Run the regression tests iteratively rather than recursively.

[mandoc.git] / eqn_term.c

diff --git a/eqn_term.c b/eqn_term.c
index f9950ec81e5af337a38049bd1039f6463e280ac0..08f4a993eca4f7aaff63b2986fd136d593d688b1 100644 (file)
--- a/eqn_term.c
+++ b/eqn_term.c
@@ -1,6 +1,7 @@
-/*     $Id: eqn_term.c,v 1.6 2014/08/10 23:54:41 schwarze Exp $ */
+/*     $Id: eqn_term.c,v 1.13 2017/07/08 14:51:04 schwarze Exp $ */

 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>

+ * Copyright (c) 2014, 2015, 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -39,39 +40,115 @@ static void        eqn_box(struct termp *, const struct eqn_box *);
 
 
 void
 
 
 void

-term_eqn(struct termp *p, const struct eqn *ep)
+term_eqn(struct termp *p, const struct eqn_box *bp)

 {
 
 {
 

-       p->flags |= TERMP_NONOSPACE;
-       eqn_box(p, ep->root);
-       term_word(p, " ");
-       p->flags &= ~TERMP_NONOSPACE;
+       eqn_box(p, bp);
+       p->flags &= ~TERMP_NOSPACE;

 }
 
 static void
 eqn_box(struct termp *p, const struct eqn_box *bp)
 {
 }
 
 static void
 eqn_box(struct termp *p, const struct eqn_box *bp)
 {

+       const struct eqn_box *child;
+       int delim;

 
 

-       if (EQNFONT_NONE != bp->font)
+       /* Delimiters around this box? */
+
+       if ((bp->type == EQN_LIST && bp->expectargs > 1) ||
+           (bp->type == EQN_PILE && (bp->prev || bp->next)) ||
+           (bp->parent != NULL && (bp->parent->pos == EQNPOS_SQRT ||
+           /* Diacritic followed by ^ or _. */
+           ((bp->top != NULL || bp->bottom != NULL) &&
+            bp->parent->type == EQN_SUBEXPR &&
+            bp->parent->pos != EQNPOS_OVER && bp->next != NULL) ||
+           /* Nested over, sub, sup, from, to. */
+           (bp->type == EQN_SUBEXPR && bp->pos != EQNPOS_SQRT &&
+            ((bp->parent->type == EQN_LIST && bp->expectargs == 1) ||
+             (bp->parent->type == EQN_SUBEXPR &&
+              bp->pos != EQNPOS_SQRT)))))) {
+               if (bp->parent->type == EQN_SUBEXPR && bp->prev != NULL)
+                       p->flags |= TERMP_NOSPACE;
+               term_word(p, bp->left != NULL ? bp->left : "(");
+               p->flags |= TERMP_NOSPACE;
+               delim = 1;
+       } else
+               delim = 0;
+
+       /* Handle Fonts and text. */
+
+       if (bp->font != EQNFONT_NONE)

                term_fontpush(p, fontmap[(int)bp->font]);
                term_fontpush(p, fontmap[(int)bp->font]);

-       if (bp->left)
-               term_word(p, bp->left);
-       if (EQN_SUBEXPR == bp->type)
-               term_word(p, "(");

 
 

-       if (bp->text)
+       if (bp->text != NULL)

                term_word(p, bp->text);
 
                term_word(p, bp->text);
 

-       if (bp->first)
-               eqn_box(p, bp->first);
+       /* Special box types. */

 
 

-       if (EQN_SUBEXPR == bp->type)
-               term_word(p, ")");
-       if (bp->right)
-               term_word(p, bp->right);
-       if (EQNFONT_NONE != bp->font)
+       if (bp->pos == EQNPOS_SQRT) {
+               term_word(p, "sqrt");
+               if (bp->first != NULL) {
+                       p->flags |= TERMP_NOSPACE;
+                       eqn_box(p, bp->first);
+               }
+       } else if (bp->type == EQN_SUBEXPR) {
+               child = bp->first;
+               eqn_box(p, child);
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, bp->pos == EQNPOS_OVER ? "/" :
+                   (bp->pos == EQNPOS_SUP ||
+                    bp->pos == EQNPOS_TO) ? "^" : "_");
+               p->flags |= TERMP_NOSPACE;
+               child = child->next;
+               if (child != NULL) {
+                       eqn_box(p, child);
+                       if (bp->pos == EQNPOS_FROMTO ||
+                           bp->pos == EQNPOS_SUBSUP) {
+                               p->flags |= TERMP_NOSPACE;
+                               term_word(p, "^");
+                               p->flags |= TERMP_NOSPACE;
+                               child = child->next;
+                               if (child != NULL)
+                                       eqn_box(p, child);
+                       }
+               }
+       } else {
+               child = bp->first;
+               if (bp->type == EQN_MATRIX &&
+                   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;
+               }
+       }
+
+       /* Handle Fonts and diacritics. */
+
+       if (bp->font != EQNFONT_NONE)

                term_fontpop(p);
                term_fontpop(p);

+       if (bp->top != NULL) {
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, bp->top);
+       }
+       if (bp->bottom != NULL) {
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, "_");
+       }
+
+       /* Right delimiter after this box? */

 
 

-       if (bp->next)
-               eqn_box(p, bp->next);
+       if (delim) {
+               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;
+       }

 }
 }