=================================================================== RCS file: /cvs/mandoc/man.h,v retrieving revision 1.52 retrieving revision 1.57 diff -u -p -r1.52 -r1.57 --- mandoc/man.h 2011/02/06 21:44:36 1.52 +++ mandoc/man.h 2011/03/22 13:28:22 1.57 @@ -1,6 +1,6 @@ -/* $Id: man.h,v 1.52 2011/02/06 21:44:36 kristaps Exp $ */ +/* $Id: man.h,v 1.57 2011/03/22 13:28:22 kristaps Exp $ */ /* - * Copyright (c) 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -17,9 +17,6 @@ #ifndef MAN_H #define MAN_H -/* - * What follows is a list of ALL possible macros. - */ enum mant { MAN_br = 0, MAN_TH, @@ -57,9 +54,6 @@ enum mant { MAN_MAX }; -/* - * Type of a syntax node. - */ enum man_type { MAN_TEXT, MAN_ELEM, @@ -71,21 +65,14 @@ enum man_type { MAN_EQN }; -/* - * Information from prologue. - */ struct man_meta { char *msec; /* `TH' section (1, 3p, etc.) */ - time_t date; /* `TH' normalised date */ - char *rawdate; /* raw `TH' date */ + char *date; /* `TH' normalised date */ char *vol; /* `TH' volume */ char *title; /* `TH' title (e.g., FOO) */ char *source; /* `TH' source (e.g., GNU) */ }; -/* - * Single node in tree-linked AST. - */ struct man_node { struct man_node *parent; /* parent AST node */ struct man_node *child; /* first child AST node */ @@ -104,25 +91,15 @@ struct man_node { struct man_node *head; /* BLOCK node HEAD ptr */ struct man_node *body; /* BLOCK node BODY ptr */ const struct tbl_span *span; /* TBL */ + const struct eqn *eqn; /* EQN */ }; -/* - * Names of macros. Index is enum mant. Indexing into this returns - * the normalised name, e.g., man_macronames[MAN_SH] -> "SH". - */ +/* Names of macros. Index is enum mant. */ extern const char *const *man_macronames; __BEGIN_DECLS struct man; - -void man_free(struct man *); -struct man *man_alloc(struct regset *, void *, mandocmsg); -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 *);