Revert part of the previous diff to fix a regression (another endless loop)

[mandoc.git] / roff_html.c

diff --git a/roff_html.c b/roff_html.c
index dabf7ca942c46be18db1ce23ebe67d17f02cf518..3cc7c19a8a511a1e049bb9b3e396013f9a7f2198 100644 (file)
--- a/roff_html.c
+++ b/roff_html.c
@@ -1,4 +1,4 @@
-/*     $Id: roff_html.c,v 1.18 2019/01/06 04:55:09 schwarze Exp $ */
+/* $Id: roff_html.c,v 1.21 2020/06/22 19:20:40 schwarze Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2017, 2018, 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,6 +15,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <assert.h>
@@ -94,7 +96,7 @@ roff_html_pre_ft(ROFF_HTML_ARGS)
        const char      *cp;
 
        cp = n->child->string;
-       print_metaf(h, mandoc_font(cp, (int)strlen(cp)));
+       html_setfont(h, mandoc_font(cp, (int)strlen(cp)));
 }
 
 static void
@@ -110,8 +112,8 @@ roff_html_pre_sp(ROFF_HTML_ARGS)
        if (html_fillmode(h, TOKEN_NONE) == ROFF_nf) {
                h->col++;
                print_endline(h);
-       } else if (n->parent->tok >= MAN_TH)
+       } else {
+               html_close_paragraph(h);
                print_otag(h, TAG_P, "c", "Pp");
-       else
-               print_paragraph(h);
+       }
 }