=================================================================== RCS file: /cvs/mandoc/roff.h,v retrieving revision 1.13 retrieving revision 1.22 diff -u -p -r1.13 -r1.22 --- mandoc/roff.h 2010/05/15 18:35:14 1.13 +++ mandoc/roff.h 2011/01/01 16:18:39 1.22 @@ -1,4 +1,4 @@ -/* $Id: roff.h,v 1.13 2010/05/15 18:35:14 kristaps Exp $ */ +/* $Id: roff.h,v 1.22 2011/01/01 16:18:39 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons * @@ -18,9 +18,14 @@ #define ROFF_H enum rofferr { - ROFF_CONT, /* re-process line with libmdoc or libman */ - ROFF_IGN, /* ignore line */ - ROFF_ERR, /* badness */ + ROFF_CONT, /* continue processing line */ + ROFF_RERUN, /* re-run roff interpreter with offset */ + ROFF_APPEND, /* re-run main parser, appending next line */ + ROFF_REPARSE, /* re-run main parser on the result */ + ROFF_SO, /* include another file */ + ROFF_IGN, /* ignore current line */ + ROFF_TBL, /* a table row was successfully parsed */ + ROFF_ERR /* badness: puke and stop */ }; __BEGIN_DECLS @@ -28,10 +33,12 @@ __BEGIN_DECLS struct roff; void roff_free(struct roff *); -struct roff *roff_alloc(mandocmsg, void *); +struct roff *roff_alloc(struct regset *, void *, mandocmsg); void roff_reset(struct roff *); -enum rofferr roff_parseln(struct roff *, int, char **, size_t *); -int roff_endparse(struct roff *); +enum rofferr roff_parseln(struct roff *, int, + char **, size_t *, int, int *); +void roff_endparse(struct roff *); +const struct tbl_span *roff_span(const struct roff *); __END_DECLS