version 1.146, 2011/01/25 15:28:56 |
version 1.150, 2011/02/02 21:40:45 |
Line 422 print_mdoc_node(MDOC_ARGS) |
|
Line 422 print_mdoc_node(MDOC_ARGS) |
|
case (MDOC_TEXT): |
case (MDOC_TEXT): |
/* No tables in this mode... */ |
/* No tables in this mode... */ |
assert(NULL == h->tblt); |
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 (' ' == *n->string && MDOC_LINE & n->flags) |
print_otag(h, TAG_BR, 0, NULL); |
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_TBL): |
case (MDOC_TBL): |
|
|
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 823 mdoc_xx_pre(MDOC_ARGS) |
|
Line 830 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); |
} |
} |
|
|
|
|
|
|
mdoc_bx_pre(MDOC_ARGS) |
mdoc_bx_pre(MDOC_ARGS) |
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
char buf[3]; |
|
|
|
PAIR_CLASS_INIT(&tag, "unix"); |
PAIR_CLASS_INIT(&tag, "unix"); |
print_otag(h, TAG_SPAN, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
Line 848 mdoc_bx_pre(MDOC_ARGS) |
|
Line 860 mdoc_bx_pre(MDOC_ARGS) |
|
} |
} |
|
|
if (NULL != (n = n->next)) { |
if (NULL != (n = n->next)) { |
buf[0] = '-'; |
|
buf[1] = toupper((unsigned char)*n->string); |
|
buf[2] = '\0'; |
|
|
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
print_text(h, buf); |
print_text(h, "-"); |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
print_text(h, n->string + 1); |
print_text(h, n->string); |
} |
} |
|
|
return(0); |
return(0); |
|
|
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 1213 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1221 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 1248 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1261 mdoc_bd_pre(MDOC_ARGS) |
|
|
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
} |
} |
|
|
|
if (0 == sv) |
|
h->flags &= ~HTML_LITERAL; |
|
|
return(0); |
return(0); |
} |
} |