X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/e831f755f6b70a0a8e350399f06de7712380b3ce..0d3c1e62ca62e820e20a744760c2767cee37d5c9:/mdoc.h?ds=inline

diff --git a/mdoc.h b/mdoc.h
index a083791d..252cfdd1 100644
--- a/mdoc.h
+++ b/mdoc.h
@@ -1,278 +1,188 @@
-/* $Id: mdoc.h,v 1.21 2009/01/14 11:58:24 kristaps Exp $ */
+/*	$Id: mdoc.h,v 1.105 2010/10/04 07:01:02 kristaps Exp $ */
 /*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #ifndef MDOC_H
 #define MDOC_H
 
-#define	MDOC_LINEARG_MAX 12
-
-#define	MDOC___	 	 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_MAX	 106
-
-#define	MDOC_Split	 0
-#define	MDOC_Nosplit	 1
-#define	MDOC_Ragged	 2
-#define	MDOC_Unfilled	 3
-#define	MDOC_Literal	 4
-#define	MDOC_File	 5
-#define	MDOC_Offset	 6
-#define	MDOC_Bullet	 7
-#define	MDOC_Dash	 8
-#define	MDOC_Hyphen	 9
-#define	MDOC_Item	 10
-#define	MDOC_Enum	 11
-#define	MDOC_Tag	 12
-#define	MDOC_Diag	 13
-#define	MDOC_Hang	 14
-#define	MDOC_Ohang	 15
-#define	MDOC_Inset	 16
-#define	MDOC_Column	 17
-#define	MDOC_Width	 18
-#define	MDOC_Compact	 19
-#define	MDOC_Std	 20
-#define MDOC_p1003_1_88	 21
-#define MDOC_p1003_1_90	 22
-#define MDOC_p1003_1_96	 23
-#define MDOC_p1003_1_2001 24
-#define MDOC_p1003_1_2004 25
-#define MDOC_p1003_1	 26
-#define MDOC_p1003_1b	 27
-#define MDOC_p1003_1b_93 28
-#define MDOC_p1003_1c_95 29
-#define MDOC_p1003_1g_2000 30
-#define MDOC_p1003_2_92	 31
-#define MDOC_p1387_2_95	 32
-#define MDOC_p1003_2	 33
-#define MDOC_p1387_2	 34
-#define MDOC_isoC_90	 35
-#define MDOC_isoC_amd1	 36
-#define MDOC_isoC_tcor1	 37
-#define MDOC_isoC_tcor2	 38
-#define MDOC_isoC_99	 39
-#define MDOC_ansiC	 40
-#define MDOC_ansiC_89	 41
-#define MDOC_ansiC_99	 42
-#define MDOC_ieee754	 43
-#define MDOC_iso8802_3	 44
-#define MDOC_xpg3	 45
-#define MDOC_xpg4	 46
-#define MDOC_xpg4_2	 47
-#define MDOC_xpg4_3	 48
-#define MDOC_xbd5	 49
-#define MDOC_xcu5	 50
-#define MDOC_xsh5	 51
-#define MDOC_xns5	 52
-#define MDOC_xns5_2d2_0	 53
-#define MDOC_xcurses4_2	 54
-#define MDOC_susv2	 55
-#define MDOC_susv3	 56
-#define MDOC_svid4	 57
-#define	MDOC_Filled	 58
-#define	MDOC_Words	 59
-#define	MDOC_Emphasis	 60
-#define	MDOC_Symbolic	 61
-#define	MDOC_ARG_MAX	 62
-
-/* FIXME: have these be generic groups. */
-
-enum 	mdoc_err {
-	ERR_SYNTAX_QUOTE, /* NOTUSED */
-	ERR_SYNTAX_UNQUOTE,
-	ERR_SYNTAX_NOPUNCT,
-	ERR_SYNTAX_WS,
-	ERR_SYNTAX_ARG,
-	ERR_SYNTAX_ARGFORM,
-	ERR_SYNTAX_ARGVAL,
-	ERR_SYNTAX_ARGBAD,
-	ERR_SYNTAX_ARGMISS,
-	ERR_SYNTAX_ARGMANY,
-	ERR_MACRO_NOTSUP,
-	ERR_MACRO_NOTCALL,
-	ERR_SCOPE_BREAK,
-	ERR_SCOPE_NOCTX,
-	ERR_SCOPE_NONEST,
-	ERR_SEC_PROLOGUE,
-	ERR_SEC_NPROLOGUE,
-	ERR_SEC_PROLOGUE_OO,
-	ERR_SEC_PROLOGUE_REP,
-	ERR_SEC_NAME,
-	ERR_ARGS_EQ0,
-	ERR_ARGS_EQ1,
-	ERR_ARGS_GE1,
-	ERR_ARGS_LE2,
-	ERR_ARGS_LE8,
-	ERR_ARGS_MANY,
-	ERR_SYNTAX_CHILDBAD,
-	ERR_SYNTAX_PARENTBAD,
-	ERR_SYNTAX_CHILDHEAD,
-	ERR_SYNTAX_CHILDBODY,
-	ERR_SYNTAX_EMPTYBODY,
-	ERR_SYNTAX_EMPTYHEAD,
-	ERR_SYNTAX_NOTEXT
-};
-
-enum	mdoc_att {
-	ATT_DEFAULT = 0,
-	ATT_v1,
-	ATT_v2,
-	ATT_v3,
-	ATT_v4,
-	ATT_v5,
-	ATT_v6,
-	ATT_v7,
-	ATT_32v,
-	ATT_V1,
-	ATT_V2,
-	ATT_V3,
-	ATT_V4
-};
-
-enum	mdoc_warn {
-	WARN_SYNTAX_WS_EOLN,
-	WARN_SYNTAX_MACLIKE,
-	WARN_SYNTAX_ARGLIKE,
-	WARN_SYNTAX_QUOTED,
-	WARN_SYNTAX_EMPTYHEAD,
-	WARN_SYNTAX_EMPTYBODY,
-	WARN_SYNTAX_NOBODY,
-	WARN_IGN_AFTER_BLK,
-	WARN_IGN_BEFORE_BLK,
-	WARN_IGN_OBSOLETE,
-	WARN_SEC_OO,
-	WARN_SEC_REP,
-	WARN_ARGS_GE1,
-	WARN_ARGS_EQ0,
-	WARN_COMPAT_TROFF
+/* 
+ * What follows is a list of ALL possible macros. 
+ */
+enum	mdoct {
+	MDOC_Ap = 0,
+	MDOC_Dd,
+	MDOC_Dt,
+	MDOC_Os,
+	MDOC_Sh,
+	MDOC_Ss,
+	MDOC_Pp,
+	MDOC_D1,
+	MDOC_Dl,
+	MDOC_Bd,
+	MDOC_Ed,
+	MDOC_Bl,
+	MDOC_El,
+	MDOC_It,
+	MDOC_Ad,
+	MDOC_An,
+	MDOC_Ar,
+	MDOC_Cd,
+	MDOC_Cm,
+	MDOC_Dv,
+	MDOC_Er,
+	MDOC_Ev,
+	MDOC_Ex,
+	MDOC_Fa,
+	MDOC_Fd,
+	MDOC_Fl,
+	MDOC_Fn,
+	MDOC_Ft,
+	MDOC_Ic,
+	MDOC_In,
+	MDOC_Li,
+	MDOC_Nd,
+	MDOC_Nm,
+	MDOC_Op,
+	MDOC_Ot,
+	MDOC_Pa,
+	MDOC_Rv,
+	MDOC_St,
+	MDOC_Va,
+	MDOC_Vt,
+	MDOC_Xr,
+	MDOC__A,
+	MDOC__B,
+	MDOC__D,
+	MDOC__I,
+	MDOC__J,
+	MDOC__N,
+	MDOC__O,
+	MDOC__P,
+	MDOC__R,
+	MDOC__T,
+	MDOC__V,
+	MDOC_Ac,
+	MDOC_Ao,
+	MDOC_Aq,
+	MDOC_At,
+	MDOC_Bc,
+	MDOC_Bf,
+	MDOC_Bo,
+	MDOC_Bq,
+	MDOC_Bsx,
+	MDOC_Bx,
+	MDOC_Db,
+	MDOC_Dc,
+	MDOC_Do,
+	MDOC_Dq,
+	MDOC_Ec,
+	MDOC_Ef,
+	MDOC_Em,
+	MDOC_Eo,
+	MDOC_Fx,
+	MDOC_Ms,
+	MDOC_No,
+	MDOC_Ns,
+	MDOC_Nx,
+	MDOC_Ox,
+	MDOC_Pc,
+	MDOC_Pf,
+	MDOC_Po,
+	MDOC_Pq,
+	MDOC_Qc,
+	MDOC_Ql,
+	MDOC_Qo,
+	MDOC_Qq,
+	MDOC_Re,
+	MDOC_Rs,
+	MDOC_Sc,
+	MDOC_So,
+	MDOC_Sq,
+	MDOC_Sm,
+	MDOC_Sx,
+	MDOC_Sy,
+	MDOC_Tn,
+	MDOC_Ux,
+	MDOC_Xc,
+	MDOC_Xo,
+	MDOC_Fo,
+	MDOC_Fc,
+	MDOC_Oo,
+	MDOC_Oc,
+	MDOC_Bk,
+	MDOC_Ek,
+	MDOC_Bt,
+	MDOC_Hf,
+	MDOC_Fr,
+	MDOC_Ud,
+	MDOC_Lb,
+	MDOC_Lp,
+	MDOC_Lk,
+	MDOC_Mt,
+	MDOC_Brq,
+	MDOC_Bro,
+	MDOC_Brc,
+	MDOC__C,
+	MDOC_Es,
+	MDOC_En,
+	MDOC_Dx,
+	MDOC__Q,
+	MDOC_br,
+	MDOC_sp,
+	MDOC__U,
+	MDOC_Ta,
+	MDOC_MAX
 };
 
-struct	mdoc_arg {
-	int	  	  arg;
-	int		  line;
-	int		  pos;
-	size_t		  sz;
-	char		**value;
+/* 
+ * What follows is a list of ALL possible macro arguments. 
+ */
+enum	mdocargt {
+	MDOC_Split,
+	MDOC_Nosplit,
+	MDOC_Ragged,
+	MDOC_Unfilled,
+	MDOC_Literal,
+	MDOC_File,
+	MDOC_Offset,
+	MDOC_Bullet,
+	MDOC_Dash,
+	MDOC_Hyphen,
+	MDOC_Item,
+	MDOC_Enum,
+	MDOC_Tag,
+	MDOC_Diag,
+	MDOC_Hang,
+	MDOC_Ohang,
+	MDOC_Inset,
+	MDOC_Column,
+	MDOC_Width,
+	MDOC_Compact,
+	MDOC_Std,
+	MDOC_Filled,
+	MDOC_Words,
+	MDOC_Emphasis,
+	MDOC_Symbolic,
+	MDOC_Nested,
+	MDOC_Centred,
+	MDOC_ARG_MAX
 };
 
+/* 
+ * Type of a syntax node. 
+ */
 enum	mdoc_type {
 	MDOC_TEXT,
 	MDOC_ELEM,
@@ -283,39 +193,24 @@ enum	mdoc_type {
 	MDOC_ROOT
 };
 
-enum	mdoc_msec {
-	MSEC_DEFAULT = 0,
-	MSEC_1,
-	MSEC_2,
-	MSEC_3,
-	MSEC_3f,
-	MSEC_3p,
-	MSEC_4,
-	MSEC_5,
-	MSEC_6,
-	MSEC_7,
-	MSEC_8,
-	MSEC_9,
-	MSEC_X11,
-	MSEC_X11R6,
-	MSEC_local,
-	MSEC_n,
-	MSEC_unass,
-	MSEC_draft,
-	MSEC_paper
-};
-
+/* 
+ * Section (named/unnamed) of `Sh'.   Note that these appear in the
+ * conventional order imposed by mdoc.7.
+ */
 enum	mdoc_sec {
-	SEC_PROLOGUE = 0,
-	SEC_BODY,
+	SEC_NONE = 0, /* No section, yet. */
 	SEC_NAME,
+	SEC_LIBRARY,
 	SEC_SYNOPSIS,
 	SEC_DESCRIPTION,
+	SEC_IMPLEMENTATION,
 	SEC_RETURN_VALUES,
-	SEC_ENVIRONMENT,
+	SEC_ENVIRONMENT, 
 	SEC_FILES,
+	SEC_EXIT_STATUS,
 	SEC_EXAMPLES,
 	SEC_DIAGNOSTICS,
+	SEC_COMPATIBILITY,
 	SEC_ERRORS,
 	SEC_SEE_ALSO,
 	SEC_STANDARDS,
@@ -323,106 +218,195 @@ enum	mdoc_sec {
 	SEC_AUTHORS,
 	SEC_CAVEATS,
 	SEC_BUGS,
-	SEC_CUSTOM
+	SEC_SECURITY,
+	SEC_CUSTOM, /* User-defined. */
+	SEC__MAX
 };
 
-enum	mdoc_vol {
-	VOL_DEFAULT = 0,
-	VOL_AMD,
-	VOL_IND,
-	VOL_KM,
-	VOL_LOCAL,
-	VOL_PRM,
-	VOL_PS1,
-	VOL_SMM,
-	VOL_URM,
-	VOL_USD
+/* 
+ * Information from prologue. 
+ */
+struct	mdoc_meta {
+	char		 *msec; /* `Dt' section (1, 3p, etc.) */
+	char		 *vol; /* `Dt' volume (implied) */
+	char		 *arch; /* `Dt' arch (i386, etc.) */
+	time_t		  date; /* `Dd' normalised date */
+	char		 *title; /* `Dt' title (FOO, etc.) */
+	char		 *os; /* `Os' system (OpenBSD, etc.) */
+	char		 *name; /* leading `Nm' name */
 };
 
-enum	mdoc_arch {
-	ARCH_DEFAULT = 0,
-	ARCH_alpha, 
-	ARCH_amd64, 
-	ARCH_amiga, 
-	ARCH_arc, 
-	ARCH_armish, 
-	ARCH_aviion, 
-	ARCH_hp300,
-	ARCH_hppa, 
-	ARCH_hppa64, 
-	ARCH_i386, 
-	ARCH_landisk, 
-	ARCH_luna88k, 
-	ARCH_mac68k, 
-	ARCH_macppc,
-	ARCH_mvme68k, 
-	ARCH_mvme88k, 
-	ARCH_mvmeppc, 
-	ARCH_pmax, 
-	ARCH_sgi, 
-	ARCH_socppc, 
-	ARCH_sparc,
-	ARCH_sparc64, 
-	ARCH_sun3, 
-	ARCH_vax, 
-	ARCH_zaurus
+/* 
+ * An argument to a macro (multiple values = `-column xxx yyy'). 
+ */
+struct	mdoc_argv {
+	enum mdocargt  	  arg; /* type of argument */
+	int		  line;
+	int		  pos;
+	size_t		  sz; /* elements in "value" */
+	char		**value; /* argument strings */
 };
 
-struct	mdoc_meta {
-	enum mdoc_msec	  msec;
-	enum mdoc_vol	  vol;
-	enum mdoc_arch	  arch;
-	time_t		  date;
-#define	META_TITLE_SZ	 (64)
-	char		  title[META_TITLE_SZ];
-#define	META_OS_SZ	 (64)
-	char		  os[META_OS_SZ];
+/*
+ * Reference-counted macro arguments.  These are refcounted because
+ * blocks have multiple instances of the same arguments spread across
+ * the HEAD, BODY, TAIL, and BLOCK node types.
+ */
+struct 	mdoc_arg {
+	size_t		  argc;
+	struct mdoc_argv *argv;
+	unsigned int	  refcnt;
 };
 
-struct	mdoc_text {
-	char		 *string;
+/*
+ * Indicates that a BODY's formatting has ended, but the scope is still
+ * open.  Used for syntax-broken blocks.
+ */
+enum	mdoc_endbody {
+	ENDBODY_NOT = 0,
+	ENDBODY_SPACE, /* is broken: append a space */
+	ENDBODY_NOSPACE /* is broken: don't append a space */
 };
 
-struct	mdoc_block {
-	size_t		  argc;
-	struct mdoc_arg	 *argv;
-	struct mdoc_node *head;
-	struct mdoc_node *body;
-	struct mdoc_node *tail;
+/*
+ * Normalised `Bl' list type.
+ */
+enum	mdoc_list {
+	LIST__NONE = 0,
+	LIST_bullet,
+	LIST_column,
+	LIST_dash,
+	LIST_diag,
+	LIST_enum,
+	LIST_hang,
+	LIST_hyphen,
+	LIST_inset,
+	LIST_item,
+	LIST_ohang,
+	LIST_tag
 };
 
-struct	mdoc_elem {
-	size_t		  sz;
-	char		**args;
-	size_t		  argc;
-	struct mdoc_arg	 *argv;
+/*
+ * Normalised `Bd' display type.
+ */
+enum	mdoc_disp {
+	DISP__NONE = 0,
+	DISP_centred,
+	DISP_ragged,
+	DISP_unfilled,
+	DISP_filled,
+	DISP_literal
+};
+
+/*
+ * Normalised `An' splitting argument. 
+ */
+enum	mdoc_auth {
+	AUTH__NONE = 0,
+	AUTH_split,
+	AUTH_nosplit
 };
 
-union	mdoc_data {
-	struct mdoc_text  text;
-	struct mdoc_elem  elem;
-	struct mdoc_block block;
+/*
+ * Normalised `Bf' font type.
+ */
+enum	mdoc_font {
+	FONT__NONE = 0,
+	FONT_Em,
+	FONT_Li,
+	FONT_Sy
 };
 
-struct	mdoc_node {
-	struct mdoc_node *parent;
-	struct mdoc_node *child;
-	struct mdoc_node *next;
-	struct mdoc_node *prev;
-	int		  line;
-	int		  pos;
-	int		  tok;
-	enum mdoc_type	  type;
-	union mdoc_data	  data;
+/*
+ * Normalised arguments for `Bd'.
+ */
+struct	mdoc_bd {
+	const char	 *offs; /* -offset */
+	enum mdoc_disp	  type; /* -ragged, etc. */
+	int		  comp; /* -compact */
 };
 
-struct	mdoc_cb {
-	int	(*mdoc_err)(void *, int, int, enum mdoc_err);
-	int	(*mdoc_warn)(void *, int, int, enum mdoc_warn);
-	void	(*mdoc_msg)(void *, int, int, const char *);
+/*
+ * Normalised arguments for `Bl'.
+ */
+struct	mdoc_bl {
+	const char	 *width; /* -width */
+	const char	 *offs; /* -offset */
+	enum mdoc_list	  type; /* -tag, -enum, etc. */
+	int		  comp; /* -compact */
+	size_t		  ncols; /* -column arg count */
+	const char	**cols; /* -column val ptr */
 };
 
+/*
+ * Normalised arguments for `Bf'.
+ */
+struct	mdoc_bf {
+	enum mdoc_font	  font; /* font */
+};
+
+/*
+ * Normalised arguments for `An'.
+ */
+struct	mdoc_an {
+	enum mdoc_auth	  auth; /* -split, etc. */
+};
+
+/*
+ * Consists of normalised node arguments.  These should be used instead
+ * of iterating through the mdoc_arg pointers of a node: defaults are
+ * provided, etc.
+ */
+union mdoc_data {
+	struct mdoc_an 	  An;
+	struct mdoc_bd	 *Bd;
+	struct mdoc_bf	 *Bf;
+	struct mdoc_bl	 *Bl;
+};
+
+/* 
+ * Single node in tree-linked AST. 
+ */
+struct	mdoc_node {
+	struct mdoc_node *parent; /* parent AST node */
+	struct mdoc_node *child; /* first child AST node */
+	struct mdoc_node *next; /* sibling AST node */
+	struct mdoc_node *prev; /* prior sibling AST node */
+	int		  nchild; /* number children */
+	int		  line; /* parse line */
+	int		  pos; /* parse column */
+	enum mdoct	  tok; /* tok or MDOC__MAX if none */
+	int		  flags;
+#define	MDOC_VALID	 (1 << 0) /* has been validated */
+#define	MDOC_ACTED	 (1 << 1) /* has been acted upon */
+#define	MDOC_EOS	 (1 << 2) /* at sentence boundary */
+#define	MDOC_LINE	 (1 << 3) /* first macro/text on line */
+#define	MDOC_SYNPRETTY	 (1 << 4) /* SYNOPSIS-style formatting */
+#define	MDOC_ENDED	 (1 << 5) /* rendering has been ended */
+	enum mdoc_type	  type; /* AST node type */
+	enum mdoc_sec	  sec; /* current named section */
+	/* FIXME: these can be union'd to shave a few bytes. */
+	struct mdoc_arg	 *args; /* BLOCK/ELEM */
+	struct mdoc_node *pending; /* BLOCK */
+	struct mdoc_node *head; /* BLOCK */
+	struct mdoc_node *body; /* BLOCK */
+	struct mdoc_node *tail; /* BLOCK */
+	char		 *string; /* TEXT */
+	enum mdoc_endbody end; /* BODY */
+	union mdoc_data	  data;
+};
+
+/*
+ * Names of macros.  Index is enum mdoct.  Indexing into this returns
+ * the normalised name, e.g., mdoc_macronames[MDOC_Sh] -> "Sh".
+ */
 extern	const char *const *mdoc_macronames;
+
+/*
+ * Names of macro args.  Index is enum mdocargt.  Indexing into this
+ * returns the normalised name, e.g., mdoc_argnames[MDOC_File] ->
+ * "file".
+ */
 extern	const char *const *mdoc_argnames;
 
 __BEGIN_DECLS
@@ -430,14 +414,13 @@ __BEGIN_DECLS
 struct	mdoc;
 
 void	 	  mdoc_free(struct mdoc *);
-struct	mdoc	 *mdoc_alloc(void *data, const struct mdoc_cb *);
-int	 	  mdoc_parseln(struct mdoc *, int, char *buf);
-const struct mdoc_node
-		 *mdoc_result(struct mdoc *);
+struct	mdoc	 *mdoc_alloc(struct regset *, void *, mandocmsg);
+void		  mdoc_reset(struct mdoc *);
+int	 	  mdoc_parseln(struct mdoc *, int, char *, int);
+const struct mdoc_node *mdoc_node(const struct mdoc *);
+const struct mdoc_meta *mdoc_meta(const struct mdoc *);
 int		  mdoc_endparse(struct mdoc *);
 
-char		 *mdoc_type2a(enum mdoc_type);
-
 __END_DECLS
 
 #endif /*!MDOC_H*/