typo; noticed by jmc@ some time ago

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 1d00b03c29ca25c8c13ed6180dfd8b21cb2c99a2..f9905d49ecbdcdf6d0e5a99974316b6daf0cdd2f 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.210 2014/03/23 12:11:18 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.224 2014/08/10 23:54:41 schwarze Exp $ */

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


@@ -15,13 +15,12 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif

 
 #include <sys/types.h>
 
 #include <assert.h>
 
 #include <sys/types.h>
 
 #include <assert.h>

+#include <ctype.h>

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -34,7 +33,7 @@
 #include "libmdoc.h"
 #include "libmandoc.h"
 
 #include "libmdoc.h"
 #include "libmandoc.h"
 

-const  char *const __mdoc_macronames[MDOC_MAX] = {              
+const  char *const __mdoc_macronames[MDOC_MAX + 1] = {

        "Ap",           "Dd",           "Dt",           "Os",
        "Sh",           "Ss",           "Pp",           "D1",
        "Dl",           "Bd",           "Ed",           "Bl",
        "Ap",           "Dd",           "Dt",           "Os",
        "Sh",           "Ss",           "Pp",           "D1",
        "Dl",           "Bd",           "Ed",           "Bl",


@@ -45,11 +44,8 @@ const        char *const __mdoc_macronames[MDOC_MAX] = {
        "Ic",           "In",           "Li",           "Nd",
        "Nm",           "Op",           "Ot",           "Pa",
        "Rv",           "St",           "Va",           "Vt",
        "Ic",           "In",           "Li",           "Nd",
        "Nm",           "Op",           "Ot",           "Pa",
        "Rv",           "St",           "Va",           "Vt",

-       /* LINTED */

        "Xr",           "%A",           "%B",           "%D",
        "Xr",           "%A",           "%B",           "%D",

-       /* LINTED */

        "%I",           "%J",           "%N",           "%O",
        "%I",           "%J",           "%N",           "%O",

-       /* LINTED */

        "%P",           "%R",           "%T",           "%V",
        "Ac",           "Ao",           "Aq",           "At",
        "Bc",           "Bf",           "Bo",           "Bq",
        "%P",           "%R",           "%T",           "%V",
        "Ac",           "Ao",           "Aq",           "At",
        "Bc",           "Bf",           "Bo",           "Bq",


@@ -66,22 +62,19 @@ const       char *const __mdoc_macronames[MDOC_MAX] = {
        "Bk",           "Ek",           "Bt",           "Hf",
        "Fr",           "Ud",           "Lb",           "Lp",
        "Lk",           "Mt",           "Brq",          "Bro",
        "Bk",           "Ek",           "Bt",           "Hf",
        "Fr",           "Ud",           "Lb",           "Lp",
        "Lk",           "Mt",           "Brq",          "Bro",

-       /* LINTED */

        "Brc",          "%C",           "Es",           "En",
        "Brc",          "%C",           "Es",           "En",

-       /* LINTED */

        "Dx",           "%Q",           "br",           "sp",
        "Dx",           "%Q",           "br",           "sp",

-       /* LINTED */
-       "%U",           "Ta"
+       "%U",           "Ta",           "ll",           "text",

        };
 
        };
 

-const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {            
+const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {

        "split",                "nosplit",              "ragged",
        "split",                "nosplit",              "ragged",

-       "unfilled",             "literal",              "file",          
-       "offset",               "bullet",               "dash",          
-       "hyphen",               "item",                 "enum",          
-       "tag",                  "diag",                 "hang",          
-       "ohang",                "inset",                "column",        
-       "width",                "compact",              "std",   
+       "unfilled",             "literal",              "file",
+       "offset",               "bullet",               "dash",
+       "hyphen",               "item",                 "enum",
+       "tag",                  "diag",                 "hang",
+       "ohang",                "inset",                "column",
+       "width",                "compact",              "std",

        "filled",               "words",                "emphasis",
        "symbolic",             "nested",               "centered"
        };
        "filled",               "words",                "emphasis",
        "symbolic",             "nested",               "centered"
        };


@@ -90,13 +83,13 @@ const       char * const *mdoc_macronames = __mdoc_macronames;
 const  char * const *mdoc_argnames = __mdoc_argnames;
 
 static void              mdoc_node_free(struct mdoc_node *);
 const  char * const *mdoc_argnames = __mdoc_argnames;
 
 static void              mdoc_node_free(struct mdoc_node *);

-static void              mdoc_node_unlink(struct mdoc *, 
+static void              mdoc_node_unlink(struct mdoc *,

                                struct mdoc_node *);
 static void              mdoc_free1(struct mdoc *);
 static void              mdoc_alloc1(struct mdoc *);
                                struct mdoc_node *);
 static void              mdoc_free1(struct mdoc *);
 static void              mdoc_alloc1(struct mdoc *);

-static struct mdoc_node *node_alloc(struct mdoc *, int, int, 
+static struct mdoc_node *node_alloc(struct mdoc *, int, int,

                                enum mdoct, enum mdoc_type);
                                enum mdoct, enum mdoc_type);

-static int               node_append(struct mdoc *, 
+static int               node_append(struct mdoc *,

                                struct mdoc_node *);
 #if 0
 static int               mdoc_preptext(struct mdoc *, int, char *, int);
                                struct mdoc_node *);
 #if 0
 static int               mdoc_preptext(struct mdoc *, int, char *, int);


@@ -104,24 +97,21 @@ static     int               mdoc_preptext(struct mdoc *, int, char *, int);
 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);
 
 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);
 

