Start fixing issues that beck@ helped find:

[mandoc.git] / man.h

diff --git a/man.h b/man.h
index 2f03f450de7b9ea38aef0bb0e96423a939e6c35c..aa80b6732eaea4690d1f448b22fe9125d8c4b410 100644 (file)
--- a/man.h
+++ b/man.h
@@ -1,6 +1,7 @@
-/*     $Id: man.h,v 1.41 2010/07/22 23:03:15 kristaps Exp $ */
+/*     $Id: man.h,v 1.65 2014/06/20 23:02:31 schwarze Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,8 +18,6 @@
 #ifndef MAN_H
 #define MAN_H
 
-#include <time.h>
-
 enum   mant {
        MAN_br = 0,
        MAN_TH,
@@ -42,21 +41,23 @@ enum        mant {
        MAN_IR,
        MAN_RI,
        MAN_na,
-       MAN_i,
        MAN_sp,
        MAN_nf,
        MAN_fi,
-       MAN_r,
        MAN_RE,
        MAN_RS,
        MAN_DT,
        MAN_UC,
        MAN_PD,
-       MAN_Sp,
-       MAN_Vb,
-       MAN_Ve,
        MAN_AT,
        MAN_in,
+       MAN_ft,
+       MAN_OP,
+       MAN_EX,
+       MAN_EE,
+       MAN_UR,
+       MAN_UE,
+       MAN_ll,
        MAN_MAX
 };
 
@@ -66,54 +67,54 @@ enum        man_type {
        MAN_ROOT,
        MAN_BLOCK,
        MAN_HEAD,
-       MAN_BODY
+       MAN_BODY,
+       MAN_TAIL,
+       MAN_TBL,
+       MAN_EQN
 };
 
 struct man_meta {
-       char            *msec;
-       time_t           date;
-       char            *rawdate;
-       char            *vol;
-       char            *title;
-       char            *source;
+       char            *msec; /* `TH' section (1, 3p, etc.) */
+       char            *date; /* `TH' normalised date */
+       char            *vol; /* `TH' volume */
+       char            *title; /* `TH' title (e.g., FOO) */
+       char            *source; /* `TH' source (e.g., GNU) */
+       int              hasbody; /* document is not empty */
 };
 
 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;
-       enum mant        tok;
+       enum mant        tok; /* tok or MAN__MAX if none */
        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 *tail; /* BLOCK node TAIL ptr */
+       struct man_node *body; /* BLOCK node BODY ptr */
+       const struct tbl_span *span; /* TBL */
+       const struct eqn *eqn; /* EQN */
 };
 
-#define        MAN_IGN_MACRO    (1 << 0)
-#define        MAN_IGN_ESCAPE   (1 << 2)
-
+/* Names of macros.  Index is enum mant. */
 extern const char *const *man_macronames;
 
 __BEGIN_DECLS
 
 struct man;
 
-void             man_free(struct man *);
-struct man      *man_alloc(struct regset *, void *, int, mandocmsg);
-void             man_reset(struct man *);
-int              man_parseln(struct man *, int, char *, int);
-int              man_endparse(struct man *);
-
 const struct man_node *man_node(const struct man *);
 const struct man_meta *man_meta(const struct man *);
+const struct mparse   *man_mparse(const struct man *);
+void man_deroff(char **, const struct man_node *);
 
 __END_DECLS