===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.165
retrieving revision 1.175
diff -u -p -r1.165 -r1.175
--- mandoc/mdoc.c	2010/09/27 23:03:44	1.165
+++ mandoc/mdoc.c	2011/01/01 12:18:37	1.175
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.165 2010/09/27 23:03:44 schwarze Exp $ */
+/*	$Id: mdoc.c,v 1.175 2011/01/01 12:18:37 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -98,6 +98,8 @@ static	int		  node_append(struct mdoc *, 
 				struct mdoc_node *);
 static	int		  mdoc_ptext(struct mdoc *, int, char *, int);
 static	int		  mdoc_pmacro(struct mdoc *, int, char *, int);
+static	int		  mdoc_span_alloc(struct mdoc *, 
+				const struct tbl_span *);
 
 
 const struct mdoc_node *
@@ -221,7 +223,25 @@ mdoc_endparse(struct mdoc *m)
 	return(0);
 }
 
+int
+mdoc_addspan(struct mdoc *m, const struct tbl_span *sp)
+{
 
+	if (MDOC_HALT & m->flags)
+		return(0);
+
+	/* No text before an initial macro. */
+
+	if (SEC_NONE == m->lastnamed) {
+		/* FIXME: grab from span. */
+		mdoc_pmsg(m, 0, 0, MANDOCERR_NOTEXT);
+		return(1);
+	}
+
+	return(mdoc_span_alloc(m, sp));
+}
+
+
 /*
  * Main parse routine.  Parses a single line -- really just hands off to
  * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).
@@ -277,15 +297,18 @@ mdoc_macro(MACRO_PROT_ARGS)
 	/* If we're in the body, deny prologue calls. */
 
 	if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
-			MDOC_PBODY & m->flags)
-		return(mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY));
+			MDOC_PBODY & m->flags) {
+		mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY);
+		return(1);
+	}
 
 	/* If we're in the prologue, deny "body" macros.  */
 
 	if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
 			! (MDOC_PBODY & m->flags)) {
-		if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG))
-			return(0);
+		mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG);
+		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)
@@ -326,10 +349,25 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
 
 	p->parent->nchild++;
 
+	/*
+	 * Copy over the normalised-data pointer of our parent.  Not
+	 * everybody has one, but copying a null pointer is fine.
+	 */
+
+	switch (p->type) {
+	case (MDOC_BODY):
+		/* FALLTHROUGH */
+	case (MDOC_TAIL):
+		/* FALLTHROUGH */
+	case (MDOC_HEAD):
+		p->norm = p->parent->norm;
+		break;
+	default:
+		break;
+	}
+
 	if ( ! mdoc_valid_pre(mdoc, p))
 		return(0);
