Document that -T markdown produces ASCII output, and the implied

[mandoc.git] / eqn_html.c

diff --git a/eqn_html.c b/eqn_html.c
index 738286844bf924b00e8143f25398e6eaec506e3b..b6e7d914b86e241db7f2dd425f3d46ea41495e7d 100644 (file)
--- a/eqn_html.c
+++ b/eqn_html.c
@@ -1,6 +1,7 @@
-/*     $Id: eqn_html.c,v 1.8 2014/10/10 08:44:24 kristaps Exp $ */
+/*     $Id: eqn_html.c,v 1.11 2017/01/17 01:47:51 schwarze Exp $ */
 /*
- * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 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
@@ -31,7 +32,6 @@ static void
 eqn_box(struct html *p, const struct eqn_box *bp)
 {
        struct tag      *post, *row, *cell, *t;
-       struct htmlpair  tag[2];
        const struct eqn_box *child, *parent;
        size_t           i, j, rows;
 
@@ -47,20 +47,22 @@ eqn_box(struct html *p, const struct eqn_box *bp)
        if (EQN_MATRIX == bp->type) {
                if (NULL == bp->first)
                        goto out;
-               assert(EQN_LIST == bp->first->type);
+               if (EQN_LIST != bp->first->type) {
+                       eqn_box(p, bp->first);
+                       goto out;
+               }
                if (NULL == (parent = bp->first->first))
                        goto out;
-               assert(EQN_PILE == parent->type);
                /* Estimate the number of rows, first. */
                if (NULL == (child = parent->first))
                        goto out;
-               for (rows = 0; NULL != child; rows++) 
+               for (rows = 0; NULL != child; rows++)
                        child = child->next;
                /* Print row-by-row. */
