fix -Tascii .Fd line breaking

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 586770626c1cafcbd23e3364e5c81ef1f22940e9..d4a0b8d329a7048e4a53360d57fd21eda4623ac6 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_validate.c,v 1.158 2011/03/07 01:35:51 schwarze Exp $ */
+/*     $Id: mdoc_validate.c,v 1.184 2012/05/27 17:48:57 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011, 2012 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


@@ -33,6 +33,7 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 

+#include "mdoc.h"

 #include "mandoc.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 #include "libmandoc.h"


@@ -71,9 +72,9 @@ static        void     check_text(struct mdoc *, int, int, char *);
 static void     check_argv(struct mdoc *, 
                        struct mdoc_node *, struct mdoc_argv *);
 static void     check_args(struct mdoc *, struct mdoc_node *);
 static void     check_argv(struct mdoc *, 
                        struct mdoc_node *, struct mdoc_argv *);
 static void     check_args(struct mdoc *, struct mdoc_node *);

-
-static int      concat(struct mdoc *, char *, 
-                       const struct mdoc_node *, size_t);
+static int      concat(char *, const struct mdoc_node *, size_t);
+static enum mdoc_sec   a2sec(const char *);
+static size_t          macro2len(enum mdoct);

 
 static int      ebool(POST_ARGS);
 static int      berr_ge1(POST_ARGS);
 
 static int      ebool(POST_ARGS);
 static int      berr_ge1(POST_ARGS);


@@ -152,9 +153,9 @@ static      v_post   posts_notext[] = { ewarn_eq0, NULL };
 static v_post   posts_ns[] = { post_ns, NULL };
 static v_post   posts_os[] = { post_os, post_prol, NULL };
 static v_post   posts_rs[] = { post_rs, NULL };
 static v_post   posts_ns[] = { post_ns, NULL };
 static v_post   posts_os[] = { post_os, post_prol, NULL };
 static v_post   posts_rs[] = { post_rs, NULL };

-static v_post   posts_sh[] = { post_ignpar, hwarn_ge1, bwarn_ge1, post_sh, NULL };
+static v_post   posts_sh[] = { post_ignpar, hwarn_ge1, post_sh, NULL };

 static v_post   posts_sp[] = { ewarn_le1, NULL };
 static v_post   posts_sp[] = { ewarn_le1, NULL };

-static v_post   posts_ss[] = { post_ignpar, hwarn_ge1, bwarn_ge1, NULL };
+static v_post   posts_ss[] = { post_ignpar, hwarn_ge1, NULL };

 static v_post   posts_st[] = { post_st, NULL };
 static v_post   posts_std[] = { post_std, NULL };
 static v_post   posts_text[] = { ewarn_ge1, NULL };
 static v_post   posts_st[] = { post_st, NULL };
 static v_post   posts_std[] = { post_std, NULL };
 static v_post   posts_text[] = { ewarn_ge1, NULL };


@@ -177,7 +178,7 @@ static      v_pre    pres_sh[] = { pre_sh, NULL };
 static v_pre    pres_ss[] = { pre_ss, NULL };
 static v_pre    pres_std[] = { pre_std, NULL };
 
 static v_pre    pres_ss[] = { pre_ss, NULL };
 static v_pre    pres_std[] = { pre_std, NULL };
 

-const  struct valids mdoc_valids[MDOC_MAX] = {
+static const struct valids mdoc_valids[MDOC_MAX] = {

        { NULL, NULL },                         /* Ap */
        { pres_dd, posts_dd },                  /* Dd */
        { pres_dt, posts_dt },                  /* Dt */
        { NULL, NULL },                         /* Ap */
        { pres_dd, posts_dd },                  /* Dd */
        { pres_dt, posts_dt },                  /* Dt */


@@ -321,6 +322,30 @@ static     const enum mdoct rsord[RSORD_MAX] = {
        MDOC__U
 };
 
        MDOC__U
 };
 

+static const char * const secnames[SEC__MAX] = {
+       NULL,
+       "NAME",
+       "LIBRARY",
+       "SYNOPSIS",
+       "DESCRIPTION",
+       "IMPLEMENTATION NOTES",
+       "RETURN VALUES",
+       "ENVIRONMENT",
+       "FILES",
+       "EXIT STATUS",
+       "EXAMPLES",
+       "DIAGNOSTICS",
+       "COMPATIBILITY",
+       "ERRORS",
+       "SEE ALSO",
+       "STANDARDS",
+       "HISTORY",
+       "AUTHORS",
+       "CAVEATS",
+       "BUGS",
+       "SECURITY CONSIDERATIONS",
+       NULL
+};

 
 int
 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)
 
 int
 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)


