X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=generate;h=b65ba1de66ce0883a63f33dffe6548b88d37921e;hb=HEAD;hp=c2dc42da1ae75eb7ca8f17c1c0e0c635de22541c;hpb=694e9efc16bd0cc1c202d047afa1ed1688046e9e;p=subdirmk.git

diff --git a/generate b/generate
index c2dc42d..b65ba1d 100755
--- a/generate
+++ b/generate
@@ -350,6 +350,7 @@ sub process_input_mk ($$$$) {
 		next;
 	    }
 	    if (s{^\\$esc}{}) { od "$$esclitr" }
+	    elsif (s{^:}{}) { od "$$esclitr:" }
 	    elsif (s{^\\\$}{}) { oud '$' }
 	    elsif (s{^\\\s+$}{}) { }
 	    elsif (s{^$esc}{}) { od "$$esclitr$$esclitr" }
@@ -367,10 +368,12 @@ sub process_input_mk ($$$$) {
 	    elsif (s{^\$\-}{}) { $ddbl=undef; }
 	    elsif (s{^\$\+}{}) { $ddbl=1; }
 	    elsif (s{^\$\(}{}) {
-		ddbl_only($&); oud "\${";
+		ddbl_only($&); oud "\$(";
 		$note_varref->($2,!!$1) if m{^($esc)?([^()\$]+\))};
 	    }
 	    elsif (s{^\$(\d+)}{}) { ddbl_only($&); oud "\${$1}"; }
+	    elsif (s{^\(\s*$esc(?=$lc_re)}{}) { od "\$(call ${var_prefix}" }
+	    elsif (s{^\(\s*(?=\S)}{}        ) { od "\$(call "              }
 	    elsif (s{^\{}{}) {
 		err 'macro invocation cannot be re-$-doubled' if $ddbl;
 		od '${eval ${call ';