Fix a regression caused by the insertion of two new tokens,

[mandoc.git] / mdoc.h

diff --git a/mdoc.h b/mdoc.h
index ad2ef3ac4efd0af5fc9ae936139b7a0fbc62ed6e..2f32fa4962fed0abf6871878072fcb37fb52e126 100644 (file)
--- a/mdoc.h
+++ b/mdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.h,v 1.138 2015/04/02 22:48:17 schwarze Exp $ */
+/*     $Id: mdoc.h,v 1.146 2018/12/30 00:49:55 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>


@@ -16,130 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 

-#define        MDOC_Ap    0
-#define        MDOC_Dd    1
-#define        MDOC_Dt    2
-#define        MDOC_Os    3
-#define        MDOC_Sh    4
-#define        MDOC_Ss    5
-#define        MDOC_Pp    6
-#define        MDOC_D1    7
-#define        MDOC_Dl    8
-#define        MDOC_Bd    9
-#define        MDOC_Ed   10
-#define        MDOC_Bl   11
-#define        MDOC_El   12
-#define        MDOC_It   13
-#define        MDOC_Ad   14
-#define        MDOC_An   15
-#define        MDOC_Ar   16
-#define        MDOC_Cd   17
-#define        MDOC_Cm   18
-#define        MDOC_Dv   19
-#define        MDOC_Er   20
-#define        MDOC_Ev   21
-#define        MDOC_Ex   22
-#define        MDOC_Fa   23
-#define        MDOC_Fd   24
-#define        MDOC_Fl   25
-#define        MDOC_Fn   26
-#define        MDOC_Ft   27
-#define        MDOC_Ic   28
-#define        MDOC_In   29
-#define        MDOC_Li   30
-#define        MDOC_Nd   31
-#define        MDOC_Nm   32
-#define        MDOC_Op   33
-#define        MDOC_Ot   34
-#define        MDOC_Pa   35
-#define        MDOC_Rv   36
-#define        MDOC_St   37
-#define        MDOC_Va   38
-#define        MDOC_Vt   39
-#define        MDOC_Xr   40
-#define        MDOC__A   41
-#define        MDOC__B   42
-#define        MDOC__D   43
-#define        MDOC__I   44
-#define        MDOC__J   45
-#define        MDOC__N   46
-#define        MDOC__O   47
-#define        MDOC__P   48
-#define        MDOC__R   49
-#define        MDOC__T   50
-#define        MDOC__V   51
-#define        MDOC_Ac   52
-#define        MDOC_Ao   53
-#define        MDOC_Aq   54
-#define        MDOC_At   55
-#define        MDOC_Bc   56
-#define        MDOC_Bf   57
-#define        MDOC_Bo   58
-#define        MDOC_Bq   59
-#define        MDOC_Bsx  60
-#define        MDOC_Bx   61
-#define        MDOC_Db   62
-#define        MDOC_Dc   63
-#define        MDOC_Do   64
-#define        MDOC_Dq   65
-#define        MDOC_Ec   66
-#define        MDOC_Ef   67
-#define        MDOC_Em   68
-#define        MDOC_Eo   69
-#define        MDOC_Fx   70
-#define        MDOC_Ms   71
-#define        MDOC_No   72
-#define        MDOC_Ns   73
-#define        MDOC_Nx   74
-#define        MDOC_Ox   75
-#define        MDOC_Pc   76
-#define        MDOC_Pf   77
-#define        MDOC_Po   78
-#define        MDOC_Pq   79
-#define        MDOC_Qc   80
-#define        MDOC_Ql   81
-#define        MDOC_Qo   82
-#define        MDOC_Qq   83
-#define        MDOC_Re   84
-#define        MDOC_Rs   85
-#define        MDOC_Sc   86
-#define        MDOC_So   87
-#define        MDOC_Sq   88
-#define        MDOC_Sm   89
-#define        MDOC_Sx   90
-#define        MDOC_Sy   91
-#define        MDOC_Tn   92
-#define        MDOC_Ux   93
-#define        MDOC_Xc   94
-#define        MDOC_Xo   95
-#define        MDOC_Fo   96
-#define        MDOC_Fc   97
-#define        MDOC_Oo   98
-#define        MDOC_Oc   99
-#define        MDOC_Bk  100
-#define        MDOC_Ek  101
-#define        MDOC_Bt  102
-#define        MDOC_Hf  103
-#define        MDOC_Fr  104
-#define        MDOC_Ud  105
-#define        MDOC_Lb  106
-#define        MDOC_Lp  107
-#define        MDOC_Lk  108
-#define        MDOC_Mt  109
-#define        MDOC_Brq 110
-#define        MDOC_Bro 111
-#define        MDOC_Brc 112
-#define        MDOC__C  113
-#define        MDOC_Es  114
-#define        MDOC_En  115
-#define        MDOC_Dx  116
-#define        MDOC__Q  117
-#define        MDOC_br  118
-#define        MDOC_sp  119
-#define        MDOC__U  120
-#define        MDOC_Ta  121
-#define        MDOC_ll  122
-#define        MDOC_MAX 123
+struct roff_node;
+struct roff_man;

 
 enum   mdocargt {
        MDOC_Split, /* -split */
 
 enum   mdocargt {
        MDOC_Split, /* -split */


@@ -172,16 +50,6 @@ enum        mdocargt {
        MDOC_ARG_MAX
 };
 
        MDOC_ARG_MAX
 };
 

-struct mdoc_meta {
-       char             *msec; /* `Dt' section (1, 3p, etc.) */
-       char             *vol; /* `Dt' volume (implied) */
-       char             *arch; /* `Dt' arch (i386, etc.) */
-       char             *date; /* `Dd' normalised date */
-       char             *title; /* `Dt' title (FOO, etc.) */
-       char             *os; /* `Os' system (OpenBSD, etc.) */
-       char             *name; /* leading `Nm' name */
-};
-

 /*
  * An argument to a macro (multiple values = `-column xxx yyy').
  */
 /*
  * An argument to a macro (multiple values = `-column xxx yyy').
  */


@@ -284,18 +152,7 @@ union      mdoc_data {
        struct mdoc_rs    Rs;
 };
 
        struct mdoc_rs    Rs;
 };
 

-/* Names of macros. */
-extern const char *const *mdoc_macronames;
-

 /* Names of macro args.  Index is enum mdocargt. */
 extern const char *const *mdoc_argnames;
 
 /* Names of macro args.  Index is enum mdocargt. */
 extern const char *const *mdoc_argnames;
 

-__BEGIN_DECLS
-
-struct mdoc;
-
-const struct roff_node *mdoc_node(const struct mdoc *);
-const struct mdoc_meta *mdoc_meta(const struct mdoc *);
-void mdoc_deroff(char **, const struct roff_node *);
-
-__END_DECLS
+void            mdoc_validate(struct roff_man *);