X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/364660607f78ece4469bf93ed5a754c04ec61847..a907445c2b200a31f661cd37cd622ec9328eb04d:/mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 47eb517f..7e1d0f4b 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,39 +1,92 @@
-/* $Id: mdoc.c,v 1.72 2009/03/23 15:41:09 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.119 2010/04/03 13:02:35 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdarg.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "libmdoc.h"
-
-/*
- * Main caller in the libmdoc library.  This begins the parsing routine,
- * handles allocation of data, and so forth.  Most of the "work" is done
- * in macro.c, validate.c and action.c.
- */
+#include "libmandoc.h"
+
+const	char *const __mdoc_merrnames[MERRMAX] = {		 
+	"trailing whitespace", /* ETAILWS */
+	"unexpected quoted parameter", /* EQUOTPARM */
+	"unterminated quoted parameter", /* EQUOTTERM */
+	"argument parameter suggested", /* EARGVAL */
+	"macro disallowed in prologue", /* EBODYPROL */
+	"macro disallowed in body", /* EPROLBODY */
+	"text disallowed in prologue", /* ETEXTPROL */
+	"blank line disallowed", /* ENOBLANK */
+	"text parameter too long", /* ETOOLONG */
+	"invalid escape sequence", /* EESCAPE */
+	"invalid character", /* EPRINT */
+	"document has no body", /* ENODAT */
+	"document has no prologue", /* ENOPROLOGUE */
+	"expected line arguments", /* ELINE */
+	"invalid AT&T argument", /* EATT */
+	"default name not yet set", /* ENAME */
+	"missing list type", /* ELISTTYPE */
+	"missing display type", /* EDISPTYPE */
+	"too many display types", /* EMULTIDISP */
+	"too many list types", /* EMULTILIST */
+	"NAME section must be first", /* ESECNAME */
+	"badly-formed NAME section", /* ENAMESECINC */
+	"argument repeated", /* EARGREP */
+	"expected boolean parameter", /* EBOOL */
+	"inconsistent column syntax", /* ECOLMIS */
+	"nested display invalid", /* ENESTDISP */
+	"width argument missing", /* EMISSWIDTH */
+	"invalid section for this manual section", /* EWRONGMSEC */
+	"section out of conventional order", /* ESECOOO */
+	"section repeated", /* ESECREP */
+	"invalid standard argument", /* EBADSTAND */
+	"multi-line arguments discouraged", /* ENOMULTILINE */
+	"multi-line arguments suggested", /* EMULTILINE */
+	"line arguments discouraged", /* ENOLINE */
+	"prologue macro out of conventional order", /* EPROLOOO */
+	"prologue macro repeated", /* EPROLREP */
+	"invalid manual section", /* EBADMSEC */
+	"invalid section", /* EBADSEC */
+	"invalid font mode", /* EFONT */
+	"invalid date syntax", /* EBADDATE */
+	"invalid number format", /* ENUMFMT */
+	"superfluous width argument", /* ENOWIDTH */
+	"system: utsname error", /* EUTSNAME */
+	"obsolete macro", /* EOBS */
+	"end-of-line scope violation", /* EIMPBRK */
+	"empty macro ignored", /* EIGNE */
+	"unclosed explicit scope", /* EOPEN */
+	"unterminated quoted phrase", /* EQUOTPHR */
+	"closure macro without prior context", /* ENOCTX */
+	"no description found for library", /* ELIB */
+	"bad child for parent context", /* EBADCHILD */
+	"list arguments preceding type", /* ENOTYPE */
+};
 
 const	char *const __mdoc_macronames[MDOC_MAX] = {		 
-	"\\\"",		"Dd",		"Dt",		"Os",
+	"Ap",		"Dd",		"Dt",		"Os",
 	"Sh",		"Ss",		"Pp",		"D1",
 	"Dl",		"Bd",		"Ed",		"Bl",
 	"El",		"It",		"Ad",		"An",
@@ -44,11 +97,11 @@ const	char *const __mdoc_macronames[MDOC_MAX] = {
 	"Nm",		"Op",		"Ot",		"Pa",
 	"Rv",		"St",		"Va",		"Vt",
 	/* LINTED */
-	"Xr",		"\%A",		"\%B",		"\%D",
+	"Xr",		"%A",		"%B",		"%D",
 	/* LINTED */
-	"\%I",		"\%J",		"\%N",		"\%O",
+	"%I",		"%J",		"%N",		"%O",
 	/* LINTED */
-	"\%P",		"\%R",		"\%T",		"\%V",
+	"%P",		"%R",		"%T",		"%V",
 	"Ac",		"Ao",		"Aq",		"At",
 	"Bc",		"Bf",		"Bo",		"Bq",
 	"Bsx",		"Bx",		"Db",		"Dc",
@@ -62,12 +115,14 @@ const	char *const __mdoc_macronames[MDOC_MAX] = {
 	"Tn",		"Ux",		"Xc",		"Xo",
 	"Fo",		"Fc",		"Oo",		"Oc",
 	"Bk",		"Ek",		"Bt",		"Hf",
-	"Fr",		"Ud",		"Lb",		"Ap",
-	"Lp",		"Lk",		"Mt",		"Brq",
+	"Fr",		"Ud",		"Lb",		"Lp",
+	"Lk",		"Mt",		"Brq",		"Bro",
+	/* LINTED */
+	"Brc",		"%C",		"Es",		"En",
 	/* LINTED */
-	"Bro",		"Brc",		"\%C",		"Es",
+	"Dx",		"%Q",		"br",		"sp",
 	/* LINTED */
-	"En",		"Dx",		"\%Q"
+	"%U"
 	};
 
 const	char *const __mdoc_argnames[MDOC_ARG_MAX] = {		 
@@ -79,26 +134,24 @@ const	char *const __mdoc_argnames[MDOC_ARG_MAX] = {
 	"ohang",		"inset",		"column",	 
 	"width",		"compact",		"std",	 
 	"filled",		"words",		"emphasis",
-	"symbolic",		"nested"
+	"symbolic",		"nested",		"centered"
 	};
 
 const	char * const *mdoc_macronames = __mdoc_macronames;
 const	char * const *mdoc_argnames = __mdoc_argnames;
 
-/* FIXME: have this accept line/pos/tok. */
-/* FIXME: mdoc_alloc1 and mdoc_free1 like in man.c. */
-static	struct mdoc_node *mdoc_node_alloc(const struct mdoc *);
-static	int		  mdoc_node_append(struct mdoc *, 
+static	void		  mdoc_free1(struct mdoc *);
+static	void		  mdoc_alloc1(struct mdoc *);
+static	struct mdoc_node *node_alloc(struct mdoc *, int, int, 
+				enum mdoct, enum mdoc_type);
+static	int		  node_append(struct mdoc *, 
 				struct mdoc_node *);
-
 static	int		  parsetext(struct mdoc *, int, char *);
 static	int		  parsemacro(struct mdoc *, int, char *);
 static	int		  macrowarn(struct mdoc *, int, const char *);
+static	int		  pstring(struct mdoc *, int, int, 
+				const char *, size_t);
 
-
-/*
- * Get the first (root) node of the parse tree.
- */
 const struct mdoc_node *
 mdoc_node(const struct mdoc *m)
 {
@@ -116,12 +169,10 @@ mdoc_meta(const struct mdoc *m)
 
 
 /*
- * Free up all resources contributed by a parse:  the node tree,
- * meta-data and so on.  Then reallocate the root node for another
- * parse.
+ * Frees volatile resources (parse tree, meta-data, fields).
  */
-void
-mdoc_reset(struct mdoc *mdoc)
+static void
+mdoc_free1(struct mdoc *mdoc)
 {
 
 	if (mdoc->first)
@@ -136,13 +187,20 @@ mdoc_reset(struct mdoc *mdoc)
 		free(mdoc->meta.arch);
 	if (mdoc->meta.vol)
 		free(mdoc->meta.vol);
+}
+
 
-	bzero(&mdoc->meta, sizeof(struct mdoc_meta));
+/*
+ * Allocate all volatile resources (parse tree, meta-data, fields).
+ */
+static void
+mdoc_alloc1(struct mdoc *mdoc)
+{
+
+	memset(&mdoc->meta, 0, sizeof(struct mdoc_meta));
 	mdoc->flags = 0;
-	mdoc->lastnamed = mdoc->lastsec = 0;
-	mdoc->last = calloc(1, sizeof(struct mdoc_node));
-	if (NULL == mdoc->last)
-		err(1, "calloc");
+	mdoc->lastnamed = mdoc->lastsec = SEC_NONE;
+	mdoc->last = mandoc_calloc(1, sizeof(struct mdoc_node));
 	mdoc->first = mdoc->last;
 	mdoc->last->type = MDOC_ROOT;
 	mdoc->next = MDOC_NEXT_CHILD;
@@ -150,58 +208,58 @@ mdoc_reset(struct mdoc *mdoc)
 
 
 /*
- * Completely free up all resources.
+ * Free up volatile resources (see mdoc_free1()) then re-initialises the
+ * data with mdoc_alloc1().  After invocation, parse data has been reset
+ * and the parser is ready for re-invocation on a new tree; however,
+ * cross-parse non-volatile data is kept intact.
  */
 void
-mdoc_free(struct mdoc *mdoc)
+mdoc_reset(struct mdoc *mdoc)
 {
 
-	if (mdoc->first)
-		mdoc_node_freelist(mdoc->first);
-	if (mdoc->meta.title)
-		free(mdoc->meta.title);
-	if (mdoc->meta.os)
-		free(mdoc->meta.os);
-	if (mdoc->meta.name)
-		free(mdoc->meta.name);
-	if (mdoc->meta.arch)
-		free(mdoc->meta.arch);
-	if (mdoc->meta.vol)
-		free(mdoc->meta.vol);
+	mdoc_free1(mdoc);
+	mdoc_alloc1(mdoc);
+}
+
 
-	if (mdoc->htab)
-		mdoc_tokhash_free(mdoc->htab);
+/*
+ * Completely free up all volatile and non-volatile parse resources.
+ * After invocation, the pointer is no longer usable.
+ */
+void
+mdoc_free(struct mdoc *mdoc)
+{
 
+	mdoc_free1(mdoc);
 	free(mdoc);
 }
 
 
+/*
+ * Allocate volatile and non-volatile parse resources.  
+ */
 struct mdoc *
 mdoc_alloc(void *data, int pflags, const struct mdoc_cb *cb)
 {
 	struct mdoc	*p;
 
-	if (NULL == (p = calloc(1, sizeof(struct mdoc))))
-		err(1, "calloc");
+	p = mandoc_calloc(1, sizeof(struct mdoc));
 
-	p->data = data;
 	if (cb)
-		(void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
+		memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
 
-	if (NULL == (p->first = calloc(1, sizeof(struct mdoc_node))))
-		err(1, "calloc");
-	p->last = p->first;
-	p->last->type = MDOC_ROOT;
+	p->data = data;
 	p->pflags = pflags;
-	p->next = MDOC_NEXT_CHILD;
-	p->htab = mdoc_tokhash_alloc();
+
+	mdoc_hash_init();
+	mdoc_alloc1(p);
 	return(p);
 }
 
 
 /*
  * Climb back up the parse tree, validating open scopes.  Mostly calls
- * through to macro_end in macro.c.
+ * through to macro_end() in macro.c.
  */
 int
 mdoc_endparse(struct mdoc *m)
@@ -218,14 +276,12 @@ mdoc_endparse(struct mdoc *m)
 
 /*
  * Main parse routine.  Parses a single line -- really just hands off to
- * the macro or text parser.
+ * the macro (parsemacro()) or text parser (parsetext()).
  */
 int
 mdoc_parseln(struct mdoc *m, int ln, char *buf)
 {
 
-	/* If in error-mode, then we parse no more. */
-
 	if (MDOC_HALT & m->flags)
 		return(0);
 
@@ -234,22 +290,6 @@ mdoc_parseln(struct mdoc *m, int ln, char *buf)
 }
 
 
-void
-mdoc_vmsg(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...)
-{
-	char		  buf[256];
-	va_list		  ap;
-
-	if (NULL == mdoc->cb.mdoc_msg)
-		return;
-
-	va_start(ap, fmt);
-	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-	va_end(ap);
-	(*mdoc->cb.mdoc_msg)(mdoc->data, ln, pos, buf);
-}
-
-
 int
 mdoc_verr(struct mdoc *mdoc, int ln, int pos, 
 		const char *fmt, ...)
@@ -263,13 +303,13 @@ mdoc_verr(struct mdoc *mdoc, int ln, int pos,
 	va_start(ap, fmt);
 	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
 	va_end(ap);
+
 	return((*mdoc->cb.mdoc_err)(mdoc->data, ln, pos, buf));
 }
 
 
 int
-mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, 
-		enum mdoc_warn type, const char *fmt, ...)
+mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...)
 {
 	char		 buf[256];
 	va_list		 ap;
@@ -280,37 +320,49 @@ mdoc_vwarn(struct mdoc *mdoc, int ln, int pos,
 	va_start(ap, fmt);
 	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
 	va_end(ap);
-	return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, type, buf));
+
+	return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, buf));
 }
 
 
 int
-mdoc_macro(struct mdoc *m, int tok, 
-		int ln, int pp, int *pos, char *buf)
+mdoc_err(struct mdoc *m, int line, int pos, int iserr, enum merr type)
 {
+	const char	*p;
 
-	/* FIXME - these should happen during validation. */
+	p = __mdoc_merrnames[(int)type];
+	assert(p);
 
-	if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
-			SEC_PROLOGUE != m->lastnamed)
-		return(mdoc_perr(m, ln, pp, 
-				"disallowed in document body"));
+	if (iserr)
+		return(mdoc_verr(m, line, pos, p));
+
+	return(mdoc_vwarn(m, line, pos, p));
+}
 
-	if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
-			SEC_PROLOGUE == m->lastnamed)
-		return(mdoc_perr(m, ln, pp, 
-				"disallowed in prologue"));
 
