From acb30a24128863f2d57ac9aa20a93c8dd243b80b Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 5 Jul 2017 15:03:27 +0000 Subject: The EQN_LISTONE box type is pointless. Simplify by just using EQN_LIST with expectargs = 1. Noticed while investigating a bug report from bentley@. No functional change. --- eqn_html.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'eqn_html.c') diff --git a/eqn_html.c b/eqn_html.c index 2d9eeb8a..feeae102 100644 --- 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.15 2017/07/05 15:03:27 schwarze Exp $ */ /* * Copyright (c) 2011, 2014 Kristaps Dzonsons * Copyright (c) 2017 Ingo Schwarze @@ -51,7 +51,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 +132,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, ""); -- cgit v1.2.3-56-ge451