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 f023a9c439b02532c80131e12430d0891131dace..3cc7c19a8a511a1e049bb9b3e396013f9a7f2198 100644 (file)
--- a/roff_html.c
+++ b/roff_html.c
@@ -1,7 +1,7 @@
-/*     $Id: roff_html.c,v 1.8 2017/06/08 12:54:58 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 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,11 +15,15 @@
  * 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>
-#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 
+#include "mandoc.h"
 #include "roff.h"
 #include "out.h"
 #include "html.h"
@@ -30,14 +34,21 @@ 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 */
-       NULL,  /* ft */
+       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 */
        NULL,  /* ta */
        NULL,  /* ti */
@@ -55,11 +66,7 @@ roff_html_pre(struct html *h, const struct roff_node *n)
 static void
 roff_html_pre_br(ROFF_HTML_ARGS)
 {
-       struct tag      *t;
-
-       t = print_otag(h, TAG_DIV, "");
-       print_text(h, "\\~");  /* So the div isn't empty. */
-       print_tagq(h, t);
+       print_otag(h, TAG_BR, "");
 }
 
 static void
@@ -76,18 +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;
+       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)
 {
-       struct roffsu    su;
-
-       SCALE_VS_INIT(&su, 1);
-       if ((n = n->child) != NULL) {
-               if (a2roffsu(n->string, &su, SCALE_VS) == NULL)
-                       su.scale = 1.0;
-               else if (su.scale < 0.0)
-                       su.scale = 0.0;
+       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");
        }
-       print_otag(h, TAG_DIV, "suh", &su);
-       print_text(h, "\\~");  /* So the div isn't empty. */
 }