===================================================================
RCS file: /cvs/mandoc/eqn.c,v
retrieving revision 1.15
retrieving revision 1.17
diff -u -p -r1.15 -r1.17
--- mandoc/eqn.c	2011/07/21 12:30:44	1.15
+++ mandoc/eqn.c	2011/07/21 13:37:04	1.17
@@ -1,4 +1,4 @@
-/*	$Id: eqn.c,v 1.15 2011/07/21 12:30:44 kristaps Exp $ */
+/*	$Id: eqn.c,v 1.17 2011/07/21 13:37:04 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 *);
 };
 
@@ -58,11 +62,29 @@ 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] = {
+	{ "roman", 5 },
+	{ "bold", 4 },
+	{ "italic", 6 },
+};
+
 /* ARGSUSED */
 enum rofferr
 eqn_read(struct eqn_node **epp, int ln, 
@@ -139,13 +161,15 @@ eqn_end(struct eqn_node *ep)
 	 * Otherwise, return the equation.
 	 */
 
-	if ((c = eqn_box(ep, root, &last)) > 0) {
+	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);
-		c = 0;
-	} else if (0 == c && last != root)
-		EQN_MSG(MANDOCERR_EQNSCOPE, ep);
 
-	return(1 == c ? ROFF_EQN : ROFF_IGN);
+	return(0 == c ? ROFF_EQN : ROFF_IGN);
 }
 
 static int
@@ -154,6 +178,7 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last, str
 	size_t		 sz;
 	const char	*start;
 	int		 c, i, nextc;
+	enum eqn_fontt	 font;
 	struct eqn_box	*bp;
 
 	/* 
@@ -164,27 +189,49 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last, str
 
 	*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)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->font = font;
+	font = EQNFONT_NONE;
+
 	if (nextc)
 		last->child = bp;
 	else