===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.13
retrieving revision 1.17
diff -u -p -r1.13 -r1.17
--- mandoc/mandoc.c	2010/05/14 14:09:13	1.13
+++ mandoc/mandoc.c	2010/06/01 11:47:28	1.17
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.c,v 1.13 2010/05/14 14:09:13 kristaps Exp $ */
+/*	$Id: mandoc.c,v 1.17 2010/06/01 11:47:28 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -61,6 +61,8 @@ mandoc_special(const char *p)
 		/* FALLTHROUGH */
 	case (' '):
 		/* FALLTHROUGH */
+	case ('}'):
+		/* FALLTHROUGH */
 	case ('|'):
 		/* FALLTHROUGH */
 	case ('&'):
@@ -308,19 +310,63 @@ 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 (']'):
+			/* 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(0);
+}
+
+
+int
+mandoc_hyph(const char *start, const char *c)
+{
+
+	/*
+	 * Choose whether to break at a hyphenated character.  We only
+	 * do this if it's free-standing within a word.
+	 */
+
+	/* Skip first/last character of buffer. */
+	if (c == start || '\0' == *(c + 1))
+		return(0);
+	/* Skip first/last character of word. */
+	if ('\t' == *(c + 1) || '\t' == *(c - 1))
+		return(0);
+	if (' ' == *(c + 1) || ' ' == *(c - 1))
+		return(0);
+	/* Skip double invocations. */
+	if ('-' == *(c + 1) || '-' == *(c - 1))
+		return(0);
+	/* Skip escapes. */
+	if ('\\' == *(c - 1))
+		return(0);
 
 	return(1);
 }