From 061a6346f4f4414832b2c18ac23ca3e0613b32f3 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@cvs.openbsd.org>
Date: Fri, 16 Nov 2012 18:40:40 +0000
Subject: Two more macros (.Ap and .In) do trailing delimiter handling. This
 fixes the end of sentence spacing in open(2) and in about 150 pages in the
 NetBSD base system.

Reported by Nicolas Joly <njoly a pasteur point fr>, merci!
---
 regress/usr.bin/mandoc/mdoc/Ap/Makefile      |  4 ++--
 regress/usr.bin/mandoc/mdoc/Ap/eos.in        | 12 ++++++++++++
 regress/usr.bin/mandoc/mdoc/Ap/eos.out_ascii | 10 ++++++++++
 regress/usr.bin/mandoc/mdoc/In/Makefile      |  4 ++--
 regress/usr.bin/mandoc/mdoc/In/eos.in        | 10 ++++++++++
 regress/usr.bin/mandoc/mdoc/In/eos.out_ascii |  9 +++++++++
 6 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 regress/usr.bin/mandoc/mdoc/Ap/eos.in
 create mode 100644 regress/usr.bin/mandoc/mdoc/Ap/eos.out_ascii
 create mode 100644 regress/usr.bin/mandoc/mdoc/In/eos.in
 create mode 100644 regress/usr.bin/mandoc/mdoc/In/eos.out_ascii

(limited to 'regress')

diff --git a/regress/usr.bin/mandoc/mdoc/Ap/Makefile b/regress/usr.bin/mandoc/mdoc/Ap/Makefile
index 5c5fb4109d6..4ee492534dc 100644
--- a/regress/usr.bin/mandoc/mdoc/Ap/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Ap/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.1 2011/12/04 03:09:25 schwarze Exp $
+# $OpenBSD: Makefile,v 1.2 2012/11/16 18:40:39 schwarze Exp $
 
-REGRESS_TARGETS=middle
+REGRESS_TARGETS = middle eos
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Ap/eos.in b/regress/usr.bin/mandoc/mdoc/Ap/eos.in
new file mode 100644
index 00000000000..032cf72ab45
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Ap/eos.in
@@ -0,0 +1,12 @@
+.Dd November 16, 2012
+.Dt AP-EOS 1
+.Os OpenBSD
+.Sh NAME
+.Nm Ap-eos
+.Nd end of sentence handling after the apostrophe macro
+.Sh DESCRIPTION
+The first sentence is
+.An Ingo Ap s .
+The second is
+.An Kristaps Ap .
+No idea about the third.
diff --git a/regress/usr.bin/mandoc/mdoc/Ap/eos.out_ascii b/regress/usr.bin/mandoc/mdoc/Ap/eos.out_ascii
new file mode 100644
index 00000000000..91d3084b02a
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Ap/eos.out_ascii
@@ -0,0 +1,10 @@
+AP-EOS(1)                  OpenBSD Reference Manual                  AP-EOS(1)
+
+NNAAMMEE
+     AApp--eeooss - end of sentence handling after the apostrophe macro
+
+DDEESSCCRRIIPPTTIIOONN
+     The first sentence is Ingo's.  The second is Kristaps'.  No idea about
+     the third.
+
+OpenBSD                        November 16, 2012                       OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/In/Makefile b/regress/usr.bin/mandoc/mdoc/In/Makefile
index 8d76a4df828..55c83febd60 100644
--- a/regress/usr.bin/mandoc/mdoc/In/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/In/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.4 2012/07/09 17:52:09 schwarze Exp $
+# $OpenBSD: Makefile,v 1.5 2012/11/16 18:40:39 schwarze Exp $
 
-REGRESS_TARGETS = break font
+REGRESS_TARGETS = break font eos
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/In/eos.in b/regress/usr.bin/mandoc/mdoc/In/eos.in
new file mode 100644
index 00000000000..929c2be9a8e
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/In/eos.in
@@ -0,0 +1,10 @@
+.Dd November 16, 2012
+.Dt IN-EOS 1
+.Os OpenBSD
+.Sh NAME
+.Nm In-eos
+.Nd end of sentence handling after the include macro
+.Sh DESCRIPTION
+Let's use
+.In string.h .
+And then something else.
diff --git a/regress/usr.bin/mandoc/mdoc/In/eos.out_ascii b/regress/usr.bin/mandoc/mdoc/In/eos.out_ascii
new file mode 100644
index 00000000000..fee045373bc
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/In/eos.out_ascii
@@ -0,0 +1,9 @@
+IN-EOS(1)                  OpenBSD Reference Manual                  IN-EOS(1)
+
+NNAAMMEE
+     IInn--eeooss - end of sentence handling after the include macro
+
+DDEESSCCRRIIPPTTIIOONN
+     Let's use <_s_t_r_i_n_g_._h>.  And then something else.
+
+OpenBSD                        November 16, 2012                       OpenBSD
-- 
cgit v1.2.3