X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=tests%2Ffilter%2Fextract-doctest;h=10dd42a3d8b5f5bc061551db40a4aed6ebbac9b1;hp=b7da9ac72d3701d1b429b3346a90b95a72613c00;hb=7cb83215bac621d9585023742911555964857890;hpb=8df0559baf489581ba2f7decc8f3b6854df7fc52

diff --git a/tests/filter/extract-doctest b/tests/filter/extract-doctest
index b7da9ac..10dd42a 100755
--- a/tests/filter/extract-doctest
+++ b/tests/filter/extract-doctest
@@ -41,8 +41,8 @@ while (<>) {
     # parse: rely on looking for => (and .. on subsequent lines)
     next unless m{\=\>} or ($cent and m{ \.\. });
     my $mapop = '=>';
-    # adhoc: special case STUFF here so we recognise things in changequote
-    if (s{^(\s*)(\&\S+|STUFF\S+|\$)\s+(\=\>|\.\.)\s+(\S+)\s+}{} ||
+    # adhoc: special case NEWQUOTE here so we recognise things in changequote
+    if (s{^(\s*)(\&\S+|NEWQUOTE\S+|\$)\s+(\=\>|\.\.)\s+(\S+)\s+}{} ||
 	s{^()(\&\:\w+(?: \S+)*)\s{2,}(\=\>)\s{2,}($withspcs)$}{} ||
         $cent && s{^()($withspcs)\s{2,}(\.\.)\s{2,}($withspcs)$}{}) {
 	# adhoc: expected indented iff in changequote part
@@ -56,6 +56,9 @@ while (<>) {
 	    $e->{OutTop} = $1 eq 'nothing' ? '' : $1;
 	} elsif (# parse: expect other wordish things to be comments
 		 m{^(?!or\b)\w{2,} }) {
+	} elsif (m/^$/) {
+	} else {
+	    confess "unk rhs $_ ?";
 	}
 	$e->{CQ} = $in_changequote;
     } else {
@@ -104,6 +107,7 @@ sub write_permode ($$$$$;$$) {
 	my $rubric = $e->{In};
 	$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";
@@ -128,9 +132,9 @@ sub writeout ($) {
 		  '','','', 'normal',
 		 sub { !$_[0]{CQ} } );
     write_permode($dir_prefix,
-		  "&:changequote STUFF",
-		  "STUFF:changequote &",
-		  "\n",
+		  "&:changequote NEWQUOTE\n",
+		  "NEWQUOTE:changequote &\n",
+		  "",
 		  'changequote',
 		  sub { $_[0]{CQ} } );
     oh "# doctest ends\n";