From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 24 Dec 2019 16:05:49 +0000 (+0000)
Subject: doctests: Improve entry description filter
X-Git-Tag: subdirmk/0.3~63
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=commitdiff_plain;h=b870fbb3b70af8a37585f4ecedc7e0e574f772f1

doctests: Improve entry description filter

This makes the decriptive text more aposite in some situations.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/filter/extract-doctest b/tests/filter/extract-doctest
index b63f309..40cf4f5 100755
--- a/tests/filter/extract-doctest
+++ b/tests/filter/extract-doctest
@@ -110,16 +110,16 @@ sub write_permode ($$$$$;$$) {
 	$rubric =~ s/\&/AMP /g;
 	$rubric =~ s/\$/DOLLAR /g;
 	$rubric =~ s/NEWQUOTE/NEW_QUOTE /g;
-	my $f = $e->{In} =~ m/\n/
-	        ? "\n# %s:\n%s\n\n"
-		: "%-30s: %s.\n";
+	my ($f,$prubric) = $rubric =~ m/^(.*)\n/
+	        ? ("\n# %s:\n%s\n\n", $1)
+		: ("%-30s: %s .\n", $rubric);
 	my $o;
 	$o = $e->{OutTop} if $dir_prefix eq '';
 	$o //= $e->{Out};
 	$o =~ s{/sub/dir}{} if $dir_prefix eq '' && !defined $e->{OutTop};
 	$o = $omap->($o, $e);
-	oi sprintf $f, $rubric, $e->{In};
-	oo sprintf $f, $rubric, $o;
+	oi sprintf $f, $prubric, $e->{In};
+	oo sprintf $f, $prubric, $o;
     }
     oi $end;
     oh "${senl}# ----- $what ends -----\n";