Make sure that -Thtml doesn't break within literal lines. This is the

[mandoc.git] / man.h

diff --git a/man.h b/man.h
index a50a2d4ba839f8f9166ff91916322a4afa0f23d8..4373f8e6cb7bab936271964b538d51f5093cea9e 100644 (file)
--- a/man.h
+++ b/man.h
@@ -1,4 +1,4 @@
-/*     $Id: man.h,v 1.43 2010/08/20 01:02:07 schwarze Exp $ */
+/*     $Id: man.h,v 1.51 2011/01/12 10:43:22 kristaps Exp $ */

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


@@ -17,8 +17,9 @@
 #ifndef MAN_H
 #define MAN_H
 
 #ifndef MAN_H
 #define MAN_H
 

-#include <time.h>
-
+/* 
+ * What follows is a list of ALL possible macros. 
+ */

 enum   mant {
        MAN_br = 0,
        MAN_TH,
 enum   mant {
        MAN_br = 0,
        MAN_TH,


@@ -42,61 +43,72 @@ 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_UC,
        MAN_PD,
        MAN_RE,
        MAN_RS,
        MAN_DT,
        MAN_UC,
        MAN_PD,

-       MAN_Sp,
-       MAN_Vb,
-       MAN_Ve,

        MAN_AT,
        MAN_in,
        MAN_AT,
        MAN_in,

+       MAN_ft,

        MAN_MAX
 };
 
        MAN_MAX
 };
 

+/* 
+ * Type of a syntax node. 
+ */

 enum   man_type {
        MAN_TEXT,
        MAN_ELEM,
        MAN_ROOT,
        MAN_BLOCK,
        MAN_HEAD,
 enum   man_type {
        MAN_TEXT,
        MAN_ELEM,
        MAN_ROOT,
        MAN_BLOCK,
        MAN_HEAD,

-       MAN_BODY
+       MAN_BODY,
+       MAN_TBL

 };
 
 };
 

+/* 
+ * Information from prologue. 
+ */

 struct man_meta {
 struct man_meta {

-       char            *msec;
-       time_t           date;
-       char            *rawdate;
-       char            *vol;
-       char            *title;
-       char            *source;
+       char            *msec; /* `TH' section (1, 3p, etc.) */
+       time_t           date; /* `TH' normalised date */
+       char            *rawdate; /* raw `TH' date */
+       char            *vol; /* `TH' volume */
+       char            *title; /* `TH' title (e.g., FOO) */
+       char            *source; /* `TH' source (e.g., GNU) */

 };
 
 };
 

+/* 
+ * Single node in tree-linked AST. 
+ */

 struct man_node {
 struct man_node {

-       struct man_node *parent;
-       struct man_node *child;
-       struct man_node *next;
-       struct man_node *prev;
-       int              nchild;
+       struct man_node *parent; /* parent AST node */
+       struct man_node *child; /* first child AST node */
+       struct man_node *next; /* sibling AST node */
+       struct man_node *prev; /* prior sibling AST node */
+       int              nchild; /* number children */

        int              line;
        int              pos;
        int              line;
        int              pos;

-       enum mant        tok;
+       enum mant        tok; /* tok or MAN__MAX if none */

        int              flags;
        int              flags;

-#define        MAN_VALID       (1 << 0)
-#define        MAN_ACTED       (1 << 1)
-#define        MAN_EOS         (1 << 2)
-       enum man_type    type;
-       char            *string;
-       struct man_node *head;
-       struct man_node *body;
+#define        MAN_VALID       (1 << 0) /* has been validated */
+#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 */

 };
 
 };
 

+/*
+ * Names of macros.  Index is enum mant.  Indexing into this returns
+ * the normalised name, e.g., man_macronames[MAN_SH] -> "SH".
+ */

 extern const char *const *man_macronames;
 
 __BEGIN_DECLS
 extern const char *const *man_macronames;
 
 __BEGIN_DECLS


@@ -108,6 +120,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 *);