Clean up the warnings related to document structure.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 4be408383592bd13557caae2c7d49cda6aa6254f..04e9d9724864e1881dfb1ce71e1d557f78d9e26f 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.211 2014/03/23 12:44:56 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.216 2014/07/01 22:37:15 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>


@@ -35,7 +35,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",


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


@@ -67,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",           "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"
        };


@@ -91,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);


@@ -105,6 +99,7 @@ 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)
 {


@@ -113,7 +108,6 @@ mdoc_node(const struct mdoc *mdoc)
        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)
 {


@@ -122,7 +116,6 @@ mdoc_meta(const struct mdoc *mdoc)
        return(&mdoc->meta);
 }
 
        return(&mdoc->meta);
 }
 

-

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


@@ -148,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).
  */


@@ -166,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


@@ -181,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.


@@ -194,9 +184,8 @@ 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,


@@ -216,7 +205,6 @@ 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.
 /*
  * Climb back up the parse tree, validating open scopes.  Mostly calls
  * through to macro_end() in macro.c.


@@ -280,7 +268,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()).


@@ -305,8 +292,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


@@ -316,17 +303,19 @@ 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 & mdoc->flags) {
-               mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADBODY);
+       if (MDOC_PROLOGUE & mdoc_macros[tok].flags &&
+           MDOC_PBODY & mdoc->flags) {
+               mandoc_vmsg(MANDOCERR_PROLOG_ONLY, mdoc->parse,
+                   line, ppos, "%s", mdoc_macronames[tok]);

                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 & mdoc->flags)) {
-               mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADPROLOG);
+       if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&
+            ! (MDOC_PBODY & mdoc->flags)) {
+               mandoc_vmsg(MANDOCERR_PROLOG_BAD, mdoc->parse,
+                   line, ppos, "%s", mdoc_macronames[tok]);

                if (NULL == mdoc->meta.msec)
                        mdoc->meta.msec = mandoc_strdup("1");
                if (NULL == mdoc->meta.title)
                if (NULL == mdoc->meta.msec)
                        mdoc->meta.msec = mandoc_strdup("1");
                if (NULL == mdoc->meta.title)


@@ -354,12 +343,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;


@@ -376,13 +365,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:


@@ -393,15 +382,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);


@@ -414,9 +403,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;


@@ -427,9 +416,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;


@@ -455,7 +443,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)
 {


@@ -468,7 +455,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)
 {


@@ -484,7 +470,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)
 {


@@ -497,7 +482,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)


@@ -514,9 +498,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;


@@ -527,13 +510,13 @@ 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_Rs:

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


@@ -546,9 +529,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;


@@ -559,7 +541,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:


@@ -615,7 +597,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)
 {


@@ -653,7 +634,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)
 {


@@ -724,7 +704,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);
 }


@@ -758,16 +738,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));


@@ -853,7 +833,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.


@@ -876,23 +855,23 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
 
        sv = offs;
 
 
        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_vmsg(MANDOCERR_MACRO, mdoc->parse,
+                   ln, sv, "%s", buf + sv - 1);

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


@@ -906,7 +885,7 @@ 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.
         */
         * Trailing whitespace.  Note that tabs are allowed to be passed
         * into the parser as "text", so we only warn about spaces here.
         */


@@ -920,7 +899,7 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
         */
 
        if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) {
         */
 
        if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) {

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

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


@@ -934,7 +913,7 @@ 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;
                if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf))
                        goto err;
                mdoc->flags |= MDOC_FREECOL;
                if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf))
                        goto err;


@@ -948,18 +927,18 @@ 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)) 
+               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(mdoc, tok, ln, sv, &offs, buf)) 
+       if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf))

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


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