===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.97
retrieving revision 1.103
diff -u -p -r1.97 -r1.103
--- mandoc/mdoc.c	2009/07/29 08:46:06	1.97
+++ mandoc/mdoc.c	2009/08/20 11:44:47	1.103
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.97 2009/07/29 08:46:06 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.103 2009/08/20 11:44:47 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -74,7 +74,6 @@ const	char *const __mdoc_merrnames[MERRMAX] = {		 
 	"unclosed explicit scope", /* EOPEN */
 	"unterminated quoted phrase", /* EQUOTPHR */
 	"closure macro without prior context", /* ENOCTX */
-	"invalid whitespace after control character", /* ESPACE */
 	"no description found for library" /* ELIB */
 };
 
@@ -460,7 +459,10 @@ mdoc_tail_alloc(struct mdoc *m, int line, int pos, int
 	p = node_alloc(m, line, pos, tok, MDOC_TAIL);
 	if (NULL == p)
 		return(0);
-	return(node_append(m, p));
+	if ( ! node_append(m, p))
+		return(0);
+	m->next = MDOC_NEXT_CHILD;
+	return(1);
 }
 
 
@@ -475,7 +477,10 @@ mdoc_head_alloc(struct mdoc *m, int line, int pos, int
 	p = node_alloc(m, line, pos, tok, MDOC_HEAD);
 	if (NULL == p)
 		return(0);
-	return(node_append(m, p));
+	if ( ! node_append(m, p))
+		return(0);
+	m->next = MDOC_NEXT_CHILD;
+	return(1);
 }
 
 
@@ -487,7 +492,10 @@ mdoc_body_alloc(struct mdoc *m, int line, int pos, int
 	p = node_alloc(m, line, pos, tok, MDOC_BODY);
 	if (NULL == p)
 		return(0);
-	return(node_append(m, p));
+	if ( ! node_append(m, p))
+		return(0);
+	m->next = MDOC_NEXT_CHILD;
+	return(1);
 }
 
 
@@ -503,7 +511,10 @@ mdoc_block_alloc(struct mdoc *m, int line, int pos, 
 	p->args = args;
 	if (p->args)
 		(args->refcnt)++;
-	return(node_append(m, p));
+	if ( ! node_append(m, p))
+		return(0);
+	m->next = MDOC_NEXT_CHILD;
+	return(1);
 }
 
 
@@ -519,7 +530,10 @@ mdoc_elem_alloc(struct mdoc *m, int line, int pos, 
 	p->args = args;
 	if (p->args)
 		(args->refcnt)++;
-	return(node_append(m, p));
+	if ( ! node_append(m, p))
+		return(0);
+	m->next = MDOC_NEXT_CHILD;
+	return(1);
 }
 
 
@@ -544,7 +558,10 @@ pstring(struct mdoc *m, int line, int pos, const char 
 	/* Prohibit truncation. */
 	assert(sv < len + 1);
 
-	return(node_append(m, n));
+	if ( ! node_append(m, n))
+		return(0);
+	m->next = MDOC_NEXT_SIBLING;
+	return(1);
 }
 
 
@@ -601,12 +618,8 @@ parsetext(struct mdoc *m, int line, char *buf)
 	 * back-end, as it should be preserved as a single term.
 	 */
 
-	if (MDOC_LITERAL & m->flags) {
-		if ( ! mdoc_word_alloc(m, line, 0, buf))
-			return(0);
-		m->next = MDOC_NEXT_SIBLING;
-		return(1);
-	}
+	if (MDOC_LITERAL & m->flags)
+		return(mdoc_word_alloc(m, line, 0, buf));
 
 	/* Disallow blank/white-space lines in non-literal mode. */
 
@@ -631,7 +644,6 @@ parsetext(struct mdoc *m, int line, char *buf)
 		buf[i++] = 0;
 		if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
 			return(0);
-		m->next = MDOC_NEXT_SIBLING;
 
 		for ( ; ' ' == buf[i]; i++)
 			/* Skip trailing whitespace. */ ;
@@ -670,7 +682,7 @@ macrowarn(struct mdoc *m, int ln, const char *buf)
 int
 parsemacro(struct mdoc *m, int ln, char *buf)
 {
-	int		  i, c;
+	int		  i, j, c;
 	char		  mac[5];
 
 	/* Empty lines are ignored. */
@@ -678,27 +690,30 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 	if (0 == buf[1])
 		return(1);
 
-	if (' ' == buf[1]) {
-		i = 2;
+	i = 1;
+
+	/* Accept whitespace after the initial control char. */
+
+	if (' ' == buf[i]) {
+		i++;
 		while (buf[i] && ' ' == buf[i])
 			i++;
 		if (0 == buf[i])
 			return(1);
-		return(mdoc_perr(m, ln, 1, ESPACE));
 	}
 
 	/* Copy the first word into a nil-terminated buffer. */
 
-	for (i = 1; i < 5; i++) {
-		if (0 == (mac[i - 1] = buf[i]))
+	for (j = 0; j < 4; j++, i++) {
+		if (0 == (mac[j] = buf[i]))
 			break;
 		else if (' ' == buf[i])
 			break;
 	}
 
-	mac[i - 1] = 0;
+	mac[j] = 0;
 
-	if (i == 5 || i <= 2) {
+	if (j == 4 || j < 2) {
 		if ( ! macrowarn(m, ln, mac))
 			goto err;
 		return(1);
@@ -715,8 +730,10 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 	while (buf[i] && ' ' == buf[i])
 		i++;
 
-	/* Begin recursive parse sequence. */
-
+	/* 
+	 * Begin recursive parse sequence.  Since we're at the start of
+	 * the line, we don't need to do callable/parseable checks.
+	 */
 	if ( ! mdoc_macro(m, c, ln, 1, &i, buf)) 
 		goto err;
 
@@ -727,3 +744,5 @@ err:	/* Error out. */
 	m->flags |= MDOC_HALT;
 	return(0);
 }
+
+