Plug in the "head" concept for tables. A tbl_head specifies the full

[mandoc.git] / man.h

diff --git a/man.h b/man.h
index 43a71bfb3a9b6373fb1d356f9c45357de50ac956..581f55ffc417b5237789167c5c1586d07164e40f 100644 (file)
--- a/man.h
+++ b/man.h
@@ -1,4 +1,4 @@
-/*     $Id: man.h,v 1.46 2010/12/05 16:14:16 kristaps Exp $ */
+/*     $Id: man.h,v 1.50 2011/01/01 12:59:17 kristaps Exp $ */

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


@@ -43,11 +43,9 @@ enum mant {
        MAN_IR,
        MAN_RI,
        MAN_na,
        MAN_IR,
        MAN_RI,
        MAN_na,

-       MAN_i,

        MAN_sp,
        MAN_nf,
        MAN_fi,
        MAN_sp,
        MAN_nf,
        MAN_fi,

-       MAN_r,

        MAN_RE,
        MAN_RS,
        MAN_DT,
        MAN_RE,
        MAN_RS,
        MAN_DT,


@@ -55,6 +53,7 @@ enum  mant {
        MAN_PD,
        MAN_AT,
        MAN_in,
        MAN_PD,
        MAN_AT,
        MAN_in,

+       MAN_ft,

        MAN_MAX
 };
 
        MAN_MAX
 };
 


@@ -67,7 +66,8 @@ enum  man_type {
        MAN_ROOT,
        MAN_BLOCK,
        MAN_HEAD,
        MAN_ROOT,
        MAN_BLOCK,
        MAN_HEAD,

-       MAN_BODY
+       MAN_BODY,
+       MAN_TBL

 };
 
 /* 
 };
 
 /* 


@@ -96,12 +96,12 @@ struct      man_node {
        enum mant        tok; /* tok or MAN__MAX if none */
        int              flags;
 #define        MAN_VALID       (1 << 0) /* has been validated */
        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 */
        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 */
 #define        MAN_EOS         (1 << 2) /* at sentence boundary */
        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 */

 };
 
 /*
 };
 
 /*


@@ -119,6 +119,8 @@ 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 *);
 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 *);

 
 const struct man_node *man_node(const struct man *);
 const struct man_meta *man_meta(const struct man *);
 
 const struct man_node *man_node(const struct man *);
 const struct man_meta *man_meta(const struct man *);