version 1.160, 2010/06/27 16:18:13 |
version 1.167, 2010/07/02 12:54:33 |
Line 85 static void termp_fo_post(DECL_ARGS); |
|
Line 85 static void termp_fo_post(DECL_ARGS); |
|
static void termp_in_post(DECL_ARGS); |
static void termp_in_post(DECL_ARGS); |
static void termp_it_post(DECL_ARGS); |
static void termp_it_post(DECL_ARGS); |
static void termp_lb_post(DECL_ARGS); |
static void termp_lb_post(DECL_ARGS); |
|
static void termp_nm_post(DECL_ARGS); |
static void termp_op_post(DECL_ARGS); |
static void termp_op_post(DECL_ARGS); |
static void termp_pf_post(DECL_ARGS); |
static void termp_pf_post(DECL_ARGS); |
static void termp_pq_post(DECL_ARGS); |
static void termp_pq_post(DECL_ARGS); |
Line 170 static const struct termact termacts[MDOC_MAX] = { |
|
Line 171 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_in_pre, termp_in_post }, /* In */ |
{ termp_in_pre, termp_in_post }, /* In */ |
{ termp_li_pre, NULL }, /* Li */ |
{ termp_li_pre, NULL }, /* Li */ |
{ termp_nd_pre, NULL }, /* Nd */ |
{ termp_nd_pre, NULL }, /* Nd */ |
{ termp_nm_pre, NULL }, /* Nm */ |
{ termp_nm_pre, termp_nm_post }, /* Nm */ |
{ termp_op_pre, termp_op_post }, /* Op */ |
{ termp_op_pre, termp_op_post }, /* Op */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, NULL }, /* Ot */ |
{ termp_under_pre, NULL }, /* Pa */ |
{ termp_under_pre, NULL }, /* Pa */ |
Line 325 print_mdoc_node(DECL_ARGS) |
|
Line 326 print_mdoc_node(DECL_ARGS) |
|
memset(&npair, 0, sizeof(struct termpair)); |
memset(&npair, 0, sizeof(struct termpair)); |
npair.ppair = pair; |
npair.ppair = pair; |
|
|
if (MDOC_TEXT != n->type) { |
if (MDOC_TEXT == n->type) |
if (termacts[n->tok].pre) |
|
chld = (*termacts[n->tok].pre)(p, &npair, m, n); |
|
} else |
|
term_word(p, n->string); |
term_word(p, n->string); |
|
else if (termacts[n->tok].pre && ENDBODY_NOT == n->end) |
|
chld = (*termacts[n->tok].pre)(p, &npair, m, n); |
|
|
if (chld && n->child) |
if (chld && n->child) |
print_mdoc_nodelist(p, &npair, m, n->child); |
print_mdoc_nodelist(p, &npair, m, n->child); |
|
|
term_fontpopq(p, font); |
term_fontpopq(p, font); |
|
|
if (MDOC_TEXT != n->type) |
if (MDOC_TEXT != n->type && termacts[n->tok].post && |
if (termacts[n->tok].post) |
! (MDOC_ENDED & n->flags)) { |
(*termacts[n->tok].post)(p, &npair, m, n); |
(void)(*termacts[n->tok].post)(p, &npair, m, n); |
|
|
|
/* |
|
* Explicit end tokens not only call the post |
|
* handler, but also tell the respective block |
|
* that it must not call the post handler again. |
|
*/ |
|
if (ENDBODY_NOT != n->end) |
|
n->pending->flags |= MDOC_ENDED; |
|
|
|
/* |
|
* End of line terminating an implicit block |
|
* while an explicit block is still open. |
|
* Continue the explicit block without spacing. |
|
*/ |
|
if (ENDBODY_NOSPACE == n->end) |
|
p->flags |= TERMP_NOSPACE; |
|
} |
|
|
if (MDOC_EOS & n->flags) |
if (MDOC_EOS & n->flags) |
p->flags |= TERMP_SENTENCE; |
p->flags |= TERMP_SENTENCE; |
|
|
Line 556 print_bvspace(struct termp *p, |
|
Line 573 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->data.Bd->comp) |
return; |
return; |
if (MDOC_Bl == bl->tok && bl->data.Bl.comp) |
if (MDOC_Bl == bl->tok && bl->data.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 594 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->data.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->data.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 637 termp_it_pre(DECL_ARGS) |
|
Line 654 termp_it_pre(DECL_ARGS) |
|
} |
} |
|
|
bl = n->parent->parent->parent; |
bl = n->parent->parent->parent; |
type = bl->data.Bl.type; |
assert(bl->data.Bl); |
|
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 647 termp_it_pre(DECL_ARGS) |
|
Line 665 termp_it_pre(DECL_ARGS) |
|
|
|
width = offset = 0; |
width = offset = 0; |
|
|
if (bl->data.Bl.offs) |
if (bl->data.Bl->offs) |
offset = a2offs(p, bl->data.Bl.offs); |
offset = a2offs(p, bl->data.Bl->offs); |
|
|
switch (type) { |
switch (type) { |
case (LIST_column): |
case (LIST_column): |
Line 698 termp_it_pre(DECL_ARGS) |
|
Line 716 termp_it_pre(DECL_ARGS) |
|
width = a2width(p, bl->args->argv[col].value[i]) + dcol; |
width = a2width(p, bl->args->argv[col].value[i]) + dcol; |
break; |
break; |
default: |
default: |
if (NULL == bl->data.Bl.width) |
if (NULL == bl->data.Bl->width) |
break; |
break; |
|
|
/* |
/* |
Line 706 termp_it_pre(DECL_ARGS) |
|
Line 724 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->data.Bl->width); |
width = a2width(p, bl->data.Bl.width) + term_len(p, 2); |
width = a2width(p, bl->data.Bl->width) + term_len(p, 2); |
break; |
break; |
} |
} |
|
|
Line 969 termp_it_post(DECL_ARGS) |
|
Line 987 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->data.Bl->type; |
|
|
switch (type) { |
switch (type) { |
case (LIST_item): |
case (LIST_item): |
|
|
termp_nm_pre(DECL_ARGS) |
termp_nm_pre(DECL_ARGS) |
{ |
{ |
|
|
if (NULL == n->child && NULL == m->name) |
if (MDOC_BLOCK == n->type) |
return(1); |
return(1); |
|
|
|
if (MDOC_BODY == n->type) { |
|
if (NULL == n->child) |
|
return(0); |
|
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
|
p->offset += term_len(p, 1) + |
|
(NULL == n->prev->child ? term_strlen(p, m->name) : |
|
MDOC_TEXT == n->prev->child->type ? |
|
term_strlen(p, n->prev->child->string) : |
|
term_len(p, 5)); |
|
return(1); |
|
} |
|
|
|
if (NULL == n->child && NULL == m->name) |
|
return(0); |
|
|
synopsis_pre(p, n); |
synopsis_pre(p, n); |
|
|
|
if (MDOC_HEAD == n->type && n->next->child) { |
|
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_HANG; |
|
p->rmargin = p->offset + term_len(p, 1) + |
|
(NULL == n->child ? term_strlen(p, m->name) : |
|
MDOC_TEXT == n->child->type ? |
|
term_strlen(p, n->child->string) : |
|
term_len(p, 5)); |
|
} |
|
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
if (NULL == n->child) |
if (NULL == n->child) |
term_word(p, m->name); |
term_word(p, m->name); |
Line 1021 termp_nm_pre(DECL_ARGS) |
|
Line 1063 termp_nm_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
|
static void |
|
termp_nm_post(DECL_ARGS) |
|
{ |
|
|
|
if (MDOC_HEAD == n->type && n->next->child) { |
|
term_flushln(p); |
|
p->flags &= ~(TERMP_NOBREAK | TERMP_HANG); |
|
} else if (MDOC_BODY == n->type && n->child) { |
|
term_flushln(p); |
|
p->flags &= ~TERMP_NOLPAD; |
|
} |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
static int |
static int |
termp_fl_pre(DECL_ARGS) |
termp_fl_pre(DECL_ARGS) |
{ |
{ |
Line 1591 termp_bd_pre(DECL_ARGS) |
|
Line 1648 termp_bd_pre(DECL_ARGS) |
|
} else if (MDOC_HEAD == n->type) |
} else if (MDOC_HEAD == n->type) |
return(0); |
return(0); |
|
|
if (n->data.Bd.offs) |
assert(n->data.Bd); |
p->offset += a2offs(p, n->data.Bd.offs); |
if (n->data.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 1602 termp_bd_pre(DECL_ARGS) |
|
Line 1660 termp_bd_pre(DECL_ARGS) |
|
* lines are allowed. |
* lines are allowed. |
*/ |
*/ |
|
|
if (DISP_literal != n->data.Bd.type && |
if (DISP_literal != n->data.Bd->type && |
DISP_unfilled != n->data.Bd.type) |
DISP_unfilled != n->data.Bd->type) |
return(1); |
return(1); |
|
|
tabwidth = p->tabwidth; |
tabwidth = p->tabwidth; |
Line 1640 termp_bd_post(DECL_ARGS) |
|
Line 1698 termp_bd_post(DECL_ARGS) |
|
rm = p->rmargin; |
rm = p->rmargin; |
rmax = p->maxrmargin; |
rmax = p->maxrmargin; |
|
|
if (DISP_literal == n->data.Bd.type || |
assert(n->data.Bd); |
DISP_unfilled == n->data.Bd.type) |
if (DISP_literal == n->data.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; |
Line 1998 termp_fo_post(DECL_ARGS) |
|
Line 2057 termp_fo_post(DECL_ARGS) |
|
static int |
static int |
termp_bf_pre(DECL_ARGS) |
termp_bf_pre(DECL_ARGS) |
{ |
{ |
const struct mdoc_node *nn; |
|
|
|
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
return(0); |
return(0); |
else if (MDOC_BLOCK != n->type) |
else if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
|
|
if (NULL == (nn = n->head->child)) { |
assert(n->data.Bf); |
if (arg_hasattr(MDOC_Emphasis, n)) |
|
term_fontpush(p, TERMFONT_UNDER); |
|
else if (arg_hasattr(MDOC_Symbolic, n)) |
|
term_fontpush(p, TERMFONT_BOLD); |
|
else |
|
term_fontpush(p, TERMFONT_NONE); |
|
|
|
return(1); |
if (FONT_Em == n->data.Bf->font) |
} |
|
|
|
assert(MDOC_TEXT == nn->type); |
|
if (0 == strcmp("Em", nn->string)) |
|
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
else if (0 == strcmp("Sy", nn->string)) |
else if (FONT_Sy == n->data.Bf->font) |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
else |
else |
term_fontpush(p, TERMFONT_NONE); |
term_fontpush(p, TERMFONT_NONE); |
|
|
return(1); |
return(1); |
|
|
termp_bk_pre(DECL_ARGS) |
termp_bk_pre(DECL_ARGS) |
{ |
{ |
|
|
p->flags |= TERMP_PREKEEP; |
switch (n->type) { |
|
case (MDOC_BLOCK): |
|
break; |
|
case (MDOC_HEAD): |
|
return(0); |
|
case (MDOC_BODY): |
|
p->flags |= TERMP_PREKEEP; |
|
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
|
|
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_bk_post(DECL_ARGS) |
termp_bk_post(DECL_ARGS) |
{ |
{ |
|
|
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
if (MDOC_BODY == n->type) |
|
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
} |
} |
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |