Refactoring in preparation for .rm support:

[mandoc.git] / mdoc.h

diff --git a/mdoc.h b/mdoc.h
index 36e40d19b8fd16acc592d4dd8ef57b668873b61e..9c22c3364099b135535f8a91ebde7528aece03f1 100644 (file)
--- a/mdoc.h
+++ b/mdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.h,v 1.111 2010/12/25 13:50:37 kristaps Exp $ */
+/*     $Id: mdoc.h,v 1.114 2011/01/01 12:18:37 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -190,6 +190,7 @@ enum        mdoc_type {
        MDOC_TAIL,
        MDOC_BODY,
        MDOC_BLOCK,
+       MDOC_TBL,
        MDOC_ROOT
 };
 
@@ -354,7 +355,7 @@ struct      mdoc_an {
 };
 
 struct mdoc_rs {
-       int               titlejournal; /* whether %T and %J */
+       struct mdoc_node *child_J; /* pointer to %J */
 };
 
 /*
@@ -385,7 +386,6 @@ struct      mdoc_node {
        enum mdoct        tok; /* tok or MDOC__MAX if none */
        int               flags;
 #define        MDOC_VALID       (1 << 0) /* has been validated */
-#define        MDOC_ACTED       (1 << 1) /* has been acted upon */
 #define        MDOC_EOS         (1 << 2) /* at sentence boundary */
 #define        MDOC_LINE        (1 << 3) /* first macro/text on line */
 #define        MDOC_SYNPRETTY   (1 << 4) /* SYNOPSIS-style formatting */
@@ -400,6 +400,7 @@ struct      mdoc_node {
        struct mdoc_node *body; /* BLOCK */
        struct mdoc_node *tail; /* BLOCK */
        char             *string; /* TEXT */
+       const struct tbl_span *span; /* TBL */
        enum mdoc_endbody end; /* BODY */
 };
 
@@ -427,6 +428,8 @@ int           mdoc_parseln(struct mdoc *, int, char *, int);
 const struct mdoc_node *mdoc_node(const struct mdoc *);
 const struct mdoc_meta *mdoc_meta(const struct mdoc *);
 int              mdoc_endparse(struct mdoc *);
+int              mdoc_addspan(struct mdoc *,
+                       const struct tbl_span *);
 
 __END_DECLS