version 1.229, 2011/04/30 22:14:42 |
version 1.236, 2011/10/16 12:20:34 |
Line 264 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
Line 264 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
p->tabwidth = term_len(p, 5); |
p->tabwidth = term_len(p, 5); |
|
|
if (NULL == p->symtab) |
if (NULL == p->symtab) |
switch (p->enc) { |
p->symtab = mchars_alloc(); |
case (TERMENC_ASCII): |
|
p->symtab = mchars_alloc(); |
|
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
|
|
|
n = mdoc_node(mdoc); |
n = mdoc_node(mdoc); |
m = mdoc_meta(mdoc); |
m = mdoc_meta(mdoc); |
Line 358 print_mdoc_node(DECL_ARGS) |
|
Line 351 print_mdoc_node(DECL_ARGS) |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
break; |
break; |
case (MDOC_EQN): |
case (MDOC_EQN): |
term_word(p, n->eqn->data); |
term_eqn(p, n->eqn); |
break; |
break; |
case (MDOC_TBL): |
case (MDOC_TBL): |
term_tbl(p, n->span); |
term_tbl(p, n->span); |
Line 442 print_mdoc_foot(struct termp *p, const void *arg) |
|
Line 435 print_mdoc_foot(struct termp *p, const void *arg) |
|
|
|
p->offset = p->rmargin; |
p->offset = p->rmargin; |
p->rmargin = p->maxrmargin - term_strlen(p, m->os); |
p->rmargin = p->maxrmargin - term_strlen(p, m->os); |
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
term_word(p, m->date); |
term_word(p, m->date); |
term_flushln(p); |
term_flushln(p); |
Line 450 print_mdoc_foot(struct termp *p, const void *arg) |
|
Line 443 print_mdoc_foot(struct termp *p, const void *arg) |
|
p->offset = p->rmargin; |
p->offset = p->rmargin; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
term_word(p, m->os); |
term_word(p, m->os); |
term_flushln(p); |
term_flushln(p); |
|
|
print_mdoc_head(struct termp *p, const void *arg) |
print_mdoc_head(struct termp *p, const void *arg) |
{ |
{ |
char buf[BUFSIZ], title[BUFSIZ]; |
char buf[BUFSIZ], title[BUFSIZ]; |
|
size_t buflen, titlen; |
const struct mdoc_meta *m; |
const struct mdoc_meta *m; |
|
|
m = (const struct mdoc_meta *)arg; |
m = (const struct mdoc_meta *)arg; |
|
|
p->rmargin = p->maxrmargin; |
|
p->offset = 0; |
|
|
|
/* |
/* |
* The header is strange. It has three components, which are |
* The header is strange. It has three components, which are |
* really two with the first duplicated. It goes like this: |
* really two with the first duplicated. It goes like this: |
Line 485 print_mdoc_head(struct termp *p, const void *arg) |
|
Line 476 print_mdoc_head(struct termp *p, const void *arg) |
|
* switches on the manual section. |
* switches on the manual section. |
*/ |
*/ |
|
|
|
p->offset = 0; |
|
p->rmargin = p->maxrmargin; |
|
|
assert(m->vol); |
assert(m->vol); |
strlcpy(buf, m->vol, BUFSIZ); |
strlcpy(buf, m->vol, BUFSIZ); |
|
buflen = term_strlen(p, buf); |
|
|
if (m->arch) { |
if (m->arch) { |
strlcat(buf, " (", BUFSIZ); |
strlcat(buf, " (", BUFSIZ); |
Line 495 print_mdoc_head(struct termp *p, const void *arg) |
|
Line 490 print_mdoc_head(struct termp *p, const void *arg) |
|
} |
} |
|
|
snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec); |
snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec); |
|
titlen = term_strlen(p, title); |
|
|
p->offset = 0; |
|
p->rmargin = (p->maxrmargin - |
|
term_strlen(p, buf) + term_len(p, 1)) / 2; |
|
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
|
p->offset = 0; |
|
p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ? |
|
(p->maxrmargin - |
|
term_strlen(p, buf) + term_len(p, 1)) / 2 : |
|
p->maxrmargin - buflen; |
|
|
term_word(p, title); |
term_word(p, title); |
term_flushln(p); |
term_flushln(p); |
|
|
|
p->flags |= TERMP_NOSPACE; |
p->offset = p->rmargin; |
p->offset = p->rmargin; |
p->rmargin = p->maxrmargin - term_strlen(p, title); |
p->rmargin = p->offset + buflen + titlen < p->maxrmargin ? |
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
p->maxrmargin - titlen : p->maxrmargin; |
|
|
term_word(p, buf); |
term_word(p, buf); |
term_flushln(p); |
term_flushln(p); |
|
|
p->offset = p->rmargin; |
|
p->rmargin = p->maxrmargin; |
|
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
if (p->rmargin + titlen <= p->maxrmargin) { |
|
p->flags |= TERMP_NOSPACE; |
|
p->offset = p->rmargin; |
|
p->rmargin = p->maxrmargin; |
|
term_word(p, title); |
|
term_flushln(p); |
|
} |
|
|
term_word(p, title); |
p->flags &= ~TERMP_NOSPACE; |
term_flushln(p); |
|
|
|
p->offset = 0; |
p->offset = 0; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
p->flags &= ~TERMP_NOSPACE; |
|
} |
} |
|
|
|
|
Line 530 a2height(const struct termp *p, const char *v) |
|
Line 530 a2height(const struct termp *p, const char *v) |
|
{ |
{ |
struct roffsu su; |
struct roffsu su; |
|
|
|
|
assert(v); |
assert(v); |
if ( ! a2roffsu(v, &su, SCALE_VS)) |
if ( ! a2roffsu(v, &su, SCALE_VS)) |
SCALE_VS_INIT(&su, term_len(p, 1)); |
SCALE_VS_INIT(&su, atoi(v)); |
|
|
return(term_vspan(p, &su)); |
return(term_vspan(p, &su)); |
} |
} |
Line 583 print_bvspace(struct termp *p, |
|
Line 584 print_bvspace(struct termp *p, |
|
{ |
{ |
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
|
|
|
assert(n); |
|
|
term_newln(p); |
term_newln(p); |
|
|
if (MDOC_Bd == bl->tok && bl->norm->Bd.comp) |
if (MDOC_Bd == bl->tok && bl->norm->Bd.comp) |
Line 793 termp_it_pre(DECL_ARGS) |
|
Line 796 termp_it_pre(DECL_ARGS) |
|
case (LIST_hyphen): |
case (LIST_hyphen): |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
else |
|
p->flags |= TERMP_NOLPAD; |
|
break; |
break; |
case (LIST_hang): |
case (LIST_hang): |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
else |
else |
p->flags |= TERMP_NOLPAD; |
|
|
|
if (MDOC_HEAD != n->type) |
|
break; |
break; |
|
|
/* |
/* |
Line 813 termp_it_pre(DECL_ARGS) |
|
Line 811 termp_it_pre(DECL_ARGS) |
|
*/ |
*/ |
if (n->next->child && |
if (n->next->child && |
(MDOC_Bl == n->next->child->tok || |
(MDOC_Bl == n->next->child->tok || |
MDOC_Bd == n->next->child->tok)) { |
MDOC_Bd == n->next->child->tok)) |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOLPAD; |
else |
} else |
|
p->flags |= TERMP_HANG; |
p->flags |= TERMP_HANG; |
break; |
break; |
case (LIST_tag): |
case (LIST_tag): |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE; |
p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE; |
else |
|
p->flags |= TERMP_NOLPAD; |
|
|
|
if (MDOC_HEAD != n->type) |
if (MDOC_HEAD != n->type) |
break; |
break; |
Line 839 termp_it_pre(DECL_ARGS) |
|
Line 834 termp_it_pre(DECL_ARGS) |
|
else |
else |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
|
|
assert(n->prev); |
|
if (MDOC_BODY == n->prev->type) |
|
p->flags |= TERMP_NOLPAD; |
|
|
|
break; |
break; |
case (LIST_diag): |
case (LIST_diag): |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
Line 999 termp_it_post(DECL_ARGS) |
|
Line 990 termp_it_post(DECL_ARGS) |
|
p->flags &= ~TERMP_DANGLE; |
p->flags &= ~TERMP_DANGLE; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_TWOSPACE; |
p->flags &= ~TERMP_TWOSPACE; |
p->flags &= ~TERMP_NOLPAD; |
|
p->flags &= ~TERMP_HANG; |
p->flags &= ~TERMP_HANG; |
} |
} |
|
|
Line 1015 termp_nm_pre(DECL_ARGS) |
|
Line 1005 termp_nm_pre(DECL_ARGS) |
|
if (MDOC_BODY == n->type) { |
if (MDOC_BODY == n->type) { |
if (NULL == n->child) |
if (NULL == n->child) |
return(0); |
return(0); |
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
p->offset += term_len(p, 1) + |
p->offset += term_len(p, 1) + |
(NULL == n->prev->child ? term_strlen(p, m->name) : |
(NULL == n->prev->child ? term_strlen(p, m->name) : |
MDOC_TEXT == n->prev->child->type ? |
MDOC_TEXT == n->prev->child->type ? |
Line 1060 termp_nm_post(DECL_ARGS) |
|
Line 1050 termp_nm_post(DECL_ARGS) |
|
if (MDOC_HEAD == n->type && n->next->child) { |
if (MDOC_HEAD == n->type && n->next->child) { |
term_flushln(p); |
term_flushln(p); |
p->flags &= ~(TERMP_NOBREAK | TERMP_HANG); |
p->flags &= ~(TERMP_NOBREAK | TERMP_HANG); |
} else if (MDOC_BODY == n->type && n->child) { |
} else if (MDOC_BODY == n->type && n->child) |
term_flushln(p); |
term_flushln(p); |
p->flags &= ~TERMP_NOLPAD; |
|
} |
|
} |
} |
|
|
|
|