version 1.39, 2009/07/14 15:17:25 |
version 1.49, 2009/07/20 19:30:46 |
Line 130 static int termp_ar_pre(DECL_ARGS); |
|
Line 130 static int termp_ar_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); |
|
static int termp_br_pre(DECL_ARGS); |
static int termp_brq_pre(DECL_ARGS); |
static int termp_brq_pre(DECL_ARGS); |
static int termp_bt_pre(DECL_ARGS); |
static int termp_bt_pre(DECL_ARGS); |
static int termp_cd_pre(DECL_ARGS); |
static int termp_cd_pre(DECL_ARGS); |
Line 163 static int termp_rs_pre(DECL_ARGS); |
|
Line 164 static int termp_rs_pre(DECL_ARGS); |
|
static int termp_rv_pre(DECL_ARGS); |
static int termp_rv_pre(DECL_ARGS); |
static int termp_sh_pre(DECL_ARGS); |
static int termp_sh_pre(DECL_ARGS); |
static int termp_sm_pre(DECL_ARGS); |
static int termp_sm_pre(DECL_ARGS); |
|
static int termp_sp_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_sx_pre(DECL_ARGS); |
static int termp_sx_pre(DECL_ARGS); |
Line 292 static const struct termact termacts[MDOC_MAX] = { |
|
Line 294 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* En */ |
{ NULL, NULL }, /* En */ |
{ termp_xx_pre, NULL }, /* Dx */ |
{ termp_xx_pre, NULL }, /* Dx */ |
{ NULL, NULL }, /* %Q */ |
{ NULL, NULL }, /* %Q */ |
|
{ termp_br_pre, NULL }, /* br */ |
|
{ termp_sp_pre, NULL }, /* sp */ |
}; |
}; |
|
|
#ifdef __linux__ |
#ifdef __linux__ |
Line 360 print_node(DECL_ARGS) |
|
Line 364 print_node(DECL_ARGS) |
|
npair.flag = 0; |
npair.flag = 0; |
npair.count = 0; |
npair.count = 0; |
|
|
|
/* |
|
* Note on termpair. This allows a pre function to set a termp |
|
* flag that is automatically unset after the body, but before |
|
* the post function. Thus, if a pre uses a termpair flag, it |
|
* must be reapplied in the post for use. |
|
*/ |
|
|
if (MDOC_TEXT != node->type) { |
if (MDOC_TEXT != node->type) { |
if (termacts[node->tok].pre) |
if (termacts[node->tok].pre) |
if ( ! (*termacts[node->tok].pre)(p, &npair, meta, node)) |
if ( ! (*termacts[node->tok].pre)(p, &npair, meta, node)) |
Line 374 print_node(DECL_ARGS) |
|
Line 385 print_node(DECL_ARGS) |
|
if (dochild && node->child) |
if (dochild && node->child) |
print_body(p, &npair, meta, node->child); |
print_body(p, &npair, meta, node->child); |
|
|
|
p->flags &= ~npair.flag; |
|
|
/* Post-processing. */ |
/* Post-processing. */ |
|
|
if (MDOC_TEXT != node->type) |
if (MDOC_TEXT != node->type) |
Line 382 print_node(DECL_ARGS) |
|
Line 395 print_node(DECL_ARGS) |
|
|
|
p->offset = offset; |
p->offset = offset; |
p->rmargin = rmargin; |
p->rmargin = rmargin; |
p->flags &= ~npair.flag; |
|
} |
} |
|
|
|
|
Line 407 print_foot(struct termp *p, const struct mdoc_meta *me |
|
Line 419 print_foot(struct termp *p, const struct mdoc_meta *me |
|
|
|
tm = localtime(&meta->date); |
tm = localtime(&meta->date); |
|
|
if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm)) |
if (0 == strftime(buf, p->rmargin, "%B %e, %Y", tm)) |
err(1, "strftime"); |
err(1, "strftime"); |
|
|
(void)strlcpy(os, meta->os, p->rmargin); |
(void)strlcpy(os, meta->os, p->rmargin); |
Line 517 print_head(struct termp *p, const struct mdoc_meta *me |
|
Line 529 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 586 arg_listtype(const struct mdoc_node *n) |
|
Line 596 arg_listtype(const struct mdoc_node *n) |
|
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 649 fmt_block_vspace(struct termp *p, |
|
Line 672 fmt_block_vspace(struct termp *p, |
|
|
|
if (arg_hasattr(MDOC_Compact, bl)) |
if (arg_hasattr(MDOC_Compact, bl)) |
return(1); |
return(1); |
|
/* XXX - not documented! */ |
|
else if (arg_hasattr(MDOC_Column, bl)) |
|
return(1); |
|
|
for (n = node; n; n = n->parent) { |
for (n = node; n; n = n->parent) { |
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
Line 772 termp_it_pre(DECL_ARGS) |
|
Line 798 termp_it_pre(DECL_ARGS) |
|
if (0 == width) |
if (0 == width) |
width = 8; |
width = 8; |
break; |
break; |
|
case (MDOC_Column): |
|
/* FALLTHROUGH */ |
case (MDOC_Tag): |
case (MDOC_Tag): |
if (0 == width) |
if (0 == width) |
width = 10; |
width = 10; |
Line 786 termp_it_pre(DECL_ARGS) |
|
Line 814 termp_it_pre(DECL_ARGS) |
|
*/ |
*/ |
|
|
switch (type) { |
switch (type) { |
case (MDOC_Diag): |
|
term_word(p, "\\ "); |
|
/* FALLTHROUGH */ |
|
case (MDOC_Inset): |
case (MDOC_Inset): |
if (MDOC_BODY == node->type) |
if (MDOC_BODY == node->type) |
p->flags &= ~TERMP_NOSPACE; |
p->flags &= ~TERMP_NOSPACE; |
Line 893 termp_it_pre(DECL_ARGS) |
|
Line 918 termp_it_pre(DECL_ARGS) |
|
case (MDOC_Hang): |
case (MDOC_Hang): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Tag): |
case (MDOC_Tag): |
|
assert(width); |
if (MDOC_HEAD == node->type) |
if (MDOC_HEAD == node->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 (MDOC_Column): |
|
assert(width); |
p->rmargin = p->offset + width; |
p->rmargin = p->offset + width; |
break; |
break; |
default: |
default: |
Line 977 termp_it_post(DECL_ARGS) |
|
Line 1004 termp_it_post(DECL_ARGS) |
|
|
|
switch (type) { |
switch (type) { |
case (MDOC_Diag): |
case (MDOC_Diag): |
|
term_word(p, "\\ "); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Item): |
case (MDOC_Item): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1129 termp_nd_pre(DECL_ARGS) |
|
Line 1157 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 |
Line 1553 termp_bd_pre(DECL_ARGS) |
|
Line 1576 termp_bd_pre(DECL_ARGS) |
|
* Ew. |
* Ew. |
*/ |
*/ |
|
|
p->flags |= TERMP_LITERAL; |
|
ln = node->child ? node->child->line : 0; |
ln = node->child ? node->child->line : 0; |
|
|
for (node = node->child; node; node = node->next) { |
for (node = node->child; node; node = node->next) { |
Line 1576 termp_bd_post(DECL_ARGS) |
|
Line 1598 termp_bd_post(DECL_ARGS) |
|
|
|
if (MDOC_BODY != node->type) |
if (MDOC_BODY != node->type) |
return; |
return; |
|
|
term_flushln(p); |
term_flushln(p); |
p->flags &= ~TERMP_LITERAL; |
|
p->flags |= TERMP_NOSPACE; |
|
} |
} |
|
|
|
|
|
|
termp_in_post(DECL_ARGS) |
termp_in_post(DECL_ARGS) |
{ |
{ |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE | ttypes[TTYPE_INCLUDE]; |
term_word(p, ">"); |
term_word(p, ">"); |
|
p->flags &= ~ttypes[TTYPE_INCLUDE]; |
|
|
if (SEC_SYNOPSIS != node->sec) |
if (SEC_SYNOPSIS != node->sec) |
return; |
return; |
Line 1821 termp_in_post(DECL_ARGS) |
|
Line 1841 termp_in_post(DECL_ARGS) |
|
*/ |
*/ |
if (node->next && MDOC_In != node->next->tok) |
if (node->next && MDOC_In != node->next->tok) |
term_vspace(p); |
term_vspace(p); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
|
termp_sp_pre(DECL_ARGS) |
|
{ |
|
int i, len; |
|
|
|
if (NULL == node->child) { |
|
term_vspace(p); |
|
return(0); |
|
} |
|
|
|
len = atoi(node->child->string); |
|
if (0 == len) |
|
term_newln(p); |
|
for (i = 0; i < len; i++) |
|
term_vspace(p); |
|
|
|
return(0); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
|
termp_br_pre(DECL_ARGS) |
|
{ |
|
|
|
term_newln(p); |
|
return(1); |
} |
} |
|
|
|
|