@@ -420,10 +445,10 @@ check_count(struct mdoc *m, enum mdoc_type type,
        }
 
        t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT;
        }
 
        t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT;

-
-       return(mdoc_vmsg(m, t, m->last->line, m->last->pos,
+       mandoc_vmsg(t, m->parse, m->last->line, m->last->pos,

                        "want %s%d children (have %d)",
                        "want %s%d children (have %d)",

-                       p, val, m->last->nchild));
+                       p, val, m->last->nchild);
+       return(1);

 }
 
 static int
 }
 
 static int


@@ -518,32 +543,13 @@ check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v)
 static void
 check_text(struct mdoc *m, int ln, int pos, char *p)
 {
 static void
 check_text(struct mdoc *m, int ln, int pos, char *p)
 {

-       int              c;
-       size_t           sz;
-
-       for ( ; *p; p++, pos++) {
-               sz = strcspn(p, "\t\\");
-               p += (int)sz;
-
-               if ('\0' == *p)
-                       break;
+       char            *cp;

 
 

-               pos += (int)sz;
-
-               if ('\t' == *p) {
-                       if ( ! (MDOC_LITERAL & m->flags))
-                               mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB);
-                       continue;
-               }
-
-               if (0 == (c = mandoc_special(p))) {
-                       mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE);
-                       continue;
-               }
+       if (MDOC_LITERAL & m->flags)
+               return;

 
 

-               p += c - 1;
-               pos += c - 1;
-       }
+       for (cp = p; NULL != (p = strchr(p, '\t')); p++)
+               mdoc_pmsg(m, ln, pos + (int)(p - cp), MANDOCERR_BADTAB);

 }
 
 static int
 }
 
 static int


@@ -555,10 +561,9 @@ check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
                        (t == n->parent->type))
                return(1);
 
                        (t == n->parent->type))
                return(1);
 

-       mdoc_vmsg(mdoc, MANDOCERR_SYNTCHILD,
-                               n->line, n->pos, "want parent %s",
-                               MDOC_ROOT == t ? "<root>" : 
-                                       mdoc_macronames[tok]);
+       mandoc_vmsg(MANDOCERR_SYNTCHILD, mdoc->parse, n->line, 
+                       n->pos, "want parent %s", MDOC_ROOT == t ? 
+                       "<root>" : mdoc_macronames[tok]);

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


@@ -656,8 +661,13 @@ pre_bl(PRE_ARGS)
                        comp = 1;
                        break;
                case (MDOC_Width):
                        comp = 1;
                        break;
                case (MDOC_Width):

-                       dup = (NULL != n->norm->Bl.width);
-                       width = n->args->argv[i].value[0];
+                       /* NB: this can be empty! */
+                       if (n->args->argv[i].sz) {
+                               width = n->args->argv[i].value[0];
+                               dup = (NULL != n->norm->Bl.width);
+                               break;
+                       }
+                       mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);

                        break;
                case (MDOC_Offset):
                        /* NB: this can be empty! */
                        break;
                case (MDOC_Offset):
                        /* NB: this can be empty! */


@@ -697,7 +707,7 @@ pre_bl(PRE_ARGS)
                        if (LIST_column == lt) {
                                n->norm->Bl.ncols = 
                                        n->args->argv[i].sz;
                        if (LIST_column == lt) {
                                n->norm->Bl.ncols = 
                                        n->args->argv[i].sz;

-                               n->norm->Bl.cols = (const char **)
+                               n->norm->Bl.cols = (void *)

                                        n->args->argv[i].value;
                        }
                }
                                        n->args->argv[i].value;
                        }
                }


@@ -865,7 +875,7 @@ pre_sh(PRE_ARGS)
        if (MDOC_BLOCK != n->type)
                return(1);
 
        if (MDOC_BLOCK != n->type)
                return(1);
 

-       mdoc->regs->regs[(int)REG_nS].set = 0;
+       roff_regunset(mdoc->roff, REG_nS);

        return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT));
 }
 
        return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT));
 }
 


