=================================================================== RCS file: /cvs/mandoc/Attic/private.h,v retrieving revision 1.55 retrieving revision 1.57 diff -u -p -r1.55 -r1.57 --- mandoc/Attic/private.h 2009/01/05 16:11:14 1.55 +++ mandoc/Attic/private.h 2009/01/07 15:53:00 1.57 @@ -1,4 +1,4 @@ -/* $Id: private.h,v 1.55 2009/01/05 16:11:14 kristaps Exp $ */ +/* $Id: private.h,v 1.57 2009/01/07 15:53:00 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -31,6 +31,7 @@ struct mdoc { struct mdoc_cb cb; void *htab; int flags; +#define MDOC_HALT (1 << 0) enum mdoc_next next; struct mdoc_node *last; struct mdoc_node *first; @@ -43,10 +44,11 @@ struct mdoc_macro { int (*fp)(struct mdoc *, int, int, int *, char *); int flags; #define MDOC_CALLABLE (1 << 0) -#define MDOC_EXPLICIT (1 << 1) -#define MDOC_QUOTABLE (1 << 2) -#define MDOC_PROLOGUE (1 << 3) -#define MDOC_NESTED (1 << 4) +#define MDOC_PARSED (1 << 1) +#define MDOC_EXPLICIT (1 << 2) +#define MDOC_QUOTABLE (1 << 3) +#define MDOC_PROLOGUE (1 << 4) +#define MDOC_NESTED (1 << 5) }; extern const struct mdoc_macro *const mdoc_macros; @@ -86,8 +88,8 @@ time_t mdoc_atotime(const char *); int mdoc_valid_pre(struct mdoc *, int, int, int, const struct mdoc_arg *); -int mdoc_valid_post(struct mdoc *, int, int); -int mdoc_action(struct mdoc *, int, int); +int mdoc_valid_post(struct mdoc *, int); +int mdoc_action(struct mdoc *, int); int mdoc_argv(struct mdoc *, int, struct mdoc_arg *, int *, char *); @@ -121,6 +123,7 @@ int macro_scoped(MACRO_PROT_ARGS); int macro_close_explicit(MACRO_PROT_ARGS); int macro_scoped_line(MACRO_PROT_ARGS); int macro_prologue(MACRO_PROT_ARGS); +int macro_end(struct mdoc *); __END_DECLS