Remove a redundant condition in .%T handling, no functional change.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index d37ab8a4fb467d6ed71d15518124a386bf836389..ccd66272f2401087954699cb21397c8c468b6347 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc.c,v 1.247 2015/04/19 13:50:26 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.261 2017/03/03 13:55:31 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-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2017 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


@@ -36,6 +36,7 @@
 #include "libmdoc.h"
 
 const  char *const __mdoc_macronames[MDOC_MAX + 1] = {
 #include "libmdoc.h"
 
 const  char *const __mdoc_macronames[MDOC_MAX + 1] = {

+       "text",

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


@@ -66,8 +67,8 @@ const char *const __mdoc_macronames[MDOC_MAX + 1] = {
        "Lk",           "Mt",           "Brq",          "Bro",
        "Brc",          "%C",           "Es",           "En",
        "Dx",           "%Q",           "br",           "sp",
        "Lk",           "Mt",           "Brq",          "Bro",
        "Brc",          "%C",           "Es",           "En",
        "Dx",           "%Q",           "br",           "sp",

-       "%U",           "Ta",           "ll",           "text",
-       };
+       "%U",           "Ta",           "ll",
+};

 
 const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {
        "split",                "nosplit",              "ragged",
 
 const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {
        "split",                "nosplit",              "ragged",


@@ -81,45 +82,13 @@ const       char *const __mdoc_argnames[MDOC_ARG_MAX] = {
        "symbolic",             "nested",               "centered"
        };
 
        "symbolic",             "nested",               "centered"
        };
 

-const  char * const *mdoc_macronames = __mdoc_macronames;
+const  char * const *mdoc_macronames = __mdoc_macronames + 1;

 const  char * const *mdoc_argnames = __mdoc_argnames;
 
 static int               mdoc_ptext(struct roff_man *, int, char *, int);
 static int               mdoc_pmacro(struct roff_man *, int, char *, int);
 
 
 const  char * const *mdoc_argnames = __mdoc_argnames;
 
 static int               mdoc_ptext(struct roff_man *, int, char *, int);
 static int               mdoc_pmacro(struct roff_man *, int, char *, int);
 
 

-void
-mdoc_endparse(struct roff_man *mdoc)
-{
-
-       mdoc_macroend(mdoc);
-}
-
-void
-mdoc_addeqn(struct roff_man *mdoc, const struct eqn *ep)
-{
-       struct roff_node *n;
-
-       n = roff_node_alloc(mdoc, ep->ln, ep->pos, ROFFT_EQN, MDOC_MAX);
-       n->eqn = ep;
-       if (ep->ln > mdoc->last->line)
-               n->flags |= MDOC_LINE;
-       roff_node_append(mdoc, n);
-       mdoc->next = ROFF_NEXT_SIBLING;
-}
-
-void
-mdoc_addspan(struct roff_man *mdoc, const struct tbl_span *sp)
-{
-       struct roff_node *n;
-
-       n = roff_node_alloc(mdoc, sp->line, 0, ROFFT_TBL, MDOC_MAX);
-       n->span = sp;
-       roff_node_append(mdoc, n);
-       mdoc_valid_post(mdoc);
-       mdoc->next = ROFF_NEXT_SIBLING;
-}
-

 /*
  * 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()).


@@ -142,34 +111,16 @@ mdoc_parseln(struct roff_man *mdoc, int ln, char *buf, int offs)
        else
                mdoc->flags &= ~MDOC_SYNOPSIS;
 
        else
                mdoc->flags &= ~MDOC_SYNOPSIS;
 

-       return(roff_getcontrol(mdoc->roff, buf, &offs) ?
+       return roff_getcontrol(mdoc->roff, buf, &offs) ?

            mdoc_pmacro(mdoc, ln, buf, offs) :
            mdoc_pmacro(mdoc, ln, buf, offs) :

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

 }
 
 void
 mdoc_macro(MACRO_PROT_ARGS)
 {
 }
 
 void
 mdoc_macro(MACRO_PROT_ARGS)
 {

-       assert(tok < MDOC_MAX);
-
-       if (mdoc->flags & MDOC_PBODY) {
-               if (tok == MDOC_Dt) {
-                       mandoc_vmsg(MANDOCERR_DT_LATE,
-                           mdoc->parse, line, ppos,
-                           "Dt %s", buf + *pos);
-                       return;
-               }
-       } else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) {
-               if (mdoc->meta.title == NULL) {
-                       mandoc_vmsg(MANDOCERR_DT_NOTITLE,
-                           mdoc->parse, line, ppos, "%s %s",
-                           mdoc_macronames[tok], buf + *pos);
-                       mdoc->meta.title = mandoc_strdup("UNTITLED");
-               }
-               if (NULL == mdoc->meta.vol)
-                       mdoc->meta.vol = mandoc_strdup("LOCAL");
-               mdoc->flags |= MDOC_PBODY;
-       }
+       assert(tok > TOKEN_NONE && tok < MDOC_MAX);
+

        (*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf);
 }
 
        (*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf);
 }
 


@@ -185,19 +136,19 @@ mdoc_tail_alloc(struct roff_man *mdoc, int line, int pos, int tok)
 
 struct roff_node *
 mdoc_endbody_alloc(struct roff_man *mdoc, int line, int pos, int tok,
 
 struct roff_node *
 mdoc_endbody_alloc(struct roff_man *mdoc, int line, int pos, int tok,

-               struct roff_node *body, enum mdoc_endbody end)
+               struct roff_node *body)

 {
        struct roff_node *p;
 
 {
        struct roff_node *p;
 

-       body->flags |= MDOC_ENDED;
-       body->parent->flags |= MDOC_ENDED;
+       body->flags |= NODE_ENDED;
+       body->parent->flags |= NODE_ENDED;

        p = roff_node_alloc(mdoc, line, pos, ROFFT_BODY, tok);
        p->body = body;
        p->norm = body->norm;
        p = roff_node_alloc(mdoc, line, pos, ROFFT_BODY, tok);
        p->body = body;
        p->norm = body->norm;

-       p->end = end;
+       p->end = ENDBODY_SPACE;

        roff_node_append(mdoc, p);
        mdoc->next = ROFF_NEXT_SIBLING;
        roff_node_append(mdoc, p);
        mdoc->next = ROFF_NEXT_SIBLING;

-       return(p);
+       return p;

 }
 
 struct roff_node *
 }
 
 struct roff_node *


@@ -213,13 +164,9 @@ mdoc_block_alloc(struct roff_man *mdoc, int line, int pos,
 
        switch (tok) {
        case MDOC_Bd:
 
        switch (tok) {
        case MDOC_Bd:

-               /* FALLTHROUGH */

        case MDOC_Bf:
        case MDOC_Bf:

-               /* FALLTHROUGH */

        case MDOC_Bl:
        case MDOC_Bl:

-               /* FALLTHROUGH */

        case MDOC_En:
        case MDOC_En:

-               /* FALLTHROUGH */

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


@@ -228,7 +175,7 @@ mdoc_block_alloc(struct roff_man *mdoc, int line, int pos,
        }
        roff_node_append(mdoc, p);
        mdoc->next = ROFF_NEXT_CHILD;
        }
        roff_node_append(mdoc, p);
        mdoc->next = ROFF_NEXT_CHILD;

-       return(p);
+       return p;

 }
 
 void
 }
 
 void


