Reduce the amount of code by moving the three copies of the ohash

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 68f3ea0458cf9a5c48873db5821ad0f5515ef6ad..973b404edaa06d4e52048faf9e86c33a9c1ee136 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.247 2015/04/04 17:47:18 schwarze Exp $ */
+/*     $Id: term.c,v 1.253 2015/10/12 00:08:16 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -78,6 +78,8 @@ term_end(struct termp *p)
  *    the next column.  However, if less than p->trailspace blanks,
  *    which can be 0, 1, or 2, remain to the right margin, the line
  *    will be broken.
+ *  - TERMP_BRTRSP: Consider trailing whitespace significant
+ *    when deciding whether the chunk fits or not.
  *  - TERMP_BRIND: If the chunk does not fit and the output line has
  *    to be broken, start the next line at the right margin instead
  *    of at the offset.  Used together with TERMP_NOBREAK for the tags
@@ -265,6 +267,7 @@ term_flushln(struct termp *p)
 
        p->col = 0;
        p->overstep = 0;
+       p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE);
 
        if ( ! (TERMP_NOBREAK & p->flags)) {
                p->viscol = 0;
@@ -290,6 +293,10 @@ term_flushln(struct termp *p)
        } else if (TERMP_DANGLE & p->flags)
                return;
 
+       /* Trailing whitespace is significant in some columns. */
+       if (vis && vbl && (TERMP_BRTRSP & p->flags))
+               vis += vbl;
+
        /* If the column was overrun, break the line. */
        if (maxvis < vis + p->trailspace * (*p->width)(p, ' ')) {
                (*p->endline)(p);
@@ -417,11 +424,6 @@ term_word(struct termp *p, const char *word)
 
        while ('\0' != *word) {
                if ('\\' != *word) {
-                       if (TERMP_SKIPCHAR & p->flags) {
-                               p->flags &= ~TERMP_SKIPCHAR;
-                               word++;
-                               continue;
-                       }
                        if (TERMP_NBRWORD & p->flags) {
                                if (' ' == *word) {
                                        encode(p, nbrsp, 1);
@@ -472,7 +474,6 @@ term_word(struct termp *p, const char *word)
                        term_fontrepl(p, TERMFONT_BI);
                        continue;
                case ESCAPE_FONT:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTROMAN:
                        term_fontrepl(p, TERMFONT_NONE);
                        continue;
@@ -480,13 +481,13 @@ term_word(struct termp *p, const char *word)
                        term_fontlast(p);
                        continue;
                case ESCAPE_NOSPACE:
-                       if (TERMP_SKIPCHAR & p->flags)
-                               p->flags &= ~TERMP_SKIPCHAR;
-                       else if ('\0' == *word)
+                       if (p->flags & TERMP_BACKAFTER)
+                               p->flags &= ~TERMP_BACKAFTER;
+                       else if (*word == '\0')
                                p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE);
                        continue;
                case ESCAPE_SKIPCHAR:
-                       p->flags |= TERMP_SKIPCHAR;
+                       p->flags |= TERMP_BACKAFTER;
                        continue;
                case ESCAPE_OVERSTRIKE:
                        cp = seq + sz;
@@ -496,9 +497,17 @@ term_word(struct termp *p, const char *word)
                                        continue;
                                }
                                encode1(p, *seq++);
-                               if (seq < cp)
-                                       encode(p, "\b", 1);
+                               if (seq < cp) {
+                                       if (p->flags & TERMP_BACKBEFORE)
+                                               p->flags |= TERMP_BACKAFTER;
+                                       else
+                                               p->flags |= TERMP_BACKBEFORE;
+                               }
                        }
+                       /* Trim trailing backspace/blank pair. */
+                       if (p->col > 2 && p->buf[p->col - 1] == ' ')
+                               p->col -= 2;
+                       continue;
                default:
                        continue;
                }
@@ -553,16 +562,19 @@ encode1(struct termp *p, int c)
 {
        enum termfont     f;
 
-       if (TERMP_SKIPCHAR & p->flags) {
-               p->flags &= ~TERMP_SKIPCHAR;
-               return;
-       }
-
-       if (p->col + 6 >= p->maxcols)
-               adjbuf(p, p->col + 6);
+       if (p->col + 7 >= p->maxcols)
+               adjbuf(p, p->col + 7);
 
-       f = p->fontq[p->fonti];
+       f = (c == ASCII_HYPH || isgraph(c)) ?
+           p->fontq[p->fonti] : TERMFONT_NONE;
 
+       if (p->flags & TERMP_BACKBEFORE) {
+               if (p->buf[p->col - 1] == ' ')
+                       p->col--;
+               else
+                       p->buf[p->col++] = 8;
+               p->flags &= ~TERMP_BACKBEFORE;
+       }
        if (TERMFONT_UNDER == f || TERMFONT_BI == f) {
                p->buf[p->col++] = '_';
                p->buf[p->col++] = 8;
@@ -575,6 +587,10 @@ encode1(struct termp *p, int c)
                p->buf[p->col++] = 8;
        }
        p->buf[p->col++] = c;
+       if (p->flags & TERMP_BACKAFTER) {
+               p->flags |= TERMP_BACKBEFORE;
+               p->flags &= ~TERMP_BACKAFTER;
+       }
 }
 
 static void
@@ -582,29 +598,8 @@ encode(struct termp *p, const char *word, size_t sz)
 {
        size_t            i;
 
-       if (TERMP_SKIPCHAR & p->flags) {
-               p->flags &= ~TERMP_SKIPCHAR;
-               return;
-       }
-
-       /*
-        * Encode and buffer a string of characters.  If the current
-        * font mode is unset, buffer directly, else encode then buffer
-        * character by character.
-        */
-
-       if (p->fontq[p->fonti] == TERMFONT_NONE) {
-               if (p->col + sz >= p->maxcols)
-                       adjbuf(p, p->col + sz);
-               for (i = 0; i < sz; i++)
-                       p->buf[p->col++] = word[i];
-               return;
-       }
-
-       /* Pre-buffer, assuming worst-case. */
-
-       if (p->col + 1 + (sz * 5) >= p->maxcols)
-               adjbuf(p, p->col + 1 + (sz * 5));
+       if (p->col + 2 + (sz * 5) >= p->maxcols)
+               adjbuf(p, p->col + 2 + (sz * 5));
 
        for (i = 0; i < sz; i++) {
                if (ASCII_HYPH == word[i] ||
@@ -648,7 +643,7 @@ size_t
 term_len(const struct termp *p, size_t sz)
 {
 
-       return((*p->width)(p, ' ') * sz);
+       return (*p->width)(p, ' ') * sz;
 }
 
 static size_t
@@ -657,9 +652,9 @@ cond_width(const struct termp *p, int c, int *skip)
 
        if (*skip) {
                (*skip) = 0;
-               return(0);
+               return 0;
        } else
-               return((*p->width)(p, c));
+               return (*p->width)(p, c);
 }
 
 size_t
@@ -775,15 +770,13 @@ term_strlen(const struct termp *p, const char *cp)
                case ASCII_HYPH:
                        sz += cond_width(p, '-', &skip);
                        cp++;
-                       /* FALLTHROUGH */
-               case ASCII_BREAK:
                        break;
                default:
                        break;
                }
        }
 
-       return(sz);
+       return sz;
 }
 
 int
@@ -815,7 +808,6 @@ term_vspan(const struct termp *p, const struct roffsu *su)
                r = su->scale / 12.0;
                break;
        case SCALE_EN:
-               /* FALLTHROUGH */
        case SCALE_EM:
                r = su->scale * 0.6;
                break;
@@ -824,10 +816,9 @@ term_vspan(const struct termp *p, const struct roffsu *su)
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
        ri = r > 0.0 ? r + 0.4995 : r - 0.4995;
-       return(ri < 66 ? ri : 1);
+       return ri < 66 ? ri : 1;
 }
 
 /*
@@ -837,5 +828,5 @@ int
 term_hspan(const struct termp *p, const struct roffsu *su)
 {
 
-       return((*p->hspan)(p, su));
+       return (*p->hspan)(p, su);
 }