Implement w layout specifier (minimum column width).

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index a1e3a0f9955a4435b13bd7d92a70e578f23de6fc..d08a85259414854a7221fdb17fdd44bb18911bde 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.263 2017/04/29 12:45:41 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.266 2017/06/07 20:58:49 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -253,7 +253,7 @@ 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.
                 */
-               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;
@@ -278,14 +278,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;
-               if (end - c < 4)
+               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] != ' ' ||
+                   isalpha((unsigned char)c[-2]) == 0 ||
+                   isalpha((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);
        }