fix unchecked snprintf(3) in page header printing:

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 396d1019dc16c0e54eabdd820833f283aa6dee9d..168778177c42dca0cb4f2daf2795ac245debcc29 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc.c,v 1.202 2012/11/16 13:40:36 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.213 2014/04/20 16:46:05 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -22,6 +22,7 @@
 #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>


@@ -30,10 +31,11 @@
 
 #include "mdoc.h"
 #include "mandoc.h"
 
 #include "mdoc.h"
 #include "mandoc.h"

+#include "mandoc_aux.h"

 #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] = {

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


@@ -44,11 +46,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",


@@ -65,22 +64,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",

        };
 
        };
 

-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"
        };


@@ -89,13 +85,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);


@@ -103,24 +99,23 @@ 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 *
 const struct mdoc_node *

-mdoc_node(const struct mdoc *m)
+mdoc_node(const struct mdoc *mdoc)

 {
 
 {
 

-       assert( ! (MDOC_HALT & m->flags));
-       return(m->first);
+       assert( ! (MDOC_HALT & mdoc->flags));
+       return(mdoc->first);

 }
 
 }
 

-

 const struct mdoc_meta *
 const struct mdoc_meta *

-mdoc_meta(const struct mdoc *m)
+mdoc_meta(const struct mdoc *mdoc)

 {
 
 {
 

-       assert( ! (MDOC_HALT & m->flags));
-       return(&m->meta);
+       assert( ! (MDOC_HALT & mdoc->flags));
+       return(&mdoc->meta);

 }
 
 }
 

-

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


@@ -146,7 +141,6 @@ mdoc_free1(struct mdoc *mdoc)
                free(mdoc->meta.date);
 }
 
                free(mdoc->meta.date);
 }
 

-

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


@@ -164,7 +158,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


@@ -179,7 +172,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.


@@ -192,12 +184,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 *
  */
 struct mdoc *

-mdoc_alloc(struct roff *roff, struct mparse *parse, char *defos)
+mdoc_alloc(struct roff *roff, struct mparse *parse,
+       char *defos, int quick)

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


@@ -205,6 +197,7 @@ mdoc_alloc(struct roff *roff, struct mparse *parse, char *defos)
 
        p->parse = parse;
        p->defos = defos;
 
        p->parse = parse;
        p->defos = defos;

+       p->quick = quick;

        p->roff = roff;
 
        mdoc_hash_init();
        p->roff = roff;
 
        mdoc_hash_init();


@@ -212,82 +205,80 @@ mdoc_alloc(struct roff *roff, struct mparse *parse, char *defos)
        return(p);
 }
 
        return(p);
 }
 

-

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

-mdoc_endparse(struct mdoc *m)
+mdoc_endparse(struct mdoc *mdoc)

 {
 
 {
 

-       assert( ! (MDOC_HALT & m->flags));
-       if (mdoc_macroend(m))
+       assert( ! (MDOC_HALT & mdoc->flags));
+       if (mdoc_macroend(mdoc))

                return(1);
                return(1);

-       m->flags |= MDOC_HALT;
+       mdoc->flags |= MDOC_HALT;

        return(0);
 }
 
 int
        return(0);
 }
 
 int

