Fix end-of-sentence spacing after the DragonFly text production macro.

Patch from Franco Fichtner <franco at lastsummer dot de>.

4 files changed, 37 insertions, 4 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Ux/Makefile b/regress/usr.bin/mandoc/mdoc/Ux/Makefile
index ce6cbc62639..c945b5e63a6 100644
--- a/regress/usr.bin/mandoc/mdoc/Ux/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Ux/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.1 2011/12/04 03:09:25 schwarze Exp $
+# $OpenBSD: Makefile,v 1.2 2013/12/22 14:06:29 schwarze Exp $
 
-REGRESS_TARGETS=spacing
+REGRESS_TARGETS = spacing eos
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Ux/eos.in b/regress/usr.bin/mandoc/mdoc/Ux/eos.in
new file mode 100644
index 00000000000..b0713481181
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Ux/eos.in
@@ -0,0 +1,22 @@
+.Dd December 22, 2013
+.Dt UX-EOS 1
+.Os OpenBSD
+.Sh NAME
+.Nm Ux-eos
+.Nd end of sentence spacing after Unix macros
+.Sh DESCRIPTION
+In the beginning Ken and Dennis wrote
+.Ux .
+The CSRG rewrote it to become
+.Bx .
+When it dissolved, people started
+.Bsx .
+And
+.Nx .
+And
+.Fx .
+And
+.Ox .
+And
+.Dx .
+By now, it's free for everyone.
diff --git a/regress/usr.bin/mandoc/mdoc/Ux/eos.out_ascii b/regress/usr.bin/mandoc/mdoc/Ux/eos.out_ascii
new file mode 100644
index 00000000000..18ae00095a6
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Ux/eos.out_ascii
@@ -0,0 +1,11 @@
+UX-EOS(1)                  OpenBSD Reference Manual                  UX-EOS(1)
+
+NNAAMMEE
+     UUxx--eeooss - end of sentence spacing after Unix macros
+
+DDEESSCCRRIIPPTTIIOONN
+     In the beginning Ken and Dennis wrote UNIX.  The CSRG rewrote it to
+     become BSD.  When it dissolved, people started BSD/OS.  And NetBSD.  And
+     FreeBSD.  And OpenBSD.  And DragonFly.  By now, it's free for everyone.
+
+OpenBSD                        December 22, 2013                       OpenBSD
diff --git a/usr.bin/mandoc/mdoc_argv.c b/usr.bin/mandoc/mdoc_argv.c
index 08178b281d2..0f69fb8af9d 100644
--- a/usr.bin/mandoc/mdoc_argv.c
+++ b/usr.bin/mandoc/mdoc_argv.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_argv.c,v 1.44 2013/12/15 23:56:21 schwarze Exp $ */
+/*	$Id: mdoc_argv.c,v 1.45 2013/12/22 14:06:29 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -256,7 +256,7 @@ static	const struct mdocarg mdocargs[MDOC_MAX] = {
 	{ ARGSFL_NONE, NULL }, /* %C */
 	{ ARGSFL_NONE, NULL }, /* Es */
 	{ ARGSFL_NONE, NULL }, /* En */
-	{ ARGSFL_NONE, NULL }, /* Dx */
+	{ ARGSFL_DELIM, NULL }, /* Dx */
 	{ ARGSFL_NONE, NULL }, /* %Q */
 	{ ARGSFL_NONE, NULL }, /* br */
 	{ ARGSFL_NONE, NULL }, /* sp */