version 1.125, 2010/05/17 22:11:42 |
version 1.141, 2010/06/06 10:50:56 |
Line 61 static int arg_getattrs(const int *, int *, size_t, |
|
Line 61 static int arg_getattrs(const int *, int *, size_t, |
|
const struct mdoc_node *); |
const struct mdoc_node *); |
static int arg_getattr(int, const struct mdoc_node *); |
static int arg_getattr(int, const struct mdoc_node *); |
static int arg_disptype(const struct mdoc_node *); |
static int arg_disptype(const struct mdoc_node *); |
static int arg_listtype(const struct mdoc_node *); |
|
static void print_bvspace(struct termp *, |
static void print_bvspace(struct termp *, |
const struct mdoc_node *, |
const struct mdoc_node *, |
const struct mdoc_node *); |
const struct mdoc_node *); |
Line 83 static void termp_dq_post(DECL_ARGS); |
|
Line 82 static void termp_dq_post(DECL_ARGS); |
|
static void termp_fd_post(DECL_ARGS); |
static void termp_fd_post(DECL_ARGS); |
static void termp_fn_post(DECL_ARGS); |
static void termp_fn_post(DECL_ARGS); |
static void termp_fo_post(DECL_ARGS); |
static void termp_fo_post(DECL_ARGS); |
static void termp_ft_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); |
Line 167 static const struct termact termacts[MDOC_MAX] = { |
|
Line 165 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_bold_pre, termp_fd_post }, /* Fd */ |
{ termp_bold_pre, termp_fd_post }, /* Fd */ |
{ termp_fl_pre, NULL }, /* Fl */ |
{ termp_fl_pre, NULL }, /* Fl */ |
{ termp_fn_pre, termp_fn_post }, /* Fn */ |
{ termp_fn_pre, termp_fn_post }, /* Fn */ |
{ termp_ft_pre, termp_ft_post }, /* Ft */ |
{ termp_ft_pre, NULL }, /* Ft */ |
{ termp_bold_pre, NULL }, /* Ic */ |
{ termp_bold_pre, NULL }, /* Ic */ |
{ termp_in_pre, termp_in_post }, /* In */ |
{ termp_in_pre, termp_in_post }, /* In */ |
{ termp_li_pre, NULL }, /* Li */ |
{ termp_li_pre, NULL }, /* Li */ |
Line 261 static const struct termact termacts[MDOC_MAX] = { |
|
Line 259 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_sp_pre, NULL }, /* br */ |
{ termp_sp_pre, NULL }, /* br */ |
{ termp_sp_pre, NULL }, /* sp */ |
{ termp_sp_pre, NULL }, /* sp */ |
{ termp_under_pre, termp____post }, /* %U */ |
{ termp_under_pre, termp____post }, /* %U */ |
|
{ NULL, NULL }, /* Ta */ |
}; |
}; |
|
|
|
|
Line 275 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
Line 274 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
|
|
p->overstep = 0; |
p->overstep = 0; |
p->maxrmargin = p->defrmargin; |
p->maxrmargin = p->defrmargin; |
|
p->tabwidth = 5; |
|
|
if (NULL == p->symtab) |
if (NULL == p->symtab) |
switch (p->enc) { |
switch (p->enc) { |
Line 512 arg_disptype(const struct mdoc_node *n) |
|
Line 512 arg_disptype(const struct mdoc_node *n) |
|
} |
} |
|
|
|
|
static int |
|
arg_listtype(const struct mdoc_node *n) |
|
{ |
|
int i, len; |
|
|
|
assert(MDOC_BLOCK == n->type); |
|
|
|
len = (int)(n->args ? n->args->argc : 0); |
|
|
|
for (i = 0; i < len; i++) |
|
switch (n->args->argv[i].arg) { |
|
case (MDOC_Bullet): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Dash): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Enum): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Hyphen): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Tag): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Inset): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Diag): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Item): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Column): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Hang): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ohang): |
|
return(n->args->argv[i].arg); |
|
default: |
|
break; |
|
} |
|
|
|
return(-1); |
|
} |
|
|
|
|
|
static size_t |
static size_t |
a2offs(const struct mdoc_argv *arg) |
a2offs(const struct mdoc_argv *arg) |
{ |
{ |
Line 655 print_bvspace(struct termp *p, |
|
Line 614 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 && arg_hasattr(MDOC_Column, bl)) |
if (MDOC_Bl == bl->tok && LIST_column == bl->data.list) |
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 && arg_hasattr(MDOC_Diag, bl)) |
if (MDOC_Bl == bl->tok && LIST_diag == bl->data.list) |
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 705 termp_it_pre(DECL_ARGS) |
|
Line 664 termp_it_pre(DECL_ARGS) |
|
{ |
{ |
const struct mdoc_node *bl, *nn; |
const struct mdoc_node *bl, *nn; |
char buf[7]; |
char buf[7]; |
int i, type, keys[3], vals[3]; |
int i, keys[3], vals[3]; |
size_t width, offset, ncols, dcol; |
size_t width, offset, ncols, dcol; |
|
enum mdoc_list type; |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
print_bvspace(p, n->parent->parent, n); |
print_bvspace(p, n->parent->parent, n); |
Line 725 termp_it_pre(DECL_ARGS) |
|
Line 685 termp_it_pre(DECL_ARGS) |
|
|
|
arg_getattrs(keys, vals, 3, bl); |
arg_getattrs(keys, vals, 3, bl); |
|
|
type = arg_listtype(bl); |
type = bl->data.list; |
assert(-1 != type); |
|
|
|
/* |
/* |
* First calculate width and offset. This is pretty easy unless |
* First calculate width and offset. This is pretty easy unless |
Line 740 termp_it_pre(DECL_ARGS) |
|
Line 699 termp_it_pre(DECL_ARGS) |
|
offset = a2offs(&bl->args->argv[vals[1]]); |
offset = a2offs(&bl->args->argv[vals[1]]); |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Column): |
case (LIST_column): |
if (MDOC_BODY == n->type) |
if (MDOC_HEAD == n->type) |
break; |
break; |
/* |
/* |
* Imitate groff's column handling: |
* Imitate groff's column handling: |
Line 756 termp_it_pre(DECL_ARGS) |
|
Line 715 termp_it_pre(DECL_ARGS) |
|
/* LINTED */ |
/* LINTED */ |
dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1; |
dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1; |
|
|
|
/* |
|
* Calculate the offset by applying all prior MDOC_BODY, |
|
* so we stop at the MDOC_HEAD (NULL == nn->prev). |
|
*/ |
|
|
for (i = 0, nn = n->prev; |
for (i = 0, nn = n->prev; |
nn && i < (int)ncols; |
nn->prev && i < (int)ncols; |
nn = nn->prev, i++) |
nn = nn->prev, i++) |
offset += dcol + a2width |
offset += dcol + a2width |
(&bl->args->argv[vals[2]], i); |
(&bl->args->argv[vals[2]], i); |
Line 798 termp_it_pre(DECL_ARGS) |
|
Line 762 termp_it_pre(DECL_ARGS) |
|
*/ |
*/ |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Bullet): |
case (LIST_bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Dash): |
case (LIST_dash): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hyphen): |
case (LIST_hyphen): |
if (width < 4) |
if (width < 4) |
width = 4; |
width = 4; |
break; |
break; |
case (MDOC_Enum): |
case (LIST_enum): |
if (width < 5) |
if (width < 5) |
width = 5; |
width = 5; |
break; |
break; |
case (MDOC_Hang): |
case (LIST_hang): |
if (0 == width) |
if (0 == width) |
width = 8; |
width = 8; |
break; |
break; |
case (MDOC_Column): |
case (LIST_column): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Tag): |
case (LIST_tag): |
if (0 == width) |
if (0 == width) |
width = 10; |
width = 10; |
break; |
break; |
Line 832 termp_it_pre(DECL_ARGS) |
|
Line 796 termp_it_pre(DECL_ARGS) |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Diag): |
case (LIST_diag): |
if (MDOC_BODY == n->type) |
if (MDOC_BODY == n->type) |
term_word(p, "\\ \\ "); |
term_word(p, "\\ \\ "); |
break; |
break; |
case (MDOC_Inset): |
case (LIST_inset): |
if (MDOC_BODY == n->type) |
if (MDOC_BODY == n->type) |
term_word(p, "\\ "); |
term_word(p, "\\ "); |
break; |
break; |
Line 847 termp_it_pre(DECL_ARGS) |
|
Line 811 termp_it_pre(DECL_ARGS) |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Diag): |
case (LIST_diag): |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
break; |
break; |
Line 863 termp_it_pre(DECL_ARGS) |
|
Line 827 termp_it_pre(DECL_ARGS) |
|
*/ |
*/ |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Bullet): |
case (LIST_bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Dash): |
case (LIST_dash): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Enum): |
case (LIST_enum): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hyphen): |
case (LIST_hyphen): |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
else |
else |
p->flags |= TERMP_NOLPAD; |
p->flags |= TERMP_NOLPAD; |
break; |
break; |
case (MDOC_Hang): |
case (LIST_hang): |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
else |
else |
Line 898 termp_it_pre(DECL_ARGS) |
|
Line 862 termp_it_pre(DECL_ARGS) |
|
} else |
} else |
p->flags |= TERMP_HANG; |
p->flags |= TERMP_HANG; |
break; |
break; |
case (MDOC_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 |
else |
Line 909 termp_it_pre(DECL_ARGS) |
|
Line 873 termp_it_pre(DECL_ARGS) |
|
if (NULL == n->next || NULL == n->next->child) |
if (NULL == n->next || NULL == n->next->child) |
p->flags |= TERMP_DANGLE; |
p->flags |= TERMP_DANGLE; |
break; |
break; |
case (MDOC_Column): |
case (LIST_column): |
if (MDOC_HEAD == n->type) { |
if (MDOC_HEAD == n->type) |
assert(n->next); |
break; |
if (MDOC_BODY == n->next->type) |
|
p->flags &= ~TERMP_NOBREAK; |
if (NULL == n->next) |
else |
p->flags &= ~TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
else |
if (n->prev) |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOLPAD; |
|
} |
assert(n->prev); |
|
if (MDOC_BODY == n->prev->type) |
|
p->flags |= TERMP_NOLPAD; |
|
|
break; |
break; |
case (MDOC_Diag): |
case (LIST_diag): |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
break; |
break; |
Line 937 termp_it_pre(DECL_ARGS) |
|
Line 904 termp_it_pre(DECL_ARGS) |
|
p->offset += offset; |
p->offset += offset; |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Hang): |
case (LIST_hang): |
/* |
/* |
* Same stipulation as above, regarding `-hang'. We |
* Same stipulation as above, regarding `-hang'. We |
* don't want to recalculate rmargin and offsets when |
* don't want to recalculate rmargin and offsets when |
Line 948 termp_it_pre(DECL_ARGS) |
|
Line 915 termp_it_pre(DECL_ARGS) |
|
MDOC_Bd == n->next->child->tok)) |
MDOC_Bd == n->next->child->tok)) |
break; |
break; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Bullet): |
case (LIST_bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Dash): |
case (LIST_dash): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Enum): |
case (LIST_enum): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hyphen): |
case (LIST_hyphen): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Tag): |
case (LIST_tag): |
assert(width); |
assert(width); |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
p->rmargin = p->offset + width; |
p->rmargin = p->offset + width; |
else |
else |
p->offset += width; |
p->offset += width; |
break; |
break; |
case (MDOC_Column): |
case (LIST_column): |
assert(width); |
assert(width); |
p->rmargin = p->offset + width; |
p->rmargin = p->offset + width; |
/* |
/* |
* XXX - this behaviour is not documented: the |
* XXX - this behaviour is not documented: the |
* right-most column is filled to the right margin. |
* right-most column is filled to the right margin. |
*/ |
*/ |
if (MDOC_HEAD == n->type && |
if (MDOC_HEAD == n->type) |
MDOC_BODY == n->next->type && |
break; |
p->rmargin < p->maxrmargin) |
if (NULL == n->next && p->rmargin < p->maxrmargin) |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
break; |
break; |
default: |
default: |
Line 986 termp_it_pre(DECL_ARGS) |
|
Line 953 termp_it_pre(DECL_ARGS) |
|
|
|
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
switch (type) { |
switch (type) { |
case (MDOC_Bullet): |
case (LIST_bullet): |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, "\\[bu]"); |
term_word(p, "\\[bu]"); |
term_fontpop(p); |
term_fontpop(p); |
break; |
break; |
case (MDOC_Dash): |
case (LIST_dash): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hyphen): |
case (LIST_hyphen): |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, "\\(hy"); |
term_word(p, "\\(hy"); |
term_fontpop(p); |
term_fontpop(p); |
break; |
break; |
case (MDOC_Enum): |
case (LIST_enum): |
(pair->ppair->ppair->count)++; |
(pair->ppair->ppair->count)++; |
snprintf(buf, sizeof(buf), "%d.", |
snprintf(buf, sizeof(buf), "%d.", |
pair->ppair->ppair->count); |
pair->ppair->ppair->count); |
Line 1013 termp_it_pre(DECL_ARGS) |
|
Line 980 termp_it_pre(DECL_ARGS) |
|
*/ |
*/ |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Bullet): |
case (LIST_bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Item): |
case (LIST_item): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Dash): |
case (LIST_dash): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hyphen): |
case (LIST_hyphen): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Enum): |
case (LIST_enum): |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
return(0); |
return(0); |
break; |
break; |
case (MDOC_Column): |
case (LIST_column): |
if (MDOC_BODY == n->type) |
if (MDOC_HEAD == n->type) |
return(0); |
return(0); |
break; |
break; |
default: |
default: |
Line 1041 termp_it_pre(DECL_ARGS) |
|
Line 1008 termp_it_pre(DECL_ARGS) |
|
static void |
static void |
termp_it_post(DECL_ARGS) |
termp_it_post(DECL_ARGS) |
{ |
{ |
int type; |
enum mdoc_list type; |
|
|
if (MDOC_BLOCK == n->type) |
if (MDOC_BLOCK == n->type) |
return; |
return; |
|
|
type = arg_listtype(n->parent->parent->parent); |
type = n->parent->parent->parent->data.list; |
assert(-1 != type); |
|
|
|
switch (type) { |
switch (type) { |
case (MDOC_Item): |
case (LIST_item): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Diag): |
case (LIST_diag): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Inset): |
case (LIST_inset): |
if (MDOC_BODY == n->type) |
if (MDOC_BODY == n->type) |
term_flushln(p); |
term_newln(p); |
break; |
break; |
case (MDOC_Column): |
case (LIST_column): |
if (MDOC_HEAD == n->type) |
if (MDOC_BODY == n->type) |
term_flushln(p); |
term_flushln(p); |
break; |
break; |
default: |
default: |
term_flushln(p); |
term_newln(p); |
break; |
break; |
} |
} |
|
|
Line 1087 termp_nm_pre(DECL_ARGS) |
|
Line 1053 termp_nm_pre(DECL_ARGS) |
|
{ |
{ |
|
|
if (NULL == n->child && NULL == m->name) |
if (NULL == n->child && NULL == m->name) |
|
return(1); |
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
term_newln(p); |
term_newln(p); |
Line 1233 termp_rv_pre(DECL_ARGS) |
|
Line 1200 termp_rv_pre(DECL_ARGS) |
|
term_fontpop(p); |
term_fontpop(p); |
|
|
term_word(p, "is set to indicate the error."); |
term_word(p, "is set to indicate the error."); |
|
p->flags |= TERMP_SENTENCE; |
|
|
return(0); |
return(0); |
} |
} |
Line 1265 termp_ex_pre(DECL_ARGS) |
|
Line 1233 termp_ex_pre(DECL_ARGS) |
|
term_word(p, "utility exits"); |
term_word(p, "utility exits"); |
|
|
term_word(p, "0 on success, and >0 if an error occurs."); |
term_word(p, "0 on success, and >0 if an error occurs."); |
|
p->flags |= TERMP_SENTENCE; |
|
|
return(0); |
return(0); |
} |
} |
|
|
termp_fd_post(DECL_ARGS) |
termp_fd_post(DECL_ARGS) |
{ |
{ |
|
|
if (n->sec != SEC_SYNOPSIS || ! (MDOC_LINE & n->flags)) |
|
return; |
|
|
|
term_newln(p); |
term_newln(p); |
if (n->next && MDOC_Fd != n->next->tok) |
|
term_vspace(p); |
|
} |
} |
|
|
|
|
Line 1466 termp_bt_pre(DECL_ARGS) |
|
Line 1430 termp_bt_pre(DECL_ARGS) |
|
{ |
{ |
|
|
term_word(p, "is currently in beta test."); |
term_word(p, "is currently in beta test."); |
|
p->flags |= TERMP_SENTENCE; |
return(0); |
return(0); |
} |
} |
|
|
Line 1486 termp_ud_pre(DECL_ARGS) |
|
Line 1451 termp_ud_pre(DECL_ARGS) |
|
{ |
{ |
|
|
term_word(p, "currently under development."); |
term_word(p, "currently under development."); |
|
p->flags |= TERMP_SENTENCE; |
return(0); |
return(0); |
} |
} |
|
|
|
|
termp_ft_pre(DECL_ARGS) |
termp_ft_pre(DECL_ARGS) |
{ |
{ |
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
/* NB: MDOC_LINE does not effect this! */ |
if (n->prev && MDOC_Fo == n->prev->tok) |
if (SEC_SYNOPSIS == n->sec && n->prev) |
term_vspace(p); |
term_vspace(p); |
|
|
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
return(1); |
return(1); |
Line 1554 termp_ft_pre(DECL_ARGS) |
|
Line 1520 termp_ft_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
|
termp_ft_post(DECL_ARGS) |
|
{ |
|
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
|
term_newln(p); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
static int |
termp_fn_pre(DECL_ARGS) |
termp_fn_pre(DECL_ARGS) |
{ |
{ |
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
|
|
|
/* NB: MDOC_LINE has no effect on this macro! */ |
|
if (SEC_SYNOPSIS == n->sec) { |
|
if (n->prev && MDOC_Ft == n->prev->tok) |
|
term_newln(p); |
|
else if (n->prev) |
|
term_vspace(p); |
|
} |
|
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, n->child->string); |
term_word(p, n->child->string); |
term_fontpop(p); |
term_fontpop(p); |
|
|
termp_fn_post(DECL_ARGS) |
termp_fn_post(DECL_ARGS) |
{ |
{ |
|
|
if (n->sec == SEC_SYNOPSIS && n->next && MDOC_LINE & n->flags) |
/* NB: MDOC_LINE has no effect on this macro! */ |
term_vspace(p); |
if (SEC_SYNOPSIS == n->sec) |
|
term_newln(p); |
} |
} |
|
|
|
|
Line 1635 termp_fa_pre(DECL_ARGS) |
|
Line 1600 termp_fa_pre(DECL_ARGS) |
|
static int |
static int |
termp_bd_pre(DECL_ARGS) |
termp_bd_pre(DECL_ARGS) |
{ |
{ |
|
size_t tabwidth; |
int i, type; |
int i, type; |
size_t rm, rmax; |
size_t rm, rmax; |
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
Line 1664 termp_bd_pre(DECL_ARGS) |
|
Line 1630 termp_bd_pre(DECL_ARGS) |
|
if (MDOC_Literal != type && MDOC_Unfilled != type) |
if (MDOC_Literal != type && MDOC_Unfilled != type) |
return(1); |
return(1); |
|
|
|
tabwidth = p->tabwidth; |
|
p->tabwidth = 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 1671 termp_bd_pre(DECL_ARGS) |
|
Line 1639 termp_bd_pre(DECL_ARGS) |
|
for (nn = n->child; nn; nn = nn->next) { |
for (nn = n->child; nn; nn = nn->next) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
print_mdoc_node(p, pair, m, nn); |
print_mdoc_node(p, pair, m, nn); |
if (NULL == nn->next) |
if (NULL == nn->prev || |
continue; |
nn->prev->line < nn->line || |
if (nn->prev && nn->prev->line < nn->line) |
NULL == nn->next) |
term_flushln(p); |
term_flushln(p); |
else if (NULL == nn->prev) |
|
term_flushln(p); |
|
} |
} |
|
p->tabwidth = tabwidth; |
|
|
p->rmargin = rm; |
p->rmargin = rm; |
p->maxrmargin = rmax; |
p->maxrmargin = rmax; |
Line 1705 termp_bd_post(DECL_ARGS) |
|
Line 1672 termp_bd_post(DECL_ARGS) |
|
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_flushln(p); |
term_newln(p); |
|
|
p->rmargin = rm; |
p->rmargin = rm; |
p->maxrmargin = rmax; |
p->maxrmargin = rmax; |
|
|
termp_in_pre(DECL_ARGS) |
termp_in_pre(DECL_ARGS) |
{ |
{ |
|
|
term_fontpush(p, TERMFONT_BOLD); |
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) { |
if (SEC_SYNOPSIS == n->sec) |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, "#include"); |
term_word(p, "#include"); |
|
term_word(p, "<"); |
|
} else { |
|
term_word(p, "<"); |
|
term_fontpush(p, TERMFONT_UNDER); |
|
} |
|
|
term_word(p, "<"); |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
return(1); |
return(1); |
} |
} |
|
|
termp_in_post(DECL_ARGS) |
termp_in_post(DECL_ARGS) |
{ |
{ |
|
|
term_fontpush(p, TERMFONT_BOLD); |
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
|
term_fontpush(p, TERMFONT_BOLD); |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ">"); |
term_word(p, ">"); |
term_fontpop(p); |
|
|
|
if (SEC_SYNOPSIS != n->sec && ! (MDOC_LINE & n->flags)) |
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) { |
return; |
term_fontpop(p); |
|
term_newln(p); |
term_newln(p); |
} |
/* |
|
* XXX Not entirely correct. If `.In foo bar' is specified in |
|
* the SYNOPSIS section, then it produces a single break after |
|
* the <foo>; mandoc asserts a vertical space. Since this |
|
* construction is rarely used, I think it's fine. |
|
*/ |
|
if (n->next && MDOC_In != n->next->tok) |
|
term_vspace(p); |
|
} |
} |
|
|
|
|
Line 2018 termp_pq_post(DECL_ARGS) |
|
Line 1982 termp_pq_post(DECL_ARGS) |
|
static int |
static int |
termp_fo_pre(DECL_ARGS) |
termp_fo_pre(DECL_ARGS) |
{ |
{ |
const struct mdoc_node *nn; |
|
|
|
if (MDOC_BODY == n->type) { |
if (MDOC_BLOCK == n->type) { |
|
/* NB: MDOC_LINE has no effect on this macro! */ |
|
if (SEC_SYNOPSIS != n->sec) |
|
return(1); |
|
if (n->prev && MDOC_Ft == n->prev->tok) |
|
term_newln(p); |
|
else if (n->prev) |
|
term_vspace(p); |
|
return(1); |
|
} else if (MDOC_BODY == n->type) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, "("); |
term_word(p, "("); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
return(1); |
return(1); |
} else if (MDOC_HEAD != n->type) |
} |
return(1); |
|
|
|
term_fontpush(p, TERMFONT_BOLD); |
/* XXX: we drop non-initial arguments as per groff. */ |
for (nn = n->child; nn; nn = nn->next) { |
|
assert(MDOC_TEXT == nn->type); |
|
term_word(p, nn->string); |
|
} |
|
term_fontpop(p); |
|
|
|
|
assert(n->child); |
|
assert(n->child->string); |
|
term_fontpush(p, TERMFONT_BOLD); |
|
term_word(p, n->child->string); |
return(0); |
return(0); |
} |
} |
|
|
|
|
termp_fo_post(DECL_ARGS) |
termp_fo_post(DECL_ARGS) |
{ |
{ |
|
|
if (MDOC_BODY != n->type) |
if (MDOC_BLOCK == n->type) { |
return; |
/* NB: MDOC_LINE has no effect on this macro! */ |
p->flags |= TERMP_NOSPACE; |
if (SEC_SYNOPSIS == n->sec) |
term_word(p, ")"); |
term_newln(p); |
p->flags |= TERMP_NOSPACE; |
} else if (MDOC_BODY == n->type) { |
term_word(p, ";"); |
p->flags |= TERMP_NOSPACE; |
term_newln(p); |
term_word(p, ")"); |
|
if (SEC_SYNOPSIS == n->sec) { |
|
p->flags |= TERMP_NOSPACE; |
|
term_word(p, ";"); |
|
} |
|
} |
} |
} |
|
|
|
|