===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.49
retrieving revision 1.51
diff -u -p -r1.49 -r1.51
--- mandoc/mdoc_macro.c	2010/03/31 08:04:57	1.49
+++ mandoc/mdoc_macro.c	2010/04/05 08:45:29	1.51
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.49 2010/03/31 08:04:57 kristaps Exp $ */
+/*	$Id: mdoc_macro.c,v 1.51 2010/04/05 08:45:29 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,9 +27,11 @@
 
 #include "libmdoc.h"
 
-#define	REWIND_REWIND	(1 << 0)
-#define	REWIND_NOHALT	(1 << 1)
-#define	REWIND_HALT	(1 << 2)
+enum	rew {
+	REWIND_REWIND,
+	REWIND_NOHALT,
+	REWIND_HALT
+};
 
 static	int	  ctx_synopsis(MACRO_PROT_ARGS);
 static	int	  obsolete(MACRO_PROT_ARGS);
@@ -42,7 +44,7 @@ static	int	  blk_exp_close(MACRO_PROT_ARGS);
 static	int	  blk_part_imp(MACRO_PROT_ARGS);
 
 static	int	  phrase(struct mdoc *, int, int, char *);
-static	int	  rew_dohalt(enum mdoct, enum mdoc_type, 
+static	enum rew  rew_dohalt(enum mdoct, enum mdoc_type, 
 			const struct mdoc_node *);
 static	enum mdoct rew_alt(enum mdoct);
 static	int	  rew_dobreak(enum mdoct, const struct mdoc_node *);
@@ -368,7 +370,7 @@ rew_alt(enum mdoct tok)
  * close our current scope (REWIND_REWIND), or continue (REWIND_NOHALT).
  * The scope-closing and so on occurs in the various rew_* routines.
  */
-static int 
+static enum rew
 rew_dohalt(enum mdoct tok, enum mdoc_type type, 
 		const struct mdoc_node *p)
 {
@@ -574,7 +576,7 @@ rew_sub(enum mdoc_type t, struct mdoc *m, 
 		enum mdoct tok, int line, int ppos)
 {
 	struct mdoc_node *n;
-	int		  c;
+	enum rew	  c;
 
 	/* LINTED */
 	for (n = m->last; n; n = n->parent) {
@@ -818,7 +820,7 @@ in_line(MACRO_PROT_ARGS)
 		 * the word. 
 		 */
 
-		d = mdoc_isdelim(p);
+		d = ARGS_QWORD == w ? 0 : mdoc_isdelim(p);
 
 		if (ARGS_QWORD != w && d) {
 			if (0 == lastpunct && ! rew_elem(m, tok))
@@ -954,6 +956,7 @@ blk_full(MACRO_PROT_ARGS)
 		/* Don't emit leading punct. for phrases. */
 
 		if (NULL == head && ARGS_PHRASE != c &&
+				ARGS_QWORD != c &&
 				1 == mdoc_isdelim(p)) {
 			if ( ! mdoc_word_alloc(m, line, la, p))
 				return(0);
@@ -1077,7 +1080,8 @@ blk_part_imp(MACRO_PROT_ARGS)
 		if (ARGS_PUNCT == c)
 			break;
 
-		if (NULL == body && 1 == mdoc_isdelim(p)) {
+		if (NULL == body && ARGS_QWORD != c &&
+				1 == mdoc_isdelim(p)) {
 			if ( ! mdoc_word_alloc(m, line, la, p))
 				return(0);
 			continue;
@@ -1169,7 +1173,8 @@ blk_part_exp(MACRO_PROT_ARGS)
 
 		/* Flush out leading punctuation. */
 
-		if (NULL == head && 1 == mdoc_isdelim(p)) {
+		if (NULL == head && ARGS_QWORD != c &&
+				1 == mdoc_isdelim(p)) {
 			assert(NULL == body);
 			if ( ! mdoc_word_alloc(m, line, la, p))
 				return(0);
@@ -1305,6 +1310,7 @@ in_line_argn(MACRO_PROT_ARGS)
 			break;
 
 		if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && 
+				ARGS_QWORD != c &&
 				0 == j && 1 == mdoc_isdelim(p)) {
 			if ( ! mdoc_word_alloc(m, line, la, p))
 				return(0);
@@ -1330,6 +1336,7 @@ in_line_argn(MACRO_PROT_ARGS)
 		}
 
 		if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) &&
+				ARGS_QWORD != c &&
 				! flushed && mdoc_isdelim(p)) {
 			if ( ! rew_elem(m, tok))
 				return(0);