+

 const struct mdoc_node *
 mdoc_node(const struct mdoc *mdoc)
 {
 
 const struct mdoc_node *
 mdoc_node(const struct mdoc *mdoc)
 {
 

-       assert( ! (MDOC_HALT & mdoc->flags));

        return(mdoc->first);
 }
 
        return(mdoc->first);
 }
 

-

 const struct mdoc_meta *
 mdoc_meta(const struct mdoc *mdoc)
 {
 
 const struct mdoc_meta *
 mdoc_meta(const struct mdoc *mdoc)
 {
 

-       assert( ! (MDOC_HALT & mdoc->flags));

        return(&mdoc->meta);
 }
 
        return(&mdoc->meta);
 }
 

-

 /*
  * Frees volatile resources (parse tree, meta-data, fields).
  */
 /*
  * Frees volatile resources (parse tree, meta-data, fields).
  */


@@ -131,23 +121,15 @@ mdoc_free1(struct mdoc *mdoc)
 
        if (mdoc->first)
                mdoc_node_delete(mdoc, mdoc->first);
 
        if (mdoc->first)
                mdoc_node_delete(mdoc, mdoc->first);

-       if (mdoc->meta.title)
-               free(mdoc->meta.title);
-       if (mdoc->meta.os)
-               free(mdoc->meta.os);
-       if (mdoc->meta.name)
-               free(mdoc->meta.name);
-       if (mdoc->meta.arch)
-               free(mdoc->meta.arch);
-       if (mdoc->meta.vol)
-               free(mdoc->meta.vol);
-       if (mdoc->meta.msec)
-               free(mdoc->meta.msec);
-       if (mdoc->meta.date)
-               free(mdoc->meta.date);
+       free(mdoc->meta.msec);
+       free(mdoc->meta.vol);
+       free(mdoc->meta.arch);
+       free(mdoc->meta.date);
+       free(mdoc->meta.title);
+       free(mdoc->meta.os);
+       free(mdoc->meta.name);

 }
 
 }
 

-

 /*
  * Allocate all volatile resources (parse tree, meta-data, fields).
  */
 /*
  * Allocate all volatile resources (parse tree, meta-data, fields).
  */


@@ -165,7 +147,6 @@ mdoc_alloc1(struct mdoc *mdoc)
        mdoc->next = MDOC_NEXT_CHILD;
 }
 
        mdoc->next = MDOC_NEXT_CHILD;
 }
 

