===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.144
retrieving revision 1.148
diff -u -p -r1.144 -r1.148
--- mandoc/mdoc.c	2010/05/31 20:14:10	1.144
+++ mandoc/mdoc.c	2010/06/26 16:07:08	1.148
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.144 2010/05/31 20:14:10 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.148 2010/06/26 16:07:08 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -29,6 +29,7 @@
 #include <time.h>
 
 #include "mandoc.h"
+#include "regs.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
 
@@ -96,8 +97,12 @@ static	struct mdoc_node *node_alloc(struct mdoc *, int
 				enum mdoct, enum mdoc_type);
 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_ptext(struct mdoc *, 
+				const struct regset *,
+				int, char *, int);
+static	int		  mdoc_pmacro(struct mdoc *, 
+				const struct regset *,
+				int, char *, int);
 static	int		  macrowarn(struct mdoc *, int, 
 				const char *, int);
 
@@ -229,7 +234,8 @@ mdoc_endparse(struct mdoc *m)
  * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).
  */
 int
-mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)
+mdoc_parseln(struct mdoc *m, const struct regset *regs,
+		int ln, char *buf, int offs)
 {
 
 	if (MDOC_HALT & m->flags)
@@ -237,8 +243,8 @@ mdoc_parseln(struct mdoc *m, int ln, char *buf, int of
 
 	m->flags |= MDOC_NEWLINE;
 	return(('.' == buf[offs] || '\'' == buf[offs]) ? 
-			mdoc_pmacro(m, ln, buf, offs) :
-			mdoc_ptext(m, ln, buf, offs));
+			mdoc_pmacro(m, regs, ln, buf, offs) :
+			mdoc_ptext(m, regs, ln, buf, offs));
 }
 
 
@@ -258,8 +264,7 @@ mdoc_vmsg(struct mdoc *mdoc, enum mandocerr t, 
 
 
 int
-mdoc_macro(struct mdoc *m, enum mdoct tok, 
-		int ln, int pp, int *pos, char *buf)
+mdoc_macro(MACRO_PROT_ARGS)
 {
 	assert(tok < MDOC_MAX);
 
@@ -267,13 +272,13 @@ mdoc_macro(struct mdoc *m, enum mdoct tok, 
 
 	if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
 			MDOC_PBODY & m->flags)
-		return(mdoc_pmsg(m, ln, pp, MANDOCERR_BADBODY));
+		return(mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY));
 
 	/* If we're in the prologue, deny "body" macros.  */
 
 	if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
 			! (MDOC_PBODY & m->flags)) {
-		if ( ! mdoc_pmsg(m, ln, pp, MANDOCERR_BADPROLOG))
+		if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG))
 			return(0);
 		if (NULL == m->meta.title)
 			m->meta.title = mandoc_strdup("UNKNOWN");
@@ -286,7 +291,8 @@ mdoc_macro(struct mdoc *m, enum mdoct tok, 
 		m->flags |= MDOC_PBODY;
 	}
 
-	return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));
+	return((*mdoc_macros[tok].fp)
+			(m, regs, tok, line, ppos, pos, buf));
 }
 
 
@@ -540,7 +546,8 @@ mdoc_node_delete(struct mdoc *m, struct mdoc_node *p)
  * control character.
  */
 static int
-mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
+mdoc_ptext(struct mdoc *m, const struct regset *regs,
+		int line, char *buf, int offs)
 {
 	char		 *c, *ws, *end;
 	struct mdoc_node *n;
@@ -568,19 +575,21 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 	 */
 
 	if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-			LIST_column == n->data.list) {
+			LIST_column == n->data.Bl.type) {
 		/* `Bl' is open without any children. */
 		m->flags |= MDOC_FREECOL;
-		return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
+		return(mdoc_macro(m, regs, MDOC_It, 
+					line, offs, &offs, buf));
 	}
 
 	if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
 			NULL != n->parent &&
 			MDOC_Bl == n->parent->tok &&
-			LIST_column == n->parent->data.list) {
+			LIST_column == n->parent->data.Bl.type) {
 		/* `Bl' has block-level `It' children. */
 		m->flags |= MDOC_FREECOL;
-		return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
+		return(mdoc_macro(m, regs, MDOC_It, 
+					line, offs, &offs, buf));
 	}
 
 	/*
@@ -595,6 +604,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 		case '-':
 			if (mandoc_hyph(buf + offs, c))
 				*c = ASCII_HYPH;
+			ws = NULL;
 			break;
 		case ' ':
 			if (NULL == ws)
@@ -689,7 +699,8 @@ macrowarn(struct mdoc *m, int ln, const char *buf, int
  * character.
  */
 int
-mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
+mdoc_pmacro(struct mdoc *m, const struct regset *regs,
+		int ln, char *buf, int offs)
 {
 	enum mdoct	  tok;
 	int		  i, j, sv;
@@ -768,7 +779,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 	 */
 
 	if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) {
-		if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) 
+		if ( ! mdoc_macro(m, regs, tok, ln, sv, &i, buf)) 
 			goto err;
 		return(1);
 	}
@@ -782,9 +793,9 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 	 */
 
 	if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-			LIST_column == n->data.list) {
+			LIST_column == n->data.Bl.type) {
 		m->flags |= MDOC_FREECOL;
-		if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
+		if ( ! mdoc_macro(m, regs, MDOC_It, ln, sv, &sv, buf))
 			goto err;
 		return(1);
 	}
@@ -798,16 +809,16 @@ 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.list) {
+			LIST_column == n->parent->data.Bl.type) {
 		m->flags |= MDOC_FREECOL;
-		if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
+		if ( ! mdoc_macro(m, regs, MDOC_It, ln, sv, &sv, buf)) 
 			goto err;
 		return(1);
 	}
 
 	/* Normal processing of a macro. */
 
-	if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) 
+	if ( ! mdoc_macro(m, regs, tok, ln, sv, &i, buf)) 
 		goto err;
 
 	return(1);