=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.118 retrieving revision 1.124 diff -u -p -r1.118 -r1.124 --- mandoc/term.c 2009/10/30 18:50:11 1.118 +++ mandoc/term.c 2009/11/07 14:14:16 1.124 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.118 2009/10/30 18:50:11 kristaps Exp $ */ +/* $Id: term.c,v 1.124 2009/11/07 14:14:16 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -15,7 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include -#include +#include #include #include #include @@ -34,7 +34,6 @@ static struct termp *term_alloc(enum termenc); static void term_free(struct termp *); -static void do_escaped(struct termp *, const char **); static void do_special(struct termp *, const char *, size_t); static void do_reserved(struct termp *, @@ -79,7 +78,7 @@ term_alloc(enum termenc enc) p = calloc(1, sizeof(struct termp)); if (NULL == p) { - fprintf(stderr, "memory exhausted\n"); + perror(NULL); exit(EXIT_FAILURE); } p->maxrmargin = 78; @@ -147,9 +146,11 @@ term_flushln(struct termp *p) assert(p->offset < p->rmargin); maxvis = (int)(p->rmargin - p->offset) - overstep < 0 ? - 0 : p->rmargin - p->offset - overstep; + /* LINTED */ + 0 : p->rmargin - p->offset - overstep; mmax = (int)(p->maxrmargin - p->offset) - overstep < 0 ? - 0 : p->maxrmargin - p->offset - overstep; + /* LINTED */ + 0 : p->maxrmargin - p->offset - overstep; bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; @@ -228,7 +229,12 @@ term_flushln(struct termp *p) for ( ; i < (int)p->col; i++) { if (' ' == p->buf[i]) break; - putchar(p->buf[i]); + + /* The unit sep. is a non-breaking space. */ + if (31 == p->buf[i]) + putchar(' '); + else + putchar(p->buf[i]); } vis += vsz; } @@ -360,110 +366,6 @@ do_reserved(struct termp *p, const char *word, size_t /* - * Handle an escape sequence: determine its length and pass it to the - * escape-symbol look table. Note that we assume mdoc(3) has validated - * the escape sequence (we assert upon badly-formed escape sequences). - */ -static void -do_escaped(struct termp *p, const char **word) -{ - int j, type; - const char *wp; - - wp = *word; - type = 1; - - if (0 == *(++wp)) { - *word = wp; - return; - } - - if ('(' == *wp) { - wp++; - if (0 == *wp || 0 == *(wp + 1)) { - *word = 0 == *wp ? wp : wp + 1; - return; - } - - do_special(p, wp, 2); - *word = ++wp; - return; - - } else if ('*' == *wp) { - if (0 == *(++wp)) { - *word = wp; - return; - } - - switch (*wp) { - case ('('): - wp++; - if (0 == *wp || 0 == *(wp + 1)) { - *word = 0 == *wp ? wp : wp + 1; - return; - } - - do_reserved(p, wp, 2); - *word = ++wp; - return; - case ('['): - type = 0; - break; - default: - do_reserved(p, wp, 1); - *word = wp; - return; - } - - } else if ('f' == *wp) { - if (0 == *(++wp)) { - *word = wp; - return; - } - - switch (*wp) { - case ('B'): - p->bold++; - break; - case ('I'): - p->under++; - break; - case ('P'): - /* FALLTHROUGH */ - case ('R'): - p->bold = p->under = 0; - break; - default: - break; - } - - *word = wp; - return; - - } else if ('[' != *wp) { - do_special(p, wp, 1); - *word = wp; - return; - } - - wp++; - for (j = 0; *wp && ']' != *wp; wp++, j++) - /* Loop... */ ; - - if (0 == *wp) { - *word = wp; - return; - } - - if (type) - do_special(p, wp - j, (size_t)j); - else - do_reserved(p, wp - j, (size_t)j); - *word = wp; -} - - -/* * Handle pwords, partial words, which may be either a single word or a * phrase that cannot be broken down (such as a literal string). This * handles word styling. @@ -471,11 +373,14 @@ do_escaped(struct termp *p, const char **word) void term_word(struct termp *p, const char *word) { - const char *sv; + const char *sv, *seq; + int sz, meta; + size_t ssz; + enum roffdeco deco; sv = word; - if (word[0] && 0 == word[1]) + if (word[0] && '\0' == word[1]) switch (word[0]) { case('.'): /* FALLTHROUGH */ @@ -507,12 +412,53 @@ term_word(struct termp *p, const char *word) if ( ! (p->flags & TERMP_NONOSPACE)) p->flags &= ~TERMP_NOSPACE; - for ( ; *word; word++) - if ('\\' != *word) + /* + * FIXME: it's faster to put the metafont conditional here, + * because most of the time we're not a metafont and can use + * strcspn and fwrite. + */ + + while (*word) { + if ('\\' != *word) { encode(p, *word); - else - do_escaped(p, &word); + word++; + continue; + } + seq = ++word; + sz = a2roffdeco(&deco, &seq, &ssz); + + switch (deco) { + case (DECO_RESERVED): + do_reserved(p, seq, ssz); + break; + case (DECO_SPECIAL): + do_special(p, seq, ssz); + break; + case (DECO_BOLD): + p->metamask = p->metafont; + p->metafont |= METAF_BOLD; + break; + case (DECO_ITALIC): + p->metamask = p->metafont; + p->metafont |= METAF_UNDER; + break; + case (DECO_ROMAN): + p->metamask = p->metafont; + p->metafont &= ~METAF_UNDER; + p->metafont &= ~METAF_BOLD; + break; + case (DECO_PREVIOUS): + meta = p->metamask; + p->metamask = p->metafont; + p->metafont = meta; + break; + default: + break; + } + word += sz; + } + if (sv[0] && 0 == sv[1]) switch (sv[0]) { case('('): @@ -544,7 +490,7 @@ buffer(struct termp *p, char c) s = p->maxcols * 2; p->buf = realloc(p->buf, s); if (NULL == p->buf) { - fprintf(stderr, "memory exhausted\n"); + perror(NULL); exit(EXIT_FAILURE); } p->maxcols = s; @@ -557,12 +503,12 @@ static void encode(struct termp *p, char c) { - if (' ' != c) { - if (p->under) { + if (isgraph((u_char)c)) { + if (p->under || METAF_UNDER & p->metafont) { buffer(p, '_'); buffer(p, 8); } - if (p->bold) { + if (p->bold || METAF_BOLD & p->metafont) { buffer(p, c); buffer(p, 8); }