-

 /*
  * Free up volatile resources (see mdoc_free1()) then re-initialises the
  * data with mdoc_alloc1().  After invocation, parse data has been reset
 /*
  * Free up volatile resources (see mdoc_free1()) then re-initialises the
  * data with mdoc_alloc1().  After invocation, parse data has been reset


@@ -180,7 +161,6 @@ mdoc_reset(struct mdoc *mdoc)
        mdoc_alloc1(mdoc);
 }
 
        mdoc_alloc1(mdoc);
 }
 

-

 /*
  * Completely free up all volatile and non-volatile parse resources.
  * After invocation, the pointer is no longer usable.
 /*
  * Completely free up all volatile and non-volatile parse resources.
  * After invocation, the pointer is no longer usable.


@@ -193,13 +173,12 @@ mdoc_free(struct mdoc *mdoc)
        free(mdoc);
 }
 
        free(mdoc);
 }
 

-

 /*
 /*

- * Allocate volatile and non-volatile parse resources.  
+ * Allocate volatile and non-volatile parse resources.

  */
 struct mdoc *
 mdoc_alloc(struct roff *roff, struct mparse *parse,
  */
 struct mdoc *
 mdoc_alloc(struct roff *roff, struct mparse *parse,

-       char *defos, int quick)
+       const char *defos, int quick)

 {
        struct mdoc     *p;
 
 {
        struct mdoc     *p;
 


@@ -215,20 +194,11 @@ mdoc_alloc(struct roff *roff, struct mparse *parse,
        return(p);
 }
 
        return(p);
 }
 

-
-/*
- * Climb back up the parse tree, validating open scopes.  Mostly calls
- * through to macro_end() in macro.c.
- */

 int
 mdoc_endparse(struct mdoc *mdoc)
 {
 
 int
 mdoc_endparse(struct mdoc *mdoc)
 {
 

-       assert( ! (MDOC_HALT & mdoc->flags));
-       if (mdoc_macroend(mdoc))
-               return(1);
-       mdoc->flags |= MDOC_HALT;
-       return(0);
+       return(mdoc_macroend(mdoc));

 }
 
 int
 }
 
 int


@@ -236,15 +206,6 @@ mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep)
 {
        struct mdoc_node *n;
 
 {
        struct mdoc_node *n;
 

-       assert( ! (MDOC_HALT & mdoc->flags));
-
-       /* No text before an initial macro. */
-
-       if (SEC_NONE == mdoc->lastnamed) {
-               mdoc_pmsg(mdoc, ep->ln, ep->pos, MANDOCERR_NOTEXT);
-               return(1);
-       }
-

        n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN);
        n->eqn = ep;
 
        n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN);
        n->eqn = ep;
 


@@ -260,15 +221,6 @@ mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp)
 {
        struct mdoc_node *n;
 
 {
        struct mdoc_node *n;
 

-       assert( ! (MDOC_HALT & mdoc->flags));
-
-       /* No text before an initial macro. */
-
-       if (SEC_NONE == mdoc->lastnamed) {
-               mdoc_pmsg(mdoc, sp->line, 0, MANDOCERR_NOTEXT);
-               return(1);
-       }
-

        n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL);
        n->span = sp;
 
        n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL);
        n->span = sp;
 


@@ -279,7 +231,6 @@ mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp)
        return(1);
 }
 
        return(1);
 }
 

