After almost five years and 92 revisions, mdoc_macro.c rev. 1.139

finally fixed the four issues explained in the mdoc_macro.c rev. 1.47
commit message.

10 files changed, 143 insertions, 19 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/break/Makefile b/regress/usr.bin/mandoc/mdoc/break/Makefile
index 1fd82f7f2cb..1642b209fec 100644
--- a/regress/usr.bin/mandoc/mdoc/break/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/break/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.1 2014/12/22 23:26:20 schwarze Exp $
+# $OpenBSD: Makefile,v 1.2 2015/02/12 13:52:12 schwarze Exp $
 
-REGRESS_TARGETS	= twice
-LINT_TARGETS	= twice
+REGRESS_TARGETS	= brokenbreaker twice two
+LINT_TARGETS	= brokenbreaker twice two
 
 # groff-1.22.3 defect:
 # - non-matching enclosure end macro prints a closing delimiter
 
-SKIP_GROFF	= twice
+SKIP_GROFF	= brokenbreaker
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/break/brokenbreaker.in b/regress/usr.bin/mandoc/mdoc/break/brokenbreaker.in
new file mode 100644
index 00000000000..b5a23f40c26
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/break/brokenbreaker.in
@@ -0,0 +1,14 @@
+.Dd December 23, 2014
+.Dt BREAK-BROKENBREAKER 1
+.Os OpenBSD
+.Sh NAME
+.Nm break-brokenbreaker
+.Nd a broken block breaking another block
+.Sh DESCRIPTION
+.Po po
+.Ao ao pc
+.Pc
+.Bo bo pc
+.Pc ac
+.Ac bc
+.Bc
diff --git a/regress/usr.bin/mandoc/mdoc/break/brokenbreaker.out_ascii b/regress/usr.bin/mandoc/mdoc/break/brokenbreaker.out_ascii
new file mode 100644
index 00000000000..1a8cd75a450
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/break/brokenbreaker.out_ascii
@@ -0,0 +1,9 @@
+BREAK-BROKENBREAKER(1)      General Commands Manual     BREAK-BROKENBREAKER(1)
+
+NNAAMMEE
+     bbrreeaakk--bbrrookkeennbbrreeaakkeerr - a broken block breaking another block
+
+DDEESSCCRRIIPPTTIIOONN
+     (po <ao pc) [bo pc ac> bc]
+
+OpenBSD                        December 23, 2014                       OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/break/brokenbreaker.out_lint b/regress/usr.bin/mandoc/mdoc/break/brokenbreaker.out_lint
new file mode 100644
index 00000000000..16e7a2bae85
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/break/brokenbreaker.out_lint
@@ -0,0 +1,3 @@
+mandoc: brokenbreaker.in:10:2: WARNING: blocks badly nested: Po breaks Ao
+mandoc: brokenbreaker.in:12:2: ERROR: skipping end of block that is not open: Pc
+mandoc: brokenbreaker.in:13:2: WARNING: blocks badly nested: Ao breaks Bo
diff --git a/regress/usr.bin/mandoc/mdoc/break/twice.in b/regress/usr.bin/mandoc/mdoc/break/twice.in
index cb6642a2850..8853aec1a04 100644
--- a/regress/usr.bin/mandoc/mdoc/break/twice.in
+++ b/regress/usr.bin/mandoc/mdoc/break/twice.in
@@ -1,14 +1,32 @@
-.Dd December 23, 2014
+.Dd February 12, 2015
 .Dt BREAK-TWICE 1
 .Os OpenBSD
 .Sh NAME
 .Nm break-twice
-.Nd the same block breaking two other blocks
+.Nd breaking the same block twice
 .Sh DESCRIPTION
-.Po po
-.Ao ao pc
-.Pc
-.Bo bo pc
-.Pc ac
-.Ac bc
-.Bc
+Standard case, explicit:
+.Bo bo
+.Bro bro
+.Ao ao brc
+.Brc bc
+.Bc ac
+.Ac
+.Pp
+Standard case, implicit:
+.Bo bo
+.Bro bro
+.Aq aq brc Brc bc Bc eol
+.Pp
+Two of the same kind, explicit:
+.Bo bo
+.Bo bo
+.Ao ao bc
+.Bc bc
+.Bc ac
+.Ac
+.Pp
+Two of the same kind, implicit:
+.Bo bo
+.Bo bo
+.Aq aq bc Bc bc Bc eol
diff --git a/regress/usr.bin/mandoc/mdoc/break/twice.out_ascii b/regress/usr.bin/mandoc/mdoc/break/twice.out_ascii
index 6d91ffa070c..c6d0149db7d 100644
--- a/regress/usr.bin/mandoc/mdoc/break/twice.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/break/twice.out_ascii
@@ -1,9 +1,15 @@
 BREAK-TWICE(1)              General Commands Manual             BREAK-TWICE(1)
 
 NNAAMMEE
-     bbrreeaakk--ttwwiiccee - the same block breaking two other blocks
+     bbrreeaakk--ttwwiiccee - breaking the same block twice
 
 DDEESSCCRRIIPPTTIIOONN
-     (po <ao pc) [bo pc ac> bc]
+     Standard case, explicit: [bo {bro <ao brc} bc] ac>
 
