version 1.326, 2019/01/11 16:36:19 |
version 1.330, 2019/09/03 15:09:44 |
Line 354 print_mdoc_node(MDOC_ARGS) |
|
Line 354 print_mdoc_node(MDOC_ARGS) |
|
html_fillmode(h, n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi); |
html_fillmode(h, n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi); |
|
|
child = 1; |
child = 1; |
t = h->tag; |
|
if (t->tag == TAG_P || t->tag == TAG_PRE) |
|
t = t->next; |
|
|
|
n->flags &= ~NODE_ENDED; |
n->flags &= ~NODE_ENDED; |
switch (n->type) { |
switch (n->type) { |
case ROFFT_TEXT: |
case ROFFT_TEXT: |
|
t = h->tag; |
|
t->refcnt++; |
|
|
/* No tables in this mode... */ |
/* No tables in this mode... */ |
assert(NULL == h->tblt); |
assert(NULL == h->tblt); |
|
|
Line 379 print_mdoc_node(MDOC_ARGS) |
|
Line 378 print_mdoc_node(MDOC_ARGS) |
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
break; |
break; |
case ROFFT_EQN: |
case ROFFT_EQN: |
|
t = h->tag; |
|
t->refcnt++; |
print_eqn(h, n->eqn); |
print_eqn(h, n->eqn); |
break; |
break; |
case ROFFT_TBL: |
case ROFFT_TBL: |
Line 395 print_mdoc_node(MDOC_ARGS) |
|
Line 396 print_mdoc_node(MDOC_ARGS) |
|
* the "meta" table state. This will be reopened on the |
* the "meta" table state. This will be reopened on the |
* next table element. |
* next table element. |
*/ |
*/ |
if (h->tblt != NULL) { |
if (h->tblt != NULL) |
print_tblclose(h); |
print_tblclose(h); |
t = h->tag; |
|
} |
|
assert(h->tblt == NULL); |
assert(h->tblt == NULL); |
|
t = h->tag; |
|
t->refcnt++; |
if (n->tok < ROFF_MAX) { |
if (n->tok < ROFF_MAX) { |
roff_html_pre(h, n); |
roff_html_pre(h, n); |
|
t->refcnt--; |
print_stagq(h, t); |
print_stagq(h, t); |
return; |
return; |
} |
} |
Line 421 print_mdoc_node(MDOC_ARGS) |
|
Line 423 print_mdoc_node(MDOC_ARGS) |
|
if (child && n->child != NULL) |
if (child && n->child != NULL) |
print_mdoc_nodelist(meta, n->child, h); |
print_mdoc_nodelist(meta, n->child, h); |
|
|
|
t->refcnt--; |
print_stagq(h, t); |
print_stagq(h, t); |
|
|
switch (n->type) { |
switch (n->type) { |
Line 528 mdoc_sh_pre(MDOC_ARGS) |
|
Line 531 mdoc_sh_pre(MDOC_ARGS) |
|
html_close_paragraph(h); |
html_close_paragraph(h); |
if ((h->oflags & HTML_TOC) == 0 || |
if ((h->oflags & HTML_TOC) == 0 || |
h->flags & HTML_TOCDONE || |
h->flags & HTML_TOCDONE || |
n->sec <= SEC_SYNOPSIS) |
n->sec <= SEC_SYNOPSIS) { |
|
print_otag(h, TAG_SECTION, "c", "Sh"); |
break; |
break; |
|
} |
h->flags |= HTML_TOCDONE; |
h->flags |= HTML_TOCDONE; |
sc = 0; |
sc = 0; |
for (sn = n->next; sn != NULL; sn = sn->next) |
for (sn = n->next; sn != NULL; sn = sn->next) |
Line 570 mdoc_sh_pre(MDOC_ARGS) |
|
Line 575 mdoc_sh_pre(MDOC_ARGS) |
|
print_tagq(h, tsec); |
print_tagq(h, tsec); |
} |
} |
print_tagq(h, t); |
print_tagq(h, t); |
|
print_otag(h, TAG_SECTION, "c", "Sh"); |
break; |
break; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
id = html_make_id(n, 1); |
id = html_make_id(n, 1); |
Line 595 mdoc_ss_pre(MDOC_ARGS) |
|
Line 601 mdoc_ss_pre(MDOC_ARGS) |
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BLOCK: |
case ROFFT_BLOCK: |
html_close_paragraph(h); |
html_close_paragraph(h); |
|
print_otag(h, TAG_SECTION, "c", "Ss"); |
return 1; |
return 1; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
break; |
break; |
Line 646 mdoc_nd_pre(MDOC_ARGS) |
|
Line 653 mdoc_nd_pre(MDOC_ARGS) |
|
{ |
{ |
switch (n->type) { |
switch (n->type) { |
case ROFFT_BLOCK: |
case ROFFT_BLOCK: |
html_close_paragraph(h); |
|
return 1; |
return 1; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
return 0; |
return 0; |
Line 656 mdoc_nd_pre(MDOC_ARGS) |
|
Line 662 mdoc_nd_pre(MDOC_ARGS) |
|
abort(); |
abort(); |
} |
} |
print_text(h, "\\(em"); |
print_text(h, "\\(em"); |
/* Cannot use TAG_SPAN because it may contain blocks. */ |
print_otag(h, TAG_SPAN, "c", "Nd"); |
print_otag(h, TAG_DIV, "c", "Nd"); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 1693 mdoc_quote_pre(MDOC_ARGS) |
|
Line 1698 mdoc_quote_pre(MDOC_ARGS) |
|
/* |
/* |
* Give up on semantic markup for now. |
* Give up on semantic markup for now. |
* We cannot use TAG_SPAN because .Oo may contain blocks. |
* We cannot use TAG_SPAN because .Oo may contain blocks. |
* We cannot use TAG_IDIV because we might be in a |
* We cannot use TAG_DIV because we might be in a |
* phrasing context (like .Dl or .Pp); we cannot |
* phrasing context (like .Dl or .Pp); we cannot |
* close out a .Pp at this point either because |
* close out a .Pp at this point either because |
* that would break the line. |
* that would break the line. |