-

 /*
  * Main parse routine.  Parses a single line -- really just hands off to
  * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).
 /*
  * Main parse routine.  Parses a single line -- really just hands off to
  * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).


@@ -288,8 +239,6 @@ int
 mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs)
 {
 
 mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs)
 {
 

-       assert( ! (MDOC_HALT & mdoc->flags));
-

        mdoc->flags |= MDOC_NEWLINE;
 
        /*
        mdoc->flags |= MDOC_NEWLINE;
 
        /*


@@ -304,8 +253,8 @@ mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs)
                mdoc->flags &= ~MDOC_SYNOPSIS;
 
        return(roff_getcontrol(mdoc->roff, buf, &offs) ?
                mdoc->flags &= ~MDOC_SYNOPSIS;
 
        return(roff_getcontrol(mdoc->roff, buf, &offs) ?

-                       mdoc_pmacro(mdoc, ln, buf, offs) :
-                       mdoc_ptext(mdoc, ln, buf, offs));
+           mdoc_pmacro(mdoc, ln, buf, offs) :
+           mdoc_ptext(mdoc, ln, buf, offs));

 }
 
 int
 }
 
 int


@@ -313,30 +262,22 @@ mdoc_macro(MACRO_PROT_ARGS)
 {
        assert(tok < MDOC_MAX);
 
 {
        assert(tok < MDOC_MAX);
 

-       /* If we're in the body, deny prologue calls. */
-
-       if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
-                       MDOC_PBODY & mdoc->flags) {
-               mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADBODY);
-               return(1);
-       }
-
-       /* If we're in the prologue, deny "body" macros.  */
-
-       if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
-                       ! (MDOC_PBODY & mdoc->flags)) {
-               mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADPROLOG);
-               if (NULL == mdoc->meta.msec)
-                       mdoc->meta.msec = mandoc_strdup("1");
-               if (NULL == mdoc->meta.title)
-                       mdoc->meta.title = mandoc_strdup("UNKNOWN");
+       if (mdoc->flags & MDOC_PBODY) {
+               if (tok == MDOC_Dt) {
+                       mandoc_vmsg(MANDOCERR_DT_LATE,
+                           mdoc->parse, line, ppos,
+                           "Dt %s", buf + *pos);
+                       return(1);
+               }
+       } else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) {
+               if (mdoc->meta.title == NULL) {
+                       mandoc_vmsg(MANDOCERR_DT_NOTITLE,
+                           mdoc->parse, line, ppos, "%s %s",
+                           mdoc_macronames[tok], buf + *pos);
+                       mdoc->meta.title = mandoc_strdup("UNTITLED");
+               }

                if (NULL == mdoc->meta.vol)
                        mdoc->meta.vol = mandoc_strdup("LOCAL");
                if (NULL == mdoc->meta.vol)
                        mdoc->meta.vol = mandoc_strdup("LOCAL");

-               if (NULL == mdoc->meta.os)
-                       mdoc->meta.os = mandoc_strdup("LOCAL");
-               if (NULL == mdoc->meta.date)
-                       mdoc->meta.date = mandoc_normdate
-                               (mdoc->parse, NULL, line, ppos);

                mdoc->flags |= MDOC_PBODY;
        }
 
                mdoc->flags |= MDOC_PBODY;
        }
 


@@ -353,12 +294,12 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        assert(MDOC_ROOT != p->type);
 
        switch (mdoc->next) {
        assert(MDOC_ROOT != p->type);
 
        switch (mdoc->next) {

-       case (MDOC_NEXT_SIBLING):
+       case MDOC_NEXT_SIBLING:

                mdoc->last->next = p;
                p->prev = mdoc->last;
                p->parent = mdoc->last->parent;
                break;
                mdoc->last->next = p;
                p->prev = mdoc->last;
                p->parent = mdoc->last->parent;
                break;

-       case (MDOC_NEXT_CHILD):
+       case MDOC_NEXT_CHILD:

                mdoc->last->child = p;
                p->parent = mdoc->last;
                break;
                mdoc->last->child = p;
                p->parent = mdoc->last;
                break;


@@ -375,13 +316,13 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
         */
 
        switch (p->type) {
         */
 
        switch (p->type) {

-       case (MDOC_BODY):
+       case MDOC_BODY:

                if (ENDBODY_NOT != p->end)
                        break;
                /* FALLTHROUGH */
                if (ENDBODY_NOT != p->end)
                        break;
                /* FALLTHROUGH */

-       case (MDOC_TAIL):
+       case MDOC_TAIL:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                p->norm = p->parent->norm;
                break;
        default:
                p->norm = p->parent->norm;
                break;
        default:


@@ -392,15 +333,15 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
                return(0);
 
        switch (p->type) {
                return(0);
 
        switch (p->type) {

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                assert(MDOC_BLOCK == p->parent->type);
                p->parent->head = p;
                break;
                assert(MDOC_BLOCK == p->parent->type);
                p->parent->head = p;
                break;

-       case (MDOC_TAIL):
+       case MDOC_TAIL:

                assert(MDOC_BLOCK == p->parent->type);
                p->parent->tail = p;
                break;
                assert(MDOC_BLOCK == p->parent->type);
                p->parent->tail = p;
                break;

-       case (MDOC_BODY):
+       case MDOC_BODY:

                if (p->end)
                        break;
                assert(MDOC_BLOCK == p->parent->type);
                if (p->end)
                        break;
                assert(MDOC_BLOCK == p->parent->type);


@@ -413,9 +354,9 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        mdoc->last = p;
 
        switch (p->type) {
        mdoc->last = p;
 
        switch (p->type) {

-       case (MDOC_TBL):
+       case MDOC_TBL:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_TEXT):
+       case MDOC_TEXT:

                if ( ! mdoc_valid_post(mdoc))
                        return(0);
                break;
                if ( ! mdoc_valid_post(mdoc))
                        return(0);
                break;


@@ -426,9 +367,8 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        return(1);
 }
 
        return(1);
 }
 

-

 static struct mdoc_node *
 static struct mdoc_node *

-node_alloc(struct mdoc *mdoc, int line, int pos, 
+node_alloc(struct mdoc *mdoc, int line, int pos,

                enum mdoct tok, enum mdoc_type type)
 {
        struct mdoc_node *p;
                enum mdoct tok, enum mdoc_type type)
 {
        struct mdoc_node *p;


@@ -454,7 +394,6 @@ node_alloc(struct mdoc *mdoc, int line, int pos,
        return(p);
 }
 
        return(p);
 }
 

-

 int
 mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
 {
 int
 mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
 {


@@ -467,7 +406,6 @@ mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
        return(1);
 }
 
        return(1);
 }
 

-

 int
 mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
 {
 int
 mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
 {


@@ -483,7 +421,6 @@ mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
        return(1);
 }
 
        return(1);
 }
 

-

 int
 mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
 {
 int
 mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
 {


@@ -496,7 +433,6 @@ mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
        return(1);
 }
 
        return(1);
 }
 

-

 int
 mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok,
                struct mdoc_node *body, enum mdoc_endbody end)
 int
 mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok,
                struct mdoc_node *body, enum mdoc_endbody end)


@@ -513,9 +449,8 @@ mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok,
        return(1);
 }
 
        return(1);
 }
 

-

 int
 int

-mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, 
+mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,

                enum mdoct tok, struct mdoc_arg *args)
 {
        struct mdoc_node *p;
                enum mdoct tok, struct mdoc_arg *args)
 {
        struct mdoc_node *p;


@@ -526,13 +461,15 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,
                (args->refcnt)++;
 
        switch (tok) {
                (args->refcnt)++;
 
        switch (tok) {

-       case (MDOC_Bd):
+       case MDOC_Bd:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Bf):
+       case MDOC_Bf:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Bl):
+       case MDOC_Bl:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Rs):
+       case MDOC_En:
+               /* FALLTHROUGH */
+       case MDOC_Rs:

                p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
                break;
        default:
                p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
                break;
        default:


@@ -545,9 +482,8 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,
        return(1);
 }
 
        return(1);
 }
 

