version 1.108, 2010/01/01 18:01:40 |
version 1.117, 2010/04/08 08:17:55 |
|
|
|
|
struct termpair { |
struct termpair { |
struct termpair *ppair; |
struct termpair *ppair; |
int flag; |
|
int count; |
int count; |
}; |
}; |
|
|
Line 94 static void termp_sq_post(DECL_ARGS); |
|
Line 93 static void termp_sq_post(DECL_ARGS); |
|
static void termp_ss_post(DECL_ARGS); |
static void termp_ss_post(DECL_ARGS); |
static void termp_vt_post(DECL_ARGS); |
static void termp_vt_post(DECL_ARGS); |
|
|
static int termp__t_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); |
static int termp_bd_pre(DECL_ARGS); |
static int termp_bd_pre(DECL_ARGS); |
static int termp_bf_pre(DECL_ARGS); |
static int termp_bf_pre(DECL_ARGS); |
|
static int termp_bl_pre(DECL_ARGS); |
static int termp_bold_pre(DECL_ARGS); |
static int termp_bold_pre(DECL_ARGS); |
static int termp_bq_pre(DECL_ARGS); |
static int termp_bq_pre(DECL_ARGS); |
static int termp_brq_pre(DECL_ARGS); |
static int termp_brq_pre(DECL_ARGS); |
Line 133 static int termp_sq_pre(DECL_ARGS); |
|
Line 132 static int termp_sq_pre(DECL_ARGS); |
|
static int termp_ss_pre(DECL_ARGS); |
static int termp_ss_pre(DECL_ARGS); |
static int termp_under_pre(DECL_ARGS); |
static int termp_under_pre(DECL_ARGS); |
static int termp_ud_pre(DECL_ARGS); |
static int termp_ud_pre(DECL_ARGS); |
|
static int termp_vt_pre(DECL_ARGS); |
static int termp_xr_pre(DECL_ARGS); |
static int termp_xr_pre(DECL_ARGS); |
static int termp_xx_pre(DECL_ARGS); |
static int termp_xx_pre(DECL_ARGS); |
|
|
Line 148 static const struct termact termacts[MDOC_MAX] = { |
|
Line 148 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_d1_pre, termp_d1_post }, /* Dl */ |
{ termp_d1_pre, termp_d1_post }, /* Dl */ |
{ termp_bd_pre, termp_bd_post }, /* Bd */ |
{ termp_bd_pre, termp_bd_post }, /* Bd */ |
{ NULL, NULL }, /* Ed */ |
{ NULL, NULL }, /* Ed */ |
{ NULL, 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 */ |
{ NULL, NULL }, /* Ad */ |
Line 176 static const struct termact termacts[MDOC_MAX] = { |
|
Line 176 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_rv_pre, NULL }, /* Rv */ |
{ termp_rv_pre, NULL }, /* Rv */ |
{ NULL, NULL }, /* St */ |
{ NULL, NULL }, /* St */ |
{ termp_under_pre, NULL }, /* Va */ |
{ termp_under_pre, NULL }, /* Va */ |
{ termp_under_pre, termp_vt_post }, /* Vt */ |
{ termp_vt_pre, termp_vt_post }, /* Vt */ |
{ termp_xr_pre, NULL }, /* Xr */ |
{ termp_xr_pre, NULL }, /* Xr */ |
{ NULL, termp____post }, /* %A */ |
{ NULL, termp____post }, /* %A */ |
{ termp_under_pre, termp____post }, /* %B */ |
{ termp_under_pre, termp____post }, /* %B */ |
Line 187 static const struct termact termacts[MDOC_MAX] = { |
|
Line 187 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, termp____post }, /* %O */ |
{ NULL, termp____post }, /* %O */ |
{ NULL, termp____post }, /* %P */ |
{ NULL, termp____post }, /* %P */ |
{ NULL, termp____post }, /* %R */ |
{ NULL, termp____post }, /* %R */ |
{ termp__t_pre, termp____post }, /* %T */ |
{ termp_under_pre, termp____post }, /* %T */ |
{ NULL, termp____post }, /* %V */ |
{ NULL, termp____post }, /* %V */ |
{ NULL, NULL }, /* Ac */ |
{ NULL, NULL }, /* Ac */ |
{ termp_aq_pre, termp_aq_post }, /* Ao */ |
{ termp_aq_pre, termp_aq_post }, /* Ao */ |
Line 203 static const struct termact termacts[MDOC_MAX] = { |
|
Line 203 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Dc */ |
{ termp_dq_pre, termp_dq_post }, /* Do */ |
{ termp_dq_pre, termp_dq_post }, /* Do */ |
{ termp_dq_pre, termp_dq_post }, /* Dq */ |
{ termp_dq_pre, termp_dq_post }, /* Dq */ |
{ NULL, NULL }, /* Ec */ |
{ NULL, NULL }, /* Ec */ /* FIXME: no space */ |
{ NULL, NULL }, /* Ef */ |
{ NULL, NULL }, /* Ef */ |
{ termp_under_pre, NULL }, /* Em */ |
{ termp_under_pre, NULL }, /* Em */ |
{ NULL, NULL }, /* Eo */ |
{ NULL, NULL }, /* Eo */ |
Line 270 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
Line 270 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
|
|
p = (struct termp *)arg; |
p = (struct termp *)arg; |
|
|
|
p->overstep = 0; |
|
p->maxrmargin = 78; |
|
|
if (NULL == p->symtab) |
if (NULL == p->symtab) |
switch (p->enc) { |
switch (p->enc) { |
case (TERMENC_ASCII): |
case (TERMENC_ASCII): |
Line 677 termp_it_pre(DECL_ARGS) |
|
Line 680 termp_it_pre(DECL_ARGS) |
|
|
|
bl = n->parent->parent->parent; |
bl = n->parent->parent->parent; |
|
|
/* Save parent attributes. */ |
|
|
|
pair->flag = p->flags; |
|
|
|
/* Get list width, offset, and list type from argument list. */ |
/* Get list width, offset, and list type from argument list. */ |
|
|
keys[0] = MDOC_Width; |
keys[0] = MDOC_Width; |
Line 822 termp_it_pre(DECL_ARGS) |
|
Line 821 termp_it_pre(DECL_ARGS) |
|
} |
} |
|
|
/* |
/* |
* Pad and break control. This is the tricker part. Lists with |
* Pad and break control. This is the tricky part. These flags |
* set right-margins for the head get TERMP_NOBREAK because, if |
* are documented in term_flushln() in term.c. Note that we're |
* they overrun the margin, they wrap to the new margin. |
* going to unset all of these flags in termp_it_post() when we |
* Correspondingly, the body for these types don't left-pad, as |
* exit. |
* the head will pad out to to the right. |
|
*/ |
*/ |
|
|
switch (type) { |
switch (type) { |
Line 967 termp_it_pre(DECL_ARGS) |
|
Line 965 termp_it_pre(DECL_ARGS) |
|
break; |
break; |
case (MDOC_Enum): |
case (MDOC_Enum): |
(pair->ppair->ppair->count)++; |
(pair->ppair->ppair->count)++; |
(void)snprintf(buf, sizeof(buf), "%d.", |
snprintf(buf, sizeof(buf), "%d.", |
pair->ppair->ppair->count); |
pair->ppair->ppair->count); |
term_word(p, buf); |
term_word(p, buf); |
break; |
break; |
Line 1010 termp_it_post(DECL_ARGS) |
|
Line 1008 termp_it_post(DECL_ARGS) |
|
{ |
{ |
int type; |
int type; |
|
|
if (MDOC_BODY != n->type && MDOC_HEAD != n->type) |
if (MDOC_BLOCK == n->type) |
return; |
return; |
|
|
type = arg_listtype(n->parent->parent->parent); |
type = arg_listtype(n->parent->parent->parent); |
Line 1034 termp_it_post(DECL_ARGS) |
|
Line 1032 termp_it_post(DECL_ARGS) |
|
break; |
break; |
} |
} |
|
|
p->flags = pair->flag; |
/* |
|
* Now that our output is flushed, we can reset our tags. Since |
|
* only `It' sets these flags, we're free to assume that nobody |
|
* has munged them in the meanwhile. |
|
*/ |
|
|
|
p->flags &= ~TERMP_DANGLE; |
|
p->flags &= ~TERMP_NOBREAK; |
|
p->flags &= ~TERMP_TWOSPACE; |
|
p->flags &= ~TERMP_NOLPAD; |
|
p->flags &= ~TERMP_HANG; |
} |
} |
|
|
|
|
Line 1062 termp_fl_pre(DECL_ARGS) |
|
Line 1070 termp_fl_pre(DECL_ARGS) |
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, "\\-"); |
term_word(p, "\\-"); |
|
|
/* A blank `Fl' should incur a subsequent space. */ |
|
|
|
if (n->child) |
if (n->child) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
else if (n->next && n->next->line == n->line) |
|
p->flags |= TERMP_NOSPACE; |
|
|
return(1); |
return(1); |
} |
} |
Line 1242 termp_nd_pre(DECL_ARGS) |
|
Line 1250 termp_nd_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
|
static int |
|
termp_bl_pre(DECL_ARGS) |
|
{ |
|
|
|
return(MDOC_HEAD != n->type); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
static void |
static void |
termp_bl_post(DECL_ARGS) |
termp_bl_post(DECL_ARGS) |
{ |
{ |
Line 1269 termp_xr_pre(DECL_ARGS) |
|
Line 1286 termp_xr_pre(DECL_ARGS) |
|
{ |
{ |
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
|
|
assert(n->child && MDOC_TEXT == n->child->type); |
if (NULL == n->child) |
|
return(0); |
|
|
|
assert(MDOC_TEXT == n->child->type); |
nn = n->child; |
nn = n->child; |
|
|
term_word(p, nn->string); |
term_word(p, nn->string); |
Line 1286 termp_xr_pre(DECL_ARGS) |
|
Line 1306 termp_xr_pre(DECL_ARGS) |
|
} |
} |
|
|
|
|
|
static int |
|
termp_vt_pre(DECL_ARGS) |
|
{ |
|
|
|
if (MDOC_ELEM == n->type) |
|
return(termp_under_pre(p, pair, m, n)); |
|
else if (MDOC_HEAD == n->type) |
|
return(0); |
|
else if (MDOC_BLOCK == n->type) |
|
return(1); |
|
|
|
return(termp_under_pre(p, pair, m, n)); |
|
} |
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
static void |
termp_vt_post(DECL_ARGS) |
termp_vt_post(DECL_ARGS) |
{ |
{ |
|
|
if (n->sec != SEC_SYNOPSIS) |
if (MDOC_BLOCK != n->type) |
return; |
return; |
if (n->next && MDOC_Vt == n->next->tok) |
if (n->next && MDOC_Vt == n->next->tok) |
term_newln(p); |
term_newln(p); |
Line 1568 termp_bd_pre(DECL_ARGS) |
|
Line 1603 termp_bd_pre(DECL_ARGS) |
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
print_bvspace(p, n, n); |
print_bvspace(p, n, n); |
return(1); |
return(1); |
} else if (MDOC_BODY != n->type) |
} else if (MDOC_HEAD == n->type) |
return(1); |
return(0); |
|
|
nn = n->parent; |
nn = n->parent; |
|
|
Line 2015 termp_sm_pre(DECL_ARGS) |
|
Line 2050 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)) |
p->flags &= ~TERMP_NONOSPACE; |
p->flags &= ~TERMP_NONOSPACE; |
p->flags &= ~TERMP_NOSPACE; |
else |
} else |
|
p->flags |= TERMP_NONOSPACE; |
p->flags |= TERMP_NONOSPACE; |
|
|
return(0); |
return(0); |
Line 2045 termp____post(DECL_ARGS) |
|
Line 2079 termp____post(DECL_ARGS) |
|
/* TODO: %U. */ |
/* TODO: %U. */ |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
switch (n->tok) { |
|
case (MDOC__T): |
|
term_word(p, "\\(rq"); |
|
p->flags |= TERMP_NOSPACE; |
|
break; |
|
default: |
|
break; |
|
} |
|
term_word(p, n->next ? "," : "."); |
term_word(p, n->next ? "," : "."); |
} |
} |
|
|
Line 2100 termp_under_pre(DECL_ARGS) |
|
Line 2126 termp_under_pre(DECL_ARGS) |
|
{ |
{ |
|
|
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
return(1); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
|
termp__t_pre(DECL_ARGS) |
|
{ |
|
|
|
term_word(p, "\\(lq"); |
|
p->flags |= TERMP_NOSPACE; |
|
return(1); |
return(1); |
} |
} |