5 files changed, 111 insertions, 15 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Eo/break.in b/regress/usr.bin/mandoc/mdoc/Eo/break.in
index 6dd3ee3da7a..001d7ac55da 100644
--- a/regress/usr.bin/mandoc/mdoc/Eo/break.in
+++ b/regress/usr.bin/mandoc/mdoc/Eo/break.in
@@ -1,11 +1,11 @@
-.Dd November 27, 2014
+.Dd February 1, 2015
 .Dt EO-BREAK 1
 .Os OpenBSD
 .Sh NAME
 .Nm Eo-break
 .Nd breaking a custom enclosure block
 .Sh DESCRIPTION
-initial text
+break
 .Eo <<
 eo
 .Bo
@@ -14,4 +14,55 @@ ec
 .Ec >>
 bc
 .Bc
+no closing
+.Eo <<
+eo
+.Bo
+bo
+ec
+.Ec
+bc
+.Bc
+no content
+.Eo <<
+.Bo
+.Ec >>
+bc
+.Bc
+opening only
+.Eo <<
+.Bo
+.Ec
+bc
+.Bc
+broken
+.Bo
+bo
+.Eo <<
+eo
+bc
+.Bc
+ec
+.Ec >>
+no content
+.Bo
+bo
+.Eo <<
+.Bc
+.Ec >>
+no opening
+.Bo
+bo
+.Eo
+eo
+bc
+.Bc
+ec
+.Ec >>
+closing only
+.Bo
+bo
+.Eo
+.Bc
+.Ec >>
 final text
diff --git a/regress/usr.bin/mandoc/mdoc/Eo/break.out_ascii b/regress/usr.bin/mandoc/mdoc/Eo/break.out_ascii
index 1088828fa33..d4a663432b7 100644
--- a/regress/usr.bin/mandoc/mdoc/Eo/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Eo/break.out_ascii
@@ -4,6 +4,8 @@ NNAAMMEE
      EEoo--bbrreeaakk - breaking a custom enclosure block
 
 DDEESSCCRRIIPPTTIIOONN
-     initial text <<eo [bo ec>> bc] final text
+     break <<eo [bo ec>> bc] no closing <<eo [bo ec bc] no content <<[>> bc]
+     opening only <<[ bc] broken [bo <<eo bc] ec>> no content [bo <<]>> no
+     opening [bo eo bc] ec>> closing only [bo ]>> final text
 
-OpenBSD                        November 27, 2014                       OpenBSD
+OpenBSD                        February 1, 2015                        OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Eo/break.out_lint b/regress/usr.bin/mandoc/mdoc/Eo/break.out_lint
index 11dc16308bc..15281e9aba1 100644
--- a/regress/usr.bin/mandoc/mdoc/Eo/break.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Eo/break.out_lint
@@ -1 +1,8 @@
 mandoc: break.in:14:2: WARNING: blocks badly nested: Ec breaks Bo
+mandoc: break.in:23:2: WARNING: blocks badly nested: Ec breaks Bo
+mandoc: break.in:29:2: WARNING: blocks badly nested: Ec breaks Bo
+mandoc: break.in:35:2: WARNING: blocks badly nested: Ec breaks Bo
+mandoc: break.in:44:2: WARNING: blocks badly nested: Bc breaks Eo
+mandoc: break.in:51:2: WARNING: blocks badly nested: Bc breaks Eo
+mandoc: break.in:59:2: WARNING: blocks badly nested: Bc breaks Eo
+mandoc: break.in:66:2: WARNING: blocks badly nested: Bc breaks Eo
diff --git a/regress/usr.bin/mandoc/mdoc/Eo/empty.in b/regress/usr.bin/mandoc/mdoc/Eo/empty.in
index c4b65c0aaa9..bf637f27744 100644
--- a/regress/usr.bin/mandoc/mdoc/Eo/empty.in
+++ b/regress/usr.bin/mandoc/mdoc/Eo/empty.in
@@ -1,18 +1,51 @@
-.Dd October 21, 2010
+.Dd February 1, 2015
 .Dt EO-EMPTY 1
 .Os OpenBSD
 .Sh NAME
 .Nm Eo-empty
 .Nd empty implicit enclosure macros
 .Sh DESCRIPTION
-An empty
+completely empty
+.Eo
+.Ec
+closing only
+.Eo
+.Ec >>
+content only
+.Eo
+text
+.Ec
+opening only
+.Eo <<
+.Ec
+no opening
+.Eo
+text
+.Ec >>
+no content
+.Eo <<
+.Ec >>
+no closing
+.Eo <<
+text
+.Ec
+all
 .Eo <<
+text
+.Ec >>
+completely empty
+.No prefix Ns Eo
+.Ec
+closing only
+.No prefix Ns Eo
+.Ec >>
+no opening
+.No prefix Ns Eo
+text
 .Ec >>
-and a full
+no closing
 .Eo <<
-user@host
+.No prefix Ns Ec
+stray closing
 .Ec >>
-quotation.
-And a stray
-.Ec ignore this
-end macro.
+end of file
diff --git a/regress/usr.bin/mandoc/mdoc/Eo/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Eo/empty.out_ascii
index a8e9376a82a..a28e5727610 100644
--- a/regress/usr.bin/mandoc/mdoc/Eo/empty.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Eo/empty.out_ascii
@@ -4,7 +4,10 @@ NNAAMMEE
      EEoo--eemmppttyy - empty implicit enclosure macros
 
 DDEESSCCRRIIPPTTIIOONN
-     An empty <<>> and a full <<user@host>> quotation.  And a stray
-     ignore this end macro.
+     completely empty  closing only >> content only text opening only << no
+     opening text>> no content <<>> no closing <<text all <<text>> completely
+     empty prefix closing only prefix>> no opening prefixtext>> no closing
+     <<prefix stray closing
+     >> end of file
 
-OpenBSD                        October 21, 2010                        OpenBSD
+OpenBSD                        February 1, 2015                        OpenBSD