===================================================================
RCS file: /cvs/mandoc/eqn.c,v
retrieving revision 1.29
retrieving revision 1.41
diff -u -p -r1.29 -r1.41
--- mandoc/eqn.c	2011/07/22 14:55:07	1.29
+++ mandoc/eqn.c	2014/04/20 19:40:13	1.41
@@ -1,4 +1,4 @@
-/*	$Id: eqn.c,v 1.29 2011/07/22 14:55:07 kristaps Exp $ */
+/*	$Id: eqn.c,v 1.41 2014/04/20 19:40:13 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -26,6 +26,7 @@
 #include <time.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "libroff.h"
 
@@ -102,6 +103,21 @@ enum	eqn_symt {
 	EQNSYM__MAX
 };
 
+enum	eqnpartt {
+	EQN_DEFINE = 0,
+	EQN_NDEFINE,
+	EQN_TDEFINE,
+	EQN_SET,
+	EQN_UNDEF,
+	EQN_GFONT,
+	EQN_GSIZE,
+	EQN_BACK,
+	EQN_FWD,
+	EQN_UP,
+	EQN_DOWN,
+	EQN__MAX
+};
+
 struct	eqnstr {
 	const char	*name;
 	size_t		 sz;
@@ -122,37 +138,40 @@ struct	eqnsym {
 	const char	*sym;
 };
 
-enum	eqnpartt {
-	EQN_DEFINE = 0,
-	EQN_SET,
-	EQN_UNDEF,
-	EQN_GSIZE,
-	EQN__MAX
-};
-
 static	enum eqn_rest	 eqn_box(struct eqn_node *, struct eqn_box *);
-static	struct eqn_box	*eqn_box_alloc(struct eqn_node *, 
+static	struct eqn_box	*eqn_box_alloc(struct eqn_node *,
 				struct eqn_box *);
 static	void		 eqn_box_free(struct eqn_box *);
-static	struct eqn_def	*eqn_def_find(struct eqn_node *, 
+static	struct eqn_def	*eqn_def_find(struct eqn_node *,
 				const char *, size_t);
+static	int		 eqn_do_gfont(struct eqn_node *);
 static	int		 eqn_do_gsize(struct eqn_node *);
 static	int		 eqn_do_define(struct eqn_node *);
-static	int		 eqn_do_set(struct eqn_node *);
+static	int		 eqn_do_ign1(struct eqn_node *);
+static	int		 eqn_do_ign2(struct eqn_node *);
+static	int		 eqn_do_tdefine(struct eqn_node *);
 static	int		 eqn_do_undef(struct eqn_node *);
 static	enum eqn_rest	 eqn_eqn(struct eqn_node *, struct eqn_box *);
 static	enum eqn_rest	 eqn_list(struct eqn_node *, struct eqn_box *);
+static	enum eqn_rest	 eqn_matrix(struct eqn_node *, struct eqn_box *);
 static	const char	*eqn_nexttok(struct eqn_node *, size_t *);
 static	const char	*eqn_nextrawtok(struct eqn_node *, size_t *);
-static	const char	*eqn_next(struct eqn_node *, 
+static	const char	*eqn_next(struct eqn_node *,
 				char, size_t *, int);
 static	void		 eqn_rewind(struct eqn_node *);
 
 static	const struct eqnpart eqnparts[EQN__MAX] = {
 	{ { "define", 6 }, eqn_do_define }, /* EQN_DEFINE */
-	{ { "set", 3 }, eqn_do_set }, /* EQN_SET */
+	{ { "ndefine", 7 }, eqn_do_define }, /* EQN_NDEFINE */
+	{ { "tdefine", 7 }, eqn_do_tdefine }, /* EQN_TDEFINE */
+	{ { "set", 3 }, eqn_do_ign2 }, /* EQN_SET */
 	{ { "undef", 5 }, eqn_do_undef }, /* EQN_UNDEF */