@@ -1099,6 +1109,7 @@ static int
 post_nm(POST_ARGS)
 {
        char             buf[BUFSIZ];
 post_nm(POST_ARGS)
 {
        char             buf[BUFSIZ];

+       int              c;

 
        /* If no child specified, make sure we have the meta name. */
 
 
        /* If no child specified, make sure we have the meta name. */
 


@@ -1110,11 +1121,14 @@ post_nm(POST_ARGS)
 
        /* If no meta name, set it from the child. */
 
 
        /* If no meta name, set it from the child. */
 

-       if ( ! concat(mdoc, buf, mdoc->last->child, BUFSIZ))
+       buf[0] = '\0';
+       if (-1 == (c = concat(buf, mdoc->last->child, BUFSIZ))) {
+               mdoc_nmsg(mdoc, mdoc->last->child, MANDOCERR_MEM);

                return(0);
                return(0);

+       }

 
 

+       assert(c);

        mdoc->meta.name = mandoc_strdup(buf);
        mdoc->meta.name = mandoc_strdup(buf);

-

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


@@ -1240,7 +1254,7 @@ post_an(POST_ARGS)
 static int
 post_it(POST_ARGS)
 {
 static int
 post_it(POST_ARGS)
 {

-       int               i, cols, rc;
+       int               i, cols;

        enum mdoc_list    lt;
        struct mdoc_node *n, *c;
        enum mandocerr    er;
        enum mdoc_list    lt;
        struct mdoc_node *n, *c;
        enum mandocerr    er;


@@ -1306,10 +1320,10 @@ post_it(POST_ARGS)
                else
                        er = MANDOCERR_SYNTARGCOUNT;
 
                else
                        er = MANDOCERR_SYNTARGCOUNT;
 

-               rc = mdoc_vmsg(mdoc, er, 
-                               mdoc->last->line, mdoc->last->pos, 
+               mandoc_vmsg(er, mdoc->parse, mdoc->last->line, 
+                               mdoc->last->pos, 

                                "columns == %d (have %d)", cols, i);
                                "columns == %d (have %d)", cols, i);

-               return(rc);
+               return(MANDOCERR_ARGCOUNT == er);

        default:
                break;
        }
        default:
                break;
        }


@@ -1370,7 +1384,7 @@ post_bl_block_width(POST_ARGS)
                width = 6;
        else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width)))
                return(1);
                width = 6;
        else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width)))
                return(1);

-       else if (0 == (width = mdoc_macro2len(tok)))  {
+       else if (0 == (width = macro2len(tok)))  {

                mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH);
                return(1);
        }
                mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH);
                return(1);
        }


@@ -1385,7 +1399,7 @@ post_bl_block_width(POST_ARGS)
 
        assert(i < (int)n->args->argc);
 
 
        assert(i < (int)n->args->argc);
 

-       snprintf(buf, NUMSIZ, "%zun", width);
+       snprintf(buf, NUMSIZ, "%un", (unsigned int)width);

        free(n->args->argv[i].value[0]);
        n->args->argv[i].value[0] = mandoc_strdup(buf);
 
        free(n->args->argv[i].value[0]);
        n->args->argv[i].value[0] = mandoc_strdup(buf);
 


@@ -1427,7 +1441,7 @@ post_bl_block_tag(POST_ARGS)
                        break;
                }
 
                        break;
                }
 

-               if (0 != (ssz = mdoc_macro2len(nn->tok)))
+               if (0 != (ssz = macro2len(nn->tok)))

                        sz = ssz;
 
                break;
                        sz = ssz;
 
                break;


@@ -1435,7 +1449,7 @@ post_bl_block_tag(POST_ARGS)
 
        /* Defaults to ten ens. */
 
 
        /* Defaults to ten ens. */
 

-       snprintf(buf, NUMSIZ, "%zun", sz);
+       snprintf(buf, NUMSIZ, "%un", (unsigned int)sz);

 
        /*
         * We have to dynamically add this to the macro's argument list.
 
        /*
         * We have to dynamically add this to the macro's argument list.


@@ -1501,7 +1515,7 @@ post_bl_head(POST_ARGS)
        assert(0 == np->args->argv[j].sz);
 
        /*
        assert(0 == np->args->argv[j].sz);
 
        /*

-        * Accomodate for new-style groff column syntax.  Shuffle the
+        * Accommodate for new-style groff column syntax.  Shuffle the

         * child nodes, all of which must be TEXT, as arguments for the
         * column field.  Then, delete the head children.
         */
         * child nodes, all of which must be TEXT, as arguments for the
         * column field.  Then, delete the head children.
         */


