Delete substantial amounts of code

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index d3da99d973dbb634c5f91e9c09028f052f680ecb..71803531ddfbaa30dc0a963c8eacd006814e5ecb 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.262 2017/04/24 23:06:18 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.268 2017/08/11 16:56:21 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) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>


@@ -179,6 +179,7 @@ static int
 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
 {
        struct roff_node *n;
 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;
        char             *c, *ws, *end;
 
        n = mdoc->last;


@@ -244,16 +245,31 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
                mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
                    line, (int)(ws-buf), NULL);
 
                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)) {
        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);
                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, MDOC_sp);
+               roff_elem_alloc(mdoc, line, offs, ROFF_sp);

                mdoc->last->flags |= NODE_VALID | NODE_ENDED;
                mdoc->next = ROFF_NEXT_SIBLING;
                return 1;
                mdoc->last->flags |= NODE_VALID | NODE_ENDED;
                mdoc->next = ROFF_NEXT_SIBLING;
                return 1;


@@ -278,14 +294,20 @@ mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)
        for (c = buf + offs; c != NULL; c = strchr(c + 1, '.')) {
                if (c - buf < offs + 2)
                        continue;
        for (c = buf + offs; c != NULL; c = strchr(c + 1, '.')) {
                if (c - buf < offs + 2)
                        continue;

-               if (end - c < 4)
+               if (end - c < 3)

                        break;
                        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);
        }
                        mandoc_msg(MANDOCERR_EOS, mdoc->parse,
                            line, (int)(c - buf), NULL);
        }


@@ -302,25 +324,18 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
 {
        struct roff_node *n;
        const char       *cp;
 {
        struct roff_node *n;
        const char       *cp;

+       size_t            sz;

        enum roff_tok     tok;
        enum roff_tok     tok;

-       int               i, sv;
-       char              mac[5];
+       int               sv;

 
 

-       sv = offs;
-
-       /*
-        * Copy the first word into a nil-terminated buffer.
-        * Stop when a space, tab, escape, or eoln is encountered.
-        */
-
-       i = 0;
-       while (i < 4 && strchr(" \t\\", buf[offs]) == NULL)
-               mac[i++] = buf[offs++];
-
-       mac[i] = '\0';
-
-       tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : TOKEN_NONE;
+       /* Determine the line macro. */

 
 

+       sv = offs;
+       tok = TOKEN_NONE;
+       for (sz = 0; sz < 4 && strchr(" \t\\", buf[offs]) == NULL; sz++)
+               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);
        if (tok == TOKEN_NONE) {
                mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
                    ln, sv, buf + sv - 1);