version 1.173, 2010/07/07 15:04:54 |
version 1.185, 2010/09/23 20:40:00 |
Line 92 static void termp_sh_post(DECL_ARGS); |
|
Line 92 static void termp_sh_post(DECL_ARGS); |
|
static void termp_sq_post(DECL_ARGS); |
static void termp_sq_post(DECL_ARGS); |
static void termp_ss_post(DECL_ARGS); |
static void termp_ss_post(DECL_ARGS); |
|
|
|
static int termp__a_pre(DECL_ARGS); |
static int termp_an_pre(DECL_ARGS); |
static int termp_an_pre(DECL_ARGS); |
static int termp_ap_pre(DECL_ARGS); |
static int termp_ap_pre(DECL_ARGS); |
static int termp_aq_pre(DECL_ARGS); |
static int termp_aq_pre(DECL_ARGS); |
Line 151 static const struct termact termacts[MDOC_MAX] = { |
|
Line 152 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_bl_pre, termp_bl_post }, /* Bl */ |
{ termp_bl_pre, termp_bl_post }, /* Bl */ |
{ NULL, NULL }, /* El */ |
{ NULL, NULL }, /* El */ |
{ termp_it_pre, termp_it_post }, /* It */ |
{ termp_it_pre, termp_it_post }, /* It */ |
{ NULL, NULL }, /* Ad */ |
{ termp_under_pre, NULL }, /* Ad */ |
{ termp_an_pre, termp_an_post }, /* An */ |
{ termp_an_pre, termp_an_post }, /* An */ |
{ termp_under_pre, NULL }, /* Ar */ |
{ termp_under_pre, NULL }, /* Ar */ |
{ termp_cd_pre, NULL }, /* Cd */ |
{ termp_cd_pre, NULL }, /* Cd */ |
Line 178 static const struct termact termacts[MDOC_MAX] = { |
|
Line 179 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_under_pre, NULL }, /* Va */ |
{ termp_under_pre, NULL }, /* Va */ |
{ termp_vt_pre, NULL }, /* Vt */ |
{ termp_vt_pre, NULL }, /* Vt */ |
{ termp_xr_pre, NULL }, /* Xr */ |
{ termp_xr_pre, NULL }, /* Xr */ |
{ NULL, termp____post }, /* %A */ |
{ termp__a_pre, termp____post }, /* %A */ |
{ termp_under_pre, termp____post }, /* %B */ |
{ termp_under_pre, termp____post }, /* %B */ |
{ NULL, termp____post }, /* %D */ |
{ NULL, termp____post }, /* %D */ |
{ termp_under_pre, termp____post }, /* %I */ |
{ termp_under_pre, termp____post }, /* %I */ |
Line 208 static const struct termact termacts[MDOC_MAX] = { |
|
Line 209 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_under_pre, NULL }, /* Em */ |
{ termp_under_pre, NULL }, /* Em */ |
{ NULL, NULL }, /* Eo */ |
{ NULL, NULL }, /* Eo */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_bold_pre, NULL }, /* Ms */ /* FIXME: convert to symbol? */ |
{ termp_bold_pre, NULL }, /* Ms */ |
{ NULL, NULL }, /* No */ |
{ NULL, NULL }, /* No */ |
{ termp_ns_pre, NULL }, /* Ns */ |
{ termp_ns_pre, NULL }, /* Ns */ |
{ termp_xx_pre, NULL }, /* Nx */ |
{ termp_xx_pre, NULL }, /* Nx */ |
Line 1026 termp_nm_pre(DECL_ARGS) |
|
Line 1027 termp_nm_pre(DECL_ARGS) |
|
if (NULL == n->child && NULL == m->name) |
if (NULL == n->child && NULL == m->name) |
return(0); |
return(0); |
|
|
synopsis_pre(p, n); |
if (MDOC_HEAD == n->type) |
|
synopsis_pre(p, n->parent); |
|
|
if (MDOC_HEAD == n->type && n->next->child) { |
if (MDOC_HEAD == n->type && n->next->child) { |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_HANG; |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
p->rmargin = p->offset + term_len(p, 1) + |
p->rmargin = p->offset + term_len(p, 1); |
(NULL == n->child ? term_strlen(p, m->name) : |
if (NULL == n->child) { |
MDOC_TEXT == n->child->type ? |
p->rmargin += term_strlen(p, m->name); |
term_strlen(p, n->child->string) : |
} else if (MDOC_TEXT == n->child->type) { |
term_len(p, 5)); |
p->rmargin += term_strlen(p, n->child->string); |
|
if (n->child->next) |
|
p->flags |= TERMP_HANG; |
|
} else { |
|
p->rmargin += term_len(p, 5); |
|
p->flags |= TERMP_HANG; |
|
} |
} |
} |
|
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
Line 1078 termp_fl_pre(DECL_ARGS) |
|
Line 1086 termp_fl_pre(DECL_ARGS) |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
|
termp__a_pre(DECL_ARGS) |
|
{ |
|
|
|
if (n->prev && MDOC__A == n->prev->tok) |
|
if (NULL == n->next || MDOC__A != n->next->tok) |
|
term_word(p, "and"); |
|
|
|
return(1); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
termp_an_pre(DECL_ARGS) |
termp_an_pre(DECL_ARGS) |
{ |
{ |
|
|
Line 1620 termp_fa_pre(DECL_ARGS) |
|
Line 1641 termp_fa_pre(DECL_ARGS) |
|
static int |
static int |
termp_bd_pre(DECL_ARGS) |
termp_bd_pre(DECL_ARGS) |
{ |
{ |
size_t tabwidth; |
size_t tabwidth, rm, rmax; |
size_t rm, rmax; |
|
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
Line 1653 termp_bd_pre(DECL_ARGS) |
|
Line 1673 termp_bd_pre(DECL_ARGS) |
|
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
|
|
for (nn = n->child; nn; nn = nn->next) { |
for (nn = n->child; nn; nn = nn->next) { |
p->flags |= TERMP_NOSPACE; |
|
print_mdoc_node(p, pair, m, nn); |
print_mdoc_node(p, pair, m, nn); |
if (NULL == nn->prev || |
if (nn->next && nn->next->line == nn->line) |
nn->prev->line < nn->line || |
continue; |
NULL == nn->next) |
term_flushln(p); |
term_flushln(p); |
p->flags |= TERMP_NOSPACE; |
} |
} |
|
|
p->tabwidth = tabwidth; |
p->tabwidth = tabwidth; |
Line 1905 termp_sp_pre(DECL_ARGS) |
|
Line 1924 termp_sp_pre(DECL_ARGS) |
|
len = 0; |
len = 0; |
break; |
break; |
default: |
default: |
|
assert(n->parent); |
|
if ((NULL == n->next || NULL == n->prev) && |
|
(MDOC_Ss == n->parent->tok || |
|
MDOC_Sh == n->parent->tok)) |
|
return(0); |
len = 1; |
len = 1; |
break; |
break; |
} |
} |
Line 2066 termp_sm_pre(DECL_ARGS) |
|
Line 2090 termp_sm_pre(DECL_ARGS) |
|
{ |
{ |
|
|
assert(n->child && MDOC_TEXT == n->child->type); |
assert(n->child && MDOC_TEXT == n->child->type); |
if (0 == strcmp("on", n->child->string)) |
if (0 == strcmp("on", n->child->string)) { |
|
if (p->col) |
|
p->flags &= ~TERMP_NOSPACE; |
p->flags &= ~TERMP_NONOSPACE; |
p->flags &= ~TERMP_NONOSPACE; |
else |
} else |
p->flags |= TERMP_NONOSPACE; |
p->flags |= TERMP_NONOSPACE; |
|
|
return(0); |
return(0); |
|
|
termp____post(DECL_ARGS) |
termp____post(DECL_ARGS) |
{ |
{ |
|
|
|
/* |
|
* Handle lists of authors. In general, print each followed by |
|
* a comma. Don't print the comma if there are only two |
|
* authors. |
|
*/ |
|
if (MDOC__A == n->tok && n->next && MDOC__A == n->next->tok) |
|
if (NULL == n->next->next || MDOC__A != n->next->next->tok) |
|
if (NULL == n->prev || MDOC__A != n->prev->tok) |
|
return; |
|
|
/* TODO: %U. */ |
/* TODO: %U. */ |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
Line 2113 termp_li_pre(DECL_ARGS) |
|
Line 2149 termp_li_pre(DECL_ARGS) |
|
static int |
static int |
termp_lk_pre(DECL_ARGS) |
termp_lk_pre(DECL_ARGS) |
{ |
{ |
const struct mdoc_node *nn; |
const struct mdoc_node *nn, *sv; |
|
|
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
nn = n->child; |
|
|
|
|
nn = sv = n->child; |
|
|
if (NULL == nn->next) |
if (NULL == nn->next) |
return(1); |
return(1); |
|
|
term_word(p, nn->string); |
for (nn = nn->next; nn; nn = nn->next) |
|
term_word(p, nn->string); |
|
|
term_fontpop(p); |
term_fontpop(p); |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ":"); |
term_word(p, ":"); |
|
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
for (nn = nn->next; nn; nn = nn->next) |
term_word(p, sv->string); |
term_word(p, nn->string); |
|
term_fontpop(p); |
term_fontpop(p); |
|
|
return(0); |
return(0); |