===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.62
retrieving revision 1.66
diff -u -p -r1.62 -r1.66
--- mandoc/man.c	2010/05/08 07:30:19	1.62
+++ mandoc/man.c	2010/05/12 17:08:03	1.66
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.62 2010/05/08 07:30:19 kristaps Exp $ */
+/*	$Id: man.c,v 1.66 2010/05/12 17:08:03 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -395,18 +395,41 @@ man_ptext(struct man *m, int line, char *buf)
 		goto descope;
 	}
 
-	/* Warn if the last un-escaped character is whitespace. */
+	/* 
+	 * Warn if the last un-escaped character is whitespace. Then
+	 * strip away the remaining spaces (tabs stay!).   
+	 */
 
 	i = (int)strlen(buf);
 	assert(i);
 
-	if (' ' == buf[i - 1] || '\t' == buf[i - 1])
-		if (1 == i || ('\\' != buf[i - 2]))
+	if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
+		if (i > 1 && '\\' != buf[i - 2])
 			if ( ! man_pwarn(m, line, i - 1, WTSPACE))
 				return(0);
 
+		for (--i; i && ' ' == buf[i]; i--)
+			/* Spin back to non-space. */ ;
+
+		/* Jump ahead of escaped whitespace. */
+		i += '\\' == buf[i] ? 2 : 1;
+
+		buf[i] = '\0';
+	}
+
 	if ( ! man_word_alloc(m, line, 0, buf))
 		return(0);
+
+	/*
+	 * End-of-sentence check.  If the last character is an unescaped
+	 * EOS character, then flag the node as being the end of a
+	 * sentence.  The front-end will know how to interpret this.
+	 */
+
+	assert(i);
+
+	if (mandoc_eos(buf, (size_t)i))
+		m->last->flags |= MAN_EOS;
 
 descope:
 	/*