=================================================================== RCS file: /cvs/mandoc/libmdoc.h,v retrieving revision 1.38 retrieving revision 1.42 diff -u -p -r1.38 -r1.42 --- mandoc/libmdoc.h 2010/05/07 06:05:38 1.38 +++ mandoc/libmdoc.h 2010/05/13 06:22:11 1.42 @@ -1,4 +1,4 @@ -/* $Id: libmdoc.h,v 1.38 2010/05/07 06:05:38 kristaps Exp $ */ +/* $Id: libmdoc.h,v 1.42 2010/05/13 06:22:11 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -28,9 +28,10 @@ struct mdoc { void *data; struct mdoc_cb cb; int flags; -#define MDOC_HALT (1 << 0) /* Error in parse. Halt. */ -#define MDOC_LITERAL (1 << 1) /* In a literal scope. */ -#define MDOC_PBODY (1 << 2) /* In the document body. */ +#define MDOC_HALT (1 << 0) /* error in parse: halt */ +#define MDOC_LITERAL (1 << 1) /* in a literal scope */ +#define MDOC_PBODY (1 << 2) /* in the document body */ +#define MDOC_NEWLINE (1 << 3) /* first macro/text in a line */ int pflags; enum mdoc_next next; struct mdoc_node *last; @@ -118,7 +119,8 @@ enum margserr { ARGS_PUNCT, ARGS_QWORD, ARGS_PHRASE, - ARGS_PPHRASE + ARGS_PPHRASE, + ARGS_PEND }; enum margverr { @@ -161,10 +163,9 @@ enum mdoct mdoc_hash_find(const char *); int mdoc_iscdelim(char); int mdoc_isdelim(const char *); size_t mdoc_isescape(const char *); -enum mdoc_sec mdoc_atosec(const char *); +enum mdoc_sec mdoc_str2sec(const char *); time_t mdoc_atotime(const char *); - -size_t mdoc_macro2len(int); +size_t mdoc_macro2len(enum mdoct); const char *mdoc_a2att(const char *); const char *mdoc_a2lib(const char *); const char *mdoc_a2st(const char *);