=================================================================== RCS file: /cvs/mandoc/mdoc.h,v retrieving revision 1.8 retrieving revision 1.15 diff -u -p -r1.8 -r1.15 --- mandoc/mdoc.h 2008/12/29 18:08:44 1.8 +++ mandoc/mdoc.h 2009/01/05 17:57:08 1.15 @@ -1,4 +1,4 @@ -/* $Id: mdoc.h,v 1.8 2008/12/29 18:08:44 kristaps Exp $ */ +/* $Id: mdoc.h,v 1.15 2009/01/05 17:57:08 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -189,7 +189,9 @@ #define MDOC_svid4 57 #define MDOC_Filled 58 #define MDOC_Words 59 -#define MDOC_ARG_MAX 60 +#define MDOC_Emphasis 60 +#define MDOC_Symbolic 61 +#define MDOC_ARG_MAX 62 enum mdoc_err { ERR_SYNTAX_QUOTE, /* NOTUSED */ @@ -212,9 +214,15 @@ enum mdoc_err { ERR_SEC_PROLOGUE_REP, ERR_SEC_NAME, ERR_ARGS_EQ0, + ERR_ARGS_EQ1, ERR_ARGS_GE1, ERR_ARGS_LE2, - ERR_ARGS_MANY + ERR_ARGS_MANY, + ERR_SYNTAX_CHILDHEAD, + ERR_SYNTAX_CHILDBODY, + ERR_SYNTAX_EMPTYBODY, + ERR_SYNTAX_EMPTYHEAD, + ERR_SYNTAX_NOTEXT }; enum mdoc_att { @@ -238,8 +246,10 @@ enum mdoc_warn { WARN_SYNTAX_MACLIKE, WARN_SYNTAX_ARGLIKE, WARN_SYNTAX_QUOTED, + WARN_SYNTAX_EMPTYBODY, WARN_IGN_AFTER_BLK, WARN_IGN_BEFORE_BLK, + WARN_IGN_OBSOLETE, WARN_SEC_OO, WARN_ARGS_GE1, WARN_ARGS_EQ0, @@ -256,6 +266,7 @@ enum mdoc_type { MDOC_TEXT, MDOC_ELEM, MDOC_HEAD, + MDOC_TAIL, MDOC_BODY, MDOC_BLOCK }; @@ -367,11 +378,13 @@ struct mdoc_block { }; struct mdoc_head { - size_t sz; - char **args; int tok; }; +struct mdoc_tail { + int tok; +}; + struct mdoc_body { int tok; }; @@ -389,6 +402,7 @@ union mdoc_data { struct mdoc_elem elem; struct mdoc_body body; struct mdoc_head head; + struct mdoc_tail tail; struct mdoc_block block; };