Merge restructuring of main.c code. This provided by schwarze@ and inspected

[mandoc.git] / roff.h

diff --git a/roff.h b/roff.h
index c8c4babc518ddc2af0ae7370a66f8d23515d5013..3624308f452158767c14c75b87a4e9b6cad15d09 100644 (file)
--- a/roff.h
+++ b/roff.h
@@ -1,4 +1,4 @@
-/*     $Id: roff.h,v 1.16 2010/06/26 15:22:19 kristaps Exp $ */
+/*     $Id: roff.h,v 1.19 2010/12/01 15:09:01 kristaps Exp $ */

 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -20,6 +20,9 @@
 enum   rofferr {
        ROFF_CONT, /* continue processing line */
        ROFF_RERUN, /* re-run roff interpreter with offset */
 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_IGN, /* ignore current line */
        ROFF_ERR /* badness: puke and stop */
 };


@@ -29,10 +32,10 @@ __BEGIN_DECLS
 struct roff;
 
 void             roff_free(struct roff *);
 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 *);
 void             roff_reset(struct roff *);

-enum   rofferr   roff_parseln(struct roff *, struct regset *,
-                       int, char **, size_t *, int, int *);
+enum   rofferr   roff_parseln(struct roff *, int, 
+                       char **, size_t *, int, int *);

 int              roff_endparse(struct roff *);
 
 __END_DECLS
 int              roff_endparse(struct roff *);
 
 __END_DECLS