-mdoc_addeqn(struct mdoc *m, const struct eqn *ep)
+mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep)

 {
        struct mdoc_node *n;
 
 {
        struct mdoc_node *n;
 

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

 
        /* No text before an initial macro. */
 
 
        /* No text before an initial macro. */
 

-       if (SEC_NONE == m->lastnamed) {
-               mdoc_pmsg(m, ep->ln, ep->pos, MANDOCERR_NOTEXT);
+       if (SEC_NONE == mdoc->lastnamed) {
+               mdoc_pmsg(mdoc, ep->ln, ep->pos, MANDOCERR_NOTEXT);

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

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

        n->eqn = ep;
 
        n->eqn = ep;
 

-       if ( ! node_append(m, n))
+       if ( ! node_append(mdoc, n))

                return(0);
 
                return(0);
 

-       m->next = MDOC_NEXT_SIBLING;
+       mdoc->next = MDOC_NEXT_SIBLING;

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

-mdoc_addspan(struct mdoc *m, const struct tbl_span *sp)
+mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp)

 {
        struct mdoc_node *n;
 
 {
        struct mdoc_node *n;
 

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

 
        /* No text before an initial macro. */
 
 
        /* No text before an initial macro. */
 

-       if (SEC_NONE == m->lastnamed) {
-               mdoc_pmsg(m, sp->line, 0, MANDOCERR_NOTEXT);
+       if (SEC_NONE == mdoc->lastnamed) {
+               mdoc_pmsg(mdoc, sp->line, 0, MANDOCERR_NOTEXT);

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

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

        n->span = sp;
 
        n->span = sp;
 

-       if ( ! node_append(m, n))
+       if ( ! node_append(mdoc, n))

                return(0);
 
                return(0);
 

-       m->next = MDOC_NEXT_SIBLING;
+       mdoc->next = MDOC_NEXT_SIBLING;

        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()).
  */
 int
 /*
  * Main parse routine.  Parses a single line -- really just hands off to
  * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).
  */
 int

-mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)
+mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs)

 {
 
 {
 

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

 
 

-       m->flags |= MDOC_NEWLINE;
+       mdoc->flags |= MDOC_NEWLINE;

 
        /*
         * Let the roff nS register switch SYNOPSIS mode early,
 
        /*
         * Let the roff nS register switch SYNOPSIS mode early,


@@ -295,16 +286,14 @@ mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)
         * whether this mode is on or off.
         * Note that this mode is also switched by the Sh macro.
         */
         * whether this mode is on or off.
         * Note that this mode is also switched by the Sh macro.
         */

-       if (roff_regisset(m->roff, REG_nS)) {
-               if (roff_regget(m->roff, REG_nS))
-                       m->flags |= MDOC_SYNOPSIS;
-               else
-                       m->flags &= ~MDOC_SYNOPSIS;
-       }
+       if (roff_getreg(mdoc->roff, "nS"))
+               mdoc->flags |= MDOC_SYNOPSIS;
+       else
+               mdoc->flags &= ~MDOC_SYNOPSIS;

 
 

-       return(roff_getcontrol(m->roff, buf, &offs) ?
-                       mdoc_pmacro(m, ln, buf, offs) :
-                       mdoc_ptext(m, ln, buf, offs));
+       return(roff_getcontrol(mdoc->roff, buf, &offs) ?
+           mdoc_pmacro(mdoc, ln, buf, offs) :
+           mdoc_ptext(mdoc, ln, buf, offs));

 }
 
 int
 }
 
 int


@@ -314,32 +303,32 @@ mdoc_macro(MACRO_PROT_ARGS)
 
        /* If we're in the body, deny prologue calls. */
 
 
        /* If we're in the body, deny prologue calls. */
 

-       if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
-                       MDOC_PBODY & m->flags) {
-               mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY);
+       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.  */
 
                return(1);
        }
 
        /* If we're in the prologue, deny "body" macros.  */
 

-       if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
-                       ! (MDOC_PBODY & m->flags)) {
-               mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG);
-               if (NULL == m->meta.msec)
-                       m->meta.msec = mandoc_strdup("1");
-               if (NULL == m->meta.title)
-                       m->meta.title = mandoc_strdup("UNKNOWN");
-               if (NULL == m->meta.vol)
-                       m->meta.vol = mandoc_strdup("LOCAL");
-               if (NULL == m->meta.os)
-                       m->meta.os = mandoc_strdup("LOCAL");
-               if (NULL == m->meta.date)
-                       m->meta.date = mandoc_normdate
-                               (m->parse, NULL, line, ppos);
-               m->flags |= MDOC_PBODY;
+       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 (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;

        }
 
        }
 

-       return((*mdoc_macros[tok].fp)(m, tok, line, ppos, pos, buf));
+       return((*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf));

 }
 
 
 }
 
 


@@ -352,12 +341,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;


@@ -374,13 +363,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:


@@ -391,15 +380,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);


@@ -412,9 +401,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;


