Commit and commit message by deraadt@:

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 8ea579b6bfc672fec6edb1b03e8d09757c45fb4d..475a6aa0ddb3cac71309fe5fe5450f1ce110c825 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc.c,v 1.269 2018/08/17 20:33:37 schwarze Exp $ */
+/* $Id: mdoc.c,v 1.275 2020/04/06 10:16:17 schwarze Exp $ */
 /*
+ * Copyright (c) 2010, 2012-2018, 2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012-2018 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
@@ -14,6 +14,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Top level and utility functions of the mdoc(7) parser for mandoc(1).
  */
 #include "config.h"
 
@@ -155,15 +157,6 @@ mdoc_elem_alloc(struct roff_man *mdoc, int line, int pos,
        mdoc->next = ROFF_NEXT_CHILD;
 }
 
-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);
-}
-
 /*
  * Parse free-form text, that is, a line that does not begin with the
  * control character.
@@ -219,7 +212,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
                         * Strip trailing tabs in literal context only;
                         * outside, they affect the next line.
                         */
-                       if (MDOC_LITERAL & mdoc->flags)
+                       if (mdoc->flags & ROFF_NOFILL)
                                continue;
                        break;
                case '\\':
@@ -236,8 +229,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
        *end = '\0';
 
        if (ws)
-               mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
-                   line, (int)(ws-buf), NULL);
+               mandoc_msg(MANDOCERR_SPACE_EOL, line, (int)(ws - buf), NULL);
 
        /*
         * Blank lines are allowed in no-fill mode
@@ -245,7 +237,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
         * but add a single vertical space elsewhere.
         */
 
-       if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) {
+       if (buf[offs] == '\0' && (mdoc->flags & ROFF_NOFILL) == 0) {
                switch (mdoc->last->type) {
                case ROFFT_TEXT:
                        sp = mdoc->last->string;
@@ -261,8 +253,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
                default:
                        break;
                }
-               mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse,
-                   line, (int)(c - buf), NULL);
+               mandoc_msg(MANDOCERR_FI_BLANK, line, (int)(c - buf), NULL);
                roff_elem_alloc(mdoc, line, offs, ROFF_sp);
                mdoc->last->flags |= NODE_VALID | NODE_ENDED;
                mdoc->next = ROFF_NEXT_SIBLING;
@@ -271,7 +262,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
 
        roff_word_alloc(mdoc, line, offs, buf+offs);
 
-       if (mdoc->flags & MDOC_LITERAL)
+       if (mdoc->flags & ROFF_NOFILL)
                return 1;
 
        /*
@@ -302,8 +293,7 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
                if (*c == ' ')
                        c++;
                if (isupper((unsigned char)(*c)))
-                       mandoc_msg(MANDOCERR_EOS, mdoc->parse,
-                           line, (int)(c - buf), NULL);
+                       mandoc_msg(MANDOCERR_EOS, line, (int)(c - buf), NULL);
        }
 
        return 1;
@@ -331,8 +321,7 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
        if (sz == 2 || sz == 3)
                tok = roffhash_find(mdoc->mdocmac, buf + sv, sz);
        if (tok == TOKEN_NONE) {
-               mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
-                   ln, sv, buf + sv - 1);
+               mandoc_msg(MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1);
                return 1;
        }
 
@@ -362,16 +351,16 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
         */
 
        if ('\0' == buf[offs] && ' ' == buf[offs - 1])
-               mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
-                   ln, offs - 1, NULL);
+               mandoc_msg(MANDOCERR_SPACE_EOL, ln, offs - 1, NULL);
 
        /*
-        * If an initial macro or a list invocation, divert directly
-        * into macro processing.
+        * If an initial or transparent macro or a list invocation,
+        * divert directly into macro processing.
         */
 
        n = mdoc->last;
-       if (n == NULL || tok == MDOC_It || tok == MDOC_El) {
+       if (n == NULL || tok == MDOC_It || tok == MDOC_El ||
+           roff_tok_transparent(tok)) {
                (*mdoc_macro(tok)->fp)(mdoc, tok, ln, sv, &offs, buf);
                return 1;
        }
@@ -442,12 +431,3 @@ mdoc_isdelim(const char *p)
 
        return DELIM_NONE;
 }
-
-void
-mdoc_validate(struct roff_man *mdoc)
-{
-
-       mdoc->last = mdoc->first;
-       mdoc_node_validate(mdoc);
-       mdoc_state_reset(mdoc);
-}