===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.114
retrieving revision 1.117
diff -u -p -r1.114 -r1.117
--- mandoc/mdoc.c	2010/01/01 17:14:29	1.114
+++ mandoc/mdoc.c	2010/03/31 07:13:53	1.117
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.114 2010/01/01 17:14:29 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.117 2010/03/31 07:13:53 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -143,7 +143,7 @@ const	char * const *mdoc_argnames = __mdoc_argnames;
 static	void		  mdoc_free1(struct mdoc *);
 static	void		  mdoc_alloc1(struct mdoc *);
 static	struct mdoc_node *node_alloc(struct mdoc *, int, int, 
-				int, enum mdoc_type);
+				enum mdoct, enum mdoc_type);
 static	int		  node_append(struct mdoc *, 
 				struct mdoc_node *);
 static	int		  parsetext(struct mdoc *, int, char *);
@@ -341,9 +341,11 @@ mdoc_err(struct mdoc *m, int line, int pos, int iserr,
 
 
 int
-mdoc_macro(struct mdoc *m, int tok, 
+mdoc_macro(struct mdoc *m, enum mdoct tok, 
 		int ln, int pp, int *pos, char *buf)
 {
+
+	assert(tok < MDOC_MAX);
 	/*
 	 * If we're in the prologue, deny "body" macros.  Similarly, if
 	 * we're in the body, deny prologue calls.
@@ -424,8 +426,8 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
 
 
 static struct mdoc_node *
-node_alloc(struct mdoc *m, int line, 
-		int pos, int tok, enum mdoc_type type)
+node_alloc(struct mdoc *m, int line, int pos, 
+		enum mdoct tok, enum mdoc_type type)
 {
 	struct mdoc_node *p;
 
@@ -434,15 +436,13 @@ node_alloc(struct mdoc *m, int line, 
 	p->line = line;
 	p->pos = pos;
 	p->tok = tok;
-	if (MDOC_TEXT != (p->type = type))
-		assert(p->tok >= 0);
 
 	return(p);
 }
 
 
 int
-mdoc_tail_alloc(struct mdoc *m, int line, int pos, int tok)
+mdoc_tail_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
 {
 	struct mdoc_node *p;
 
@@ -455,7 +455,7 @@ mdoc_tail_alloc(struct mdoc *m, int line, int pos, int
 
 
 int
-mdoc_head_alloc(struct mdoc *m, int line, int pos, int tok)
+mdoc_head_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
 {
 	struct mdoc_node *p;
 
@@ -471,7 +471,7 @@ mdoc_head_alloc(struct mdoc *m, int line, int pos, int
 
 
 int
-mdoc_body_alloc(struct mdoc *m, int line, int pos, int tok)
+mdoc_body_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
 {
 	struct mdoc_node *p;
 
@@ -485,7 +485,7 @@ mdoc_body_alloc(struct mdoc *m, int line, int pos, int
 
 int
 mdoc_block_alloc(struct mdoc *m, int line, int pos, 
-		int tok, struct mdoc_arg *args)
+		enum mdoct tok, struct mdoc_arg *args)
 {
 	struct mdoc_node *p;
 
@@ -502,7 +502,7 @@ mdoc_block_alloc(struct mdoc *m, int line, int pos, 
 
 int
 mdoc_elem_alloc(struct mdoc *m, int line, int pos, 
-		int tok, struct mdoc_arg *args)
+		enum mdoct tok, struct mdoc_arg *args)
 {
 	struct mdoc_node *p;
 
@@ -581,6 +581,7 @@ static int
 parsetext(struct mdoc *m, int line, char *buf)
 {
 	int		 i, j;
+	char		 sv;
 
 	if (SEC_NONE == m->lastnamed)
 		return(mdoc_perr(m, line, 0, ETEXTPROL));
@@ -597,7 +598,8 @@ parsetext(struct mdoc *m, int line, char *buf)
 
 	for (i = 0; ' ' == buf[i]; i++)
 		/* Skip leading whitespace. */ ;
-	if (0 == buf[i])
+
+	if ('\0' == buf[i])
 		return(mdoc_perr(m, line, 0, ENOBLANK));
 
 	/*
@@ -613,15 +615,30 @@ parsetext(struct mdoc *m, int line, char *buf)
 		if (i && ' ' == buf[i] && '\\' == buf[i - 1])
 			continue;
 
-		buf[i++] = 0;
+		sv = buf[i];
+		buf[i++] = '\0';
+
 		if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
 			return(0);
 
+		/* Trailing whitespace?  Check at overwritten byte. */
+
+		if (' ' == sv && '\0' == buf[i])
+			if ( ! mdoc_pwarn(m, line, i - 1, ETAILWS))
+				return(0);
+
 		for ( ; ' ' == buf[i]; i++)
 			/* Skip trailing whitespace. */ ;
 
 		j = i;
-		if (0 == buf[i])
+
+		/* Trailing whitespace? */
+
+		if (' ' == buf[i - 1] && '\0' == buf[i])
+			if ( ! mdoc_pwarn(m, line, i - 1, ETAILWS))
+				return(0);
+
+		if ('\0' == buf[i])
 			break;
 	}
 
@@ -658,7 +675,7 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 
 	/* Empty lines are ignored. */
 
-	if (0 == buf[1])
+	if ('\0' == buf[1])
 		return(1);
 
 	i = 1;
@@ -669,14 +686,14 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 		i++;
 		while (buf[i] && ' ' == buf[i])
 			i++;
-		if (0 == buf[i])
+		if ('\0' == buf[i])
 			return(1);
 	}
 
 	/* Copy the first word into a nil-terminated buffer. */
 
 	for (j = 0; j < 4; j++, i++) {
-		if (0 == (mac[j] = buf[i]))
+		if ('\0' == (mac[j] = buf[i]))
 			break;
 		else if (' ' == buf[i])
 			break;
@@ -706,6 +723,12 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 
 	while (buf[i] && ' ' == buf[i])
 		i++;
+
+	/* Trailing whitespace? */
+
+	if ('\0' == buf[i] && ' ' == buf[i - 1])
+		if ( ! mdoc_pwarn(m, ln, i - 1, ETAILWS))
+			goto err;
 
 	/* 
 	 * Begin recursive parse sequence.  Since we're at the start of