various fixes:

doc: make sure that double spaces follow {!,?,.}, even when used in macros;
fix partially from NetBSD;

doc-common: add `?' and `!' as punctuation characters. This means they must
now be escaped (just like `.') using `\&';

doc-ditroff: add `?' and `!' to the .Pu macro; sync order with doc-nroff;

doc-nroff: add `?' and `!' to the .Pu macro; remove a bogus blank line;

ok deraadt@

4 files changed, 10 insertions, 9 deletions

diff --git a/share/tmac/mdoc/doc b/share/tmac/mdoc/doc
index ed8e72179fc..324ffd4d4d0 100644
--- a/share/tmac/mdoc/doc
+++ b/share/tmac/mdoc/doc
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc,v 1.10 2003/07/24 18:12:53 jmc Exp $
+.\"	$OpenBSD: doc,v 1.11 2003/09/02 19:04:58 jmc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -364,7 +364,7 @@
 .	el .as b1 \&\f\\n(cF\s\\n(cZ\\*(A\\n(aP\fP\s0
 .	ie \\n(aC==\\n(aP \{\
 .		if \\n(jM==4 .as b1 \&\|\-
-.		as b1 \&\fP\s0
+.		as b1 \fP\s0
 .		aZ
 .	\}
 .	el \{\
@@ -392,7 +392,7 @@
 .	ie \\n(jM==2 .as b1 \&\\*(A\\n(aP
 .	el .as b1 \&\f\\n(cF\s\\n(cZ\\*(A\\n(aP\fP\s0
 .	ie \\n(aC==\\n(aP \{\
-.		as b1 \&\f\\n(cF\s\\n(cZ
+.		as b1 \f\\n(cF\s\\n(cZ
 .		aZ
 .	\}
 .	el \{\
diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common
index b7f3ae71197..00c52918346 100644
--- a/share/tmac/mdoc/doc-common
+++ b/share/tmac/mdoc/doc-common
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-common,v 1.32 2003/08/11 14:52:42 deraadt Exp $
+.\"	$OpenBSD: doc-common,v 1.33 2003/09/02 19:04:58 jmc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -110,6 +110,8 @@
 .nr z, 3
 .nr z: 3
 .nr z; 3
+.nr z? 3
+.nr z! 3
 .nr z( 4
 .nr z) 3
 .nr z[ 4
diff --git a/share/tmac/mdoc/doc-ditroff b/share/tmac/mdoc/doc-ditroff
index d13a0bb2ff6..5c9aec5fd66 100644
--- a/share/tmac/mdoc/doc-ditroff
+++ b/share/tmac/mdoc/doc-ditroff
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-ditroff,v 1.3 2003/06/02 23:30:16 millert Exp $
+.\"	$OpenBSD: doc-ditroff,v 1.4 2003/09/02 19:04:58 jmc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -60,7 +60,7 @@
 .ds nO \fR\s10
 .ds nT \s0
 .ds pA \fC\s10
-.ds Pu \fR{\ .\ ,\ :\ ;\ (\ )\ [\ ]\ \fR}
+.ds Pu \fR{\ .\ ,\ ;\ :\ ?\ !\ (\ )\ [\ ]\ \fR}
 .ds rA \fR\s10
 .ds rT \f(CO\s10
 .ds sH \fB\s10
diff --git a/share/tmac/mdoc/doc-nroff b/share/tmac/mdoc/doc-nroff
index 2d8071b33f2..a504dbb31c3 100644
--- a/share/tmac/mdoc/doc-nroff
+++ b/share/tmac/mdoc/doc-nroff
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-nroff,v 1.5 2003/06/28 18:15:59 jmc Exp $
+.\"	$OpenBSD: doc-nroff,v 1.6 2003/09/02 19:04:58 jmc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -59,7 +59,7 @@
 .ds nM \fB
 .ds nO \fR
 .ds pA \fI
-.ds Pu {\ .\ ,\ ;\ :\ (\ )\ [\ ]}
+.ds Pu {\ .\ ,\ ;\ :\ ?\ !\ (\ )\ [\ ]}
 .ds rA \fR
 .ds rT \fI
 .ds sH \fB
@@ -116,7 +116,6 @@
 .ds If Infinity
 .ds Na \fINaN\fP
 .ds Ba \fR\&|\fP
-
 .\"
 .de hK
 .nr % 1