-	{ { "gsize", 5 }, eqn_do_gsize }, /* EQN_UNDEF */
+	{ { "gfont", 5 }, eqn_do_gfont }, /* EQN_GFONT */
+	{ { "gsize", 5 }, eqn_do_gsize }, /* EQN_GSIZE */
+	{ { "back", 4 }, eqn_do_ign1 }, /* EQN_BACK */
+	{ { "fwd", 3 }, eqn_do_ign1 }, /* EQN_FWD */
+	{ { "up", 2 }, eqn_do_ign1 }, /* EQN_UP */
+	{ { "down", 4 }, eqn_do_ign1 }, /* EQN_DOWN */
 };
 
 static	const struct eqnstr eqnmarks[EQNMARK__MAX] = {
@@ -171,6 +190,7 @@ static	const struct eqnstr eqnfonts[EQNFONT__MAX] = {
 	{ "", 0 }, /* EQNFONT_NONE */
 	{ "roman", 5 }, /* EQNFONT_ROMAN */
 	{ "bold", 4 }, /* EQNFONT_BOLD */
+	{ "fat", 3 }, /* EQNFONT_FAT */
 	{ "italic", 6 }, /* EQNFONT_ITALIC */
 };
 
@@ -185,9 +205,14 @@ static	const struct eqnstr eqnposs[EQNPOS__MAX] = {
 
 static	const struct eqnstr eqnpiles[EQNPILE__MAX] = {
 	{ "", 0 }, /* EQNPILE_NONE */
+	{ "pile", 4 }, /* EQNPILE_PILE */
 	{ "cpile", 5 }, /* EQNPILE_CPILE */
 	{ "rpile", 5 }, /* EQNPILE_RPILE */
 	{ "lpile", 5 }, /* EQNPILE_LPILE */
+	{ "col", 3 }, /* EQNPILE_COL */
+	{ "ccol", 4 }, /* EQNPILE_CCOL */
+	{ "rcol", 4 }, /* EQNPILE_RCOL */
+	{ "lcol", 4 }, /* EQNPILE_LCOL */
 };
 
 static	const struct eqnsym eqnsyms[EQNSYM__MAX] = {
@@ -252,9 +277,9 @@ static	const struct eqnsym eqnsyms[EQNSYM__MAX] = {
 	{ { ">=", 2 }, ">=" }, /* EQNSYM_moreequal */
 };
 
-/* ARGSUSED */
+
 enum rofferr
-eqn_read(struct eqn_node **epp, int ln, 
+eqn_read(struct eqn_node **epp, int ln,
 		const char *p, int pos, int *offs)
 {
 	size_t		 sz;
@@ -268,9 +293,14 @@ eqn_read(struct eqn_node **epp, int ln, 
 	 * validate the full equation.
 	 */
 
-	if (0 == strcmp(p, ".EN")) {
-		er = eqn_end(ep);
-		*epp = NULL;
+	if (0 == strncmp(p, ".EN", 3)) {
+		er = eqn_end(epp);
+		p += 3;
+		while (' ' == *p || '\t' == *p)
+			p++;
+		if ('\0' == *p)
+			return(er);
+		mandoc_msg(MANDOCERR_ARGSLOST, ep->parse, ln, pos, NULL);
 		return(er);
 	}
 
@@ -294,11 +324,24 @@ eqn_read(struct eqn_node **epp, int ln, 
 }
 
 struct eqn_node *
-eqn_alloc(int pos, int line, struct mparse *parse)
+eqn_alloc(const char *name, int pos, int line, struct mparse *parse)
 {
 	struct eqn_node	*p;
+	size_t		 sz;
+	const char	*end;
 
 	p = mandoc_calloc(1, sizeof(struct eqn_node));
+
+	if (name && '\0' != *name) {
+		sz = strlen(name);
+		assert(sz);
+		do {
+			sz--;
+			end = name + (int)sz;
+		} while (' ' == *end || '\t' == *end);
+		p->eqn.name = mandoc_strndup(name, sz + 1);
+	}
+
 	p->parse = parse;
 	p->eqn.ln = line;
 	p->eqn.pos = pos;
@@ -308,11 +351,15 @@ eqn_alloc(int pos, int line, struct mparse *parse)
 }
 
 enum rofferr
-eqn_end(struct eqn_node *ep)
+eqn_end(struct eqn_node **epp)
 {
+	struct eqn_node	*ep;
 	struct eqn_box	*root;
 	enum eqn_rest	 c;
 
+	ep = *epp;
+	*epp = NULL;
+
 	ep->eqn.root = mandoc_calloc(1, sizeof(struct eqn_box));
 
 	root = ep->eqn.root;
@@ -345,6 +392,55 @@ eqn_eqn(struct eqn_node *ep, struct eqn_box *last)
 }
 
 static enum eqn_rest
+eqn_matrix(struct eqn_node *ep, struct eqn_box *last)
+{
+	struct eqn_box	*bp;
+	const char	*start;
+	size_t		 sz;
+	enum eqn_rest	 c;
+
+	bp = eqn_box_alloc(ep, last);
+	bp->type = EQN_MATRIX;
+
+	if (NULL == (start = eqn_nexttok(ep, &sz))) {
+		EQN_MSG(MANDOCERR_EQNEOF, ep);
+		return(EQN_ERR);
+	}
+	if ( ! STRNEQ(start, sz, "{", 1)) {
+		EQN_MSG(MANDOCERR_EQNSYNT, ep);
+		return(EQN_ERR);
+	}
+
+	while (EQN_OK == (c = eqn_box(ep, bp)))
+		switch (bp->last->pile) {
+		case EQNPILE_LCOL:
+			/* FALLTHROUGH */
+		case EQNPILE_CCOL:
+			/* FALLTHROUGH */
+		case EQNPILE_RCOL:
+			continue;
+		default:
+			EQN_MSG(MANDOCERR_EQNSYNT, ep);
+			return(EQN_ERR);
+		};
+
+	if (EQN_DESCOPE != c) {
+		if (EQN_EOF == c)
+			EQN_MSG(MANDOCERR_EQNEOF, ep);
+		return(EQN_ERR);
+	}
+
+	eqn_rewind(ep);
+	start = eqn_nexttok(ep, &sz);
+	assert(start);
+	if (STRNEQ(start, sz, "}", 1))
+		return(EQN_OK);
+
+	EQN_MSG(MANDOCERR_EQNBADSCOPE, ep);
+	return(EQN_ERR);
+}
+
+static enum eqn_rest
 eqn_list(struct eqn_node *ep, struct eqn_box *last)
 {
 	struct eqn_box	*bp;
@@ -370,7 +466,6 @@ eqn_list(struct eqn_node *ep, struct eqn_box *last)
 		assert(start);
 		if ( ! STRNEQ(start, sz, "above", 5))
 			break;
-		bp->last->above = 1;
 	}
 
 	if (EQN_DESCOPE != c) {
@@ -409,12 +504,16 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
 		return(EQN_DESCOPE);
 	else if (STRNEQ(start, sz, "above", 5))
 		return(EQN_DESCOPE);
+	else if (STRNEQ(start, sz, "mark", 4))
+		return(EQN_OK);
+	else if (STRNEQ(start, sz, "lineup", 6))
+		return(EQN_OK);
 
 	for (i = 0; i < (int)EQN__MAX; i++) {
 		if ( ! EQNSTREQ(&eqnparts[i].str, start, sz))
 			continue;
 		return((*eqnparts[i].fp)(ep) ? EQN_OK : EQN_ERR);
-	} 
+	}
 
 	if (STRNEQ(start, sz, "{", 1)) {
 		if (EQN_DESCOPE != (c = eqn_eqn(ep, last))) {
@@ -429,7 +528,7 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
 			return(EQN_OK);
 		EQN_MSG(MANDOCERR_EQNBADSCOPE, ep);
 		return(EQN_ERR);
-	} 
+	}
 
 	for (i = 0; i < (int)EQNPILE__MAX; i++) {
 		if ( ! EQNSTREQ(&eqnpiles[i], start, sz))
@@ -439,6 +538,9 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
 		return(c);
 	}
 
+	if (STRNEQ(start, sz, "matrix", 6))
+		return(eqn_matrix(ep, last));
+
 	if (STRNEQ(start, sz, "left", 4)) {
 		if (NULL == (start = eqn_nexttok(ep, &sz))) {
 			EQN_MSG(MANDOCERR_EQNEOF, ep);
@@ -472,7 +574,7 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
 		if (NULL == last->last) {
 			EQN_MSG(MANDOCERR_EQNSYNT, ep);
 			return(EQN_ERR);
-		} 
+		}
 		last->last->pos = (enum eqn_post)i;
 		if (EQN_EOF == (c = eqn_box(ep, last))) {
 			EQN_MSG(MANDOCERR_EQNEOF, ep);
@@ -487,7 +589,7 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
 		if (NULL == last->last) {
 			EQN_MSG(MANDOCERR_EQNSYNT, ep);
 			return(EQN_ERR);
-		} 
+		}
 		last->last->mark = (enum eqn_markt)i;
 		if (EQN_EOF == (c = eqn_box(ep, last))) {
 			EQN_MSG(MANDOCERR_EQNEOF, ep);
@@ -526,7 +628,7 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last)
 	for (i = 0; i < (int)EQNSYM__MAX; i++)
 		if (EQNSTREQ(&eqnsyms[i].str, start, sz)) {
 			sym[63] = '\0';
-			snprintf(sym, 62, "\\[%s]", eqnsyms[i].sym);
+			(void)snprintf(sym, 62, "\\[%s]", eqnsyms[i].sym);
 			bp->text = mandoc_strdup(sym);
 			return(EQN_OK);
 		}
@@ -547,6 +649,7 @@ eqn_free(struct eqn_node *p)
 		free(p->defs[i].val);
 	}
 
+	free(p->eqn.name);
 	free(p->data);
 	free(p->defs);
 	free(p);
@@ -623,7 +726,7 @@ again:
 	/* Prevent self-definitions. */
 
 	if (lim >= EQN_NEST_MAX) {
-		EQN_MSG(MANDOCERR_EQNNEST, ep);
+		EQN_MSG(MANDOCERR_ROFFLOOP, ep);
 		return(NULL);
 	}
 
@@ -645,7 +748,7 @@ again:
 		if ('{' == *start || '}' == *start)
 			ssz = 1;
 		else
-			ssz = strcspn(start + 1, " ~\"{}\t") + 1;
+			ssz = strcspn(start + 1, " ^~\"{}\t") + 1;
 		next = start + (int)ssz;
 		if ('\0' == *next)
 			next = NULL;
@@ -658,8 +761,9 @@ again:
 		if (q)
 			ep->cur++;
 		while (' ' == ep->data[(int)ep->cur] ||
-				'\t' == ep->data[(int)ep->cur] ||
-				'~' == ep->data[(int)ep->cur])
+		    '\t' == ep->data[(int)ep->cur] ||
+		    '^' == ep->data[(int)ep->cur] ||
+		    '~' == ep->data[(int)ep->cur])
 			ep->cur++;
 	} else {
 		if (q)
@@ -685,8 +789,8 @@ again:
 		}
 
 		diff = def->valsz - *sz;
-		memmove(start + *sz + diff, start + *sz, 
-				(strlen(start) - *sz) + 1);
+		memmove(start + *sz + diff, start + *sz,
+		    (strlen(start) - *sz) + 1);
 		memcpy(start, def->val, def->valsz);
 		goto again;
 	}
@@ -695,14 +799,25 @@ again:
 }
 
 static int
-eqn_do_set(struct eqn_node *ep)
+eqn_do_ign1(struct eqn_node *ep)
 {
-	const char	*start;
 
-	if (NULL == (start = eqn_nextrawtok(ep, NULL)))
+	if (NULL == eqn_nextrawtok(ep, NULL))
 		EQN_MSG(MANDOCERR_EQNEOF, ep);
-	else if (NULL == (start = eqn_nextrawtok(ep, NULL)))
+	else
+		return(1);
+
+	return(0);
+}
+
+static int
+eqn_do_ign2(struct eqn_node *ep)
+{
+
+	if (NULL == eqn_nextrawtok(ep, NULL))
 		EQN_MSG(MANDOCERR_EQNEOF, ep);
+	else if (NULL == eqn_nextrawtok(ep, NULL))
+		EQN_MSG(MANDOCERR_EQNEOF, ep);
 	else
 		return(1);
 
@@ -710,6 +825,20 @@ eqn_do_set(struct eqn_node *ep)
 }
 
 static int
+eqn_do_tdefine(struct eqn_node *ep)
+{
+
+	if (NULL == eqn_nextrawtok(ep, NULL))
+		EQN_MSG(MANDOCERR_EQNEOF, ep);
+	else if (NULL == eqn_next(ep, ep->data[(int)ep->cur], NULL, 0))
+		EQN_MSG(MANDOCERR_EQNEOF, ep);
+	else
+		return(1);
+
+	return(0);
+}
+
+static int
 eqn_do_define(struct eqn_node *ep)
 {
 	const char	*start;
@@ -722,8 +851,8 @@ eqn_do_define(struct eqn_node *ep)
 		return(0);
 	}
 
-	/* 
-	 * Search for a key that already exists. 
+	/*
+	 * Search for a key that already exists.
 	 * Create a new key if none is found.
 	 */
 
@@ -735,15 +864,14 @@ eqn_do_define(struct eqn_node *ep)
 
 		if (i == (int)ep->defsz) {
 			ep->defsz++;
-			ep->defs = mandoc_realloc
-				(ep->defs, ep->defsz * 
-				 sizeof(struct eqn_def));
+			ep->defs = mandoc_realloc(ep->defs,
+			    ep->defsz * sizeof(struct eqn_def));
 			ep->defs[i].key = ep->defs[i].val = NULL;
 		}
 
 		ep->defs[i].keysz = sz;
-		ep->defs[i].key = mandoc_realloc
-			(ep->defs[i].key, sz + 1);
+		ep->defs[i].key = mandoc_realloc(
+		    ep->defs[i].key, sz + 1);
 
 		memcpy(ep->defs[i].key, start, sz);
 		ep->defs[i].key[(int)sz] = '\0';
@@ -765,6 +893,17 @@ eqn_do_define(struct eqn_node *ep)
 }
 
 static int
+eqn_do_gfont(struct eqn_node *ep)
+{
+
+	if (NULL == eqn_nextrawtok(ep, NULL)) {
+		EQN_MSG(MANDOCERR_EQNEOF, ep);
+		return(0);
+	}
+	return(1);
+}
+
+static int
 eqn_do_gsize(struct eqn_node *ep)
 {
 	const char	*start;
@@ -773,8 +912,7 @@ eqn_do_gsize(struct eqn_node *ep)
 	if (NULL == (start = eqn_nextrawtok(ep, &sz))) {
 		EQN_MSG(MANDOCERR_EQNEOF, ep);
 		return(0);
-	} 
-
+	}
 	ep->gsize = mandoc_strntoi(start, sz, 10);
 	return(1);
 }
@@ -800,9 +938,9 @@ eqn_def_find(struct eqn_node *ep, const char *key, siz
 {
 	int		 i;
 
-	for (i = 0; i < (int)ep->defsz; i++) 
-		if (ep->defs[i].keysz && STRNEQ(ep->defs[i].key, 
-					ep->defs[i].keysz, key, sz))
+	for (i = 0; i < (int)ep->defsz; i++)
+		if (ep->defs[i].keysz && STRNEQ(ep->defs[i].key,
+		    ep->defs[i].keysz, key, sz))
 			return(&ep->defs[i]);
 
 	return(NULL);