version 1.318, 2018/12/16 00:17:02 |
version 1.324, 2019/01/10 07:40:10 |
Line 268 synopsis_pre(struct html *h, const struct roff_node *n |
|
Line 268 synopsis_pre(struct html *h, const struct roff_node *n |
|
case MDOC_Fo: |
case MDOC_Fo: |
case MDOC_In: |
case MDOC_In: |
case MDOC_Vt: |
case MDOC_Vt: |
print_paragraph(h); |
|
break; |
break; |
case MDOC_Ft: |
case MDOC_Ft: |
if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) { |
if (n->tok != MDOC_Fn && n->tok != MDOC_Fo) |
print_paragraph(h); |
|
break; |
break; |
} |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
print_otag(h, TAG_BR, ""); |
print_otag(h, TAG_BR, ""); |
break; |
return; |
} |
} |
|
html_close_paragraph(h); |
|
print_otag(h, TAG_P, "c", "Pp"); |
} |
} |
|
|
void |
void |
html_mdoc(void *arg, const struct roff_man *mdoc) |
html_mdoc(void *arg, const struct roff_meta *mdoc) |
{ |
{ |
struct html *h; |
struct html *h; |
struct roff_node *n; |
struct roff_node *n; |
Line 298 html_mdoc(void *arg, const struct roff_man *mdoc) |
|
Line 297 html_mdoc(void *arg, const struct roff_man *mdoc) |
|
if (n->type == ROFFT_COMMENT) |
if (n->type == ROFFT_COMMENT) |
print_gen_comment(h, n); |
print_gen_comment(h, n); |
t = print_otag(h, TAG_HEAD, ""); |
t = print_otag(h, TAG_HEAD, ""); |
print_mdoc_head(&mdoc->meta, h); |
print_mdoc_head(mdoc, h); |
print_tagq(h, t); |
print_tagq(h, t); |
print_otag(h, TAG_BODY, ""); |
print_otag(h, TAG_BODY, ""); |
} |
} |
|
|
mdoc_root_pre(&mdoc->meta, h); |
mdoc_root_pre(mdoc, h); |
t = print_otag(h, TAG_DIV, "c", "manual-text"); |
t = print_otag(h, TAG_DIV, "c", "manual-text"); |
print_mdoc_nodelist(&mdoc->meta, n, h); |
print_mdoc_nodelist(mdoc, n, h); |
print_tagq(h, t); |
print_tagq(h, t); |
mdoc_root_post(&mdoc->meta, h); |
mdoc_root_post(mdoc, h); |
print_tagq(h, NULL); |
print_tagq(h, NULL); |
} |
} |
|
|
Line 346 print_mdoc_nodelist(MDOC_ARGS) |
|
Line 345 print_mdoc_nodelist(MDOC_ARGS) |
|
static void |
static void |
print_mdoc_node(MDOC_ARGS) |
print_mdoc_node(MDOC_ARGS) |
{ |
{ |
int child; |
|
struct tag *t; |
struct tag *t; |
|
int child; |
|
|
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); |
|
|
child = 1; |
child = 1; |
t = h->tag; |
t = h->tag; |
n->flags &= ~NODE_ENDED; |
if (t->tag == TAG_P || t->tag == TAG_PRE) |
|
t = t->next; |
|
|
|
n->flags &= ~NODE_ENDED; |
switch (n->type) { |
switch (n->type) { |
case ROFFT_TEXT: |
case ROFFT_TEXT: |
/* No tables in this mode... */ |
/* No tables in this mode... */ |
Line 366 print_mdoc_node(MDOC_ARGS) |
|
Line 369 print_mdoc_node(MDOC_ARGS) |
|
* (i.e., within a <PRE>) don't print the newline. |
* (i.e., within a <PRE>) don't print the newline. |
*/ |
*/ |
if (*n->string == ' ' && n->flags & NODE_LINE && |
if (*n->string == ' ' && n->flags & NODE_LINE && |
(h->flags & (HTML_LITERAL | HTML_NONEWLINE)) == 0) |
(h->flags & HTML_NONEWLINE) == 0 && |
|
(n->flags & NODE_NOFILL) == 0) |
print_otag(h, TAG_BR, ""); |
print_otag(h, TAG_BR, ""); |
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); |
if (NODE_DELIMO & n->flags) |
if (NODE_DELIMO & n->flags) |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
return; |
break; |
case ROFFT_EQN: |
case ROFFT_EQN: |
print_eqn(h, n->eqn); |
print_eqn(h, n->eqn); |
break; |
break; |
Line 398 print_mdoc_node(MDOC_ARGS) |
|
Line 402 print_mdoc_node(MDOC_ARGS) |
|
assert(h->tblt == NULL); |
assert(h->tblt == NULL); |
if (n->tok < ROFF_MAX) { |
if (n->tok < ROFF_MAX) { |
roff_html_pre(h, n); |
roff_html_pre(h, n); |
child = 0; |
print_stagq(h, t); |
break; |
return; |
} |
} |
assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); |
assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); |
if (mdoc_html_acts[n->tok - MDOC_Dd].pre != NULL && |
if (mdoc_html_acts[n->tok - MDOC_Dd].pre != NULL && |
Line 414 print_mdoc_node(MDOC_ARGS) |
|
Line 418 print_mdoc_node(MDOC_ARGS) |
|
h->flags |= HTML_PREKEEP; |
h->flags |= HTML_PREKEEP; |
} |
} |
|
|
if (child && n->child) |
if (child && n->child != NULL) |
print_mdoc_nodelist(meta, n->child, h); |
print_mdoc_nodelist(meta, n->child, h); |
|
|
print_stagq(h, t); |
print_stagq(h, t); |
|
|
switch (n->type) { |
switch (n->type) { |
|
case ROFFT_TEXT: |
case ROFFT_EQN: |
case ROFFT_EQN: |
break; |
break; |
default: |
default: |
if (n->tok < ROFF_MAX || |
if (mdoc_html_acts[n->tok - MDOC_Dd].post == NULL || |
mdoc_html_acts[n->tok - MDOC_Dd].post == NULL || |
|
n->flags & NODE_ENDED) |
n->flags & NODE_ENDED) |
break; |
break; |
(*mdoc_html_acts[n->tok - MDOC_Dd].post)(meta, n, h); |
(*mdoc_html_acts[n->tok - MDOC_Dd].post)(meta, n, h); |
Line 432 print_mdoc_node(MDOC_ARGS) |
|
Line 436 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 515 mdoc_sh_pre(MDOC_ARGS) |
|
Line 525 mdoc_sh_pre(MDOC_ARGS) |
|
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BLOCK: |
case ROFFT_BLOCK: |
|
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) |
Line 534 mdoc_sh_pre(MDOC_ARGS) |
|
Line 545 mdoc_sh_pre(MDOC_ARGS) |
|
for (sn = n; sn != NULL; sn = sn->next) { |
for (sn = n; sn != NULL; sn = sn->next) { |
tsec = print_otag(h, TAG_LI, ""); |
tsec = print_otag(h, TAG_LI, ""); |
id = html_make_id(sn->head, 0); |
id = html_make_id(sn->head, 0); |
print_otag(h, TAG_A, "hR", id); |
tsub = print_otag(h, TAG_A, "hR", id); |
free(id); |
free(id); |
print_mdoc_nodelist(meta, sn->head->child, h); |
print_mdoc_nodelist(meta, sn->head->child, h); |
|
print_tagq(h, tsub); |
tsub = NULL; |
tsub = NULL; |
for (subn = sn->body->child; subn != NULL; |
for (subn = sn->body->child; subn != NULL; |
subn = subn->next) { |
subn = subn->next) { |
Line 580 mdoc_ss_pre(MDOC_ARGS) |
|
Line 592 mdoc_ss_pre(MDOC_ARGS) |
|
{ |
{ |
char *id; |
char *id; |
|
|
if (n->type != ROFFT_HEAD) |
switch (n->type) { |
|
case ROFFT_BLOCK: |
|
html_close_paragraph(h); |
return 1; |
return 1; |
|
case ROFFT_HEAD: |
|
break; |
|
case ROFFT_BODY: |
|
return 1; |
|
default: |
|
abort(); |
|
} |
|
|
id = html_make_id(n, 1); |
id = html_make_id(n, 1); |
print_otag(h, TAG_H2, "cTi", "Ss", id); |
print_otag(h, TAG_H2, "cTi", "Ss", id); |
Line 623 mdoc_cm_pre(MDOC_ARGS) |
|
Line 644 mdoc_cm_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_nd_pre(MDOC_ARGS) |
mdoc_nd_pre(MDOC_ARGS) |
{ |
{ |
if (n->type != ROFFT_BODY) |
switch (n->type) { |
|
case ROFFT_BLOCK: |
|
html_close_paragraph(h); |
return 1; |
return 1; |
|
case ROFFT_HEAD: |
|
return 0; |
|
case ROFFT_BODY: |
|
break; |
|
default: |
|
abort(); |
|
} |
print_text(h, "\\(em"); |
print_text(h, "\\(em"); |
/* Cannot use TAG_SPAN because it may contain blocks. */ |
/* Cannot use TAG_SPAN because it may contain blocks. */ |
print_otag(h, TAG_DIV, "cT", "Nd"); |
print_otag(h, TAG_DIV, "cT", "Nd"); |
|
|
mdoc_nm_pre(MDOC_ARGS) |
mdoc_nm_pre(MDOC_ARGS) |
{ |
{ |
switch (n->type) { |
switch (n->type) { |
|
case ROFFT_BLOCK: |
|
break; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
print_otag(h, TAG_TD, ""); |
print_otag(h, TAG_TD, ""); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 646 mdoc_nm_pre(MDOC_ARGS) |
|
Line 677 mdoc_nm_pre(MDOC_ARGS) |
|
print_otag(h, TAG_TD, ""); |
print_otag(h, TAG_TD, ""); |
return 1; |
return 1; |
default: |
default: |
break; |
abort(); |
} |
} |
|
html_close_paragraph(h); |
synopsis_pre(h, n); |
synopsis_pre(h, n); |
print_otag(h, TAG_TABLE, "c", "Nm"); |
print_otag(h, TAG_TABLE, "c", "Nm"); |
print_otag(h, TAG_TR, ""); |
print_otag(h, TAG_TR, ""); |
|
|
mdoc_it_pre(MDOC_ARGS) |
mdoc_it_pre(MDOC_ARGS) |
{ |
{ |
const struct roff_node *bl; |
const struct roff_node *bl; |
struct tag *t; |
|
enum mdoc_list type; |
enum mdoc_list type; |
|
|
bl = n->parent; |
bl = n->parent; |
Line 751 mdoc_it_pre(MDOC_ARGS) |
|
Line 782 mdoc_it_pre(MDOC_ARGS) |
|
case LIST_tag: |
case LIST_tag: |
switch (n->type) { |
switch (n->type) { |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
if (h->style != NULL && !bl->norm->Bl.comp && |
|
(n->parent->prev == NULL || |
|
n->parent->prev->body == NULL || |
|
n->parent->prev->body->child != NULL)) { |
|
t = print_otag(h, TAG_DT, ""); |
|
print_text(h, "\\ "); |
|
print_tagq(h, t); |
|
t = print_otag(h, TAG_DD, ""); |
|
print_text(h, "\\ "); |
|
print_tagq(h, t); |
|
} |
|
print_otag(h, TAG_DT, ""); |
print_otag(h, TAG_DT, ""); |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
Line 795 mdoc_it_pre(MDOC_ARGS) |
|
Line 815 mdoc_it_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_bl_pre(MDOC_ARGS) |
mdoc_bl_pre(MDOC_ARGS) |
{ |
{ |
char cattr[28]; |
char cattr[32]; |
struct mdoc_bl *bl; |
struct mdoc_bl *bl; |
enum htmltag elemtype; |
enum htmltag elemtype; |
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BODY: |
case ROFFT_BLOCK: |
return 1; |
html_close_paragraph(h); |
|
break; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
return 0; |
return 0; |
|
case ROFFT_BODY: |
|
return 1; |
default: |
default: |
break; |
abort(); |
} |
} |
|
|
bl = &n->norm->Bl; |
bl = &n->norm->Bl; |
Line 889 mdoc_em_pre(MDOC_ARGS) |
|
Line 912 mdoc_em_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_d1_pre(MDOC_ARGS) |
mdoc_d1_pre(MDOC_ARGS) |
{ |
{ |
if (n->type != ROFFT_BLOCK) |
switch (n->type) { |
|
case ROFFT_BLOCK: |
|
html_close_paragraph(h); |
|
break; |
|
case ROFFT_HEAD: |
|
return 0; |
|
case ROFFT_BODY: |
return 1; |
return 1; |
|
default: |
|
abort(); |
|
} |
print_otag(h, TAG_DIV, "c", "Bd Bd-indent"); |
print_otag(h, TAG_DIV, "c", "Bd Bd-indent"); |
|
|
if (n->tok == MDOC_Dl) |
if (n->tok == MDOC_Dl) |
print_otag(h, TAG_CODE, "c", "Li"); |
print_otag(h, TAG_CODE, "c", "Li"); |
|
|
return 1; |
return 1; |
} |
} |
|
|
Line 914 mdoc_sx_pre(MDOC_ARGS) |
|
Line 943 mdoc_sx_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_bd_pre(MDOC_ARGS) |
mdoc_bd_pre(MDOC_ARGS) |
{ |
{ |
int comp, sv; |
char buf[16]; |
struct roff_node *nn; |
struct roff_node *nn; |
|
int comp; |
|
|
if (n->type == ROFFT_HEAD) |
switch (n->type) { |
return 0; |
case ROFFT_BLOCK: |
|
html_close_paragraph(h); |
if (n->type == ROFFT_BLOCK) { |
|
comp = n->norm->Bd.comp; |
|
for (nn = n; nn && ! comp; nn = nn->parent) { |
|
if (nn->type != ROFFT_BLOCK) |
|
continue; |
|
if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok) |
|
comp = 1; |
|
if (nn->prev) |
|
break; |
|
} |
|
if ( ! comp) |
|
print_paragraph(h); |
|
return 1; |
return 1; |
|
case ROFFT_HEAD: |
|
return 0; |
|
case ROFFT_BODY: |
|
break; |
|
default: |
|
abort(); |
} |
} |
|
|
/* Handle the -offset argument. */ |
/* Handle preceding whitespace. */ |
|
|
if (n->norm->Bd.offs == NULL || |
comp = n->norm->Bd.comp; |
! strcmp(n->norm->Bd.offs, "left")) |
for (nn = n; nn != NULL && comp == 0; nn = nn->parent) { |
print_otag(h, TAG_DIV, "c", "Bd"); |
if (nn->type != ROFFT_BLOCK) |
else |
|
print_otag(h, TAG_DIV, "c", "Bd Bd-indent"); |
|
|
|
if (n->norm->Bd.type != DISP_unfilled && |
|
n->norm->Bd.type != DISP_literal) |
|
return 1; |
|
|
|
print_otag(h, TAG_PRE, "c", "Li"); |
|
|
|
/* 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) { |
|
print_mdoc_node(meta, nn, h); |
|
/* |
|
* If the printed node flushes its own line, then we |
|
* needn't do it here as well. This is hacky, but the |
|
* notion of selective eoln whitespace is pretty dumb |
|
* anyway, so don't sweat it. |
|
*/ |
|
switch (nn->tok) { |
|
case ROFF_br: |
|
case ROFF_sp: |
|
case MDOC_Sm: |
|
case MDOC_Bl: |
|
case MDOC_D1: |
|
case MDOC_Dl: |
|
case MDOC_Pp: |
|
continue; |
continue; |
default: |
if (nn->tok == MDOC_Sh || nn->tok == MDOC_Ss) |
|
comp = 1; |
|
if (nn->prev != NULL) |
break; |
break; |
} |
|
if (h->flags & HTML_NONEWLINE || |
|
(nn->next && ! (nn->next->flags & NODE_LINE))) |
|
continue; |
|
else if (nn->next) |
|
print_text(h, "\n"); |
|
|
|
h->flags |= HTML_NOSPACE; |
|
} |
} |
|
(void)strlcpy(buf, "Bd", sizeof(buf)); |
|
if (comp == 0) |
|
(void)strlcat(buf, " Pp", sizeof(buf)); |
|
|
if (0 == sv) |
/* Handle the -offset argument. */ |
h->flags &= ~HTML_LITERAL; |
|
|
|
return 0; |
if (n->norm->Bd.offs != NULL && |
|
strcmp(n->norm->Bd.offs, "left") != 0) |
|
(void)strlcat(buf, " Bd-indent", sizeof(buf)); |
|
|
|
print_otag(h, TAG_DIV, "c", buf); |
|
return 1; |
} |
} |
|
|
static int |
static int |
Line 1270 mdoc_skip_pre(MDOC_ARGS) |
|
Line 1265 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) { |
print_paragraph(h); |
html_close_paragraph(h); |
|
print_otag(h, TAG_P, "c", "Pp"); |
|
} |
return 0; |
return 0; |
} |
} |
|
|
Line 1446 mdoc_bf_pre(MDOC_ARGS) |
|
Line 1443 mdoc_bf_pre(MDOC_ARGS) |
|
{ |
{ |
const char *cattr; |
const char *cattr; |
|
|
if (n->type == ROFFT_HEAD) |
switch (n->type) { |
return 0; |
case ROFFT_BLOCK: |
else if (n->type != ROFFT_BODY) |
html_close_paragraph(h); |
return 1; |
return 1; |
|
case ROFFT_HEAD: |
|
return 0; |
|
case ROFFT_BODY: |
|
break; |
|
default: |
|
abort(); |
|
} |
|
|
if (FONT_Em == n->norm->Bf.font) |
if (FONT_Em == n->norm->Bf.font) |
cattr = "Bf Em"; |
cattr = "Bf Em"; |
Line 1495 mdoc_pf_post(MDOC_ARGS) |
|
Line 1499 mdoc_pf_post(MDOC_ARGS) |
|
static int |
static int |
mdoc_rs_pre(MDOC_ARGS) |
mdoc_rs_pre(MDOC_ARGS) |
{ |
{ |
if (n->type != ROFFT_BLOCK) |
switch (n->type) { |
return 1; |
case ROFFT_BLOCK: |
|
if (n->sec == SEC_SEE_ALSO) |
if (n->prev && SEC_SEE_ALSO == n->sec) |
html_close_paragraph(h); |
print_paragraph(h); |
break; |
|
case ROFFT_HEAD: |
print_otag(h, TAG_CITE, "cT", "Rs"); |
return 0; |
|
case ROFFT_BODY: |
|
if (n->sec == SEC_SEE_ALSO) |
|
print_otag(h, TAG_P, "c", "Pp"); |
|
print_otag(h, TAG_CITE, "cT", "Rs"); |
|
break; |
|
default: |
|
abort(); |
|
} |
return 1; |
return 1; |
} |
} |
|
|
Line 1678 mdoc_quote_pre(MDOC_ARGS) |
|
Line 1690 mdoc_quote_pre(MDOC_ARGS) |
|
case MDOC_Oo: |
case MDOC_Oo: |
case MDOC_Op: |
case MDOC_Op: |
print_text(h, "\\(lB"); |
print_text(h, "\\(lB"); |
h->flags |= HTML_NOSPACE; |
/* |
/* Cannot use TAG_SPAN because it may contain blocks. */ |
* Give up on semantic markup for now. |
print_otag(h, TAG_IDIV, "c", "Op"); |
* We cannot use TAG_SPAN because .Oo may contain blocks. |
|
* We cannot use TAG_IDIV because we might be in a |
|
* phrasing context (like .Dl or .Pp); we cannot |
|
* close out a .Pp at this point either because |
|
* that would break the line. |
|
*/ |
|
/* XXX print_otag(h, TAG_???, "c", "Op"); */ |
break; |
break; |
case MDOC_En: |
case MDOC_En: |
if (NULL == n->norm->Es || |
if (NULL == n->norm->Es || |