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 3e30aa14fd763a1f870448e11ae5d50fbc366873..3cc7c19a8a511a1e049bb9b3e396013f9a7f2198 100644 (file)
--- a/roff_html.c
+++ b/roff_html.c
@@ -1,6 +1,7 @@
-/*     $OpenBSD$ */
+/* $Id: roff_html.c,v 1.21 2020/06/22 19:20:40 schwarze Exp $ */
 /*
- * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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
@@ -14,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"
@@ -28,10 +33,25 @@
 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 */
-       NULL,  /* ft */
+       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 */
+       NULL,  /* ta */
+       NULL,  /* ti */
 };
 
 
@@ -46,6 +66,54 @@ roff_html_pre(struct html *h, const struct roff_node *n)
 static void
 roff_html_pre_br(ROFF_HTML_ARGS)
 {
-       print_otag(h, TAG_DIV, "");
-       print_text(h, "\\~");  /* So the div isn't empty. */
+       print_otag(h, TAG_BR, "");
+}
+
+static void
+roff_html_pre_ce(ROFF_HTML_ARGS)
+{
+       for (n = n->child->next; n != NULL; n = n->next) {
+               if (n->type == ROFFT_TEXT) {
+                       if (n->flags & NODE_LINE)
+                               roff_html_pre_br(h, n);
+                       print_text(h, n->string);
+               } else
+                       roff_html_pre(h, n);
+       }
+       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)
+{
+       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");
+       }
 }