-

 int
 int

-mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, 
+mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos,

                enum mdoct tok, struct mdoc_arg *args)
 {
        struct mdoc_node *p;
                enum mdoct tok, struct mdoc_arg *args)
 {
        struct mdoc_node *p;


@@ -558,7 +494,7 @@ mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos,
                (args->refcnt)++;
 
        switch (tok) {
                (args->refcnt)++;
 
        switch (tok) {

-       case (MDOC_An):
+       case MDOC_An:

                p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
                break;
        default:
                p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
                break;
        default:


@@ -614,7 +550,6 @@ mdoc_node_free(struct mdoc_node *p)
        free(p);
 }
 
        free(p);
 }
 

-

 static void
 mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n)
 {
 static void
 mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n)
 {


@@ -652,7 +587,6 @@ mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n)
                mdoc->first = NULL;
 }
 
                mdoc->first = NULL;
 }
 

-

 void
 mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p)
 {
 void
 mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p)
 {


@@ -723,7 +657,7 @@ mdoc_preptext(struct mdoc *mdoc, int line, char *buf, int offs)
                        if ( ! mdoc_addeqn(mdoc, roff_eqn(mdoc->roff)))
                                return(0);
                offs += (end - (buf + offs));
                        if ( ! mdoc_addeqn(mdoc, roff_eqn(mdoc->roff)))
                                return(0);
                offs += (end - (buf + offs));

-       } 
+       }

 
        return(1);
 }
 
        return(1);
 }


@@ -739,13 +673,6 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
        char             *c, *ws, *end;
        struct mdoc_node *n;
 
        char             *c, *ws, *end;
        struct mdoc_node *n;
 

-       /* No text before an initial macro. */
-
-       if (SEC_NONE == mdoc->lastnamed) {
-               mdoc_pmsg(mdoc, line, offs, MANDOCERR_NOTEXT);
-               return(1);
-       }
-

        assert(mdoc->last);
        n = mdoc->last;
 
        assert(mdoc->last);
        n = mdoc->last;
 