@@ -253,38 +200,12 @@ mdoc_elem_alloc(struct roff_man *mdoc, int line, int pos,
        mdoc->next = ROFF_NEXT_CHILD;
 }
 
        mdoc->next = ROFF_NEXT_CHILD;
 }
 

-void
-mdoc_word_alloc(struct roff_man *mdoc, int line, int pos, const char *p)
-{
-       struct roff_node *n;
-
-       n = roff_node_alloc(mdoc, line, pos, ROFFT_TEXT, MDOC_MAX);
-       n->string = roff_strdup(mdoc->roff, p);
-       roff_node_append(mdoc, n);
-       mdoc_valid_post(mdoc);
-       mdoc->next = ROFF_NEXT_SIBLING;
-}
-
-void
-mdoc_word_append(struct roff_man *mdoc, const char *p)
-{
-       struct roff_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 = ROFF_NEXT_SIBLING;
-}
-

 void
 mdoc_node_relink(struct roff_man *mdoc, struct roff_node *p)
 {
 
        roff_node_unlink(mdoc, p);
 void
 mdoc_node_relink(struct roff_man *mdoc, struct roff_node *p)
 {
 
        roff_node_unlink(mdoc, p);

+       p->prev = p->next = NULL;

        roff_node_append(mdoc, p);
 }
 
        roff_node_append(mdoc, p);
 }
 


