"sys/param.h is for kernel interface programs.

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index b4cd5b97bee6b56c1e971d3e4a13e06dc13cb32d..79a0f45f4786d8165d302a200aab7cb7027fd81b 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.161 2010/07/16 22:33:30 kristaps Exp $ */
+/*     $Id: term.c,v 1.169 2010/08/20 23:34:02 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -34,9 +34,9 @@
 #include "term.h"
 #include "main.h"
 
-static void              spec(struct termp *, const char *, size_t);
+static void              spec(struct termp *, enum roffdeco,
+                               const char *, size_t);
 static void              res(struct termp *, const char *, size_t);
-static void              buffera(struct termp *, const char *, size_t);
 static void              bufferc(struct termp *, char);
 static void              adjbuf(struct termp *p, size_t);
 static void              encode(struct termp *, const char *, size_t);
@@ -83,7 +83,7 @@ term_alloc(enum termenc enc)
        p = calloc(1, sizeof(struct termp));
        if (NULL == p) {
                perror(NULL);
-               exit(EXIT_FAILURE);
+               exit(MANDOCLEVEL_SYSERR);
        }
 
        p->enc = enc;
@@ -169,12 +169,11 @@ term_flushln(struct termp *p)
                 * Handle literal tab characters: collapse all
                 * subsequent tabs into a single huge set of spaces.
                 */
-               for (j = i; j < (int)p->col; j++) {
-                       if ('\t' != p->buf[j])
-                               break;
+               while (i < (int)p->col && '\t' == p->buf[i]) {
                        vend = (vis / p->tabwidth + 1) * p->tabwidth;
                        vbl += vend - vis;
                        vis = vend;
+                       i++;
                }
 
                /*
@@ -185,7 +184,7 @@ term_flushln(struct termp *p)
                 */
 
                /* LINTED */
-               for (jhy = 0; j < (int)p->col; j++) {
+               for (j = i, jhy = 0; j < (int)p->col; j++) {
                        if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])
                                break;
 
@@ -228,12 +227,6 @@ term_flushln(struct termp *p)
                        p->overstep = 0;
                }
 
-               /*
-                * Skip leading tabs, they were handled above.
-                */
-               while (i < (int)p->col && '\t' == p->buf[i])
-                       i++;
-
                /* Write out the [remaining] word. */
                for ( ; i < (int)p->col; i++) {
                        if (vend > bp && jhy > 0 && i > jhy)
@@ -241,10 +234,10 @@ term_flushln(struct termp *p)
                        if ('\t' == p->buf[i])
                                break;
                        if (' ' == p->buf[i]) {
-                               while (' ' == p->buf[i]) {
-                                       vbl += (*p->width)(p, p->buf[i]);
+                               j = i;
+                               while (' ' == p->buf[i])
                                        i++;
-                               }
+                               vbl += (i - j) * (*p->width)(p, ' ');
                                break;
                        }
                        if (ASCII_NBRSP == p->buf[i]) {
@@ -275,6 +268,12 @@ term_flushln(struct termp *p)
                vis = vend;
        }
 
+       /*
+        * If there was trailing white space, it was not printed;
+        * so reset the cursor position accordingly.
+        */
+       vis -= vbl;
+
        p->col = 0;
        p->overstep = 0;
 
@@ -360,7 +359,7 @@ term_vspace(struct termp *p)
 
 
 static void
-spec(struct termp *p, const char *word, size_t len)
+spec(struct termp *p, enum roffdeco d, const char *word, size_t len)
 {
        const char      *rhs;
        size_t           sz;
@@ -368,6 +367,8 @@ spec(struct termp *p, const char *word, size_t len)
        rhs = chars_spec2str(p->symtab, word, len, &sz);
        if (rhs) 
                encode(p, rhs, sz);
+       else if (DECO_SSPECIAL == d)
+               encode(p, word, len);
 }
 
 
@@ -500,17 +501,18 @@ term_word(struct termp *p, const char *word)
 
        if ( ! (p->flags & TERMP_NONOSPACE))
                p->flags &= ~TERMP_NOSPACE;
+       else
+               p->flags |= TERMP_NOSPACE;
 
        p->flags &= ~TERMP_SENTENCE;
 
-       /* FIXME: use strcspn. */
-
        while (*word) {
-               if ('\\' != *word) {
-                       encode(p, word, 1);
-                       word++;
+               if ((ssz = strcspn(word, "\\")) > 0)
+                       encode(p, word, ssz);
+
+               word += ssz;
+               if ('\\' != *word)
                        continue;
-               }
 
                seq = ++word;
                sz = a2roffdeco(&deco, &seq, &ssz);
@@ -520,7 +522,9 @@ term_word(struct termp *p, const char *word)
                        res(p, seq, ssz);
                        break;
                case (DECO_SPECIAL):
-                       spec(p, seq, ssz);
+                       /* FALLTHROUGH */
+               case (DECO_SSPECIAL):
+                       spec(p, deco, seq, ssz);
                        break;
                case (DECO_BOLD):
                        term_fontrepl(p, TERMFONT_BOLD);
@@ -547,7 +551,7 @@ term_word(struct termp *p, const char *word)
         * Note that we don't process the pipe: the parser sees it as
         * punctuation, but we don't in terms of typography.
         */
-       if (sv[0] && 0 == sv[1])
+       if (sv[0] && '\0' == sv[1])
                switch (sv[0]) {
                case('('):
                        /* FALLTHROUGH */
@@ -572,23 +576,11 @@ adjbuf(struct termp *p, size_t sz)
        p->buf = realloc(p->buf, p->maxcols);
        if (NULL == p->buf) {
                perror(NULL);
-               exit(EXIT_FAILURE);
+               exit(MANDOCLEVEL_SYSERR);
        }
 }
 
 
-static void
-buffera(struct termp *p, const char *word, size_t sz)
-{
-
-       if (p->col + sz >= p->maxcols) 
-               adjbuf(p, p->col + sz);
-
-       memcpy(&p->buf[(int)p->col], word, sz);
-       p->col += sz;
-}
-
-
 static void
 bufferc(struct termp *p, char c)
 {
@@ -613,23 +605,31 @@ encode(struct termp *p, const char *word, size_t sz)
         */
 
        if (TERMFONT_NONE == (f = term_fonttop(p))) {
-               buffera(p, word, sz);
+               if (p->col + sz >= p->maxcols) 
+                       adjbuf(p, p->col + sz);
+               memcpy(&p->buf[(int)p->col], word, sz);
+               p->col += sz;
                return;
        }
 
+       /* Pre-buffer, assuming worst-case. */
+
+       if (p->col + 1 + (sz * 3) >= p->maxcols)
+               adjbuf(p, p->col + 1 + (sz * 3));
+
        for (i = 0; i < (int)sz; i++) {
                if ( ! isgraph((u_char)word[i])) {
-                       bufferc(p, word[i]);
+                       p->buf[(int)p->col++] = word[i];
                        continue;
                }
 
                if (TERMFONT_UNDER == f)
-                       bufferc(p, '_');
+                       p->buf[(int)p->col++] = '_';
                else
-                       bufferc(p, word[i]);
+                       p->buf[(int)p->col++] = word[i];
 
-               bufferc(p, 8);
-               bufferc(p, word[i]);
+               p->buf[(int)p->col++] = 8;
+               p->buf[(int)p->col++] = word[i];
        }
 }