=================================================================== RCS file: /cvs/mandoc/man.h,v retrieving revision 1.47 retrieving revision 1.51 diff -u -p -r1.47 -r1.51 --- mandoc/man.h 2010/12/06 15:31:19 1.47 +++ mandoc/man.h 2011/01/12 10:43:22 1.51 @@ -1,4 +1,4 @@ -/* $Id: man.h,v 1.47 2010/12/06 15:31:19 kristaps Exp $ */ +/* $Id: man.h,v 1.51 2011/01/12 10:43:22 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons * @@ -43,11 +43,9 @@ enum mant { MAN_IR, MAN_RI, MAN_na, - MAN_i, MAN_sp, MAN_nf, MAN_fi, - MAN_r, MAN_RE, MAN_RS, MAN_DT, @@ -68,7 +66,8 @@ enum man_type { MAN_ROOT, MAN_BLOCK, MAN_HEAD, - MAN_BODY + MAN_BODY, + MAN_TBL }; /* @@ -97,12 +96,13 @@ struct man_node { enum mant tok; /* tok or MAN__MAX if none */ int flags; #define MAN_VALID (1 << 0) /* has been validated */ -#define MAN_ACTED (1 << 1) /* has been acted upon */ #define MAN_EOS (1 << 2) /* at sentence boundary */ +#define MAN_LINE (1 << 3) /* first macro/text on line */ enum man_type type; /* AST node type */ char *string; /* TEXT node argument */ struct man_node *head; /* BLOCK node HEAD ptr */ struct man_node *body; /* BLOCK node BODY ptr */ + const struct tbl_span *span; /* TBL */ }; /* @@ -120,6 +120,8 @@ struct man *man_alloc(struct regset *, void *, mandoc void man_reset(struct man *); int man_parseln(struct man *, int, char *, int); int man_endparse(struct man *); +int man_addspan(struct man *, + const struct tbl_span *); const struct man_node *man_node(const struct man *); const struct man_meta *man_meta(const struct man *);