@@ -757,16 +684,16 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&

-                       LIST_column == n->norm->Bl.type) {
+           LIST_column == n->norm->Bl.type) {

                /* `Bl' is open without any children. */
                mdoc->flags |= MDOC_FREECOL;
                return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));
        }
 
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                /* `Bl' is open without any children. */
                mdoc->flags |= MDOC_FREECOL;
                return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));
        }
 
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&

-                       NULL != n->parent &&
-                       MDOC_Bl == n->parent->tok &&
-                       LIST_column == n->parent->norm->Bl.type) {
+           NULL != n->parent &&
+           MDOC_Bl == n->parent->tok &&
+           LIST_column == n->parent->norm->Bl.type) {

                /* `Bl' has block-level `It' children. */
                mdoc->flags |= MDOC_FREECOL;
                return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));
                /* `Bl' has block-level `It' children. */
                mdoc->flags |= MDOC_FREECOL;
                return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));


@@ -814,10 +741,12 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
        *end = '\0';
 
        if (ws)
        *end = '\0';
 
        if (ws)

-               mdoc_pmsg(mdoc, line, (int)(ws-buf), MANDOCERR_EOLNSPACE);
+               mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
+                   line, (int)(ws-buf), NULL);

 
        if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) {
 
        if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) {

-               mdoc_pmsg(mdoc, line, (int)(c-buf), MANDOCERR_NOBLANKLN);
+               mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse,
+                   line, (int)(c - buf), NULL);

 
                /*
                 * Insert a `sp' in the case of a blank line.  Technically,
 
                /*
                 * Insert a `sp' in the case of a blank line.  Technically,


@@ -852,7 +781,6 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
        return(1);
 }
 
        return(1);
 }
 

-

 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.
 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.


@@ -868,30 +796,31 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
        /* Empty post-control lines are ignored. */
 
        if ('"' == buf[offs]) {
        /* Empty post-control lines are ignored. */
 
        if ('"' == buf[offs]) {

-               mdoc_pmsg(mdoc, ln, offs, MANDOCERR_BADCOMMENT);
+               mandoc_msg(MANDOCERR_COMMENT_BAD, mdoc->parse,
+                   ln, offs, NULL);

                return(1);
        } else if ('\0' == buf[offs])
                return(1);
 
        sv = offs;
 
                return(1);
        } else if ('\0' == buf[offs])
                return(1);
 
        sv = offs;
 

-       /* 
+       /*

         * Copy the first word into a nil-terminated buffer.
         * Stop copying when a tab, space, or eoln is encountered.
         */
 
        i = 0;
         * Copy the first word into a nil-terminated buffer.
         * Stop copying when a tab, space, or eoln is encountered.
         */
 
        i = 0;

-       while (i < 4 && '\0' != buf[offs] && 
-                       ' ' != buf[offs] && '\t' != buf[offs])
+       while (i < 4 && '\0' != buf[offs] && ' ' != buf[offs] &&
+           '\t' != buf[offs])

                mac[i++] = buf[offs++];
 
        mac[i] = '\0';
 
                mac[i++] = buf[offs++];
 
        mac[i] = '\0';
 

-       tok = (i > 1 || i < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
+       tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : MDOC_MAX;

 
        if (MDOC_MAX == tok) {
 
        if (MDOC_MAX == tok) {

-               mandoc_vmsg(MANDOCERR_MACRO, mdoc->parse, 
-                               ln, sv, "%s", buf + sv - 1);
+               mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
+                   ln, sv, buf + sv - 1);

                return(1);
        }
 
                return(1);
        }
 


@@ -905,24 +834,22 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
        while (buf[offs] && ' ' == buf[offs])
                offs++;
 
        while (buf[offs] && ' ' == buf[offs])
                offs++;
 

-       /* 
+       /*

         * Trailing whitespace.  Note that tabs are allowed to be passed
         * into the parser as "text", so we only warn about spaces here.
         */
 
        if ('\0' == buf[offs] && ' ' == buf[offs - 1])
         * Trailing whitespace.  Note that tabs are allowed to be passed
         * into the parser as "text", so we only warn about spaces here.
         */
 
        if ('\0' == buf[offs] && ' ' == buf[offs - 1])