-	if ( ! mdoc_action_pre(mdoc, p))
-		return(0);
 
 	switch (p->type) {
 	case (MDOC_HEAD):
@@ -356,8 +394,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;
@@ -462,6 +498,21 @@ mdoc_block_alloc(struct mdoc *m, int line, int pos, 
 	p->args = args;
 	if (p->args)
 		(args->refcnt)++;
+
+	switch (tok) {
+	case (MDOC_Bd):
+		/* FALLTHROUGH */
+	case (MDOC_Bf):
+		/* FALLTHROUGH */
+	case (MDOC_Bl):
+		/* FALLTHROUGH */
+	case (MDOC_Rs):
+		p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
+		break;
+	default:
+		break;
+	}
+
 	if ( ! node_append(m, p))
 		return(0);
 	m->next = MDOC_NEXT_CHILD;
@@ -479,13 +530,38 @@ mdoc_elem_alloc(struct mdoc *m, int line, int pos, 
 	p->args = args;
 	if (p->args)
 		(args->refcnt)++;
+
+	switch (tok) {
+	case (MDOC_An):
+		p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
+		break;
+	default:
+		break;
+	}
+
 	if ( ! node_append(m, p))
 		return(0);
 	m->next = MDOC_NEXT_CHILD;
 	return(1);
 }
 
+static int
+mdoc_span_alloc(struct mdoc *m, const struct tbl_span *sp)
+{
+	struct mdoc_node *n;
 
+	/* FIXME: grab from tbl_span. */
+	n = node_alloc(m, 0, 0, MDOC_MAX, MDOC_TBL);
+	n->span = sp;
+
+	if ( ! node_append(m, n))
+		return(0);
+
+	m->next = MDOC_NEXT_SIBLING;
+	return(1);
+}
+
+
 int
 mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
 {
@@ -513,22 +589,8 @@ static void
 mdoc_node_free(struct mdoc_node *p)
 {
 
-	/*
-	 * XXX: if these end up being problematic in terms of memory
-	 * management and dereferencing freed blocks, then make them
-	 * into reference-counted double-pointers.
-	 */
-
-	if (MDOC_Bd == p->tok && MDOC_BLOCK == p->type)
-		if (p->data.Bd)
-			free(p->data.Bd);
-	if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type)
-		if (p->data.Bl)
-			free(p->data.Bl);
-	if (MDOC_Bf == p->tok && MDOC_HEAD == p->type)
-		if (p->data.Bf)
-			free(p->data.Bf);
-
+	if (MDOC_BLOCK == p->type || MDOC_ELEM == p->type)
+		free(p->norm);
 	if (p->string)
 		free(p->string);
 	if (p->args)
@@ -554,6 +616,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. */
@@ -602,13 +666,17 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 
 	if ('\\' == buf[offs] && 
 			'.' == buf[offs + 1] && 
-			'"' == buf[offs + 2])
-		return(mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT));
+			'"' == buf[offs + 2]) {
+		mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT);
+		return(1);
+	}
 
 	/* No text before an initial macro. */
 
-	if (SEC_NONE == m->lastnamed)
-		return(mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT));
+	if (SEC_NONE == m->lastnamed) {
+		mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT);
+		return(1);
+	}
 
 	assert(m->last);
 	n = m->last;
@@ -621,7 +689,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 	 */
 
 	if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-			LIST_column == n->data.Bl->type) {
+			LIST_column == n->norm->Bl.type) {
 		/* `Bl' is open without any children. */
 		m->flags |= MDOC_FREECOL;
 		return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
@@ -630,7 +698,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 	if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
 			NULL != n->parent &&
 			MDOC_Bl == n->parent->tok &&
-			LIST_column == n->parent->data.Bl->type) {
+			LIST_column == n->parent->norm->Bl.type) {
 		/* `Bl' has block-level `It' children. */
 		m->flags |= MDOC_FREECOL;
 		return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
@@ -683,12 +751,10 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 	*end = '\0';
 
 	if (ws)
-		if ( ! mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE))
-			return(0);
+		mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE);
 
 	if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) {
-		if ( ! mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN))
-			return(0);
+		mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN);
 
 		/*
 		 * Insert a `sp' in the case of a blank line.  Technically,
@@ -768,9 +834,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 
 	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);
 	}
 
@@ -790,8 +854,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 	 */
 
 	if ('\0' == buf[i] && ' ' == buf[i - 1])
-		if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE))
-			goto err;
+		mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE);
 
 	/*
 	 * If an initial macro or a list invocation, divert directly
@@ -813,7 +876,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 	 */
 
 	if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-			LIST_column == n->data.Bl->type) {
+			LIST_column == n->norm->Bl.type) {
 		m->flags |= MDOC_FREECOL;
 		if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf))
 			goto err;
@@ -829,7 +892,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 	if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
 			NULL != n->parent &&
 			MDOC_Bl == n->parent->tok &&
-			LIST_column == n->parent->data.Bl->type) {
+			LIST_column == n->parent->norm->Bl.type) {
 		m->flags |= MDOC_FREECOL;
 		if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
 			goto err;