===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.59
retrieving revision 1.64
diff -u -p -r1.59 -r1.64
--- mandoc/mdoc_macro.c	2010/05/09 10:17:02	1.59
+++ mandoc/mdoc_macro.c	2010/05/14 14:09:13	1.64
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.59 2010/05/09 10:17:02 kristaps Exp $ */
+/*	$Id: mdoc_macro.c,v 1.64 2010/05/14 14:09:13 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -26,6 +26,7 @@
 #include <time.h>
 
 #include "libmdoc.h"
+#include "libmandoc.h"
 
 enum	rew {
 	REWIND_REWIND,
@@ -48,7 +49,7 @@ static	int	  	append_delims(struct mdoc *, 
 static	enum mdoct	lookup(enum mdoct, const char *);
 static	enum mdoct	lookup_raw(const char *);
 static	int	  	phrase(struct mdoc *, int, int, 
-				char *, enum margserr, int);
+				char *, enum margserr);
 static	enum mdoct 	rew_alt(enum mdoct);
 static	int	  	rew_dobreak(enum mdoct, 
 				const struct mdoc_node *);
@@ -653,11 +654,13 @@ append_delims(struct mdoc *mdoc, int line, int *pos, c
 static int
 blk_exp_close(MACRO_PROT_ARGS)
 {
-	int	 	 j, lastarg, maxargs, flushed;
+	int	 	 j, lastarg, maxargs, flushed, nl;
 	enum margserr	 ac;
 	enum mdoct	 ntok;
 	char		*p;
 
+	nl = MDOC_NEWLINE & m->flags;
+
 	switch (tok) {
 	case (MDOC_Ec):
 		maxargs = 1;
@@ -723,7 +726,7 @@ blk_exp_close(MACRO_PROT_ARGS)
 	if ( ! flushed && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
 		return(0);
 
-	if (ppos > 1)
+	if ( ! nl)
 		return(1);
 	return(append_delims(m, line, pos, buf));
 }
@@ -732,13 +735,15 @@ blk_exp_close(MACRO_PROT_ARGS)
 static int
 in_line(MACRO_PROT_ARGS)
 {
-	int		 la, lastpunct, cnt, d, nc;
+	int		 la, lastpunct, cnt, d, nc, nl;
 	enum margverr	 av;
 	enum mdoct	 ntok;
 	enum margserr	 ac;
 	struct mdoc_arg	*arg;
 	char		*p;
 
+	nl = MDOC_NEWLINE & m->flags;
+
 	/*
 	 * Whether we allow ignored elements (those without content,
 	 * usually because of reserved words) to squeak by.
@@ -815,7 +820,7 @@ in_line(MACRO_PROT_ARGS)
 			}
 			if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
 				return(0);
-			if (ppos > 1)
+			if ( ! nl)
 				return(1);
 			return(append_delims(m, line, pos, buf));
 		} 
@@ -875,7 +880,7 @@ in_line(MACRO_PROT_ARGS)
 			return(0);
 	}
 
-	if (ppos > 1)
+	if ( ! nl)
 		return(1);
 	return(append_delims(m, line, pos, buf));
 }
@@ -884,7 +889,7 @@ in_line(MACRO_PROT_ARGS)
 static int
 blk_full(MACRO_PROT_ARGS)
 {
-	int		  la, pcnt;
+	int		  la, nl;
 	struct mdoc_arg	 *arg;
 	struct mdoc_node *head; /* save of head macro */
 	struct mdoc_node *body; /* save of body macro */
@@ -896,6 +901,8 @@ blk_full(MACRO_PROT_ARGS)
 	enum margverr	  av;
 	char		 *p;
 
+	nl = MDOC_NEWLINE & m->flags;
+
 	/* Close out prior implicit scope. */
 
 	if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
@@ -955,7 +962,7 @@ blk_full(MACRO_PROT_ARGS)
 
 	ac = ARGS_ERROR;
 
