Add character output (-Tpdf, -Tps, -Tascii) for equations. This is the

minimum: unseparated terms.

5 files changed, 96 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index eb9efb82..03d00fdd 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,7 @@ SRCS		 = Makefile \
 		   config.h.pre \
 		   eqn.7 \
 		   eqn.c \
+		   eqn_term.c \
 		   example.style.css \
 		   external.png \
 		   html.c \
@@ -200,13 +201,15 @@ MANDOC_HTML_LNS	 = html.ln \
 		   mdoc_html.ln \
 		   tbl_html.ln
 
-MANDOC_TERM_OBJS = man_term.o \
+MANDOC_TERM_OBJS = eqn_term.o \
+		   man_term.o \
 		   mdoc_term.o \
 		   term.o \
 		   term_ascii.o \
 		   term_ps.o \
 		   tbl_term.o
-MANDOC_TERM_LNS	 = man_term.ln \
+MANDOC_TERM_LNS	 = eqn_term.ln \
+		   man_term.ln \
 		   mdoc_term.ln \
 		   term.ln \
 		   term_ascii.ln \
diff --git a/eqn_term.c b/eqn_term.c
new file mode 100644
index 00000000..8e49b729
--- /dev/null
+++ b/eqn_term.c
@@ -0,0 +1,88 @@
+/*	$Id$ */
+/*
+ * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * 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 <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "mandoc.h"
+#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 *);
+
+void
+term_eqn(struct termp *p, const struct eqn *ep)
+{
+
+	p->flags |= TERMP_NONOSPACE;
+	eqn_box(p, ep->root);
+	p->flags &= ~TERMP_NONOSPACE;
+}
+
+static void
+eqn_box(struct termp *p, const struct eqn_box *bp)
+{
+
+	eqn_box_pre(p, bp);
+	eqn_text(p, bp);
+
+	if (bp->first)
+		eqn_box(p, bp->first);
+
+	eqn_box_post(p, bp);
+
+	if (bp->next)
+		eqn_box(p, bp->next);
+}
+
+static void
+eqn_box_pre(struct termp *p, const struct eqn_box *bp)
+{
+
+	if (EQN_LIST == bp->type)
+		term_word(p, "{");
+	if (bp->left)
+		term_word(p, bp->left);
+}
+
+static void
+eqn_box_post(struct termp *p, const struct eqn_box *bp)
+{
+
+	if (EQN_LIST == bp->type)
+		term_word(p, "}");
+	if (bp->right)
+		term_word(p, bp->right);
+	if (bp->above)
+		term_word(p, "|");
+}
+
+static void
+eqn_text(struct termp *p, const struct eqn_box *bp)
+{
+
+	if (bp->text)
+		term_word(p, bp->text);
+}
diff --git a/man_term.c b/man_term.c
index 0029e8e7..8399381b 100644
--- a/man_term.c
+++ b/man_term.c
@@ -905,7 +905,7 @@ print_man_node(DECL_ARGS)
 			p->flags |= TERMP_SENTENCE;
 		return;
 	case (MAN_EQN):
-		/*term_word(p, n->eqn->data);*/
+		term_eqn(p, n->eqn);
 		return;
 	case (MAN_TBL):
 		/*
diff --git a/mdoc_term.c b/mdoc_term.c
index 39efd872..5e77aa1b 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -351,7 +351,7 @@ print_mdoc_node(DECL_ARGS)
 			p->flags |= TERMP_NOSPACE;
 		break;
 	case (MDOC_EQN):
-		/*term_word(p, n->eqn->data);*/
+		term_eqn(p, n->eqn);
 		break;
 	case (MDOC_TBL):
 		term_tbl(p, n->span);
diff --git a/term.h b/term.h
index 1a4452d3..b6a34f8d 100644
--- a/term.h
+++ b/term.h
@@ -96,6 +96,7 @@ struct	termp {
 	struct termp_ps	 *ps;
 };
 
+void		  term_eqn(struct termp *, const struct eqn *);
 void		  term_tbl(struct termp *, const struct tbl_span *);
 void		  term_free(struct termp *);
 void		  term_newln(struct termp *);