=================================================================== RCS file: /cvs/mandoc/mdoc_html.c,v retrieving revision 1.326 retrieving revision 1.327 diff -u -p -r1.326 -r1.327 --- mandoc/mdoc_html.c 2019/01/11 16:36:19 1.326 +++ mandoc/mdoc_html.c 2019/01/18 14:36:21 1.327 @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.326 2019/01/11 16:36:19 schwarze Exp $ */ +/* $Id: mdoc_html.c,v 1.327 2019/01/18 14:36:21 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons * Copyright (c) 2014-2019 Ingo Schwarze @@ -354,13 +354,12 @@ print_mdoc_node(MDOC_ARGS) html_fillmode(h, n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi); child = 1; - t = h->tag; - if (t->tag == TAG_P || t->tag == TAG_PRE) - t = t->next; - n->flags &= ~NODE_ENDED; switch (n->type) { case ROFFT_TEXT: + t = h->tag; + t->refcnt++; + /* No tables in this mode... */ assert(NULL == h->tblt); @@ -379,6 +378,8 @@ print_mdoc_node(MDOC_ARGS) h->flags |= HTML_NOSPACE; break; case ROFFT_EQN: + t = h->tag; + t->refcnt++; print_eqn(h, n->eqn); break; case ROFFT_TBL: @@ -395,13 +396,14 @@ print_mdoc_node(MDOC_ARGS) * the "meta" table state. This will be reopened on the * next table element. */ - if (h->tblt != NULL) { + if (h->tblt != NULL) print_tblclose(h); - t = h->tag; - } assert(h->tblt == NULL); + t = h->tag; + t->refcnt++; if (n->tok < ROFF_MAX) { roff_html_pre(h, n); + t->refcnt--; print_stagq(h, t); return; } @@ -421,6 +423,7 @@ print_mdoc_node(MDOC_ARGS) if (child && n->child != NULL) print_mdoc_nodelist(meta, n->child, h); + t->refcnt--; print_stagq(h, t); switch (n->type) {