John Gardner: handling of ASCII control characters during input

[mandoc.git] / roff_html.c

diff --git a/roff_html.c b/roff_html.c
index 6a06c0d8789debf3af306ec7606262ab789ed984..e525aa2ede6802b7bff6c5efc6545323a163f26c 100644 (file)
--- a/roff_html.c
+++ b/roff_html.c
@@ -1,7 +1,7 @@
-/*     $Id: roff_html.c,v 1.12 2018/06/25 14:53:58 schwarze Exp $ */
+/*     $Id: roff_html.c,v 1.20 2019/04/30 15:53:01 schwarze Exp $ */

 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -18,7 +18,8 @@
 #include <sys/types.h>
 
 #include <assert.h>
 #include <sys/types.h>
 
 #include <assert.h>

-#include <stddef.h>
+#include <stdio.h>
+#include <string.h>

 
 #include "mandoc.h"
 #include "roff.h"
 
 #include "mandoc.h"
 #include "roff.h"


@@ -31,14 +32,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_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 */
 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 */
        NULL,  /* ll */
        NULL,  /* mc */

+       roff_html_pre_nf,  /* nf */

        NULL,  /* po */
        roff_html_pre_ce,  /* rj */
        roff_html_pre_sp,  /* sp */
        NULL,  /* po */
        roff_html_pre_ce,  /* rj */
        roff_html_pre_sp,  /* sp */


@@ -58,11 +64,7 @@ roff_html_pre(struct html *h, const struct roff_node *n)
 static void
 roff_html_pre_br(ROFF_HTML_ARGS)
 {
 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
 }
 
 static void


@@ -79,8 +81,37 @@ roff_html_pre_ce(ROFF_HTML_ARGS)
        roff_html_pre_br(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)
 {
 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");
+       }

 }
 }