@@ -425,165 +414,173 @@ 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 *m, int line, int pos, 
+node_alloc(struct mdoc *mdoc, int line, int pos,

                enum mdoct tok, enum mdoc_type type)
 {
        struct mdoc_node *p;
 
        p = mandoc_calloc(1, sizeof(struct mdoc_node));
                enum mdoct tok, enum mdoc_type type)
 {
        struct mdoc_node *p;
 
        p = mandoc_calloc(1, sizeof(struct mdoc_node));

-       p->sec = m->lastsec;
+       p->sec = mdoc->lastsec;

        p->line = line;
        p->pos = pos;
        p->line = line;
        p->pos = pos;

+       p->lastline = line;

        p->tok = tok;
        p->type = type;
 
        /* Flag analysis. */
 
        p->tok = tok;
        p->type = type;
 
        /* Flag analysis. */
 

-       if (MDOC_SYNOPSIS & m->flags)
+       if (MDOC_SYNOPSIS & mdoc->flags)

                p->flags |= MDOC_SYNPRETTY;
        else
                p->flags &= ~MDOC_SYNPRETTY;
                p->flags |= MDOC_SYNPRETTY;
        else
                p->flags &= ~MDOC_SYNPRETTY;

-       if (MDOC_NEWLINE & m->flags)
+       if (MDOC_NEWLINE & mdoc->flags)

                p->flags |= MDOC_LINE;
                p->flags |= MDOC_LINE;

-       m->flags &= ~MDOC_NEWLINE;
+       mdoc->flags &= ~MDOC_NEWLINE;

 
        return(p);
 }
 
 
        return(p);
 }
 

-

 int
 int

