version 1.325, 2019/01/11 12:56:43 |
version 1.327, 2019/01/18 14:36:21 |
|
|
/* $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,2015,2016,2017,2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2014-2019 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 294 html_mdoc(void *arg, const struct roff_meta *mdoc) |
|
Line 294 html_mdoc(void *arg, const struct roff_meta *mdoc) |
|
if ((h->oflags & HTML_FRAGMENT) == 0) { |
if ((h->oflags & HTML_FRAGMENT) == 0) { |
print_gen_decls(h); |
print_gen_decls(h); |
print_otag(h, TAG_HTML, ""); |
print_otag(h, TAG_HTML, ""); |
if (n->type == ROFFT_COMMENT) |
if (n != NULL && 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, h); |
print_mdoc_head(mdoc, h); |
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) { |