=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.105 retrieving revision 1.124 diff -u -p -r1.105 -r1.124 --- mandoc/term.c 2009/10/13 10:57:25 1.105 +++ mandoc/term.c 2009/11/07 14:14:16 1.124 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.105 2009/10/13 10:57:25 kristaps Exp $ */ +/* $Id: term.c,v 1.124 2009/11/07 14:14:16 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -15,12 +15,14 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include -#include +#include #include #include #include +#include #include "chars.h" +#include "out.h" #include "term.h" #include "man.h" #include "mdoc.h" @@ -32,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 *, @@ -75,9 +76,11 @@ term_alloc(enum termenc enc) { struct termp *p; - if (NULL == (p = malloc(sizeof(struct termp)))) - return(NULL); - bzero(p, sizeof(struct termp)); + p = calloc(1, sizeof(struct termp)); + if (NULL == p) { + perror(NULL); + exit(EXIT_FAILURE); + } p->maxrmargin = 78; p->enc = enc; return(p); @@ -118,41 +121,45 @@ term_alloc(enum termenc enc) * If TERMP_NOBREAK is specified and the line overruns the right * margin, it will break and pad-right to the right margin after * writing. If maxrmargin is violated, it will break and continue - * writing from the right-margin, which will lead to the above - * scenario upon exit. - * - * Otherwise, the line will break at the right margin. Extremely long - * lines will cause the system to emit a warning (TODO: hyphenate, if - * possible). + * writing from the right-margin, which will lead to the above scenario + * upon exit. Otherwise, the line will break at the right margin. */ void term_flushln(struct termp *p) { - int i, j; - size_t vbl, vsz, vis, maxvis, mmax, bp, os; + int i; /* current input position in p->buf */ + size_t vis; /* current visual position on output */ + size_t vbl; /* number of blanks to prepend to output */ + size_t vsz; /* visual characters to write to output */ + size_t bp; /* visual right border position */ + int j; /* temporary loop index */ + size_t maxvis, mmax; static int overstep = 0; /* * First, establish the maximum columns of "visible" content. * This is usually the difference between the right-margin and * an indentation, but can be, for tagged lists or columns, a - * small set of values. + * small set of values. */ assert(p->offset < p->rmargin); - assert((int)(p->rmargin - p->offset) - overstep > 0); - /* Save the overstep. */ - os = (size_t)overstep; + maxvis = (int)(p->rmargin - p->offset) - overstep < 0 ? + /* LINTED */ + 0 : p->rmargin - p->offset - overstep; + mmax = (int)(p->maxrmargin - p->offset) - overstep < 0 ? + /* LINTED */ + 0 : p->maxrmargin - p->offset - overstep; - maxvis = /* LINTED */ - p->rmargin - p->offset - overstep; - mmax = /* LINTED */ - p->maxrmargin - p->offset - overstep; - bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; + + /* + * FIXME: if bp is zero, we still output the first word before + * breaking the line. + */ + vis = 0; - overstep = 0; /* * If in the standard case (left-justified), then begin with our @@ -207,8 +214,9 @@ term_flushln(struct termp *p) vis = 0; } /* Remove the overstep width. */ - bp += os; - os = 0; + bp += (int)/* LINTED */ + overstep; + overstep = 0; } else { for (j = 0; j < (int)vbl; j++) putchar(' '); @@ -221,11 +229,18 @@ 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; } + p->col = 0; + overstep = 0; if ( ! (TERMP_NOBREAK & p->flags)) { putchar('\n'); @@ -351,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. @@ -462,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 */ @@ -498,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('('): @@ -534,8 +489,10 @@ buffer(struct termp *p, char c) p->maxcols = 256; s = p->maxcols * 2; p->buf = realloc(p->buf, s); - if (NULL == p->buf) - err(1, "realloc"); /* FIXME: shouldn't be here! */ + if (NULL == p->buf) { + perror(NULL); + exit(EXIT_FAILURE); + } p->maxcols = s; } p->buf[(int)(p->col)++] = c; @@ -546,15 +503,92 @@ static void encode(struct termp *p, char c) { - if (' ' != c) { - if (p->bold) { - buffer(p, c); + if (isgraph((u_char)c)) { + if (p->under || METAF_UNDER & p->metafont) { + buffer(p, '_'); buffer(p, 8); } - if (p->under) { - buffer(p, '_'); + if (p->bold || METAF_BOLD & p->metafont) { + buffer(p, c); buffer(p, 8); } } buffer(p, c); } + + +size_t +term_vspan(const struct roffsu *su) +{ + double r; + + switch (su->unit) { + case (SCALE_CM): + r = su->scale * 2; + break; + case (SCALE_IN): + r = su->scale * 6; + break; + case (SCALE_PC): + r = su->scale; + break; + case (SCALE_PT): + r = su->scale / 8; + break; + case (SCALE_MM): + r = su->scale / 1000; + break; + case (SCALE_VS): + r = su->scale; + break; + default: + r = su->scale - 1; + break; + } + + if (r < 0.0) + r = 0.0; + return(/* LINTED */(size_t) + r); +} + + +size_t +term_hspan(const struct roffsu *su) +{ + double r; + + /* XXX: CM, IN, and PT are approximations. */ + + switch (su->unit) { + case (SCALE_CM): + r = 4 * su->scale; + break; + case (SCALE_IN): + /* XXX: this is an approximation. */ + r = 10 * su->scale; + break; + case (SCALE_PC): + r = (10 * su->scale) / 6; + break; + case (SCALE_PT): + r = (10 * su->scale) / 72; + break; + case (SCALE_MM): + r = su->scale / 1000; /* FIXME: double-check. */ + break; + case (SCALE_VS): + r = su->scale * 2 - 1; /* FIXME: double-check. */ + break; + default: + r = su->scale; + break; + } + + if (r < 0.0) + r = 0.0; + return((size_t)/* LINTED */ + r); +} + +