-	for (pcnt = 0; ; ) {
+	for ( ; ; ) {
 		la = *pos;
 		lac = ac;
 		ac = mdoc_args(m, line, pos, buf, tok, &p);
@@ -1003,7 +1010,7 @@ blk_full(MACRO_PROT_ARGS)
 			else if (ARGS_PEND == ac && ARGS_PHRASE == lac)
 				ac = ARGS_PHRASE;
 
-			if ( ! phrase(m, line, la, buf, ac, pcnt++))
+			if ( ! phrase(m, line, la, buf, ac))
 				return(0);
 			if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
 				return(0);
@@ -1029,7 +1036,7 @@ blk_full(MACRO_PROT_ARGS)
 		head = m->last;
 	}
 	
-	if (1 == ppos && ! append_delims(m, line, pos, buf))
+	if (nl && ! append_delims(m, line, pos, buf))
 		return(0);
 
 	/* If we've already opened our body, exit now. */
@@ -1069,7 +1076,7 @@ blk_full(MACRO_PROT_ARGS)
 static int
 blk_part_imp(MACRO_PROT_ARGS)
 {
-	int		  la;
+	int		  la, nl;
 	enum mdoct	  ntok;
 	enum margserr	  ac;
 	char		 *p;
@@ -1077,6 +1084,8 @@ blk_part_imp(MACRO_PROT_ARGS)
 	struct mdoc_node *body; /* saved body context */
 	struct mdoc_node *n;
 
+	nl = MDOC_NEWLINE & m->flags;
+
 	/*
 	 * A macro that spans to the end of the line.  This is generally
 	 * (but not necessarily) called as the first macro.  The block
@@ -1147,11 +1156,32 @@ blk_part_imp(MACRO_PROT_ARGS)
 		body = m->last;
 	}
 
+	for (n = body->child; n && n->next; n = n->next)
+		/* Do nothing. */ ;
+	
 	/* 
+	 * End of sentence spacing: if the last node is a text node and
+	 * has a trailing period, then mark it as being end-of-sentence.
+	 */
+
+	if (n && MDOC_TEXT == n->type && n->string)
+		if (mandoc_eos(n->string, strlen(n->string)))
+			n->flags |= MDOC_EOS;
+
+	/* Up-propogate the end-of-space flag. */
+
+	if (n && (MDOC_EOS & n->flags)) {
+		body->flags |= MDOC_EOS;
+		body->parent->flags |= MDOC_EOS;
+	}
+
+	/* 
 	 * If we can't rewind to our body, then our scope has already
 	 * been closed by another macro (like `Oc' closing `Op').  This
 	 * is ugly behaviour nodding its head to OpenBSD's overwhelming
 	 * crufty use of `Op' breakage.
+	 *
+	 * FIXME - this should be ifdef'd OpenBSD?
 	 */
 	for (n = m->last; n; n = n->parent)
 		if (body == n)
@@ -1165,7 +1195,7 @@ blk_part_imp(MACRO_PROT_ARGS)
 
 	/* Standard appending of delimiters. */
 
-	if (1 == ppos && ! append_delims(m, line, pos, buf))
+	if (nl && ! append_delims(m, line, pos, buf))
 		return(0);
 
 	/* Rewind scope, if applicable. */
@@ -1180,13 +1210,15 @@ blk_part_imp(MACRO_PROT_ARGS)
 static int
 blk_part_exp(MACRO_PROT_ARGS)
 {
-	int		  la;
+	int		  la, nl;
 	enum margserr	  ac;
 	struct mdoc_node *head; /* keep track of head */
 	struct mdoc_node *body; /* keep track of body */
 	char		 *p;
 	enum mdoct	  ntok;
 
+	nl = MDOC_NEWLINE & m->flags;
+
 	/*
 	 * The opening of an explicit macro having zero or more leading
 	 * punctuation nodes; a head with optional single element (the
@@ -1279,23 +1311,25 @@ blk_part_exp(MACRO_PROT_ARGS)
 
 	/* Standard appending of delimiters. */
 
-	if (ppos > 1)
+	if ( ! nl)
 		return(1);
-
 	return(append_delims(m, line, pos, buf));
 }
 
 
+/* ARGSUSED */
 static int
 in_line_argn(MACRO_PROT_ARGS)
 {
-	int		 la, flushed, j, maxargs;
+	int		 la, flushed, j, maxargs, nl;
 	enum margserr	 ac;
 	enum margverr	 av;
 	struct mdoc_arg	*arg;
 	char		*p;
 	enum mdoct	 ntok;
 
+	nl = MDOC_NEWLINE & m->flags;
+
 	/*
 	 * A line macro that has a fixed number of arguments (maxargs).
 	 * Only open the scope once the first non-leading-punctuation is
@@ -1415,8 +1449,7 @@ in_line_argn(MACRO_PROT_ARGS)
 
 	if ( ! flushed && ! rew_elem(m, tok))
 		return(0);
-
-	if (ppos > 1)
+	if ( ! nl)
 		return(1);
 	return(append_delims(m, line, pos, buf));
 }
@@ -1492,13 +1525,16 @@ in_line_eoln(MACRO_PROT_ARGS)
 static int
 ctx_synopsis(MACRO_PROT_ARGS)
 {
+	int		 nl;
 
+	nl = MDOC_NEWLINE & m->flags;
+
 	/* If we're not in the SYNOPSIS, go straight to in-line. */
 	if (SEC_SYNOPSIS != m->lastsec)
 		return(in_line(m, tok, line, ppos, pos, buf));
 
 	/* If we're a nested call, same place. */
-	if (ppos > 1)
+	if ( ! nl)
 		return(in_line(m, tok, line, ppos, pos, buf));
 
 	/*
@@ -1526,8 +1562,7 @@ obsolete(MACRO_PROT_ARGS)
  * macro is encountered.
  */
 static int
-phrase(struct mdoc *m, int line, int ppos, char *buf, 
-		enum margserr ac, int count)
+phrase(struct mdoc *m, int line, int ppos, char *buf, enum margserr ac)
 {
 	int		 la, pos;
 	enum margserr	 aac;
@@ -1538,14 +1573,10 @@ phrase(struct mdoc *m, int line, int ppos, char *buf, 
 			ARGS_PEND == ac ||
 			ARGS_PPHRASE == ac);
 
-	if (count && ARGS_PPHRASE == ac)
-		return(mdoc_word_alloc(m, line, ppos, &buf[ppos]));
-
 	for (pos = ppos; ; ) {
 		la = pos;
 
-		/* Note: no calling context! */
-		aac = mdoc_zargs(m, line, &pos, buf, 0, &p);
+		aac = mdoc_zargs(m, line, &pos, buf, ARGS_PPHRASED, &p);
 
 		if (ARGS_ERROR == aac)
 			return(0);