diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2017-07-05 15:03:27 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-07-05 15:03:27 +0000 |
| commit | e0015d9facf740a96124938363ba25c3b6c09af8 (patch) | |
| tree | bebf9dd098429842cccc08c348fd7db9216b7e63 /eqn_term.c | |
| parent | 811d843bdd0c53a8825c4c177600fa22e1d8d722 (diff) | |
| download | mandoc-e0015d9facf740a96124938363ba25c3b6c09af8.tar.gz | |
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.
Diffstat (limited to 'eqn_term.c')
| -rw-r--r-- | eqn_term.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -52,7 +52,7 @@ eqn_box(struct termp *p, const struct eqn_box *bp) { const struct eqn_box *child; - if (bp->type == EQN_LIST || + if ((bp->type == EQN_LIST && bp->expectargs > 1) || (bp->type == EQN_PILE && (bp->prev || bp->next)) || (bp->parent != NULL && bp->parent->pos == EQNPOS_SQRT)) { if (bp->parent->type == EQN_SUBEXPR && bp->prev != NULL) @@ -96,12 +96,15 @@ eqn_box(struct termp *p, const struct eqn_box *bp) } else { child = bp->first; if (bp->type == EQN_MATRIX && - child != NULL && child->type == EQN_LIST) + child != NULL && + child->type == EQN_LIST && + child->expectargs > 1) child = child->first; while (child != NULL) { eqn_box(p, bp->type == EQN_PILE && child->type == EQN_LIST && + child->expectargs > 1 && child->args == 1 ? child->first : child); child = child->next; @@ -110,7 +113,7 @@ eqn_box(struct termp *p, const struct eqn_box *bp) if (bp->font != EQNFONT_NONE) term_fontpop(p); - if (bp->type == EQN_LIST || + if ((bp->type == EQN_LIST && bp->expectargs > 1) || (bp->type == EQN_PILE && (bp->prev || bp->next)) || (bp->parent != NULL && bp->parent->pos == EQNPOS_SQRT)) { p->flags |= TERMP_NOSPACE; |