version 1.200, 2010/12/19 12:11:42 |
version 1.208, 2011/01/06 14:05:12 |
Line 68 static void synopsis_pre(struct termp *, |
|
Line 68 static void synopsis_pre(struct termp *, |
|
const struct mdoc_node *); |
const struct mdoc_node *); |
|
|
static void termp____post(DECL_ARGS); |
static void termp____post(DECL_ARGS); |
|
static void termp__t_post(DECL_ARGS); |
static void termp_an_post(DECL_ARGS); |
static void termp_an_post(DECL_ARGS); |
static void termp_bd_post(DECL_ARGS); |
static void termp_bd_post(DECL_ARGS); |
static void termp_bk_post(DECL_ARGS); |
static void termp_bk_post(DECL_ARGS); |
Line 85 static void termp_sh_post(DECL_ARGS); |
|
Line 86 static void termp_sh_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__a_pre(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_bd_pre(DECL_ARGS); |
static int termp_bd_pre(DECL_ARGS); |
Line 174 static const struct termact termacts[MDOC_MAX] = { |
|
Line 176 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_under_pre, termp____post }, /* %T */ |
{ termp__t_pre, termp__t_post }, /* %T */ |
{ NULL, termp____post }, /* %V */ |
{ NULL, termp____post }, /* %V */ |
{ NULL, NULL }, /* Ac */ |
{ NULL, NULL }, /* Ac */ |
{ termp_quote_pre, termp_quote_post }, /* Ao */ |
{ termp_quote_pre, termp_quote_post }, /* Ao */ |
Line 310 print_mdoc_node(DECL_ARGS) |
|
Line 312 print_mdoc_node(DECL_ARGS) |
|
|
|
memset(&npair, 0, sizeof(struct termpair)); |
memset(&npair, 0, sizeof(struct termpair)); |
npair.ppair = pair; |
npair.ppair = pair; |
|
|
|
switch (n->type) { |
|
case (MDOC_TEXT): |
|
term_word(p, n->string); |
|
break; |
|
case (MDOC_TBL): |
|
term_tbl(p, n->span); |
|
break; |
|
default: |
|
if (termacts[n->tok].pre && ENDBODY_NOT == n->end) |
|
chld = (*termacts[n->tok].pre) |
|
(p, &npair, m, n); |
|
break; |
|
} |
|
|
if (MDOC_TEXT == n->type) |
|
term_word(p, n->string); |
|
else if (termacts[n->tok].pre && ENDBODY_NOT == n->end) |
|
chld = (*termacts[n->tok].pre)(p, &npair, m, n); |
|
|
|
/* |
/* |
* Keeps only work until the end of a line. If a keep was |
* Keeps only work until the end of a line. If a keep was |
* invoked in a prior line, revert it to PREKEEP. |
* invoked in a prior line, revert it to PREKEEP. |
Line 351 print_mdoc_node(DECL_ARGS) |
|
Line 362 print_mdoc_node(DECL_ARGS) |
|
|
|
term_fontpopq(p, font); |
term_fontpopq(p, font); |
|
|
if (MDOC_TEXT != n->type && termacts[n->tok].post && |
switch (n->type) { |
! (MDOC_ENDED & n->flags)) { |
case (MDOC_TEXT): |
|
break; |
|
case (MDOC_TBL): |
|
break; |
|
default: |
|
if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags) |
|
break; |
(void)(*termacts[n->tok].post)(p, &npair, m, n); |
(void)(*termacts[n->tok].post)(p, &npair, m, n); |
|
|
/* |
/* |
Line 370 print_mdoc_node(DECL_ARGS) |
|
Line 387 print_mdoc_node(DECL_ARGS) |
|
*/ |
*/ |
if (ENDBODY_NOSPACE == n->end) |
if (ENDBODY_NOSPACE == n->end) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
break; |
} |
} |
|
|
if (MDOC_EOS & n->flags) |
if (MDOC_EOS & n->flags) |
Line 556 print_bvspace(struct termp *p, |
|
Line 574 print_bvspace(struct termp *p, |
|
|
|
term_newln(p); |
term_newln(p); |
|
|
if (MDOC_Bd == bl->tok && bl->data.Bd->comp) |
if (MDOC_Bd == bl->tok && bl->norm->Bd.comp) |
return; |
return; |
if (MDOC_Bl == bl->tok && bl->data.Bl->comp) |
if (MDOC_Bl == bl->tok && bl->norm->Bl.comp) |
return; |
return; |
|
|
/* Do not vspace directly after Ss/Sh. */ |
/* Do not vspace directly after Ss/Sh. */ |
Line 577 print_bvspace(struct termp *p, |
|
Line 595 print_bvspace(struct termp *p, |
|
|
|
/* A `-column' does not assert vspace within the list. */ |
/* A `-column' does not assert vspace within the list. */ |
|
|
if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl->type) |
if (MDOC_Bl == bl->tok && LIST_column == bl->norm->Bl.type) |
if (n->prev && MDOC_It == n->prev->tok) |
if (n->prev && MDOC_It == n->prev->tok) |
return; |
return; |
|
|
/* A `-diag' without body does not vspace. */ |
/* A `-diag' without body does not vspace. */ |
|
|
if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl->type) |
if (MDOC_Bl == bl->tok && LIST_diag == bl->norm->Bl.type) |
if (n->prev && MDOC_It == n->prev->tok) { |
if (n->prev && MDOC_It == n->prev->tok) { |
assert(n->prev->body); |
assert(n->prev->body); |
if (NULL == n->prev->body->child) |
if (NULL == n->prev->body->child) |
Line 610 termp_it_pre(DECL_ARGS) |
|
Line 628 termp_it_pre(DECL_ARGS) |
|
} |
} |
|
|
bl = n->parent->parent->parent; |
bl = n->parent->parent->parent; |
assert(bl->data.Bl); |
type = bl->norm->Bl.type; |
type = bl->data.Bl->type; |
|
|
|
/* |
/* |
* First calculate width and offset. This is pretty easy unless |
* First calculate width and offset. This is pretty easy unless |
Line 621 termp_it_pre(DECL_ARGS) |
|
Line 638 termp_it_pre(DECL_ARGS) |
|
|
|
width = offset = 0; |
width = offset = 0; |
|
|
if (bl->data.Bl->offs) |
if (bl->norm->Bl.offs) |
offset = a2offs(p, bl->data.Bl->offs); |
offset = a2offs(p, bl->norm->Bl.offs); |
|
|
switch (type) { |
switch (type) { |
case (LIST_column): |
case (LIST_column): |
Line 638 termp_it_pre(DECL_ARGS) |
|
Line 655 termp_it_pre(DECL_ARGS) |
|
* column. |
* column. |
* - For more than 5 columns, add only one column. |
* - For more than 5 columns, add only one column. |
*/ |
*/ |
ncols = bl->data.Bl->ncols; |
ncols = bl->norm->Bl.ncols; |
|
|
/* LINTED */ |
/* LINTED */ |
dcol = ncols < 5 ? term_len(p, 4) : |
dcol = ncols < 5 ? term_len(p, 4) : |
Line 653 termp_it_pre(DECL_ARGS) |
|
Line 670 termp_it_pre(DECL_ARGS) |
|
nn->prev && i < (int)ncols; |
nn->prev && i < (int)ncols; |
nn = nn->prev, i++) |
nn = nn->prev, i++) |
offset += dcol + a2width |
offset += dcol + a2width |
(p, bl->data.Bl->cols[i]); |
(p, bl->norm->Bl.cols[i]); |
|
|
/* |
/* |
* When exceeding the declared number of columns, leave |
* When exceeding the declared number of columns, leave |
Line 668 termp_it_pre(DECL_ARGS) |
|
Line 685 termp_it_pre(DECL_ARGS) |
|
* Use the declared column widths, extended as explained |
* Use the declared column widths, extended as explained |
* in the preceding paragraph. |
* in the preceding paragraph. |
*/ |
*/ |
width = a2width(p, bl->data.Bl->cols[i]) + dcol; |
width = a2width(p, bl->norm->Bl.cols[i]) + dcol; |
break; |
break; |
default: |
default: |
if (NULL == bl->data.Bl->width) |
if (NULL == bl->norm->Bl.width) |
break; |
break; |
|
|
/* |
/* |
Line 679 termp_it_pre(DECL_ARGS) |
|
Line 696 termp_it_pre(DECL_ARGS) |
|
* number for buffering single arguments. See the above |
* number for buffering single arguments. See the above |
* handling for column for how this changes. |
* handling for column for how this changes. |
*/ |
*/ |
assert(bl->data.Bl->width); |
assert(bl->norm->Bl.width); |
width = a2width(p, bl->data.Bl->width) + term_len(p, 2); |
width = a2width(p, bl->norm->Bl.width) + term_len(p, 2); |
break; |
break; |
} |
} |
|
|
Line 942 termp_it_post(DECL_ARGS) |
|
Line 959 termp_it_post(DECL_ARGS) |
|
if (MDOC_BLOCK == n->type) |
if (MDOC_BLOCK == n->type) |
return; |
return; |
|
|
type = n->parent->parent->parent->data.Bl->type; |
type = n->parent->parent->parent->norm->Bl.type; |
|
|
switch (type) { |
switch (type) { |
case (LIST_item): |
case (LIST_item): |
Line 1116 termp_an_post(DECL_ARGS) |
|
Line 1133 termp_an_post(DECL_ARGS) |
|
return; |
return; |
} |
} |
|
|
if (AUTH_split == n->data.An->auth) { |
if (AUTH_split == n->norm->An.auth) { |
p->flags &= ~TERMP_NOSPLIT; |
p->flags &= ~TERMP_NOSPLIT; |
p->flags |= TERMP_SPLIT; |
p->flags |= TERMP_SPLIT; |
} else if (AUTH_nosplit == n->data.An->auth) { |
} else if (AUTH_nosplit == n->norm->An.auth) { |
p->flags &= ~TERMP_SPLIT; |
p->flags &= ~TERMP_SPLIT; |
p->flags |= TERMP_NOSPLIT; |
p->flags |= TERMP_NOSPLIT; |
} |
} |
Line 1566 termp_bd_pre(DECL_ARGS) |
|
Line 1583 termp_bd_pre(DECL_ARGS) |
|
} else if (MDOC_HEAD == n->type) |
} else if (MDOC_HEAD == n->type) |
return(0); |
return(0); |
|
|
assert(n->data.Bd); |
if (n->norm->Bd.offs) |
if (n->data.Bd->offs) |
p->offset += a2offs(p, n->norm->Bd.offs); |
p->offset += a2offs(p, n->data.Bd->offs); |
|
|
|
/* |
/* |
* If -ragged or -filled are specified, the block does nothing |
* If -ragged or -filled are specified, the block does nothing |
Line 1578 termp_bd_pre(DECL_ARGS) |
|
Line 1594 termp_bd_pre(DECL_ARGS) |
|
* lines are allowed. |
* lines are allowed. |
*/ |
*/ |
|
|
if (DISP_literal != n->data.Bd->type && |
if (DISP_literal != n->norm->Bd.type && |
DISP_unfilled != n->data.Bd->type) |
DISP_unfilled != n->norm->Bd.type) |
return(1); |
return(1); |
|
|
tabwidth = p->tabwidth; |
tabwidth = p->tabwidth; |
p->tabwidth = term_len(p, 8); |
if (DISP_literal == n->norm->Bd.type) |
|
p->tabwidth = term_len(p, 8); |
|
|
rm = p->rmargin; |
rm = p->rmargin; |
rmax = p->maxrmargin; |
rmax = p->maxrmargin; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
Line 1641 termp_bd_post(DECL_ARGS) |
|
Line 1659 termp_bd_post(DECL_ARGS) |
|
rm = p->rmargin; |
rm = p->rmargin; |
rmax = p->maxrmargin; |
rmax = p->maxrmargin; |
|
|
assert(n->data.Bd); |
if (DISP_literal == n->norm->Bd.type || |
if (DISP_literal == n->data.Bd->type || |
DISP_unfilled == n->norm->Bd.type) |
DISP_unfilled == n->data.Bd->type) |
|
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
termp_quote_pre(DECL_ARGS) |
termp_quote_pre(DECL_ARGS) |
{ |
{ |
|
|
if (MDOC_BODY != n->type) |
if (MDOC_BODY != n->type && MDOC_ELEM != n->type) |
return(1); |
return(1); |
|
|
switch (n->tok) { |
switch (n->tok) { |
Line 1866 termp_quote_pre(DECL_ARGS) |
|
Line 1883 termp_quote_pre(DECL_ARGS) |
|
case (MDOC_Pq): |
case (MDOC_Pq): |
term_word(p, "("); |
term_word(p, "("); |
break; |
break; |
|
case (MDOC__T): |
|
/* FALLTHROUGH */ |
case (MDOC_Qo): |
case (MDOC_Qo): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Qq): |
case (MDOC_Qq): |
|
|
termp_quote_post(DECL_ARGS) |
termp_quote_post(DECL_ARGS) |
{ |
{ |
|
|
if (MDOC_BODY != n->type) |
if (MDOC_BODY != n->type && MDOC_ELEM != n->type) |
return; |
return; |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
Line 1928 termp_quote_post(DECL_ARGS) |
|
Line 1947 termp_quote_post(DECL_ARGS) |
|
case (MDOC_Pq): |
case (MDOC_Pq): |
term_word(p, ")"); |
term_word(p, ")"); |
break; |
break; |
|
case (MDOC__T): |
|
/* FALLTHROUGH */ |
case (MDOC_Qo): |
case (MDOC_Qo): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Qq): |
case (MDOC_Qq): |
Line 1998 termp_bf_pre(DECL_ARGS) |
|
Line 2019 termp_bf_pre(DECL_ARGS) |
|
else if (MDOC_BLOCK != n->type) |
else if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
|
|
assert(n->data.Bf); |
if (FONT_Em == n->norm->Bf.font) |
|
|
if (FONT_Em == n->data.Bf->font) |
|
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
else if (FONT_Sy == n->data.Bf->font) |
else if (FONT_Sy == n->norm->Bf.font) |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
else |
else |
term_fontpush(p, TERMFONT_NONE); |
term_fontpush(p, TERMFONT_NONE); |
Line 2136 termp_bk_post(DECL_ARGS) |
|
Line 2155 termp_bk_post(DECL_ARGS) |
|
|
|
if (MDOC_BODY == n->type) |
if (MDOC_BODY == n->type) |
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
|
} |
|
|
|
/* ARGSUSED */ |
|
static void |
|
termp__t_post(DECL_ARGS) |
|
{ |
|
|
|
/* |
|
* If we're in an `Rs' and there's a journal present, then quote |
|
* us instead of underlining us (for disambiguation). |
|
*/ |
|
if (n->parent && MDOC_Rs == n->parent->tok && |
|
n->parent->norm->Rs.child_J) |
|
termp_quote_post(p, pair, m, n); |
|
|
|
termp____post(p, pair, m, n); |
|
} |
|
|
|
/* ARGSUSED */ |
|
static int |
|
termp__t_pre(DECL_ARGS) |
|
{ |
|
|
|
/* |
|
* If we're in an `Rs' and there's a journal present, then quote |
|
* us instead of underlining us (for disambiguation). |
|
*/ |
|
if (n->parent && MDOC_Rs == n->parent->tok && |
|
n->parent->norm->Rs.child_J) |
|
return(termp_quote_pre(p, pair, m, n)); |
|
|
|
term_fontpush(p, TERMFONT_UNDER); |
|
return(1); |
} |
} |
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |