Fix a TODO noted by schwarze@, originally by Christian Weisgerber:

literal mode (`nf') is ended by SH (and, it turns out, SS as well).
Noted the updated behaviour in man.7 as well.

4 files changed, 8 insertions, 3 deletions

diff --git a/TODO b/TODO
index 2629bfa9..1bb80c6b 100644
--- a/TODO
+++ b/TODO
@@ -128,9 +128,6 @@
 - groff an-ext.tmac macros (.UR, .UE) occur in xine(5)
   reported by brad@  Sat, 15 Jan 2011 15:45:23 -0500
 
-- .SH implies .fi, see e.g. sasl_setpass(1)
-  reported by naddy@  Sun, 3 Jul 2011 23:55:17 +0200
-
 --- missing tbl features -----------------------------------------------
 
 - implement basic non-parametric .de to support e.g. sox(1)
diff --git a/man.7 b/man.7
index 1b271f1f..e2fc31ec 100644
--- a/man.7
+++ b/man.7
@@ -845,6 +845,10 @@ Begin literal mode: all subsequent free-form lines have their end of
 line boundaries preserved.
 May be ended by
 .Sx \&fi .
+Literal mode is implicitly ended by
+.Sx \&SH
+or
+.Sx \&SS .
 .Ss \&sp
 Insert vertical spaces into output with the following syntax:
 .Bd -filled -offset indent
diff --git a/man_html.c b/man_html.c
index 6104f7c3..1f03eae8 100644
--- a/man_html.c
+++ b/man_html.c
@@ -439,6 +439,7 @@ man_SH_pre(MAN_ARGS)
 	struct htmlpair	 tag;
 
 	if (MAN_BLOCK == n->type) {
+		mh->fl &= ~MANH_LITERAL;
 		PAIR_CLASS_INIT(&tag, "section");
 		print_otag(h, TAG_DIV, 1, &tag);
 		return(1);
@@ -520,6 +521,7 @@ man_SS_pre(MAN_ARGS)
 	struct htmlpair	 tag;
 
 	if (MAN_BLOCK == n->type) {
+		mh->fl &= ~MANH_LITERAL;
 		PAIR_CLASS_INIT(&tag, "subsection");
 		print_otag(h, TAG_DIV, 1, &tag);
 		return(1);
diff --git a/man_term.c b/man_term.c
index 8ca5d312..9d39cc29 100644
--- a/man_term.c
+++ b/man_term.c
@@ -709,6 +709,7 @@ pre_SS(DECL_ARGS)
 
 	switch (n->type) {
 	case (MAN_BLOCK):
+		mt->fl &= ~MANT_LITERAL;
 		mt->lmargin = term_len(p, INDENT);
 		mt->offset = term_len(p, INDENT);
 		/* If following a prior empty `SS', no vspace. */
@@ -759,6 +760,7 @@ pre_SH(DECL_ARGS)
 
 	switch (n->type) {
 	case (MAN_BLOCK):
+		mt->fl &= ~MANT_LITERAL;
 		mt->lmargin = term_len(p, INDENT);
 		mt->offset = term_len(p, INDENT);
 		/* If following a prior empty `SH', no vspace. */