===================================================================
RCS file: /cvs/mandoc/demandoc.c,v
retrieving revision 1.5
retrieving revision 1.14
diff -u -p -r1.5 -r1.14
--- mandoc/demandoc.c	2011/09/01 22:09:50	1.5
+++ mandoc/demandoc.c	2015/02/07 06:28:08	1.14
@@ -1,4 +1,4 @@
-/*	$Id: demandoc.c,v 1.5 2011/09/01 22:09:50 kristaps Exp $ */
+/*	$Id: demandoc.c,v 1.14 2015/02/07 06:28:08 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,10 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <getopt.h>
@@ -43,11 +43,13 @@ int
 main(int argc, char *argv[])
 {
 	struct mparse	*mp;
-	int		 ch, i, list;
+	struct mchars	*mchars;
+	int		 ch, fd, i, list;
 	extern int	 optind;
 
-	progname = strrchr(argv[0], '/');
-	if (progname == NULL)
+	if (argc < 1)
+		progname = "demandoc";
+	else if ((progname = strrchr(argv[0], '/')) == NULL)
 		progname = argv[0];
 	else
 		++progname;
@@ -76,18 +78,24 @@ main(int argc, char *argv[])
 	argc -= optind;
 	argv += optind;
 
-	mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL);
+	mchars = mchars_alloc();
+	mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, mchars, NULL);
 	assert(mp);
 
-	if (0 == argc)
+	if (argc < 1)
 		pmandoc(mp, STDIN_FILENO, "<stdin>", list);
 
 	for (i = 0; i < argc; i++) {
 		mparse_reset(mp);
-		pmandoc(mp, -1, argv[i], list);
+		if (mparse_open(mp, &fd, argv[i]) != MANDOCLEVEL_OK) {
+			perror(argv[i]);
+			continue;
+		}
+		pmandoc(mp, fd, argv[i], list);
 	}
 
 	mparse_free(mp);
+	mchars_free(mchars);
 	return((int)MANDOCLEVEL_OK);
 }
 
@@ -105,12 +113,8 @@ pmandoc(struct mparse *mp, int fd, const char *fn, int
 	struct man	*man;
 	int		 line, col;
 
-	if (mparse_readfd(mp, fd, fn) >= MANDOCLEVEL_FATAL) {
-		fprintf(stderr, "%s: Parse failure\n", fn);
-		return;
-	}
-
-	mparse_result(mp, &mdoc, &man);
+	mparse_readfd(mp, fd, fn);
+	mparse_result(mp, &mdoc, &man, NULL);
 	line = 1;
 	col = 0;
 
@@ -132,7 +136,7 @@ static void
 pstring(const char *p, int col, int *colp, int list)
 {
 	enum mandoc_esc	 esc;
-	const char	*start;
+	const char	*start, *end;
 	int		 emit;
 
 	/*
@@ -161,8 +165,20 @@ again:
 			} else if (isspace((unsigned char)*p))
 				break;
 
-		if (emit && p - start >= 2) {
-			for ( ; start != p; start++)
+		end = p - 1;
+
+		while (end > start)
+			if ('.' == *end || ',' == *end || 
+					'\'' == *end || '"' == *end ||
+					')' == *end || '!' == *end ||
+					'?' == *end || ':' == *end ||
+					';' == *end)
+				end--;
+			else
+				break;
+
+		if (emit && end - start >= 1) {
+			for ( ; start <= end; start++)
 				if (ASCII_HYPH == *start)
 					putchar('-');
 				else