@@ -1511,7 +1525,7 @@ post_bl_head(POST_ARGS)
                ((size_t)mdoc->last->nchild * sizeof(char *));
 
        mdoc->last->norm->Bl.ncols = np->args->argv[j].sz;
                ((size_t)mdoc->last->nchild * sizeof(char *));
 
        mdoc->last->norm->Bl.ncols = np->args->argv[j].sz;

-       mdoc->last->norm->Bl.cols = (const char **)np->args->argv[j].value;
+       mdoc->last->norm->Bl.cols = (void *)np->args->argv[j].value;

 
        for (i = 0, nn = mdoc->last->child; nn; i++) {
                np->args->argv[j].value[i] = nn->string;
 
        for (i = 0, nn = mdoc->last->child; nn; i++) {
                np->args->argv[j].value[i] = nn->string;


@@ -1684,6 +1698,14 @@ post_rs(POST_ARGS)
                mdoc_node_delete(mdoc, nn);
        }
 
                mdoc_node_delete(mdoc, nn);
        }
 

+       /*
+        * Nothing to sort if only invalid nodes were found
+        * inside the `Rs' body.
+        */
+
+       if (NULL == mdoc->last->child)
+               return(1);
+

        /*
         * The full `Rs' block needs special handling to order the
         * sub-elements according to `rsord'.  Pick through each element
        /*
         * The full `Rs' block needs special handling to order the
         * sub-elements according to `rsord'.  Pick through each element


@@ -1809,7 +1831,9 @@ static int
 post_sh_head(POST_ARGS)
 {
        char             buf[BUFSIZ];
 post_sh_head(POST_ARGS)
 {
        char             buf[BUFSIZ];

+       struct mdoc_node *n;

        enum mdoc_sec    sec;
        enum mdoc_sec    sec;

+       int              c;

 
        /*
         * Process a new section.  Sections are either "named" or
 
        /*
         * Process a new section.  Sections are either "named" or


@@ -1818,10 +1842,13 @@ post_sh_head(POST_ARGS)
         * manual sections.
         */
 
         * manual sections.
         */
 

-       if ( ! concat(mdoc, buf, mdoc->last->child, BUFSIZ))
+       sec = SEC_CUSTOM;
+       buf[0] = '\0';
+       if (-1 == (c = concat(buf, mdoc->last->child, BUFSIZ))) {
+               mdoc_nmsg(mdoc, mdoc->last->child, MANDOCERR_MEM);

                return(0);
                return(0);

-
-       sec = mdoc_str2sec(buf);
+       } else if (1 == c)
+               sec = a2sec(buf);

 
        /* The NAME should be first. */
 
 
        /* The NAME should be first. */
 


@@ -1839,6 +1866,20 @@ post_sh_head(POST_ARGS)
 
        mdoc->lastsec = sec;
 
 
        mdoc->lastsec = sec;
 

+       /*
+        * Set the section attribute for the current HEAD, for its
+        * parent BLOCK, and for the HEAD children; the latter can
+        * only be TEXT nodes, so no recursion is needed.
+        * For other blocks and elements, including .Sh BODY, this is
+        * done when allocating the node data structures, but for .Sh
+        * BLOCK and HEAD, the section is still unknown at that time.
+        */
+
+       mdoc->last->parent->sec = sec;
+       mdoc->last->sec = sec;
+       for (n = mdoc->last->child; n; n = n->next)
+               n->sec = sec;
+

        /* We don't care about custom sections after this. */
 
        if (SEC_CUSTOM == sec)
        /* We don't care about custom sections after this. */
 
        if (SEC_CUSTOM == sec)


