In the parser, when closing an explicit block that is not open,

close below-subsection implicit scopes that may still be open.
In the formatter, make sure indentation is reset when leaving a scope,
not only when entering the next one.

Improves the formatting of gpg(1); issue reported by jca on ports.

3 files changed, 46 insertions, 2 deletions

diff --git a/regress/usr.bin/mandoc/man/RS/Makefile b/regress/usr.bin/mandoc/man/RS/Makefile
index bca9d9e9017..adefaeab654 100644
--- a/regress/usr.bin/mandoc/man/RS/Makefile
+++ b/regress/usr.bin/mandoc/man/RS/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.4 2013/01/05 22:18:59 schwarze Exp $
+# $OpenBSD: Makefile,v 1.5 2013/11/11 00:35:51 schwarze Exp $
 
-REGRESS_TARGETS = breaking empty literal nested
+REGRESS_TARGETS = breaking empty literal lonelyRE nested
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/man/RS/lonelyRE.in b/regress/usr.bin/mandoc/man/RS/lonelyRE.in
new file mode 100644
index 00000000000..2f166daee6b
--- /dev/null
+++ b/regress/usr.bin/mandoc/man/RS/lonelyRE.in
@@ -0,0 +1,21 @@
+.TH RS-LONELYRE 1 "November 10, 2013" OpenBSD
+.SH NAME
+RS-lonelyRE \- closing RS that is not open
+.SH DESCRIPTION
+.RS
+indented text
+.RE
+.TP 6n
+tag
+body
+.RE
+out of body
+.IP tag 6n
+body
+.RE
+out of body
+.HP 6n
+Here we need some text that is long enough to span more than one
+output line, such that we can see the hanging indentation.
+.RE
+out of body
diff --git a/regress/usr.bin/mandoc/man/RS/lonelyRE.out_ascii b/regress/usr.bin/mandoc/man/RS/lonelyRE.out_ascii
new file mode 100644
index 00000000000..abacd63e3e5
--- /dev/null
+++ b/regress/usr.bin/mandoc/man/RS/lonelyRE.out_ascii
@@ -0,0 +1,23 @@
+RS-LONELYRE(1)             OpenBSD Reference Manual             RS-LONELYRE(1)
+
+
+
+NNAAMMEE
+       RS-lonelyRE - closing RS that is not open
+
+DDEESSCCRRIIPPTTIIOONN
+              indented text
+
+       tag   body
+       out of body
+
+       tag   body
+       out of body
+
+       Here we need some text that is long enough to span more than one output
+             line, such that we can see the hanging indentation.
+       out of body
+
+
+
+OpenBSD                        November 10, 2013                RS-LONELYRE(1)