version 1.207, 2013/05/29 15:17:52 |
version 1.218, 2014/03/23 11:25:26 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
#include <stdint.h> |
|
#include <stdio.h> |
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
|
#include "mandoc.h" |
#include "mandoc.h" |
|
#include "mandoc_aux.h" |
#include "out.h" |
#include "out.h" |
#include "term.h" |
#include "term.h" |
#include "main.h" |
#include "main.h" |
|
|
static size_t cond_width(const struct termp *, int, int *); |
static size_t cond_width(const struct termp *, int, int *); |
static void adjbuf(struct termp *p, int); |
static void adjbuf(struct termp *p, size_t); |
static void bufferc(struct termp *, char); |
static void bufferc(struct termp *, char); |
static void encode(struct termp *, const char *, size_t); |
static void encode(struct termp *, const char *, size_t); |
static void encode1(struct termp *, int); |
static void encode1(struct termp *, int); |
Line 83 term_end(struct termp *p) |
|
Line 83 term_end(struct termp *p) |
|
* - TERMP_NOBREAK: this is the most important and is used when making |
* - TERMP_NOBREAK: this is the most important and is used when making |
* columns. In short: don't print a newline and instead expect the |
* columns. In short: don't print a newline and instead expect the |
* next call to do the padding up to the start of the next column. |
* next call to do the padding up to the start of the next column. |
|
* p->trailspace may be set to 0, 1, or 2, depending on how many |
|
* space characters are required at the end of the column. |
* |
* |
* - TERMP_TWOSPACE: make sure there is room for at least two space |
|
* characters of padding. Otherwise, rather break the line. |
|
* |
|
* - TERMP_DANGLE: don't newline when TERMP_NOBREAK is specified and |
* - TERMP_DANGLE: don't newline when TERMP_NOBREAK is specified and |
* the line is overrun, and don't pad-right if it's underrun. |
* the line is overrun, and don't pad-right if it's underrun. |
* |
* |
Line 105 term_end(struct termp *p) |
|
Line 104 term_end(struct termp *p) |
|
void |
void |
term_flushln(struct termp *p) |
term_flushln(struct termp *p) |
{ |
{ |
int i; /* current input position in p->buf */ |
size_t i; /* current input position in p->buf */ |
int ntab; /* number of tabs to prepend */ |
int ntab; /* number of tabs to prepend */ |
size_t vis; /* current visual position on output */ |
size_t vis; /* current visual position on output */ |
size_t vbl; /* number of blanks to prepend to output */ |
size_t vbl; /* number of blanks to prepend to output */ |
size_t vend; /* end of word visual position on output */ |
size_t vend; /* end of word visual position on output */ |
size_t bp; /* visual right border position */ |
size_t bp; /* visual right border position */ |
size_t dv; /* temporary for visual pos calculations */ |
size_t dv; /* temporary for visual pos calculations */ |
int j; /* temporary loop index for p->buf */ |
size_t j; /* temporary loop index for p->buf */ |
int jhy; /* last hyph before overflow w/r/t j */ |
size_t jhy; /* last hyph before overflow w/r/t j */ |
size_t maxvis; /* output position of visible boundary */ |
size_t maxvis; /* output position of visible boundary */ |
size_t mmax; /* used in calculating bp */ |
size_t mmax; /* used in calculating bp */ |
|
|
Line 121 term_flushln(struct termp *p) |
|
Line 120 term_flushln(struct termp *p) |
|
* First, establish the maximum columns of "visible" content. |
* First, establish the maximum columns of "visible" content. |
* This is usually the difference between the right-margin and |
* This is usually the difference between the right-margin and |
* an indentation, but can be, for tagged lists or columns, a |
* an indentation, but can be, for tagged lists or columns, a |
* small set of values. |
* small set of values. |
|
* |
|
* The following unsigned-signed subtractions look strange, |
|
* but they are actually correct. If the int p->overstep |
|
* is negative, it gets sign extended. Subtracting that |
|
* very large size_t effectively adds a small number to dv. |
*/ |
*/ |
assert (p->rmargin >= p->offset); |
assert (p->rmargin >= p->offset); |
dv = p->rmargin - p->offset; |
dv = p->rmargin - p->offset; |
Line 162 term_flushln(struct termp *p) |
|
Line 166 term_flushln(struct termp *p) |
|
*/ |
*/ |
|
|
for (j = i, jhy = 0; j < p->col; j++) { |
for (j = i, jhy = 0; j < p->col; j++) { |
if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j]) |
if (' ' == p->buf[j] || '\t' == p->buf[j]) |
break; |
break; |
|
|
/* Back over the the last printed character. */ |
/* Back over the the last printed character. */ |
Line 175 term_flushln(struct termp *p) |
|
Line 179 term_flushln(struct termp *p) |
|
/* Regular word. */ |
/* Regular word. */ |
/* Break at the hyphen point if we overrun. */ |
/* Break at the hyphen point if we overrun. */ |
if (vend > vis && vend < bp && |
if (vend > vis && vend < bp && |
ASCII_HYPH == p->buf[j]) |
(ASCII_HYPH == p->buf[j] || |
|
ASCII_BREAK == p->buf[j])) |
jhy = j; |
jhy = j; |
|
|
|
/* |
|
* Hyphenation now decided, put back a real |
|
* hyphen such that we get the correct width. |
|
*/ |
|
if (ASCII_HYPH == p->buf[j]) |
|
p->buf[j] = '-'; |
|
|
vend += (*p->width)(p, p->buf[j]); |
vend += (*p->width)(p, p->buf[j]); |
} |
} |
|
|
Line 200 term_flushln(struct termp *p) |
|
Line 212 term_flushln(struct termp *p) |
|
if (0 < ntab) |
if (0 < ntab) |
vbl += ntab * p->tabwidth; |
vbl += ntab * p->tabwidth; |
|
|
/* Remove the p->overstep width. */ |
/* |
|
* Remove the p->overstep width. |
|
* Again, if p->overstep is negative, |
|
* sign extension does the right thing. |
|
*/ |
|
|
bp += (size_t)p->overstep; |
bp += (size_t)p->overstep; |
p->overstep = 0; |
p->overstep = 0; |
Line 216 term_flushln(struct termp *p) |
|
Line 232 term_flushln(struct termp *p) |
|
j = i; |
j = i; |
while (' ' == p->buf[i]) |
while (' ' == p->buf[i]) |
i++; |
i++; |
dv = (size_t)(i - j) * (*p->width)(p, ' '); |
dv = (i - j) * (*p->width)(p, ' '); |
vbl += dv; |
vbl += dv; |
vend += dv; |
vend += dv; |
break; |
break; |
Line 225 term_flushln(struct termp *p) |
|
Line 241 term_flushln(struct termp *p) |
|
vbl += (*p->width)(p, ' '); |
vbl += (*p->width)(p, ' '); |
continue; |
continue; |
} |
} |
|
if (ASCII_BREAK == p->buf[i]) |
|
continue; |
|
|
/* |
/* |
* Now we definitely know there will be |
* Now we definitely know there will be |
Line 237 term_flushln(struct termp *p) |
|
Line 255 term_flushln(struct termp *p) |
|
vbl = 0; |
vbl = 0; |
} |
} |
|
|
if (ASCII_HYPH == p->buf[i]) { |
|
(*p->letter)(p, '-'); |
|
p->viscol += (*p->width)(p, '-'); |
|
continue; |
|
} |
|
|
|
(*p->letter)(p, p->buf[i]); |
(*p->letter)(p, p->buf[i]); |
if (8 == p->buf[i]) |
if (8 == p->buf[i]) |
p->viscol -= (*p->width)(p, p->buf[i-1]); |
p->viscol -= (*p->width)(p, p->buf[i-1]); |
Line 269 term_flushln(struct termp *p) |
|
Line 281 term_flushln(struct termp *p) |
|
} |
} |
|
|
if (TERMP_HANG & p->flags) { |
if (TERMP_HANG & p->flags) { |
/* We need one blank after the tag. */ |
p->overstep = (int)(vis - maxvis + |
p->overstep = (int)(vis - maxvis + (*p->width)(p, ' ')); |
p->trailspace * (*p->width)(p, ' ')); |
|
|
/* |
/* |
* If we have overstepped the margin, temporarily move |
* If we have overstepped the margin, temporarily move |
* it to the right and flag the rest of the line to be |
* it to the right and flag the rest of the line to be |
* shorter. |
* shorter. |
|
* If there is a request to keep the columns together, |
|
* allow negative overstep when the column is not full. |
*/ |
*/ |
if (p->overstep < 0) |
if (p->trailspace && p->overstep < 0) |
p->overstep = 0; |
p->overstep = 0; |
return; |
return; |
|
|
Line 285 term_flushln(struct termp *p) |
|
Line 299 term_flushln(struct termp *p) |
|
return; |
return; |
|
|
/* If the column was overrun, break the line. */ |
/* If the column was overrun, break the line. */ |
if (maxvis <= vis + |
if (maxvis < vis + p->trailspace * (*p->width)(p, ' ')) { |
((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) { |
|
(*p->endline)(p); |
(*p->endline)(p); |
p->viscol = 0; |
p->viscol = 0; |
} |
} |
Line 398 term_fontpop(struct termp *p) |
|
Line 411 term_fontpop(struct termp *p) |
|
void |
void |
term_word(struct termp *p, const char *word) |
term_word(struct termp *p, const char *word) |
{ |
{ |
|
const char nbrsp[2] = { ASCII_NBRSP, 0 }; |
const char *seq, *cp; |
const char *seq, *cp; |
char c; |
char c; |
int sz, uc; |
int sz, uc; |
Line 420 term_word(struct termp *p, const char *word) |
|
Line 434 term_word(struct termp *p, const char *word) |
|
else |
else |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
p->flags &= ~(TERMP_SENTENCE | TERMP_IGNDELIM); |
p->flags &= ~TERMP_SENTENCE; |
|
|
while ('\0' != *word) { |
while ('\0' != *word) { |
if ('\\' != *word) { |
if ('\\' != *word) { |
Line 429 term_word(struct termp *p, const char *word) |
|
Line 443 term_word(struct termp *p, const char *word) |
|
word++; |
word++; |
continue; |
continue; |
} |
} |
ssz = strcspn(word, "\\"); |
if (TERMP_NBRWORD & p->flags) { |
|
if (' ' == *word) { |
|
encode(p, nbrsp, 1); |
|
word++; |
|
continue; |
|
} |
|
ssz = strcspn(word, "\\ "); |
|
} else |
|
ssz = strcspn(word, "\\"); |
encode(p, word, ssz); |
encode(p, word, ssz); |
word += (int)ssz; |
word += (int)ssz; |
continue; |
continue; |
Line 480 term_word(struct termp *p, const char *word) |
|
Line 502 term_word(struct termp *p, const char *word) |
|
case (ESCAPE_FONTITALIC): |
case (ESCAPE_FONTITALIC): |
term_fontrepl(p, TERMFONT_UNDER); |
term_fontrepl(p, TERMFONT_UNDER); |
break; |
break; |
|
case (ESCAPE_FONTBI): |
|
term_fontrepl(p, TERMFONT_BI); |
|
break; |
case (ESCAPE_FONT): |
case (ESCAPE_FONT): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (ESCAPE_FONTROMAN): |
case (ESCAPE_FONTROMAN): |
Line 501 term_word(struct termp *p, const char *word) |
|
Line 526 term_word(struct termp *p, const char *word) |
|
break; |
break; |
} |
} |
} |
} |
|
p->flags &= ~TERMP_NBRWORD; |
} |
} |
|
|
static void |
static void |
adjbuf(struct termp *p, int sz) |
adjbuf(struct termp *p, size_t sz) |
{ |
{ |
|
|
if (0 == p->maxcols) |
if (0 == p->maxcols) |
Line 512 adjbuf(struct termp *p, int sz) |
|
Line 538 adjbuf(struct termp *p, int sz) |
|
while (sz >= p->maxcols) |
while (sz >= p->maxcols) |
p->maxcols <<= 2; |
p->maxcols <<= 2; |
|
|
p->buf = mandoc_realloc |
p->buf = mandoc_realloc(p->buf, sizeof(int) * p->maxcols); |
(p->buf, sizeof(int) * (size_t)p->maxcols); |
|
} |
} |
|
|
static void |
static void |
Line 541 encode1(struct termp *p, int c) |
|
Line 566 encode1(struct termp *p, int c) |
|
return; |
return; |
} |
} |
|
|
if (p->col + 4 >= p->maxcols) |
if (p->col + 6 >= p->maxcols) |
adjbuf(p, p->col + 4); |
adjbuf(p, p->col + 6); |
|
|
f = term_fonttop(p); |
f = term_fonttop(p); |
|
|
if (TERMFONT_NONE == f) { |
if (TERMFONT_UNDER == f || TERMFONT_BI == f) { |
p->buf[p->col++] = c; |
|
return; |
|
} else if (TERMFONT_UNDER == f) { |
|
p->buf[p->col++] = '_'; |
p->buf[p->col++] = '_'; |
} else |
p->buf[p->col++] = 8; |
p->buf[p->col++] = c; |
} |
|
if (TERMFONT_BOLD == f || TERMFONT_BI == f) { |
p->buf[p->col++] = 8; |
if (ASCII_HYPH == c) |
|
p->buf[p->col++] = '-'; |
|
else |
|
p->buf[p->col++] = c; |
|
p->buf[p->col++] = 8; |
|
} |
p->buf[p->col++] = c; |
p->buf[p->col++] = c; |
} |
} |
|
|
static void |
static void |
encode(struct termp *p, const char *word, size_t sz) |
encode(struct termp *p, const char *word, size_t sz) |
{ |
{ |
enum termfont f; |
size_t i; |
int i, len; |
|
|
|
if (TERMP_SKIPCHAR & p->flags) { |
if (TERMP_SKIPCHAR & p->flags) { |
p->flags &= ~TERMP_SKIPCHAR; |
p->flags &= ~TERMP_SKIPCHAR; |
return; |
return; |
} |
} |
|
|
/* LINTED */ |
|
len = sz; |
|
|
|
/* |
/* |
* Encode and buffer a string of characters. If the current |
* Encode and buffer a string of characters. If the current |
* font mode is unset, buffer directly, else encode then buffer |
* font mode is unset, buffer directly, else encode then buffer |
* character by character. |
* character by character. |
*/ |
*/ |
|
|
if (TERMFONT_NONE == (f = term_fonttop(p))) { |
if (TERMFONT_NONE == term_fonttop(p)) { |
if (p->col + len >= p->maxcols) |
if (p->col + sz >= p->maxcols) |
adjbuf(p, p->col + len); |
adjbuf(p, p->col + sz); |
for (i = 0; i < len; i++) |
for (i = 0; i < sz; i++) |
p->buf[p->col++] = word[i]; |
p->buf[p->col++] = word[i]; |
return; |
return; |
} |
} |
|
|
/* Pre-buffer, assuming worst-case. */ |
/* Pre-buffer, assuming worst-case. */ |
|
|
if (p->col + 1 + (len * 3) >= p->maxcols) |
if (p->col + 1 + (sz * 5) >= p->maxcols) |
adjbuf(p, p->col + 1 + (len * 3)); |
adjbuf(p, p->col + 1 + (sz * 5)); |
|
|
for (i = 0; i < len; i++) { |
for (i = 0; i < sz; i++) { |
if (ASCII_HYPH != word[i] && |
if (ASCII_HYPH == word[i] || |
! isgraph((unsigned char)word[i])) { |
isgraph((unsigned char)word[i])) |
p->buf[p->col++] = word[i]; |
encode1(p, word[i]); |
continue; |
|
} |
|
|
|
if (TERMFONT_UNDER == f) |
|
p->buf[p->col++] = '_'; |
|
else if (ASCII_HYPH == word[i]) |
|
p->buf[p->col++] = '-'; |
|
else |
else |
p->buf[p->col++] = word[i]; |
p->buf[p->col++] = word[i]; |
|
|
p->buf[p->col++] = 8; |
|
p->buf[p->col++] = word[i]; |
|
} |
} |
} |
} |
|
|
Line 635 term_strlen(const struct termp *p, const char *cp) |
|
Line 648 term_strlen(const struct termp *p, const char *cp) |
|
int ssz, skip, c; |
int ssz, skip, c; |
const char *seq, *rhs; |
const char *seq, *rhs; |
enum mandoc_esc esc; |
enum mandoc_esc esc; |
static const char rej[] = { '\\', ASCII_HYPH, ASCII_NBRSP, '\0' }; |
static const char rej[] = { '\\', ASCII_NBRSP, ASCII_HYPH, |
|
ASCII_BREAK, '\0' }; |
|
|
/* |
/* |
* Account for escaped sequences within string length |
* Account for escaped sequences within string length |
Line 650 term_strlen(const struct termp *p, const char *cp) |
|
Line 664 term_strlen(const struct termp *p, const char *cp) |
|
for (i = 0; i < rsz; i++) |
for (i = 0; i < rsz; i++) |
sz += cond_width(p, *cp++, &skip); |
sz += cond_width(p, *cp++, &skip); |
|
|
c = 0; |
|
switch (*cp) { |
switch (*cp) { |
case ('\\'): |
case ('\\'): |
cp++; |
cp++; |
Line 724 term_strlen(const struct termp *p, const char *cp) |
|
Line 737 term_strlen(const struct termp *p, const char *cp) |
|
case (ASCII_HYPH): |
case (ASCII_HYPH): |
sz += cond_width(p, '-', &skip); |
sz += cond_width(p, '-', &skip); |
cp++; |
cp++; |
|
/* FALLTHROUGH */ |
|
case (ASCII_BREAK): |
break; |
break; |
default: |
default: |
break; |
break; |