do not break the line between Bsx/Bx/Fx/Nx/Ox/Dx and its arguments

[mandoc.git] / roff_html.c

diff --git a/roff_html.c b/roff_html.c
index 3e30aa14fd763a1f870448e11ae5d50fbc366873..f023a9c439b02532c80131e12430d0891131dace 100644 (file)
--- a/roff_html.c
+++ b/roff_html.c
@@ -1,6 +1,7 @@
-/*     $OpenBSD$ */
+/*     $Id: roff_html.c,v 1.8 2017/06/08 12:54:58 schwarze Exp $ */
 /*
- * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014, 2017 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
@@ -28,10 +29,18 @@
 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_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 */
+       NULL,  /* ll */
+       NULL,  /* mc */
+       roff_html_pre_sp,  /* sp */
+       NULL,  /* ta */
+       NULL,  /* ti */
 };
 
 
@@ -46,6 +55,39 @@ 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, "");
+       struct tag      *t;
+
+       t = print_otag(h, TAG_DIV, "");
+       print_text(h, "\\~");  /* So the div isn't empty. */
+       print_tagq(h, t);
+}
+
+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_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;
+       }
+       print_otag(h, TAG_DIV, "suh", &su);
        print_text(h, "\\~");  /* So the div isn't empty. */
 }