Implement centering and adjustment to the right margin directly in

[mandoc.git] / roff_html.c

diff --git a/roff_html.c b/roff_html.c
index abb2ddf941dc0b72e02fc885f81bb7925d1f04dd..a4d4468d67c2843c659da5427b0e06798cf2ab5d 100644 (file)
--- a/roff_html.c
+++ b/roff_html.c
@@ -1,7 +1,7 @@
-/*     $Id: roff_html.c,v 1.7 2017/06/06 15:01:04 schwarze Exp $ */
+/*     $Id: roff_html.c,v 1.16 2018/12/31 07:08:12 schwarze Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2017, 2018 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
@@ -18,8 +18,10 @@
 #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 +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_ft(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_br,  /* fi */
+       roff_html_pre_ft,  /* ft */
        NULL,  /* ll */
        NULL,  /* mc */
+       roff_html_pre_br,  /* nf */
+       NULL,  /* po */
+       roff_html_pre_ce,  /* rj */
        roff_html_pre_sp,  /* sp */
        NULL,  /* ta */
        NULL,  /* ti */
@@ -55,11 +62,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
@@ -77,17 +80,16 @@ roff_html_pre_ce(ROFF_HTML_ARGS)
 }
 
 static void
-roff_html_pre_sp(ROFF_HTML_ARGS)
+roff_html_pre_ft(ROFF_HTML_ARGS)
 {
-       struct roffsu    su;
+       const char      *cp;
 
-       SCALE_VS_INIT(&su, 1);
-       if ((n = n->child) != NULL) {
-               if (a2roffsu(n->string, &su, SCALE_VS) == 0)
-                       su.scale = 1.0;
-               else if (su.scale < 0.0)
-                       su.scale = 0.0;
-       }
-       print_otag(h, TAG_DIV, "suh", &su);
-       print_text(h, "\\~");  /* So the div isn't empty. */
+       cp = n->child->string;
+       print_metaf(h, mandoc_font(cp, (int)strlen(cp)));
+}
+
+static void
+roff_html_pre_sp(ROFF_HTML_ARGS)
+{
+       print_paragraph(h);
 }