version 1.119, 2010/12/15 16:35:21 |
version 1.132, 2010/12/20 10:40:11 |
Line 103 static int mdoc_nm_pre(MDOC_ARGS); |
|
Line 103 static int mdoc_nm_pre(MDOC_ARGS); |
|
static int mdoc_ns_pre(MDOC_ARGS); |
static int mdoc_ns_pre(MDOC_ARGS); |
static int mdoc_pa_pre(MDOC_ARGS); |
static int mdoc_pa_pre(MDOC_ARGS); |
static void mdoc_pf_post(MDOC_ARGS); |
static void mdoc_pf_post(MDOC_ARGS); |
|
static int mdoc_pp_pre(MDOC_ARGS); |
static void mdoc_quote_post(MDOC_ARGS); |
static void mdoc_quote_post(MDOC_ARGS); |
static int mdoc_quote_pre(MDOC_ARGS); |
static int mdoc_quote_pre(MDOC_ARGS); |
static int mdoc_rs_pre(MDOC_ARGS); |
static int mdoc_rs_pre(MDOC_ARGS); |
Line 126 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
Line 127 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
{NULL, NULL}, /* Os */ |
{NULL, NULL}, /* Os */ |
{mdoc_sh_pre, NULL }, /* Sh */ |
{mdoc_sh_pre, NULL }, /* Sh */ |
{mdoc_ss_pre, NULL }, /* Ss */ |
{mdoc_ss_pre, NULL }, /* Ss */ |
{mdoc_sp_pre, NULL}, /* Pp */ |
{mdoc_pp_pre, NULL}, /* Pp */ |
{mdoc_d1_pre, NULL}, /* D1 */ |
{mdoc_d1_pre, NULL}, /* D1 */ |
{mdoc_d1_pre, NULL}, /* Dl */ |
{mdoc_d1_pre, NULL}, /* Dl */ |
{mdoc_bd_pre, NULL}, /* Bd */ |
{mdoc_bd_pre, NULL}, /* Bd */ |
Line 227 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
Line 228 static const struct htmlmdoc mdocs[MDOC_MAX] = { |
|
{NULL, NULL}, /* Fr */ |
{NULL, NULL}, /* Fr */ |
{mdoc_ud_pre, NULL}, /* Ud */ |
{mdoc_ud_pre, NULL}, /* Ud */ |
{mdoc_lb_pre, NULL}, /* Lb */ |
{mdoc_lb_pre, NULL}, /* Lb */ |
{mdoc_sp_pre, NULL}, /* Lp */ |
{mdoc_pp_pre, NULL}, /* Lp */ |
{mdoc_lk_pre, NULL}, /* Lk */ |
{mdoc_lk_pre, NULL}, /* Lk */ |
{mdoc_mt_pre, NULL}, /* Mt */ |
{mdoc_mt_pre, NULL}, /* Mt */ |
{mdoc_quote_pre, mdoc_quote_post}, /* Brq */ |
{mdoc_quote_pre, mdoc_quote_post}, /* Brq */ |
Line 286 a2width(const char *p, struct roffsu *su) |
|
Line 287 a2width(const char *p, struct roffsu *su) |
|
{ |
{ |
|
|
if ( ! a2roffsu(p, su, SCALE_MAX)) { |
if ( ! a2roffsu(p, su, SCALE_MAX)) { |
su->unit = SCALE_EM; |
su->unit = SCALE_BU; |
su->scale = (int)strlen(p); |
su->scale = (int)strlen(p); |
} |
} |
} |
} |
Line 298 a2width(const char *p, struct roffsu *su) |
|
Line 299 a2width(const char *p, struct roffsu *su) |
|
static void |
static void |
synopsis_pre(struct html *h, const struct mdoc_node *n) |
synopsis_pre(struct html *h, const struct mdoc_node *n) |
{ |
{ |
struct roffsu su; |
|
struct htmlpair tag; |
|
|
|
if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags)) |
if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags)) |
return; |
return; |
|
|
SCALE_VS_INIT(&su, 1); |
|
bufcat_su(h, "margin-top", &su); |
|
PAIR_STYLE_INIT(&tag, h); |
|
|
|
if (n->prev->tok == n->tok && |
if (n->prev->tok == n->tok && |
MDOC_Fo != n->tok && |
MDOC_Fo != n->tok && |
MDOC_Ft != n->tok && |
MDOC_Ft != n->tok && |
MDOC_Fn != n->tok) { |
MDOC_Fn != n->tok) { |
print_otag(h, TAG_DIV, 0, NULL); |
print_otag(h, TAG_BR, 0, NULL); |
return; |
return; |
} |
} |
|
|
Line 326 synopsis_pre(struct html *h, const struct mdoc_node *n |
|
Line 321 synopsis_pre(struct html *h, const struct mdoc_node *n |
|
case (MDOC_In): |
case (MDOC_In): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Vt): |
case (MDOC_Vt): |
print_otag(h, TAG_DIV, 1, &tag); |
print_otag(h, TAG_P, 0, NULL); |
break; |
break; |
case (MDOC_Ft): |
case (MDOC_Ft): |
if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) { |
if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) { |
print_otag(h, TAG_DIV, 1, &tag); |
print_otag(h, TAG_P, 0, NULL); |
break; |
break; |
} |
} |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
print_otag(h, TAG_DIV, 0, NULL); |
print_otag(h, TAG_BR, 0, NULL); |
break; |
break; |
} |
} |
} |
} |
Line 359 a2offs(const char *p, struct roffsu *su) |
|
Line 354 a2offs(const char *p, struct roffsu *su) |
|
else if (0 == strcmp(p, "indent-two")) |
else if (0 == strcmp(p, "indent-two")) |
SCALE_HS_INIT(su, INDENT * 2); |
SCALE_HS_INIT(su, INDENT * 2); |
else if ( ! a2roffsu(p, su, SCALE_MAX)) { |
else if ( ! a2roffsu(p, su, SCALE_MAX)) { |
su->unit = SCALE_EM; |
su->unit = SCALE_BU; |
su->scale = (int)strlen(p); |
su->scale = (int)strlen(p); |
} |
} |
} |
} |
Line 462 print_mdoc_node(MDOC_ARGS) |
|
Line 457 print_mdoc_node(MDOC_ARGS) |
|
} |
} |
} |
} |
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
static void |
mdoc_root_post(MDOC_ARGS) |
mdoc_root_post(MDOC_ARGS) |
Line 473 mdoc_root_post(MDOC_ARGS) |
|
Line 467 mdoc_root_post(MDOC_ARGS) |
|
|
|
time2a(m->date, b, DATESIZ); |
time2a(m->date, b, DATESIZ); |
|
|
PAIR_CLASS_INIT(&tag[0], "footer"); |
PAIR_SUMMARY_INIT(&tag[0], "Document Footer"); |
bufcat_style(h, "width", "100%"); |
PAIR_CLASS_INIT(&tag[1], "foot"); |
PAIR_STYLE_INIT(&tag[1], h); |
if (NULL == h->style) { |
PAIR_SUMMARY_INIT(&tag[2], "footer"); |
PAIR_INIT(&tag[1], ATTR_WIDTH, "100%"); |
|
t = print_otag(h, TAG_TABLE, 3, tag); |
|
PAIR_INIT(&tag[0], ATTR_WIDTH, "50%"); |
|
print_otag(h, TAG_COL, 1, tag); |
|
print_otag(h, TAG_COL, 1, tag); |
|
} else |
|
t = print_otag(h, TAG_TABLE, 2, tag); |
|
|
t = print_otag(h, TAG_TABLE, 3, tag); |
t = print_otag(h, TAG_TBODY, 0, NULL); |
|
|
tt = print_otag(h, TAG_TR, 0, NULL); |
tt = print_otag(h, TAG_TR, 0, NULL); |
|
|
bufinit(h); |
PAIR_CLASS_INIT(&tag[0], "foot-date"); |
bufcat_style(h, "width", "50%"); |
|
PAIR_STYLE_INIT(&tag[0], h); |
|
print_otag(h, TAG_TD, 1, tag); |
print_otag(h, TAG_TD, 1, tag); |
|
|
print_text(h, b); |
print_text(h, b); |
print_stagq(h, tt); |
print_stagq(h, tt); |
|
|
bufinit(h); |
PAIR_CLASS_INIT(&tag[0], "foot-os"); |
bufcat_style(h, "width", "50%"); |
if (NULL == h->style) { |
bufcat_style(h, "text-align", "right"); |
PAIR_INIT(&tag[1], ATTR_ALIGN, "right"); |
PAIR_STYLE_INIT(&tag[0], h); |
print_otag(h, TAG_TD, 2, tag); |
print_otag(h, TAG_TD, 1, tag); |
} else |
|
print_otag(h, TAG_TD, 1, tag); |
|
|
print_text(h, m->os); |
print_text(h, m->os); |
print_tagq(h, t); |
print_tagq(h, t); |
} |
} |
Line 516 mdoc_root_pre(MDOC_ARGS) |
|
Line 518 mdoc_root_pre(MDOC_ARGS) |
|
|
|
snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec); |
snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec); |
|
|
PAIR_CLASS_INIT(&tag[0], "header"); |
PAIR_SUMMARY_INIT(&tag[0], "Document Header"); |
bufcat_style(h, "width", "100%"); |
PAIR_CLASS_INIT(&tag[1], "head"); |
PAIR_STYLE_INIT(&tag[1], h); |
if (NULL == h->style) { |
PAIR_SUMMARY_INIT(&tag[2], "header"); |
PAIR_INIT(&tag[2], ATTR_WIDTH, "100%"); |
|
t = print_otag(h, TAG_TABLE, 3, tag); |
|
PAIR_INIT(&tag[0], ATTR_WIDTH, "30%"); |
|
print_otag(h, TAG_COL, 1, tag); |
|
print_otag(h, TAG_COL, 1, tag); |
|
print_otag(h, TAG_COL, 1, tag); |
|
} else |
|
t = print_otag(h, TAG_TABLE, 2, tag); |
|
|
t = print_otag(h, TAG_TABLE, 3, tag); |
print_otag(h, TAG_TBODY, 0, NULL); |
|
|
tt = print_otag(h, TAG_TR, 0, NULL); |
tt = print_otag(h, TAG_TR, 0, NULL); |
|
|
bufinit(h); |
PAIR_CLASS_INIT(&tag[0], "head-ltitle"); |
bufcat_style(h, "width", "10%"); |
|
PAIR_STYLE_INIT(&tag[0], h); |
|
print_otag(h, TAG_TD, 1, tag); |
print_otag(h, TAG_TD, 1, tag); |
|
|
print_text(h, title); |
print_text(h, title); |
print_stagq(h, tt); |
print_stagq(h, tt); |
|
|
bufinit(h); |
PAIR_CLASS_INIT(&tag[0], "head-vol"); |
bufcat_style(h, "text-align", "center"); |
if (NULL == h->style) { |
bufcat_style(h, "white-space", "nowrap"); |
PAIR_INIT(&tag[1], ATTR_ALIGN, "center"); |
bufcat_style(h, "width", "80%"); |
print_otag(h, TAG_TD, 2, tag); |
PAIR_STYLE_INIT(&tag[0], h); |
} else |
print_otag(h, TAG_TD, 1, tag); |
print_otag(h, TAG_TD, 1, tag); |
|
|
print_text(h, b); |
print_text(h, b); |
print_stagq(h, tt); |
print_stagq(h, tt); |
|
|
bufinit(h); |
PAIR_CLASS_INIT(&tag[0], "head-rtitle"); |
bufcat_style(h, "text-align", "right"); |
if (NULL == h->style) { |
bufcat_style(h, "width", "10%"); |
PAIR_INIT(&tag[1], ATTR_ALIGN, "right"); |
PAIR_STYLE_INIT(&tag[0], h); |
print_otag(h, TAG_TD, 2, tag); |
print_otag(h, TAG_TD, 1, tag); |
} else |
|
print_otag(h, TAG_TD, 1, tag); |
|
|
print_text(h, title); |
print_text(h, title); |
print_tagq(h, t); |
print_tagq(h, t); |
return(1); |
return(1); |
Line 556 mdoc_root_pre(MDOC_ARGS) |
|
Line 567 mdoc_root_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_sh_pre(MDOC_ARGS) |
mdoc_sh_pre(MDOC_ARGS) |
{ |
{ |
struct htmlpair tag[2]; |
struct htmlpair tag; |
const struct mdoc_node *nn; |
char buf[BUFSIZ]; |
char buf[BUFSIZ]; |
|
struct roffsu su; |
|
|
|
if (MDOC_BODY == n->type) { |
if (MDOC_BLOCK == n->type) { |
SCALE_HS_INIT(&su, INDENT); |
PAIR_CLASS_INIT(&tag, "section"); |
bufcat_su(h, "margin-left", &su); |
print_otag(h, TAG_DIV, 1, &tag); |
PAIR_CLASS_INIT(&tag[0], "sec-body"); |
|
PAIR_STYLE_INIT(&tag[1], h); |
|
print_otag(h, TAG_DIV, 2, tag); |
|
return(1); |
return(1); |
} else if (MDOC_BLOCK == n->type) { |
} else if (MDOC_BODY == n->type) |
PAIR_CLASS_INIT(&tag[0], "sec-block"); |
|
if (n->prev && NULL == n->prev->body->child) { |
|
print_otag(h, TAG_DIV, 1, tag); |
|
return(1); |
|
} |
|
|
|
SCALE_VS_INIT(&su, 1); |
|
bufcat_su(h, "margin-top", &su); |
|
if (NULL == n->next) |
|
bufcat_su(h, "margin-bottom", &su); |
|
|
|
PAIR_STYLE_INIT(&tag[1], h); |
|
print_otag(h, TAG_DIV, 2, tag); |
|
return(1); |
return(1); |
} |
|
|
|
buf[0] = '\0'; |
buf[0] = '\0'; |
for (nn = n->child; nn; nn = nn->next) { |
for (n = n->child; n; n = n->next) { |
html_idcat(buf, nn->string, BUFSIZ); |
html_idcat(buf, n->string, BUFSIZ); |
if (nn->next) |
if (n->next) |
html_idcat(buf, " ", BUFSIZ); |
html_idcat(buf, " ", BUFSIZ); |
} |
} |
|
|
PAIR_CLASS_INIT(&tag[0], "sec-head"); |
PAIR_ID_INIT(&tag, buf); |
PAIR_ID_INIT(&tag[1], buf); |
print_otag(h, TAG_H1, 1, &tag); |
|
|
print_otag(h, TAG_DIV, 2, tag); |
|
return(1); |
return(1); |
} |
} |
|
|
Line 604 mdoc_sh_pre(MDOC_ARGS) |
|
Line 594 mdoc_sh_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_ss_pre(MDOC_ARGS) |
mdoc_ss_pre(MDOC_ARGS) |
{ |
{ |
struct htmlpair tag[3]; |
struct htmlpair tag; |
const struct mdoc_node *nn; |
char buf[BUFSIZ]; |
char buf[BUFSIZ]; |
|
struct roffsu su; |
|
|
|
SCALE_VS_INIT(&su, 1); |
if (MDOC_BLOCK == n->type) { |
|
PAIR_CLASS_INIT(&tag, "subsection"); |
if (MDOC_BODY == n->type) { |
print_otag(h, TAG_DIV, 1, &tag); |
PAIR_CLASS_INIT(&tag[0], "ssec-body"); |
|
if (n->parent->next && n->child) { |
|
bufcat_su(h, "margin-bottom", &su); |
|
PAIR_STYLE_INIT(&tag[1], h); |
|
print_otag(h, TAG_DIV, 2, tag); |
|
} else |
|
print_otag(h, TAG_DIV, 1, tag); |
|
return(1); |
return(1); |
} else if (MDOC_BLOCK == n->type) { |
} else if (MDOC_BODY == n->type) |
PAIR_CLASS_INIT(&tag[0], "ssec-block"); |
|
if (n->prev) { |
|
bufcat_su(h, "margin-top", &su); |
|
PAIR_STYLE_INIT(&tag[1], h); |
|
print_otag(h, TAG_DIV, 2, tag); |
|
} else |
|
print_otag(h, TAG_DIV, 1, tag); |
|
return(1); |
return(1); |
} |
|
|
|
/* TODO: see note in mdoc_sh_pre() about duplicates. */ |
|
|
|
buf[0] = '\0'; |
buf[0] = '\0'; |
for (nn = n->child; nn; nn = nn->next) { |
for (n = n->child; n; n = n->next) { |
html_idcat(buf, nn->string, BUFSIZ); |
html_idcat(buf, n->string, BUFSIZ); |
if (nn->next) |
if (n->next) |
html_idcat(buf, " ", BUFSIZ); |
html_idcat(buf, " ", BUFSIZ); |
} |
} |
|
|
SCALE_HS_INIT(&su, INDENT - HALFINDENT); |
PAIR_ID_INIT(&tag, buf); |
su.scale = -su.scale; |
print_otag(h, TAG_H2, 1, &tag); |
bufcat_su(h, "margin-left", &su); |
|
|
|
PAIR_CLASS_INIT(&tag[0], "ssec-head"); |
|
PAIR_STYLE_INIT(&tag[1], h); |
|
PAIR_ID_INIT(&tag[2], buf); |
|
|
|
print_otag(h, TAG_DIV, 3, tag); |
|
return(1); |
return(1); |
} |
} |
|
|
Line 660 mdoc_fl_pre(MDOC_ARGS) |
|
Line 624 mdoc_fl_pre(MDOC_ARGS) |
|
struct htmlpair tag; |
struct htmlpair tag; |
|
|
PAIR_CLASS_INIT(&tag, "flag"); |
PAIR_CLASS_INIT(&tag, "flag"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_B, 1, &tag); |
|
|
/* `Cm' has no leading hyphen. */ |
/* `Cm' has no leading hyphen. */ |
|
|
Line 690 mdoc_nd_pre(MDOC_ARGS) |
|
Line 654 mdoc_nd_pre(MDOC_ARGS) |
|
/* XXX: this tag in theory can contain block elements. */ |
/* XXX: this tag in theory can contain block elements. */ |
|
|
print_text(h, "\\(em"); |
print_text(h, "\\(em"); |
PAIR_CLASS_INIT(&tag, "desc-body"); |
PAIR_CLASS_INIT(&tag, "desc"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
return(1); |
return(1); |
} |
} |
Line 701 mdoc_nm_pre(MDOC_ARGS) |
|
Line 665 mdoc_nm_pre(MDOC_ARGS) |
|
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
struct roffsu su; |
struct roffsu su; |
const char *cp; |
size_t len; |
|
|
/* |
switch (n->type) { |
* Accomodate for `Nm' being both an element (which may have |
case (MDOC_ELEM): |
* NULL children AND no m->name) and a block. |
|
*/ |
|
|
|
cp = NULL; |
|
|
|
if (MDOC_ELEM == n->type) { |
|
if (NULL == n->child && NULL == m->name) |
|
return(1); |
|
synopsis_pre(h, n); |
synopsis_pre(h, n); |
PAIR_CLASS_INIT(&tag, "name"); |
PAIR_CLASS_INIT(&tag, "name"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_B, 1, &tag); |
if (NULL == n->child) |
if (NULL == n->child && m->name) |
print_text(h, m->name); |
print_text(h, m->name); |
} else if (MDOC_BLOCK == n->type) { |
return(1); |
synopsis_pre(h, n); |
case (MDOC_HEAD): |
|
print_otag(h, TAG_TD, 0, NULL); |
|
if (NULL == n->child && m->name) |
|
print_text(h, m->name); |
|
return(1); |
|
case (MDOC_BODY): |
|
print_otag(h, TAG_TD, 0, NULL); |
|
return(1); |
|
default: |
|
break; |
|
} |
|
|
bufcat_style(h, "clear", "both"); |
synopsis_pre(h, n); |
if (n->head->child || m->name) { |
PAIR_CLASS_INIT(&tag, "synopsis"); |
if (n->head->child && MDOC_TEXT == |
print_otag(h, TAG_TABLE, 1, &tag); |
n->head->child->type) |
|
cp = n->head->child->string; |
|
if (NULL == cp || '\0' == *cp) |
|
cp = m->name; |
|
|
|
SCALE_HS_INIT(&su, (double)strlen(cp)); |
for (len = 0, n = n->child; n; n = n->next) |
bufcat_su(h, "padding-left", &su); |
if (MDOC_TEXT == n->type) |
} |
len += strlen(n->string); |
|
|
PAIR_STYLE_INIT(&tag, h); |
if (0 == len && m->name) |
print_otag(h, TAG_DIV, 1, &tag); |
len = strlen(m->name); |
} else if (MDOC_HEAD == n->type) { |
|
if (NULL == n->child && NULL == m->name) |
|
return(1); |
|
|
|
if (n->child && MDOC_TEXT == n->child->type) |
SCALE_HS_INIT(&su, (double)len); |
cp = n->child->string; |
bufcat_su(h, "width", &su); |
if (NULL == cp || '\0' == *cp) |
PAIR_STYLE_INIT(&tag, h); |
cp = m->name; |
print_otag(h, TAG_COL, 1, &tag); |
|
print_otag(h, TAG_COL, 0, NULL); |
SCALE_HS_INIT(&su, (double)strlen(cp)); |
print_otag(h, TAG_TBODY, 0, NULL); |
|
print_otag(h, TAG_TR, 0, NULL); |
bufcat_style(h, "float", "left"); |
|
bufcat_su(h, "min-width", &su); |
|
SCALE_INVERT(&su); |
|
bufcat_su(h, "margin-left", &su); |
|
|
|
PAIR_STYLE_INIT(&tag, h); |
|
print_otag(h, TAG_DIV, 1, &tag); |
|
|
|
if (NULL == n->child) |
|
print_text(h, m->name); |
|
} else if (MDOC_BODY == n->type) { |
|
SCALE_HS_INIT(&su, 2); |
|
bufcat_su(h, "margin-left", &su); |
|
PAIR_STYLE_INIT(&tag, h); |
|
print_otag(h, TAG_DIV, 1, &tag); |
|
} |
|
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 902 mdoc_it_pre(MDOC_ARGS) |
|
Line 844 mdoc_it_pre(MDOC_ARGS) |
|
assert(lists[type]); |
assert(lists[type]); |
PAIR_CLASS_INIT(&tag[0], lists[type]); |
PAIR_CLASS_INIT(&tag[0], lists[type]); |
|
|
SCALE_VS_INIT(&su, ! bl->data.Bl->comp); |
|
bufcat_su(h, "margin-top", &su); |
|
PAIR_STYLE_INIT(&tag[1], h); |
|
|
|
if (MDOC_HEAD == n->type) { |
if (MDOC_HEAD == n->type) { |
switch (type) { |
switch (type) { |
case(LIST_bullet): |
case(LIST_bullet): |
Line 919 mdoc_it_pre(MDOC_ARGS) |
|
Line 857 mdoc_it_pre(MDOC_ARGS) |
|
case(LIST_enum): |
case(LIST_enum): |
return(0); |
return(0); |
case(LIST_diag): |
case(LIST_diag): |
|
/* FIXME: STYLE for diag! */ |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(LIST_hang): |
case(LIST_hang): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 927 mdoc_it_pre(MDOC_ARGS) |
|
Line 866 mdoc_it_pre(MDOC_ARGS) |
|
case(LIST_ohang): |
case(LIST_ohang): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(LIST_tag): |
case(LIST_tag): |
|
SCALE_VS_INIT(&su, ! bl->data.Bl->comp); |
|
bufcat_su(h, "margin-top", &su); |
|
PAIR_STYLE_INIT(&tag[1], h); |
print_otag(h, TAG_DT, 2, tag); |
print_otag(h, TAG_DT, 2, tag); |
break; |
break; |
case(LIST_column): |
case(LIST_column): |
Line 945 mdoc_it_pre(MDOC_ARGS) |
|
Line 887 mdoc_it_pre(MDOC_ARGS) |
|
case(LIST_enum): |
case(LIST_enum): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(LIST_item): |
case(LIST_item): |
/* FALLTHROUGH */ |
SCALE_VS_INIT(&su, ! bl->data.Bl->comp); |
|
bufcat_su(h, "margin-top", &su); |
|
PAIR_STYLE_INIT(&tag[1], h); |
print_otag(h, TAG_LI, 2, tag); |
print_otag(h, TAG_LI, 2, tag); |
break; |
break; |
case(LIST_diag): |
case(LIST_diag): |
Line 957 mdoc_it_pre(MDOC_ARGS) |
|
Line 901 mdoc_it_pre(MDOC_ARGS) |
|
case(LIST_ohang): |
case(LIST_ohang): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(LIST_tag): |
case(LIST_tag): |
print_otag(h, TAG_DD, 1, tag); |
if (NULL == bl->data.Bl->width) { |
|
print_otag(h, TAG_DD, 1, tag); |
|
break; |
|
} |
|
a2width(bl->data.Bl->width, &su); |
|
bufcat_su(h, "margin-left", &su); |
|
PAIR_STYLE_INIT(&tag[1], h); |
|
print_otag(h, TAG_DD, 2, tag); |
break; |
break; |
case(LIST_column): |
case(LIST_column): |
|
SCALE_VS_INIT(&su, ! bl->data.Bl->comp); |
|
bufcat_su(h, "margin-top", &su); |
|
PAIR_STYLE_INIT(&tag[1], h); |
print_otag(h, TAG_TD, 2, tag); |
print_otag(h, TAG_TD, 2, tag); |
break; |
break; |
default: |
default: |
Line 1023 mdoc_bl_pre(MDOC_ARGS) |
|
Line 977 mdoc_bl_pre(MDOC_ARGS) |
|
PAIR_STYLE_INIT(&tag[0], h); |
PAIR_STYLE_INIT(&tag[0], h); |
|
|
assert(lists[n->data.Bl->type]); |
assert(lists[n->data.Bl->type]); |
PAIR_CLASS_INIT(&tag[1], lists[n->data.Bl->type]); |
bufinit(h); |
|
bufcat(h, "list "); |
|
bufcat(h, lists[n->data.Bl->type]); |
|
PAIR_INIT(&tag[1], ATTR_CLASS, h->buf); |
i = 2; |
i = 2; |
|
|
/* Set the block's left-hand margin. */ |
/* Set the block's left-hand margin. */ |
Line 1078 mdoc_ex_pre(MDOC_ARGS) |
|
Line 1035 mdoc_ex_pre(MDOC_ARGS) |
|
struct tag *t; |
struct tag *t; |
struct htmlpair tag; |
struct htmlpair tag; |
|
|
|
if (n->prev) |
|
print_otag(h, TAG_BR, 0, NULL); |
|
|
PAIR_CLASS_INIT(&tag, "utility"); |
PAIR_CLASS_INIT(&tag, "utility"); |
|
|
print_text(h, "The"); |
print_text(h, "The"); |
for (nn = n->child; nn; nn = nn->next) { |
for (nn = n->child; nn; nn = nn->next) { |
t = print_otag(h, TAG_SPAN, 1, &tag); |
t = print_otag(h, TAG_B, 1, &tag); |
print_text(h, nn->string); |
print_text(h, nn->string); |
print_tagq(h, t); |
print_tagq(h, t); |
|
|
Line 1132 mdoc_d1_pre(MDOC_ARGS) |
|
Line 1092 mdoc_d1_pre(MDOC_ARGS) |
|
bufcat_su(h, "margin-top", &su); |
bufcat_su(h, "margin-top", &su); |
bufcat_su(h, "margin-bottom", &su); |
bufcat_su(h, "margin-bottom", &su); |
PAIR_STYLE_INIT(&tag[0], h); |
PAIR_STYLE_INIT(&tag[0], h); |
|
print_otag(h, TAG_BLOCKQUOTE, 1, tag); |
|
|
if (MDOC_Dl == n->tok) { |
/* BLOCKQUOTE needs a block body. */ |
PAIR_CLASS_INIT(&tag[1], "lit"); |
|
print_otag(h, TAG_BLOCKQUOTE, 2, tag); |
|
} else |
|
print_otag(h, TAG_BLOCKQUOTE, 1, tag); |
|
|
|
|
if (MDOC_Dl == n->tok) |
|
PAIR_CLASS_INIT(&tag[0], "lit display"); |
|
else |
|
PAIR_CLASS_INIT(&tag[0], "display"); |
|
|
|
print_otag(h, TAG_DIV, 1, tag); |
return(1); |
return(1); |
} |
} |
|
|
Line 1178 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1141 mdoc_bd_pre(MDOC_ARGS) |
|
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
return(0); |
return(0); |
|
|
SCALE_VS_INIT(&su, 0); |
|
|
|
assert(n->data.Bd); |
|
if (n->data.Bd->offs) |
|
a2offs(n->data.Bd->offs, &su); |
|
|
|
comp = n->data.Bd->comp; |
|
|
|
/* FIXME: -centered, etc. formatting. */ |
|
/* FIXME: does not respect -offset ??? */ |
|
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
bufcat_su(h, "margin-left", &su); |
comp = n->data.Bd->comp; |
for (nn = n; nn && ! comp; nn = nn->parent) { |
for (nn = n; nn && ! comp; nn = nn->parent) { |
if (MDOC_BLOCK != nn->type) |
if (MDOC_BLOCK != nn->type) |
continue; |
continue; |
Line 1199 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1151 mdoc_bd_pre(MDOC_ARGS) |
|
if (nn->prev) |
if (nn->prev) |
break; |
break; |
} |
} |
if (comp) { |
if ( ! comp) |
PAIR_STYLE_INIT(&tag[0], h); |
print_otag(h, TAG_P, 0, NULL); |
print_otag(h, TAG_DIV, 1, tag); |
|
return(1); |
|
} |
|
SCALE_VS_INIT(&su, 1); |
|
bufcat_su(h, "margin-top", &su); |
|
PAIR_STYLE_INIT(&tag[0], h); |
|
print_otag(h, TAG_DIV, 1, tag); |
|
return(1); |
return(1); |
} |
} |
|
|
|
SCALE_HS_INIT(&su, 0); |
|
if (n->data.Bd->offs) |
|
a2offs(n->data.Bd->offs, &su); |
|
|
|
bufcat_su(h, "margin-left", &su); |
|
PAIR_STYLE_INIT(&tag[0], h); |
|
|
if (DISP_unfilled != n->data.Bd->type && |
if (DISP_unfilled != n->data.Bd->type && |
DISP_literal != n->data.Bd->type) |
DISP_literal != n->data.Bd->type) { |
|
PAIR_CLASS_INIT(&tag[1], "display"); |
|
print_otag(h, TAG_DIV, 2, tag); |
return(1); |
return(1); |
|
} |
|
|
PAIR_CLASS_INIT(&tag[0], "lit"); |
PAIR_CLASS_INIT(&tag[1], "lit display"); |
bufcat_style(h, "white-space", "pre"); |
print_otag(h, TAG_PRE, 2, tag); |
PAIR_STYLE_INIT(&tag[1], h); |
|
print_otag(h, TAG_DIV, 2, tag); |
|
|
|
for (nn = n->child; nn; nn = nn->next) { |
for (nn = n->child; nn; nn = nn->next) { |
print_mdoc_node(m, nn, h); |
print_mdoc_node(m, nn, h); |
Line 1250 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1203 mdoc_bd_pre(MDOC_ARGS) |
|
} |
} |
if (nn->next && nn->next->line == nn->line) |
if (nn->next && nn->next->line == nn->line) |
continue; |
continue; |
print_text(h, "\n"); |
else if (nn->next) |
|
print_text(h, "\n"); |
|
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
} |
} |
|
|
Line 1304 mdoc_cd_pre(MDOC_ARGS) |
|
Line 1259 mdoc_cd_pre(MDOC_ARGS) |
|
|
|
synopsis_pre(h, n); |
synopsis_pre(h, n); |
PAIR_CLASS_INIT(&tag, "config"); |
PAIR_CLASS_INIT(&tag, "config"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_B, 1, &tag); |
return(1); |
return(1); |
} |
} |
|
|
Line 1383 mdoc_fd_pre(MDOC_ARGS) |
|
Line 1338 mdoc_fd_pre(MDOC_ARGS) |
|
synopsis_pre(h, n); |
synopsis_pre(h, n); |
|
|
PAIR_CLASS_INIT(&tag, "macro"); |
PAIR_CLASS_INIT(&tag, "macro"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_B, 1, &tag); |
return(1); |
return(1); |
} |
} |
|
|
Line 1472 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1427 mdoc_fn_pre(MDOC_ARGS) |
|
} |
} |
#endif |
#endif |
|
|
t = print_otag(h, TAG_SPAN, 1, tag); |
t = print_otag(h, TAG_B, 1, tag); |
|
|
if (sp) { |
if (sp) { |
strlcpy(nbuf, sp, BUFSIZ); |
strlcpy(nbuf, sp, BUFSIZ); |
Line 1533 mdoc_sm_pre(MDOC_ARGS) |
|
Line 1488 mdoc_sm_pre(MDOC_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
|
/* ARGSUSED */ |
|
static int |
|
mdoc_pp_pre(MDOC_ARGS) |
|
{ |
|
|
|
print_otag(h, TAG_P, 0, NULL); |
|
return(0); |
|
|
|
} |
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
mdoc_sp_pre(MDOC_ARGS) |
mdoc_sp_pre(MDOC_ARGS) |
{ |
{ |
int len; |
|
struct htmlpair tag; |
|
struct roffsu su; |
struct roffsu su; |
|
struct htmlpair tag; |
|
|
switch (n->tok) { |
SCALE_VS_INIT(&su, 1); |
case (MDOC_sp): |
|
/* FIXME: can this have a scaling indicator? */ |
|
len = n->child ? atoi(n->child->string) : 1; |
|
break; |
|
case (MDOC_br): |
|
len = 0; |
|
break; |
|
default: |
|
assert(n->parent); |
|
if ((NULL == n->next || NULL == n->prev) && |
|
(MDOC_Ss == n->parent->tok || |
|
MDOC_Sh == n->parent->tok)) |
|
return(0); |
|
len = 1; |
|
break; |
|
} |
|
|
|
SCALE_VS_INIT(&su, len); |
if (MDOC_sp == n->tok) { |
|
if (n->child) |
|
a2roffsu(n->child->string, &su, SCALE_VS); |
|
} else |
|
su.scale = 0; |
|
|
bufcat_su(h, "height", &su); |
bufcat_su(h, "height", &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); |
|
|
/* So the div isn't empty: */ |
/* So the div isn't empty: */ |
print_text(h, "\\~"); |
print_text(h, "\\~"); |
|
|
Line 1571 mdoc_sp_pre(MDOC_ARGS) |
|
Line 1524 mdoc_sp_pre(MDOC_ARGS) |
|
|
|
} |
} |
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
mdoc_lk_pre(MDOC_ARGS) |
mdoc_lk_pre(MDOC_ARGS) |
Line 1673 mdoc_in_pre(MDOC_ARGS) |
|
Line 1625 mdoc_in_pre(MDOC_ARGS) |
|
synopsis_pre(h, n); |
synopsis_pre(h, n); |
|
|
PAIR_CLASS_INIT(&tag[0], "includes"); |
PAIR_CLASS_INIT(&tag[0], "includes"); |
print_otag(h, TAG_SPAN, 1, tag); |
print_otag(h, TAG_B, 1, tag); |
|
|
if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags) |
if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags) |
print_text(h, "#include"); |
print_text(h, "#include"); |
Line 1709 mdoc_ic_pre(MDOC_ARGS) |
|
Line 1661 mdoc_ic_pre(MDOC_ARGS) |
|
struct htmlpair tag; |
struct htmlpair tag; |
|
|
PAIR_CLASS_INIT(&tag, "cmd"); |
PAIR_CLASS_INIT(&tag, "cmd"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_B, 1, &tag); |
return(1); |
return(1); |
} |
} |
|
|
Line 1722 mdoc_rv_pre(MDOC_ARGS) |
|
Line 1674 mdoc_rv_pre(MDOC_ARGS) |
|
struct htmlpair tag; |
struct htmlpair tag; |
struct tag *t; |
struct tag *t; |
|
|
print_otag(h, TAG_DIV, 0, NULL); |
if (n->prev) |
|
print_otag(h, TAG_BR, 0, NULL); |
|
|
print_text(h, "The"); |
print_text(h, "The"); |
|
|
for (nn = n->child; nn; nn = nn->next) { |
for (nn = n->child; nn; nn = nn->next) { |
Line 1749 mdoc_rv_pre(MDOC_ARGS) |
|
Line 1703 mdoc_rv_pre(MDOC_ARGS) |
|
"-1 is returned and the global variable"); |
"-1 is returned and the global variable"); |
|
|
PAIR_CLASS_INIT(&tag, "var"); |
PAIR_CLASS_INIT(&tag, "var"); |
t = print_otag(h, TAG_SPAN, 1, &tag); |
t = print_otag(h, TAG_B, 1, &tag); |
print_text(h, "errno"); |
print_text(h, "errno"); |
print_tagq(h, t); |
print_tagq(h, t); |
print_text(h, "is set to indicate the error."); |
print_text(h, "is set to indicate the error."); |
Line 1764 mdoc_va_pre(MDOC_ARGS) |
|
Line 1718 mdoc_va_pre(MDOC_ARGS) |
|
struct htmlpair tag; |
struct htmlpair tag; |
|
|
PAIR_CLASS_INIT(&tag, "var"); |
PAIR_CLASS_INIT(&tag, "var"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_B, 1, &tag); |
return(1); |
return(1); |
} |
} |
|
|
Line 1858 mdoc_rs_pre(MDOC_ARGS) |
|
Line 1812 mdoc_rs_pre(MDOC_ARGS) |
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
|
|
if (n->prev && SEC_SEE_ALSO == n->sec) { |
if (n->prev && SEC_SEE_ALSO == n->sec) |
print_otag(h, TAG_BR, 0, NULL); |
print_otag(h, TAG_P, 0, NULL); |
print_otag(h, TAG_BR, 0, NULL); |
|
} |
|
|
|
PAIR_CLASS_INIT(&tag, "ref"); |
PAIR_CLASS_INIT(&tag, "ref"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
Line 1920 mdoc_lb_pre(MDOC_ARGS) |
|
Line 1872 mdoc_lb_pre(MDOC_ARGS) |
|
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
|
|
if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags) |
if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags && n->prev) |
print_otag(h, TAG_DIV, 0, NULL); |
print_otag(h, TAG_BR, 0, NULL); |
|
|
PAIR_CLASS_INIT(&tag, "lib"); |
PAIR_CLASS_INIT(&tag, "lib"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
return(1); |
return(1); |
Line 2027 mdoc_bk_pre(MDOC_ARGS) |
|
Line 1980 mdoc_bk_pre(MDOC_ARGS) |
|
case (MDOC_HEAD): |
case (MDOC_HEAD): |
return(0); |
return(0); |
case (MDOC_BODY): |
case (MDOC_BODY): |
h->flags |= HTML_PREKEEP; |
if (n->parent->args || 0 == n->prev->nchild) |
|
h->flags |= HTML_PREKEEP; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |