this file needs to #include "config.h" because it calls getprogname();

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index f0c56a2bfb47cb84d1bb4cb266d7784df98b8164..2b07352b90a3e91bcc98f2f47ffd508f81072f80 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,7 +1,7 @@
-/*     $Id: roff.c,v 1.358 2018/12/31 07:08:12 schwarze Exp $ */
+/*     $Id: roff.c,v 1.363 2019/02/06 21:11:43 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2015, 2017-2019 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
@@ -889,6 +889,10 @@ roff_node_alloc(struct roff_man *man, int line, int pos,
                n->flags |= NODE_SYNPRETTY;
        else
                n->flags &= ~NODE_SYNPRETTY;
+       if ((man->flags & (ROFF_NOFILL | ROFF_NONOFILL)) == ROFF_NOFILL)
+               n->flags |= NODE_NOFILL;
+       else
+               n->flags &= ~NODE_NOFILL;
        if (man->flags & MDOC_NEWLINE)
                n->flags |= NODE_LINE;
        man->flags &= ~MDOC_NEWLINE;
@@ -2533,7 +2537,7 @@ roff_evalcond(struct roff *r, int ln, char *v, int *pos)
                        roff_getstrn(r, name, sz, &deftype);
                        istrue = !!deftype;
                }
-               *pos = cp - v;
+               *pos = (name + sz) - v;
                return istrue == wanttrue;
        default:
                break;
@@ -2679,8 +2683,15 @@ roff_ds(ROFF_ARGS)
                return ROFF_IGN;
 
        namesz = roff_getname(r, &string, ln, pos);
-       if (name[namesz] == '\\')
+       switch (name[namesz]) {
+       case '\\':
                return ROFF_IGN;
+       case '\t':
+               string = buf->buf + pos + namesz;
+               break;
+       default:
+               break;
+       }
 
        /* Read past the initial double-quote, if any. */
        if (*string == '"')
@@ -3056,7 +3067,7 @@ roff_nr(ROFF_ARGS)
                return ROFF_IGN;
 
        keysz = roff_getname(r, &val, ln, pos);
-       if (key[keysz] == '\\')
+       if (key[keysz] == '\\' || key[keysz] == '\t')
                return ROFF_IGN;
 
        sign = *val;
@@ -3120,7 +3131,7 @@ roff_rm(ROFF_ARGS)
                namesz = roff_getname(r, &cp, ln, (int)(cp - buf->buf));
                roff_setstrn(&r->strtab, name, namesz, NULL, 0, 0);
                roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0);
-               if (name[namesz] == '\\')
+               if (name[namesz] == '\\' || name[namesz] == '\t')
                        break;
        }
        return ROFF_IGN;
@@ -3188,6 +3199,7 @@ roff_Dd(ROFF_ARGS)
 static int
 roff_TE(ROFF_ARGS)
 {
+       r->man->flags &= ~ROFF_NONOFILL;
        if (r->tbl == NULL) {
                mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "TE");
                return ROFF_IGN;
@@ -3332,6 +3344,7 @@ roff_TS(ROFF_ARGS)
                mandoc_msg(MANDOCERR_BLK_BROKEN, ln, ppos, "TS breaks TS");
                tbl_end(r->tbl, 0);
        }
+       r->man->flags |= ROFF_NONOFILL;
        r->tbl = tbl_alloc(ppos, ln, r->last_tbl);
        if (r->last_tbl == NULL)
                r->first_tbl = r->tbl;
@@ -3453,7 +3466,7 @@ roff_als(ROFF_ARGS)
                return ROFF_IGN;
 
        newsz = roff_getname(r, &oldn, ln, pos);
-       if (newn[newsz] == '\\' || *oldn == '\0')
+       if (newn[newsz] == '\\' || newn[newsz] == '\t' || *oldn == '\0')
                return ROFF_IGN;
 
        end = oldn;
@@ -3683,7 +3696,7 @@ roff_rn(ROFF_ARGS)
                return ROFF_IGN;
 
        oldsz = roff_getname(r, &newn, ln, pos);
-       if (oldn[oldsz] == '\\' || *newn == '\0')
+       if (oldn[oldsz] == '\\' || oldn[oldsz] == '\t' || *newn == '\0')
                return ROFF_IGN;
 
        end = newn;
@@ -3859,6 +3872,10 @@ roff_renamed(ROFF_ARGS)
        return ROFF_CONT;
 }
 
+/*
+ * Measure the length in bytes of the roff identifier at *cpp
+ * and advance the pointer to the next word.
+ */
 static size_t
 roff_getname(struct roff *r, char **cpp, int ln, int pos)
 {
@@ -3866,22 +3883,24 @@ roff_getname(struct roff *r, char **cpp, int ln, int pos)
        size_t    namesz;
 
        name = *cpp;
-       if ('\0' == *name)
+       if (*name == '\0')
                return 0;
 
-       /* Read until end of name and terminate it with NUL. */
+       /* Advance cp to the byte after the end of the name. */
+
        for (cp = name; 1; cp++) {
-               if ('\0' == *cp || ' ' == *cp) {
-                       namesz = cp - name;
+               namesz = cp - name;
+               if (*cp == '\0')
+                       break;
+               if (*cp == ' ' || *cp == '\t') {
+                       cp++;
                        break;
                }
-               if ('\\' != *cp)
+               if (*cp != '\\')
                        continue;
-               namesz = cp - name;
-               if ('{' == cp[1] || '}' == cp[1])
+               if (cp[1] == '{' || cp[1] == '}')
                        break;
-               cp++;
-               if ('\\' == *cp)
+               if (*++cp == '\\')
                        continue;
                mandoc_msg(MANDOCERR_NAMESC, ln, pos,
                    "%.*s", (int)(cp - name + 1), name);
@@ -3890,7 +3909,8 @@ roff_getname(struct roff *r, char **cpp, int ln, int pos)
        }
 
        /* Read past spaces. */
-       while (' ' == *cp)
+
+       while (*cp == ' ')
                cp++;
 
        *cpp = cp;