Style message about legacy man(7) date format in mdoc(7) documents

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 9d0c2bdd96ec465179cfabcaa7b5019f6ec15c75..661508d985328894f510f73823898f249d68072a 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.267 2017/06/07 20:01:19 schwarze Exp $ */
+/*     $Id: term.c,v 1.268 2017/06/08 12:54:58 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -479,7 +479,7 @@ term_word(struct termp *p, const char *word)
                                p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE);
                        continue;
                case ESCAPE_HORIZ:
-                       if (a2roffsu(seq, &su, SCALE_EM) == 0)
+                       if (a2roffsu(seq, &su, SCALE_EM) == NULL)
                                continue;
                        uc = term_hspan(p, &su) / 24;
                        if (uc > 0)
@@ -500,7 +500,7 @@ term_word(struct termp *p, const char *word)
                        }
                        continue;
                case ESCAPE_HLINE:
-                       if (a2roffsu(seq, &su, SCALE_EM) == 0)
+                       if ((seq = a2roffsu(seq, &su, SCALE_EM)) == NULL)
                                continue;
                        uc = term_hspan(p, &su) / 24;
                        if (uc <= 0) {
@@ -509,16 +509,7 @@ term_word(struct termp *p, const char *word)
                                lsz = p->tcol->rmargin - p->tcol->offset;
                        } else
                                lsz = uc;
-                       while (sz &&
-                           strchr(" %&()*+-./0123456789:<=>", *seq)) {
-                               seq++;
-                               sz--;
-                       }
-                       if (sz && strchr("cifMmnPpuv", *seq)) {
-                               seq++;
-                               sz--;
-                       }
-                       if (sz == 0)
+                       if (*seq == '\0')
                                uc = -1;
                        else if (*seq == '\\') {
                                seq++;
@@ -739,7 +730,7 @@ term_setwidth(struct termp *p, const char *wstr)
                default:
                        break;
                }
-               if (a2roffsu(wstr, &su, SCALE_MAX))
+               if (a2roffsu(wstr, &su, SCALE_MAX) != NULL)
                        width = term_hspan(p, &su);
                else
                        iop = 0;