@@ -298,32 +219,22 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
        struct roff_node *n;
        char             *c, *ws, *end;
 
        struct roff_node *n;
        char             *c, *ws, *end;
 

-       assert(mdoc->last);

        n = mdoc->last;
 
        /*
        n = mdoc->last;
 
        /*

-        * Divert directly to list processing if we're encountering a
-        * columnar ROFFT_BLOCK with or without a prior ROFFT_BLOCK entry
-        * (a ROFFT_BODY means it's already open, in which case we should
-        * process within its context in the normal way).
+        * If a column list contains plain text, assume an implicit item
+        * macro.  This can happen one or more times at the beginning
+        * of such a list, intermixed with non-It mdoc macros and with
+        * nodes generated on the roff level, for example by tbl.

         */
 
         */
 

-       if (n->tok == MDOC_Bl && n->type == ROFFT_BODY &&
-           n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) {
-               /* `Bl' is open without any children. */
+       if ((n->tok == MDOC_Bl && n->type == ROFFT_BODY &&
+            n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) ||
+           (n->parent != NULL && n->parent->tok == MDOC_Bl &&
+            n->parent->norm->Bl.type == LIST_column)) {

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

-               return(1);
-       }
-
-       if (n->tok == MDOC_It && n->type == ROFFT_BLOCK &&
-           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;
-               mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf);
-               return(1);
+               return 1;

        }
 
        /*
        }
 
        /*


@@ -380,16 +291,16 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
                 * blank lines aren't allowed, but enough manuals assume this
                 * behaviour that we want to work around it.
                 */
                 * blank lines aren't allowed, but enough manuals assume this
                 * behaviour that we want to work around it.
                 */

-               mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL);
+               roff_elem_alloc(mdoc, line, offs, MDOC_sp);
+               mdoc->last->flags |= NODE_VALID | NODE_ENDED;

                mdoc->next = ROFF_NEXT_SIBLING;
                mdoc->next = ROFF_NEXT_SIBLING;

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

        }
 
        }
 

-       mdoc_word_alloc(mdoc, line, offs, buf+offs);
+       roff_word_alloc(mdoc, line, offs, buf+offs);

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

-               return(1);
+               return 1;

 
        /*
         * End-of-sentence check.  If the last character is an unescaped
 
        /*
         * End-of-sentence check.  If the last character is an unescaped


@@ -400,8 +311,24 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
        assert(buf < end);
 
        if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))
        assert(buf < end);
 
        if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))

-               mdoc->last->flags |= MDOC_EOS;
-       return(1);
+               mdoc->last->flags |= NODE_EOS;
+
+       for (c = buf + offs; c != NULL; c = strchr(c + 1, '.')) {
+               if (c - buf < offs + 2)
+                       continue;
+               if (end - c < 4)
+                       break;
+               if (isalpha((unsigned char)c[-2]) &&
+                   isalpha((unsigned char)c[-1]) &&
+                   c[1] == ' ' &&
+                   isupper((unsigned char)(c[2] == ' ' ? c[3] : c[2])) &&
+                   (c[-2] != 'n' || c[-1] != 'c') &&
+                   (c[-2] != 'v' || c[-1] != 's'))
+                       mandoc_msg(MANDOCERR_EOS, mdoc->parse,
+                           line, (int)(c - buf), NULL);
+       }
+
+       return 1;

 }
 
 /*
 }
 
 /*


@@ -430,12 +357,12 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
 
        mac[i] = '\0';
 
 
        mac[i] = '\0';
 

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

 
 

-       if (tok == MDOC_MAX) {
+       if (tok == TOKEN_NONE) {

                mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
                    ln, sv, buf + sv - 1);
                mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
                    ln, sv, buf + sv - 1);

-               return(1);
+               return 1;

        }
 
        /* Skip a leading escape sequence or tab. */
        }
 
        /* Skip a leading escape sequence or tab. */


@@ -455,7 +382,7 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
 
        /* Jump to the next non-whitespace word. */
 
 
        /* Jump to the next non-whitespace word. */
 

-       while (buf[offs] && ' ' == buf[offs])
+       while (buf[offs] == ' ')

                offs++;
 
        /*
                offs++;
 
        /*


@@ -472,39 +399,26 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
         * into macro processing.
         */
 
         * into macro processing.
         */
 

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

        n = mdoc->last;
        n = mdoc->last;

