More EOS: append_delims() fitted with EOS detection, so ANY macro with appended delimiters will properly EOS.

Fixed mandoc_eos() to accept sentence punctuation followed by close-delim buffers.

4 files changed, 51 insertions, 18 deletions

diff --git a/man.c b/man.c
index a484c175..c8b8b2f2 100644
--- a/man.c
+++ b/man.c
@@ -426,6 +426,8 @@ man_ptext(struct man *m, int line, char *buf)
 	 * sentence.  The front-end will know how to interpret this.
 	 */
 
+	/* FIXME: chain of close delims. */
+
 	assert(i);
 
 	if (mandoc_eos(buf, (size_t)i))
diff --git a/mandoc.c b/mandoc.c
index ce480a9f..5ed306c6 100644
--- a/mandoc.c
+++ b/mandoc.c
@@ -308,19 +308,33 @@ mandoc_eos(const char *p, size_t sz)
 	if (0 == sz)
 		return(0);
 
-	switch (p[(int)sz - 1]) {
-	case ('.'):
-		/* Escaped periods. */
-		if (sz > 1 && '\\' == p[(int)sz - 2])
+	/*
+	 * End-of-sentence recognition must include situations where
+	 * some symbols, such as `)', allow prior EOS punctuation to
+	 * propogate outward.
+	 */
+
+	for ( ; sz; sz--) {
+		switch (p[(int)sz - 1]) {
+		case ('\"'):
+			/* FALLTHROUGH */
+		case ('\''):
+			/* FALLTHROUGH */
+		case (')'):
+			break;
+		case ('.'):
+			/* Escaped periods. */
+			if (sz > 1 && '\\' == p[(int)sz - 2])
+				return(0);
+			/* FALLTHROUGH */
+		case ('!'):
+			/* FALLTHROUGH */
+		case ('?'):
+			return(1);
+		default:
 			return(0);
-		/* FALLTHROUGH */
-	case ('!'):
-		/* FALLTHROUGH */
-	case ('?'):
-		break;
-	default:
-		return(0);
+		}
 	}
 
-	return(1);
+	return(0);
 }
diff --git a/mdoc.c b/mdoc.c
index b840482b..092d67be 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -701,6 +701,8 @@ mdoc_ptext(struct mdoc *m, int line, char *buf)
 	 * sentence.  The front-end will know how to interpret this.
 	 */
 
+	/* FIXME: chain of close delims. */
+
 	assert(i);
 
 	if (mandoc_eos(buf, (size_t)i))
diff --git a/mdoc_macro.c b/mdoc_macro.c
index 8886a6b6..6d5ccb7e 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -622,26 +622,41 @@ rew_sub(enum mdoc_type t, struct mdoc *m,
 
 
 static int
-append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
+append_delims(struct mdoc *m, int line, int *pos, char *buf)
 {
-	int		 lastarg;
+	int		 la;
 	enum margserr	 ac;
 	char		*p;
 
-	if (0 == buf[*pos])
+	if ('\0' == buf[*pos])
 		return(1);
 
 	for (;;) {
-		lastarg = *pos;
-		ac = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p);
+		la = *pos;
+		ac = mdoc_zargs(m, line, pos, buf, ARGS_NOWARN, &p);
 
 		if (ARGS_ERROR == ac)
 			return(0);
 		else if (ARGS_EOLN == ac)
 			break;
+
 		assert(mdoc_isdelim(p));
-		if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+		if ( ! mdoc_word_alloc(m, line, la, p))
 			return(0);
+
+		/*
+		 * If we encounter end-of-sentence symbols, then trigger
+		 * the double-space.
+		 *
+		 * XXX: it's easy to allow this to propogate outward to
+		 * the last symbol, such that `. )' will cause the
+		 * correct double-spacing.  However, (1) groff isn't
+		 * smart enough to do this and (2) it would require
+		 * knowing which symbols break this behaviour, for
+		 * example, `.  ;' shouldn't propogate the double-space.
+		 */
+		if (mandoc_eos(p, strlen(p)))
+			m->last->flags |= MDOC_EOS;
 	}
 
 	return(1);