=================================================================== RCS file: /cvs/mandoc/mdoc.h,v retrieving revision 1.14 retrieving revision 1.17 diff -u -p -r1.14 -r1.17 --- mandoc/mdoc.h 2009/01/05 16:11:14 1.14 +++ mandoc/mdoc.h 2009/01/08 14:55:59 1.17 @@ -1,4 +1,4 @@ -/* $Id: mdoc.h,v 1.14 2009/01/05 16:11:14 kristaps Exp $ */ +/* $Id: mdoc.h,v 1.17 2009/01/08 14:55:59 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -19,7 +19,7 @@ #ifndef MDOC_H #define MDOC_H -#define MDOC_LINEARG_MAX 8 +#define MDOC_LINEARG_MAX 12 #define MDOC___ 0 #define MDOC_Dd 1 @@ -217,11 +217,13 @@ enum mdoc_err { ERR_ARGS_EQ1, ERR_ARGS_GE1, ERR_ARGS_LE2, + ERR_ARGS_LE8, ERR_ARGS_MANY, ERR_SYNTAX_CHILDHEAD, ERR_SYNTAX_CHILDBODY, ERR_SYNTAX_EMPTYBODY, - ERR_SYNTAX_EMPTYHEAD + ERR_SYNTAX_EMPTYHEAD, + ERR_SYNTAX_NOTEXT }; enum mdoc_att { @@ -410,6 +412,8 @@ struct mdoc_node { struct mdoc_node *child; struct mdoc_node *next; struct mdoc_node *prev; + int line; + int pos; enum mdoc_type type; union mdoc_data data; }; @@ -417,7 +421,7 @@ struct mdoc_node { struct mdoc_cb { int (*mdoc_err)(void *, int, int, enum mdoc_err); int (*mdoc_warn)(void *, int, int, enum mdoc_warn); - void (*mdoc_msg)(void *, int, const char *); + void (*mdoc_msg)(void *, int, int, const char *); }; extern const char *const *mdoc_macronames; @@ -429,9 +433,10 @@ struct mdoc; void mdoc_free(struct mdoc *); struct mdoc *mdoc_alloc(void *data, const struct mdoc_cb *); -int mdoc_parseln(struct mdoc *, char *buf); +int mdoc_parseln(struct mdoc *, int, char *buf); const struct mdoc_node *mdoc_result(struct mdoc *); +int mdoc_endparse(struct mdoc *); __END_DECLS