-       assert(mdoc->last);
-
-       /*
-        * If the first macro of a `Bl -column', open an `It' block
-        * context around the parsed macro.
-        */
-
-       if (n->tok == MDOC_Bl && n->type == ROFFT_BODY &&
-           n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) {
-               mdoc->flags |= MDOC_FREECOL;
-               mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);
-               return(1);
+       if (n == NULL || tok == MDOC_It || tok == MDOC_El) {
+               mdoc_macro(mdoc, tok, ln, sv, &offs, buf);
+               return 1;

        }
 
        /*
        }
 
        /*

-        * If we're following a block-level `It' within a `Bl -column'
-        * context (perhaps opened in the above block or in ptext()),
-        * then open an `It' block context around the parsed macro.
+        * If a column list contains a non-It macro, assume an implicit
+        * item macro.  This can happen one or more times at the
+        * beginning of such a list, intermixed with text lines and
+        * with nodes generated on the roff level, for example by tbl.

         */
 
         */
 

-       if (n->tok == MDOC_It && n->type == ROFFT_BLOCK &&
-           NULL != n->parent &&
-           MDOC_Bl == n->parent->tok &&
-           LIST_column == n->parent->norm->Bl.type) {
+       if ((n->tok == MDOC_Bl && n->type == ROFFT_BODY &&
+            n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) ||
+           (n->parent != NULL && n->parent->tok == MDOC_Bl &&
+            n->parent->norm->Bl.type == LIST_column)) {

                mdoc->flags |= MDOC_FREECOL;
                mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);
                mdoc->flags |= MDOC_FREECOL;
                mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);

-               return(1);
+               return 1;

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


@@ -515,9 +429,9 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
 
        if (mdoc->quick && MDOC_Sh == tok &&
            SEC_NAME != mdoc->last->sec)
 
        if (mdoc->quick && MDOC_Sh == tok &&
            SEC_NAME != mdoc->last->sec)

-               return(2);
+               return 2;

 
 

-       return(1);
+       return 1;

 }
 
 enum mdelim
 }
 
 enum mdelim


@@ -525,82 +439,44 @@ mdoc_isdelim(const char *p)
 {
 
        if ('\0' == p[0])
 {
 
        if ('\0' == p[0])

-               return(DELIM_NONE);
+               return DELIM_NONE;

 
        if ('\0' == p[1])
                switch (p[0]) {
                case '(':
 
        if ('\0' == p[1])
                switch (p[0]) {
                case '(':

-                       /* FALLTHROUGH */

                case '[':
                case '[':

-                       return(DELIM_OPEN);
+                       return DELIM_OPEN;

                case '|':
                case '|':

-                       return(DELIM_MIDDLE);
+                       return DELIM_MIDDLE;

                case '.':
                case '.':

-                       /* FALLTHROUGH */

                case ',':
                case ',':

-                       /* FALLTHROUGH */

                case ';':
                case ';':

-                       /* FALLTHROUGH */

                case ':':
                case ':':

-                       /* FALLTHROUGH */

                case '?':
                case '?':

-                       /* FALLTHROUGH */

                case '!':
                case '!':

-                       /* FALLTHROUGH */

                case ')':
                case ')':

-                       /* FALLTHROUGH */

                case ']':
                case ']':

-                       return(DELIM_CLOSE);
+                       return DELIM_CLOSE;

                default:
                default:

-                       return(DELIM_NONE);
+                       return DELIM_NONE;

                }
 
        if ('\\' != p[0])
                }
 
        if ('\\' != p[0])

-               return(DELIM_NONE);
+               return DELIM_NONE;

 
        if (0 == strcmp(p + 1, "."))
 
        if (0 == strcmp(p + 1, "."))

-               return(DELIM_CLOSE);
+               return DELIM_CLOSE;

        if (0 == strcmp(p + 1, "fR|\\fP"))
        if (0 == strcmp(p + 1, "fR|\\fP"))

-               return(DELIM_MIDDLE);
+               return DELIM_MIDDLE;

 
 

-       return(DELIM_NONE);
+       return DELIM_NONE;

 }
 
 void
 }
 
 void

-mdoc_deroff(char **dest, const struct roff_node *n)
+mdoc_validate(struct roff_man *mdoc)

 {
 {

-       char    *cp;
-       size_t   sz;
-
-       if (n->type != ROFFT_TEXT) {
-               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;
+       mdoc->last = mdoc->first;
+       mdoc_node_validate(mdoc);
+       mdoc_state_reset(mdoc);

 }
 }