-OpenBSD                        December 23, 2014                       OpenBSD
+     Standard case, implicit: [bo {bro <aq brc} bc] eol>
+
+     Two of the same kind, explicit: [bo [bo <ao bc] bc] ac>
+
+     Two of the same kind, implicit: [bo [bo <aq bc] bc] eol>
+
+OpenBSD                        February 12, 2015                       OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/break/twice.out_lint b/regress/usr.bin/mandoc/mdoc/break/twice.out_lint
index 92b93e4e200..6ac976c0309 100644
--- a/regress/usr.bin/mandoc/mdoc/break/twice.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/break/twice.out_lint
@@ -1,3 +1,8 @@
-mandoc: twice.in:10:2: WARNING: blocks badly nested: Po breaks Ao
-mandoc: twice.in:12:2: ERROR: skipping end of block that is not open: Pc
-mandoc: twice.in:13:2: WARNING: blocks badly nested: Ao breaks Bo
+mandoc: twice.in:12:2: WARNING: blocks badly nested: Bro breaks Ao
+mandoc: twice.in:13:2: WARNING: blocks badly nested: Bo breaks Ao
+mandoc: twice.in:19:12: WARNING: blocks badly nested: Bro breaks Aq
+mandoc: twice.in:19:19: WARNING: blocks badly nested: Bo breaks Aq
+mandoc: twice.in:25:2: WARNING: blocks badly nested: Bo breaks Ao
+mandoc: twice.in:26:2: WARNING: blocks badly nested: Bo breaks Ao
+mandoc: twice.in:32:11: WARNING: blocks badly nested: Bo breaks Aq
+mandoc: twice.in:32:17: WARNING: blocks badly nested: Bo breaks Aq
diff --git a/regress/usr.bin/mandoc/mdoc/break/two.in b/regress/usr.bin/mandoc/mdoc/break/two.in
new file mode 100644
index 00000000000..d3071699bc4
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/break/two.in
@@ -0,0 +1,42 @@
+.Dd February 12, 2015
+.Dt BREAK-TWO 1
+.Os OpenBSD
+.Sh NAME
+.Nm break-two
+.Nd the same block breaking two other blocks
+.Sh DESCRIPTION
+Standard case, explicit:
+.Ao ao
+.Bo bo
+.Bro bro ac
+.Ac brc
+.Brc bc
+.Bc
+.Pp
+Standard case, implicit:
+.Aq aq Bo bo Bro bro eol
+.Brc bc Bc
+.Pp
+Reverse closing, explicit:
+.Ao ao
+.Bo bo
+.Bro bro ac
+.Ac bc
+.Bc brc
+.Brc
+.Pp
+Reverse closing, implicit:
+.Aq aq Bo bo Bro bro eol
+.Bc brc Brc
+.Pp
+Two of the same kind, explicit:
+.Ao ao
+.Bo bo
+.Bo bo ac
+.Ac bc
+.Bc bc
+.Bc
+.Pp
+Two of the same kind, implicit:
+.Aq aq Bo bo Bo bo eol
+.Bc bc Bc
diff --git a/regress/usr.bin/mandoc/mdoc/break/two.out_ascii b/regress/usr.bin/mandoc/mdoc/break/two.out_ascii
new file mode 100644
index 00000000000..e4db38c4685
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/break/two.out_ascii
@@ -0,0 +1,19 @@
+BREAK-TWO(1)                General Commands Manual               BREAK-TWO(1)
+
+NNAAMMEE
+     bbrreeaakk--ttwwoo - the same block breaking two other blocks
+
+DDEESSCCRRIIPPTTIIOONN
+     Standard case, explicit: <ao [bo {bro ac> brc} bc]
+
+     Standard case, implicit: <aq [bo {bro eol>} bc]
+
+     Reverse closing, explicit: <ao [bo {bro ac> bc] brc}
+
+     Reverse closing, implicit: <aq [bo {bro eol>] brc}
+
+     Two of the same kind, explicit: <ao [bo [bo ac> bc] bc]
+
+     Two of the same kind, implicit: <aq [bo [bo eol>] bc]
+
+OpenBSD                        February 12, 2015                       OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/break/two.out_lint b/regress/usr.bin/mandoc/mdoc/break/two.out_lint
new file mode 100644
index 00000000000..79346fe3d49
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/break/two.out_lint
@@ -0,0 +1,8 @@
+mandoc: two.in:12:2: WARNING: blocks badly nested: Ao breaks Bro
+mandoc: two.in:17:2: WARNING: blocks badly nested: Aq breaks Bro
+mandoc: two.in:24:2: WARNING: blocks badly nested: Ao breaks Bro
+mandoc: two.in:25:2: WARNING: blocks badly nested: Bo breaks Bro
+mandoc: two.in:29:2: WARNING: blocks badly nested: Aq breaks Bro
+mandoc: two.in:30:2: WARNING: blocks badly nested: Bo breaks Bro
+mandoc: two.in:36:2: WARNING: blocks badly nested: Ao breaks Bo
+mandoc: two.in:41:2: WARNING: blocks badly nested: Aq breaks Bo