-	if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))
-		return(mdoc_perr(m, ln, pp, "%s not callable",
-					mdoc_macronames[tok]));
+int
+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.
+	 */
+	if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
+			MDOC_PBODY & m->flags)
+		return(mdoc_perr(m, ln, pp, EPROLBODY));
+	if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
+			! (MDOC_PBODY & m->flags))
+		return(mdoc_perr(m, ln, pp, EBODYPROL));
 
 	return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));
 }
 
 
 static int
-mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p)
+node_append(struct mdoc *mdoc, struct mdoc_node *p)
 {
 
 	assert(mdoc->last);
@@ -332,6 +384,8 @@ mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p)
 		/* NOTREACHED */
 	}
 
+	p->parent->nchild++;
+
 	if ( ! mdoc_valid_pre(mdoc, p))
 		return(0);
 	if ( ! mdoc_action_pre(mdoc, p))
@@ -372,132 +426,123 @@ mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p)
 
 
 static struct mdoc_node *
-mdoc_node_alloc(const struct mdoc *mdoc)
+node_alloc(struct mdoc *m, int line, int pos, 
+		enum mdoct tok, enum mdoc_type type)
 {
 	struct mdoc_node *p;
 
-	if (NULL == (p = calloc(1, sizeof(struct mdoc_node))))
-		err(1, "calloc");
-	p->sec = mdoc->lastsec;
+	p = mandoc_calloc(1, sizeof(struct mdoc_node));
+	p->sec = m->lastsec;
+	p->line = line;
+	p->pos = pos;
+	p->tok = tok;
+	p->type = type;
 
 	return(p);
 }
 
 
 int
-mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, int tok)
+mdoc_tail_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
 {
 	struct mdoc_node *p;
 
-	assert(mdoc->first);
-	assert(mdoc->last);
-
-	p = mdoc_node_alloc(mdoc);
-
-	p->line = line;
-	p->pos = pos;
-	p->type = MDOC_TAIL;
-	p->tok = tok;
-
-	return(mdoc_node_append(mdoc, p));
+	p = node_alloc(m, line, pos, tok, MDOC_TAIL);
+	if ( ! node_append(m, p))
+		return(0);
+	m->next = MDOC_NEXT_CHILD;
+	return(1);
 }
 
 
 int
-mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, int tok)
+mdoc_head_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
 {
 	struct mdoc_node *p;
 
-	assert(mdoc->first);
-	assert(mdoc->last);
-
-	p = mdoc_node_alloc(mdoc);
-
-	p->line = line;
-	p->pos = pos;
-	p->type = MDOC_HEAD;
-	p->tok = tok;
+	assert(m->first);
+	assert(m->last);
 
-	return(mdoc_node_append(mdoc, p));
+	p = node_alloc(m, line, pos, tok, MDOC_HEAD);
+	if ( ! node_append(m, p))
+		return(0);
+	m->next = MDOC_NEXT_CHILD;
+	return(1);
 }
 
 
 int
-mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, int tok)
+mdoc_body_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
 {
 	struct mdoc_node *p;
 
-	assert(mdoc->first);
-	assert(mdoc->last);
-
-	p = mdoc_node_alloc(mdoc);
-
-	p->line = line;
-	p->pos = pos;
-	p->type = MDOC_BODY;
-	p->tok = tok;
-
-	return(mdoc_node_append(mdoc, p));
+	p = node_alloc(m, line, pos, tok, MDOC_BODY);
+	if ( ! node_append(m, p))
+		return(0);
+	m->next = MDOC_NEXT_CHILD;
+	return(1);
 }
 
 
 int
-mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, 
-		int tok, struct mdoc_arg *args)
+mdoc_block_alloc(struct mdoc *m, int line, int pos, 
+		enum mdoct tok, struct mdoc_arg *args)
 {
 	struct mdoc_node *p;
 
-	p = mdoc_node_alloc(mdoc);
-
-	p->pos = pos;
-	p->line = line;
-	p->type = MDOC_BLOCK;
-	p->tok = tok;
+	p = node_alloc(m, line, pos, tok, MDOC_BLOCK);
 	p->args = args;
-
-	if (args)
+	if (p->args)
 		(args->refcnt)++;
-
-	return(mdoc_node_append(mdoc, p));
+	if ( ! node_append(m, p))
+		return(0);
+	m->next = MDOC_NEXT_CHILD;
+	return(1);
 }
 
 
 int
-mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, 
-		int tok, struct mdoc_arg *args)
+mdoc_elem_alloc(struct mdoc *m, int line, int pos, 
+		enum mdoct tok, struct mdoc_arg *args)
 {
 	struct mdoc_node *p;
 
-	p = mdoc_node_alloc(mdoc);
-
-	p->line = line;
-	p->pos = pos;
-	p->type = MDOC_ELEM;
-	p->tok = tok;
+	p = node_alloc(m, line, pos, tok, MDOC_ELEM);
 	p->args = args;
-
-	if (args)
+	if (p->args)
 		(args->refcnt)++;
-
-	return(mdoc_node_append(mdoc, p));
+	if ( ! node_append(m, p))
+		return(0);
+	m->next = MDOC_NEXT_CHILD;
+	return(1);
 }
 
 
-int
-mdoc_word_alloc(struct mdoc *mdoc, 
-		int line, int pos, const char *word)
+static int
+pstring(struct mdoc *m, int line, int pos, const char *p, size_t len)
 {
-	struct mdoc_node *p;
+	struct mdoc_node *n;
+	size_t		  sv;
 
-	p = mdoc_node_alloc(mdoc);
+	n = node_alloc(m, line, pos, -1, MDOC_TEXT);
+	n->string = mandoc_malloc(len + 1);
+	sv = strlcpy(n->string, p, len + 1);
 
-	p->line = line;
-	p->pos = pos;
-	p->type = MDOC_TEXT;
-	if (NULL == (p->string = strdup(word)))
-		err(1, "strdup");
+	/* Prohibit truncation. */
+	assert(sv < len + 1);
 
-	return(mdoc_node_append(mdoc, p));
+	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)
+{
+
+	return(pstring(m, line, pos, p, strlen(p)));
 }
 
 
@@ -505,6 +550,8 @@ void
 mdoc_node_free(struct mdoc_node *p)
 {
 
+	if (p->parent)
+		p->parent->nchild--;
 	if (p->string)
 		free(p->string);
 	if (p->args)
@@ -522,6 +569,7 @@ mdoc_node_freelist(struct mdoc_node *p)
 	if (p->next)
 		mdoc_node_freelist(p->next);
 
+	assert(0 == p->nchild);
 	mdoc_node_free(p);
 }
 
@@ -533,16 +581,79 @@ mdoc_node_freelist(struct mdoc_node *p)
 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));
