Tedu support for the -xsh4.2 argument to the mdoc(7) .St macro

[mandoc.git] / eqn_html.c

diff --git a/eqn_html.c b/eqn_html.c
index 2d9eeb8a3afbc143b0101c5fda61ccfde8992be2..64d06649997feeb3a482a64b00c09387c8cea1f3 100644 (file)
--- a/eqn_html.c
+++ b/eqn_html.c
@@ -1,4 +1,4 @@
-/*     $Id: eqn_html.c,v 1.14 2017/06/23 23:00:01 schwarze Exp $ */
+/*     $Id: eqn_html.c,v 1.19 2019/03/17 18:21:45 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,6 +26,8 @@
 #include <string.h>
 
 #include "mandoc.h"
+#include "roff.h"
+#include "eqn.h"
 #include "out.h"
 #include "html.h"
 
@@ -51,7 +53,8 @@ eqn_box(struct html *p, const struct eqn_box *bp)
        if (EQN_MATRIX == bp->type) {
                if (NULL == bp->first)
                        goto out;
-               if (EQN_LIST != bp->first->type) {
+               if (bp->first->type != EQN_LIST ||
+                   bp->first->expectargs == 1) {
                        eqn_box(p, bp->first);
                        goto out;
                }
@@ -131,9 +134,11 @@ eqn_box(struct html *p, const struct eqn_box *bp)
 
        if (EQN_PILE == bp->type) {
                assert(NULL == post);
-               if (bp->first != NULL && bp->first->type == EQN_LIST)
+               if (bp->first != NULL &&
+                   bp->first->type == EQN_LIST &&
+                   bp->first->expectargs > 1)
                        post = print_otag(p, TAG_MTABLE, "");
-       } else if (bp->type == EQN_LIST &&
+       } else if (bp->type == EQN_LIST && bp->expectargs > 1 &&
            bp->parent && bp->parent->type == EQN_PILE) {
                assert(NULL == post);
                post = print_otag(p, TAG_MTR, "");
@@ -224,14 +229,17 @@ out:
 }
 
 void
-print_eqn(struct html *p, const struct eqn *ep)
+print_eqn(struct html *p, const struct eqn_box *bp)
 {
        struct tag      *t;
 
+       if (bp->first == NULL)
+               return;
+
        t = print_otag(p, TAG_MATH, "c", "eqn");
 
        p->flags |= HTML_NONOSPACE;
-       eqn_box(p, ep->root);
+       eqn_box(p, bp);
        p->flags &= ~HTML_NONOSPACE;
 
        print_tagq(p, t);