Commit of patch floated on discuss@ a few days ago: if an in_line scope

has not been opened and closing punctuation is encountered AND the macro
is marked as accepting no-content (or `Li'), then open an empty scope.

Added regression tests for `Fl' and `Li' testing this behaviour.

Also, squeeze hyph0.in tests into the last characters of each line so
that groff doesn't hyphenate and break the test.

4 files changed, 73 insertions, 6 deletions

diff --git a/regress/mdoc/Fl/empty.in b/regress/mdoc/Fl/empty.in
new file mode 100644
index 00000000..bfda2dcb
--- /dev/null
+++ b/regress/mdoc/Fl/empty.in
@@ -0,0 +1,15 @@
+.Dd May 16, 2010
+.Dt FOO 1
+.Os
+.Sh NAME
+.Nm foo
+.Nd bar
+.Sh DESCRIPTION
+.Fl . a
+.Pp
+.Fl ;
+.Pp
+.Ar expr1 Fl : expr2
+.Pp
+.Ar expr1 Fl . ; expr2 ( expr3 )
+.Ar expr1 Fl . ; ) ( expr3 )
diff --git a/regress/mdoc/Li/empty.in b/regress/mdoc/Li/empty.in
new file mode 100644
index 00000000..64fa6add
--- /dev/null
+++ b/regress/mdoc/Li/empty.in
@@ -0,0 +1,14 @@
+.Dd May 16, 2010
+.Dt FOO 1
+.Os
+.Sh NAME
+.Nm foo
+.Nd bar
+.Sh DESCRIPTION
+.Li . a
+.Pp
+.Li ;
+.Pp
+.Ar expr1 Li : expr2
+.Pp
+.Ar expr1 Li . ; expr2 ( expr3 )
diff --git a/regress/mdoc/Li/empty2.in b/regress/mdoc/Li/empty2.in
new file mode 100644
index 00000000..68cee15a
--- /dev/null
+++ b/regress/mdoc/Li/empty2.in
@@ -0,0 +1,40 @@
+.\" $OpenBSD: bgpd.conf.5,v 1.88 2008/03/22 08:38:38 claudio Exp $
+.\"
+.\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
+.\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
+.\" Copyright (c) 2002 Daniel Hartmeier <dhartmei@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd $Mdocdate: May 29 2010 $
+.Dt BGPD.CONF 5
+.Os
+.Sh NAME
+.Nm bgpd.conf
+.Nd Border Gateway Protocol daemon configuration file
+.Sh DESCRIPTION
+The
+.Ar address Ns Li / Ns Ar prefix
+.Pp
+.Ar as-number Ns Li \&: Ns Ar local
+.Pp
+.Ar as-number Ns Li : Ns Ar local ,
+.Pp
+.Ar address Ns Li / Ns Ar len
+.Pp
+.Ar address Ns Li / Ns Ar len
+.Pp
+.Ar as-number Ns Li : Ns Ar local
+.Pp
+.Ar as-number Ns Li : Ns Ar local ,
+where
diff --git a/regress/mdoc/punct/hyph0.in b/regress/mdoc/punct/hyph0.in
index 2e73367c..46d8aa79 100644
--- a/regress/mdoc/punct/hyph0.in
+++ b/regress/mdoc/punct/hyph0.in
@@ -1,20 +1,18 @@
-.Dd $Mdocdate: May 25 2010 $
+.Dd $Mdocdate: May 29 2010 $
 .Dt FOO 1
 .Os
 .Sh NAME
 .Nm foo
 .Nd bar
 .Sh DESCRIPTION
-asdflkjhasdflkjhasdflkjhasdflkjhasdflkjhasdflkjhsadflkjhsadflkjhasf d-asdf
+aasdflkjhasdflkjhasdflkjhasdflkjhasdflkjhasdflkjhsadflkjhsadflkjhasf d-asdf
 .Pp
-asdflkjhasdflkjhasdflkjhasdflkjhasdflkjhasdflkjhsadflkjhsadflkjhasf d\(hyasdf
+aasdflkjhasdflkjhasdflkjhasdflkjhasdflkjhasdflkjhsadflkjhsadflkjhasf d\(hyasdf
 .Pp
 asdflkjhasdflkjhasdflkjhasdflkjhasdflkjhasdflkjhsadflkjhsadflkjhasf d--yasdf
 .Pp
 asdflkjhasdflkjhasdflkjhasdflkjhasdflkjhasdflkjhsadflkjhsadfhsasf d---yasdf
 .Pp
-asdflkjhasdflkjhasdflkjhasdflkjhasdflkjhasdflkjhsadflkjhsadfhsasf "d-yasdf"
+aaasdflkjhasdflkjhasdflkjhasdflkjhasdflkjhasdflkjhsadflkjhsadfhsasf "d-yasdf"
 .Pp
 asdflkjhasdflkjhasdflkjhasdflkjhasdflkjhasdflkjhsadflkjhsadfhsasf d\-yasdf
-.Pp
-.Qq lkjhasdflkjhasdflkjhasdflkjhasdflkjhasdflkjhsadflkjhsadflkjhasfasas d-asdf