Cope with another one of the many kinds of DocBook stupidity:

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index d884ba70648a7eb816a61fdcd952a9127342824c..75c12f4af21e9576cfead9ad040785a20dd39886 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,7 +1,7 @@
-/*     $Id: term.c,v 1.240 2014/12/23 13:48:57 schwarze Exp $ */
+/*     $Id: term.c,v 1.244 2015/01/31 00:12:41 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2015 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
@@ -273,7 +273,7 @@ term_flushln(struct termp *p)
        }
 
        if (TERMP_HANG & p->flags) {
-               p->overstep = (int)(vis - maxvis +
+               p->overstep += (int)(p->offset + vis - p->rmargin +
                    p->trailspace * (*p->width)(p, ' '));
 
                /*
@@ -363,22 +363,14 @@ term_fontpush(struct termp *p, enum termfont f)
        p->fontq[p->fonti] = f;
 }
 
-/* Retrieve pointer to current font. */
-const enum termfont *
-term_fontq(struct termp *p)
-{
-
-       return(&p->fontq[p->fonti]);
-}
-
 /* Flush to make the saved pointer current again. */
 void
-term_fontpopq(struct termp *p, const enum termfont *key)
+term_fontpopq(struct termp *p, int i)
 {
 
-       while (p->fonti >= 0 && key < p->fontq + p->fonti)
-               p->fonti--;
-       assert(p->fonti >= 0);
+       assert(i >= 0);
+       if (p->fonti > i)
+               p->fonti = i;
 }
 
 /* Pop one font off the stack. */
@@ -495,6 +487,17 @@ term_word(struct termp *p, const char *word)
                case ESCAPE_SKIPCHAR:
                        p->flags |= TERMP_SKIPCHAR;
                        continue;
+               case ESCAPE_OVERSTRIKE:
+                       cp = seq + sz;
+                       while (seq < cp) {
+                               if (*seq == '\\') {
+                                       mandoc_escape(&seq, NULL, NULL);
+                                       continue;
+                               }
+                               encode1(p, *seq++);
+                               if (seq < cp)
+                                       encode(p, "\b", 1);
+                       }
                default:
                        continue;
                }
@@ -557,7 +560,7 @@ encode1(struct termp *p, int c)
        if (p->col + 6 >= p->maxcols)
                adjbuf(p, p->col + 6);
 
-       f = *term_fontq(p);
+       f = p->fontq[p->fonti];
 
        if (TERMFONT_UNDER == f || TERMFONT_BI == f) {
                p->buf[p->col++] = '_';
@@ -589,7 +592,7 @@ encode(struct termp *p, const char *word, size_t sz)
         * character by character.
         */
 
-       if (*term_fontq(p) == TERMFONT_NONE) {
+       if (p->fontq[p->fonti] == TERMFONT_NONE) {
                if (p->col + sz >= p->maxcols)
                        adjbuf(p, p->col + sz);
                for (i = 0; i < sz; i++)
@@ -716,6 +719,20 @@ term_strlen(const struct termp *p, const char *cp)
                        case ESCAPE_SKIPCHAR:
                                skip = 1;
                                continue;
+                       case ESCAPE_OVERSTRIKE:
+                               rsz = 0;
+                               rhs = seq + ssz;
+                               while (seq < rhs) {
+                                       if (*seq == '\\') {
+                                               mandoc_escape(&seq, NULL, NULL);
+                                               continue;
+                                       }
+                                       i = (*p->width)(p, *seq++);
+                                       if (rsz < i)
+                                               rsz = i;
+                               }
+                               sz += rsz;
+                               continue;
                        default:
                                continue;
                        }
@@ -773,6 +790,7 @@ int
 term_vspan(const struct termp *p, const struct roffsu *su)
 {
        double           r;
+       int              ri;
 
        switch (su->unit) {
        case SCALE_BU:
@@ -808,7 +826,8 @@ term_vspan(const struct termp *p, const struct roffsu *su)
                abort();
                /* NOTREACHED */
        }
-       return(r > 0.0 ? r + 0.4995 : r - 0.4995);
+       ri = r > 0.0 ? r + 0.4995 : r - 0.4995;
+       return(ri < 66 ? ri : 1);
 }
 
 int