version 1.125, 2010/05/17 22:11:42 |
version 1.149, 2010/06/12 11:58:22 |
|
|
|
|
static size_t a2width(const struct mdoc_argv *, int); |
static size_t a2width(const struct mdoc_argv *, int); |
static size_t a2height(const struct mdoc_node *); |
static size_t a2height(const struct mdoc_node *); |
static size_t a2offs(const struct mdoc_argv *); |
static size_t a2offs(const char *); |
|
|
static int arg_hasattr(int, const struct mdoc_node *); |
static int arg_hasattr(int, const struct mdoc_node *); |
static int arg_getattrs(const int *, int *, size_t, |
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_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 *); |
static void print_mdoc_node(DECL_ARGS); |
static void print_mdoc_node(DECL_ARGS); |
static void print_mdoc_head(DECL_ARGS); |
|
static void print_mdoc_nodelist(DECL_ARGS); |
static void print_mdoc_nodelist(DECL_ARGS); |
static void print_foot(DECL_ARGS); |
static void print_mdoc_head(struct termp *, const void *); |
|
static void print_mdoc_foot(struct termp *, const void *); |
|
static void synopsis_pre(struct termp *, |
|
const struct mdoc_node *); |
|
|
static void termp____post(DECL_ARGS); |
static void termp____post(DECL_ARGS); |
static void termp_an_post(DECL_ARGS); |
static void termp_an_post(DECL_ARGS); |
Line 80 static void termp_brq_post(DECL_ARGS); |
|
Line 80 static void termp_brq_post(DECL_ARGS); |
|
static void termp_bx_post(DECL_ARGS); |
static void termp_bx_post(DECL_ARGS); |
static void termp_d1_post(DECL_ARGS); |
static void termp_d1_post(DECL_ARGS); |
static void termp_dq_post(DECL_ARGS); |
static void termp_dq_post(DECL_ARGS); |
static void termp_fd_post(DECL_ARGS); |
static int termp_fd_pre(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 94 static void termp_qq_post(DECL_ARGS); |
|
Line 92 static void termp_qq_post(DECL_ARGS); |
|
static void termp_sh_post(DECL_ARGS); |
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 void termp_vt_post(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); |
Line 164 static const struct termact termacts[MDOC_MAX] = { |
|
Line 161 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Ev */ |
{ NULL, NULL }, /* Ev */ |
{ termp_ex_pre, NULL }, /* Ex */ |
{ termp_ex_pre, NULL }, /* Ex */ |
{ termp_fa_pre, NULL }, /* Fa */ |
{ termp_fa_pre, NULL }, /* Fa */ |
{ termp_bold_pre, termp_fd_post }, /* Fd */ |
{ termp_fd_pre, NULL }, /* Fd */ |
{ termp_fl_pre, NULL }, /* Fl */ |
{ termp_fl_pre, NULL }, /* Fl */ |
{ termp_fn_pre, termp_fn_post }, /* Fn */ |
{ termp_fn_pre, NULL }, /* 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 179 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_vt_pre, termp_vt_post }, /* Vt */ |
{ termp_vt_pre, NULL }, /* 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 261 static const struct termact termacts[MDOC_MAX] = { |
|
Line 258 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 273 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 289 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
Line 288 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
n = mdoc_node(mdoc); |
n = mdoc_node(mdoc); |
m = mdoc_meta(mdoc); |
m = mdoc_meta(mdoc); |
|
|
print_mdoc_head(p, NULL, m, n); |
term_begin(p, print_mdoc_head, print_mdoc_foot, m); |
|
|
if (n->child) |
if (n->child) |
print_mdoc_nodelist(p, NULL, m, n->child); |
print_mdoc_nodelist(p, NULL, m, n->child); |
print_foot(p, NULL, m, n); |
|
|
term_end(p); |
} |
} |
|
|
|
|
Line 346 print_mdoc_node(DECL_ARGS) |
|
Line 347 print_mdoc_node(DECL_ARGS) |
|
} |
} |
|
|
|
|
/* ARGSUSED */ |
|
static void |
static void |
print_foot(DECL_ARGS) |
print_mdoc_foot(struct termp *p, const void *arg) |
{ |
{ |
char buf[DATESIZ], os[BUFSIZ]; |
char buf[DATESIZ], os[BUFSIZ]; |
|
const struct mdoc_meta *m; |
|
|
|
m = (const struct mdoc_meta *)arg; |
|
|
term_fontrepl(p, TERMFONT_NONE); |
term_fontrepl(p, TERMFONT_NONE); |
|
|
/* |
/* |
Line 395 print_foot(DECL_ARGS) |
|
Line 398 print_foot(DECL_ARGS) |
|
} |
} |
|
|
|
|
/* ARGSUSED */ |
|
static void |
static void |
print_mdoc_head(DECL_ARGS) |
print_mdoc_head(struct termp *p, const void *arg) |
{ |
{ |
char buf[BUFSIZ], title[BUFSIZ]; |
char buf[BUFSIZ], title[BUFSIZ]; |
|
const struct mdoc_meta *m; |
|
|
|
m = (const struct mdoc_meta *)arg; |
|
|
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
p->offset = 0; |
p->offset = 0; |
|
|
Line 483 a2width(const struct mdoc_argv *arg, int pos) |
|
Line 488 a2width(const struct mdoc_argv *arg, int pos) |
|
} |
} |
|
|
|
|
static int |
|
arg_disptype(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_Centred): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Ragged): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Filled): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Unfilled): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Literal): |
|
return(n->args->argv[i].arg); |
|
default: |
|
break; |
|
} |
|
|
|
return(-1); |
|
} |
|
|
|
|
|
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 char *v) |
{ |
{ |
struct roffsu su; |
struct roffsu su; |
|
|
if ('\0' == arg->value[0][0]) |
if ('\0' == *v) |
return(0); |
return(0); |
else if (0 == strcmp(arg->value[0], "left")) |
else if (0 == strcmp(v, "left")) |
return(0); |
return(0); |
else if (0 == strcmp(arg->value[0], "indent")) |
else if (0 == strcmp(v, "indent")) |
return(INDENT + 1); |
return(INDENT + 1); |
else if (0 == strcmp(arg->value[0], "indent-two")) |
else if (0 == strcmp(v, "indent-two")) |
return((INDENT + 1) * 2); |
return((INDENT + 1) * 2); |
else if ( ! a2roffsu(arg->value[0], &su, SCALE_MAX)) |
else if ( ! a2roffsu(v, &su, SCALE_MAX)) |
SCALE_HS_INIT(&su, strlen(arg->value[0])); |
SCALE_HS_INIT(&su, strlen(v)); |
|
|
return(term_hspan(&su)); |
return(term_hspan(&su)); |
} |
} |
Line 635 print_bvspace(struct termp *p, |
|
Line 570 print_bvspace(struct termp *p, |
|
{ |
{ |
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
|
|
|
/* FIXME: MDOC_Bd == bl->tok && bl->data.Bd.comp */ |
term_newln(p); |
term_newln(p); |
if (arg_hasattr(MDOC_Compact, bl)) |
if (arg_hasattr(MDOC_Compact, bl)) |
return; |
return; |
Line 655 print_bvspace(struct termp *p, |
|
Line 591 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.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 && arg_hasattr(MDOC_Diag, bl)) |
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 705 termp_it_pre(DECL_ARGS) |
|
Line 641 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 662 termp_it_pre(DECL_ARGS) |
|
|
|
arg_getattrs(keys, vals, 3, bl); |
arg_getattrs(keys, vals, 3, bl); |
|
|
type = arg_listtype(bl); |
type = bl->data.Bl.type; |
assert(-1 != type); |
|
|
|
/* |
/* |
* First calculate width and offset. This is pretty easy unless |
* First calculate width and offset. This is pretty easy unless |
Line 737 termp_it_pre(DECL_ARGS) |
|
Line 673 termp_it_pre(DECL_ARGS) |
|
width = offset = 0; |
width = offset = 0; |
|
|
if (vals[1] >= 0) |
if (vals[1] >= 0) |
offset = a2offs(&bl->args->argv[vals[1]]); |
offset = a2offs(bl->args->argv[vals[1]].value[0]); |
|
|
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 692 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 739 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 773 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 788 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 804 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 839 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 850 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 881 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 892 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 930 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 957 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 985 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.Bl.type; |
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 1030 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) |
synopsis_pre(p, n); |
term_newln(p); |
|
|
|
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); |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 1233 termp_rv_pre(DECL_ARGS) |
|
Line 1174 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 1207 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); |
} |
} |
Line 1344 termp_xr_pre(DECL_ARGS) |
|
Line 1287 termp_xr_pre(DECL_ARGS) |
|
} |
} |
|
|
|
|
|
/* |
|
* This decides how to assert whitespace before any of the SYNOPSIS set |
|
* of macros (which, as in the case of Ft/Fo and Ft/Fn, may contain |
|
* macro combos). |
|
*/ |
|
static void |
|
synopsis_pre(struct termp *p, const struct mdoc_node *n) |
|
{ |
|
/* |
|
* Obviously, if we're not in a SYNOPSIS or no prior macros |
|
* exist, do nothing. |
|
*/ |
|
if (NULL == n->prev || SEC_SYNOPSIS != n->sec) |
|
return; |
|
|
|
/* |
|
* If we're the second in a pair of like elements, emit our |
|
* newline and return. UNLESS we're `Fo', `Fn', `Fn', in which |
|
* case we soldier on. |
|
*/ |
|
if (n->prev->tok == n->tok && |
|
MDOC_Ft != n->tok && |
|
MDOC_Fo != n->tok && |
|
MDOC_Fn != n->tok) { |
|
term_newln(p); |
|
return; |
|
} |
|
|
|
/* |
|
* If we're one of the SYNOPSIS set and non-like pair-wise after |
|
* another (or Fn/Fo, which we've let slip through) then assert |
|
* vertical space, else only newline and move on. |
|
*/ |
|
switch (n->prev->tok) { |
|
case (MDOC_Fd): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Fn): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Fo): |
|
/* FALLTHROUGH */ |
|
case (MDOC_In): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Vt): |
|
term_vspace(p); |
|
break; |
|
case (MDOC_Ft): |
|
if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) { |
|
term_vspace(p); |
|
break; |
|
} |
|
/* FALLTHROUGH */ |
|
default: |
|
term_newln(p); |
|
break; |
|
} |
|
} |
|
|
|
|
static int |
static int |
termp_vt_pre(DECL_ARGS) |
termp_vt_pre(DECL_ARGS) |
{ |
{ |
|
|
if (MDOC_ELEM == n->type) |
if (MDOC_ELEM == n->type) { |
|
synopsis_pre(p, n); |
return(termp_under_pre(p, pair, m, n)); |
return(termp_under_pre(p, pair, m, n)); |
else if (MDOC_HEAD == n->type) |
} else if (MDOC_BLOCK == n->type) { |
return(0); |
synopsis_pre(p, n); |
else if (MDOC_BLOCK == n->type) |
|
return(1); |
return(1); |
|
} else if (MDOC_HEAD == n->type) |
|
return(0); |
|
|
return(termp_under_pre(p, pair, m, n)); |
return(termp_under_pre(p, pair, m, n)); |
} |
} |
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
|
termp_vt_post(DECL_ARGS) |
|
{ |
|
|
|
if (MDOC_BLOCK != n->type) |
|
return; |
|
if (n->next && MDOC_Vt == n->next->tok) |
|
term_newln(p); |
|
else if (n->next) |
|
term_vspace(p); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
static int |
termp_bold_pre(DECL_ARGS) |
termp_bold_pre(DECL_ARGS) |
{ |
{ |
Line 1384 termp_bold_pre(DECL_ARGS) |
|
Line 1373 termp_bold_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
static int |
termp_fd_post(DECL_ARGS) |
termp_fd_pre(DECL_ARGS) |
{ |
{ |
|
|
if (n->sec != SEC_SYNOPSIS || ! (MDOC_LINE & n->flags)) |
synopsis_pre(p, n); |
return; |
return(termp_bold_pre(p, pair, m, n)); |
|
|
term_newln(p); |
|
if (n->next && MDOC_Fd != n->next->tok) |
|
term_vspace(p); |
|
} |
} |
|
|
|
|
Line 1466 termp_bt_pre(DECL_ARGS) |
|
Line 1451 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 1472 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) |
synopsis_pre(p, n); |
term_vspace(p); |
|
|
|
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
return(1); |
return(1); |
} |
} |
|
|
|
|
/* 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; |
|
|
|
synopsis_pre(p, n); |
|
|
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); |
Line 1595 termp_fn_pre(DECL_ARGS) |
|
Line 1572 termp_fn_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
|
termp_fn_post(DECL_ARGS) |
|
{ |
|
|
|
if (n->sec == SEC_SYNOPSIS && n->next && MDOC_LINE & n->flags) |
|
term_vspace(p); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
static int |
termp_fa_pre(DECL_ARGS) |
termp_fa_pre(DECL_ARGS) |
{ |
{ |
Line 1635 termp_fa_pre(DECL_ARGS) |
|
Line 1602 termp_fa_pre(DECL_ARGS) |
|
static int |
static int |
termp_bd_pre(DECL_ARGS) |
termp_bd_pre(DECL_ARGS) |
{ |
{ |
int i, type; |
size_t tabwidth; |
size_t rm, rmax; |
size_t rm, rmax; |
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
|
|
Line 1645 termp_bd_pre(DECL_ARGS) |
|
Line 1612 termp_bd_pre(DECL_ARGS) |
|
} else if (MDOC_HEAD == n->type) |
} else if (MDOC_HEAD == n->type) |
return(0); |
return(0); |
|
|
nn = n->parent; |
if (n->data.Bd.offs) |
|
p->offset += a2offs(n->data.Bd.offs); |
|
|
type = arg_disptype(nn); |
|
assert(-1 != type); |
|
|
|
if (-1 != (i = arg_getattr(MDOC_Offset, nn))) |
|
p->offset += a2offs(&nn->args->argv[i]); |
|
|
|
/* |
/* |
* If -ragged or -filled are specified, the block does nothing |
* If -ragged or -filled are specified, the block does nothing |
* but change the indentation. If -unfilled or -literal are |
* but change the indentation. If -unfilled or -literal are |
Line 1661 termp_bd_pre(DECL_ARGS) |
|
Line 1623 termp_bd_pre(DECL_ARGS) |
|
* lines are allowed. |
* lines are allowed. |
*/ |
*/ |
|
|
if (MDOC_Literal != type && MDOC_Unfilled != type) |
if (DISP_literal != n->data.Bd.type && |
|
DISP_unfilled != n->data.Bd.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 1636 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; |
return(0); |
return(0); |
Line 1689 termp_bd_pre(DECL_ARGS) |
|
Line 1653 termp_bd_pre(DECL_ARGS) |
|
static void |
static void |
termp_bd_post(DECL_ARGS) |
termp_bd_post(DECL_ARGS) |
{ |
{ |
int type; |
|
size_t rm, rmax; |
size_t rm, rmax; |
|
|
if (MDOC_BODY != n->type) |
if (MDOC_BODY != n->type) |
return; |
return; |
|
|
type = arg_disptype(n->parent); |
|
assert(-1 != type); |
|
|
|
rm = p->rmargin; |
rm = p->rmargin; |
rmax = p->maxrmargin; |
rmax = p->maxrmargin; |
|
|
if (MDOC_Literal == type || MDOC_Unfilled == 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; |
term_flushln(p); |
term_newln(p); |
|
|
p->rmargin = rm; |
p->rmargin = rm; |
p->maxrmargin = rmax; |
p->maxrmargin = rmax; |
|
|
termp_cd_pre(DECL_ARGS) |
termp_cd_pre(DECL_ARGS) |
{ |
{ |
|
|
|
synopsis_pre(p, n); |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_newln(p); |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_in_pre(DECL_ARGS) |
termp_in_pre(DECL_ARGS) |
{ |
{ |
|
|
term_fontpush(p, TERMFONT_BOLD); |
synopsis_pre(p, n); |
if (SEC_SYNOPSIS == n->sec) |
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) { |
|
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) |
|
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) |
return; |
term_fontpop(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 1976 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) { |
|
synopsis_pre(p, n); |
|
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_BODY != n->type) |
return; |
return; |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ")"); |
term_word(p, ")"); |
p->flags |= TERMP_NOSPACE; |
|
term_word(p, ";"); |
if (SEC_SYNOPSIS == n->sec) { |
term_newln(p); |
p->flags |= TERMP_NOSPACE; |
|
term_word(p, ";"); |
|
} |
} |
} |
|
|
|
|