.nf blocks may be ended with .SH

Author: mle86

man-to-md.pl

@@ -382,7 +382,7 @@ sub postprocess_synopsis {
 
 sub reformat_syntax {
 	# commands to be ignored:
-	if (m/^\.(?:PD|hy|ad|\s|$)/) {
+	if (m/^\.(?:PD|hy|ad|ft|fi|\s|$)/) {
 		$_ = '';
 		return
 	}
@@ -703,13 +703,16 @@ sub read_version {
 nextline() if (section_title && $is_synopsis);
 
 
-do {
+do {{
+	PARSELINE:
+
 	if ($in_rawblock) {
-		if (m/^\.(?:fi|cx)/) {
+		if (m/^\.(?:fi|SH|cx)/) {
 			# code block ends
 			$in_rawblock = 0;
 			print "</code></pre>\n"  if $code_formatting;
 			print "\n"  if m/^\.cx/;
+			redo if m/^\.SH/;  # .nf sections can be ended with .SH, but we still need to print the new section title too
 		} elsif ($code_formatting) {
 			# inside code block with limited html formatting
 			if ($in_rawblock == 2) {
@@ -768,7 +771,7 @@ sub read_version {
 		print
 	}
 
-} while (nextline(1));
+}} while (nextline(1));
 
 
 # Paste section which haven't matched anything yet:

test/90-test-bug-nf-sh.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+. $(dirname "$0")/init.sh
+
+# .nf code blocks may be ended with a new section title (.SH).
+
+output="$(conv code.roff)"
+
+expectedFragment=
+expectedFragment="${expectedFragment}^# Unterminated\b.*"
+expectedFragment="${expectedFragment}^    +my\b.*"
+expectedFragment="${expectedFragment}^    +code\b.*"
+expectedFragment="${expectedFragment}^# Terminator*"
+
+assertRegex "$output" "/$expectedFragment/ms"
+
+
+success

test/samples/code.roff

@@ -34,3 +34,9 @@ cm-output1
 cm-output2 \\" not a comment
 .cx
 text 1
+.SH UNTERMINATED
+.nf
+my
+code
+.SH TERMINATOR
+ttt