+	
+	/*
+	 * If in literal mode, then pass the buffer directly to the
+	 * back-end, as it should be preserved as a single term.
+	 */
+
+	if (MDOC_LITERAL & m->flags)
+		return(mdoc_word_alloc(m, line, 0, buf));
+
+	/* Disallow blank/white-space lines in non-literal mode. */
+
+	for (i = 0; ' ' == buf[i]; i++)
+		/* Skip leading whitespace. */ ;
+
+	if ('\0' == buf[i]) {
+		if ( ! mdoc_pwarn(m, line, 0, ENOBLANK))
+			return(0);
+		/*
+		 * Assume that a `Pp' should be inserted 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, 0, MDOC_Pp, NULL))
+			return(0);
+	}
+
+	/*
+	 * Break apart a free-form line into tokens.  Spaces are
+	 * stripped out of the input.
+	 */
+
+	for (j = i; buf[i]; i++) {
+		if (' ' != buf[i])
+			continue;
+
+		/* Escaped whitespace. */
+		if (i && ' ' == buf[i] && '\\' == buf[i - 1])
+			continue;
+
+		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);
 
-	if (SEC_PROLOGUE == m->lastnamed)
-		return(mdoc_perr(m, line, 0,
-			"text disallowed in prologue"));
+		for ( ; ' ' == buf[i]; i++)
+			/* Skip trailing whitespace. */ ;
 
-	if (0 == buf[0] && ! (MDOC_LITERAL & m->flags))
-		return(mdoc_perr(m, line, 0,
-			"blank lines only in literal context"));
+		j = i;
 
-	if ( ! mdoc_word_alloc(m, line, 0, buf))
+		/* Trailing whitespace? */
+
+		if (' ' == buf[i - 1] && '\0' == buf[i])
+			if ( ! mdoc_pwarn(m, line, i - 1, ETAILWS))
+				return(0);
+
+		if ('\0' == buf[i])
+			break;
+	}
+
+	if (j != i && ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
 		return(0);
 
 	m->next = MDOC_NEXT_SIBLING;
@@ -550,19 +661,19 @@ parsetext(struct mdoc *m, int line, char *buf)
 }
 
 
+
 static int
 macrowarn(struct mdoc *m, int ln, const char *buf)
 {
 	if ( ! (MDOC_IGN_MACRO & m->pflags))
-		return(mdoc_perr(m, ln, 1, "unknown macro: %s%s", 
+		return(mdoc_verr(m, ln, 0, 
+				"unknown macro: %s%s", 
 				buf, strlen(buf) > 3 ? "..." : ""));
-	return(mdoc_pwarn(m, ln, 1, WARN_SYNTAX,
-				"unknown macro: %s%s",
+	return(mdoc_vwarn(m, ln, 0, "unknown macro: %s%s",
 				buf, strlen(buf) > 3 ? "..." : ""));
 }
 
 
-
 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.
@@ -570,45 +681,50 @@ 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];
 
-	/* Comments and empties are quickly ignored. */
+	/* Empty lines are ignored. */
 
-	if (0 == buf[1])
+	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])
+		if ('\0' == buf[i])
 			return(1);
-		return(mdoc_perr(m, ln, 1, "invalid syntax"));
 	}
 
-	if (buf[1] && '\\' == buf[1])
-		if (buf[2] && '\"' == buf[2])
-			return(1);
-
 	/* 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;
+
+		/* Check for invalid characters. */
+
+		if (isgraph((u_char)buf[i]))
+			continue;
+		return(mdoc_perr(m, ln, i, EPRINT));
 	}
 
-	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);
 	} 
 	
-	if (MDOC_MAX == (c = mdoc_tokhash_find(m->htab, mac))) {
+	if (MDOC_MAX == (c = mdoc_hash_find(mac))) {
 		if ( ! macrowarn(m, ln, mac))
 			goto err;
 		return(1);
@@ -619,8 +735,16 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 	while (buf[i] && ' ' == buf[i])
 		i++;
 
-	/* Begin recursive parse sequence. */
+	/* 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
+	 * the line, we don't need to do callable/parseable checks.
+	 */
 	if ( ! mdoc_macro(m, c, ln, 1, &i, buf)) 
 		goto err;
 
@@ -631,3 +755,5 @@ err:	/* Error out. */
 	m->flags |= MDOC_HALT;
 	return(0);
 }
+
+