=== modified file 'bin/aat.awk'
--- bin/aat.awk	2014-07-08 20:27:15 +0000
+++ bin/aat.awk	2014-07-08 20:10:05 +0000
@@ -93,41 +93,44 @@
 		token(varname " = \"" $0 "\\n\"\n")
 	}
 	close(filename)
+	filename = file_old
 }
 
 function call_macro(name, args,    file_old) {
 	if(DEBUG) printf "call_macro(\"%s\", \"%s\")\n", name, args >"/dev/stderr"
-
-	# store current filename so macros can change it, restore before function exits
-	file_old = filename
-
 	# Macro to recursively parse another template
 	if(name == "include"){
+		file_old = filename
 		find_file(args)
 		while(getline <filename) {
 			parse_line($0)
 		}
 		close(filename)
+		filename = file_old
 	}
 
 	# Macro to insert another file as verbatim code
 	else if(name == "awk"){
+		file_old = filename
 		find_file(args)
 		tok_type=T_AWK
 		while(getline <filename) {
 			token($0 "\n")
 		}
 		close(filename)
+		filename = file_old
 	}
 
 	# Macro to insert another file as text
 	else if(name == "text"){
+		file_old = filename
 		find_file(args)
 		tok_type=T_TEXT
 		while(getline <filename) {
 			token($0 "\n")
 		}
 		close(filename)
+		filename = file_old
 	}
 
 	# Macro to insert source filename as a variable into produced code
@@ -135,6 +138,7 @@
 		tok_type=T_AWK
 		token("filename = \"" gsub(/["\\]/, "\\&", args) "\n")
 		close(filename)
+		filename = file_old
 	}
 
 	# Macro to read content of a file into a variable
@@ -171,7 +175,6 @@
 		tok_type=T_AWK
 		token("@" name " " args "\n")
 	}
-	filename = file_old
 }
 
 function parse_line(line) {