-               mdoc_pmsg(mdoc, ln, offs - 1, MANDOCERR_EOLNSPACE);
+               mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
+                   ln, offs - 1, NULL);

 
        /*
         * If an initial macro or a list invocation, divert directly
         * into macro processing.
         */
 
 
        /*
         * If an initial macro or a list invocation, divert directly
         * into macro processing.
         */
 

-       if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) {
-               if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) 
-                       goto err;
-               return(1);
-       }
+       if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok)
+               return(mdoc_macro(mdoc, tok, ln, sv, &offs, buf));

 
        n = mdoc->last;
        assert(mdoc->last);
 
        n = mdoc->last;
        assert(mdoc->last);


@@ -933,11 +860,9 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&

-                       LIST_column == n->norm->Bl.type) {
+           LIST_column == n->norm->Bl.type) {

                mdoc->flags |= MDOC_FREECOL;
                mdoc->flags |= MDOC_FREECOL;

-               if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf))
-                       goto err;
-               return(1);
+               return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf));

        }
 
        /*
        }
 
        /*


@@ -947,19 +872,17 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
         */
 
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
         */
 
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&

-                       NULL != n->parent &&
-                       MDOC_Bl == n->parent->tok &&
-                       LIST_column == n->parent->norm->Bl.type) {
+           NULL != n->parent &&
+           MDOC_Bl == n->parent->tok &&
+           LIST_column == n->parent->norm->Bl.type) {

                mdoc->flags |= MDOC_FREECOL;
                mdoc->flags |= MDOC_FREECOL;

-               if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)) 
-                       goto err;
-               return(1);
+               return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf));

        }
 
        /* Normal processing of a macro. */
 
        }
 
        /* Normal processing of a macro. */
 

-       if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) 
-               goto err;
+       if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf))
+               return(0);

 
        /* In quick mode (for mandocdb), abort after the NAME section. */
 
 
        /* In quick mode (for mandocdb), abort after the NAME section. */
 


@@ -968,11 +891,6 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
                return(2);
 
        return(1);
                return(2);
 
        return(1);

-
-err:   /* Error out. */
-
-       mdoc->flags |= MDOC_HALT;
-       return(0);

 }
 
 enum mdelim
 }
 
 enum mdelim


@@ -984,27 +902,27 @@ mdoc_isdelim(const char *p)
 
        if ('\0' == p[1])
                switch (p[0]) {
 
        if ('\0' == p[1])
                switch (p[0]) {

-               case('('):
+               case '(':

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case('['):
+               case '[':

                        return(DELIM_OPEN);
                        return(DELIM_OPEN);

-               case('|'):
+               case '|':

                        return(DELIM_MIDDLE);
                        return(DELIM_MIDDLE);

-               case('.'):
+               case '.':

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case(','):
+               case ',':

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case(';'):
+               case ';':

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case(':'):
+               case ':':

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case('?'):
+               case '?':

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case('!'):
+               case '!':

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case(')'):
+               case ')':

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case(']'):
+               case ']':

                        return(DELIM_CLOSE);
                default:
                        return(DELIM_NONE);
                        return(DELIM_CLOSE);
                default:
                        return(DELIM_NONE);


@@ -1020,3 +938,42 @@ mdoc_isdelim(const char *p)
 
        return(DELIM_NONE);
 }
 
        return(DELIM_NONE);
 }

+
+void
+mdoc_deroff(char **dest, const struct mdoc_node *n)
+{
+       char    *cp;
+       size_t   sz;
+
+       if (MDOC_TEXT != n->type) {
+               for (n = n->child; n; n = n->next)
+                       mdoc_deroff(dest, n);
+               return;
+       }
+
+       /* Skip leading whitespace. */
+
+       for (cp = n->string; '\0' != *cp; cp++)
+               if (0 == isspace((unsigned char)*cp))
+                       break;
+
+       /* Skip trailing whitespace. */
+
+       for (sz = strlen(cp); sz; sz--)
+               if (0 == isspace((unsigned char)cp[sz-1]))
+                       break;
+
+       /* Skip empty strings. */
+
+       if (0 == sz)
+               return;
+
+       if (NULL == *dest) {
+               *dest = mandoc_strndup(cp, sz);
+               return;
+       }
+
+       mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp);
+       free(*dest);
+       *dest = cp;
+}