version 1.241, 2017/01/08 22:51:55 |
version 1.244, 2017/01/10 13:47:00 |
|
|
synopsis_pre(struct html *h, const struct roff_node *n) |
synopsis_pre(struct html *h, const struct roff_node *n) |
{ |
{ |
|
|
if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags)) |
if (NULL == n->prev || ! (NODE_SYNPRETTY & n->flags)) |
return; |
return; |
|
|
if (n->prev->tok == n->tok && |
if (n->prev->tok == n->tok && |
Line 377 print_mdoc_node(MDOC_ARGS) |
|
Line 377 print_mdoc_node(MDOC_ARGS) |
|
int child; |
int child; |
struct tag *t; |
struct tag *t; |
|
|
|
if (n->flags & NODE_NOPRT) |
|
return; |
|
|
child = 1; |
child = 1; |
t = h->tags.head; |
t = h->tags.head; |
n->flags &= ~MDOC_ENDED; |
n->flags &= ~NODE_ENDED; |
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_TEXT: |
case ROFFT_TEXT: |
Line 390 print_mdoc_node(MDOC_ARGS) |
|
Line 393 print_mdoc_node(MDOC_ARGS) |
|
* Make sure that if we're in a literal mode already |
* Make sure that if we're in a literal mode already |
* (i.e., within a <PRE>) don't print the newline. |
* (i.e., within a <PRE>) don't print the newline. |
*/ |
*/ |
if (' ' == *n->string && MDOC_LINE & n->flags) |
if (' ' == *n->string && NODE_LINE & n->flags) |
if ( ! (HTML_LITERAL & h->flags)) |
if ( ! (HTML_LITERAL & h->flags)) |
print_otag(h, TAG_BR, 0, NULL); |
print_otag(h, TAG_BR, 0, NULL); |
if (MDOC_DELIMC & n->flags) |
if (NODE_DELIMC & n->flags) |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
print_text(h, n->string); |
print_text(h, n->string); |
if (MDOC_DELIMO & n->flags) |
if (NODE_DELIMO & n->flags) |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
return; |
return; |
case ROFFT_EQN: |
case ROFFT_EQN: |
if (n->flags & MDOC_LINE) |
if (n->flags & NODE_LINE) |
putchar('\n'); |
putchar('\n'); |
print_eqn(h, n->eqn); |
print_eqn(h, n->eqn); |
break; |
break; |
Line 428 print_mdoc_node(MDOC_ARGS) |
|
Line 431 print_mdoc_node(MDOC_ARGS) |
|
break; |
break; |
} |
} |
|
|
if (h->flags & HTML_KEEP && n->flags & MDOC_LINE) { |
if (h->flags & HTML_KEEP && n->flags & NODE_LINE) { |
h->flags &= ~HTML_KEEP; |
h->flags &= ~HTML_KEEP; |
h->flags |= HTML_PREKEEP; |
h->flags |= HTML_PREKEEP; |
} |
} |
Line 442 print_mdoc_node(MDOC_ARGS) |
|
Line 445 print_mdoc_node(MDOC_ARGS) |
|
case ROFFT_EQN: |
case ROFFT_EQN: |
break; |
break; |
default: |
default: |
if ( ! mdocs[n->tok].post || n->flags & MDOC_ENDED) |
if ( ! mdocs[n->tok].post || n->flags & NODE_ENDED) |
break; |
break; |
(*mdocs[n->tok].post)(meta, n, h); |
(*mdocs[n->tok].post)(meta, n, h); |
if (n->end != ENDBODY_NOT) |
if (n->end != ENDBODY_NOT) |
n->body->flags |= MDOC_ENDED; |
n->body->flags |= NODE_ENDED; |
if (n->end == ENDBODY_NOSPACE) |
if (n->end == ENDBODY_NOSPACE) |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
break; |
break; |
Line 605 mdoc_fl_pre(MDOC_ARGS) |
|
Line 608 mdoc_fl_pre(MDOC_ARGS) |
|
if (!(n->child == NULL && |
if (!(n->child == NULL && |
(n->next == NULL || |
(n->next == NULL || |
n->next->type == ROFFT_TEXT || |
n->next->type == ROFFT_TEXT || |
n->next->flags & MDOC_LINE))) |
n->next->flags & NODE_LINE))) |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
|
|
return 1; |
return 1; |
|
|
mdoc_ns_pre(MDOC_ARGS) |
mdoc_ns_pre(MDOC_ARGS) |
{ |
{ |
|
|
if ( ! (MDOC_LINE & n->flags)) |
if ( ! (NODE_LINE & n->flags)) |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
return 1; |
return 1; |
} |
} |
Line 1158 mdoc_bd_pre(MDOC_ARGS) |
|
Line 1161 mdoc_bd_pre(MDOC_ARGS) |
|
break; |
break; |
} |
} |
if (h->flags & HTML_NONEWLINE || |
if (h->flags & HTML_NONEWLINE || |
(nn->next && ! (nn->next->flags & MDOC_LINE))) |
(nn->next && ! (nn->next->flags & NODE_LINE))) |
continue; |
continue; |
else if (nn->next) |
else if (nn->next) |
print_text(h, "\n"); |
print_text(h, "\n"); |
Line 1397 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1400 mdoc_fn_pre(MDOC_ARGS) |
|
const char *sp, *ep; |
const char *sp, *ep; |
int sz, i, pretty; |
int sz, i, pretty; |
|
|
pretty = MDOC_SYNPRETTY & n->flags; |
pretty = NODE_SYNPRETTY & n->flags; |
synopsis_pre(h, n); |
synopsis_pre(h, n); |
|
|
/* Split apart into type and name. */ |
/* Split apart into type and name. */ |
Line 1427 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1430 mdoc_fn_pre(MDOC_ARGS) |
|
*/ |
*/ |
|
|
#if 0 |
#if 0 |
if (MDOC_SYNPRETTY & n->flags) { |
if (NODE_SYNPRETTY & n->flags) { |
nbuf[0] = '\0'; |
nbuf[0] = '\0'; |
html_idcat(nbuf, sp, BUFSIZ); |
html_idcat(nbuf, sp, BUFSIZ); |
PAIR_ID_INIT(&tag[1], nbuf); |
PAIR_ID_INIT(&tag[1], nbuf); |
Line 1456 mdoc_fn_pre(MDOC_ARGS) |
|
Line 1459 mdoc_fn_pre(MDOC_ARGS) |
|
|
|
for (n = n->child->next; n; n = n->next) { |
for (n = n->child->next; n; n = n->next) { |
i = 1; |
i = 1; |
if (MDOC_SYNPRETTY & n->flags) |
if (NODE_SYNPRETTY & n->flags) |
i = 2; |
i = 2; |
t = print_otag(h, TAG_I, i, tag); |
t = print_otag(h, TAG_I, i, tag); |
print_text(h, n->string); |
print_text(h, n->string); |
Line 1646 mdoc_in_pre(MDOC_ARGS) |
|
Line 1649 mdoc_in_pre(MDOC_ARGS) |
|
* of no children. |
* of no children. |
*/ |
*/ |
|
|
if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags) |
if (NODE_SYNPRETTY & n->flags && NODE_LINE & n->flags) |
print_text(h, "#include"); |
print_text(h, "#include"); |
|
|
print_text(h, "<"); |
print_text(h, "<"); |
|
|
mdoc_pf_post(MDOC_ARGS) |
mdoc_pf_post(MDOC_ARGS) |
{ |
{ |
|
|
if ( ! (n->next == NULL || n->next->flags & MDOC_LINE)) |
if ( ! (n->next == NULL || n->next->flags & NODE_LINE)) |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
} |
} |
|
|
Line 1849 mdoc_no_pre(MDOC_ARGS) |
|
Line 1852 mdoc_no_pre(MDOC_ARGS) |
|
struct htmlpair tag; |
struct htmlpair tag; |
|
|
PAIR_CLASS_INIT(&tag, "none"); |
PAIR_CLASS_INIT(&tag, "none"); |
print_otag(h, TAG_CODE, 1, &tag); |
print_otag(h, TAG_SPAN, 1, &tag); |
return 1; |
return 1; |
} |
} |
|
|
Line 1894 mdoc_lb_pre(MDOC_ARGS) |
|
Line 1897 mdoc_lb_pre(MDOC_ARGS) |
|
{ |
{ |
struct htmlpair tag; |
struct htmlpair tag; |
|
|
if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags && n->prev) |
if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev) |
print_otag(h, TAG_BR, 0, NULL); |
print_otag(h, TAG_BR, 0, NULL); |
|
|
PAIR_CLASS_INIT(&tag, "lib"); |
PAIR_CLASS_INIT(&tag, "lib"); |