Cleanup, no functional change:

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 7ad087e0b61720d47d651891ac22a0a7e67c5cc9..9c170e6e4c947e8cc1f709a4a5f2844c012ea9b4 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc.c,v 1.265 2017/06/07 20:30:40 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.270 2018/12/04 02:53:51 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
+ * 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
@@ -79,13 +79,6 @@ mdoc_parseln(struct roff_man *mdoc, int ln, char *buf, int offs)
            mdoc_ptext(mdoc, ln, buf, offs);
 }
 
-void
-mdoc_macro(MACRO_PROT_ARGS)
-{
-       assert(tok >= MDOC_Dd && tok < MDOC_MAX);
-       (*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf);
-}
-
 void
 mdoc_tail_alloc(struct roff_man *mdoc, int line, int pos, enum roff_tok tok)
 {
@@ -162,15 +155,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.
@@ -179,6 +163,7 @@ static int
 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
 {
        struct roff_node *n;
+       const char       *cp, *sp;
        char             *c, *ws, *end;
 
        n = mdoc->last;
@@ -195,7 +180,8 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
            (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_macro(MDOC_It)->fp)(mdoc, MDOC_It,
+                   line, offs, &offs, buf);
                return 1;
        }
 
@@ -244,15 +230,30 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
                mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
                    line, (int)(ws-buf), NULL);
 
+       /*
+        * Blank lines are allowed in no-fill mode
+        * and cancel preceding \c,
+        * but add a single vertical space elsewhere.
+        */
+
        if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) {
+               switch (mdoc->last->type) {
+               case ROFFT_TEXT:
+                       sp = mdoc->last->string;
+                       cp = end = strchr(sp, '\0') - 2;
+                       if (cp < sp || cp[0] != '\\' || cp[1] != 'c')
+                               break;
+                       while (cp > sp && cp[-1] == '\\')
+                               cp--;
+                       if ((end - cp) % 2)
+                               break;
+                       *end = '\0';
+                       return 1;
+               default:
+                       break;
+               }
                mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse,
                    line, (int)(c - buf), NULL);
-
-               /*
-                * 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.
-                */
                roff_elem_alloc(mdoc, line, offs, ROFF_sp);
                mdoc->last->flags |= NODE_VALID | NODE_ENDED;
                mdoc->next = ROFF_NEXT_SIBLING;
@@ -280,12 +281,18 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
                        continue;
                if (end - c < 3)
                        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'))
+               if (c[1] != ' ' ||
+                   isalnum((unsigned char)c[-2]) == 0 ||
+                   isalnum((unsigned char)c[-1]) == 0 ||
+                   (c[-2] == 'n' && c[-1] == 'c') ||
+                   (c[-2] == 'v' && c[-1] == 's'))
+                       continue;
+               c += 2;
+               if (*c == ' ')
+                       c++;
+               if (*c == ' ')
+                       c++;
+               if (isupper((unsigned char)(*c)))
                        mandoc_msg(MANDOCERR_EOS, mdoc->parse,
                            line, (int)(c - buf), NULL);
        }
@@ -356,7 +363,7 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
 
        n = mdoc->last;
        if (n == NULL || tok == MDOC_It || tok == MDOC_El) {
-               mdoc_macro(mdoc, tok, ln, sv, &offs, buf);
+               (*mdoc_macro(tok)->fp)(mdoc, tok, ln, sv, &offs, buf);
                return 1;
        }
 
@@ -372,13 +379,13 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
            (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_macro(MDOC_It)->fp)(mdoc, MDOC_It, ln, sv, &sv, buf);
                return 1;
        }
 
        /* Normal processing of a macro. */
 
-       mdoc_macro(mdoc, tok, ln, sv, &offs, buf);
+       (*mdoc_macro(tok)->fp)(mdoc, tok, ln, sv, &offs, buf);
 
        /* In quick mode (for mandocdb), abort after the NAME section. */