Merge from OpenBSD (similar to my original fix committed on Oct 15, 2010):

[mandoc.git] / roff.h

diff --git a/roff.h b/roff.h
index c28c05eb2ca499a522dc2e2d01177b6fd0f4a3eb..141a469acb3a1d335045e3a7345e94134f3e65ad 100644 (file)
--- a/roff.h
+++ b/roff.h
@@ -1,4 +1,4 @@
-/*     $Id: roff.h,v 1.14 2010/05/16 10:59:36 kristaps Exp $ */
+/*     $Id: roff.h,v 1.22 2011/01/01 16:18:39 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -20,8 +20,12 @@
 enum   rofferr {
        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_ERR, /* badness: puke and stop */
+       ROFF_TBL, /* a table row was successfully parsed */
+       ROFF_ERR /* badness: puke and stop */
 };
 
 __BEGIN_DECLS
@@ -29,11 +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, int *);
-int              roff_endparse(struct roff *);
+void             roff_endparse(struct roff *);
+const struct tbl_span *roff_span(const struct roff *);
 
 __END_DECLS