[ZPT] CVS: Packages/TAL/tests/input - test04.html:1.2.8.1 test04.xml:1.1.8.1 test_metal1.html:1.2.2.1

[Evan Simpson]

Update of /cvs-repository/Packages/TAL/tests/input
In directory cvs.zope.org:/tmp/cvs-serv7789/tests/input

Modified Files:
      Tag: tal-1_4_0
	test04.html test04.xml test_metal1.html 
Log Message:
Fix macro nesting behaviour; Tests all pass now.


=== Packages/TAL/tests/input/test04.html 1.2 => 1.2.8.1 ===
     <span z:define="global count python:2; global message str:hello world"/>
 
-    <p m:use-macro="whoops">use-macro</p>
+    <p m:use-macro="whoops">use-macro
+      <span m:fill-slot="whoops">fill-slot</span>
+    </p>
 
     <span z:define="global message str:goodbye cruel world"/>
 
     <p m:use-macro="whoops">use-macro</p>
 
     <p m:define-slot="whoops">define-slot</p>
-
-    <p m:fill-slot="whoops">fill-slot</p>
 
   </body>
 


=== Packages/TAL/tests/input/test04.xml 1.1 => 1.1.8.1 ===
     <span z:define="global count python:2; global message str:hello world"/>
 
-    <p m:use-macro="whoops">use-macro</p>
+    <p m:use-macro="whoops">use-macro
+      <span m:fill-slot="whoops">fill-slot</span>
+    </p>
 
     <span z:define="global message str:goodbye cruel world"/>
 
     <p m:use-macro="whoops">use-macro</p>
 
     <p m:define-slot="whoops">define-slot</p>
-
-    <p m:fill-slot="whoops">fill-slot</p>
 
   </body>
 


=== Packages/TAL/tests/input/test_metal1.html 1.2 => 1.2.2.1 ===
 
 <xxx metal:use-macro="INSLOT"></xxx>
-
-