Create the link from ./man to ./mandoc in the "all" target rather than

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 8e97622825822ff5142d8e76f81089666135c0bc..fb0351d91f1d693c28ee0bcebaa2712a4f2d1a18 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,7 +1,7 @@
-/*     $Id: term.c,v 1.280 2019/01/15 12:16:18 schwarze Exp $ */
+/* $Id: term.c,v 1.283 2021/08/10 12:55:04 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2019 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2020 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
@@ -38,8 +38,7 @@ static        void             bufferc(struct termp *, char);
 static void             encode(struct termp *, const char *, size_t);
 static void             encode1(struct termp *, int);
 static void             endline(struct termp *);
-static void             term_field(struct termp *, size_t, size_t,
-                               size_t, size_t);
+static void             term_field(struct termp *, size_t, size_t);
 static void             term_fill(struct termp *, size_t *, size_t *,
                                size_t);
 
@@ -127,8 +126,7 @@ term_flushln(struct termp *p)
                 * and with the BRNEVER flag, never break it at all.
                 */
 
-               vtarget = p->flags & TERMP_BRNEVER ? SIZE_MAX :
-                   (p->flags & TERMP_NOBREAK) == 0 ? vfield :
+               vtarget = (p->flags & TERMP_NOBREAK) == 0 ? vfield :
                    p->maxrmargin > p->viscol + vbl ?
                    p->maxrmargin - p->viscol - vbl : 0;
 
@@ -137,7 +135,8 @@ term_flushln(struct termp *p)
                 * If there is whitespace only, print nothing.
                 */
 
-               term_fill(p, &nbr, &vbr, vtarget);
+               term_fill(p, &nbr, &vbr,
+                   p->flags & TERMP_BRNEVER ? SIZE_MAX : vtarget);
                if (nbr == 0)
                        break;
 
@@ -156,7 +155,7 @@ term_flushln(struct termp *p)
 
                /* Finally, print the field content. */
 
-               term_field(p, vbl, nbr, vbr, vtarget);
+               term_field(p, vbl, nbr);
 
                /*
                 * If there is no text left in the field, exit the loop.
@@ -281,6 +280,8 @@ term_fill(struct termp *p, size_t *nbr, size_t *vbr, size_t vtarget)
                        case ASCII_BREAK:
                                vn = vis;
                                break;
+                       default:
+                               abort();
                        }
                        /* Can break at the end of a word. */
                        if (breakline || vn > vtarget)
@@ -343,12 +344,10 @@ term_fill(struct termp *p, size_t *nbr, size_t *vbr, size_t vtarget)
 /*
  * Print the contents of one field
  * with an indentation of       vbl      visual columns,
- * an input string length of    nbr      characters,
- * an output width of           vbr      visual columns,
- * and a desired field width of         vtarget  visual columns.
+ * and an input string length of nbr     characters.
  */
 static void
-term_field(struct termp *p, size_t vbl, size_t nbr, size_t vbr, size_t vtarget)
+term_field(struct termp *p, size_t vbl, size_t nbr)
 {
        size_t   ic;    /* Character position in the input buffer. */
        size_t   vis;   /* Visual position of the current character. */
@@ -590,16 +589,18 @@ term_word(struct termp *p, const char *word)
                        uc = *seq;
                        break;
                case ESCAPE_FONTBOLD:
+               case ESCAPE_FONTCB:
                        term_fontrepl(p, TERMFONT_BOLD);
                        continue;
                case ESCAPE_FONTITALIC:
+               case ESCAPE_FONTCI:
                        term_fontrepl(p, TERMFONT_UNDER);
                        continue;
                case ESCAPE_FONTBI:
                        term_fontrepl(p, TERMFONT_BI);
                        continue;
                case ESCAPE_FONT:
-               case ESCAPE_FONTCW:
+               case ESCAPE_FONTCR:
                case ESCAPE_FONTROMAN:
                        term_fontrepl(p, TERMFONT_NONE);
                        continue;