=================================================================== RCS file: /cvs/mandoc/man.h,v retrieving revision 1.27 retrieving revision 1.33 diff -u -p -r1.27 -r1.33 --- mandoc/man.h 2010/03/27 10:13:16 1.27 +++ mandoc/man.h 2010/05/16 10:59:36 1.33 @@ -1,4 +1,4 @@ -/* $Id: man.h,v 1.27 2010/03/27 10:13:16 kristaps Exp $ */ +/* $Id: man.h,v 1.33 2010/05/16 10:59:36 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -55,12 +55,6 @@ enum mant { MAN_Sp, MAN_Vb, MAN_Ve, - MAN_de, - MAN_dei, - MAN_am, - MAN_ami, - MAN_ig, - MAN_dot, MAN_MAX }; @@ -74,7 +68,7 @@ enum man_type { }; struct man_meta { - int msec; + char *msec; time_t date; char *vol; char *title; @@ -93,6 +87,7 @@ struct man_node { int flags; #define MAN_VALID (1 << 0) #define MAN_ACTED (1 << 1) +#define MAN_EOS (1 << 2) enum man_type type; char *string; struct man_node *head; @@ -100,7 +95,6 @@ struct man_node { }; #define MAN_IGN_MACRO (1 << 0) -#define MAN_IGN_CHARS (1 << 1) #define MAN_IGN_ESCAPE (1 << 2) extern const char *const *man_macronames; @@ -117,7 +111,7 @@ struct man; void man_free(struct man *); struct man *man_alloc(void *, int, const struct man_cb *); void man_reset(struct man *); -int man_parseln(struct man *, int, char *buf); +int man_parseln(struct man *, int, char *, int); int man_endparse(struct man *); const struct man_node *man_node(const struct man *);