===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.148
retrieving revision 1.153
diff -u -p -r1.148 -r1.153
--- mandoc/roff.c	2011/07/21 10:24:35	1.148
+++ mandoc/roff.c	2011/07/26 14:24:06	1.153
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.148 2011/07/21 10:24:35 kristaps Exp $ */
+/*	$Id: roff.c,v 1.153 2011/07/26 14:24:06 kristaps Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -395,15 +395,16 @@ roff_alloc(struct mparse *parse)
 	return(r);
 }
 
-
 /*
  * Pre-filter each and every line for reserved words (one beginning with
  * `\*', e.g., `\*(ab').  These must be handled before the actual line
  * is processed. 
- */
+ * This also checks the syntax of regular escapes.
+*/
 static int
 roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
 {
+	enum mandoc_esc	 esc;
 	const char	*stesc;	/* start of an escape sequence ('\\') */
 	const char	*stnam;	/* start of the name, after "[(*" */
 	const char	*cp;	/* end of the name, e.g. before ']' */
@@ -426,9 +427,21 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int
 
 		if ('\0' == *cp)
 			return(1);
-		if ('*' != *cp++)
+
+		if ('*' != *cp) {
+			res = cp;
+			esc = mandoc_escape(&cp, NULL, NULL);
+			if (ESCAPE_ERROR != esc)
+				continue;
+			cp = res;
+			mandoc_msg
+				(MANDOCERR_BADESCAPE, r->parse, 
+				 ln, (int)(stesc - *bufp), NULL);
 			continue;
+		}
 
+		cp++;
+
 		/*
 		 * The third character decides the length
 		 * of the name of the string.
@@ -455,8 +468,13 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int
 		/* Advance to the end of the name. */
 
 		for (i = 0; 0 == maxl || i < maxl; i++, cp++) {
-			if ('\0' == *cp)
-				return(1); /* Error. */
+			if ('\0' == *cp) {
+				mandoc_msg
+					(MANDOCERR_BADESCAPE, 
+					 r->parse, ln, 
+					 (int)(stesc - *bufp), NULL);
+				return(1); 
+			}
 			if (0 == maxl && ']' == *cp)
 				break;
 		}
@@ -469,8 +487,9 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int
 		res = roff_getstrn(r, stnam, (size_t)i);
 
 		if (NULL == res) {
-			/* TODO: keep track of the correct position. */
-			mandoc_msg(MANDOCERR_BADESCAPE, r->parse, ln, pos, NULL);
+			mandoc_msg
+				(MANDOCERR_BADESCAPE, r->parse, 
+				 ln, (int)(stesc - *bufp), NULL);
 			res = "";
 		}
 
@@ -493,7 +512,6 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int
 	return(1);
 }
 
-
 enum rofferr
 roff_parseln(struct roff *r, int ln, char **bufp, 
 		size_t *szp, int pos, int *offs)
@@ -507,7 +525,7 @@ roff_parseln(struct roff *r, int ln, char **bufp, 
 	 * words to fill in.
 	 */
 
-	if (r->first_string && ! roff_res(r, bufp, szp, ln, pos))
+	if ( ! roff_res(r, bufp, szp, ln, pos))
 		return(ROFF_REPARSE);
 
 	ppos = pos;
@@ -584,15 +602,13 @@ roff_endparse(struct roff *r)
 	if (r->eqn) {
 		mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, 
 				r->eqn->eqn.ln, r->eqn->eqn.pos, NULL);
-		eqn_end(r->eqn);
-		r->eqn = NULL;
+		eqn_end(&r->eqn);
 	}
 
 	if (r->tbl) {
 		mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, 
 				r->tbl->line, r->tbl->pos, NULL);
-		tbl_end(r->tbl);
-		r->tbl = NULL;
+		tbl_end(&r->tbl);
 	}
 }
 
@@ -1149,7 +1165,7 @@ roff_nr(ROFF_ARGS)
 
 	if (0 == strcmp(key, "nS")) {
 		r->regs[(int)REG_nS].set = 1;
-		if ((iv = mandoc_strntou(val, strlen(val), 10)) >= 0)
+		if ((iv = mandoc_strntoi(val, strlen(val), 10)) >= 0)
 			r->regs[(int)REG_nS].u = (unsigned)iv;
 		else
 			r->regs[(int)REG_nS].u = 0u;
@@ -1182,9 +1198,8 @@ roff_TE(ROFF_ARGS)
 	if (NULL == r->tbl)
 		mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
 	else
-		tbl_end(r->tbl);
+		tbl_end(&r->tbl);
 
-	r->tbl = NULL;
 	return(ROFF_IGN);
 }
 
@@ -1201,14 +1216,22 @@ roff_T_(ROFF_ARGS)
 	return(ROFF_IGN);
 }
 
-/* ARGSUSED */
-static enum rofferr
-roff_EQ(ROFF_ARGS)
+int
+roff_closeeqn(struct roff *r)
 {
-	struct eqn_node	*e;
 
+	return(r->eqn && ROFF_EQN == eqn_end(&r->eqn) ? 1 : 0);
+}
+
+void
+roff_openeqn(struct roff *r, const char *name, int line, 
+		int offs, const char *buf)
+{
+	struct eqn_node *e;
+	int		 poff;
+
 	assert(NULL == r->eqn);
-	e = eqn_alloc(ppos, ln, r->parse);
+	e = eqn_alloc(name, offs, line, r->parse);
 
 	if (r->last_eqn)
 		r->last_eqn->next = e;
@@ -1216,6 +1239,19 @@ roff_EQ(ROFF_ARGS)
 		r->first_eqn = r->last_eqn = e;
 
 	r->eqn = r->last_eqn = e;
+
+	if (buf) {
+		poff = 0;
+		eqn_read(&r->eqn, line, buf, offs, &poff);
+	}
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_EQ(ROFF_ARGS)
+{
+
+	roff_openeqn(r, *bufp + pos, ln, ppos, NULL);
 	return(ROFF_IGN);
 }
 
@@ -1236,7 +1272,7 @@ roff_TS(ROFF_ARGS)
 
 	if (r->tbl) {
 		mandoc_msg(MANDOCERR_SCOPEBROKEN, r->parse, ln, ppos, NULL);
-		tbl_end(r->tbl);
+		tbl_end(&r->tbl);
 	}
 
 	t = tbl_alloc(ppos, ln, r->parse);
@@ -1471,4 +1507,11 @@ roff_eqn(const struct roff *r)
 {
 	
 	return(r->last_eqn ? &r->last_eqn->eqn : NULL);
+}
+
+char
+roff_eqndelim(const struct roff *r)
+{
+
+	return('\0');
 }