version 1.13, 2009/06/15 20:26:47 |
version 1.25, 2009/07/12 16:34:16 |
Line 183 struct termact { |
|
Line 183 struct termact { |
|
}; |
}; |
|
|
static const struct termact termacts[MDOC_MAX] = { |
static const struct termact termacts[MDOC_MAX] = { |
{ NULL, NULL }, /* \" */ |
{ termp_ap_pre, NULL }, /* Ap */ |
{ NULL, NULL }, /* Dd */ |
{ NULL, NULL }, /* Dd */ |
{ NULL, NULL }, /* Dt */ |
{ NULL, NULL }, /* Dt */ |
{ NULL, NULL }, /* Os */ |
{ NULL, NULL }, /* Os */ |
Line 290 static const struct termact termacts[MDOC_MAX] = { |
|
Line 290 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Fr */ |
{ NULL, NULL }, /* Fr */ |
{ termp_ud_pre, NULL }, /* Ud */ |
{ termp_ud_pre, NULL }, /* Ud */ |
{ termp_lb_pre, termp_lb_post }, /* Lb */ |
{ termp_lb_pre, termp_lb_post }, /* Lb */ |
{ termp_ap_pre, NULL }, /* Lb */ |
{ termp_pp_pre, NULL }, /* Lp */ |
{ termp_pp_pre, NULL }, /* Pp */ |
|
{ termp_lk_pre, NULL }, /* Lk */ |
{ termp_lk_pre, NULL }, /* Lk */ |
{ termp_mt_pre, NULL }, /* Mt */ |
{ termp_mt_pre, NULL }, /* Mt */ |
{ termp_brq_pre, termp_brq_post }, /* Brq */ |
{ termp_brq_pre, termp_brq_post }, /* Brq */ |
Line 336 mdoc_run(struct termp *p, const struct mdoc *m) |
|
Line 335 mdoc_run(struct termp *p, const struct mdoc *m) |
|
*/ |
*/ |
|
|
print_head(p, mdoc_meta(m)); |
print_head(p, mdoc_meta(m)); |
print_body(p, NULL, mdoc_meta(m), mdoc_node(m)); |
assert(mdoc_node(m)); |
|
assert(MDOC_ROOT == mdoc_node(m)->type); |
|
if (mdoc_node(m)->child) |
|
print_body(p, NULL, mdoc_meta(m), mdoc_node(m)->child); |
print_foot(p, mdoc_meta(m)); |
print_foot(p, mdoc_meta(m)); |
return(1); |
return(1); |
} |
} |
Line 530 arg_width(const struct mdoc_argv *arg, int pos) |
|
Line 532 arg_width(const struct mdoc_argv *arg, int pos) |
|
|
|
assert(pos < (int)arg->sz && pos >= 0); |
assert(pos < (int)arg->sz && pos >= 0); |
assert(arg->value[pos]); |
assert(arg->value[pos]); |
if (0 == strcmp(arg->value[pos], "indent")) |
|
return(INDENT); |
|
if (0 == strcmp(arg->value[pos], "indent-two")) |
|
return(INDENT * 2); |
|
|
|
if (0 == (len = (int)strlen(arg->value[pos]))) |
if (0 == (len = (int)strlen(arg->value[pos]))) |
return(0); |
return(0); |
Line 543 arg_width(const struct mdoc_argv *arg, int pos) |
|
Line 541 arg_width(const struct mdoc_argv *arg, int pos) |
|
break; |
break; |
|
|
if (i == len - 1) { |
if (i == len - 1) { |
if ('n' == arg->value[pos][len - 1]) { |
if ('n' == arg->value[pos][len - 1] || |
|
'm' == arg->value[pos][len - 1]) { |
v = (size_t)atoi(arg->value[pos]); |
v = (size_t)atoi(arg->value[pos]); |
return(v); |
return(v + 2); |
} |
} |
|
|
} |
} |
return(strlen(arg->value[pos]) + 1); |
return(strlen(arg->value[pos]) + 2); |
} |
} |
|
|
|
|
Line 603 arg_offset(const struct mdoc_argv *arg) |
|
Line 602 arg_offset(const struct mdoc_argv *arg) |
|
if (0 == strcmp(*arg->value, "left")) |
if (0 == strcmp(*arg->value, "left")) |
return(0); |
return(0); |
if (0 == strcmp(*arg->value, "indent")) |
if (0 == strcmp(*arg->value, "indent")) |
return(INDENT); |
return(INDENT + 1); |
if (0 == strcmp(*arg->value, "indent-two")) |
if (0 == strcmp(*arg->value, "indent-two")) |
return(INDENT * 2); |
return((INDENT + 1) * 2); |
|
|
/* FIXME: needs to support field-widths (10n, etc.). */ |
/* FIXME: needs to support field-widths (10n, etc.). */ |
|
|
Line 712 termp_it_pre(DECL_ARGS) |
|
Line 711 termp_it_pre(DECL_ARGS) |
|
{ |
{ |
const struct mdoc_node *bl, *n; |
const struct mdoc_node *bl, *n; |
char buf[7]; |
char buf[7]; |
int i, type, keys[3], vals[3]; |
int i, type, keys[3], vals[3], sv; |
size_t width, offset; |
size_t width, offset; |
|
|
if (MDOC_BLOCK == node->type) |
if (MDOC_BLOCK == node->type) |
Line 758 termp_it_pre(DECL_ARGS) |
|
Line 757 termp_it_pre(DECL_ARGS) |
|
if (vals[0] >= 0) |
if (vals[0] >= 0) |
width = arg_width(&bl->args->argv[vals[0]], 0); |
width = arg_width(&bl->args->argv[vals[0]], 0); |
if (vals[1] >= 0) |
if (vals[1] >= 0) |
offset = arg_offset(&bl->args->argv[vals[1]]); |
offset += arg_offset(&bl->args->argv[vals[1]]); |
break; |
break; |
} |
} |
|
|
Line 773 termp_it_pre(DECL_ARGS) |
|
Line 772 termp_it_pre(DECL_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Dash): |
case (MDOC_Dash): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Enum): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Hyphen): |
case (MDOC_Hyphen): |
if (width < 4) |
if (width < 4) |
width = 4; |
width = 4; |
break; |
break; |
|
case (MDOC_Enum): |
|
if (width < 5) |
|
width = 5; |
|
break; |
case (MDOC_Tag): |
case (MDOC_Tag): |
if (0 == width) |
if (0 == width) |
width = 10; |
width = 10; |
Line 788 termp_it_pre(DECL_ARGS) |
|
Line 789 termp_it_pre(DECL_ARGS) |
|
} |
} |
|
|
/* |
/* |
* Whitespace control. Inset bodies need an initial space. |
* Whitespace control. Inset bodies need an initial space, |
|
* while diagonal bodies need two. |
*/ |
*/ |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Diag): |
case (MDOC_Diag): |
|
term_word(p, "\\ "); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Inset): |
case (MDOC_Inset): |
if (MDOC_BODY == node->type) |
if (MDOC_BODY == node->type) |
Line 896 termp_it_pre(DECL_ARGS) |
|
Line 899 termp_it_pre(DECL_ARGS) |
|
|
|
/* |
/* |
* The dash, hyphen, bullet and enum lists all have a special |
* The dash, hyphen, bullet and enum lists all have a special |
* HEAD character. Print it now. |
* HEAD character (temporarily bold, in some cases). |
*/ |
*/ |
|
|
|
sv = p->flags; |
if (MDOC_HEAD == node->type) |
if (MDOC_HEAD == node->type) |
switch (type) { |
switch (type) { |
case (MDOC_Bullet): |
case (MDOC_Bullet): |
|
p->flags |= TERMP_BOLD; |
term_word(p, "\\[bu]"); |
term_word(p, "\\[bu]"); |
break; |
break; |
case (MDOC_Dash): |
case (MDOC_Dash): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hyphen): |
case (MDOC_Hyphen): |
|
p->flags |= TERMP_BOLD; |
term_word(p, "\\-"); |
term_word(p, "\\-"); |
break; |
break; |
case (MDOC_Enum): |
case (MDOC_Enum): |
Line 919 termp_it_pre(DECL_ARGS) |
|
Line 925 termp_it_pre(DECL_ARGS) |
|
break; |
break; |
} |
} |
|
|
|
p->flags = sv; /* Restore saved flags. */ |
|
|
/* |
/* |
* If we're not going to process our children, indicate so here. |
* If we're not going to process our children, indicate so here. |
*/ |
*/ |
|
|
termp_nd_pre(DECL_ARGS) |
termp_nd_pre(DECL_ARGS) |
{ |
{ |
|
|
|
if (MDOC_BODY != node->type) |
|
return(1); |
|
/* |
|
* XXX: signed off by jmc@openbsd.org. This technically |
|
* produces a minus sign after the Nd, which is wrong, but is |
|
* consistent with the historic OpenBSD tmac file. |
|
*/ |
|
#ifdef __OpenBSD__ |
term_word(p, "\\-"); |
term_word(p, "\\-"); |
|
#else |
|
term_word(p, "\\(em"); |
|
#endif |
return(1); |
return(1); |
} |
} |
|
|
Line 1297 termp_lb_pre(DECL_ARGS) |
|
Line 1316 termp_lb_pre(DECL_ARGS) |
|
const char *lb; |
const char *lb; |
|
|
assert(node->child && MDOC_TEXT == node->child->type); |
assert(node->child && MDOC_TEXT == node->child->type); |
if ((lb = mdoc_a2lib(node->child->string))) { |
lb = mdoc_a2lib(node->child->string); |
|
if (lb) { |
term_word(p, lb); |
term_word(p, lb); |
return(0); |
return(0); |
} |
} |
Line 1333 termp_d1_pre(DECL_ARGS) |
|
Line 1353 termp_d1_pre(DECL_ARGS) |
|
if (MDOC_BLOCK != node->type) |
if (MDOC_BLOCK != node->type) |
return(1); |
return(1); |
term_newln(p); |
term_newln(p); |
p->offset += (pair->offset = INDENT); |
pair->offset = INDENT + 1; |
|
p->offset += pair->offset; |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_in_pre(DECL_ARGS) |
termp_in_pre(DECL_ARGS) |
{ |
{ |
|
|
|
/* XXX This conforms to new-groff style. */ |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]); |
term_word(p, "#include"); |
|
|
if (SEC_SYNOPSIS == node->sec) |
|
term_word(p, "#include"); |
|
|
term_word(p, "<"); |
term_word(p, "<"); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
return(1); |
return(1); |
Line 1844 termp_in_post(DECL_ARGS) |
|
Line 1869 termp_in_post(DECL_ARGS) |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ">"); |
term_word(p, ">"); |
|
|
term_newln(p); |
|
if (SEC_SYNOPSIS != node->sec) |
if (SEC_SYNOPSIS != node->sec) |
return; |
return; |
|
|
|
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 (node->next && MDOC_In != node->next->tok) |
if (node->next && MDOC_In != node->next->tok) |
term_vspace(p); |
term_vspace(p); |
} |
} |