version 1.126, 2010/12/17 10:37:26 |
version 1.151, 2011/02/06 21:44:36 |
Line 287 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 354 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 420 print_mdoc_node(MDOC_ARGS) |
|
Line 420 print_mdoc_node(MDOC_ARGS) |
|
child = mdoc_root_pre(m, n, h); |
child = mdoc_root_pre(m, n, h); |
break; |
break; |
case (MDOC_TEXT): |
case (MDOC_TEXT): |
|
/* No tables in this mode... */ |
|
assert(NULL == h->tblt); |
|
|
|
/* |
|
* Make sure that if we're in a literal mode already |
|
* (i.e., within a <PRE>) don't print the newline. |
|
*/ |
|
if (' ' == *n->string && MDOC_LINE & n->flags) |
|
if ( ! (HTML_LITERAL & h->flags)) |
|
print_otag(h, TAG_BR, 0, NULL); |
print_text(h, n->string); |
print_text(h, n->string); |
return; |
return; |
|
case (MDOC_EQN): |
|
return; |
|
case (MDOC_TBL): |
|
/* |
|
* This will take care of initialising all of the table |
|
* state data for the first table, then tearing it down |
|
* for the last one. |
|
*/ |
|
print_tbl(h, n->span); |
|
return; |
default: |
default: |
|
/* |
|
* Close out the current table, if it's open, and unset |
|
* the "meta" table state. This will be reopened on the |
|
* next table element. |
|
*/ |
|
if (h->tblt) { |
|
print_tblclose(h); |
|
t = h->tags.head; |
|
} |
|
|
|
assert(NULL == h->tblt); |
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); |
break; |
break; |
Line 461 print_mdoc_node(MDOC_ARGS) |
|
Line 492 print_mdoc_node(MDOC_ARGS) |
|
static void |
static void |
mdoc_root_post(MDOC_ARGS) |
mdoc_root_post(MDOC_ARGS) |
{ |
{ |
struct htmlpair tag[2]; |
struct htmlpair tag[3]; |
struct tag *t, *tt; |
struct tag *t, *tt; |
char b[DATESIZ]; |
char b[DATESIZ]; |
|
|
time2a(m->date, b, DATESIZ); |
time2a(m->date, b, DATESIZ); |
|
|
PAIR_CLASS_INIT(&tag[0], "foot"); |
PAIR_SUMMARY_INIT(&tag[0], "Document Footer"); |
PAIR_SUMMARY_INIT(&tag[1], "Document Footer"); |
PAIR_CLASS_INIT(&tag[1], "foot"); |
t = print_otag(h, TAG_TABLE, 2, tag); |
if (NULL == h->style) { |
|
PAIR_INIT(&tag[2], 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_TBODY, 0, NULL); |
|
|
tt = print_otag(h, TAG_TR, 0, NULL); |
tt = print_otag(h, TAG_TR, 0, NULL); |
|
|
PAIR_CLASS_INIT(&tag[0], "foot-date"); |
PAIR_CLASS_INIT(&tag[0], "foot-date"); |
Line 480 mdoc_root_post(MDOC_ARGS) |
|
Line 520 mdoc_root_post(MDOC_ARGS) |
|
print_stagq(h, tt); |
print_stagq(h, tt); |
|
|
PAIR_CLASS_INIT(&tag[0], "foot-os"); |
PAIR_CLASS_INIT(&tag[0], "foot-os"); |
print_otag(h, TAG_TD, 1, tag); |
if (NULL == h->style) { |
|
PAIR_INIT(&tag[1], ATTR_ALIGN, "right"); |
|
print_otag(h, TAG_TD, 2, 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 505 mdoc_root_pre(MDOC_ARGS) |
|
Line 549 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], "head"); |
PAIR_SUMMARY_INIT(&tag[0], "Document Header"); |
PAIR_SUMMARY_INIT(&tag[1], "Document Header"); |
PAIR_CLASS_INIT(&tag[1], "head"); |
t = print_otag(h, TAG_TABLE, 2, tag); |
if (NULL == h->style) { |
|
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); |
|
|
|
print_otag(h, TAG_TBODY, 0, NULL); |
|
|
tt = print_otag(h, TAG_TR, 0, NULL); |
tt = print_otag(h, TAG_TR, 0, NULL); |
|
|
PAIR_CLASS_INIT(&tag[0], "head-ltitle"); |
PAIR_CLASS_INIT(&tag[0], "head-ltitle"); |
Line 518 mdoc_root_pre(MDOC_ARGS) |
|
Line 572 mdoc_root_pre(MDOC_ARGS) |
|
print_stagq(h, tt); |
print_stagq(h, tt); |
|
|
PAIR_CLASS_INIT(&tag[0], "head-vol"); |
PAIR_CLASS_INIT(&tag[0], "head-vol"); |
print_otag(h, TAG_TD, 1, tag); |
if (NULL == h->style) { |
|
PAIR_INIT(&tag[1], ATTR_ALIGN, "center"); |
|
print_otag(h, TAG_TD, 2, tag); |
|
} else |
|
print_otag(h, TAG_TD, 1, tag); |
|
|
print_text(h, b); |
print_text(h, b); |
print_stagq(h, tt); |
print_stagq(h, tt); |
|
|
PAIR_CLASS_INIT(&tag[0], "head-rtitle"); |
PAIR_CLASS_INIT(&tag[0], "head-rtitle"); |
print_otag(h, TAG_TD, 1, tag); |
if (NULL == h->style) { |
|
PAIR_INIT(&tag[1], ATTR_ALIGN, "right"); |
|
print_otag(h, TAG_TD, 2, 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); |
Line 593 mdoc_fl_pre(MDOC_ARGS) |
|
Line 655 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 640 mdoc_nm_pre(MDOC_ARGS) |
|
Line 702 mdoc_nm_pre(MDOC_ARGS) |
|
case (MDOC_ELEM): |
case (MDOC_ELEM): |
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 && m->name) |
if (NULL == n->child && m->name) |
print_text(h, m->name); |
print_text(h, m->name); |
return(1); |
return(1); |
|
|
mdoc_ns_pre(MDOC_ARGS) |
mdoc_ns_pre(MDOC_ARGS) |
{ |
{ |
|
|
h->flags |= HTML_NOSPACE; |
if ( ! (MDOC_LINE & n->flags)) |
|
h->flags |= HTML_NOSPACE; |
return(1); |
return(1); |
} |
} |
|
|
Line 732 mdoc_ar_pre(MDOC_ARGS) |
|
Line 795 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 769 mdoc_xx_pre(MDOC_ARGS) |
|
Line 832 mdoc_xx_pre(MDOC_ARGS) |
|
|
|
PAIR_CLASS_INIT(&tag, "unix"); |
PAIR_CLASS_INIT(&tag, "unix"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
|
|
print_text(h, pp); |
print_text(h, pp); |
return(1); |
if (n->child) { |
|
h->flags |= HTML_KEEP; |
|
print_text(h, n->child->string); |
|
h->flags &= ~HTML_KEEP; |
|
} |
|
return(0); |
} |
} |
|
|
|
|
Line 778 mdoc_xx_pre(MDOC_ARGS) |
|
Line 847 mdoc_xx_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_bx_pre(MDOC_ARGS) |
mdoc_bx_pre(MDOC_ARGS) |
{ |
{ |
const struct mdoc_node *nn; |
struct htmlpair tag; |
struct htmlpair tag; |
|
|
|
PAIR_CLASS_INIT(&tag, "unix"); |
PAIR_CLASS_INIT(&tag, "unix"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
|
|
for (nn = n->child; nn; nn = nn->next) |
if (NULL != (n = n->child)) { |
print_mdoc_node(m, nn, h); |
print_text(h, n->string); |
|
h->flags |= HTML_NOSPACE; |
|
print_text(h, "BSD"); |
|
} else { |
|
print_text(h, "BSD"); |
|
return(0); |
|
} |
|
|
if (n->child) |
if (NULL != (n = n->next)) { |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
|
print_text(h, "-"); |
|
h->flags |= HTML_NOSPACE; |
|
print_text(h, n->string); |
|
} |
|
|
print_text(h, "BSD"); |
|
return(0); |
return(0); |
} |
} |
|
|
|
/* ARGSUSED */ |
static int |
static int |
mdoc_it_pre(MDOC_ARGS) |
mdoc_it_pre(MDOC_ARGS) |
{ |
{ |
Line 808 mdoc_it_pre(MDOC_ARGS) |
|
Line 886 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 834 mdoc_it_pre(MDOC_ARGS) |
|
Line 912 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 855 mdoc_it_pre(MDOC_ARGS) |
|
Line 937 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 869 mdoc_it_pre(MDOC_ARGS) |
|
Line 951 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 904 mdoc_it_pre(MDOC_ARGS) |
|
Line 986 mdoc_it_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_bl_pre(MDOC_ARGS) |
mdoc_bl_pre(MDOC_ARGS) |
{ |
{ |
size_t i; |
int 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 925 mdoc_bl_pre(MDOC_ARGS) |
|
Line 1008 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 < (int)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 < (int)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 944 mdoc_bl_pre(MDOC_ARGS) |
|
Line 1027 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]); |
PAIR_CLASS_INIT(&tag[1], lists[n->data.Bl->type]); |
strlcpy(buf, "list ", BUFSIZ); |
i = 2; |
strlcat(buf, lists[n->norm->Bl.type], BUFSIZ); |
|
PAIR_INIT(&tag[1], ATTR_CLASS, buf); |
|
|
/* 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 965 mdoc_bl_pre(MDOC_ARGS) |
|
Line 1047 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 979 mdoc_bl_pre(MDOC_ARGS) |
|
Line 1061 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 1000 mdoc_ex_pre(MDOC_ARGS) |
|
Line 1082 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 1058 mdoc_d1_pre(MDOC_ARGS) |
|
Line 1143 mdoc_d1_pre(MDOC_ARGS) |
|
|
|
/* BLOCKQUOTE needs a block body. */ |
/* BLOCKQUOTE needs a block body. */ |
|
|
|
PAIR_CLASS_INIT(&tag[0], "display"); |
|
print_otag(h, TAG_DIV, 1, tag); |
|
|
if (MDOC_Dl == n->tok) { |
if (MDOC_Dl == n->tok) { |
PAIR_CLASS_INIT(&tag[0], "lit display"); |
PAIR_CLASS_INIT(&tag[0], "lit"); |
print_otag(h, TAG_DIV, 1, tag); |
print_otag(h, TAG_CODE, 1, tag); |
} else |
} |
PAIR_CLASS_INIT(&tag[0], "display"); |
|
print_otag(h, TAG_DIV, 1, tag); |
|
|
|
return(1); |
return(1); |
} |
} |
Line 1087 mdoc_sx_pre(MDOC_ARGS) |
|
Line 1173 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); |
} |
} |
|
|
mdoc_bd_pre(MDOC_ARGS) |
mdoc_bd_pre(MDOC_ARGS) |
{ |
{ |
struct htmlpair tag[2]; |
struct htmlpair tag[2]; |
int comp; |
int comp, sv; |
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
struct roffsu su; |
struct roffsu su; |
|
|
Line 1105 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1192 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 1120 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1207 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 1136 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1223 mdoc_bd_pre(MDOC_ARGS) |
|
PAIR_CLASS_INIT(&tag[1], "lit display"); |
PAIR_CLASS_INIT(&tag[1], "lit display"); |
print_otag(h, TAG_PRE, 2, tag); |
print_otag(h, TAG_PRE, 2, tag); |
|
|
|
/* This can be recursive: save & set our literal state. */ |
|
|
|
sv = h->flags & HTML_LITERAL; |
|
h->flags |= HTML_LITERAL; |
|
|
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 1172 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1264 mdoc_bd_pre(MDOC_ARGS) |
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
} |
} |
|
|
|
if (0 == sv) |
|
h->flags &= ~HTML_LITERAL; |
|
|
return(0); |
return(0); |
} |
} |
|
|
Line 1183 mdoc_pa_pre(MDOC_ARGS) |
|
Line 1278 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 1195 mdoc_ad_pre(MDOC_ARGS) |
|
Line 1290 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 1222 mdoc_cd_pre(MDOC_ARGS) |
|
Line 1317 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 1273 mdoc_fa_pre(MDOC_ARGS) |
|
Line 1368 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 1301 mdoc_fd_pre(MDOC_ARGS) |
|
Line 1396 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 1334 mdoc_ft_pre(MDOC_ARGS) |
|
Line 1429 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 1359 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1454 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 1390 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1485 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 1411 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1506 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 1557 mdoc_fo_pre(MDOC_ARGS) |
|
Line 1652 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 1588 mdoc_in_pre(MDOC_ARGS) |
|
Line 1683 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 1624 mdoc_ic_pre(MDOC_ARGS) |
|
Line 1719 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 1637 mdoc_rv_pre(MDOC_ARGS) |
|
Line 1732 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) { |
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 1664 mdoc_rv_pre(MDOC_ARGS) |
|
Line 1761 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 1679 mdoc_va_pre(MDOC_ARGS) |
|
Line 1776 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 1708 mdoc_bf_pre(MDOC_ARGS) |
|
Line 1805 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"); |
Line 1833 mdoc_lb_pre(MDOC_ARGS) |
|
Line 1928 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); |
|
|
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 1856 mdoc__x_pre(MDOC_ARGS) |
|
Line 1955 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 1865 mdoc__x_pre(MDOC_ARGS) |
|
Line 1965 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 1899 mdoc__x_pre(MDOC_ARGS) |
|
Line 2001 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); |
} |
} |
|
|
Line 1940 mdoc_bk_pre(MDOC_ARGS) |
|
Line 2042 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(); |