=================================================================== RCS file: /cvs/mandoc/libmdoc.h,v retrieving revision 1.82 retrieving revision 1.85 diff -u -p -r1.82 -r1.85 --- mandoc/libmdoc.h 2013/10/21 23:47:58 1.82 +++ mandoc/libmdoc.h 2014/07/02 03:48:07 1.85 @@ -1,4 +1,4 @@ -/* $Id: libmdoc.h,v 1.82 2013/10/21 23:47:58 schwarze Exp $ */ +/* $Id: libmdoc.h,v 1.85 2014/07/02 03:48:07 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2013 Ingo Schwarze @@ -26,6 +26,7 @@ enum mdoc_next { struct mdoc { struct mparse *parse; /* parse pointer */ char *defos; /* default argument for .Os */ + int quick; /* abort parse early */ int flags; /* parse flags */ #define MDOC_HALT (1 << 0) /* error in parse: halt */ #define MDOC_LITERAL (1 << 1) /* in a literal scope */ @@ -40,6 +41,7 @@ struct mdoc { enum mdoc_next next; /* where to put the next node */ struct mdoc_node *last; /* the last node parsed */ struct mdoc_node *first; /* the first node parsed */ + struct mdoc_node *last_es; /* the most recent Es node */ struct mdoc_meta meta; /* document meta-data */ enum mdoc_sec lastnamed; enum mdoc_sec lastsec; @@ -108,12 +110,12 @@ __BEGIN_DECLS #define mdoc_nmsg(mdoc, n, t) \ mandoc_msg((t), (mdoc)->parse, (n)->line, (n)->pos, NULL) int mdoc_macro(MACRO_PROT_ARGS); -int mdoc_word_alloc(struct mdoc *, +int mdoc_word_alloc(struct mdoc *, int, int, const char *); void mdoc_word_append(struct mdoc *, const char *); -int mdoc_elem_alloc(struct mdoc *, int, int, +int mdoc_elem_alloc(struct mdoc *, int, int, enum mdoct, struct mdoc_arg *); -int mdoc_block_alloc(struct mdoc *, int, int, +int mdoc_block_alloc(struct mdoc *, int, int, enum mdoct, struct mdoc_arg *); int mdoc_head_alloc(struct mdoc *, int, int, enum mdoct); int mdoc_tail_alloc(struct mdoc *, int, int, enum mdoct); @@ -136,7 +138,7 @@ enum margverr mdoc_argv(struct mdoc *, int, enum mdo void mdoc_argv_free(struct mdoc_arg *); enum margserr mdoc_args(struct mdoc *, int, int *, char *, enum mdoct, char **); -enum margserr mdoc_zargs(struct mdoc *, int, +enum margserr mdoc_zargs(struct mdoc *, int, int *, char *, char **); int mdoc_macroend(struct mdoc *); enum mdelim mdoc_isdelim(const char *);