]> git.cameronkatri.com Git - mandoc.git/blobdiff - roff.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
*** empty log message ***
[mandoc.git] / roff.c
diff --git a/roff.c b/roff.c
index 3e2b765675e29cfb4a47fd2fd4e6ba98b475a297..774f0a704d0eea054b4cac34c53be77236274c26 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.1 2008/11/24 14:24:55 kristaps Exp $ */
+/* $Id: roff.c,v 1.13 2008/11/27 17:27:50 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -27,7 +28,17 @@
 #include "libmdocml.h"
 #include "private.h"
 
 #include "libmdocml.h"
 #include "private.h"
 
-#define        ROFF_MAXARG       10
+/* FIXME: warn if Pp occurs before/after Sh etc. (see mdoc.samples). */
+
+/* FIXME: warn about "X section only" macros. */
+
+/* FIXME: warn about empty lists. */
+
+/* FIXME: ; : } ) (etc.) after text macros? */
+
+/* FIXME: NAME section needs specific elements. */
+
+#define        ROFF_MAXARG       32
 
 enum   roffd { 
        ROFF_ENTER = 0, 
 
 enum   roffd { 
        ROFF_ENTER = 0, 
@@ -35,107 +46,318 @@ enum      roffd {
 };
 
 enum   rofftype { 
 };
 
 enum   rofftype { 
-       ROFF_TITLE, 
        ROFF_COMMENT, 
        ROFF_TEXT, 
        ROFF_COMMENT, 
        ROFF_TEXT, 
-       ROFF_LAYOUT 
+       ROFF_LAYOUT,
+       ROFF_SPECIAL
 };
 
 #define        ROFFCALL_ARGS \
 };
 
 #define        ROFFCALL_ARGS \
-       struct rofftree *tree, const char *argv[], enum roffd type
+       int tok, struct rofftree *tree, \
+       const char *argv[], enum roffd type
 
 struct rofftree;
 
 struct rofftok {
 
 struct rofftree;
 
 struct rofftok {
-       char             *name;
-       int             (*cb)(ROFFCALL_ARGS);
-       enum rofftype     type;
+       int             (*cb)(ROFFCALL_ARGS);   /* Callback. */
+       const int        *args;                 /* Args (or NULL). */
+       const int        *parents;
+       const int        *children;
+       int               ctx;
+       enum rofftype     type;                 /* Type of macro. */
        int               flags;
        int               flags;
-#define        ROFF_NESTED      (1 << 0) 
-#define        ROFF_PARSED      (1 << 1)
-#define        ROFF_CALLABLE    (1 << 2)
-#define        ROFF_QUOTES      (1 << 3)
+#define        ROFF_PARSED      (1 << 0)               /* "Parsed". */
+#define        ROFF_CALLABLE    (1 << 1)               /* "Callable". */
+#define        ROFF_QUOTES      (1 << 2)               /* Quoted args. */
+#define        ROFF_SHALLOW     (1 << 3)               /* Nesting block. */
 };
 
 struct roffarg {
 };
 
 struct roffarg {
-       char             *name;
        int               flags;
        int               flags;
-#define        ROFF_VALUE       (1 << 0)
+#define        ROFF_VALUE       (1 << 0)               /* Has a value. */
 };
 
 struct roffnode {
 };
 
 struct roffnode {
-       int               tok;  
-       struct roffnode  *parent;
-       size_t            line;
+       int               tok;                  /* Token id. */
+       struct roffnode  *parent;               /* Parent (or NULL). */
+       size_t            line;                 /* Parsed at line. */
 };
 
 struct rofftree {
 };
 
 struct rofftree {
-       struct roffnode  *last;
-       time_t            date;
-       char              title[256];
-       char              section[256];
-       char              volume[256];
+       struct roffnode  *last;                 /* Last parsed node. */
+       time_t            date;                 /* `Dd' results. */
+       char             *cur;
+       char              os[64];               /* `Os' results. */
+       char              title[64];            /* `Dt' results. */
+       char              section[64];          /* `Dt' results. */
+       char              volume[64];           /* `Dt' results. */
        int               state;
        int               state;
-#define        ROFF_PRELUDE     (1 << 1)
-#define        ROFF_PRELUDE_Os  (1 << 2)
-#define        ROFF_PRELUDE_Dt  (1 << 3)
-#define        ROFF_PRELUDE_Dd  (1 << 4)
-#define        ROFF_BODY        (1 << 5)
-       struct md_mbuf  *mbuf; /* NULL if ROFF_EXIT and error. */
-
-       const struct md_args    *args;
-       const struct md_rbuf    *rbuf;
+#define        ROFF_PRELUDE     (1 << 1)               /* In roff prelude. */
+       /* FIXME: if we had prev ptrs, this wouldn't be necessary. */
+#define        ROFF_PRELUDE_Os  (1 << 2)               /* `Os' is parsed. */
+#define        ROFF_PRELUDE_Dt  (1 << 3)               /* `Dt' is parsed. */
+#define        ROFF_PRELUDE_Dd  (1 << 4)               /* `Dd' is parsed. */
+#define        ROFF_BODY        (1 << 5)               /* In roff body. */
+       struct md_mbuf          *mbuf;          /* Output (or NULL). */
+       const struct md_args    *args;          /* Global args. */
+       const struct md_rbuf    *rbuf;          /* Input. */
+       const struct roffcb     *cb;
 };
 
 };
 
-#define        ROFF___           0
-#define        ROFF_Dd           1
-#define        ROFF_Dt           2
-#define        ROFF_Os           3
-#define        ROFF_Sh           4
-#define        ROFF_An           5
-#define        ROFF_Li           6
-#define        ROFF_MAX          7
-
 static int               roff_Dd(ROFFCALL_ARGS);
 static int               roff_Dt(ROFFCALL_ARGS);
 static int               roff_Os(ROFFCALL_ARGS);
 static int               roff_Dd(ROFFCALL_ARGS);
 static int               roff_Dt(ROFFCALL_ARGS);
 static int               roff_Os(ROFFCALL_ARGS);
-static int               roff_Sh(ROFFCALL_ARGS);
-static int               roff_An(ROFFCALL_ARGS);
-static int               roff_Li(ROFFCALL_ARGS);
 
 
-static struct roffnode  *roffnode_new(int, size_t, 
-                               struct rofftree *);
+static int               roff_layout(ROFFCALL_ARGS);
+static int               roff_text(ROFFCALL_ARGS);
+static int               roff_comment(ROFFCALL_ARGS);
+static int               roff_close(ROFFCALL_ARGS);
+static int               roff_special(ROFFCALL_ARGS);
+
+static struct roffnode  *roffnode_new(int, struct rofftree *);
 static void              roffnode_free(int, struct rofftree *);
 
 static void              roffnode_free(int, struct rofftree *);
 
+static void              roff_warn(const struct rofftree *, 
+                               const char *, char *, ...);
+static void              roff_err(const struct rofftree *, 
+                               const char *, char *, ...);
+
+static int               roffscan(int, const int *);
 static int               rofffindtok(const char *);
 static int               rofffindarg(const char *);
 static int               rofffindtok(const char *);
 static int               rofffindarg(const char *);
-static int               roffargs(int, char *, char **);
+static int               rofffindcallable(const char *);
+static int               roffargs(const struct rofftree *,
+                               int, char *, char **);
+static int               roffargok(int, int);
+static int               roffnextopt(const struct rofftree *,
+                               int, const char ***, char **);
 static int               roffparse(struct rofftree *, char *, size_t);
 static int               textparse(const struct rofftree *,
                                const char *, size_t);
 
 static int               roffparse(struct rofftree *, char *, size_t);
 static int               textparse(const struct rofftree *,
                                const char *, size_t);
 
-static void              dbg_enter(const struct md_args *, int);
-static void              dbg_leave(const struct md_args *, int);
 
 
-
-static const struct rofftok tokens[ROFF_MAX] = {
-       { "\\\"",    NULL, ROFF_COMMENT, 0 },
-       {   "Dd", roff_Dd, ROFF_TITLE, 0 },
-       {   "Dt", roff_Dt, ROFF_TITLE, 0 },
-       {   "Os", roff_Os, ROFF_TITLE, 0 },
-       {   "Sh", roff_Sh, ROFF_LAYOUT, 0 },
-       {   "An", roff_An, ROFF_TEXT, ROFF_PARSED },
-       {   "Li", roff_Li, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE },
-};
-
-#define        ROFF_Split        0
-#define        ROFF_Nosplit      1
-#define        ROFF_ARGMAX       2
-
-static const struct roffarg tokenargs[ROFF_ARGMAX] = {
-       {  "split",     0 },
-       {  "nosplit",   0 },
-};
+static const int roffarg_An[] = { ROFF_Split, ROFF_Nosplit, 
+       ROFF_ARGMAX };
+static const int roffarg_Bd[] = { ROFF_Ragged, ROFF_Unfilled, 
+       ROFF_Literal, ROFF_File, ROFF_Offset, ROFF_Filled,
+       ROFF_Compact, ROFF_ARGMAX };
+static const int roffarg_Bk[] = { ROFF_Words, ROFF_ARGMAX };
+static const int roffarg_Ex[] = { ROFF_Std, ROFF_ARGMAX };
+static const int roffarg_Rv[] = { ROFF_Std, ROFF_ARGMAX };
+static         const int roffarg_Bl[] = { ROFF_Bullet, ROFF_Dash, 
+       ROFF_Hyphen, ROFF_Item, ROFF_Enum, ROFF_Tag, ROFF_Diag, 
+       ROFF_Hang, ROFF_Ohang, ROFF_Inset, ROFF_Column, ROFF_Offset, 
+       ROFF_Width, ROFF_Compact, ROFF_ARGMAX };
+static         const int roffarg_St[] = {
+       ROFF_p1003_1_88, ROFF_p1003_1_90, ROFF_p1003_1_96,
+       ROFF_p1003_1_2001, ROFF_p1003_1_2004, ROFF_p1003_1,
+       ROFF_p1003_1b, ROFF_p1003_1b_93, ROFF_p1003_1c_95,
+       ROFF_p1003_1g_2000, ROFF_p1003_2_92, ROFF_p1387_2_95,
+       ROFF_p1003_2, ROFF_p1387_2, ROFF_isoC_90, ROFF_isoC_amd1,
+       ROFF_isoC_tcor1, ROFF_isoC_tcor2, ROFF_isoC_99, ROFF_ansiC,
+       ROFF_ansiC_89, ROFF_ansiC_99, ROFF_ieee754, ROFF_iso8802_3,
+       ROFF_xpg3, ROFF_xpg4, ROFF_xpg4_2, ROFF_xpg4_3, ROFF_xbd5,
+       ROFF_xcu5, ROFF_xsh5, ROFF_xns5, ROFF_xns5_2d2_0,
+       ROFF_xcurses4_2, ROFF_susv2, ROFF_susv3, ROFF_svid4,
+       ROFF_ARGMAX };
+
+static const int roffchild_Bl[] = { ROFF_It, ROFF_El, ROFF_MAX };
+static const int roffchild_Fo[] = { ROFF_Fa, ROFF_Fc, ROFF_MAX };
+static const int roffchild_Oo[] = { ROFF_Op, ROFF_Oc, ROFF_MAX };
+static const int roffchild_Rs[] = { ROFF_Re, ROFF__A, ROFF__B,
+       ROFF__D, ROFF__I, ROFF__J, ROFF__N, ROFF__O, ROFF__P,
+       ROFF__R, ROFF__T, ROFF__V, ROFF_MAX };
+
+static const int roffparent_El[] = { ROFF_Bl, ROFF_It, ROFF_MAX };
+static const int roffparent_Fc[] = { ROFF_Fo, ROFF_Fa, ROFF_MAX };
+static const int roffparent_Oc[] = { ROFF_Oo, ROFF_Oc, ROFF_MAX };
+static const int roffparent_It[] = { ROFF_Bl, ROFF_It, ROFF_MAX };
+static const int roffparent_Re[] = { ROFF_Rs, ROFF_MAX };
+
+/* Table of all known tokens. */
+static const struct rofftok tokens[ROFF_MAX] = 
+       {
+       {roff_comment, NULL, NULL, NULL, 0, ROFF_COMMENT, 0 }, /* \" */
+       {     roff_Dd, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Dd */
+       {     roff_Dt, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Dt */
+       {     roff_Os, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_QUOTES }, /* Os */
+       { roff_layout, NULL, NULL, NULL, ROFF_Sh, ROFF_LAYOUT, ROFF_PARSED }, /* Sh */
+       { roff_layout, NULL, NULL, NULL, ROFF_Ss, ROFF_LAYOUT, ROFF_PARSED }, /* Ss */ 
+       {   roff_text, NULL, NULL, NULL, ROFF_Pp, ROFF_TEXT, 0 }, /* Pp */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* D1 */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Dl */
+       { roff_layout, roffarg_Bd, NULL, NULL, 0, ROFF_LAYOUT, 0 },     /* Bd */
+       {  roff_close, NULL, NULL, NULL, ROFF_Bd, ROFF_LAYOUT, 0 }, /* Ed */
+       { roff_layout, roffarg_Bl, NULL, roffchild_Bl, 0, ROFF_LAYOUT, 0 }, /* Bl */
+       {  roff_close, NULL, roffparent_El, NULL, ROFF_Bl, ROFF_LAYOUT, 0 }, /* El */
+       { roff_layout, NULL, roffparent_It, NULL, ROFF_It, ROFF_LAYOUT, ROFF_SHALLOW }, /* It */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ad */
+       {   roff_text, roffarg_An, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* An */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ar */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_QUOTES }, /* Cd */ /* XXX man.4 only */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Cm */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Dv */ /* XXX needs arg */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Er */ /* XXX needs arg */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ev */ /* XXX needs arg */
+       {   roff_text, roffarg_Ex, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ex */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Fa */ /* XXX needs arg */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Fd */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Fl */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Fn */ /* XXX needs arg */ /* FIXME */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ft */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ic */ /* XXX needs arg */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* In */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Li */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_QUOTES }, /* Nd */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Nm */ /* FIXME */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Op */
+       {   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Ot */ /* XXX deprecated */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pa */
+       {   roff_text, roffarg_Rv, NULL, NULL, 0, ROFF_TEXT, 0 }, /* Rv */
+       {   roff_text, roffarg_St, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* St */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Va */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Vt */ /* XXX needs arg */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xr */ /* XXX needs arg */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* %A */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE}, /* %B */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %D */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE}, /* %I */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE}, /* %J */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %N */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %O */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %P */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %R */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* %T */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* %V */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ac */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ao */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Aq */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, 0 }, /* At */ /* XXX at most 2 args */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bc */
+       {   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },  /* Bf */ /* FIXME */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bo */
+       {   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Bq */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Bsx */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Bx */
+       {roff_special, NULL, NULL, NULL, 0, ROFF_SPECIAL, 0 },  /* Db */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Dc */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Do */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Dq */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ec */
+       {   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, 0 },  /* Ef */ /* FIXME */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Em */ /* XXX needs arg */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Eo */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Fx */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ms */
+       {   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* No */
+       {   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ns */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Nx */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ox */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pc */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Pf */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_LAYOUT, ROFF_PARSED | ROFF_CALLABLE }, /* Po */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Pq */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qc */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Ql */
+       { roff_layout, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qo */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Qq */
+       {  roff_close, NULL, roffparent_Re, NULL, ROFF_Rs, ROFF_LAYOUT, 0 }, /* Re */
+       { roff_layout, NULL, NULL, roffchild_Rs, 0, ROFF_LAYOUT, 0 },   /* Rs */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sc */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* So */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sq */
+       {roff_special, NULL, NULL, NULL, 0, ROFF_SPECIAL, 0 }, /* Sm */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sx */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sy */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Tn */
+       {   roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ux */
+       {   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xc */
+       {   NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xo */
+       { roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Fo */
+       {  roff_close, NULL, roffparent_Fc, NULL, ROFF_Fo, ROFF_LAYOUT, 0 }, /* Fc */
+       { roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Oo */
+       {  roff_close, NULL, roffparent_Oc, NULL, ROFF_Oo, ROFF_LAYOUT, 0 }, /* Oc */
+       { roff_layout, roffarg_Bk, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Bk */
+       {  roff_close, NULL, NULL, NULL, ROFF_Bk, ROFF_LAYOUT, 0 }, /* Ek */
+       };
+
+/* Table of all known token arguments. */
+static const int tokenargs[ROFF_ARGMAX] = 
+       {
+       0,              0,              0,              0,
+       0,              ROFF_VALUE,     ROFF_VALUE,     0,
+       0,              0,              0,              0,
+       0,              0,              0,              0,
+       0,              0,              0,              0,
+       0,              0,              0,              0,
+       0,              0,              0,              0,
+       0,              0,              0,              0,
+       0,              0,              0,              0,
+       0,              0,              0,              0,
+       0,              0,              0,              0,
+       0,              0,              0,              0,
+       0,              0,              0,              0,
+       0,              0,              0,              0,
+       0,              0,              0,              0,
+       };
+
+const  char *const toknamesp[ROFF_MAX] = 
+       {                
+       "\\\"",         "Dd",           "Dt",           "Os",
+       "Sh",           "Ss",           "Pp",           "D1",
+       "Dl",           "Bd",           "Ed",           "Bl",
+       "El",           "It",           "Ad",           "An",
+       "Ar",           "Cd",           "Cm",           "Dv",
+       "Er",           "Ev",           "Ex",           "Fa",
+       "Fd",           "Fl",           "Fn",           "Ft",
+       "Ic",           "In",           "Li",           "Nd",
+       "Nm",           "Op",           "Ot",           "Pa",
+       "Rv",           "St",           "Va",           "Vt",
+       "Xr",           "\%A",          "\%B",          "\%D",
+       "\%I",          "\%J",          "\%N",          "\%O",
+       "\%P",          "\%R",          "\%T",          "\%V",
+       "Ac",           "Ao",           "Aq",           "At",
+       "Bc",           "Bf",           "Bo",           "Bq",
+       "Bsx",          "Bx",           "Db",           "Dc",
+       "Do",           "Dq",           "Ec",           "Ef",
+       "Em",           "Eo",           "Fx",           "Ms",
+       "No",           "Ns",           "Nx",           "Ox",
+       "Pc",           "Pf",           "Po",           "Pq",
+       "Qc",           "Ql",           "Qo",           "Qq",
+       "Re",           "Rs",           "Sc",           "So",
+       "Sq",           "Sm",           "Sx",           "Sy",
+       "Tn",           "Ux",           "Xc",           "Xo",
+       "Fo",           "Fc",           "Oo",           "Oc",
+       "Bk",           "Ek",
+       };
+
+const  char *const tokargnamesp[ROFF_ARGMAX] = 
+       {                
+       "split",                "nosplit",              "ragged",
+       "unfilled",             "literal",              "file",          
+       "offset",               "bullet",               "dash",          
+       "hyphen",               "item",                 "enum",          
+       "tag",                  "diag",                 "hang",          
+       "ohang",                "inset",                "column",        
+       "width",                "compact",              "std",   
+       "p1003.1-88",           "p1003.1-90",           "p1003.1-96",
+       "p1003.1-2001",         "p1003.1-2004",         "p1003.1",
+       "p1003.1b",             "p1003.1b-93",          "p1003.1c-95",
+       "p1003.1g-2000",        "p1003.2-92",           "p1387.2-95",
+       "p1003.2",              "p1387.2",              "isoC-90",
+       "isoC-amd1",            "isoC-tcor1",           "isoC-tcor2",
+       "isoC-99",              "ansiC",                "ansiC-89",
+       "ansiC-99",             "ieee754",              "iso8802-3",
+       "xpg3",                 "xpg4",                 "xpg4.2",
+       "xpg4.3",               "xbd5",                 "xcu5",
+       "xsh5",                 "xns5",                 "xns5.2d2.0",
+       "xcurses4.2",           "susv2",                "susv3",
+       "svid4",                "filled",               "words",
+       };
+
+
+const  char *const *toknames = toknamesp;
+const  char *const *tokargnames = tokargnamesp;
 
 
 int
 
 
 int
@@ -150,15 +372,14 @@ roff_free(struct rofftree *tree, int flush)
        /* LINTED */
        while (tree->last)
                if ( ! (*tokens[tree->last->tok].cb)
        /* LINTED */
        while (tree->last)
                if ( ! (*tokens[tree->last->tok].cb)
-                               (tree, NULL, ROFF_EXIT))
+                               (tree->last->tok, tree, NULL, ROFF_EXIT))
                        /* Disallow flushing. */
                        tree->mbuf = NULL;
 
        error = tree->mbuf ? 0 : 1;
 
        if (tree->mbuf && (ROFF_PRELUDE & tree->state)) {
                        /* Disallow flushing. */
                        tree->mbuf = NULL;
 
        error = tree->mbuf ? 0 : 1;
 
        if (tree->mbuf && (ROFF_PRELUDE & tree->state)) {
-               warnx("%s: prelude never finished", 
-                               tree->rbuf->name);
+               /*roff_warn(tree, "prelude never finished");*/
                error = 1;
        }
 
                error = 1;
        }
 
@@ -169,19 +390,18 @@ roff_free(struct rofftree *tree, int flush)
 
 struct rofftree *
 roff_alloc(const struct md_args *args, struct md_mbuf *out, 
 
 struct rofftree *
 roff_alloc(const struct md_args *args, struct md_mbuf *out, 
-               const struct md_rbuf *in)
+               const struct md_rbuf *in, const struct roffcb *cb)
 {
        struct rofftree *tree;
 
 {
        struct rofftree *tree;
 
-       if (NULL == (tree = calloc(1, sizeof(struct rofftree)))) {
-               warn("malloc");
-               return(NULL);
-       }
+       if (NULL == (tree = calloc(1, sizeof(struct rofftree))))
+               err(1, "calloc");
 
        tree->state = ROFF_PRELUDE;
        tree->args = args;
        tree->mbuf = out;
        tree->rbuf = in;
 
        tree->state = ROFF_PRELUDE;
        tree->args = args;
        tree->mbuf = out;
        tree->rbuf = in;
+       tree->cb = cb;
 
        return(tree);
 }
 
        return(tree);
 }
@@ -191,10 +411,10 @@ int
 roff_engine(struct rofftree *tree, char *buf, size_t sz)
 {
 
 roff_engine(struct rofftree *tree, char *buf, size_t sz)
 {
 
+       tree->cur = buf;
+
        if (0 == sz) {
        if (0 == sz) {
-               warnx("%s: blank line (line %zu)", 
-                               tree->rbuf->name, 
-                               tree->rbuf->line);
+               roff_warn(tree, buf, "blank line");
                return(0);
        } else if ('.' != *buf)
                return(textparse(tree, buf, sz));
                return(0);
        } else if ('.' != *buf)
                return(textparse(tree, buf, sz));
@@ -207,41 +427,42 @@ static int
 textparse(const struct rofftree *tree, const char *buf, size_t sz)
 {
        
 textparse(const struct rofftree *tree, const char *buf, size_t sz)
 {
        
-       if (NULL == tree->last) {
-               warnx("%s: unexpected text (line %zu)",
-                               tree->rbuf->name, 
-                               tree->rbuf->line);
-               return(0);
-       } else if (NULL == tree->last->parent) {
-               warnx("%s: disallowed text (line %zu)",
-                               tree->rbuf->name, 
-                               tree->rbuf->line);
-               return(0);
-       }
-
        /* Print text. */
        /* Print text. */
-
        return(1);
 }
 
 
 static int
        return(1);
 }
 
 
 static int
-roffargs(int tok, char *buf, char **argv)
+roffargs(const struct rofftree *tree, 
+               int tok, char *buf, char **argv)
 {
        int              i;
 {
        int              i;
-
-       (void)tok;/* FIXME: quotable strings? */
+       char            *p;
 
        assert(tok >= 0 && tok < ROFF_MAX);
        assert('.' == *buf);
 
 
        assert(tok >= 0 && tok < ROFF_MAX);
        assert('.' == *buf);
 
+       p = buf;
+
        /* LINTED */
        for (i = 0; *buf && i < ROFF_MAXARG; i++) {
        /* LINTED */
        for (i = 0; *buf && i < ROFF_MAXARG; i++) {
-               argv[i] = buf++;
-               while (*buf && ! isspace(*buf))
-                       buf++;
-               if (0 == *buf) {
-                       continue;
+               if ('\"' == *buf) {
+                       argv[i] = ++buf;
+                       while (*buf && '\"' != *buf)
+                               buf++;
+                       if (0 == *buf) {
+                               roff_err(tree, argv[i], "unclosed "
+                                               "quote in argument "
+                                               "list for `%s'", 
+                                               toknames[tok]);
+                               return(0);
+                       }
+               } else { 
+                       argv[i] = buf++;
+                       while (*buf && ! isspace(*buf))
+                               buf++;
+                       if (0 == *buf)
+                               continue;
                }
                *buf++ = 0;
                while (*buf && isspace(*buf))
                }
                *buf++ = 0;
                while (*buf && isspace(*buf))
@@ -249,10 +470,30 @@ roffargs(int tok, char *buf, char **argv)
        }
        
        assert(i > 0);
        }
        
        assert(i > 0);
-       if (i < ROFF_MAXARG)
-               argv[i] = NULL;
+       if (ROFF_MAXARG == i && *buf) {
+               roff_err(tree, p, "too many arguments for `%s'", toknames
+                               [tok]);
+               return(0);
+       }
+
+       argv[i] = NULL;
+       return(1);
+}
+
+
+/* XXX */
+static int
+roffscan(int tok, const int *tokv)
+{
+
+       if (NULL == tokv)
+               return(1);
+
+       for ( ; ROFF_MAX != *tokv; tokv++) 
+               if (tok == *tokv)
+                       return(1);
 
 
-       return(ROFF_MAXARG > i);
+       return(0);
 }
 
 
 }
 
 
@@ -260,125 +501,145 @@ static int
 roffparse(struct rofftree *tree, char *buf, size_t sz)
 {
        int               tok, t;
 roffparse(struct rofftree *tree, char *buf, size_t sz)
 {
        int               tok, t;
-       struct roffnode  *node;
+       struct roffnode  *n;
        char             *argv[ROFF_MAXARG];
        const char      **argvp;
 
        assert(sz > 0);
 
        char             *argv[ROFF_MAXARG];
        const char      **argvp;
 
        assert(sz > 0);
 
-       /*
-        * Extract the token identifier from the buffer.  If there's no
-        * callback for the token (comment, etc.) then exit immediately.
-        * We don't do any error handling (yet), so if the token doesn't
-        * exist, die.
-        */
-
-       if (3 > sz) {
-               warnx("%s: malformed line (line %zu)", 
-                               tree->rbuf->name, 
-                               tree->rbuf->line);
+       if (ROFF_MAX == (tok = rofffindtok(buf + 1))) {
+               roff_err(tree, buf + 1, "bogus line macro");
                return(0);
                return(0);
-       } else if (ROFF_MAX == (tok = rofffindtok(buf + 1))) {
-               warnx("%s: unknown line token `%c%c' (line %zu)",
-                               tree->rbuf->name, 
-                               *(buf + 1), *(buf + 2), 
-                               tree->rbuf->line);
+       } else if (NULL == tokens[tok].cb) {
+               roff_err(tree, buf + 1, "unsupported macro `%s'", 
+                               toknames[tok]);
                return(0);
                return(0);
-       } else if (ROFF_COMMENT == tokens[tok].type) 
-               /* Ignore comment tokens. */
+       } else if (ROFF_COMMENT == tokens[tok].type)
                return(1);
        
                return(1);
        
-       if ( ! roffargs(tok, buf, argv)) {
-               warnx("%s: too many arguments to `%s' (line %zu)",
-                               tree->rbuf->name, tokens[tok].name, 
-                               tree->rbuf->line);
+       if ( ! roffargs(tree, tok, buf, argv)) 
                return(0);
                return(0);
-       }
 
 
-       /* Domain cross-contamination (and sanity) checks. */
+       argvp = (const char **)argv;
 
 
-       switch (tokens[tok].type) {
-       case (ROFF_TITLE):
-               if (ROFF_PRELUDE & tree->state) {
-                       assert( ! (ROFF_BODY & tree->state));
-                       break;
-               }
-               assert(ROFF_BODY & tree->state);
-               warnx("%s: prelude token `%s' in body (line %zu)",
-                               tree->rbuf->name, tokens[tok].name, 
-                               tree->rbuf->line);
+       /* 
+        * Prelude macros break some assumptions, so branch now. 
+        */
+       
+       if (ROFF_PRELUDE & tree->state) {
+               assert(NULL == tree->last);
+               return((*tokens[tok].cb)(tok, tree, argvp, ROFF_ENTER));
+       } else 
+               assert(tree->last);
+
+       assert(ROFF_BODY & tree->state);
+
+       /* 
+        * First check that our possible parents and parent's possible
+        * children are satisfied.  
+        */
+
+       if ( ! roffscan(tree->last->tok, tokens[tok].parents)) {
+               warnx("%s: invalid parent `%s' for `%s' (line %zu)",
+                               tree->rbuf->name, 
+                               toknames[tree->last->tok],
+                               toknames[tok], tree->rbuf->line);
                return(0);
                return(0);
-       case (ROFF_LAYOUT):
-               /* FALLTHROUGH */
-       case (ROFF_TEXT):
-               if (ROFF_BODY & tree->state) {
-                       assert( ! (ROFF_PRELUDE & tree->state));
-                       break;
-               }
-               assert(ROFF_PRELUDE & tree->state);
-               warnx("%s: body token `%s' in prelude (line %zu)",
-                               tree->rbuf->name, tokens[tok].name, 
+       } 
+
+       if ( ! roffscan(tok, tokens[tree->last->tok].children)) {
+               warnx("%s: invalid child `%s' for `%s' (line %zu)",
+                               tree->rbuf->name, toknames[tok], 
+                               toknames[tree->last->tok],
                                tree->rbuf->line);
                return(0);
                                tree->rbuf->line);
                return(0);
-       case (ROFF_COMMENT):
-               return(1);
-       default:
-               abort();
        }
 
        /*
        }
 
        /*
-        * If this is a non-nestable layout token and we're below a
-        * token of the same type, then recurse upward to the token,
-        * closing out the interim scopes.
-        *
-        * If there's a nested token on the chain, then raise an error
-        * as nested tokens have corresponding "ending" tokens and we're
-        * breaking their scope.
+        * Branch if we're not a layout token.
         */
 
         */
 
-       node = NULL;
+       if (ROFF_LAYOUT != tokens[tok].type)
+               return((*tokens[tok].cb)(tok, tree, argvp, ROFF_ENTER));
 
 
-       if (ROFF_LAYOUT == tokens[tok].type && 
-                       ! (ROFF_NESTED & tokens[tok].flags)) {
-               for (node = tree->last; node; node = node->parent) {
-                       if (node->tok == tok)
-                               break;
+       /* 
+        * Check our scope rules. 
+        */
 
 
-                       /* Don't break nested scope. */
+       if (0 == tokens[tok].ctx)
+               return((*tokens[tok].cb)(tok, tree, argvp, ROFF_ENTER));
 
 
-                       if ( ! (ROFF_NESTED & tokens[node->tok].flags))
-                               continue;
-                       warnx("%s: scope of %s (line %zu) broken by "
-                                       "%s (line %zu)", 
-                                       tree->rbuf->name, 
-                                       tokens[tok].name,
-                                       node->line, 
-                                       tokens[node->tok].name,
-                                       tree->rbuf->line);
-                       return(0);
+       /*
+        * First consider implicit-end tags, like as follows:
+        *      .Sh SECTION 1
+        *      .Sh SECTION 2
+        * In this, we want to close the scope of the NAME section.  If
+        * there's an intermediary implicit-end tag, such as
+        *      .Sh SECTION 1
+        *      .Ss Subsection 1
+        *      .Sh SECTION 2
+        * then it must be closed as well.
+        */
+
+       if (tok == tokens[tok].ctx) {
+               /* 
+                * First search up to the point where we must close.
+                * If one doesn't exist, then we can open a new scope.
+                */
+
+               for (n = tree->last; n; n = n->parent) {
+                       assert(0 == tokens[n->tok].ctx ||
+                                       n->tok == tokens[n->tok].ctx);
+                       if (n->tok == tok)
+                               break;
+                       if (ROFF_SHALLOW & tokens[tok].flags) {
+                               n = NULL;
+                               break;
+                       }
                }
                }
-       }
 
 
-       if (node) {
-               assert(ROFF_LAYOUT == tokens[tok].type);
-               assert( ! (ROFF_NESTED & tokens[tok].flags));
-               assert(node->tok == tok);
+               /*
+                * Create a new scope, as no previous one exists to
+                * close out.
+                */
 
 
-               /* Clear up to last scoped token. */
+               if (NULL == n)
+                       return((*tokens[tok].cb)(tok, tree, argvp, ROFF_ENTER));
+
+               /* 
+                * Close out all intermediary scoped blocks, then hang
+                * the current scope from our predecessor's parent.
+                */
 
 
-               /* LINTED */
                do {
                        t = tree->last->tok;
                do {
                        t = tree->last->tok;
-                       if ( ! (*tokens[tree->last->tok].cb)
-                                       (tree, NULL, ROFF_EXIT))
+                       if ( ! (*tokens[t].cb)(t, tree, NULL, ROFF_EXIT))
                                return(0);
                } while (t != tok);
                                return(0);
                } while (t != tok);
+
+               return((*tokens[tok].cb)(tok, tree, argvp, ROFF_ENTER));
        }
 
        }
 
-       /* Proceed with actual token processing. */
+       /*
+        * Now consider explicit-end tags, where we want to close back
+        * to a specific tag.  Example:
+        *      .Bl
+        *      .It Item.
+        *      .El
+        * In this, the `El' tag closes out the scope of `Bl'.
+        */
+
+       assert(tree->last);
+       assert(tok != tokens[tok].ctx && 0 != tokens[tok].ctx);
+
+       do {
+               t = tree->last->tok;
+               if ( ! (*tokens[t].cb)(t, tree, NULL, ROFF_EXIT))
+                       return(0);
+       } while (t != tokens[tok].ctx);
 
 
-       argvp = (const char **)&argv[1];
-       return((*tokens[tok].cb)(tree, argvp, ROFF_ENTER));
+       assert(tree->last);
+       return(1);
 }
 
 
 }
 
 
@@ -392,7 +653,7 @@ rofffindarg(const char *name)
        /* LINTED */
        for (i = 0; i < ROFF_ARGMAX; i++)
                /* LINTED */
        /* LINTED */
        for (i = 0; i < ROFF_ARGMAX; i++)
                /* LINTED */
-               if (0 == strcmp(name, tokenargs[i].name))
+               if (0 == strcmp(name, tokargnames[i]))
                        return((int)i);
        
        return(ROFF_ARGMAX);
                        return((int)i);
        
        return(ROFF_ARGMAX);
@@ -400,41 +661,76 @@ rofffindarg(const char *name)
 
 
 static int
 
 
 static int
-rofffindtok(const char *name)
+rofffindtok(const char *buf)
 {
 {
+       char             token[4];
        size_t           i;
 
        size_t           i;
 
+       for (i = 0; *buf && ! isspace(*buf) && i < 3; i++, buf++)
+               token[i] = *buf;
+
+       if (i == 3) 
+               return(ROFF_MAX);
+
+       token[i] = 0;
+
        /* FIXME: use a table, this is slow but ok for now. */
 
        /* LINTED */
        for (i = 0; i < ROFF_MAX; i++)
                /* LINTED */
        /* FIXME: use a table, this is slow but ok for now. */
 
        /* LINTED */
        for (i = 0; i < ROFF_MAX; i++)
                /* LINTED */
-               if (0 == strncmp(name, tokens[i].name, 2))
+               if (0 == strcmp(toknames[i], token))
                        return((int)i);
                        return((int)i);
-       
+
        return(ROFF_MAX);
 }
 
 
        return(ROFF_MAX);
 }
 
 
-/* FIXME: accept only struct rofftree *. */
+static int
+rofffindcallable(const char *name)
+{
+       int              c;
+
+       if (ROFF_MAX == (c = rofffindtok(name)))
+               return(ROFF_MAX);
+       assert(c >= 0 && c < ROFF_MAX);
+       return(ROFF_CALLABLE & tokens[c].flags ? c : ROFF_MAX);
+}
+
+
 static struct roffnode *
 static struct roffnode *
-roffnode_new(int tokid, size_t line, struct rofftree *tree)
+roffnode_new(int tokid, struct rofftree *tree)
 {
        struct roffnode *p;
        
 {
        struct roffnode *p;
        
-       if (NULL == (p = malloc(sizeof(struct roffnode)))) {
-               warn("malloc");
-               return(NULL);
-       }
+       if (NULL == (p = malloc(sizeof(struct roffnode))))
+               err(1, "malloc");
 
 
-       p->line = line;
+       p->line = tree->rbuf->line;
        p->tok = tokid;
        p->parent = tree->last;
        tree->last = p;
        p->tok = tokid;
        p->parent = tree->last;
        tree->last = p;
+
        return(p);
 }
 
 
        return(p);
 }
 
 
+static int
+roffargok(int tokid, int argid)
+{
+       const int       *c;
+
+       if (NULL == (c = tokens[tokid].args))
+               return(0);
+
+       for ( ; ROFF_ARGMAX != *c; c++) 
+               if (argid == *c)
+                       return(1);
+
+       return(0);
+}
+
+
 static void
 roffnode_free(int tokid, struct rofftree *tree)
 {
 static void
 roffnode_free(int tokid, struct rofftree *tree)
 {
@@ -449,83 +745,76 @@ roffnode_free(int tokid, struct rofftree *tree)
 }
 
 
 }
 
 
-static int dbg_lvl = 0;
-
-
-static void
-dbg_enter(const struct md_args *args, int tokid)
+static int
+roffnextopt(const struct rofftree *tree, int tok, 
+               const char ***in, char **val)
 {
 {
-       int              i;
-       static char      buf[72];
-
-       assert(args);
-       if ( ! (args->dbg & MD_DBG_TREE))
-               return;
-       assert(tokid >= 0 && tokid <= ROFF_MAX);
-
-       buf[0] = buf[71] = 0;
-
-       switch (tokens[tokid].type) {
-       case (ROFF_LAYOUT):
-               (void)strncat(buf, "[body-layout] ", sizeof(buf) - 1);
-               break;
-       case (ROFF_TEXT):
-               (void)strncat(buf, "[  body-text] ", sizeof(buf) - 1);
-               break;
-       case (ROFF_TITLE):
-               (void)strncat(buf, "[    prelude] ", sizeof(buf) - 1);
-               break;
-       default:
-               abort();
-       }
-
-       /* LINTED */
-       for (i = 0; i < dbg_lvl; i++)
-               (void)strncat(buf, "  ", sizeof(buf) - 1);
+       const char      *arg, **argv;
+       int              v;
 
 
-       (void)strncat(buf, tokens[tokid].name, sizeof(buf) - 1);
+       *val = NULL;
+       argv = *in;
+       assert(argv);
 
 
-       (void)printf("%s\n", buf);
+       if (NULL == (arg = *argv))
+               return(-1);
+       if ('-' != *arg)
+               return(-1);
 
 
-       dbg_lvl++;
-}
+       if (ROFF_ARGMAX == (v = rofffindarg(arg + 1))) {
+               roff_warn(tree, arg, "argument-like parameter `%s' to "
+                               "`%s'", &arg[1], toknames[tok]);
+               return(-1);
+       } 
+       
+       if ( ! roffargok(tok, v)) {
+               roff_warn(tree, arg, "invalid argument parameter `%s' to "
+                               "`%s'", tokargnames[v], toknames[tok]);
+               return(-1);
+       } 
+       
+       if ( ! (ROFF_VALUE & tokenargs[v]))
+               return(v);
 
 
+       *in = ++argv;
 
 
-/* FIXME: accept only struct rofftree *. */
-static void
-dbg_leave(const struct md_args *args, int tokid)
-{
-       assert(args);
-       if ( ! (args->dbg & MD_DBG_TREE))
-               return;
+       if (NULL == *argv) {
+               roff_err(tree, arg, "empty value of `%s' for `%s'",
+                               tokargnames[v], toknames[tok]);
+               return(ROFF_ARGMAX);
+       }
 
 
-       assert(tokid >= 0 && tokid <= ROFF_MAX);
-       assert(dbg_lvl > 0);
-       dbg_lvl--;
+       return(v);
 }
 
 
 }
 
 
-/* FIXME: accept only struct rofftree *. */
 /* ARGSUSED */
 static int
 roff_Dd(ROFFCALL_ARGS)
 {
 
 /* ARGSUSED */
 static int
 roff_Dd(ROFFCALL_ARGS)
 {
 
-       dbg_enter(tree->args, ROFF_Dd);
+       if (ROFF_BODY & tree->state) {
+               assert( ! (ROFF_PRELUDE & tree->state));
+               assert(ROFF_PRELUDE_Dd & tree->state);
+               return(roff_text(tok, tree, argv, type));
+       }
 
        assert(ROFF_PRELUDE & tree->state);
 
        assert(ROFF_PRELUDE & tree->state);
-       if (ROFF_PRELUDE_Dt & tree->state ||
-                       ROFF_PRELUDE_Dd & tree->state) {
-               warnx("%s: prelude `Dd' out-of-order (line %zu)",
-                               tree->rbuf->name, tree->rbuf->line);
+       assert( ! (ROFF_BODY & tree->state));
+
+       if (ROFF_PRELUDE_Dd & tree->state) {
+               roff_err(tree, *argv, "repeated `Dd' in prelude");
+               return(0);
+       } else if (ROFF_PRELUDE_Dt & tree->state) {
+               roff_err(tree, *argv, "out-of-order `Dd' in prelude");
                return(0);
        }
 
                return(0);
        }
 
+       /* TODO: parse date. */
+
        assert(NULL == tree->last);
        tree->state |= ROFF_PRELUDE_Dd;
 
        assert(NULL == tree->last);
        tree->state |= ROFF_PRELUDE_Dd;
 
-       dbg_leave(tree->args, ROFF_Dd);
-
        return(1);
 }
 
        return(1);
 }
 
@@ -535,21 +824,28 @@ static    int
 roff_Dt(ROFFCALL_ARGS)
 {
 
 roff_Dt(ROFFCALL_ARGS)
 {
 
-       dbg_enter(tree->args, ROFF_Dt);
+       if (ROFF_BODY & tree->state) {
+               assert( ! (ROFF_PRELUDE & tree->state));
+               assert(ROFF_PRELUDE_Dt & tree->state);
+               return(roff_text(tok, tree, argv, type));
+       }
 
        assert(ROFF_PRELUDE & tree->state);
 
        assert(ROFF_PRELUDE & tree->state);
-       if ( ! (ROFF_PRELUDE_Dd & tree->state) ||
-                       (ROFF_PRELUDE_Dt & tree->state)) {
-               warnx("%s: prelude `Dt' out-of-order (line %zu)",
-                               tree->rbuf->name, tree->rbuf->line);
+       assert( ! (ROFF_BODY & tree->state));
+
+       if ( ! (ROFF_PRELUDE_Dd & tree->state)) {
+               roff_err(tree, *argv, "out-of-order `Dt' in prelude");
+               return(0);
+       } else if (ROFF_PRELUDE_Dt & tree->state) {
+               roff_err(tree, *argv, "repeated `Dt' in prelude");
                return(0);
        }
 
                return(0);
        }
 
+       /* TODO: parse date. */
+
        assert(NULL == tree->last);
        tree->state |= ROFF_PRELUDE_Dt;
 
        assert(NULL == tree->last);
        tree->state |= ROFF_PRELUDE_Dt;
 
-       dbg_leave(tree->args, ROFF_Dt);
-
        return(1);
 }
 
        return(1);
 }
 
@@ -560,142 +856,220 @@ roff_Os(ROFFCALL_ARGS)
 {
 
        if (ROFF_EXIT == type) {
 {
 
        if (ROFF_EXIT == type) {
-               roffnode_free(ROFF_Os, tree);
-               dbg_leave(tree->args, ROFF_Os);
-               return(1);
-       } 
-
-       dbg_enter(tree->args, ROFF_Os);
+               assert(ROFF_PRELUDE_Os & tree->state);
+               return(roff_layout(tok, tree, argv, type));
+       } else if (ROFF_BODY & tree->state) {
+               assert( ! (ROFF_PRELUDE & tree->state));
+               assert(ROFF_PRELUDE_Os & tree->state);
+               return(roff_text(tok, tree, argv, type));
+       }
 
        assert(ROFF_PRELUDE & tree->state);
        if ( ! (ROFF_PRELUDE_Dt & tree->state) ||
                        ! (ROFF_PRELUDE_Dd & tree->state)) {
 
        assert(ROFF_PRELUDE & tree->state);
        if ( ! (ROFF_PRELUDE_Dt & tree->state) ||
                        ! (ROFF_PRELUDE_Dd & tree->state)) {
-               warnx("%s: prelude `Os' out-of-order (line %zu)",
-                               tree->rbuf->name, tree->rbuf->line);
+               roff_err(tree, *argv, "out-of-order `Os' in prelude");
                return(0);
        }
 
                return(0);
        }
 
-       assert(NULL == tree->last);
-       if (NULL == roffnode_new(ROFF_Os, tree->rbuf->line, tree))
-               return(0);
+       /* TODO: extract OS. */
 
        tree->state |= ROFF_PRELUDE_Os;
        tree->state &= ~ROFF_PRELUDE;
        tree->state |= ROFF_BODY;
 
 
        tree->state |= ROFF_PRELUDE_Os;
        tree->state &= ~ROFF_PRELUDE;
        tree->state |= ROFF_BODY;
 
-       return(1);
+       assert(NULL == tree->last);
+
+       return(roff_layout(tok, tree, argv, type));
 }
 
 
 /* ARGSUSED */
 static int
 }
 
 
 /* ARGSUSED */
 static int
-roff_Sh(ROFFCALL_ARGS)
+roff_layout(ROFFCALL_ARGS) 
 {
 {
+       int              i, c, argcp[ROFF_MAXARG];
+       char            *v, *argvp[ROFF_MAXARG];
+
+       if (ROFF_PRELUDE & tree->state) {
+               roff_err(tree, *argv, "`%s' disallowed in prelude", 
+                               toknames[tok]);
+               return(0);
+       }
 
        if (ROFF_EXIT == type) {
 
        if (ROFF_EXIT == type) {
-               roffnode_free(ROFF_Sh, tree);
-               dbg_leave(tree->args, ROFF_Sh);
-               return(1);
+               roffnode_free(tok, tree);
+               return((*tree->cb->roffblkout)(tree->args, tok));
        } 
 
        } 
 
-       dbg_enter(tree->args, ROFF_Sh);
+       i = 0;
+       argv++;
 
 
-       if (NULL == roffnode_new(ROFF_Sh, tree->rbuf->line, tree))
-               return(0);
+       while (-1 != (c = roffnextopt(tree, tok, &argv, &v))) {
+               if (ROFF_ARGMAX == c)
+                       return(0);
 
 
-       return(1);
-}
+               argcp[i] = c;
+               argvp[i] = v;
+               i++;
+               argv++;
+       }
 
 
+       argcp[i] = ROFF_ARGMAX;
+       argvp[i] = NULL;
 
 
-/* ARGSUSED */
-static int
-roff_Li(ROFFCALL_ARGS) 
-{
+       if (NULL == roffnode_new(tok, tree))
+               return(0);
 
 
-       dbg_enter(tree->args, ROFF_Li);
-       dbg_leave(tree->args, ROFF_Li);
+       if ( ! (*tree->cb->roffin)(tree->args, tok, argcp, argvp))
+               return(0);
 
 
-       return(1);
-}
+       if ( ! (ROFF_PARSED & tokens[tok].flags)) {
 
 
+               /* TODO: print all tokens. */
 
 
-static int
-roffnextopt(const char ***in, char **val)
-{
-       const char      *arg, **argv;
-       int              v;
+               if ( ! ((*tree->cb->roffout)(tree->args, tok)))
+                       return(0);
+               return((*tree->cb->roffblkin)(tree->args, tok));
+       }
 
 
-       *val = NULL;
-       argv = *in;
-       assert(argv);
+       while (*argv) {
+               if (ROFF_MAX != (c = rofffindcallable(*argv))) {
+                       if (NULL == tokens[c].cb) {
+                               roff_err(tree, *argv, "unsupported "
+                                               "macro `%s'",
+                                               toknames[c]);
+                               return(0);
+                       }
+                       if ( ! (*tokens[c].cb)(c, tree, 
+                                               argv, ROFF_ENTER))
+                               return(0);
+               }
 
 
-       if (NULL == (arg = *argv))
-               return(-1);
-       if ('-' != *arg)
-               return(-1);
-       if (ROFF_ARGMAX == (v = rofffindarg(&arg[1])))
-               return(-1);
-       if ( ! (ROFF_VALUE & tokenargs[v].flags))
-               return(v);
+               /* TODO: print token. */
 
 
-       *in = ++argv;
+               argv++;
+       }
 
 
-       /* FIXME: what if this looks like a roff token or argument? */
+       if ( ! ((*tree->cb->roffout)(tree->args, tok)))
+               return(0);
 
 
-       return(*argv ? v : ROFF_ARGMAX);
+       return((*tree->cb->roffblkin)(tree->args, tok));
 }
 
 
 /* ARGSUSED */
 static int
 }
 
 
 /* ARGSUSED */
 static int
-roff_An(ROFFCALL_ARGS) 
+roff_text(ROFFCALL_ARGS) 
 {
 {
-       int              c;
-       char            *val;
-
-       dbg_enter(tree->args, ROFF_An);
-
-       while (-1 != (c = roffnextopt(&argv, &val))) {
-               switch (c) {
-               case (ROFF_Split):
-                       /* Process argument. */
-                       break;
-               case (ROFF_Nosplit):
-                       /* Process argument. */
-                       break;
-               default:
-                       warnx("%s: error parsing `An' args (line %zu)", 
-                                       tree->rbuf->name, 
-                                       tree->rbuf->line);
+       int              i, c, argcp[ROFF_MAXARG];
+       char            *v, *argvp[ROFF_MAXARG];
+
+       if (ROFF_PRELUDE & tree->state) {
+               roff_err(tree, *argv, "`%s' disallowed in prelude", 
+                               toknames[tok]);
+               return(0);
+       }
+
+       i = 0;
+       argv++;
+
+       while (-1 != (c = roffnextopt(tree, tok, &argv, &v))) {
+               if (ROFF_ARGMAX == c) 
                        return(0);
                        return(0);
-               }
+
+               argcp[i] = c;
+               argvp[i] = v;
+               i++;
                argv++;
        }
 
                argv++;
        }
 
-       /* Print header. */
-  
+       argcp[i] = ROFF_ARGMAX;
+       argvp[i] = NULL;
+
+       if ( ! (*tree->cb->roffin)(tree->args, tok, argcp, argvp))
+               return(0);
+
+       if ( ! (ROFF_PARSED & tokens[tok].flags)) {
+
+               /* TODO: print all tokens. */
+
+               return((*tree->cb->roffout)(tree->args, tok));
+       }
+
        while (*argv) {
        while (*argv) {
-               if (/* is_parsable && */ 2 >= strlen(*argv)) {
-                       if (ROFF_MAX != (c = rofffindtok(*argv))) {
-                               if (ROFF_CALLABLE & tokens[c].flags) {
-                                       /* Call to token. */
-                                       if ( ! (*tokens[c].cb)(tree, (const char **)argv + 1, ROFF_ENTER))
-                                               return(0);
-                               } 
-                               /* Print token. */
-                       } else {
-                               /* Print token. */
+               if (ROFF_MAX != (c = rofffindcallable(*argv))) {
+                       if (NULL == tokens[c].cb) {
+                               roff_err(tree, *argv, "unsupported "
+                                               "macro `%s'",
+                                               toknames[c]);
+                               return(0);
                        }
                        }
-               } else {
-                       /* Print token. */
+                       if ( ! (*tokens[c].cb)(c, tree, 
+                                               argv, ROFF_ENTER))
+                               return(0);
                }
                }
+
+               /* TODO: print token. */
+
                argv++;
        }
 
                argv++;
        }
 
-       /* Print footer. */
+       return((*tree->cb->roffout)(tree->args, tok));
+}
 
 
-       dbg_leave(tree->args, ROFF_An);
+
+/* ARGSUSED */
+static int
+roff_comment(ROFFCALL_ARGS)
+{
+
+       return(1);
+}
+
+
+/* ARGSUSED */
+static int
+roff_close(ROFFCALL_ARGS)
+{
 
        return(1);
 }
 
 
        return(1);
 }
 
+
+/* ARGSUSED */
+static int
+roff_special(ROFFCALL_ARGS)
+{
+
+       return((*tree->cb->roffspecial)(tok));
+}
+
+
+static void
+roff_warn(const struct rofftree *tree, const char *pos, char *fmt, ...)
+{
+       va_list          ap;
+       char             buf[128];
+
+       va_start(ap, fmt);
+       (void)vsnprintf(buf, sizeof(buf), fmt, ap);
+       va_end(ap);
+
+       (*tree->cb->roffmsg)(tree->args, ROFF_WARN, tree->cur, pos,
+                       tree->rbuf->name, tree->rbuf->line, buf);
+}
+
+
+static void
+roff_err(const struct rofftree *tree, const char *pos, char *fmt, ...)
+{
+       va_list          ap;
+       char             buf[128];
+
+       va_start(ap, fmt);
+       (void)vsnprintf(buf, sizeof(buf), fmt, ap);
+       va_end(ap);
+
+       (*tree->cb->roffmsg)(tree->args, ROFF_ERROR, tree->cur, pos,
+                       tree->rbuf->name, tree->rbuf->line, buf);
+}
A git conversion mirror of mandoc.bsd.lv