===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.29
retrieving revision 1.31
diff -u -p -r1.29 -r1.31
--- mandoc/mdoc_macro.c	2009/07/29 08:52:24	1.29
+++ mandoc/mdoc_macro.c	2009/08/19 11:58:32	1.31
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.29 2009/07/29 08:52:24 kristaps Exp $ */
+/*	$Id: mdoc_macro.c,v 1.31 2009/08/19 11:58:32 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -45,7 +45,7 @@ static	int	  rew_impblock(struct mdoc *, int, int, int
 static	int	  rew_expblock(struct mdoc *, int, int, int);
 static	int	  rew_subblock(enum mdoc_type, 
 			struct mdoc *, int, int, int);
-static	int	  rew_last(struct mdoc *, struct mdoc_node *);
+static	int	  rew_last(struct mdoc *, struct mdoc_node *); /* FIXME: make const */
 static	int	  append_delims(struct mdoc *, int, int *, char *);
 static	int	  lookup(struct mdoc *, int, const char *);
 static	int	  lookup_raw(struct mdoc *, const char *);
@@ -599,6 +599,7 @@ rew_expblock(struct mdoc *mdoc, int tok, int line, int
 }
 
 
+/* FIXME: can this be merged with subblock? */
 static int
 rew_impblock(struct mdoc *mdoc, int tok, int line, int ppos)
 {
@@ -644,7 +645,6 @@ append_delims(struct mdoc *mdoc, int line, int *pos, c
 		assert(mdoc_isdelim(p));
 		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
 			return(0);
-		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
 	return(1);
@@ -721,7 +721,6 @@ blk_exp_close(MACRO_PROT_ARGS)
 
 		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
 			return(0);
-		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
 	if ( ! flushed && ! rew_expblock(mdoc, tok, line, ppos))
@@ -851,7 +850,6 @@ in_line(MACRO_PROT_ARGS)
 			cnt++;
 		if ( ! mdoc_word_alloc(mdoc, line, la, p))
 			return(0);
-		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
 	if (0 == lastpunct && ! rew_elem(mdoc, tok))
@@ -995,7 +993,6 @@ blk_full(MACRO_PROT_ARGS)
 		if (MDOC_MAX == (c = lookup(mdoc, tok, p))) {
 			if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
 				return(0);
-			mdoc->next = MDOC_NEXT_SIBLING;
 			continue;
 		} 
 
@@ -1062,7 +1059,6 @@ blk_part_imp(MACRO_PROT_ARGS)
 		if (MDOC_MAX == (c = lookup(mdoc, tok, p))) {
 			if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
 				return(0);
-			mdoc->next = MDOC_NEXT_SIBLING;
 			continue;
 		} 
 
@@ -1190,7 +1186,6 @@ blk_part_exp(MACRO_PROT_ARGS)
 	
 		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
 			return(0);
-		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
 	if ( ! flushed) {
@@ -1297,7 +1292,6 @@ in_line_argn(MACRO_PROT_ARGS)
 	
 		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
 			return(0);
-		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
 	if ( ! flushed && ! rew_elem(mdoc, tok))
@@ -1365,7 +1359,6 @@ in_line_eoln(MACRO_PROT_ARGS)
 
 		if ( ! mdoc_word_alloc(mdoc, line, la, p))
 			return(0);
-		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
 	return(rew_elem(mdoc, tok));
@@ -1413,7 +1406,6 @@ phrase(struct mdoc *mdoc, int line, int ppos, char *bu
 
 		if ( ! mdoc_word_alloc(mdoc, line, la, p))
 			return(0);
-		mdoc->next = MDOC_NEXT_SIBLING;
 	}
 
 	return(1);