version 1.132, 2010/12/20 10:40:11 |
version 1.141, 2011/01/04 10:29:41 |
Line 422 print_mdoc_node(MDOC_ARGS) |
|
Line 422 print_mdoc_node(MDOC_ARGS) |
|
case (MDOC_TEXT): |
case (MDOC_TEXT): |
print_text(h, n->string); |
print_text(h, n->string); |
return; |
return; |
|
case (MDOC_TBL): |
|
print_tbl(h, n->span); |
|
break; |
default: |
default: |
if (mdocs[n->tok].pre && ENDBODY_NOT == n->end) |
if (mdocs[n->tok].pre && ENDBODY_NOT == n->end) |
child = (*mdocs[n->tok].pre)(m, n, h); |
child = (*mdocs[n->tok].pre)(m, n, h); |
Line 450 print_mdoc_node(MDOC_ARGS) |
|
Line 453 print_mdoc_node(MDOC_ARGS) |
|
case (MDOC_ROOT): |
case (MDOC_ROOT): |
mdoc_root_post(m, n, h); |
mdoc_root_post(m, n, h); |
break; |
break; |
|
case (MDOC_TBL): |
|
break; |
default: |
default: |
if (mdocs[n->tok].post && ENDBODY_NOT == n->end) |
if (mdocs[n->tok].post && ENDBODY_NOT == n->end) |
(*mdocs[n->tok].post)(m, n, h); |
(*mdocs[n->tok].post)(m, n, h); |
Line 470 mdoc_root_post(MDOC_ARGS) |
|
Line 475 mdoc_root_post(MDOC_ARGS) |
|
PAIR_SUMMARY_INIT(&tag[0], "Document Footer"); |
PAIR_SUMMARY_INIT(&tag[0], "Document Footer"); |
PAIR_CLASS_INIT(&tag[1], "foot"); |
PAIR_CLASS_INIT(&tag[1], "foot"); |
if (NULL == h->style) { |
if (NULL == h->style) { |
PAIR_INIT(&tag[1], ATTR_WIDTH, "100%"); |
PAIR_INIT(&tag[2], ATTR_WIDTH, "100%"); |
t = print_otag(h, TAG_TABLE, 3, tag); |
t = print_otag(h, TAG_TABLE, 3, tag); |
PAIR_INIT(&tag[0], ATTR_WIDTH, "50%"); |
PAIR_INIT(&tag[0], ATTR_WIDTH, "50%"); |
print_otag(h, TAG_COL, 1, tag); |
print_otag(h, TAG_COL, 1, tag); |
Line 763 mdoc_ar_pre(MDOC_ARGS) |
|
Line 768 mdoc_ar_pre(MDOC_ARGS) |
|
struct htmlpair tag; |
struct htmlpair tag; |
|
|
PAIR_CLASS_INIT(&tag, "arg"); |
PAIR_CLASS_INIT(&tag, "arg"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_I, 1, &tag); |
return(1); |
return(1); |
} |
} |
|
|
Line 839 mdoc_it_pre(MDOC_ARGS) |
|
Line 844 mdoc_it_pre(MDOC_ARGS) |
|
|
|
assert(bl); |
assert(bl); |
|
|
type = bl->data.Bl->type; |
type = bl->norm->Bl.type; |
|
|
assert(lists[type]); |
assert(lists[type]); |
PAIR_CLASS_INIT(&tag[0], lists[type]); |
PAIR_CLASS_INIT(&tag[0], lists[type]); |
Line 857 mdoc_it_pre(MDOC_ARGS) |
|
Line 862 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 866 mdoc_it_pre(MDOC_ARGS) |
|
Line 870 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); |
SCALE_VS_INIT(&su, ! bl->norm->Bl.comp); |
bufcat_su(h, "margin-top", &su); |
bufcat_su(h, "margin-top", &su); |
PAIR_STYLE_INIT(&tag[1], h); |
PAIR_STYLE_INIT(&tag[1], h); |
print_otag(h, TAG_DT, 2, tag); |
print_otag(h, TAG_DT, 2, tag); |
|
if (LIST_diag != type) |
|
break; |
|
PAIR_CLASS_INIT(&tag[0], "diag"); |
|
print_otag(h, TAG_B, 1, tag); |
break; |
break; |
case(LIST_column): |
case(LIST_column): |
break; |
break; |
Line 887 mdoc_it_pre(MDOC_ARGS) |
|
Line 895 mdoc_it_pre(MDOC_ARGS) |
|
case(LIST_enum): |
case(LIST_enum): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(LIST_item): |
case(LIST_item): |
SCALE_VS_INIT(&su, ! bl->data.Bl->comp); |
SCALE_VS_INIT(&su, ! bl->norm->Bl.comp); |
bufcat_su(h, "margin-top", &su); |
bufcat_su(h, "margin-top", &su); |
PAIR_STYLE_INIT(&tag[1], h); |
PAIR_STYLE_INIT(&tag[1], h); |
print_otag(h, TAG_LI, 2, tag); |
print_otag(h, TAG_LI, 2, tag); |
Line 901 mdoc_it_pre(MDOC_ARGS) |
|
Line 909 mdoc_it_pre(MDOC_ARGS) |
|
case(LIST_ohang): |
case(LIST_ohang): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(LIST_tag): |
case(LIST_tag): |
if (NULL == bl->data.Bl->width) { |
if (NULL == bl->norm->Bl.width) { |
print_otag(h, TAG_DD, 1, tag); |
print_otag(h, TAG_DD, 1, tag); |
break; |
break; |
} |
} |
a2width(bl->data.Bl->width, &su); |
a2width(bl->norm->Bl.width, &su); |
bufcat_su(h, "margin-left", &su); |
bufcat_su(h, "margin-left", &su); |
PAIR_STYLE_INIT(&tag[1], h); |
PAIR_STYLE_INIT(&tag[1], h); |
print_otag(h, TAG_DD, 2, tag); |
print_otag(h, TAG_DD, 2, tag); |
break; |
break; |
case(LIST_column): |
case(LIST_column): |
SCALE_VS_INIT(&su, ! bl->data.Bl->comp); |
SCALE_VS_INIT(&su, ! bl->norm->Bl.comp); |
bufcat_su(h, "margin-top", &su); |
bufcat_su(h, "margin-top", &su); |
PAIR_STYLE_INIT(&tag[1], h); |
PAIR_STYLE_INIT(&tag[1], h); |
print_otag(h, TAG_TD, 2, tag); |
print_otag(h, TAG_TD, 2, tag); |
Line 939 mdoc_bl_pre(MDOC_ARGS) |
|
Line 947 mdoc_bl_pre(MDOC_ARGS) |
|
size_t i; |
size_t i; |
struct htmlpair tag[3]; |
struct htmlpair tag[3]; |
struct roffsu su; |
struct roffsu su; |
|
char buf[BUFSIZ]; |
|
|
if (MDOC_BODY == n->type) { |
if (MDOC_BODY == n->type) { |
if (LIST_column == n->data.Bl->type) |
if (LIST_column == n->norm->Bl.type) |
print_otag(h, TAG_TBODY, 0, NULL); |
print_otag(h, TAG_TBODY, 0, NULL); |
return(1); |
return(1); |
} |
} |
|
|
if (MDOC_HEAD == n->type) { |
if (MDOC_HEAD == n->type) { |
if (LIST_column != n->data.Bl->type) |
if (LIST_column != n->norm->Bl.type) |
return(0); |
return(0); |
|
|
/* |
/* |
Line 957 mdoc_bl_pre(MDOC_ARGS) |
|
Line 966 mdoc_bl_pre(MDOC_ARGS) |
|
* screen and we want to preserve that behaviour. |
* screen and we want to preserve that behaviour. |
*/ |
*/ |
|
|
for (i = 0; i < n->data.Bl->ncols; i++) { |
for (i = 0; i < n->norm->Bl.ncols; i++) { |
a2width(n->data.Bl->cols[i], &su); |
a2width(n->norm->Bl.cols[i], &su); |
bufinit(h); |
bufinit(h); |
if (i < n->data.Bl->ncols - 1) |
if (i < n->norm->Bl.ncols - 1) |
bufcat_su(h, "width", &su); |
bufcat_su(h, "width", &su); |
else |
else |
bufcat_su(h, "min-width", &su); |
bufcat_su(h, "min-width", &su); |
Line 976 mdoc_bl_pre(MDOC_ARGS) |
|
Line 985 mdoc_bl_pre(MDOC_ARGS) |
|
bufcat_su(h, "margin-bottom", &su); |
bufcat_su(h, "margin-bottom", &su); |
PAIR_STYLE_INIT(&tag[0], h); |
PAIR_STYLE_INIT(&tag[0], h); |
|
|
assert(lists[n->data.Bl->type]); |
assert(lists[n->norm->Bl.type]); |
bufinit(h); |
strlcpy(buf, "list ", BUFSIZ); |
bufcat(h, "list "); |
strlcat(buf, lists[n->norm->Bl.type], BUFSIZ); |
bufcat(h, lists[n->data.Bl->type]); |
PAIR_INIT(&tag[1], ATTR_CLASS, buf); |
PAIR_INIT(&tag[1], ATTR_CLASS, h->buf); |
|
i = 2; |
|
|
|
/* Set the block's left-hand margin. */ |
/* Set the block's left-hand margin. */ |
|
|
if (n->data.Bl->offs) { |
if (n->norm->Bl.offs) { |
a2offs(n->data.Bl->offs, &su); |
a2offs(n->norm->Bl.offs, &su); |
bufcat_su(h, "margin-left", &su); |
bufcat_su(h, "margin-left", &su); |
PAIR_STYLE_INIT(&tag[2], h); |
|
i = 3; |
|
} |
} |
|
|
switch (n->data.Bl->type) { |
switch (n->norm->Bl.type) { |
case(LIST_bullet): |
case(LIST_bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(LIST_dash): |
case(LIST_dash): |
Line 1000 mdoc_bl_pre(MDOC_ARGS) |
|
Line 1005 mdoc_bl_pre(MDOC_ARGS) |
|
case(LIST_hyphen): |
case(LIST_hyphen): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(LIST_item): |
case(LIST_item): |
print_otag(h, TAG_UL, i, tag); |
print_otag(h, TAG_UL, 2, tag); |
break; |
break; |
case(LIST_enum): |
case(LIST_enum): |
print_otag(h, TAG_OL, i, tag); |
print_otag(h, TAG_OL, 2, tag); |
break; |
break; |
case(LIST_diag): |
case(LIST_diag): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1014 mdoc_bl_pre(MDOC_ARGS) |
|
Line 1019 mdoc_bl_pre(MDOC_ARGS) |
|
case(LIST_ohang): |
case(LIST_ohang): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(LIST_tag): |
case(LIST_tag): |
print_otag(h, TAG_DL, i, tag); |
print_otag(h, TAG_DL, 2, tag); |
break; |
break; |
case(LIST_column): |
case(LIST_column): |
print_otag(h, TAG_TABLE, i, tag); |
print_otag(h, TAG_TABLE, 2, tag); |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
Line 1096 mdoc_d1_pre(MDOC_ARGS) |
|
Line 1101 mdoc_d1_pre(MDOC_ARGS) |
|
|
|
/* BLOCKQUOTE needs a block body. */ |
/* BLOCKQUOTE needs a block body. */ |
|
|
if (MDOC_Dl == n->tok) |
PAIR_CLASS_INIT(&tag[0], "display"); |
PAIR_CLASS_INIT(&tag[0], "lit display"); |
|
else |
|
PAIR_CLASS_INIT(&tag[0], "display"); |
|
|
|
print_otag(h, TAG_DIV, 1, tag); |
print_otag(h, TAG_DIV, 1, tag); |
|
|
|
if (MDOC_Dl == n->tok) { |
|
PAIR_CLASS_INIT(&tag[0], "lit"); |
|
print_otag(h, TAG_CODE, 1, tag); |
|
} |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 1124 mdoc_sx_pre(MDOC_ARGS) |
|
Line 1131 mdoc_sx_pre(MDOC_ARGS) |
|
PAIR_CLASS_INIT(&tag[0], "link-sec"); |
PAIR_CLASS_INIT(&tag[0], "link-sec"); |
PAIR_HREF_INIT(&tag[1], buf); |
PAIR_HREF_INIT(&tag[1], buf); |
|
|
|
print_otag(h, TAG_I, 1, tag); |
print_otag(h, TAG_A, 2, tag); |
print_otag(h, TAG_A, 2, tag); |
return(1); |
return(1); |
} |
} |
Line 1142 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1150 mdoc_bd_pre(MDOC_ARGS) |
|
return(0); |
return(0); |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
comp = n->data.Bd->comp; |
comp = n->norm->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 1157 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1165 mdoc_bd_pre(MDOC_ARGS) |
|
} |
} |
|
|
SCALE_HS_INIT(&su, 0); |
SCALE_HS_INIT(&su, 0); |
if (n->data.Bd->offs) |
if (n->norm->Bd.offs) |
a2offs(n->data.Bd->offs, &su); |
a2offs(n->norm->Bd.offs, &su); |
|
|
bufcat_su(h, "margin-left", &su); |
bufcat_su(h, "margin-left", &su); |
PAIR_STYLE_INIT(&tag[0], h); |
PAIR_STYLE_INIT(&tag[0], h); |
|
|
if (DISP_unfilled != n->data.Bd->type && |
if (DISP_unfilled != n->norm->Bd.type && |
DISP_literal != n->data.Bd->type) { |
DISP_literal != n->norm->Bd.type) { |
PAIR_CLASS_INIT(&tag[1], "display"); |
PAIR_CLASS_INIT(&tag[1], "display"); |
print_otag(h, TAG_DIV, 2, tag); |
print_otag(h, TAG_DIV, 2, tag); |
return(1); |
return(1); |
Line 1220 mdoc_pa_pre(MDOC_ARGS) |
|
Line 1228 mdoc_pa_pre(MDOC_ARGS) |
|
struct htmlpair tag; |
struct htmlpair tag; |
|
|
PAIR_CLASS_INIT(&tag, "file"); |
PAIR_CLASS_INIT(&tag, "file"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_I, 1, &tag); |
return(1); |
return(1); |
} |
} |
|
|
Line 1232 mdoc_ad_pre(MDOC_ARGS) |
|
Line 1240 mdoc_ad_pre(MDOC_ARGS) |
|
struct htmlpair tag; |
struct htmlpair tag; |
|
|
PAIR_CLASS_INIT(&tag, "addr"); |
PAIR_CLASS_INIT(&tag, "addr"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_I, 1, &tag); |
return(1); |
return(1); |
} |
} |
|
|
Line 1310 mdoc_fa_pre(MDOC_ARGS) |
|
Line 1318 mdoc_fa_pre(MDOC_ARGS) |
|
|
|
PAIR_CLASS_INIT(&tag, "farg"); |
PAIR_CLASS_INIT(&tag, "farg"); |
if (n->parent->tok != MDOC_Fo) { |
if (n->parent->tok != MDOC_Fo) { |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_I, 1, &tag); |
return(1); |
return(1); |
} |
} |
|
|
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_I, 1, &tag); |
print_text(h, nn->string); |
print_text(h, nn->string); |
print_tagq(h, t); |
print_tagq(h, t); |
if (nn->next) |
if (nn->next) |
Line 1371 mdoc_ft_pre(MDOC_ARGS) |
|
Line 1379 mdoc_ft_pre(MDOC_ARGS) |
|
|
|
synopsis_pre(h, n); |
synopsis_pre(h, n); |
PAIR_CLASS_INIT(&tag, "ftype"); |
PAIR_CLASS_INIT(&tag, "ftype"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_I, 1, &tag); |
return(1); |
return(1); |
} |
} |
|
|
Line 1396 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1404 mdoc_fn_pre(MDOC_ARGS) |
|
ep = strchr(sp, ' '); |
ep = strchr(sp, ' '); |
if (NULL != ep) { |
if (NULL != ep) { |
PAIR_CLASS_INIT(&tag[0], "ftype"); |
PAIR_CLASS_INIT(&tag[0], "ftype"); |
t = print_otag(h, TAG_SPAN, 1, tag); |
t = print_otag(h, TAG_I, 1, tag); |
|
|
while (ep) { |
while (ep) { |
sz = MIN((int)(ep - sp), BUFSIZ - 1); |
sz = MIN((int)(ep - sp), BUFSIZ - 1); |
Line 1448 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1456 mdoc_fn_pre(MDOC_ARGS) |
|
i = 1; |
i = 1; |
if (MDOC_SYNPRETTY & n->flags) |
if (MDOC_SYNPRETTY & n->flags) |
i = 2; |
i = 2; |
t = print_otag(h, TAG_SPAN, i, tag); |
t = print_otag(h, TAG_I, i, tag); |
print_text(h, nn->string); |
print_text(h, nn->string); |
print_tagq(h, t); |
print_tagq(h, t); |
if (nn->next) |
if (nn->next) |
Line 1594 mdoc_fo_pre(MDOC_ARGS) |
|
Line 1602 mdoc_fo_pre(MDOC_ARGS) |
|
assert(n->child->string); |
assert(n->child->string); |
|
|
PAIR_CLASS_INIT(&tag, "fname"); |
PAIR_CLASS_INIT(&tag, "fname"); |
t = print_otag(h, TAG_SPAN, 1, &tag); |
t = print_otag(h, TAG_B, 1, &tag); |
print_text(h, n->child->string); |
print_text(h, n->child->string); |
print_tagq(h, t); |
print_tagq(h, t); |
return(0); |
return(0); |
Line 1681 mdoc_rv_pre(MDOC_ARGS) |
|
Line 1689 mdoc_rv_pre(MDOC_ARGS) |
|
|
|
for (nn = n->child; nn; nn = nn->next) { |
for (nn = n->child; nn; nn = nn->next) { |
PAIR_CLASS_INIT(&tag, "fname"); |
PAIR_CLASS_INIT(&tag, "fname"); |
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 1747 mdoc_bf_pre(MDOC_ARGS) |
|
Line 1755 mdoc_bf_pre(MDOC_ARGS) |
|
else if (MDOC_BODY != n->type) |
else if (MDOC_BODY != n->type) |
return(1); |
return(1); |
|
|
assert(n->data.Bf); |
if (FONT_Em == n->norm->Bf.font) |
|
|
if (FONT_Em == n->data.Bf->font) |
|
PAIR_CLASS_INIT(&tag[0], "emph"); |
PAIR_CLASS_INIT(&tag[0], "emph"); |
else if (FONT_Sy == n->data.Bf->font) |
else if (FONT_Sy == n->norm->Bf.font) |
PAIR_CLASS_INIT(&tag[0], "symb"); |
PAIR_CLASS_INIT(&tag[0], "symb"); |
else if (FONT_Li == n->data.Bf->font) |
else if (FONT_Li == n->norm->Bf.font) |
PAIR_CLASS_INIT(&tag[0], "lit"); |
PAIR_CLASS_INIT(&tag[0], "lit"); |
else |
else |
PAIR_CLASS_INIT(&tag[0], "none"); |
PAIR_CLASS_INIT(&tag[0], "none"); |
|
|
mdoc__x_pre(MDOC_ARGS) |
mdoc__x_pre(MDOC_ARGS) |
{ |
{ |
struct htmlpair tag[2]; |
struct htmlpair tag[2]; |
|
enum htmltag t; |
|
|
|
t = TAG_SPAN; |
|
|
switch (n->tok) { |
switch (n->tok) { |
case(MDOC__A): |
case(MDOC__A): |
PAIR_CLASS_INIT(&tag[0], "ref-auth"); |
PAIR_CLASS_INIT(&tag[0], "ref-auth"); |
Line 1896 mdoc__x_pre(MDOC_ARGS) |
|
Line 1905 mdoc__x_pre(MDOC_ARGS) |
|
break; |
break; |
case(MDOC__B): |
case(MDOC__B): |
PAIR_CLASS_INIT(&tag[0], "ref-book"); |
PAIR_CLASS_INIT(&tag[0], "ref-book"); |
|
t = TAG_I; |
break; |
break; |
case(MDOC__C): |
case(MDOC__C): |
PAIR_CLASS_INIT(&tag[0], "ref-city"); |
PAIR_CLASS_INIT(&tag[0], "ref-city"); |
Line 1905 mdoc__x_pre(MDOC_ARGS) |
|
Line 1915 mdoc__x_pre(MDOC_ARGS) |
|
break; |
break; |
case(MDOC__I): |
case(MDOC__I): |
PAIR_CLASS_INIT(&tag[0], "ref-issue"); |
PAIR_CLASS_INIT(&tag[0], "ref-issue"); |
|
t = TAG_I; |
break; |
break; |
case(MDOC__J): |
case(MDOC__J): |
PAIR_CLASS_INIT(&tag[0], "ref-jrnl"); |
PAIR_CLASS_INIT(&tag[0], "ref-jrnl"); |
|
t = TAG_I; |
break; |
break; |
case(MDOC__N): |
case(MDOC__N): |
PAIR_CLASS_INIT(&tag[0], "ref-num"); |
PAIR_CLASS_INIT(&tag[0], "ref-num"); |
Line 1939 mdoc__x_pre(MDOC_ARGS) |
|
Line 1951 mdoc__x_pre(MDOC_ARGS) |
|
} |
} |
|
|
if (MDOC__U != n->tok) { |
if (MDOC__U != n->tok) { |
print_otag(h, TAG_SPAN, 1, tag); |
print_otag(h, t, 1, tag); |
return(1); |
return(1); |
} |
} |
|
|