===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.164
retrieving revision 1.170
diff -u -p -r1.164 -r1.170
--- mandoc/mdoc.c	2010/08/29 11:29:51	1.164
+++ mandoc/mdoc.c	2010/12/16 17:14:48	1.170
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.164 2010/08/29 11:29:51 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.170 2010/12/16 17:14:48 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -286,6 +286,8 @@ mdoc_macro(MACRO_PROT_ARGS)
 			! (MDOC_PBODY & m->flags)) {
 		if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG))
 			return(0);
+		if (NULL == m->meta.msec)
+			m->meta.msec = mandoc_strdup("1");
 		if (NULL == m->meta.title)
 			m->meta.title = mandoc_strdup("UNKNOWN");
 		if (NULL == m->meta.vol)
@@ -328,8 +330,6 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
 
 	if ( ! mdoc_valid_pre(mdoc, p))
 		return(0);
-	if ( ! mdoc_action_pre(mdoc, p))
-		return(0);
 
 	switch (p->type) {
 	case (MDOC_HEAD):
@@ -356,8 +356,6 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
 	case (MDOC_TEXT):
 		if ( ! mdoc_valid_post(mdoc))
 			return(0);
-		if ( ! mdoc_action_post(mdoc))
-			return(0);
 		break;
 	default:
 		break;
@@ -528,6 +526,9 @@ mdoc_node_free(struct mdoc_node *p)
 	if (MDOC_Bf == p->tok && MDOC_HEAD == p->type)
 		if (p->data.Bf)
 			free(p->data.Bf);
+	if (MDOC_An == p->tok)
+		if (p->data.An)
+			free(p->data.An);
 
 	if (p->string)
 		free(p->string);
@@ -554,6 +555,8 @@ mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n)
 		n->parent->nchild--;
 		if (n->parent->child == n)
 			n->parent->child = n->prev ? n->prev : n->next;
+		if (n->parent->last == n)
+			n->parent->last = n->prev ? n->prev : NULL;
 	}
 
 	/* Adjust parse point, if applicable. */
@@ -691,11 +694,11 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 			return(0);
 
 		/*
-		 * Insert a `Pp' in the case of a blank line.  Technically,
+		 * Insert a `sp' in the case of a blank line.  Technically,
 		 * blank lines aren't allowed, but enough manuals assume this
 		 * behaviour that we want to work around it.
 		 */
-		if ( ! mdoc_elem_alloc(m, line, offs, MDOC_Pp, NULL))
+		if ( ! mdoc_elem_alloc(m, line, offs, MDOC_sp, NULL))
 			return(0);
 
 		m->next = MDOC_NEXT_SIBLING;
@@ -758,22 +761,17 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 
 	/* 
 	 * Copy the first word into a nil-terminated buffer.
-	 * Stop copying when a tab, space, backslash, or eoln is encountered.
+	 * Stop copying when a tab, space, or eoln is encountered.
 	 */
 
 	j = 0;
-	while (j < 4 && '\0' != buf[i] && 
-			' ' != buf[i] && 
-			'\t' != buf[i] && 
-			'\\' != buf[i])
+	while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i])
 		mac[j++] = buf[i++];
 	mac[j] = '\0';
 
 	tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
 	if (MDOC_MAX == tok) {
-		mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, 
-		    "unknown macro: %s%s", 
-		    buf, strlen(buf) > 3 ? "..." : "");
+		mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1);
 		return(1);
 	}