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

[Evan Simpson]

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

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/output/test04.html 1.4 => 1.4.8.1 ===
     <p>define-slot</p>
 
-    <p>fill-slot</p>
-
   </body>
 
 </html>


=== Packages/TAL/tests/output/test04.xml 1.2 => 1.2.8.1 ===
     <p>define-slot</p>
 
-    <p>fill-slot</p>
-
   </body>
 
 </html>


=== Packages/TAL/tests/output/test_metal1.html 1.2 => 1.2.2.1 ===
   AAA
   <xxx metal:fill-slot="OUTERSLOT">
-  <span metal:use-macro="INNER2">INNER</span>
+  <span>INNER</span>
   </xxx>
   BBB
 </span>
@@ -49,8 +49,8 @@
 <span metal:use-macro="OUTER3">
   AAA
   <xxx metal:fill-slot="OUTERSLOT">
-  <span metal:use-macro="INNER3">INNER
-    <xxx metal:fill-slot="INNERSLOT">INNERSLOT</xxx>
+  <span>INNER
+    <xxx>INNERSLOT</xxx>
   </span>
   </xxx>
   BBB