diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2017-07-06 00:19:54 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-07-06 00:19:54 +0000 |
| commit | 85dde46a7c3beea67394f0a89322372457dcbbf4 (patch) | |
| tree | b005a91c14c7f0f5b74bbd5744dc6c218bdce789 /eqn_term.c | |
| parent | acb30a24128863f2d57ac9aa20a93c8dd243b80b (diff) | |
| download | mandoc-85dde46a7c3beea67394f0a89322372457dcbbf4.tar.gz mandoc-85dde46a7c3beea67394f0a89322372457dcbbf4.tar.zst mandoc-85dde46a7c3beea67394f0a89322372457dcbbf4.zip | |
Fix operator precedence according to Brian W. Kernighan and Lorinda
L. Cherry, "Typesetting Mathematics - User's Guide (Second Edition)",
August 15, 1978, paragraph 23; swarm of bugs pointed out by bentley@.
Diffstat (limited to 'eqn_term.c')
| -rw-r--r-- | eqn_term.c | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -1,4 +1,4 @@ -/* $Id: eqn_term.c,v 1.10 2017/07/05 15:03:27 schwarze Exp $ */ +/* $Id: eqn_term.c,v 1.11 2017/07/06 00:19:54 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> @@ -113,15 +113,6 @@ eqn_box(struct termp *p, const struct eqn_box *bp) if (bp->font != EQNFONT_NONE) term_fontpop(p); - 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; - term_word(p, bp->right != NULL ? bp->right : ")"); - if (bp->parent->type == EQN_SUBEXPR && bp->next != NULL) - p->flags |= TERMP_NOSPACE; - } - if (bp->top != NULL) { p->flags |= TERMP_NOSPACE; term_word(p, bp->top); @@ -130,4 +121,12 @@ eqn_box(struct termp *p, const struct eqn_box *bp) p->flags |= TERMP_NOSPACE; term_word(p, "_"); } + 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; + term_word(p, bp->right != NULL ? bp->right : ")"); + if (bp->parent->type == EQN_SUBEXPR && bp->next != NULL) + p->flags |= TERMP_NOSPACE; + } } |