-mdoc_tail_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
+mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)

 {
        struct mdoc_node *p;
 
 {
        struct mdoc_node *p;
 

-       p = node_alloc(m, line, pos, tok, MDOC_TAIL);
-       if ( ! node_append(m, p))
+       p = node_alloc(mdoc, line, pos, tok, MDOC_TAIL);
+       if ( ! node_append(mdoc, p))

                return(0);
                return(0);

-       m->next = MDOC_NEXT_CHILD;
+       mdoc->next = MDOC_NEXT_CHILD;

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

-

 int
 int

-mdoc_head_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
+mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)

 {
        struct mdoc_node *p;
 
 {
        struct mdoc_node *p;
 

-       assert(m->first);
-       assert(m->last);
+       assert(mdoc->first);
+       assert(mdoc->last);

 
 

-       p = node_alloc(m, line, pos, tok, MDOC_HEAD);
-       if ( ! node_append(m, p))
+       p = node_alloc(mdoc, line, pos, tok, MDOC_HEAD);
+       if ( ! node_append(mdoc, p))

                return(0);
                return(0);

-       m->next = MDOC_NEXT_CHILD;
+       mdoc->next = MDOC_NEXT_CHILD;

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

-

 int
 int

-mdoc_body_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
+mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)

 {
        struct mdoc_node *p;
 
 {
        struct mdoc_node *p;
 

-       p = node_alloc(m, line, pos, tok, MDOC_BODY);
-       if ( ! node_append(m, p))
+       p = node_alloc(mdoc, line, pos, tok, MDOC_BODY);
+       if ( ! node_append(mdoc, p))

                return(0);
                return(0);

-       m->next = MDOC_NEXT_CHILD;
+       mdoc->next = MDOC_NEXT_CHILD;

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

-

 int
 int

-mdoc_endbody_alloc(struct mdoc *m, int line, int pos, enum mdoct tok,
+mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok,

                struct mdoc_node *body, enum mdoc_endbody end)
 {
        struct mdoc_node *p;
 
                struct mdoc_node *body, enum mdoc_endbody end)
 {
        struct mdoc_node *p;
 

-       p = node_alloc(m, line, pos, tok, MDOC_BODY);
+       p = node_alloc(mdoc, line, pos, tok, MDOC_BODY);

        p->pending = body;
        p->norm = body->norm;
        p->end = end;
        p->pending = body;
        p->norm = body->norm;
        p->end = end;

-       if ( ! node_append(m, p))
+       if ( ! node_append(mdoc, p))

                return(0);
                return(0);

-       m->next = MDOC_NEXT_SIBLING;
+       mdoc->next = MDOC_NEXT_SIBLING;

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

-

 int
 int

-mdoc_block_alloc(struct mdoc *m, 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;
 

-       p = node_alloc(m, line, pos, tok, MDOC_BLOCK);
+       p = node_alloc(mdoc, line, pos, tok, MDOC_BLOCK);

        p->args = args;
        if (p->args)
                (args->refcnt)++;
 
        switch (tok) {
        p->args = args;
        if (p->args)
                (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_Rs:

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

-       if ( ! node_append(m, p))
+       if ( ! node_append(mdoc, p))

                return(0);
                return(0);

-       m->next = MDOC_NEXT_CHILD;
+       mdoc->next = MDOC_NEXT_CHILD;

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

-

 int
 int

-mdoc_elem_alloc(struct mdoc *m, 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;
 

-       p = node_alloc(m, line, pos, tok, MDOC_ELEM);
+       p = node_alloc(mdoc, line, pos, tok, MDOC_ELEM);

        p->args = args;
        if (p->args)
                (args->refcnt)++;
 
        switch (tok) {
        p->args = args;
        if (p->args)
                (args->refcnt)++;
 
        switch (tok) {

-       case (MDOC_An):
+       case MDOC_An:

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

-       if ( ! node_append(m, p))
+       if ( ! node_append(mdoc, p))

                return(0);
                return(0);

-       m->next = MDOC_NEXT_CHILD;
+       mdoc->next = MDOC_NEXT_CHILD;

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

-mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
+mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, const char *p)

 {
        struct mdoc_node *n;
 
 {
        struct mdoc_node *n;
 

-       n = node_alloc(m, line, pos, MDOC_MAX, MDOC_TEXT);
-       n->string = roff_strdup(m->roff, p);
+       n = node_alloc(mdoc, line, pos, MDOC_MAX, MDOC_TEXT);
+       n->string = roff_strdup(mdoc->roff, p);

 
 

-       if ( ! node_append(m, n))
+       if ( ! node_append(mdoc, n))

                return(0);
 
                return(0);
 

-       m->next = MDOC_NEXT_SIBLING;
+       mdoc->next = MDOC_NEXT_SIBLING;

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

+void
+mdoc_word_append(struct mdoc *mdoc, const char *p)
+{
+       struct mdoc_node        *n;
+       char                    *addstr, *newstr;
+
+       n = mdoc->last;
+       addstr = roff_strdup(mdoc->roff, p);
+       mandoc_asprintf(&newstr, "%s %s", n->string, addstr);
+       free(addstr);
+       free(n->string);
+       n->string = newstr;
+       mdoc->next = MDOC_NEXT_SIBLING;
+}

 
 static void
 mdoc_node_free(struct mdoc_node *p)
 
 static void
 mdoc_node_free(struct mdoc_node *p)


@@ -598,9 +595,8 @@ mdoc_node_free(struct mdoc_node *p)
        free(p);
 }
 
        free(p);
 }
 

-

 static void
 static void

-mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n)
+mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n)

 {
 
        /* Adjust siblings. */
 {
 
        /* Adjust siblings. */


@@ -622,41 +618,40 @@ mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n)
 
        /* Adjust parse point, if applicable. */
 
 
        /* Adjust parse point, if applicable. */
 

-       if (m && m->last == n) {
+       if (mdoc && mdoc->last == n) {

                if (n->prev) {
                if (n->prev) {

-                       m->last = n->prev;
-                       m->next = MDOC_NEXT_SIBLING;
+                       mdoc->last = n->prev;
+                       mdoc->next = MDOC_NEXT_SIBLING;

                } else {
                } else {

-                       m->last = n->parent;
-                       m->next = MDOC_NEXT_CHILD;
+                       mdoc->last = n->parent;
+                       mdoc->next = MDOC_NEXT_CHILD;

                }
        }
 
                }
        }
 

-       if (m && m->first == n)
-               m->first = NULL;
+       if (mdoc && mdoc->first == n)
+               mdoc->first = NULL;

 }
 
 }
 

-

 void
 void

-mdoc_node_delete(struct mdoc *m, struct mdoc_node *p)
+mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p)

 {
 
        while (p->child) {
                assert(p->nchild);
 {
 
        while (p->child) {
                assert(p->nchild);

-               mdoc_node_delete(m, p->child);
+               mdoc_node_delete(mdoc, p->child);

        }
        assert(0 == p->nchild);
 
        }
        assert(0 == p->nchild);
 

-       mdoc_node_unlink(m, p);
+       mdoc_node_unlink(mdoc, p);

        mdoc_node_free(p);
 }
 
 int
        mdoc_node_free(p);
 }
 
 int

-mdoc_node_relink(struct mdoc *m, struct mdoc_node *p)
+mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node *p)

 {
 
 {
 

-       mdoc_node_unlink(m, p);
-       return(node_append(m, p));
+       mdoc_node_unlink(mdoc, p);
+       return(node_append(mdoc, p));

 }
 
 #if 0
 }
 
 #if 0


@@ -670,7 +665,7 @@ mdoc_node_relink(struct mdoc *m, struct mdoc_node *p)
  * the end-of-line, i.e., will re-enter in the next roff parse.
  */
 static int
  * the end-of-line, i.e., will re-enter in the next roff parse.
  */
 static int

-mdoc_preptext(struct mdoc *m, int line, char *buf, int offs)
+mdoc_preptext(struct mdoc *mdoc, int line, char *buf, int offs)

 {
        char            *start, *end;
        char             delim;
 {
        char            *start, *end;
        char             delim;


@@ -678,12 +673,12 @@ mdoc_preptext(struct mdoc *m, int line, char *buf, int offs)
        while ('\0' != buf[offs]) {
                /* Mark starting position if eqn is set. */
                start = NULL;
        while ('\0' != buf[offs]) {
                /* Mark starting position if eqn is set. */
                start = NULL;

-               if ('\0' != (delim = roff_eqndelim(m->roff)))
+               if ('\0' != (delim = roff_eqndelim(mdoc->roff)))

                        if (NULL != (start = strchr(buf + offs, delim)))
                                *start++ = '\0';
 
                /* Parse text as normal. */
                        if (NULL != (start = strchr(buf + offs, delim)))
                                *start++ = '\0';
 
                /* Parse text as normal. */

-               if ( ! mdoc_ptext(m, line, buf, offs))
+               if ( ! mdoc_ptext(mdoc, line, buf, offs))

                        return(0);
 
                /* Continue only if an equation exists. */
                        return(0);
 
                /* Continue only if an equation exists. */


@@ -700,14 +695,14 @@ mdoc_preptext(struct mdoc *m, int line, char *buf, int offs)
                }
 
                /* Parse the equation itself. */
                }
 
                /* Parse the equation itself. */

-               roff_openeqn(m->roff, NULL, line, offs, buf);
+               roff_openeqn(mdoc->roff, NULL, line, offs, buf);

 
                /* Process a finished equation? */
 
                /* Process a finished equation? */

-               if (roff_closeeqn(m->roff))
-                       if ( ! mdoc_addeqn(m, roff_eqn(m->roff)))
+               if (roff_closeeqn(mdoc->roff))
+                       if ( ! mdoc_addeqn(mdoc, roff_eqn(mdoc->roff)))

                                return(0);
                offs += (end - (buf + offs));
                                return(0);
                offs += (end - (buf + offs));

-       } 
+       }

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


@@ -718,20 +713,20 @@ mdoc_preptext(struct mdoc *m, int line, char *buf, int offs)
  * control character.
  */
 static int
  * control character.
  */
 static int

-mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
+mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)

 {
        char             *c, *ws, *end;
        struct mdoc_node *n;
 
        /* No text before an initial macro. */
 
 {
        char             *c, *ws, *end;
        struct mdoc_node *n;
 
        /* No text before an initial macro. */
 

-       if (SEC_NONE == m->lastnamed) {
-               mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT);
+       if (SEC_NONE == mdoc->lastnamed) {
+               mdoc_pmsg(mdoc, line, offs, MANDOCERR_NOTEXT);

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

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

 
        /*
         * Divert directly to list processing if we're encountering a
 
        /*
         * Divert directly to list processing if we're encountering a


@@ -741,19 +736,19 @@ mdoc_ptext(struct mdoc *m, 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. */
                /* `Bl' is open without any children. */

-               m->flags |= MDOC_FREECOL;
-               return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
+               mdoc->flags |= MDOC_FREECOL;
+               return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));

        }
 
        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) {

                /* `Bl' has block-level `It' children. */
                /* `Bl' has block-level `It' children. */

-               m->flags |= MDOC_FREECOL;
-               return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
+               mdoc->flags |= MDOC_FREECOL;
+               return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));

        }
 
        /*
        }
 
        /*


@@ -781,7 +776,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
                         * Strip trailing tabs in literal context only;
                         * outside, they affect the next line.
                         */
                         * Strip trailing tabs in literal context only;
                         * outside, they affect the next line.
                         */

-                       if (MDOC_LITERAL & m->flags)
+                       if (MDOC_LITERAL & mdoc->flags)

                                continue;
                        break;
                case '\\':
                                continue;
                        break;
                case '\\':


@@ -798,28 +793,28 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
        *end = '\0';
 
        if (ws)
        *end = '\0';
 
        if (ws)

-               mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE);
+               mdoc_pmsg(mdoc, line, (int)(ws-buf), MANDOCERR_EOLNSPACE);

 
 

