[ZPT] CVS: Packages/TAL - test01.html:1.2 test01.xml:1.2 test03.html:1.2 test03.xml:1.2 test04.html:1.2 test04.xml:1.2 test05.html:1.2 test05.xml:1.2 test06.html:1.3 test06.xml:1.3 test07.html:1.2 test07.xml:1.2 test08.html:1.3 test08.xml:1.3 test10.html:1.3 test11.html:1.2 test11.xml:1.2 test12.html:1.2
guido@digicool.com
guido@digicool.com
Sat, 7 Apr 2001 15:26:11 -0400 (EDT)
Update of /cvs-repository/Packages/TAL/test/output
In directory korak:/tmp/cvs-serv6622/output
Modified Files:
test01.html test01.xml test03.html test03.xml test04.html
test04.xml test05.html test05.xml test06.html test06.xml
test07.html test07.xml test08.html test08.xml test10.html
test11.html test11.xml test12.html
Log Message:
Update the test suite output, now that TAL and METAL attributes are no
longer generated.
Also fix the test for <img src tal:attributes="src nothing">.
--- Updated File test01.html in package Packages/TAL --
--- test01.html 2001/03/27 16:39:00 1.1
+++ test01.html 2001/04/07 19:26:08 1.2
@@ -6,16 +6,12 @@
<head>dadada</head>
- <body xmlns:z="http://xml.zope.org/namespaces/tal" z:define="foo python:1">
+ <body>
- <h1 z:condition="python:1" z:content="str:This
+ <h1>This
Is
The
Replaced
-Title">This
-Is
-The
-Replaced
Title</h1>
<!-- test entity references -->
@@ -23,17 +19,17 @@
<!-- examples adapted from TemplateAttributeLanguageSyntax -->
- <span z:content="str:here/id">here/id</span>
+ <span>here/id</span>
- <p z:define="x str:template/title; global five python:2+3;" z:content="text var:five">5</p>
+ <p>5</p>
- <p z:repeat="car python:['honda', 'subaru', 'acura']">
+ <p>
honda
</p>
- <p z:repeat="car python:['honda', 'subaru', 'acura']">
+ <p>
subaru
</p>
- <p z:repeat="car python:['honda', 'subaru', 'acura']">
+ <p>
acura
</p>
@@ -42,31 +38,31 @@
<!-- more examples -->
<ul>
- <span z:repeat="car python:['honda', 'subaru', 'acura']">
- <li z:content="var:car">honda</li>
+ <span>
+ <li>honda</li>
</span>
- <span z:repeat="car python:['honda', 'subaru', 'acura']">
- <li z:content="var:car">subaru</li>
+ <span>
+ <li>subaru</li>
</span>
- <span z:repeat="car python:['honda', 'subaru', 'acura']">
- <li z:content="var:car">acura</li>
+ <span>
+ <li>acura</li>
</span>
</ul>
<!-- test attribute expansion -->
- <a href="http://python.org" z:attributes="href python:'http://python.org' ">python</a>
- <a z:attributes="href python:'http://python.org' " href="http://python.org">python</a>
+ <a href="http://python.org">python</a>
+ <a href="http://python.org">python</a>
<!-- test insert/replace structure -->
- <span z:content="structure python:None"></span>
+ <span></span>
- <span z:define="global x str:<h3>Header Level 3</h3>"/>
- <span z:define="global x python:'&' + 'nbsp;;' + x"/>
+ <span/>
+ <span/>
<h3>Header Level 3</h3>
- <span z:content="structure x"> <h3>Header Level 3</h3></span>
+ <span> <h3>Header Level 3</h3></span>
</body>
--- Updated File test01.xml in package Packages/TAL --
--- test01.xml 2001/03/27 16:39:00 1.1
+++ test01.xml 2001/04/07 19:26:08 1.2
@@ -6,26 +6,26 @@
<head>dadada</head>
- <body xmlns:z="http://xml.zope.org/namespaces/tal" z:define="foo python:1">
+ <body>
- <h1 z:condition="python:1" z:content="str:This Is The Replaced Title">This Is The Replaced Title</h1>
+ <h1>This Is The Replaced Title</h1>
<!-- test entity references -->
&HarryPotter;
<!-- examples adapted from TemplateAttributeLanguageSyntax -->
- <span z:content="str:here/id">here/id</span>
+ <span>here/id</span>
- <p z:define="x str:template/title; global five python:2+3;" z:content="text var:five">5</p>
+ <p>5</p>
- <p z:repeat="car python:['honda', 'subaru', 'acura']">
+ <p>
honda
</p>
- <p z:repeat="car python:['honda', 'subaru', 'acura']">
+ <p>
subaru
</p>
- <p z:repeat="car python:['honda', 'subaru', 'acura']">
+ <p>
acura
</p>
@@ -34,31 +34,31 @@
<!-- more examples -->
<ul>
- <span z:repeat="car python:['honda', 'subaru', 'acura']">
- <li z:content="var:car">honda</li>
+ <span>
+ <li>honda</li>
</span>
- <span z:repeat="car python:['honda', 'subaru', 'acura']">
- <li z:content="var:car">subaru</li>
+ <span>
+ <li>subaru</li>
</span>
- <span z:repeat="car python:['honda', 'subaru', 'acura']">
- <li z:content="var:car">acura</li>
+ <span>
+ <li>acura</li>
</span>
</ul>
<!-- test attribute expansion -->
- <a href="http://python.org" z:attributes="href python:'http://python.org' ">python</a>
- <a z:attributes="href python:'http://python.org' " href="http://python.org">python</a>
+ <a href="http://python.org">python</a>
+ <a href="http://python.org">python</a>
<!-- test insert/replace structure -->
- <span z:content="structure python:None"></span>
+ <span></span>
- <span z:define="global x str:<h3>Header Level 3</h3>"/>
- <span z:define="global x python:'&' + 'nbsp;;' + x"/>
+ <span/>
+ <span/>
<h3>Header Level 3</h3>
- <span z:content="structure x"> <h3>Header Level 3</h3></span>
+ <span> <h3>Header Level 3</h3></span>
</body>
--- Updated File test03.html in package Packages/TAL --
--- test03.html 2001/03/27 16:39:00 1.1
+++ test03.html 2001/04/07 19:26:08 1.2
@@ -1,10 +1,10 @@
<?xml version="1.0" ?>
-<p xmlns:z="http://xml.zope.org/namespaces/tal">
- <span z:define="local x str:hello brave new world">
- <span z:content="text local:x">hello brave new world</span>
- <span z:define="local x str:goodbye cruel world">
- <span z:content="text local:x">goodbye cruel world</span>
+<p>
+ <span>
+ <span>hello brave new world</span>
+ <span>
+ <span>goodbye cruel world</span>
</span>
- <span z:content="text local:x">hello brave new world</span>
+ <span>hello brave new world</span>
</span>
</p>
--- Updated File test03.xml in package Packages/TAL --
--- test03.xml 2001/03/27 16:39:00 1.1
+++ test03.xml 2001/04/07 19:26:08 1.2
@@ -1,10 +1,10 @@
<?xml version="1.0" ?>
-<p xmlns:z="http://xml.zope.org/namespaces/tal">
- <span z:define="local x str:hello brave new world">
- <span z:content="text local:x">hello brave new world</span>
- <span z:define="local x str:goodbye cruel world">
- <span z:content="text local:x">goodbye cruel world</span>
+<p>
+ <span>
+ <span>hello brave new world</span>
+ <span>
+ <span>goodbye cruel world</span>
</span>
- <span z:content="text local:x">hello brave new world</span>
+ <span>hello brave new world</span>
</span>
</p>
--- Updated File test04.html in package Packages/TAL --
--- test04.html 2001/03/27 16:39:00 1.1
+++ test04.html 2001/04/07 19:26:08 1.2
@@ -1,40 +1,40 @@
<?xml version="1.0" ?>
<html>
- <body xmlns:m="http://xml.zope.org/namespaces/metal" xmlns:z="http://xml.zope.org/namespaces/tal" m:define-macro="body" z:define="global count python:0">
+ <body>
- <ul m:define-macro="whoops">
+ <ul>
</ul>
- <span z:define="global count python:2; global message str:hello world"/>
+ <span/>
- <ul m:use-macro="whoops">
- <li z:repeat="item python:range(count)">
+ <ul>
+ <li>
0
hello world
</li>
- <li z:repeat="item python:range(count)">
+ <li>
1
hello world
</li>
</ul>
- <span z:define="global message str:goodbye cruel world"/>
+ <span/>
- <ul m:use-macro="whoops">
- <li z:repeat="item python:range(count)">
+ <ul>
+ <li>
0
goodbye cruel world
</li>
- <li z:repeat="item python:range(count)">
+ <li>
1
goodbye cruel world
</li>
</ul>
- <p m:define-slot="whoops">define-slot</p>
+ <p>define-slot</p>
- <p m:fill-slot="whoops">fill-slot</p>
+ <p>fill-slot</p>
</body>
--- Updated File test04.xml in package Packages/TAL --
--- test04.xml 2001/03/27 16:39:00 1.1
+++ test04.xml 2001/04/07 19:26:08 1.2
@@ -1,40 +1,40 @@
<?xml version="1.0" ?>
<html>
- <body xmlns:m="http://xml.zope.org/namespaces/metal" xmlns:z="http://xml.zope.org/namespaces/tal" m:define-macro="body" z:define="global count python:0">
+ <body>
- <ul m:define-macro="whoops">
+ <ul>
</ul>
- <span z:define="global count python:2; global message str:hello world"/>
+ <span/>
- <ul m:use-macro="whoops">
- <li z:repeat="item python:range(count)">
+ <ul>
+ <li>
0
hello world
</li>
- <li z:repeat="item python:range(count)">
+ <li>
1
hello world
</li>
</ul>
- <span z:define="global message str:goodbye cruel world"/>
+ <span/>
- <ul m:use-macro="whoops">
- <li z:repeat="item python:range(count)">
+ <ul>
+ <li>
0
goodbye cruel world
</li>
- <li z:repeat="item python:range(count)">
+ <li>
1
goodbye cruel world
</li>
</ul>
- <p m:define-slot="whoops">define-slot</p>
+ <p>define-slot</p>
- <p m:fill-slot="whoops">fill-slot</p>
+ <p>fill-slot</p>
</body>
--- Updated File test05.html in package Packages/TAL --
--- test05.html 2001/03/27 16:39:00 1.1
+++ test05.html 2001/04/07 19:26:08 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<html>
- <body xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="body">
+ <body>
<h1>This is the body of test5</h1>
--- Updated File test05.xml in package Packages/TAL --
--- test05.xml 2001/03/27 16:39:00 1.1
+++ test05.xml 2001/04/07 19:26:08 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<html>
- <body xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="body">
+ <body>
<h1>This is the body of test5</h1>
--- Updated File test06.html in package Packages/TAL --
--- test06.html 2001/03/27 16:42:36 1.2
+++ test06.html 2001/04/07 19:26:08 1.3
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<html>
- <body xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test05.xml/body">
+ <body>
<h1>This is the body of test5</h1>
--- Updated File test06.xml in package Packages/TAL --
--- test06.xml 2001/03/27 16:42:36 1.2
+++ test06.xml 2001/04/07 19:26:08 1.3
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<html>
- <body xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test05.xml/body">
+ <body>
<h1>This is the body of test5</h1>
--- Updated File test07.html in package Packages/TAL --
--- test07.html 2001/03/27 16:39:00 1.1
+++ test07.html 2001/04/07 19:26:08 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<table xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="myTable">
+<table>
<!-- macro definition with slots -->
<tr>
<td>Top Left</td>
@@ -7,6 +7,6 @@
</tr>
<tr>
<td>Bottom left</td>
- <td><span m:define-slot="bottomRight">Bottom Right</span></td>
+ <td><span>Bottom Right</span></td>
</tr>
</table>
--- Updated File test07.xml in package Packages/TAL --
--- test07.xml 2001/03/27 16:39:00 1.1
+++ test07.xml 2001/04/07 19:26:08 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<table xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="myTable">
+<table>
<!-- macro definition with slots -->
<tr>
<td>Top Left</td>
@@ -7,6 +7,6 @@
</tr>
<tr>
<td>Bottom left</td>
- <td><span m:define-slot="bottomRight">Bottom Right</span></td>
+ <td><span>Bottom Right</span></td>
</tr>
</table>
--- Updated File test08.html in package Packages/TAL --
--- test08.html 2001/03/27 16:42:36 1.2
+++ test08.html 2001/04/07 19:26:08 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test07.xml/myTable">
+<table>
<!-- macro definition with slots -->
<tr>
<td>Top Left</td>
@@ -7,7 +7,7 @@
</tr>
<tr>
<td>Bottom left</td>
- <td><span m:fill-slot="bottomRight">
+ <td><span>
<h1>Some headline</h1>
<p>This is the real contents of the bottom right slot.</p>
<p>It is supposed to contain a lot of text. Blah, blah, blab.
--- Updated File test08.xml in package Packages/TAL --
--- test08.xml 2001/03/27 16:42:36 1.2
+++ test08.xml 2001/04/07 19:26:08 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test07.xml/myTable">
+<table>
<!-- macro definition with slots -->
<tr>
<td>Top Left</td>
@@ -7,7 +7,7 @@
</tr>
<tr>
<td>Bottom left</td>
- <td><span m:fill-slot="bottomRight">
+ <td><span>
<h1>Some headline</h1>
<p>This is the real contents of the bottom right slot.</p>
<p>It is supposed to contain a lot of text. Blah, blah, blab.
--- Updated File test10.html in package Packages/TAL --
--- test10.html 2001/03/27 17:18:36 1.2
+++ test10.html 2001/04/07 19:26:08 1.3
@@ -1,5 +1,5 @@
<html><body>
-<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test07.xml/myTable">
+<table>
<!-- macro definition with slots -->
<tr>
<td>Top Left</td>
@@ -7,7 +7,7 @@
</tr>
<tr>
<td>Bottom left</td>
- <td><span m:fill-slot="bottomRight">
+ <td><span>
<h1>Some headline</h1>
<p>This is the real contents of the bottom right slot.</p>
<hr>
--- Updated File test11.html in package Packages/TAL --
--- test11.html 2001/03/27 16:33:31 1.1
+++ test11.html 2001/04/07 19:26:08 1.2
@@ -1,5 +1,5 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal">
+<html>
<a href="http://www.python.org">bar</a>
- <p tal:define="x python:1" tal:on-error="string:bad boy!">bad boy!</p>
- <p tal:on-error="string:x undefined">x undefined</p>
+ <p>bad boy!</p>
+ <p>x undefined</p>
</html>
--- Updated File test11.xml in package Packages/TAL --
--- test11.xml 2001/03/27 16:33:31 1.1
+++ test11.xml 2001/04/07 19:26:08 1.2
@@ -1,5 +1,5 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal">
+<html>
<a href="http://www.python.org">bar</a>
- <p tal:define="x python:1" tal:on-error="string:bad boy!">bad boy!</p>
- <p tal:on-error="string:x undefined">x undefined</p>
+ <p>bad boy!</p>
+ <p>x undefined</p>
</html>
--- Updated File test12.html in package Packages/TAL --
--- test12.html 2001/04/06 21:38:24 1.1
+++ test12.html 2001/04/07 19:26:08 1.2
@@ -1,24 +1,24 @@
-<span tal:define="global true python:1; global false python:0"/>
+<span/>
<img ismap>
<img ismap="ismap">
<img ismap="ismap">
<img ismap="foo">
-<img ismap tal:attributes="ismap true">
-<img tal:attributes="ismap false">
-<img tal:attributes="ismap nothing">
-
-<img ismap tal:attributes="ismap true">
-<img tal:attributes="ismap false">
-<img tal:attributes="ismap nothing">
-
-<img tal:attributes="ismap true" ismap>
-<img tal:attributes="ismap false">
-<img tal:attributes="ismap nothing">
+<img ismap>
+<img>
+<img>
+
+<img ismap>
+<img>
+<img>
+
+<img ismap>
+<img>
+<img>
-<span tal:define="global x string:x.gif"/>
+<span/>
<img src="foo">
-<img src="x.gif" tal:attributes="src x">
-<img src tal:attributes="src nothing">
+<img src="x.gif">
+<img>