Move template-escaping before raw handling

1 files changed, 13 insertions, 8 deletions

@@ -14,6 +14,19 @@ BEGIN {
         ATTR = DEFATTR
 }
 
+# Sure, let's do templating!  This makes it less... weird.
+# This has to come before raw handling so that code doesn't get expanded in raw sections.
+/\$/ {
+        if (RAW) {
+                gsub(/\$/, "\\\\&", $0)
+        } else {
+                # XXX: This is probably the dumbest way to do it.
+                gsub(/\$\$/, "$\a", $0)
+                gsub(/\$[^\a]/, "\\\\&", $0)
+                gsub(/\$\a/, "$", $0)
+        }
+}
+
 # Handle raw sections
 $0 ~ CONFIG["raw_delim"] {
         RAW = ! RAW
@@ -45,14 +58,6 @@ $0 ~ ("^" COMMENT_DELIM) {
         next
 }
 
-# Sure, let's do templating!  This makes it less... weird.
-/\$/ {
-        # XXX: This is probably the dumbest way to do it.
-        gsub(/\$\$/, "$\a", $0)
-        gsub(/\$[^\a]/, "\\\\&", $0)
-        gsub(/\$\a/, "$", $0)
-}
-
 # Blocks of text
 /./ {
         # EOL escape