===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.154
retrieving revision 1.160
diff -u -p -r1.154 -r1.160
--- mandoc/mdoc.c	2010/07/01 22:56:17	1.154
+++ mandoc/mdoc.c	2010/08/07 20:33:55	1.160
@@ -1,6 +1,7 @@
-/*	$Id: mdoc.c,v 1.154 2010/07/01 22:56:17 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.160 2010/08/07 20:33:55 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -29,7 +30,6 @@
 #include <time.h>
 
 #include "mandoc.h"
-#include "regs.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
 
@@ -514,17 +514,25 @@ mdoc_word_alloc(struct mdoc *m, int line, int pos, con
 }
 
 
-/* FIXME: put in mdoc_node_delete(). */
-void
+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 (p->string)
 		free(p->string);
@@ -713,7 +721,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 
 	assert(buf < end);
 
-	if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))
+	if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0))
 		m->last->flags |= MDOC_EOS;
 
 	return(1);
@@ -739,7 +747,7 @@ macrowarn(struct mdoc *m, int ln, const char *buf, int
  * Parse a macro line, that is, a line beginning with the control
  * character.
  */
-int
+static int
 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 {
 	enum mdoct	  tok;
@@ -756,11 +764,11 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 
 	i = offs;
 
-	/* Accept whitespace after the initial control char. */
+	/* Accept tabs/whitespace after the initial control char. */
 
-	if (' ' == buf[i]) {
+	if (' ' == buf[i] || '\t' == buf[i]) {
 		i++;
-		while (buf[i] && ' ' == buf[i])
+		while (buf[i] && (' ' == buf[i] || '\t' == buf[i]))
 			i++;
 		if ('\0' == buf[i])
 			return(1);
@@ -768,15 +776,19 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 
 	sv = i;
 
-	/* Copy the first word into a nil-terminated buffer. */
+	/* 
+	 * Copy the first word into a nil-terminated buffer.  Stop
+	 * copying when a tab, space, or eoln is encountered.
+	 */
 
 	for (j = 0; j < 4; j++, i++) {
 		if ('\0' == (mac[j] = buf[i]))
 			break;
-		else if (' ' == buf[i])
+		else if (' ' == buf[i] || '\t' == buf[i])
 			break;
 
 		/* Check for invalid characters. */
+		/* TODO: remove me, already done in main.c. */
 
 		if (isgraph((u_char)buf[i]))
 			continue;
@@ -799,7 +811,12 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 		return(1);
 	}
 
-	/* The macro is sane.  Jump to the next word. */
+	/* Disregard the first trailing tab, if applicable. */
+
+	if ('\t' == buf[i])
+		i++;
+
+	/* Jump to the next non-whitespace word. */
 
 	while (buf[i] && ' ' == buf[i])
 		i++;