Move check for closing punctuation into its own function. This will

[mandoc.git] / man.h

diff --git a/man.h b/man.h
index 1bd7c6728f7592285863e2defaccf8562f1db275..6aa744c31aa53862bd65fb0543972d35745bf90e 100644 (file)
--- a/man.h
+++ b/man.h
@@ -1,6 +1,6 @@
-/*     $Id: man.h,v 1.48 2010/12/08 10:58:22 kristaps Exp $ */
+/*     $Id: man.h,v 1.54 2011/03/07 01:35:51 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -66,7 +66,9 @@ enum  man_type {
        MAN_ROOT,
        MAN_BLOCK,
        MAN_HEAD,
-       MAN_BODY
+       MAN_BODY,
+       MAN_TBL,
+       MAN_EQN
 };
 
 /* 
@@ -74,8 +76,7 @@ enum  man_type {
  */
 struct man_meta {
        char            *msec; /* `TH' section (1, 3p, etc.) */
-       time_t           date; /* `TH' normalised date */
-       char            *rawdate; /* raw `TH' date */
+       char            *date; /* `TH' normalised date */
        char            *vol; /* `TH' volume */
        char            *title; /* `TH' title (e.g., FOO) */
        char            *source; /* `TH' source (e.g., GNU) */
@@ -95,12 +96,14 @@ struct      man_node {
        enum mant        tok; /* tok or MAN__MAX if none */
        int              flags;
 #define        MAN_VALID       (1 << 0) /* has been validated */
-#define        MAN_ACTED       (1 << 1) /* has been acted upon */
 #define        MAN_EOS         (1 << 2) /* at sentence boundary */
+#define        MAN_LINE        (1 << 3) /* first macro/text on line */
        enum man_type    type; /* AST node type */
        char            *string; /* TEXT node argument */
        struct man_node *head; /* BLOCK node HEAD ptr */
        struct man_node *body; /* BLOCK node BODY ptr */
+       const struct tbl_span *span; /* TBL */
+       const struct eqn *eqn; /* EQN */
 };
 
 /*
@@ -118,6 +121,9 @@ struct      man      *man_alloc(struct regset *, void *, mandocmsg);
 void             man_reset(struct man *);
 int              man_parseln(struct man *, int, char *, int);
 int              man_endparse(struct man *);
+int              man_addspan(struct man *,
+                       const struct tbl_span *);
+int              man_addeqn(struct man *, const struct eqn *);
 
 const struct man_node *man_node(const struct man *);
 const struct man_meta *man_meta(const struct man *);