Fix substitute variables in macro calls

With the introduction of nested macros in entities (see
commit 6d9d79b) it becomes
necessary to substitute variables in the attributes of the
`call-macro` element.

Author: cboehme

src/main/java/org/culturegraph/mf/morph/AbstractMetamorphDomWalker.java

@@ -312,7 +312,7 @@ private void handleRule(final Node node) {
 				throw new MorphDefException("Macro '" + macroName + "' undefined!");
 			}
 			vars = new ScopedHashMap<String, String>(vars);
-			vars.putAll(attributeMap(node));
+			vars.putAll(resolvedAttributeMap(node));
 			handleRules(macroNode);
 			vars = vars.getOuterScope();
 		}else {

src/test/java/org/culturegraph/mf/morph/MacroTest.xml

@@ -187,4 +187,53 @@
 		</result>
 	</test-case>
 
+	<test-case  name="nested macros with variables being passed through">
+		<input type="text/x-cg+xml">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1">
+						<cgxml:literal name="country" value="Hawaii" />
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</input>
+
+		<transformation type="text/x-metamorph+xml">
+			<mm:metamorph version="1" entityMarker=".">
+				<mm:macros>
+					<mm:macro name="prepend">
+						<mm:data source="country">
+							<mm:compose prefix="$[with]" />
+						</mm:data>
+					</mm:macro>
+
+					<mm:macro name="wrapInEntity">
+						<mm:entity name="entity">
+							<mm:call-macro name="prepend" with="$[prefix]" />
+						</mm:entity>
+					</mm:macro>
+				</mm:macros>
+				<mm:rules>
+					<mm:call-macro name="wrapInEntity" prefix="1: " />
+					<mm:call-macro name="wrapInEntity" prefix="2: " />
+				</mm:rules>
+			</mm:metamorph>
+		</transformation>
+
+		<result type="text/x-cg+xml">
+			<cgxml:cgxml version="1.0">
+				<cgxml:records>
+					<cgxml:record id="1">
+						<cgxml:entity name="entity">
+							<cgxml:literal name="country" value="1: Hawaii"/>
+						</cgxml:entity>
+						<cgxml:entity name="entity">
+							<cgxml:literal name="country" value="2: Hawaii"/>
+						</cgxml:entity>
+					</cgxml:record>
+				</cgxml:records>
+			</cgxml:cgxml>
+		</result>
+	</test-case>
+	
 </metamorph-test>