=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.86 retrieving revision 1.94 diff -u -p -r1.86 -r1.94 --- mandoc/term.c 2009/07/15 15:37:48 1.86 +++ mandoc/term.c 2009/07/27 12:02:49 1.94 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.86 2009/07/15 15:37:48 kristaps Exp $ */ +/* $Id: term.c,v 1.94 2009/07/27 12:02:49 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -34,6 +34,8 @@ static void term_free(struct termp *); static void term_pescape(struct termp *, const char **); static void term_nescape(struct termp *, const char *, size_t); +static void term_sescape(struct termp *, + const char *, size_t); static void term_chara(struct termp *, char); static void term_encodea(struct termp *, char); static int term_isopendelim(const char *); @@ -184,6 +186,9 @@ term_isopendelim(const char *p) * columns. In short: don't print a newline and instead pad to the * right margin. Used in conjunction with TERMP_NOLPAD. * + * - TERMP_TWOSPACE: when padding, make sure there are at least two + * space characters of padding. Otherwise, rather break the line. + * * - TERMP_DANGLE: don't newline when TERMP_NOBREAK is specified and * the line is overrun, and don't pad-right if it's underrun. * @@ -204,14 +209,17 @@ term_isopendelim(const char *p) * possible). * * FIXME: newline breaks occur (in groff) also occur when a single - * space follows a NOBREAK! + * space follows a NOBREAK (try `Bl -tag') + * + * FIXME: there's a newline error where a `Bl -diag' will have a + * trailing newline if the line is exactly 73 chars long. */ void term_flushln(struct termp *p) { int i, j; size_t vbl, vsz, vis, maxvis, mmax, bp; - static int sv = -1; + static int overstep = 0; /* * First, establish the maximum columns of "visible" content. @@ -221,16 +229,17 @@ term_flushln(struct termp *p) */ assert(p->offset < p->rmargin); - maxvis = p->rmargin - p->offset; - mmax = p->maxrmargin - p->offset; + assert((int)(p->rmargin - p->offset) - overstep > 0); + + maxvis = /* LINTED */ + p->rmargin - p->offset - overstep; + mmax = /* LINTED */ + p->maxrmargin - p->offset - overstep; + bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; vis = 0; + overstep = 0; - if (sv >= 0) { - vis = (size_t)sv; - sv = -1; - } - /* * If in the standard case (left-justified), then begin with our * indentation, otherwise (columns, etc.) just start spitting @@ -252,10 +261,10 @@ term_flushln(struct termp *p) /* LINTED */ for (j = i, vsz = 0; j < (int)p->col; j++) { - if (' ' == p->buf[j]) + if (j && ' ' == p->buf[j]) break; else if (8 == p->buf[j]) - j += 1; + vsz--; else vsz++; } @@ -299,38 +308,48 @@ term_flushln(struct termp *p) } vis += vsz; } + p->col = 0; - /* - * If we've overstepped our maximum visible no-break space, then - * cause a newline and offset at the right margin. - */ - - if ((TERMP_NOBREAK & p->flags) && vis >= maxvis) { - if ( ! (TERMP_DANGLE & p->flags) && - ! (TERMP_HANG & p->flags)) { - putchar('\n'); - for (i = 0; i < (int)p->rmargin; i++) - putchar(' '); - } - if (TERMP_HANG & p->flags) - sv = (int)(vis - maxvis); - p->col = 0; + if ( ! (TERMP_NOBREAK & p->flags)) { + putchar('\n'); return; } - /* - * If we're not to right-marginalise it (newline), then instead - * pad to the right margin and stay off. - */ + if (TERMP_HANG & p->flags) { + /* We need one blank after the tag. */ + overstep = /* LINTED */ + vis - maxvis + 1; - if (p->flags & TERMP_NOBREAK) { - if ( ! (TERMP_DANGLE & p->flags)) - for ( ; vis < maxvis; vis++) - putchar(' '); - } else - putchar('\n'); + /* + * Behave exactly the same way as groff: + * If we have overstepped the margin, temporarily move + * it to the right and flag the rest of the line to be + * shorter. + * If we landed right at the margin, be happy. + * If we are one step before the margin, temporarily + * move it one step LEFT and flag the rest of the line + * to be longer. + */ + if (overstep >= -1) { + assert((int)maxvis + overstep >= 0); + /* LINTED */ + maxvis += overstep; + } else + overstep = 0; - p->col = 0; + } else if (TERMP_DANGLE & p->flags) + return; + + /* Right-pad. */ + if (maxvis > vis + /* LINTED */ + ((TERMP_TWOSPACE & p->flags) ? 1 : 0)) + for ( ; vis < maxvis; vis++) + putchar(' '); + else { /* ...or newline break. */ + putchar('\n'); + for (i = 0; i < (int)p->rmargin; i++) + putchar(' '); + } } @@ -382,12 +401,29 @@ term_nescape(struct termp *p, const char *word, size_t rhs = term_a2ascii(p->symtab, word, len, &sz); - if (rhs) - for (i = 0; i < (int)sz; i++) - term_encodea(p, rhs[i]); + if (NULL == rhs) + return; + for (i = 0; i < (int)sz; i++) + term_encodea(p, rhs[i]); } +static void +term_sescape(struct termp *p, const char *word, size_t len) +{ + const char *rhs; + size_t sz; + int i; + + rhs = term_a2res(p->symtab, word, len, &sz); + + if (NULL == rhs) + return; + for (i = 0; i < (int)sz; i++) + term_encodea(p, rhs[i]); +} + + /* * Handle an escape sequence: determine its length and pass it to the * escape-symbol look table. Note that we assume mdoc(3) has validated @@ -431,13 +467,13 @@ term_pescape(struct termp *p, const char **word) return; } - term_nescape(p, wp, 2); + term_sescape(p, wp, 2); *word = ++wp; return; case ('['): break; default: - term_nescape(p, wp, 1); + term_sescape(p, wp, 1); *word = wp; return; } @@ -495,8 +531,8 @@ term_pescape(struct termp *p, const char **word) void term_word(struct termp *p, const char *word) { + const char *sv; - assert(*word); if (term_isclosedelim(word)) if ( ! (TERMP_IGNDELIM & p->flags)) p->flags |= TERMP_NOSPACE; @@ -512,13 +548,13 @@ term_word(struct termp *p, const char *word) * before the word. */ - for ( ; *word; word++) + for (sv = word; *word; word++) if ('\\' != *word) term_encodea(p, *word); else term_pescape(p, &word); - if (term_isopendelim(word)) + if (term_isopendelim(sv)) p->flags |= TERMP_NOSPACE; } @@ -549,8 +585,8 @@ term_chara(struct termp *p, char c) static void term_encodea(struct termp *p, char c) { - - if (TERMP_STYLE & p->flags) { + + if (' ' != c && TERMP_STYLE & p->flags) { if (TERMP_BOLD & p->flags) { term_chara(p, c); term_chara(p, 8);