===================================================================
RCS file: /cvs/mandoc/eqn.c,v
retrieving revision 1.14
retrieving revision 1.18
diff -u -p -r1.14 -r1.18
--- mandoc/eqn.c	2011/07/21 11:57:56	1.14
+++ mandoc/eqn.c	2011/07/21 14:13:00	1.18
@@ -1,4 +1,4 @@
-/*	$Id: eqn.c,v 1.14 2011/07/21 11:57:56 kristaps Exp $ */
+/*	$Id: eqn.c,v 1.18 2011/07/21 14:13:00 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -31,9 +31,13 @@
 #define	EQN_NEST_MAX	 128 /* maximum nesting of defines */
 #define	EQN_MSG(t, x)	 mandoc_msg((t), (x)->parse, (x)->eqn.ln, (x)->eqn.pos, NULL)
 
-struct	eqnpart {
+struct	eqnstr {
 	const char	*name;
 	size_t		 sz;
+};
+
+struct	eqnpart {
+	struct eqnstr	 str;
 	int		(*fp)(struct eqn_node *);
 };
 
@@ -54,14 +58,44 @@ static	const char	*eqn_nexttok(struct eqn_node *, size
 static	const char	*eqn_nextrawtok(struct eqn_node *, size_t *);
 static	const char	*eqn_next(struct eqn_node *, 
 				char, size_t *, int);
-static	int		 eqn_box(struct eqn_node *, struct eqn_box *);
+static	int		 eqn_box(struct eqn_node *, 
+				struct eqn_box *, struct eqn_box **);
 
 static	const struct eqnpart eqnparts[EQN__MAX] = {
-	{ "define", 6, eqn_do_define }, /* EQN_DEFINE */
-	{ "set", 3, eqn_do_set }, /* EQN_SET */
-	{ "undef", 5, eqn_do_undef }, /* EQN_UNDEF */
+	{ { "define", 6 }, eqn_do_define }, /* EQN_DEFINE */
+	{ { "set", 3 }, eqn_do_set }, /* EQN_SET */
+	{ { "undef", 5 }, eqn_do_undef }, /* EQN_UNDEF */
 };
 
+static	const struct eqnstr eqnmarks[EQNMARK__MAX] = {
+	{ "", 0 }, /* EQNMARK_NONE */
+	{ "dot", 3 }, /* EQNMARK_DOT */
+	{ "dotdot", 6 }, /* EQNMARK_DOTDOT */
+	{ "hat", 3 }, /* EQNMARK_HAT */
+	{ "tilde", 5 }, /* EQNMARK_TILDE */
+	{ "vec", 3 }, /* EQNMARK_VEC */
+	{ "dyad", 4 }, /* EQNMARK_DYAD */
+	{ "bar", 3 }, /* EQNMARK_BAR */
+	{ "under", 5 }, /* EQNMARK_UNDER */
+};
+
+static	const struct eqnstr eqnfonts[EQNFONT__MAX] = {
+	{ "", 0 },
+	{ "roman", 5 },
+	{ "bold", 4 },
+	{ "italic", 6 },
+};
+
+static	const struct eqnstr eqnposs[EQNPOS__MAX] = {
+	{ "", 0 },
+	{ "over", 4 },
+	{ "sup", 3 },
+	{ "sub", 3 },
+	{ "to", 2 },
+	{ "from", 4 },
+	{ "above", 5 },
+};
+
 /* ARGSUSED */
 enum rofferr
 eqn_read(struct eqn_node **epp, int ln, 
@@ -119,7 +153,8 @@ eqn_alloc(int pos, int line, struct mparse *parse)
 enum rofferr
 eqn_end(struct eqn_node *ep)
 {
-	struct eqn_box	*root;
+	struct eqn_box	*root, *last;
+	int		 c;
 
 	ep->eqn.root = root = 
 		mandoc_calloc(1, sizeof(struct eqn_box));
@@ -129,50 +164,120 @@ eqn_end(struct eqn_node *ep)
 		return(ROFF_IGN);
 
 	/*
-	 * Validate the expression.
-	 * Use the grammar found in the literature.
+	 * Run the parser.
+	 * If we return before reaching the end of our input, our scope
+	 * is still open somewhere.
+	 * If we return alright but don't have a symmetric scoping, then
+	 * something's not right either.
+	 * Otherwise, return the equation.
 	 */
 
-	return(eqn_box(ep, root) < 0 ? ROFF_IGN : ROFF_EQN);
+	if (0 == (c = eqn_box(ep, root, &last))) {
+		if (last != root) {
+			EQN_MSG(MANDOCERR_EQNSCOPE, ep);
+			c = 0;
+		}
+	} else if (c > 0)
+		EQN_MSG(MANDOCERR_EQNNSCOPE, ep);
+
+	return(0 == c ? ROFF_EQN : ROFF_IGN);
 }
 
 static int
-eqn_box(struct eqn_node *ep, struct eqn_box *last)
+eqn_box(struct eqn_node *ep, struct eqn_box *last, struct eqn_box **sv)
 {
 	size_t		 sz;
 	const char	*start;
-	int		 i, nextc;
+	int		 c, i, nextc;
+	enum eqn_fontt	 font;
 	struct eqn_box	*bp;
 
+	/* 
+	 * Mark our last level of subexpression. 
+	 * Also mark whether that the next node should be a
+	 * subexpression node.
+	 */
+
+	*sv = last;
 	nextc = 1;
+	font = EQNFONT_NONE;  
 again:
 	if (NULL == (start = eqn_nexttok(ep, &sz)))
 		return(0);
 
+	for (i = 0; i < (int)EQNFONT__MAX; i++) {
+		if (eqnfonts[i].sz != sz)
+			continue;
+		if (strncmp(eqnfonts[i].name, start, sz))
+			continue;
+		font = (enum eqn_fontt)i;
+		goto again;
+	}
+
+	for (i = 0; i < (int)EQNFONT__MAX; i++) {
+		if (eqnposs[i].sz != sz)
+			continue;
+		if (strncmp(eqnposs[i].name, start, sz))
+			continue;
+		last->pos = (enum eqn_post)i;
+		goto again;
+	}
+
 	for (i = 0; i < (int)EQN__MAX; i++) {
-		if (eqnparts[i].sz != sz)
+		if (eqnparts[i].str.sz != sz)
 			continue;
-		if (strncmp(eqnparts[i].name, start, sz))
+		if (strncmp(eqnparts[i].str.name, start, sz))
 			continue;
 		if ( ! (*eqnparts[i].fp)(ep))
 			return(-1);
-
 		goto again;
 	} 
 
+	for (i = 0; i < (int)EQNMARK__MAX; i++) {
+		if (eqnmarks[i].sz != sz)
+			continue;
+		if (strncmp(eqnmarks[i].name, start, sz))
+			continue;
+		last->mark = (enum eqn_markt)i;
+		goto again;
+	}
+
+	/* Exit this [hopefully] subexpression. */
+
+	if (sz == 1 && 0 == strncmp("}", start, 1)) 
+		return(1);
+
 	bp = mandoc_calloc(1, sizeof(struct eqn_box));
-	bp->type = EQN_TEXT;
+	bp->font = font;
+	font = EQNFONT_NONE;
 
 	if (nextc)
 		last->child = bp;
 	else
 		last->next = bp;
 
+	last = bp;
+
+	/* 
+	 * See if we're to open a new subexpression.
+	 * If so, mark our node as such and descend.
+	 */
+
+	if (sz == 1 && 0 == strncmp("{", start, 1)) {
+		bp->type = EQN_SUBEXPR;
+		c = eqn_box(ep, bp, sv);
+
+		nextc = 0;
+		goto again;
+	}
+
+	/* A regular text node. */
+
+	bp->type = EQN_TEXT;
 	bp->text = mandoc_malloc(sz + 1);
 	*bp->text = '\0';
 	strlcat(bp->text, start, sz + 1);
 
-	last = bp;
 	nextc = 0;
 	goto again;
 }