version 1.326, 2019/01/11 16:36:19 |
version 1.333, 2020/01/19 18:02:00 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2014-2019 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2014-2020 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 115 static int mdoc_ss_pre(MDOC_ARGS); |
|
Line 115 static int mdoc_ss_pre(MDOC_ARGS); |
|
static int mdoc_st_pre(MDOC_ARGS); |
static int mdoc_st_pre(MDOC_ARGS); |
static int mdoc_sx_pre(MDOC_ARGS); |
static int mdoc_sx_pre(MDOC_ARGS); |
static int mdoc_sy_pre(MDOC_ARGS); |
static int mdoc_sy_pre(MDOC_ARGS); |
|
static int mdoc_tg_pre(MDOC_ARGS); |
static int mdoc_va_pre(MDOC_ARGS); |
static int mdoc_va_pre(MDOC_ARGS); |
static int mdoc_vt_pre(MDOC_ARGS); |
static int mdoc_vt_pre(MDOC_ARGS); |
static int mdoc_xr_pre(MDOC_ARGS); |
static int mdoc_xr_pre(MDOC_ARGS); |
Line 241 static const struct mdoc_html_act mdoc_html_acts[MDOC_ |
|
Line 242 static const struct mdoc_html_act mdoc_html_acts[MDOC_ |
|
{mdoc__x_pre, mdoc__x_post}, /* %Q */ |
{mdoc__x_pre, mdoc__x_post}, /* %Q */ |
{mdoc__x_pre, mdoc__x_post}, /* %U */ |
{mdoc__x_pre, mdoc__x_post}, /* %U */ |
{NULL, NULL}, /* Ta */ |
{NULL, NULL}, /* Ta */ |
|
{mdoc_tg_pre, NULL}, /* Tg */ |
}; |
}; |
|
|
|
|
Line 351 print_mdoc_node(MDOC_ARGS) |
|
Line 353 print_mdoc_node(MDOC_ARGS) |
|
if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT) |
if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT) |
return; |
return; |
|
|
html_fillmode(h, n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi); |
if (n->flags & NODE_NOFILL) { |
|
html_fillmode(h, ROFF_nf); |
|
if (n->flags & NODE_LINE) |
|
print_endline(h); |
|
} else |
|
html_fillmode(h, 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: |
/* No tables in this mode... */ |
if (n->flags & NODE_LINE) { |
assert(NULL == h->tblt); |
switch (*n->string) { |
|
case '\0': |
/* |
h->col = 1; |
* Make sure that if we're in a literal mode already |
print_endline(h); |
* (i.e., within a <PRE>) don't print the newline. |
return; |
*/ |
case ' ': |
if (*n->string == ' ' && n->flags & NODE_LINE && |
if ((h->flags & HTML_NONEWLINE) == 0 && |
(h->flags & HTML_NONEWLINE) == 0 && |
(n->flags & NODE_NOFILL) == 0) |
(n->flags & NODE_NOFILL) == 0) |
print_otag(h, TAG_BR, ""); |
print_otag(h, TAG_BR, ""); |
break; |
|
default: |
|
break; |
|
} |
|
} |
|
t = h->tag; |
|
t->refcnt++; |
if (NODE_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); |
Line 379 print_mdoc_node(MDOC_ARGS) |
|
Line 388 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 406 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 433 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 436 print_mdoc_node(MDOC_ARGS) |
|
Line 449 print_mdoc_node(MDOC_ARGS) |
|
n->body->flags |= NODE_ENDED; |
n->body->flags |= NODE_ENDED; |
break; |
break; |
} |
} |
|
|
if (n->flags & NODE_NOFILL && |
|
(n->next == NULL || n->next->flags & NODE_LINE)) { |
|
h->col++; |
|
print_endline(h); |
|
} |
|
} |
} |
|
|
static void |
static void |
Line 528 mdoc_sh_pre(MDOC_ARGS) |
|
Line 535 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 579 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 605 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 657 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 666 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 715 mdoc_xr_pre(MDOC_ARGS) |
|
Line 724 mdoc_xr_pre(MDOC_ARGS) |
|
} |
} |
|
|
static int |
static int |
|
mdoc_tg_pre(MDOC_ARGS) |
|
{ |
|
char *id; |
|
|
|
if ((id = html_make_id(n, 1)) != NULL) |
|
print_otag(h, TAG_MARK, "i", id); |
|
return 0; |
|
} |
|
|
|
static int |
mdoc_ns_pre(MDOC_ARGS) |
mdoc_ns_pre(MDOC_ARGS) |
{ |
{ |
|
|
Line 1265 mdoc_skip_pre(MDOC_ARGS) |
|
Line 1284 mdoc_skip_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_pp_pre(MDOC_ARGS) |
mdoc_pp_pre(MDOC_ARGS) |
{ |
{ |
if ((n->flags & NODE_NOFILL) == 0) { |
if (n->flags & NODE_NOFILL) { |
|
print_endline(h); |
|
h->col = 1; |
|
print_endline(h); |
|
} else { |
html_close_paragraph(h); |
html_close_paragraph(h); |
print_otag(h, TAG_P, "c", "Pp"); |
print_otag(h, TAG_P, "c", "Pp"); |
} |
} |
Line 1693 mdoc_quote_pre(MDOC_ARGS) |
|
Line 1716 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. |
Line 1708 mdoc_quote_pre(MDOC_ARGS) |
|
Line 1731 mdoc_quote_pre(MDOC_ARGS) |
|
break; |
break; |
case MDOC_Do: |
case MDOC_Do: |
case MDOC_Dq: |
case MDOC_Dq: |
|
print_text(h, "\\(lq"); |
|
break; |
case MDOC_Qo: |
case MDOC_Qo: |
case MDOC_Qq: |
case MDOC_Qq: |
print_text(h, "\\(lq"); |
print_text(h, "\""); |
break; |
break; |
case MDOC_Po: |
case MDOC_Po: |
case MDOC_Pq: |
case MDOC_Pq: |
Line 1766 mdoc_quote_post(MDOC_ARGS) |
|
Line 1791 mdoc_quote_post(MDOC_ARGS) |
|
else |
else |
print_text(h, n->norm->Es->child->next->string); |
print_text(h, n->norm->Es->child->next->string); |
break; |
break; |
case MDOC_Qo: |
|
case MDOC_Qq: |
|
case MDOC_Do: |
case MDOC_Do: |
case MDOC_Dq: |
case MDOC_Dq: |
print_text(h, "\\(rq"); |
print_text(h, "\\(rq"); |
|
break; |
|
case MDOC_Qo: |
|
case MDOC_Qq: |
|
print_text(h, "\""); |
break; |
break; |
case MDOC_Po: |
case MDOC_Po: |
case MDOC_Pq: |
case MDOC_Pq: |