-               post = print_otag(p, TAG_MTABLE, 0, NULL);
+               post = print_otag(p, TAG_MTABLE, "");
                for (i = 0; i < rows; i++) {
                        parent = bp->first->first;
-                       row = print_otag(p, TAG_MTR, 0, NULL);
+                       row = print_otag(p, TAG_MTR, "");
                        while (NULL != parent) {
                                child = parent->first;
                                for (j = 0; j < i; j++) {
@@ -68,14 +70,13 @@ eqn_box(struct html *p, const struct eqn_box *bp)
                                                break;
                                        child = child->next;
                                }
-                               cell = print_otag
-                                       (p, TAG_MTD, 0, NULL);
-                               /* 
+                               cell = print_otag(p, TAG_MTD, "");
+                               /*
                                 * If we have no data for this
                                 * particular cell, then print a
                                 * placeholder and continue--don't puke.
                                 */
-                               if (NULL != child) 
+                               if (NULL != child)
                                        eqn_box(p, child->first);
                                print_tagq(p, cell);
                                parent = parent->next;
@@ -87,28 +88,28 @@ eqn_box(struct html *p, const struct eqn_box *bp)
 
        switch (bp->pos) {
        case (EQNPOS_TO):
-               post = print_otag(p, TAG_MOVER, 0, NULL);
+               post = print_otag(p, TAG_MOVER, "");
                break;
        case (EQNPOS_SUP):
-               post = print_otag(p, TAG_MSUP, 0, NULL);
+               post = print_otag(p, TAG_MSUP, "");
                break;
        case (EQNPOS_FROM):
-               post = print_otag(p, TAG_MUNDER, 0, NULL);
+               post = print_otag(p, TAG_MUNDER, "");
                break;
        case (EQNPOS_SUB):
-               post = print_otag(p, TAG_MSUB, 0, NULL);
+               post = print_otag(p, TAG_MSUB, "");
                break;
        case (EQNPOS_OVER):
-               post = print_otag(p, TAG_MFRAC, 0, NULL);
+               post = print_otag(p, TAG_MFRAC, "");
                break;
        case (EQNPOS_FROMTO):
-               post = print_otag(p, TAG_MUNDEROVER, 0, NULL);
+               post = print_otag(p, TAG_MUNDEROVER, "");
                break;
        case (EQNPOS_SUBSUP):
-               post = print_otag(p, TAG_MSUBSUP, 0, NULL);
+               post = print_otag(p, TAG_MSUBSUP, "");
                break;
        case (EQNPOS_SQRT):
-               post = print_otag(p, TAG_MSQRT, 0, NULL);
+               post = print_otag(p, TAG_MSQRT, "");
                break;
        default:
                break;
@@ -117,50 +118,49 @@ eqn_box(struct html *p, const struct eqn_box *bp)
        if (bp->top || bp->bottom) {
                assert(NULL == post);
                if (bp->top && NULL == bp->bottom)
-                       post = print_otag(p, TAG_MOVER, 0, NULL);
+                       post = print_otag(p, TAG_MOVER, "");
                else if (bp->top && bp->bottom)
-                       post = print_otag(p, TAG_MUNDEROVER, 0, NULL);
+                       post = print_otag(p, TAG_MUNDEROVER, "");
                else if (bp->bottom)
-                       post = print_otag(p, TAG_MUNDER, 0, NULL);
+                       post = print_otag(p, TAG_MUNDER, "");
        }
 
        if (EQN_PILE == bp->type) {
                assert(NULL == post);
-               post = print_otag(p, TAG_MTABLE, 0, NULL);
-       } else if (bp->parent && EQN_PILE == bp->parent->type) {
+               if (bp->first != NULL && bp->first->type == EQN_LIST)
+                       post = print_otag(p, TAG_MTABLE, "");
+       } else if (bp->type == EQN_LIST &&
+           bp->parent && bp->parent->type == EQN_PILE) {
                assert(NULL == post);
-               post = print_otag(p, TAG_MTR, 0, NULL);
-               print_otag(p, TAG_MTD, 0, NULL);
+               post = print_otag(p, TAG_MTR, "");
+               print_otag(p, TAG_MTD, "");
        }
 
        if (NULL != bp->text) {
                assert(NULL == post);
-               post = print_otag(p, TAG_MI, 0, NULL);
+               post = print_otag(p, TAG_MI, "");
                print_text(p, bp->text);
-       } else if (NULL == post) { 
-               if (NULL != bp->left || NULL != bp->right) {
-                       PAIR_INIT(&tag[0], ATTR_OPEN,
-                               NULL == bp->left ? "" : bp->left);
-                       PAIR_INIT(&tag[1], ATTR_CLOSE,
-                               NULL == bp->right ? "" : bp->right);
-                       post = print_otag(p, TAG_MFENCED, 2, tag);
-               } 
+       } else if (NULL == post) {
+               if (NULL != bp->left || NULL != bp->right)
+                       post = print_otag(p, TAG_MFENCED, "??",
+                           "open", bp->left == NULL ? "" : bp->left,
+                           "close", bp->right == NULL ? "" : bp->right);
                if (NULL == post)
-                       post = print_otag(p, TAG_MROW, 0, NULL);
+                       post = print_otag(p, TAG_MROW, "");
                else
-                       print_otag(p, TAG_MROW, 0, NULL);
+                       print_otag(p, TAG_MROW, "");
        }
 
        eqn_box(p, bp->first);
 
 out:
        if (NULL != bp->bottom) {
-               t = print_otag(p, TAG_MO, 0, NULL);
+               t = print_otag(p, TAG_MO, "");
                print_text(p, bp->bottom);
                print_tagq(p, t);
-       } 
+       }
        if (NULL != bp->top) {
-               t = print_otag(p, TAG_MO, 0, NULL);
+               t = print_otag(p, TAG_MO, "");
                print_text(p, bp->top);
                print_tagq(p, t);
        }
@@ -174,11 +174,9 @@ out:
 void
 print_eqn(struct html *p, const struct eqn *ep)
 {
-       struct htmlpair  tag;
        struct tag      *t;
 
-       PAIR_CLASS_INIT(&tag, "eqn");
-       t = print_otag(p, TAG_MATH, 1, &tag);
+       t = print_otag(p, TAG_MATH, "c", "eqn");
 
        p->flags |= HTML_NONOSPACE;
        eqn_box(p, ep->root);