version 1.72, 2010/06/03 13:44:36 |
version 1.77, 2010/06/06 10:50:56 |
Line 84 static void mdoc_dq_post(MDOC_ARGS); |
|
Line 84 static void mdoc_dq_post(MDOC_ARGS); |
|
static int mdoc_dq_pre(MDOC_ARGS); |
static int mdoc_dq_pre(MDOC_ARGS); |
static int mdoc_dv_pre(MDOC_ARGS); |
static int mdoc_dv_pre(MDOC_ARGS); |
static int mdoc_fa_pre(MDOC_ARGS); |
static int mdoc_fa_pre(MDOC_ARGS); |
|
static void mdoc_fd_post(MDOC_ARGS); |
static int mdoc_fd_pre(MDOC_ARGS); |
static int mdoc_fd_pre(MDOC_ARGS); |
static int mdoc_fl_pre(MDOC_ARGS); |
static int mdoc_fl_pre(MDOC_ARGS); |
static int mdoc_fn_pre(MDOC_ARGS); |
static int mdoc_fn_pre(MDOC_ARGS); |
Line 158 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
Line 159 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
{mdoc_ev_pre, NULL}, /* Ev */ |
{mdoc_ev_pre, NULL}, /* Ev */ |
{mdoc_ex_pre, NULL}, /* Ex */ |
{mdoc_ex_pre, NULL}, /* Ex */ |
{mdoc_fa_pre, NULL}, /* Fa */ |
{mdoc_fa_pre, NULL}, /* Fa */ |
{mdoc_fd_pre, NULL}, /* Fd */ |
{mdoc_fd_pre, mdoc_fd_post}, /* Fd */ |
{mdoc_fl_pre, NULL}, /* Fl */ |
{mdoc_fl_pre, NULL}, /* Fl */ |
{mdoc_fn_pre, NULL}, /* Fn */ |
{mdoc_fn_pre, NULL}, /* Fn */ |
{mdoc_ft_pre, NULL}, /* Ft */ |
{mdoc_ft_pre, NULL}, /* Ft */ |
Line 1246 mdoc_d1_pre(MDOC_ARGS) |
|
Line 1247 mdoc_d1_pre(MDOC_ARGS) |
|
|
|
/* FIXME: D1 shouldn't be literal. */ |
/* FIXME: D1 shouldn't be literal. */ |
|
|
SCALE_VS_INIT(&su, INDENT - 1); |
SCALE_VS_INIT(&su, INDENT - 2); |
bufcat_su(h, "margin-left", &su); |
bufcat_su(h, "margin-left", &su); |
PAIR_CLASS_INIT(&tag[0], "lit"); |
PAIR_CLASS_INIT(&tag[0], "lit"); |
PAIR_STYLE_INIT(&tag[1], h); |
PAIR_STYLE_INIT(&tag[1], h); |
Line 1510 mdoc_fa_pre(MDOC_ARGS) |
|
Line 1511 mdoc_fa_pre(MDOC_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
|
static void |
|
mdoc_fd_post(MDOC_ARGS) |
|
{ |
|
|
|
print_otag(h, TAG_BR, 0, NULL); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
static int |
static int |
mdoc_fd_pre(MDOC_ARGS) |
mdoc_fd_pre(MDOC_ARGS) |
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
struct roffsu su; |
|
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) { |
|
if (n->next && MDOC_Fd != n->next->tok) { |
|
SCALE_VS_INIT(&su, 1); |
|
bufcat_su(h, "margin-bottom", &su); |
|
PAIR_STYLE_INIT(&tag, h); |
|
print_otag(h, TAG_DIV, 1, &tag); |
|
} else |
|
print_otag(h, TAG_DIV, 0, NULL); |
|
} |
|
|
|
PAIR_CLASS_INIT(&tag, "macro"); |
PAIR_CLASS_INIT(&tag, "macro"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
return(1); |
return(1); |
Line 1564 mdoc_ft_pre(MDOC_ARGS) |
|
Line 1563 mdoc_ft_pre(MDOC_ARGS) |
|
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
if (SEC_SYNOPSIS == n->sec && n->prev) |
print_otag(h, TAG_DIV, 0, NULL); |
print_otag(h, TAG_BR, 0, NULL); |
|
|
PAIR_CLASS_INIT(&tag, "ftype"); |
PAIR_CLASS_INIT(&tag, "ftype"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
Line 1585 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1584 mdoc_fn_pre(MDOC_ARGS) |
|
int sz, i; |
int sz, i; |
struct roffsu su; |
struct roffsu su; |
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) { |
/* NB: MDOC_LINE has no effect on this macro! */ |
|
if (SEC_SYNOPSIS == n->sec) { |
SCALE_HS_INIT(&su, INDENT); |
SCALE_HS_INIT(&su, INDENT); |
bufcat_su(h, "margin-left", &su); |
bufcat_su(h, "margin-left", &su); |
su.scale = -su.scale; |
su.scale = -su.scale; |
bufcat_su(h, "text-indent", &su); |
bufcat_su(h, "text-indent", &su); |
if (n->next) { |
if (n->prev && MDOC_Ft != n->prev->tok) { |
SCALE_VS_INIT(&su, 1); |
SCALE_VS_INIT(&su, 1); |
bufcat_su(h, "margin-bottom", &su); |
bufcat_su(h, "margin-top", &su); |
} |
} |
PAIR_STYLE_INIT(&tag[0], h); |
PAIR_STYLE_INIT(&tag[0], h); |
print_otag(h, TAG_DIV, 1, tag); |
print_otag(h, TAG_DIV, 1, tag); |
} |
} |
Line 1781 mdoc_mt_pre(MDOC_ARGS) |
|
Line 1781 mdoc_mt_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_fo_pre(MDOC_ARGS) |
mdoc_fo_pre(MDOC_ARGS) |
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
struct roffsu su; |
struct roffsu su; |
|
struct tag *t; |
|
|
if (MDOC_BODY == n->type) { |
if (MDOC_BODY == n->type) { |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
print_text(h, "("); |
print_text(h, "("); |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
return(1); |
return(1); |
} else if (MDOC_BLOCK == n->type && n->next) { |
} else if (MDOC_BLOCK == n->type) { |
|
if (SEC_SYNOPSIS != n->sec) |
|
return(1); |
|
if (NULL == n->prev || MDOC_Ft == n->prev->tok) { |
|
print_otag(h, TAG_DIV, 0, NULL); |
|
return(1); |
|
} |
SCALE_VS_INIT(&su, 1); |
SCALE_VS_INIT(&su, 1); |
bufcat_su(h, "margin-bottom", &su); |
bufcat_su(h, "margin-top", &su); |
PAIR_STYLE_INIT(&tag, h); |
PAIR_STYLE_INIT(&tag, h); |
print_otag(h, TAG_DIV, 1, &tag); |
print_otag(h, TAG_DIV, 1, &tag); |
return(1); |
return(1); |
} |
} |
|
|
|
/* XXX: we drop non-initial arguments as per groff. */ |
|
|
|
assert(n->child); |
|
assert(n->child->string); |
|
|
PAIR_CLASS_INIT(&tag, "fname"); |
PAIR_CLASS_INIT(&tag, "fname"); |
print_otag(h, TAG_SPAN, 1, &tag); |
t = print_otag(h, TAG_SPAN, 1, &tag); |
return(1); |
print_text(h, n->child->string); |
|
print_tagq(h, t); |
|
return(0); |
} |
} |
|
|
|
|
Line 1824 mdoc_in_pre(MDOC_ARGS) |
|
Line 1838 mdoc_in_pre(MDOC_ARGS) |
|
struct tag *t; |
struct tag *t; |
struct htmlpair tag[2]; |
struct htmlpair tag[2]; |
int i; |
int i; |
struct roffsu su; |
|
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) { |
|
if (n->next && MDOC_In != n->next->tok) { |
|
SCALE_VS_INIT(&su, 1); |
|
bufcat_su(h, "margin-bottom", &su); |
|
PAIR_STYLE_INIT(&tag[0], h); |
|
print_otag(h, TAG_DIV, 1, tag); |
|
} else |
|
print_otag(h, TAG_DIV, 0, NULL); |
|
} |
|
|
|
/* FIXME: there's a buffer bug in here somewhere. */ |
|
|
|
PAIR_CLASS_INIT(&tag[0], "includes"); |
PAIR_CLASS_INIT(&tag[0], "includes"); |
print_otag(h, TAG_SPAN, 1, tag); |
print_otag(h, TAG_SPAN, 1, tag); |
|
|
if (SEC_SYNOPSIS == n->sec) |
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
print_text(h, "#include"); |
print_text(h, "#include"); |
|
|
print_text(h, "<"); |
print_text(h, "<"); |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
|
|
/* XXX -- see warning in termp_in_post(). */ |
|
|
|
for (nn = n->child; nn; nn = nn->next) { |
for (nn = n->child; nn; nn = nn->next) { |
PAIR_CLASS_INIT(&tag[0], "link-includes"); |
PAIR_CLASS_INIT(&tag[0], "link-includes"); |
i = 1; |
i = 1; |
Line 1865 mdoc_in_pre(MDOC_ARGS) |
|
Line 1864 mdoc_in_pre(MDOC_ARGS) |
|
|
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
print_text(h, ">"); |
print_text(h, ">"); |
|
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
|
print_otag(h, TAG_BR, 0, NULL); |
|
|
return(0); |
return(0); |
} |
} |