version 1.290, 2014/11/17 06:44:58 |
version 1.293, 2014/11/25 20:00:01 |
|
|
print_mdoc_foot(struct termp *p, const void *arg) |
print_mdoc_foot(struct termp *p, const void *arg) |
{ |
{ |
const struct mdoc_meta *meta; |
const struct mdoc_meta *meta; |
|
size_t sz; |
|
|
meta = (const struct mdoc_meta *)arg; |
meta = (const struct mdoc_meta *)arg; |
|
|
Line 421 print_mdoc_foot(struct termp *p, const void *arg) |
|
Line 422 print_mdoc_foot(struct termp *p, const void *arg) |
|
term_vspace(p); |
term_vspace(p); |
|
|
p->offset = 0; |
p->offset = 0; |
p->rmargin = (p->maxrmargin - |
sz = term_strlen(p, meta->date); |
term_strlen(p, meta->date) + term_len(p, 1)) / 2; |
p->rmargin = p->maxrmargin > sz ? |
|
(p->maxrmargin + term_len(p, 1) - sz) / 2 : 0; |
p->trailspace = 1; |
p->trailspace = 1; |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
|
|
Line 430 print_mdoc_foot(struct termp *p, const void *arg) |
|
Line 432 print_mdoc_foot(struct termp *p, const void *arg) |
|
term_flushln(p); |
term_flushln(p); |
|
|
p->offset = p->rmargin; |
p->offset = p->rmargin; |
p->rmargin = p->maxrmargin - term_strlen(p, meta->os); |
sz = term_strlen(p, meta->os); |
|
p->rmargin = p->maxrmargin > sz ? p->maxrmargin - sz : 0; |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
term_word(p, meta->date); |
term_word(p, meta->date); |
Line 492 print_mdoc_head(struct termp *p, const void *arg) |
|
Line 495 print_mdoc_head(struct termp *p, const void *arg) |
|
p->offset = 0; |
p->offset = 0; |
p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ? |
p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ? |
(p->maxrmargin - vollen + term_len(p, 1)) / 2 : |
(p->maxrmargin - vollen + term_len(p, 1)) / 2 : |
p->maxrmargin - vollen; |
vollen < p->maxrmargin ? p->maxrmargin - vollen : 0; |
|
|
term_word(p, title); |
term_word(p, title); |
term_flushln(p); |
term_flushln(p); |
Line 873 termp_it_pre(DECL_ARGS) |
|
Line 876 termp_it_pre(DECL_ARGS) |
|
assert(width); |
assert(width); |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
p->rmargin = p->offset + width; |
p->rmargin = p->offset + width; |
else { |
else |
p->offset += width; |
p->offset += width; |
if (p->rmargin < p->offset) |
|
p->rmargin = p->offset; |
|
} |
|
break; |
break; |
case LIST_column: |
case LIST_column: |
assert(width); |
assert(width); |
Line 1010 termp_nm_pre(DECL_ARGS) |
|
Line 1010 termp_nm_pre(DECL_ARGS) |
|
MDOC_TEXT == n->prev->child->type ? |
MDOC_TEXT == n->prev->child->type ? |
term_strlen(p, n->prev->child->string) : |
term_strlen(p, n->prev->child->string) : |
term_len(p, 5)); |
term_len(p, 5)); |
if (p->rmargin < p->offset) |
|
p->rmargin = p->offset; |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_sh_pre(DECL_ARGS) |
termp_sh_pre(DECL_ARGS) |
{ |
{ |
|
|
/* No vspace between consecutive `Sh' calls. */ |
|
|
|
switch (n->type) { |
switch (n->type) { |
case MDOC_BLOCK: |
case MDOC_BLOCK: |
if (n->prev && MDOC_Sh == n->prev->tok) |
/* |
if (NULL == n->prev->body->child) |
* Vertical space before sections, except |
break; |
* when the previous section was empty. |
term_vspace(p); |
*/ |
|
if (n->prev == NULL || |
|
MDOC_Sh != n->prev->tok || |
|
(n->prev->body != NULL && |
|
n->prev->body->child != NULL)) |
|
term_vspace(p); |
break; |
break; |
case MDOC_HEAD: |
case MDOC_HEAD: |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
Line 1854 termp_quote_pre(DECL_ARGS) |
|
Line 1855 termp_quote_pre(DECL_ARGS) |
|
case MDOC_Ao: |
case MDOC_Ao: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Aq: |
case MDOC_Aq: |
term_word(p, "<"); |
term_word(p, n->parent->prev != NULL && |
|
n->parent->prev->tok == MDOC_An ? "<" : "\\(la"); |
break; |
break; |
case MDOC_Bro: |
case MDOC_Bro: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1925 termp_quote_post(DECL_ARGS) |
|
Line 1927 termp_quote_post(DECL_ARGS) |
|
case MDOC_Ao: |
case MDOC_Ao: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Aq: |
case MDOC_Aq: |
term_word(p, ">"); |
term_word(p, n->parent->prev != NULL && |
|
n->parent->prev->tok == MDOC_An ? ">" : "\\(ra"); |
break; |
break; |
case MDOC_Bro: |
case MDOC_Bro: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |