=================================================================== RCS file: /cvs/mandoc/eqn_html.c,v retrieving revision 1.1 retrieving revision 1.12 diff -u -p -r1.1 -r1.12 --- mandoc/eqn_html.c 2011/07/23 22:57:13 1.1 +++ mandoc/eqn_html.c 2017/06/20 17:24:35 1.12 @@ -1,6 +1,7 @@ -/* $Id: eqn_html.c,v 1.1 2011/07/23 22:57:13 kristaps Exp $ */ +/* $Id: eqn_html.c,v 1.12 2017/06/20 17:24:35 schwarze Exp $ */ /* - * Copyright (c) 2011 Kristaps Dzonsons + * Copyright (c) 2011, 2014 Kristaps Dzonsons + * Copyright (c) 2017 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,10 +15,10 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif +#include + #include #include #include @@ -27,63 +28,159 @@ #include "out.h" #include "html.h" -static void eqn_box(struct html *, const struct eqn_box *); -static void eqn_box_post(struct html *, const struct eqn_box *); -static void eqn_box_pre(struct html *, const struct eqn_box *); -static void eqn_text(struct html *, const struct eqn_box *); - -void -print_eqn(struct html *p, const struct eqn *ep) +static void +eqn_box(struct html *p, const struct eqn_box *bp) { - struct htmlpair tag; - struct tag *t; + struct tag *post, *row, *cell, *t; + const struct eqn_box *child, *parent; + size_t i, j, rows; - PAIR_CLASS_INIT(&tag, "eqn"); - t = print_otag(p, TAG_SPAN, 1, &tag); + if (NULL == bp) + return; - p->flags |= HTML_NONOSPACE; - eqn_box(p, ep->root); - p->flags &= ~HTML_NONOSPACE; + post = NULL; - print_tagq(p, t); -} + /* + * Special handling for a matrix, which is presented to us in + * column order, but must be printed in row-order. + */ + if (EQN_MATRIX == bp->type) { + if (NULL == bp->first) + goto out; + if (EQN_LIST != bp->first->type) { + eqn_box(p, bp->first); + goto out; + } + if (NULL == (parent = bp->first->first)) + goto out; + /* Estimate the number of rows, first. */ + if (NULL == (child = parent->first)) + goto out; + for (rows = 0; NULL != child; rows++) + child = child->next; + /* Print row-by-row. */ + post = print_otag(p, TAG_MTABLE, ""); + for (i = 0; i < rows; i++) { + parent = bp->first->first; + row = print_otag(p, TAG_MTR, ""); + while (NULL != parent) { + child = parent->first; + for (j = 0; j < i; j++) { + if (NULL == child) + break; + child = child->next; + } + 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) + eqn_box(p, child->first); + print_tagq(p, cell); + parent = parent->next; + } + print_tagq(p, row); + } + goto out; + } -static void -eqn_box(struct html *p, const struct eqn_box *bp) -{ + switch (bp->pos) { + case EQNPOS_TO: + post = print_otag(p, TAG_MOVER, ""); + break; + case EQNPOS_SUP: + post = print_otag(p, TAG_MSUP, ""); + break; + case EQNPOS_FROM: + post = print_otag(p, TAG_MUNDER, ""); + break; + case EQNPOS_SUB: + post = print_otag(p, TAG_MSUB, ""); + break; + case EQNPOS_OVER: + post = print_otag(p, TAG_MFRAC, ""); + break; + case EQNPOS_FROMTO: + post = print_otag(p, TAG_MUNDEROVER, ""); + break; + case EQNPOS_SUBSUP: + post = print_otag(p, TAG_MSUBSUP, ""); + break; + case EQNPOS_SQRT: + post = print_otag(p, TAG_MSQRT, ""); + break; + default: + break; + } - eqn_box_pre(p, bp); - eqn_text(p, bp); + if (bp->top || bp->bottom) { + assert(NULL == post); + if (bp->top && NULL == bp->bottom) + post = print_otag(p, TAG_MOVER, ""); + else if (bp->top && bp->bottom) + post = print_otag(p, TAG_MUNDEROVER, ""); + else if (bp->bottom) + post = print_otag(p, TAG_MUNDER, ""); + } - if (bp->first) - eqn_box(p, bp->first); + if (EQN_PILE == bp->type) { + assert(NULL == post); + 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, ""); + print_otag(p, TAG_MTD, ""); + } - eqn_box_post(p, bp); + if (NULL != bp->text) { + assert(NULL == post); + post = print_otag(p, TAG_MI, ""); + print_text(p, bp->text); + } 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, ""); + else + print_otag(p, TAG_MROW, ""); + } - if (bp->next) - eqn_box(p, bp->next); -} + eqn_box(p, bp->first); -static void -eqn_box_pre(struct html *p, const struct eqn_box *bp) -{ +out: + if (NULL != bp->bottom) { + 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, ""); + print_text(p, bp->top); + print_tagq(p, t); + } - if (bp->left) - print_text(p, bp->left); + if (NULL != post) + print_tagq(p, post); + + eqn_box(p, bp->next); } -static void -eqn_box_post(struct html *p, const struct eqn_box *bp) +void +print_eqn(struct html *p, const struct eqn *ep) { + struct tag *t; - if (bp->right) - print_text(p, bp->right); -} + t = print_otag(p, TAG_MATH, "c", "eqn"); -static void -eqn_text(struct html *p, const struct eqn_box *bp) -{ + p->flags |= HTML_NONOSPACE; + eqn_box(p, ep->root); + p->flags &= ~HTML_NONOSPACE; - if (bp->text) - print_text(p, bp->text); + print_tagq(p, t); }