version 1.31, 2009/07/12 19:13:12 |
version 1.41, 2009/07/14 16:03:51 |
Line 127 static int termp__t_pre(DECL_ARGS); |
|
Line 127 static int termp__t_pre(DECL_ARGS); |
|
static int termp_ap_pre(DECL_ARGS); |
static int termp_ap_pre(DECL_ARGS); |
static int termp_aq_pre(DECL_ARGS); |
static int termp_aq_pre(DECL_ARGS); |
static int termp_ar_pre(DECL_ARGS); |
static int termp_ar_pre(DECL_ARGS); |
static int termp_at_pre(DECL_ARGS); |
|
static int termp_bd_pre(DECL_ARGS); |
static int termp_bd_pre(DECL_ARGS); |
static int termp_bf_pre(DECL_ARGS); |
static int termp_bf_pre(DECL_ARGS); |
static int termp_bq_pre(DECL_ARGS); |
static int termp_bq_pre(DECL_ARGS); |
Line 148 static int termp_ft_pre(DECL_ARGS); |
|
Line 147 static int termp_ft_pre(DECL_ARGS); |
|
static int termp_ic_pre(DECL_ARGS); |
static int termp_ic_pre(DECL_ARGS); |
static int termp_in_pre(DECL_ARGS); |
static int termp_in_pre(DECL_ARGS); |
static int termp_it_pre(DECL_ARGS); |
static int termp_it_pre(DECL_ARGS); |
static int termp_lb_pre(DECL_ARGS); |
|
static int termp_lk_pre(DECL_ARGS); |
static int termp_lk_pre(DECL_ARGS); |
static int termp_ms_pre(DECL_ARGS); |
static int termp_ms_pre(DECL_ARGS); |
static int termp_mt_pre(DECL_ARGS); |
static int termp_mt_pre(DECL_ARGS); |
Line 167 static int termp_sh_pre(DECL_ARGS); |
|
Line 165 static int termp_sh_pre(DECL_ARGS); |
|
static int termp_sm_pre(DECL_ARGS); |
static int termp_sm_pre(DECL_ARGS); |
static int termp_sq_pre(DECL_ARGS); |
static int termp_sq_pre(DECL_ARGS); |
static int termp_ss_pre(DECL_ARGS); |
static int termp_ss_pre(DECL_ARGS); |
static int termp_st_pre(DECL_ARGS); |
|
static int termp_sx_pre(DECL_ARGS); |
static int termp_sx_pre(DECL_ARGS); |
static int termp_sy_pre(DECL_ARGS); |
static int termp_sy_pre(DECL_ARGS); |
static int termp_ud_pre(DECL_ARGS); |
static int termp_ud_pre(DECL_ARGS); |
Line 214 static const struct termact termacts[MDOC_MAX] = { |
|
Line 211 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Ot */ |
{ NULL, NULL }, /* Ot */ |
{ termp_pa_pre, NULL }, /* Pa */ |
{ termp_pa_pre, NULL }, /* Pa */ |
{ termp_rv_pre, NULL }, /* Rv */ |
{ termp_rv_pre, NULL }, /* Rv */ |
{ termp_st_pre, NULL }, /* St */ |
{ NULL, NULL }, /* St */ |
{ termp_va_pre, NULL }, /* Va */ |
{ termp_va_pre, NULL }, /* Va */ |
{ termp_vt_pre, termp_vt_post }, /* Vt */ |
{ termp_vt_pre, termp_vt_post }, /* Vt */ |
{ termp_xr_pre, NULL }, /* Xr */ |
{ termp_xr_pre, NULL }, /* Xr */ |
Line 232 static const struct termact termacts[MDOC_MAX] = { |
|
Line 229 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Ac */ |
{ NULL, NULL }, /* Ac */ |
{ termp_aq_pre, termp_aq_post }, /* Ao */ |
{ termp_aq_pre, termp_aq_post }, /* Ao */ |
{ termp_aq_pre, termp_aq_post }, /* Aq */ |
{ termp_aq_pre, termp_aq_post }, /* Aq */ |
{ termp_at_pre, NULL }, /* At */ |
{ NULL, NULL }, /* At */ |
{ NULL, NULL }, /* Bc */ |
{ NULL, NULL }, /* Bc */ |
{ termp_bf_pre, NULL }, /* Bf */ |
{ termp_bf_pre, NULL }, /* Bf */ |
{ termp_bq_pre, termp_bq_post }, /* Bo */ |
{ termp_bq_pre, termp_bq_post }, /* Bo */ |
Line 283 static const struct termact termacts[MDOC_MAX] = { |
|
Line 280 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Hf */ |
{ NULL, NULL }, /* Hf */ |
{ NULL, NULL }, /* Fr */ |
{ NULL, NULL }, /* Fr */ |
{ termp_ud_pre, NULL }, /* Ud */ |
{ termp_ud_pre, NULL }, /* Ud */ |
{ termp_lb_pre, termp_lb_post }, /* Lb */ |
{ NULL, termp_lb_post }, /* Lb */ |
{ termp_pp_pre, NULL }, /* Lp */ |
{ termp_pp_pre, NULL }, /* Lp */ |
{ termp_lk_pre, NULL }, /* Lk */ |
{ termp_lk_pre, NULL }, /* Lk */ |
{ termp_mt_pre, NULL }, /* Mt */ |
{ termp_mt_pre, NULL }, /* Mt */ |
Line 520 print_head(struct termp *p, const struct mdoc_meta *me |
|
Line 517 print_head(struct termp *p, const struct mdoc_meta *me |
|
static size_t |
static size_t |
arg_width(const struct mdoc_argv *arg, int pos) |
arg_width(const struct mdoc_argv *arg, int pos) |
{ |
{ |
size_t v; |
|
int i, len; |
int i, len; |
|
const char *p; |
|
|
assert(pos < (int)arg->sz && pos >= 0); |
assert(pos < (int)arg->sz && pos >= 0); |
assert(arg->value[pos]); |
assert(arg->value[pos]); |
|
|
if (0 == (len = (int)strlen(arg->value[pos]))) |
p = arg->value[pos]; |
|
|
|
if (0 == (len = (int)strlen(p))) |
return(0); |
return(0); |
|
|
for (i = 0; i < len - 1; i++) |
for (i = 0; i < len - 1; i++) |
if ( ! isdigit((u_char)arg->value[pos][i])) |
if ( ! isdigit((u_char)p[i])) |
break; |
break; |
|
|
if (i == len - 1) { |
if (i == len - 1) |
if ('n' == arg->value[pos][len - 1] || |
if ('n' == p[len - 1] || 'm' == p[len - 1]) |
'm' == arg->value[pos][len - 1]) { |
return((size_t)atoi(p) + 2); |
v = (size_t)atoi(arg->value[pos]); |
|
return(v + 2); |
|
} |
|
|
|
} |
return((size_t)len + 2); |
return(strlen(arg->value[pos]) + 2); |
|
} |
} |
|
|
|
|
Line 574 arg_listtype(const struct mdoc_node *n) |
|
Line 569 arg_listtype(const struct mdoc_node *n) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Column): |
case (MDOC_Column): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (MDOC_Hang): |
|
/* FALLTHROUGH */ |
case (MDOC_Ohang): |
case (MDOC_Ohang): |
return(n->args->argv[i].arg); |
return(n->args->argv[i].arg); |
default: |
default: |
break; |
break; |
} |
} |
|
|
/* FIXME: mandated by parser. */ |
return(-1); |
|
|
errx(1, "list type not supported"); |
|
/* NOTREACHED */ |
|
} |
} |
|
|
|
|
static size_t |
static size_t |
arg_offset(const struct mdoc_argv *arg) |
arg_offset(const struct mdoc_argv *arg) |
{ |
{ |
|
int len, i; |
|
const char *p; |
|
|
assert(*arg->value); |
assert(*arg->value); |
if (0 == strcmp(*arg->value, "left")) |
p = *arg->value; |
|
|
|
if (0 == strcmp(p, "left")) |
return(0); |
return(0); |
if (0 == strcmp(*arg->value, "indent")) |
if (0 == strcmp(p, "indent")) |
return(INDENT + 1); |
return(INDENT + 1); |
if (0 == strcmp(*arg->value, "indent-two")) |
if (0 == strcmp(p, "indent-two")) |
return((INDENT + 1) * 2); |
return((INDENT + 1) * 2); |
|
|
/* FIXME: needs to support field-widths (10n, etc.). */ |
if (0 == (len = (int)strlen(p))) |
|
return(0); |
|
|
return(strlen(*arg->value)); |
for (i = 0; i < len - 1; i++) |
|
if ( ! isdigit((u_char)p[i])) |
|
break; |
|
|
|
if (i == len - 1) |
|
if ('n' == p[len - 1] || 'm' == p[len - 1]) |
|
return((size_t)atoi(p)); |
|
|
|
return((size_t)len); |
} |
} |
|
|
|
|
Line 704 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], sv; |
int i, type, keys[3], vals[3]; |
size_t width, offset; |
size_t width, offset; |
|
|
if (MDOC_BLOCK == node->type) |
if (MDOC_BLOCK == node->type) |
Line 729 termp_it_pre(DECL_ARGS) |
|
Line 736 termp_it_pre(DECL_ARGS) |
|
(void)arg_getattrs(keys, vals, 3, bl); |
(void)arg_getattrs(keys, vals, 3, bl); |
|
|
type = arg_listtype(bl); |
type = arg_listtype(bl); |
|
assert(-1 != type); |
|
|
/* Calculate real width and offset. */ |
/* Calculate real width and offset. */ |
|
|
Line 755 termp_it_pre(DECL_ARGS) |
|
Line 763 termp_it_pre(DECL_ARGS) |
|
/* |
/* |
* List-type can override the width in the case of fixed-head |
* List-type can override the width in the case of fixed-head |
* values (bullet, dash/hyphen, enum). Tags need a non-zero |
* values (bullet, dash/hyphen, enum). Tags need a non-zero |
* offset. |
* offset. FIXME: double-check that correct. |
*/ |
*/ |
|
|
switch (type) { |
switch (type) { |
Line 771 termp_it_pre(DECL_ARGS) |
|
Line 779 termp_it_pre(DECL_ARGS) |
|
if (width < 5) |
if (width < 5) |
width = 5; |
width = 5; |
break; |
break; |
|
case (MDOC_Hang): |
|
if (0 == width) |
|
width = 8; |
|
break; |
case (MDOC_Tag): |
case (MDOC_Tag): |
if (0 == width) |
if (0 == width) |
width = 10; |
width = 10; |
Line 828 termp_it_pre(DECL_ARGS) |
|
Line 840 termp_it_pre(DECL_ARGS) |
|
case (MDOC_Enum): |
case (MDOC_Enum): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hyphen): |
case (MDOC_Hyphen): |
/* FALLTHROUGH */ |
if (MDOC_HEAD == node->type) |
|
p->flags |= TERMP_NOBREAK; |
|
else |
|
p->flags |= TERMP_NOLPAD; |
|
break; |
|
case (MDOC_Hang): |
|
if (MDOC_HEAD == node->type) |
|
p->flags |= TERMP_NOBREAK; |
|
else |
|
p->flags |= TERMP_NOLPAD; |
|
|
|
if (MDOC_HEAD == node->type) |
|
p->flags |= TERMP_HANG; |
|
break; |
case (MDOC_Tag): |
case (MDOC_Tag): |
if (MDOC_HEAD == node->type) |
if (MDOC_HEAD == node->type) |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
else |
else |
p->flags |= TERMP_NOLPAD; |
p->flags |= TERMP_NOLPAD; |
if (MDOC_HEAD == node->type && MDOC_Tag == type) |
|
if (NULL == node->next || |
if (MDOC_HEAD != node->type) |
NULL == node->next->child) |
break; |
p->flags |= TERMP_NONOBREAK; |
if (NULL == node->next || NULL == node->next->child) |
|
p->flags |= TERMP_DANGLE; |
break; |
break; |
case (MDOC_Column): |
case (MDOC_Column): |
if (MDOC_HEAD == node->type) { |
if (MDOC_HEAD == node->type) { |
Line 875 termp_it_pre(DECL_ARGS) |
|
Line 901 termp_it_pre(DECL_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hyphen): |
case (MDOC_Hyphen): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (MDOC_Hang): |
|
/* FALLTHROUGH */ |
case (MDOC_Tag): |
case (MDOC_Tag): |
if (MDOC_HEAD == node->type) |
if (MDOC_HEAD == node->type) |
p->rmargin = p->offset + width; |
p->rmargin = p->offset + width; |
Line 893 termp_it_pre(DECL_ARGS) |
|
Line 921 termp_it_pre(DECL_ARGS) |
|
* HEAD character (temporarily bold, in some cases). |
* 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; |
p->flags |= TERMP_BOLD; |
term_word(p, "\\[bu]"); |
term_word(p, "\\[bu]"); |
|
p->flags &= ~TERMP_BOLD; |
break; |
break; |
case (MDOC_Dash): |
case (MDOC_Dash): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Hyphen): |
case (MDOC_Hyphen): |
p->flags |= TERMP_BOLD; |
p->flags |= TERMP_BOLD; |
term_word(p, "\\(hy"); |
term_word(p, "\\(hy"); |
|
p->flags &= ~TERMP_BOLD; |
break; |
break; |
case (MDOC_Enum): |
case (MDOC_Enum): |
(pair->ppair->ppair->count)++; |
(pair->ppair->ppair->count)++; |
Line 916 termp_it_pre(DECL_ARGS) |
|
Line 945 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. |
*/ |
*/ |
Line 957 termp_it_post(DECL_ARGS) |
|
Line 984 termp_it_post(DECL_ARGS) |
|
return; |
return; |
|
|
type = arg_listtype(node->parent->parent->parent); |
type = arg_listtype(node->parent->parent->parent); |
|
assert(-1 != type); |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Diag): |
case (MDOC_Diag): |
Line 1043 termp_pp_pre(DECL_ARGS) |
|
Line 1071 termp_pp_pre(DECL_ARGS) |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
termp_st_pre(DECL_ARGS) |
|
{ |
|
const char *cp; |
|
|
|
if (node->child && (cp = mdoc_a2st(node->child->string))) |
|
term_word(p, cp); |
|
return(0); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
|
termp_rs_pre(DECL_ARGS) |
termp_rs_pre(DECL_ARGS) |
{ |
{ |
|
|
Line 1070 termp_rv_pre(DECL_ARGS) |
|
Line 1086 termp_rv_pre(DECL_ARGS) |
|
{ |
{ |
int i; |
int i; |
|
|
/* FIXME: mandated by parser. */ |
i = arg_getattr(MDOC_Std, node); |
|
assert(-1 != i); |
|
assert(node->args->argv[i].sz); |
|
|
if (-1 == (i = arg_getattr(MDOC_Std, node))) |
|
errx(1, "expected -std argument"); |
|
if (1 != node->args->argv[i].sz) |
|
errx(1, "expected -std argument"); |
|
|
|
term_newln(p); |
term_newln(p); |
term_word(p, "The"); |
term_word(p, "The"); |
|
|
Line 1105 termp_ex_pre(DECL_ARGS) |
|
Line 1118 termp_ex_pre(DECL_ARGS) |
|
{ |
{ |
int i; |
int i; |
|
|
/* FIXME: mandated by parser? */ |
i = arg_getattr(MDOC_Std, node); |
|
assert(-1 != i); |
|
assert(node->args->argv[i].sz); |
|
|
if (-1 == (i = arg_getattr(MDOC_Std, node))) |
|
errx(1, "expected -std argument"); |
|
if (1 != node->args->argv[i].sz) |
|
errx(1, "expected -std argument"); |
|
|
|
term_word(p, "The"); |
term_word(p, "The"); |
p->flags |= ttypes[TTYPE_PROG]; |
p->flags |= ttypes[TTYPE_PROG]; |
term_word(p, *node->args->argv[i].value); |
term_word(p, *node->args->argv[i].value); |
Line 1130 termp_nd_pre(DECL_ARGS) |
|
Line 1140 termp_nd_pre(DECL_ARGS) |
|
if (MDOC_BODY != node->type) |
if (MDOC_BODY != node->type) |
return(1); |
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. |
|
*/ |
|
#if defined(__OpenBSD__) || defined(__linux__) |
#if defined(__OpenBSD__) || defined(__linux__) |
term_word(p, "\\-"); |
term_word(p, "\\(en"); |
#else |
#else |
term_word(p, "\\(em"); |
term_word(p, "\\(em"); |
#endif |
#endif |
|
|
termp_vt_post(DECL_ARGS) |
termp_vt_post(DECL_ARGS) |
{ |
{ |
|
|
if (node->sec == SEC_SYNOPSIS) |
if (node->sec != SEC_SYNOPSIS) |
|
return; |
|
if (node->next && MDOC_Vt == node->next->tok) |
|
term_newln(p); |
|
else if (node->next) |
term_vspace(p); |
term_vspace(p); |
} |
} |
|
|
Line 1300 termp_bt_pre(DECL_ARGS) |
|
Line 1309 termp_bt_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
|
termp_lb_pre(DECL_ARGS) |
|
{ |
|
const char *lb; |
|
|
|
assert(node->child && MDOC_TEXT == node->child->type); |
|
lb = mdoc_a2lib(node->child->string); |
|
if (lb) { |
|
term_word(p, lb); |
|
return(0); |
|
} |
|
term_word(p, "library"); |
|
return(1); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static void |
static void |
termp_lb_post(DECL_ARGS) |
termp_lb_post(DECL_ARGS) |
{ |
{ |
Line 1840 termp_in_post(DECL_ARGS) |
|
Line 1832 termp_in_post(DECL_ARGS) |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
termp_at_pre(DECL_ARGS) |
|
{ |
|
const char *att; |
|
|
|
att = NULL; |
|
|
|
if (node->child) |
|
att = mdoc_a2att(node->child->string); |
|
if (NULL == att) |
|
att = "AT&T UNIX"; |
|
|
|
term_word(p, att); |
|
return(0); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
|
termp_brq_pre(DECL_ARGS) |
termp_brq_pre(DECL_ARGS) |
{ |
{ |
|
|
Line 1937 termp_fo_pre(DECL_ARGS) |
|
Line 1911 termp_fo_pre(DECL_ARGS) |
|
const struct mdoc_node *n; |
const struct mdoc_node *n; |
|
|
if (MDOC_BODY == node->type) { |
if (MDOC_BODY == node->type) { |
|
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 != node->type) |
} else if (MDOC_HEAD != node->type) |
return(1); |
return(1); |
|
|
/* XXX - groff shows only first parameter */ |
|
|
|
p->flags |= ttypes[TTYPE_FUNC_NAME]; |
p->flags |= ttypes[TTYPE_FUNC_NAME]; |
for (n = node->child; n; n = n->next) { |
for (n = node->child; n; n = n->next) { |