From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 13 Nov 2019 00:52:41 +0000 (+0000)
Subject: &! new esc can be anything
X-Git-Tag: subdirmk/0.1~93
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=commitdiff_plain;h=e836650bc5599ad3aae07ed2c498bc589d0a9a82;ds=sidebyside

&! new esc can be anything
---

diff --git a/subdirmk/NOTES b/subdirmk/NOTES
index 5d57e99..d4d7da9 100644
--- a/subdirmk/NOTES
+++ b/subdirmk/NOTES
@@ -21,9 +21,9 @@ lc is [a-z][-+,0-9_a-z]*(?!\w)
 
 &!<spaces or tabs>	disables & *until* EOL (and disappears)
 
-&!STUFF		STUFF is recognised instead of & (beyond EOL)
-		STUFF is either all ASCII punct or all ASCII alphanum (incl _)
-		any lwsp after STUFF is discarded too
+&!STUFF<lwsp>		STUFF is recognised instead of &
+			the terminating lwsp is discarded too
+			may also occur at eol
 
 eg notably
  STUFF!&		now & is recognised instead (ie back to normal)
diff --git a/subdirmk/generate b/subdirmk/generate
index 02722aa..ae5db30 100755
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -150,7 +150,7 @@ sub filter_subdir_mk ($$$$$) {
 	    } elsif (s{^![ \t]+}{}) {
 		o $_;
 		$_ = '';
-	    } elsif (s{^!(\pPosixWord+|\pPosixPunct+)[ \t]*}{}) {
+	    } elsif (s{^!(\S+)(?:[ \t]+|$)}{}) {
 		$esclit = $1;
 		$esc = $esclit;
 		$esc =~ s/\W/\\$&/g;