===================================================================
RCS file: /cvs/mandoc/eqn_term.c,v
retrieving revision 1.1
retrieving revision 1.13
diff -u -p -r1.1 -r1.13
--- mandoc/eqn_term.c	2011/07/22 10:50:46	1.1
+++ mandoc/eqn_term.c	2017/07/08 14:51:04	1.13
@@ -1,6 +1,7 @@
-/*	$Id: eqn_term.c,v 1.1 2011/07/22 10:50:46 kristaps 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) 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
@@ -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 <sys/types.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,62 +28,127 @@
 #include "out.h"
 #include "term.h"
 
-static void	eqn_box(struct termp *p, const struct eqn_box *);
-static void	eqn_box_post(struct termp *p, const struct eqn_box *);
-static void	eqn_box_pre(struct termp *p, const struct eqn_box *);
-static void	eqn_text(struct termp *p, const struct eqn_box *);
+static	const enum termfont fontmap[EQNFONT__MAX] = {
+	TERMFONT_NONE, /* EQNFONT_NONE */
+	TERMFONT_NONE, /* EQNFONT_ROMAN */
+	TERMFONT_BOLD, /* EQNFONT_BOLD */
+	TERMFONT_BOLD, /* EQNFONT_FAT */
+	TERMFONT_UNDER /* EQNFONT_ITALIC */
+};
 
+static void	eqn_box(struct termp *, const struct eqn_box *);
+
+
 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);
-	p->flags &= ~TERMP_NONOSPACE;
+	eqn_box(p, bp);
+	p->flags &= ~TERMP_NOSPACE;
 }
 
 static void
 eqn_box(struct termp *p, const struct eqn_box *bp)
 {
+	const struct eqn_box *child;
+	int delim;
 
-	eqn_box_pre(p, bp);
-	eqn_text(p, bp);
+	/* Delimiters around this box? */
 
-	if (bp->first)
-		eqn_box(p, bp->first);
+	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;
 
-	eqn_box_post(p, bp);
+	/* Handle Fonts and text. */
 
-	if (bp->next)
-		eqn_box(p, bp->next);
-}
+	if (bp->font != EQNFONT_NONE)
+		term_fontpush(p, fontmap[(int)bp->font]);
 
-static void
-eqn_box_pre(struct termp *p, const struct eqn_box *bp)
-{
+	if (bp->text != NULL)
+		term_word(p, bp->text);
 
-	if (EQN_LIST == bp->type)
-		term_word(p, "{");
-	if (bp->left)
-		term_word(p, bp->left);
-}
+	/* Special box types. */
 
-static void
-eqn_box_post(struct termp *p, const struct eqn_box *bp)
-{
+	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;
+		}
+	}
 
-	if (EQN_LIST == bp->type)
-		term_word(p, "}");
-	if (bp->right)
-		term_word(p, bp->right);
-	if (bp->above)
-		term_word(p, "|");
-}
+	/* Handle Fonts and diacritics. */
 
-static void
-eqn_text(struct termp *p, const struct eqn_box *bp)
-{
+	if (bp->font != EQNFONT_NONE)
+		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, "_");
+	}
 
-	if (bp->text)
-		term_word(p, bp->text);
+	/* Right delimiter after this box? */
+
+	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;
+	}
 }