version 1.126, 2010/12/17 10:37:26 |
version 1.131, 2010/12/19 12:14: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 945 mdoc_bl_pre(MDOC_ARGS) |
|
Line 945 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 1000 mdoc_ex_pre(MDOC_ARGS) |
|
Line 1003 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"); |
Line 1058 mdoc_d1_pre(MDOC_ARGS) |
|
Line 1064 mdoc_d1_pre(MDOC_ARGS) |
|
|
|
/* BLOCKQUOTE needs a block body. */ |
/* BLOCKQUOTE needs a block body. */ |
|
|
if (MDOC_Dl == n->tok) { |
if (MDOC_Dl == n->tok) |
PAIR_CLASS_INIT(&tag[0], "lit display"); |
PAIR_CLASS_INIT(&tag[0], "lit display"); |
print_otag(h, TAG_DIV, 1, tag); |
else |
} else |
|
PAIR_CLASS_INIT(&tag[0], "display"); |
PAIR_CLASS_INIT(&tag[0], "display"); |
print_otag(h, TAG_DIV, 1, tag); |
|
|
|
|
print_otag(h, TAG_DIV, 1, tag); |
return(1); |
return(1); |
} |
} |
|
|
Line 1637 mdoc_rv_pre(MDOC_ARGS) |
|
Line 1642 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 1833 mdoc_lb_pre(MDOC_ARGS) |
|
Line 1840 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 1940 mdoc_bk_pre(MDOC_ARGS) |
|
Line 1948 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(); |