-       if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) {
-               mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN);
+       if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) {
+               mdoc_pmsg(mdoc, line, (int)(c-buf), MANDOCERR_NOBLANKLN);

 
                /*
                 * Insert a `sp' in the case of a blank line.  Technically,
                 * blank lines aren't allowed, but enough manuals assume this
                 * behaviour that we want to work around it.
                 */
 
                /*
                 * Insert a `sp' in the case of a blank line.  Technically,
                 * blank lines aren't allowed, but enough manuals assume this
                 * behaviour that we want to work around it.
                 */

-               if ( ! mdoc_elem_alloc(m, line, offs, MDOC_sp, NULL))
+               if ( ! mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL))

                        return(0);
 
                        return(0);
 

-               m->next = MDOC_NEXT_SIBLING;
+               mdoc->next = MDOC_NEXT_SIBLING;

 
 

-               return(mdoc_valid_post(m));
+               return(mdoc_valid_post(mdoc));

        }
 
        }
 

-       if ( ! mdoc_word_alloc(m, line, offs, buf+offs))
+       if ( ! mdoc_word_alloc(mdoc, line, offs, buf+offs))

                return(0);
 
                return(0);
 

-       if (MDOC_LITERAL & m->flags)
+       if (MDOC_LITERAL & mdoc->flags)

                return(1);
 
        /*
                return(1);
 
        /*


@@ -830,19 +825,18 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
 
        assert(buf < end);
 
 
        assert(buf < end);
 

-       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0))
-               m->last->flags |= MDOC_EOS;
+       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))
+               mdoc->last->flags |= MDOC_EOS;

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

-

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

-mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
+mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)

 {
        enum mdoct        tok;
        int               i, sv;
 {
        enum mdoct        tok;
        int               i, sv;


@@ -852,21 +846,21 @@ mdoc_pmacro(struct mdoc *m, 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(m, ln, offs, MANDOCERR_BADCOMMENT);
+               mdoc_pmsg(mdoc, ln, offs, MANDOCERR_BADCOMMENT);

                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';


@@ -874,8 +868,8 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
        tok = (i > 1 || i < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
 
        if (MDOC_MAX == tok) {
        tok = (i > 1 || i < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
 
        if (MDOC_MAX == tok) {

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

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


@@ -889,27 +883,27 @@ mdoc_pmacro(struct mdoc *m, 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(m, ln, offs - 1, MANDOCERR_EOLNSPACE);
+               mdoc_pmsg(mdoc, ln, offs - 1, MANDOCERR_EOLNSPACE);

 
        /*
         * 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 == m->last || MDOC_It == tok || MDOC_El == tok) {
-               if ( ! mdoc_macro(m, tok, ln, sv, &offs, buf)) 
+       if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) {
+               if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf))

                        goto err;
                return(1);
        }
 
                        goto err;
                return(1);
        }
 

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

 
        /*
         * If the first macro of a `Bl -column', open an `It' block
 
        /*
         * If the first macro of a `Bl -column', open an `It' block


@@ -917,9 +911,9 @@ mdoc_pmacro(struct mdoc *m, 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) {
-               m->flags |= MDOC_FREECOL;
-               if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf))
+           LIST_column == n->norm->Bl.type) {
+               mdoc->flags |= MDOC_FREECOL;
+               if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf))

                        goto err;
                return(1);
        }
                        goto err;
                return(1);
        }


@@ -931,25 +925,31 @@ mdoc_pmacro(struct mdoc *m, 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) {
-               m->flags |= MDOC_FREECOL;
-               if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
+           NULL != n->parent &&
+           MDOC_Bl == n->parent->tok &&
+           LIST_column == n->parent->norm->Bl.type) {
+               mdoc->flags |= MDOC_FREECOL;
+               if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf))

                        goto err;
                return(1);
        }
 
        /* Normal processing of a macro. */
 
                        goto err;
                return(1);
        }
 
        /* Normal processing of a macro. */
 

-       if ( ! mdoc_macro(m, tok, ln, sv, &offs, buf)) 
+       if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf))

                goto err;
 
                goto err;
 

+       /* In quick mode (for mandocdb), abort after the NAME section. */
+
+       if (mdoc->quick && MDOC_Sh == tok &&
+           SEC_NAME != mdoc->last->sec)
+               return(2);
+

        return(1);
 
 err:   /* Error out. */
 
        return(1);
 
 err:   /* Error out. */
 

-       m->flags |= MDOC_HALT;
+       mdoc->flags |= MDOC_HALT;

        return(0);
 }
 
        return(0);
 }
 


@@ -962,27 +962,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);


@@ -998,3 +998,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;
+}