@@ -1970,22 +2011,27 @@ post_dd(POST_ARGS)
 {
        char              buf[DATESIZE];
        struct mdoc_node *n;
 {
        char              buf[DATESIZE];
        struct mdoc_node *n;

+       int               c;

 
        if (mdoc->meta.date)
                free(mdoc->meta.date);
 
        n = mdoc->last;
        if (NULL == n->child || '\0' == n->child->string[0]) {
 
        if (mdoc->meta.date)
                free(mdoc->meta.date);
 
        n = mdoc->last;
        if (NULL == n->child || '\0' == n->child->string[0]) {

-               mdoc->meta.date = mandoc_normdate(NULL,
-                   mdoc->msg, mdoc->data, n->line, n->pos);
+               mdoc->meta.date = mandoc_normdate
+                       (mdoc->parse, NULL, n->line, n->pos);

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

-       if ( ! concat(mdoc, buf, n->child, DATESIZE))
+       buf[0] = '\0';
+       if (-1 == (c = concat(buf, n->child, DATESIZE))) {
+               mdoc_nmsg(mdoc, n->child, MANDOCERR_MEM);

                return(0);
                return(0);

+       }

 
 

-       mdoc->meta.date = mandoc_normdate(buf,
-           mdoc->msg, mdoc->data, n->line, n->pos);
+       assert(c);
+       mdoc->meta.date = mandoc_normdate
+               (mdoc->parse, buf, n->line, n->pos);

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


@@ -2012,7 +2058,7 @@ post_dt(POST_ARGS)
 
        if (NULL != (nn = n->child))
                for (p = nn->string; *p; p++) {
 
        if (NULL != (nn = n->child))
                for (p = nn->string; *p; p++) {

-                       if (toupper((u_char)*p) == *p)
+                       if (toupper((unsigned char)*p) == *p)

                                continue;
 
                        /* 
                                continue;
 
                        /* 


@@ -2058,7 +2104,7 @@ post_dt(POST_ARGS)
         *       arch = NULL
         */
 
         *       arch = NULL
         */
 

-       cp = mdoc_a2msec(nn->string);
+       cp = mandoc_a2msec(nn->string);

        if (cp) {
                mdoc->meta.vol = mandoc_strdup(cp);
                mdoc->meta.msec = mandoc_strdup(nn->string);
        if (cp) {
                mdoc->meta.vol = mandoc_strdup(cp);
                mdoc->meta.msec = mandoc_strdup(nn->string);


@@ -2127,7 +2173,8 @@ post_bx(POST_ARGS)
 
        n = mdoc->last->child;
        if (n && NULL != (n = n->next))
 
        n = mdoc->last->child;
        if (n && NULL != (n = n->next))

-               *n->string = toupper((unsigned char)*n->string);
+               *n->string = (char)toupper
+                       ((unsigned char)*n->string);

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


@@ -2137,6 +2184,7 @@ post_os(POST_ARGS)
 {
        struct mdoc_node *n;
        char              buf[BUFSIZ];
 {
        struct mdoc_node *n;
        char              buf[BUFSIZ];

+       int               c;

 #ifndef OSNAME
        struct utsname    utsname;
 #endif
 #ifndef OSNAME
        struct utsname    utsname;
 #endif


@@ -2144,30 +2192,36 @@ post_os(POST_ARGS)
        n = mdoc->last;
 
        /*
        n = mdoc->last;
 
        /*

-        * Set the operating system by way of the `Os' macro.  Note that
-        * if an argument isn't provided and -DOSNAME="\"foo\"" is
-        * provided during compilation, this value will be used instead
-        * of filling in "sysname release" from uname().
+        * Set the operating system by way of the `Os' macro.
+        * The order of precedence is:
+        * 1. the argument of the `Os' macro, unless empty
+        * 2. the -Ios=foo command line argument, if provided
+        * 3. -DOSNAME="\"foo\"", if provided during compilation
+        * 4. "sysname release" from uname(3)

         */
 
         */
 

-       if (mdoc->meta.os)
-               free(mdoc->meta.os);
+       free(mdoc->meta.os);

 
 

-       if ( ! concat(mdoc, buf, n->child, BUFSIZ))
+       buf[0] = '\0';
+       if (-1 == (c = concat(buf, n->child, BUFSIZ))) {
+               mdoc_nmsg(mdoc, n->child, MANDOCERR_MEM);

                return(0);
                return(0);

+       }

 
 

-       /* XXX: yes, these can all be dynamically-adjusted buffers, but
-        * it's really not worth the extra hackery.
-        */
+       assert(c);

 
        if ('\0' == buf[0]) {
 
        if ('\0' == buf[0]) {

+               if (mdoc->defos) {
+                       mdoc->meta.os = mandoc_strdup(mdoc->defos);
+                       return(1);
+               }

 #ifdef OSNAME
                if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) {
                        mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
                        return(0);
                }
 #else /*!OSNAME */
 #ifdef OSNAME
                if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) {
                        mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
                        return(0);
                }
 #else /*!OSNAME */

-               if (uname(&utsname)) {
+               if (-1 == uname(&utsname)) {

                        mdoc_nmsg(mdoc, n, MANDOCERR_UNAME);
                         mdoc->meta.os = mandoc_strdup("UNKNOWN");
                         return(post_prol(mdoc));
                        mdoc_nmsg(mdoc, n, MANDOCERR_UNAME);
                         mdoc->meta.os = mandoc_strdup("UNKNOWN");
                         return(post_prol(mdoc));


@@ -2221,36 +2275,130 @@ post_std(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 

+/*
+ * Concatenate a node, stopping at the first non-text.
+ * Concatenation is separated by a single whitespace.  
+ * Returns -1 on fatal (string overrun) error, 0 if child nodes were
+ * encountered, 1 otherwise.
+ */

 static int
 static int

-concat(struct mdoc *m, char *p, const struct mdoc_node *n, size_t sz)
+concat(char *p, const struct mdoc_node *n, size_t sz)

 {
 
 {
 

-       p[0] = '\0';
+       for ( ; NULL != n; n = n->next) {
+               if (MDOC_TEXT != n->type) 
+                       return(0);
+               if ('\0' != p[0] && strlcat(p, " ", sz) >= sz)
+                       return(-1);
+               if (strlcat(p, n->string, sz) >= sz)
+                       return(-1);
+               concat(p, n->child, sz);
+       }

 
 

-       /*
-        * Concatenate sibling nodes together.  All siblings must be of
-        * type MDOC_TEXT or an assertion is raised.  Concatenation is
-        * separated by a single whitespace.  Returns 0 on fatal (string
-        * overrun) error.
-        */
+       return(1);
+}

 
 

-       for ( ; n; n = n->next) {
-               assert(MDOC_TEXT == n->type);
+static enum mdoc_sec 
+a2sec(const char *p)
+{
+       int              i;

 
 

-               if (strlcat(p, n->string, sz) >= sz) {
-                       mdoc_nmsg(m, n, MANDOCERR_MEM);
-                       return(0);
-               }
+       for (i = 0; i < (int)SEC__MAX; i++) 
+               if (secnames[i] && 0 == strcmp(p, secnames[i]))
+                       return((enum mdoc_sec)i);

 
 

-               if (NULL == n->next)
-                       continue;
+       return(SEC_CUSTOM);
+}

 
 

-               if (strlcat(p, " ", sz) >= sz) {
-                       mdoc_nmsg(m, n, MANDOCERR_MEM);
-                       return(0);
-               }
-       }
+static size_t
+macro2len(enum mdoct macro)
+{

 
 

-       return(1);
+       switch (macro) {
+       case(MDOC_Ad):
+               return(12);
+       case(MDOC_Ao):
+               return(12);
+       case(MDOC_An):
+               return(12);
+       case(MDOC_Aq):
+               return(12);
+       case(MDOC_Ar):
+               return(12);
+       case(MDOC_Bo):
+               return(12);
+       case(MDOC_Bq):
+               return(12);
+       case(MDOC_Cd):
+               return(12);
+       case(MDOC_Cm):
+               return(10);
+       case(MDOC_Do):
+               return(10);
+       case(MDOC_Dq):
+               return(12);
+       case(MDOC_Dv):
+               return(12);
+       case(MDOC_Eo):
+               return(12);
+       case(MDOC_Em):
+               return(10);
+       case(MDOC_Er):
+               return(17);
+       case(MDOC_Ev):
+               return(15);
+       case(MDOC_Fa):
+               return(12);
+       case(MDOC_Fl):
+               return(10);
+       case(MDOC_Fo):
+               return(16);
+       case(MDOC_Fn):
+               return(16);
+       case(MDOC_Ic):
+               return(10);
+       case(MDOC_Li):
+               return(16);
+       case(MDOC_Ms):
+               return(6);
+       case(MDOC_Nm):
+               return(10);
+       case(MDOC_No):
+               return(12);
+       case(MDOC_Oo):
+               return(10);
+       case(MDOC_Op):
+               return(14);
+       case(MDOC_Pa):
+               return(32);
+       case(MDOC_Pf):
+               return(12);
+       case(MDOC_Po):
+               return(12);
+       case(MDOC_Pq):
+               return(12);
+       case(MDOC_Ql):
+               return(16);
+       case(MDOC_Qo):
+               return(12);
+       case(MDOC_So):
+               return(12);
+       case(MDOC_Sq):
+               return(12);
+       case(MDOC_Sy):
+               return(6);
+       case(MDOC_Sx):
+               return(16);
+       case(MDOC_Tn):
+               return(10);
+       case(MDOC_Va):
+               return(12);
+       case(MDOC_Vt):
+               return(12);
+       case(MDOC_Xr):
+               return(10);
+       default:
+               break;
+       };
+       return(0);

 }
 }

-