From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (schwarze@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.5/8.14.5) with ESMTP id s9CEnirj007236
	for <source@mdocml.bsd.lv>; Sun, 12 Oct 2014 10:49:44 -0400 (EDT)
Received: (from schwarze@localhost)
	by krisdoz.my.domain (8.14.5/8.14.3/Submit) id s9CEndRh007239;
	Sun, 12 Oct 2014 10:49:39 -0400 (EDT)
Date: Sun, 12 Oct 2014 10:49:39 -0400 (EDT)
Message-Id: <201410121449.s9CEndRh007239@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: major upgrade to eqn(7) terminal output; column vectors 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
major upgrade to eqn(7) terminal output;
column vectors ("piles") and matrices are not yet pretty,
but everything else is now more or less readable

Modified Files:
--------------
    mdocml:
        eqn_term.c

Revision Data
-------------
Index: eqn_term.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/eqn_term.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -Leqn_term.c -Leqn_term.c -u -p -r1.6 -r1.7
--- eqn_term.c
+++ eqn_term.c
@@ -1,6 +1,7 @@
 /*	$Id$ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014 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
@@ -42,36 +43,82 @@ void
 term_eqn(struct termp *p, const struct eqn *ep)
 {
 
-	p->flags |= TERMP_NONOSPACE;
 	eqn_box(p, ep->root);
-	term_word(p, " ");
-	p->flags &= ~TERMP_NONOSPACE;
+	p->flags &= ~TERMP_NOSPACE;
 }
 
 static void
 eqn_box(struct termp *p, const struct eqn_box *bp)
 {
+	const struct eqn_box *child;
 
-	if (EQNFONT_NONE != bp->font)
+	if (bp->type == EQN_LIST ||
+	    (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)
+			p->flags |= TERMP_NOSPACE;
+		term_word(p, bp->left != NULL ? bp->left : "(");
+		p->flags |= TERMP_NOSPACE;
+	}
+	if (bp->font != EQNFONT_NONE)
 		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);
 
-	if (bp->first)
+	if (bp->pos == EQNPOS_SQRT) {
+		term_word(p, "sqrt");
+		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;
+		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;
+			eqn_box(p, child);
+		}
+	} else {
+		child = bp->first;
+		if (bp->type == EQN_MATRIX && child->type == EQN_LIST)
+			child = child->first;
+		while (child != NULL) {
+			eqn_box(p,
+			    bp->type == EQN_PILE &&
+			    child->type == EQN_LIST &&
+			    child->args == 1 ?
+			    child->first : child);
+			child = child->next;
+		}
+	}
 
-	if (EQN_SUBEXPR == bp->type)
-		term_word(p, ")");
-	if (bp->right)
-		term_word(p, bp->right);
-	if (EQNFONT_NONE != bp->font)
+	if (bp->font != EQNFONT_NONE)
 		term_fontpop(p);
-
-	if (bp->next)
-		eqn_box(p, bp->next);
+	if (bp->type == EQN_LIST ||
+	    (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);
+	}
+	if (bp->bottom != NULL) {
+		p->flags |= TERMP_NOSPACE;
+		term_word(p, "_");
+	}
 }
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv