In man(1) mode, properly clean up the resn[] result array

[mandoc.git] / roff_html.c

diff --git a/roff_html.c b/roff_html.c
index adcbbf5be67fd52643d6c889a9b7e49640b6fcc6..3cc7c19a8a511a1e049bb9b3e396013f9a7f2198 100644 (file)
--- a/roff_html.c
+++ b/roff_html.c
@@ -1,7 +1,7 @@
-/*     $Id: roff_html.c,v 1.15 2018/12/16 00:17:02 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 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2017, 2018, 2019 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -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>
@@ -32,15 +34,19 @@ typedef     void    (*roff_html_pre_fp)(ROFF_HTML_ARGS);
 
 static void      roff_html_pre_br(ROFF_HTML_ARGS);
 static void      roff_html_pre_ce(ROFF_HTML_ARGS);
+static void      roff_html_pre_fi(ROFF_HTML_ARGS);
 static void      roff_html_pre_ft(ROFF_HTML_ARGS);
+static void      roff_html_pre_nf(ROFF_HTML_ARGS);
 static void      roff_html_pre_sp(ROFF_HTML_ARGS);
 
 static const roff_html_pre_fp roff_html_pre_acts[ROFF_MAX] = {
        roff_html_pre_br,  /* br */
        roff_html_pre_ce,  /* ce */
+       roff_html_pre_fi,  /* fi */
        roff_html_pre_ft,  /* ft */
        NULL,  /* ll */
        NULL,  /* mc */
+       roff_html_pre_nf,  /* nf */
        NULL,  /* po */
        roff_html_pre_ce,  /* rj */
        roff_html_pre_sp,  /* sp */
@@ -77,17 +83,37 @@ roff_html_pre_ce(ROFF_HTML_ARGS)
        roff_html_pre_br(h, n);
 }
 
+static void
+roff_html_pre_fi(ROFF_HTML_ARGS)
+{
+       if (html_fillmode(h, TOKEN_NONE) == ROFF_fi)
+               print_otag(h, TAG_BR, "");
+}
+
 static void
 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
+roff_html_pre_nf(ROFF_HTML_ARGS)
+{
+       if (html_fillmode(h, TOKEN_NONE) == ROFF_nf)
+               print_otag(h, TAG_BR, "");
 }
 
 static void
 roff_html_pre_sp(ROFF_HTML_ARGS)
 {
-       print_paragraph(h);
+       if (html_fillmode(h, TOKEN_NONE) == ROFF_nf) {
+               h->col++;
+               print_endline(h);
+       } else {
+               html_close_paragraph(h);
+               print_otag(h, TAG_P, "c", "Pp");
+       }
 }