Tests for sane and insane handling of lines before and after .SH/.SS

[mandoc.git] / man.h

diff --git a/man.h b/man.h
index 0efbebdc7cf10bfa38f890e54598f7e389c76a80..739cf8bab63918414a3cf97d7c12a5bbb70a2095 100644 (file)
--- a/man.h
+++ b/man.h
@@ -1,4 +1,4 @@
-/*     $Id: man.h,v 1.13 2009/06/16 19:55:28 kristaps Exp $ */
+/*     $Id: man.h,v 1.33 2010/05/16 10:59:36 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -19,39 +19,56 @@
 
 #include <time.h>
 
-#define        MAN_br           0
-#define        MAN_TH           1
-#define        MAN_SH           2
-#define        MAN_SS           3
-#define        MAN_TP           4
-#define        MAN_LP           5
-#define        MAN_PP           6
-#define        MAN_P            7
-#define        MAN_IP           8
-#define        MAN_HP           9
-#define        MAN_SM           10
-#define        MAN_SB           11
-#define        MAN_BI           12
-#define        MAN_IB           13
-#define        MAN_BR           14
-#define        MAN_RB           15
-#define        MAN_R            16
-#define        MAN_B            17
-#define        MAN_I            18
-#define        MAN_IR           19
-#define        MAN_RI           20
-#define        MAN_na           21
-#define        MAN_i            22
-#define        MAN_MAX          23
+enum   mant {
+       MAN_br = 0,
+       MAN_TH,
+       MAN_SH,
+       MAN_SS,
+       MAN_TP,
+       MAN_LP,
+       MAN_PP,
+       MAN_P,
+       MAN_IP,
+       MAN_HP,
+       MAN_SM,
+       MAN_SB,
+       MAN_BI,
+       MAN_IB,
+       MAN_BR,
+       MAN_RB,
+       MAN_R,
+       MAN_B,
+       MAN_I,
+       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_MAX
+};
 
 enum   man_type {
        MAN_TEXT,
        MAN_ELEM,
-       MAN_ROOT
+       MAN_ROOT,
+       MAN_BLOCK,
+       MAN_HEAD,
+       MAN_BODY
 };
 
 struct man_meta {
-       int              msec;
+       char            *msec;
        time_t           date;
        char            *vol;
        char            *title;
@@ -63,17 +80,22 @@ struct      man_node {
        struct man_node *child;
        struct man_node *next;
        struct man_node *prev;
+       int              nchild;
        int              line;
        int              pos;
-       int              tok;
+       enum mant        tok;
        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_IGN_MACRO    (1 << 0) /* Ignore unknown macros. */
+#define        MAN_IGN_MACRO    (1 << 0)
+#define        MAN_IGN_ESCAPE   (1 << 2)
 
 extern const char *const *man_macronames;
 
@@ -88,10 +110,9 @@ struct      man;
 
 void             man_free(struct man *);
 struct man      *man_alloc(void *, int, const struct man_cb *);
-int              man_reset(struct man *);
-int              man_parseln(struct man *, int, char *buf);
+void             man_reset(struct man *);
+int              man_parseln(struct man *, int, char *, int);
 int              man_endparse(struct man *);
-int              man_valid_post(struct man *);
 
 const struct man_node *man_node(const struct man *);
 const struct man_meta *man_meta(const struct man *);