version 1.9, 2009/06/11 12:07:49 |
version 1.16, 2009/06/22 12:04:05 |
Line 86 struct termpair { |
|
Line 86 struct termpair { |
|
struct termpair *ppair; |
struct termpair *ppair; |
int type; |
int type; |
#define TERMPAIR_FLAG (1 << 0) |
#define TERMPAIR_FLAG (1 << 0) |
int flag; |
int flag; /* Whether being used. */ |
size_t offset; |
size_t offset; /* Left margin. */ |
size_t rmargin; |
size_t rmargin; /* Right margin. */ |
int count; |
int count; /* Enum count. */ |
}; |
}; |
|
|
#define TERMPAIR_SETFLAG(termp, p, fl) \ |
#define TERMPAIR_SETFLAG(termp, p, fl) \ |
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 415 print_foot(struct termp *p, const struct mdoc_meta *me |
|
Line 417 print_foot(struct termp *p, const struct mdoc_meta *me |
|
|
|
tm = localtime(&meta->date); |
tm = localtime(&meta->date); |
|
|
#ifdef __OpenBSD__ |
|
if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm)) |
|
#else |
|
if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm)) |
if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm)) |
#endif |
|
err(1, "strftime"); |
err(1, "strftime"); |
|
|
(void)strlcpy(os, meta->os, p->rmargin); |
(void)strlcpy(os, meta->os, p->rmargin); |
Line 535 arg_width(const struct mdoc_argv *arg, int pos) |
|
Line 533 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")) |
if (0 == strcmp(arg->value[pos], "indent")) |
return(INDENT); |
return(INDENT + 3); |
if (0 == strcmp(arg->value[pos], "indent-two")) |
if (0 == strcmp(arg->value[pos], "indent-two")) |
return(INDENT * 2); |
return(INDENT * 2 + 2); |
|
|
if (0 == (len = (int)strlen(arg->value[pos]))) |
if (0 == (len = (int)strlen(arg->value[pos]))) |
return(0); |
return(0); |
Line 547 arg_width(const struct mdoc_argv *arg, int pos) |
|
Line 545 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 592 arg_listtype(const struct mdoc_node *n) |
|
Line 591 arg_listtype(const struct mdoc_node *n) |
|
break; |
break; |
} |
} |
|
|
|
/* FIXME: mandated by parser. */ |
|
|
errx(1, "list type not supported"); |
errx(1, "list type not supported"); |
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
Line 602 arg_offset(const struct mdoc_argv *arg) |
|
Line 603 arg_offset(const struct mdoc_argv *arg) |
|
{ |
{ |
|
|
assert(*arg->value); |
assert(*arg->value); |
|
if (0 == strcmp(*arg->value, "left")) |
|
return(INDENT - 1); |
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 * 2); |
|
|
|
/* FIXME: needs to support field-widths (10n, etc.). */ |
|
|
return(strlen(*arg->value)); |
return(strlen(*arg->value)); |
} |
} |
|
|
Line 709 termp_it_pre(DECL_ARGS) |
|
Line 715 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 893 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 916 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. |
*/ |
*/ |
Line 1067 termp_rv_pre(DECL_ARGS) |
|
Line 1078 termp_rv_pre(DECL_ARGS) |
|
{ |
{ |
int i; |
int i; |
|
|
|
/* FIXME: mandated by parser. */ |
|
|
if (-1 == (i = arg_getattr(MDOC_Std, node))) |
if (-1 == (i = arg_getattr(MDOC_Std, node))) |
errx(1, "expected -std argument"); |
errx(1, "expected -std argument"); |
if (1 != node->args->argv[i].sz) |
if (1 != node->args->argv[i].sz) |
Line 1100 termp_ex_pre(DECL_ARGS) |
|
Line 1113 termp_ex_pre(DECL_ARGS) |
|
{ |
{ |
int i; |
int i; |
|
|
|
/* FIXME: mandated by parser? */ |
|
|
if (-1 == (i = arg_getattr(MDOC_Std, node))) |
if (-1 == (i = arg_getattr(MDOC_Std, node))) |
errx(1, "expected -std argument"); |
errx(1, "expected -std argument"); |
if (1 != node->args->argv[i].sz) |
if (1 != node->args->argv[i].sz) |
Line 1153 termp_xr_pre(DECL_ARGS) |
|
Line 1168 termp_xr_pre(DECL_ARGS) |
|
{ |
{ |
const struct mdoc_node *n; |
const struct mdoc_node *n; |
|
|
if (NULL == (n = node->child)) |
assert(node->child && MDOC_TEXT == node->child->type); |
errx(1, "expected text line argument"); |
n = node->child; |
|
|
term_word(p, n->string); |
term_word(p, n->string); |
if (NULL == (n = n->next)) |
if (NULL == (n = n->next)) |
return(0); |
return(0); |
Line 1288 termp_lb_pre(DECL_ARGS) |
|
Line 1304 termp_lb_pre(DECL_ARGS) |
|
{ |
{ |
const char *lb; |
const char *lb; |
|
|
if (NULL == node->child) |
assert(node->child && MDOC_TEXT == node->child->type); |
errx(1, "expected text line argument"); |
|
if ((lb = mdoc_a2lib(node->child->string))) { |
if ((lb = mdoc_a2lib(node->child->string))) { |
term_word(p, lb); |
term_word(p, lb); |
return(0); |
return(0); |
Line 1326 termp_d1_pre(DECL_ARGS) |
|
Line 1341 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); |
} |
} |
|
|
Line 1397 termp_fn_pre(DECL_ARGS) |
|
Line 1413 termp_fn_pre(DECL_ARGS) |
|
{ |
{ |
const struct mdoc_node *n; |
const struct mdoc_node *n; |
|
|
if (NULL == node->child) |
assert(node->child && MDOC_TEXT == node->child->type); |
errx(1, "expected text line arguments"); |
|
|
|
/* FIXME: can be "type funcname" "type varname"... */ |
/* FIXME: can be "type funcname" "type varname"... */ |
|
|
Line 1505 termp_bd_pre(DECL_ARGS) |
|
Line 1520 termp_bd_pre(DECL_ARGS) |
|
else if (MDOC_BODY != node->type) |
else if (MDOC_BODY != node->type) |
return(1); |
return(1); |
|
|
|
/* FIXME: display type should be mandated by parser. */ |
|
|
if (NULL == node->parent->args) |
if (NULL == node->parent->args) |
errx(1, "missing display type"); |
errx(1, "missing display type"); |
|
|
Line 1953 termp_fo_pre(DECL_ARGS) |
|
Line 1970 termp_fo_pre(DECL_ARGS) |
|
|
|
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) { |
if (MDOC_TEXT != n->type) |
assert(MDOC_TEXT == n->type); |
errx(1, "expected text line argument"); |
|
term_word(p, n->string); |
term_word(p, n->string); |
} |
} |
p->flags &= ~ttypes[TTYPE_FUNC_NAME]; |
p->flags &= ~ttypes[TTYPE_FUNC_NAME]; |
Line 1998 termp_bf_pre(DECL_ARGS) |
|
Line 2014 termp_bf_pre(DECL_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
if (MDOC_TEXT != n->type) |
assert(MDOC_TEXT == n->type); |
errx(1, "expected text line arguments"); |
|
|
|
if (0 == strcmp("Em", n->string)) |
if (0 == strcmp("Em", n->string)) |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); |
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]); |
else if (0 == strcmp("Sy", n->string)) |
else if (0 == strcmp("Sy", n->string)) |
|
|
termp_sm_pre(DECL_ARGS) |
termp_sm_pre(DECL_ARGS) |
{ |
{ |
|
|
if (NULL == node->child || MDOC_TEXT != node->child->type) |
assert(node->child && MDOC_TEXT == node->child->type); |
errx(1, "expected boolean line argument"); |
|
|
|
if (0 == strcmp("on", node->child->string)) { |
if (0 == strcmp("on", node->child->string)) { |
p->flags &= ~TERMP_NONOSPACE; |
p->flags &= ~TERMP_NONOSPACE; |
p->flags &= ~TERMP_NOSPACE; |
p->flags &= ~TERMP_NOSPACE; |
Line 2109 termp_lk_pre(DECL_ARGS) |
|
Line 2121 termp_lk_pre(DECL_ARGS) |
|
{ |
{ |
const struct mdoc_node *n; |
const struct mdoc_node *n; |
|
|
if (NULL == (n = node->child)) |
assert(node->child); |
errx(1, "expected line argument"); |
n = node->child; |
|
|
|
if (NULL == n->next) { |
|
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK_ANCHOR]); |
|
return(1); |
|
} |
|
|
p->flags |= ttypes[TTYPE_LINK_ANCHOR]; |
p->flags |= ttypes[TTYPE_LINK_ANCHOR]; |
term_word(p, n->string); |
term_word(p, n->string); |
p->flags &= ~ttypes[TTYPE_LINK_ANCHOR]; |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ":"); |
term_word(p, ":"); |
|
p->flags &= ~ttypes[TTYPE_LINK_ANCHOR]; |
|
|
p->flags |= ttypes[TTYPE_LINK_TEXT]; |
p->flags |= ttypes[TTYPE_LINK_TEXT]; |
for ( ; n; n = n->next) { |
for (n = n->next; n; n = n->next) |
term_word(p, n->string); |
term_word(p, n->string); |
} |
|
p->flags &= ~ttypes[TTYPE_LINK_TEXT]; |
|
|
|
|
p->flags &= ~ttypes[TTYPE_LINK_TEXT]; |
return(0); |
return(0); |
} |
} |
|
|