version 1.82, 2009/06/22 12:38:07 |
version 1.93, 2009/07/24 11:54:25 |
Line 31 extern int mdoc_run(struct termp *, |
|
Line 31 extern int mdoc_run(struct termp *, |
|
|
|
static struct termp *term_alloc(enum termenc); |
static struct termp *term_alloc(enum termenc); |
static void term_free(struct termp *); |
static void term_free(struct termp *); |
static void term_pword(struct termp *, const char *, int); |
static void term_pescape(struct termp *, const char **); |
static void term_pescape(struct termp *, |
|
const char *, int *, int); |
|
static void term_nescape(struct termp *, |
static void term_nescape(struct termp *, |
const char *, size_t); |
const char *, size_t); |
static void term_chara(struct termp *, char); |
static void term_chara(struct termp *, char); |
static void term_encodea(struct termp *, char); |
static void term_encodea(struct termp *, char); |
static int term_isopendelim(const char *, int); |
static int term_isopendelim(const char *); |
static int term_isclosedelim(const char *, int); |
static int term_isclosedelim(const char *); |
|
|
|
|
void * |
void * |
Line 112 term_alloc(enum termenc enc) |
|
Line 110 term_alloc(enum termenc enc) |
|
|
|
|
|
static int |
static int |
term_isclosedelim(const char *p, int len) |
term_isclosedelim(const char *p) |
{ |
{ |
|
|
if (1 != len) |
if ( ! (*p && 0 == *(p + 1))) |
return(0); |
return(0); |
|
|
switch (*p) { |
switch (*p) { |
Line 146 term_isclosedelim(const char *p, int len) |
|
Line 144 term_isclosedelim(const char *p, int len) |
|
|
|
|
|
static int |
static int |
term_isopendelim(const char *p, int len) |
term_isopendelim(const char *p) |
{ |
{ |
|
|
if (1 != len) |
if ( ! (*p && 0 == *(p + 1))) |
return(0); |
return(0); |
|
|
switch (*p) { |
switch (*p) { |
Line 176 term_isopendelim(const char *p, int len) |
|
Line 174 term_isopendelim(const char *p, int len) |
|
* Specifically, a line is whatever's in p->buf of length p->col, which |
* Specifically, a line is whatever's in p->buf of length p->col, which |
* is zeroed after this function returns. |
* is zeroed after this function returns. |
* |
* |
* The variables TERMP_NOLPAD, TERMP_LITERAL and TERMP_NOBREAK are of |
* The usage of termp:flags is as follows: |
* critical importance here. Their behaviour follows: |
|
* |
* |
* - TERMP_NOLPAD: when beginning to write the line, don't left-pad the |
* - TERMP_NOLPAD: when beginning to write the line, don't left-pad the |
* offset value. This is useful when doing columnar lists where the |
* offset value. This is useful when doing columnar lists where the |
Line 187 term_isopendelim(const char *p, int len) |
|
Line 184 term_isopendelim(const char *p, int len) |
|
* columns. In short: don't print a newline and instead pad to the |
* columns. In short: don't print a newline and instead pad to the |
* right margin. Used in conjunction with TERMP_NOLPAD. |
* right margin. Used in conjunction with TERMP_NOLPAD. |
* |
* |
* - TERMP_NONOBREAK: don't newline when TERMP_NOBREAK is specified. |
* - 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. |
|
* |
|
* - TERMP_HANG: like TERMP_DANGLE, but doesn't newline when |
|
* overruning, instead save the position and continue at that point |
|
* when the next invocation. |
|
* |
* In-line line breaking: |
* In-line line breaking: |
* |
* |
* If TERMP_NOBREAK is specified and the line overruns the right |
* If TERMP_NOBREAK is specified and the line overruns the right |
Line 202 term_isopendelim(const char *p, int len) |
|
Line 207 term_isopendelim(const char *p, int len) |
|
* possible). |
* possible). |
* |
* |
* FIXME: newline breaks occur (in groff) also occur when a single |
* 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 |
void |
term_flushln(struct termp *p) |
term_flushln(struct termp *p) |
{ |
{ |
int i, j; |
int i, j; |
size_t vbl, vsz, vis, maxvis, mmax, bp; |
size_t vbl, vsz, vis, maxvis, mmax, bp; |
|
static int overstep = 0; |
|
|
/* |
/* |
* First, establish the maximum columns of "visible" content. |
* First, establish the maximum columns of "visible" content. |
Line 218 term_flushln(struct termp *p) |
|
Line 227 term_flushln(struct termp *p) |
|
*/ |
*/ |
|
|
assert(p->offset < p->rmargin); |
assert(p->offset < p->rmargin); |
maxvis = p->rmargin - p->offset; |
assert((int)(p->rmargin - p->offset) - overstep > 0); |
mmax = p->maxrmargin - p->offset; |
|
|
maxvis = /* LINTED */ |
|
p->rmargin - p->offset - overstep; |
|
mmax = /* LINTED */ |
|
p->maxrmargin - p->offset - overstep; |
|
|
bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; |
bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; |
vis = 0; |
vis = 0; |
|
overstep = 0; |
|
|
/* |
/* |
* If in the standard case (left-justified), then begin with our |
* If in the standard case (left-justified), then begin with our |
Line 244 term_flushln(struct termp *p) |
|
Line 259 term_flushln(struct termp *p) |
|
|
|
/* LINTED */ |
/* LINTED */ |
for (j = i, vsz = 0; j < (int)p->col; j++) { |
for (j = i, vsz = 0; j < (int)p->col; j++) { |
if (' ' == p->buf[j]) |
if (j && ' ' == p->buf[j]) |
break; |
break; |
else if (8 == p->buf[j]) |
else if (8 == p->buf[j]) |
j += 1; |
vsz--; |
else |
else |
vsz++; |
vsz++; |
} |
} |
Line 291 term_flushln(struct termp *p) |
|
Line 306 term_flushln(struct termp *p) |
|
} |
} |
vis += vsz; |
vis += vsz; |
} |
} |
|
p->col = 0; |
|
|
/* |
if ( ! (TERMP_NOBREAK & p->flags)) { |
* If we've overstepped our maximum visible no-break space, then |
putchar('\n'); |
* cause a newline and offset at the right margin. |
|
*/ |
|
|
|
if ((TERMP_NOBREAK & p->flags) && vis >= maxvis) { |
|
if ( ! (TERMP_NONOBREAK & p->flags)) { |
|
putchar('\n'); |
|
for (i = 0; i < (int)p->rmargin; i++) |
|
putchar(' '); |
|
} |
|
p->col = 0; |
|
return; |
return; |
} |
} |
|
|
/* |
if (TERMP_HANG & p->flags) { |
* If we're not to right-marginalise it (newline), then instead |
/* We need one blank after the tag. */ |
* pad to the right margin and stay off. |
overstep = /* LINTED */ |
*/ |
vis - maxvis + 1; |
|
|
if (p->flags & TERMP_NOBREAK) { |
/* |
if ( ! (TERMP_NONOBREAK & p->flags)) |
* Behave exactly the same way as groff: |
for ( ; vis < maxvis; vis++) |
* If we have overstepped the margin, temporarily move |
putchar(' '); |
* it to the right and flag the rest of the line to be |
} else |
* shorter. |
putchar('\n'); |
* 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(' '); |
|
} |
} |
} |
|
|
|
|
Line 358 term_vspace(struct termp *p) |
|
Line 386 term_vspace(struct termp *p) |
|
|
|
|
|
/* |
/* |
* Break apart a word into "pwords" (partial-words, usually from |
|
* breaking up a phrase into individual words) and, eventually, put them |
|
* into the output buffer. If we're a literal word, then don't break up |
|
* the word and put it verbatim into the output buffer. |
|
*/ |
|
void |
|
term_word(struct termp *p, const char *word) |
|
{ |
|
int i, j, len; |
|
|
|
len = (int)strlen(word); |
|
|
|
if (p->flags & TERMP_LITERAL) { |
|
term_pword(p, word, len); |
|
return; |
|
} |
|
|
|
/* LINTED */ |
|
for (j = i = 0; i < len; i++) { |
|
if (' ' != word[i]) { |
|
j++; |
|
continue; |
|
} |
|
|
|
/* Escaped spaces don't delimit... */ |
|
if (i && ' ' == word[i] && '\\' == word[i - 1]) { |
|
j++; |
|
continue; |
|
} |
|
|
|
if (0 == j) |
|
continue; |
|
assert(i >= j); |
|
term_pword(p, &word[i - j], j); |
|
j = 0; |
|
} |
|
if (j > 0) { |
|
assert(i >= j); |
|
term_pword(p, &word[i - j], j); |
|
} |
|
} |
|
|
|
|
|
/* |
|
* Determine the symbol indicated by an escape sequences, that is, one |
* Determine the symbol indicated by an escape sequences, that is, one |
* starting with a backslash. Once done, we pass this value into the |
* starting with a backslash. Once done, we pass this value into the |
* output buffer by way of the symbol table. |
* output buffer by way of the symbol table. |
Line 413 term_nescape(struct termp *p, const char *word, size_t |
|
Line 397 term_nescape(struct termp *p, const char *word, size_t |
|
size_t sz; |
size_t sz; |
int i; |
int i; |
|
|
if ((rhs = term_a2ascii(p->symtab, word, len, &sz))) |
rhs = term_a2ascii(p->symtab, word, len, &sz); |
|
|
|
if (rhs) |
for (i = 0; i < (int)sz; i++) |
for (i = 0; i < (int)sz; i++) |
term_encodea(p, rhs[i]); |
term_encodea(p, rhs[i]); |
} |
} |
Line 425 term_nescape(struct termp *p, const char *word, size_t |
|
Line 411 term_nescape(struct termp *p, const char *word, size_t |
|
* the escape sequence (we assert upon badly-formed escape sequences). |
* the escape sequence (we assert upon badly-formed escape sequences). |
*/ |
*/ |
static void |
static void |
term_pescape(struct termp *p, const char *word, int *i, int len) |
term_pescape(struct termp *p, const char **word) |
{ |
{ |
int j; |
int j; |
|
const char *wp; |
|
|
if (++(*i) >= len) |
wp = *word; |
|
|
|
if (0 == *(++wp)) { |
|
*word = wp; |
return; |
return; |
|
} |
|
|
if ('(' == word[*i]) { |
if ('(' == *wp) { |
(*i)++; |
wp++; |
if (*i + 1 >= len) |
if (0 == *wp || 0 == *(wp + 1)) { |
|
*word = 0 == *wp ? wp : wp + 1; |
return; |
return; |
|
} |
|
|
term_nescape(p, &word[*i], 2); |
term_nescape(p, wp, 2); |
(*i)++; |
*word = ++wp; |
return; |
return; |
|
|
} else if ('*' == word[*i]) { |
} else if ('*' == *wp) { |
(*i)++; |
if (0 == *(++wp)) { |
if (*i >= len) |
*word = wp; |
return; |
return; |
|
} |
|
|
switch (word[*i]) { |
switch (*wp) { |
case ('('): |
case ('('): |
(*i)++; |
wp++; |
if (*i + 1 >= len) |
if (0 == *wp || 0 == *(wp + 1)) { |
|
*word = 0 == *wp ? wp : wp + 1; |
return; |
return; |
|
} |
|
|
term_nescape(p, &word[*i], 2); |
term_nescape(p, wp, 2); |
(*i)++; |
*word = ++wp; |
return; |
return; |
case ('['): |
case ('['): |
break; |
break; |
default: |
default: |
term_nescape(p, &word[*i], 1); |
term_nescape(p, wp, 1); |
|
*word = wp; |
return; |
return; |
} |
} |
|
|
} else if ('f' == word[*i]) { |
} else if ('f' == *wp) { |
(*i)++; |
if (0 == *(++wp)) { |
if (*i >= len) |
*word = wp; |
return; |
return; |
switch (word[*i]) { |
} |
|
|
|
switch (*wp) { |
case ('B'): |
case ('B'): |
p->flags |= TERMP_BOLD; |
p->flags |= TERMP_BOLD; |
break; |
break; |
Line 481 term_pescape(struct termp *p, const char *word, int *i |
|
Line 480 term_pescape(struct termp *p, const char *word, int *i |
|
default: |
default: |
break; |
break; |
} |
} |
|
|
|
*word = wp; |
return; |
return; |
|
|
} else if ('[' != word[*i]) { |
} else if ('[' != *wp) { |
term_nescape(p, &word[*i], 1); |
term_nescape(p, wp, 1); |
|
*word = wp; |
return; |
return; |
} |
} |
|
|
(*i)++; |
wp++; |
for (j = 0; word[*i] && ']' != word[*i]; (*i)++, j++) |
for (j = 0; *wp && ']' != *wp; wp++, j++) |
/* Loop... */ ; |
/* Loop... */ ; |
|
|
if (0 == word[*i]) |
if (0 == *wp) { |
|
*word = wp; |
return; |
return; |
|
} |
|
|
term_nescape(p, &word[*i - j], (size_t)j); |
term_nescape(p, wp - j, (size_t)j); |
|
*word = wp; |
} |
} |
|
|
|
|
Line 504 term_pescape(struct termp *p, const char *word, int *i |
|
Line 509 term_pescape(struct termp *p, const char *word, int *i |
|
* phrase that cannot be broken down (such as a literal string). This |
* phrase that cannot be broken down (such as a literal string). This |
* handles word styling. |
* handles word styling. |
*/ |
*/ |
static void |
void |
term_pword(struct termp *p, const char *word, int len) |
term_word(struct termp *p, const char *word) |
{ |
{ |
int i; |
const char *sv; |
|
|
if (term_isclosedelim(word, len)) |
if (term_isclosedelim(word)) |
if ( ! (TERMP_IGNDELIM & p->flags)) |
if ( ! (TERMP_IGNDELIM & p->flags)) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
Line 524 term_pword(struct termp *p, const char *word, int len) |
|
Line 529 term_pword(struct termp *p, const char *word, int len) |
|
* before the word. |
* before the word. |
*/ |
*/ |
|
|
for (i = 0; i < len; i++) |
for (sv = word; *word; word++) |
if ('\\' == word[i]) |
if ('\\' != *word) |
term_pescape(p, word, &i, len); |
term_encodea(p, *word); |
else |
else |
term_encodea(p, word[i]); |
term_pescape(p, &word); |
|
|
if (term_isopendelim(word, len)) |
if (term_isopendelim(sv)) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
} |
} |
|
|
Line 561 term_chara(struct termp *p, char c) |
|
Line 566 term_chara(struct termp *p, char c) |
|
static void |
static void |
term_encodea(struct termp *p, char c) |
term_encodea(struct termp *p, char c) |
{ |
{ |
|
|
if (TERMP_STYLE & p->flags) { |
if (' ' != c && TERMP_STYLE & p->flags) { |
if (TERMP_BOLD & p->flags) { |
if (TERMP_BOLD & p->flags) { |
term_chara(p, c); |
term_chara(p, c); |
term_chara(p, 8); |
term_chara(p, 8); |