Commit 0f20a2ce authored by Guido van Rossum's avatar Guido van Rossum

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">.
parent 257571b0
...@@ -6,13 +6,9 @@ ...@@ -6,13 +6,9 @@
<head>dadada</head> <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 Is
The The
Replaced Replaced
...@@ -23,17 +19,17 @@ Title</h1> ...@@ -23,17 +19,17 @@ Title</h1>
<!-- examples adapted from TemplateAttributeLanguageSyntax --> <!-- 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 honda
</p> </p>
<p z:repeat="car python:['honda', 'subaru', 'acura']"> <p>
subaru subaru
</p> </p>
<p z:repeat="car python:['honda', 'subaru', 'acura']"> <p>
acura acura
</p> </p>
...@@ -42,31 +38,31 @@ Title</h1> ...@@ -42,31 +38,31 @@ Title</h1>
<!-- more examples --> <!-- more examples -->
<ul> <ul>
<span z:repeat="car python:['honda', 'subaru', 'acura']"> <span>
<li z:content="var:car">honda</li> <li>honda</li>
</span> </span>
<span z:repeat="car python:['honda', 'subaru', 'acura']"> <span>
<li z:content="var:car">subaru</li> <li>subaru</li>
</span> </span>
<span z:repeat="car python:['honda', 'subaru', 'acura']"> <span>
<li z:content="var:car">acura</li> <li>acura</li>
</span> </span>
</ul> </ul>
<!-- test attribute expansion --> <!-- test attribute expansion -->
<a href="http://python.org" z:attributes="href python:'http://python.org' ">python</a> <a href="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>
<!-- test insert/replace structure --> <!-- test insert/replace structure -->
<span z:content="structure python:None"></span> <span></span>
<span z:define="global x str:&lt;h3&gt;Header Level 3&lt;/h3&gt;"/> <span/>
<span z:define="global x python:'&amp;' + 'nbsp;;' + x"/> <span/>
&nbsp;<h3>Header Level 3</h3> &nbsp;<h3>Header Level 3</h3>
<span z:content="structure x">&nbsp;<h3>Header Level 3</h3></span> <span>&nbsp;<h3>Header Level 3</h3></span>
</body> </body>
......
...@@ -6,26 +6,26 @@ ...@@ -6,26 +6,26 @@
<head>dadada</head> <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 --> <!-- test entity references -->
&nbsp;&HarryPotter; &nbsp;&HarryPotter;
<!-- examples adapted from TemplateAttributeLanguageSyntax --> <!-- 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 honda
</p> </p>
<p z:repeat="car python:['honda', 'subaru', 'acura']"> <p>
subaru subaru
</p> </p>
<p z:repeat="car python:['honda', 'subaru', 'acura']"> <p>
acura acura
</p> </p>
...@@ -34,31 +34,31 @@ ...@@ -34,31 +34,31 @@
<!-- more examples --> <!-- more examples -->
<ul> <ul>
<span z:repeat="car python:['honda', 'subaru', 'acura']"> <span>
<li z:content="var:car">honda</li> <li>honda</li>
</span> </span>
<span z:repeat="car python:['honda', 'subaru', 'acura']"> <span>
<li z:content="var:car">subaru</li> <li>subaru</li>
</span> </span>
<span z:repeat="car python:['honda', 'subaru', 'acura']"> <span>
<li z:content="var:car">acura</li> <li>acura</li>
</span> </span>
</ul> </ul>
<!-- test attribute expansion --> <!-- test attribute expansion -->
<a href="http://python.org" z:attributes="href python:'http://python.org' ">python</a> <a href="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>
<!-- test insert/replace structure --> <!-- test insert/replace structure -->
<span z:content="structure python:None"></span> <span></span>
<span z:define="global x str:&lt;h3&gt;Header Level 3&lt;/h3&gt;"/> <span/>
<span z:define="global x python:'&amp;' + 'nbsp;;' + x"/> <span/>
&nbsp;<h3>Header Level 3</h3> &nbsp;<h3>Header Level 3</h3>
<span z:content="structure x">&nbsp;<h3>Header Level 3</h3></span> <span>&nbsp;<h3>Header Level 3</h3></span>
</body> </body>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<p xmlns:z="http://xml.zope.org/namespaces/tal"> <p>
<span z:define="local x str:hello brave new world"> <span>
<span z:content="text local:x">hello brave new world</span> <span>hello brave new world</span>
<span z:define="local x str:goodbye cruel world"> <span>
<span z:content="text local:x">goodbye cruel world</span> <span>goodbye cruel world</span>
</span> </span>
<span z:content="text local:x">hello brave new world</span> <span>hello brave new world</span>
</span> </span>
</p> </p>
<?xml version="1.0" ?> <?xml version="1.0" ?>
<p xmlns:z="http://xml.zope.org/namespaces/tal"> <p>
<span z:define="local x str:hello brave new world"> <span>
<span z:content="text local:x">hello brave new world</span> <span>hello brave new world</span>
<span z:define="local x str:goodbye cruel world"> <span>
<span z:content="text local:x">goodbye cruel world</span> <span>goodbye cruel world</span>
</span> </span>
<span z:content="text local:x">hello brave new world</span> <span>hello brave new world</span>
</span> </span>
</p> </p>
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <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> </ul>
<span z:define="global count python:2; global message str:hello world"/> <span/>
<ul m:use-macro="whoops"> <ul>
<li z:repeat="item python:range(count)"> <li>
0 0
hello world hello world
</li> </li>
<li z:repeat="item python:range(count)"> <li>
1 1
hello world hello world
</li> </li>
</ul> </ul>
<span z:define="global message str:goodbye cruel world"/> <span/>
<ul m:use-macro="whoops"> <ul>
<li z:repeat="item python:range(count)"> <li>
0 0
goodbye cruel world goodbye cruel world
</li> </li>
<li z:repeat="item python:range(count)"> <li>
1 1
goodbye cruel world goodbye cruel world
</li> </li>
</ul> </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> </body>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <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> </ul>
<span z:define="global count python:2; global message str:hello world"/> <span/>
<ul m:use-macro="whoops"> <ul>
<li z:repeat="item python:range(count)"> <li>
0 0
hello world hello world
</li> </li>
<li z:repeat="item python:range(count)"> <li>
1 1
hello world hello world
</li> </li>
</ul> </ul>
<span z:define="global message str:goodbye cruel world"/> <span/>
<ul m:use-macro="whoops"> <ul>
<li z:repeat="item python:range(count)"> <li>
0 0
goodbye cruel world goodbye cruel world
</li> </li>
<li z:repeat="item python:range(count)"> <li>
1 1
goodbye cruel world goodbye cruel world
</li> </li>
</ul> </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> </body>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <html>
<body xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="body"> <body>
<h1>This is the body of test5</h1> <h1>This is the body of test5</h1>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <html>
<body xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="body"> <body>
<h1>This is the body of test5</h1> <h1>This is the body of test5</h1>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <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> <h1>This is the body of test5</h1>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <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> <h1>This is the body of test5</h1>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<table xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="myTable"> <table>
<!-- macro definition with slots --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
</tr> </tr>
<tr> <tr>
<td>Bottom left</td> <td>Bottom left</td>
<td><span m:define-slot="bottomRight">Bottom Right</span></td> <td><span>Bottom Right</span></td>
</tr> </tr>
</table> </table>
<?xml version="1.0" ?> <?xml version="1.0" ?>
<table xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="myTable"> <table>
<!-- macro definition with slots --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
</tr> </tr>
<tr> <tr>
<td>Bottom left</td> <td>Bottom left</td>
<td><span m:define-slot="bottomRight">Bottom Right</span></td> <td><span>Bottom Right</span></td>
</tr> </tr>
</table> </table>
<?xml version="1.0" ?> <?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 --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</tr> </tr>
<tr> <tr>
<td>Bottom left</td> <td>Bottom left</td>
<td><span m:fill-slot="bottomRight"> <td><span>
<h1>Some headline</h1> <h1>Some headline</h1>
<p>This is the real contents of the bottom right slot.</p> <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. <p>It is supposed to contain a lot of text. Blah, blah, blab.
......
<?xml version="1.0" ?> <?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 --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</tr> </tr>
<tr> <tr>
<td>Bottom left</td> <td>Bottom left</td>
<td><span m:fill-slot="bottomRight"> <td><span>
<h1>Some headline</h1> <h1>Some headline</h1>
<p>This is the real contents of the bottom right slot.</p> <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. <p>It is supposed to contain a lot of text. Blah, blah, blab.
......
<html><body> <html><body>
<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test07.xml/myTable"> <table>
<!-- macro definition with slots --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</tr> </tr>
<tr> <tr>
<td>Bottom left</td> <td>Bottom left</td>
<td><span m:fill-slot="bottomRight"> <td><span>
<h1>Some headline</h1> <h1>Some headline</h1>
<p>This is the real contents of the bottom right slot.</p> <p>This is the real contents of the bottom right slot.</p>
<hr> <hr>
......
<html xmlns:tal="http://xml.zope.org/namespaces/tal"> <html>
<a href="http://www.python.org">bar</a> <a href="http://www.python.org">bar</a>
<p tal:define="x python:1" tal:on-error="string:bad boy!">bad boy!</p> <p>bad boy!</p>
<p tal:on-error="string:x undefined">x undefined</p> <p>x undefined</p>
</html> </html>
<html xmlns:tal="http://xml.zope.org/namespaces/tal"> <html>
<a href="http://www.python.org">bar</a> <a href="http://www.python.org">bar</a>
<p tal:define="x python:1" tal:on-error="string:bad boy!">bad boy!</p> <p>bad boy!</p>
<p tal:on-error="string:x undefined">x undefined</p> <p>x undefined</p>
</html> </html>
<span tal:define="global true python:1; global false python:0"/> <span/>
<img ismap> <img ismap>
<img ismap="ismap"> <img ismap="ismap">
<img ismap="ismap"> <img ismap="ismap">
<img ismap="foo"> <img ismap="foo">
<img ismap tal:attributes="ismap true"> <img ismap>
<img tal:attributes="ismap false"> <img>
<img tal:attributes="ismap nothing"> <img>
<img ismap tal:attributes="ismap true"> <img ismap>
<img tal:attributes="ismap false"> <img>
<img tal:attributes="ismap nothing"> <img>
<img tal:attributes="ismap true" ismap> <img ismap>
<img tal:attributes="ismap false"> <img>
<img tal:attributes="ismap nothing"> <img>
<span tal:define="global x string:x.gif"/> <span/>
<img src="foo"> <img src="foo">
<img src="x.gif" tal:attributes="src x"> <img src="x.gif">
<img src tal:attributes="src nothing"> <img>
...@@ -6,13 +6,9 @@ ...@@ -6,13 +6,9 @@
<head>dadada</head> <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 Is
The The
Replaced Replaced
...@@ -23,17 +19,17 @@ Title</h1> ...@@ -23,17 +19,17 @@ Title</h1>
<!-- examples adapted from TemplateAttributeLanguageSyntax --> <!-- 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 honda
</p> </p>
<p z:repeat="car python:['honda', 'subaru', 'acura']"> <p>
subaru subaru
</p> </p>
<p z:repeat="car python:['honda', 'subaru', 'acura']"> <p>
acura acura
</p> </p>
...@@ -42,31 +38,31 @@ Title</h1> ...@@ -42,31 +38,31 @@ Title</h1>
<!-- more examples --> <!-- more examples -->
<ul> <ul>
<span z:repeat="car python:['honda', 'subaru', 'acura']"> <span>
<li z:content="var:car">honda</li> <li>honda</li>
</span> </span>
<span z:repeat="car python:['honda', 'subaru', 'acura']"> <span>
<li z:content="var:car">subaru</li> <li>subaru</li>
</span> </span>
<span z:repeat="car python:['honda', 'subaru', 'acura']"> <span>
<li z:content="var:car">acura</li> <li>acura</li>
</span> </span>
</ul> </ul>
<!-- test attribute expansion --> <!-- test attribute expansion -->
<a href="http://python.org" z:attributes="href python:'http://python.org' ">python</a> <a href="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>
<!-- test insert/replace structure --> <!-- test insert/replace structure -->
<span z:content="structure python:None"></span> <span></span>
<span z:define="global x str:&lt;h3&gt;Header Level 3&lt;/h3&gt;"/> <span/>
<span z:define="global x python:'&amp;' + 'nbsp;;' + x"/> <span/>
&nbsp;<h3>Header Level 3</h3> &nbsp;<h3>Header Level 3</h3>
<span z:content="structure x">&nbsp;<h3>Header Level 3</h3></span> <span>&nbsp;<h3>Header Level 3</h3></span>
</body> </body>
......
...@@ -6,26 +6,26 @@ ...@@ -6,26 +6,26 @@
<head>dadada</head> <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 --> <!-- test entity references -->
&nbsp;&HarryPotter; &nbsp;&HarryPotter;
<!-- examples adapted from TemplateAttributeLanguageSyntax --> <!-- 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 honda
</p> </p>
<p z:repeat="car python:['honda', 'subaru', 'acura']"> <p>
subaru subaru
</p> </p>
<p z:repeat="car python:['honda', 'subaru', 'acura']"> <p>
acura acura
</p> </p>
...@@ -34,31 +34,31 @@ ...@@ -34,31 +34,31 @@
<!-- more examples --> <!-- more examples -->
<ul> <ul>
<span z:repeat="car python:['honda', 'subaru', 'acura']"> <span>
<li z:content="var:car">honda</li> <li>honda</li>
</span> </span>
<span z:repeat="car python:['honda', 'subaru', 'acura']"> <span>
<li z:content="var:car">subaru</li> <li>subaru</li>
</span> </span>
<span z:repeat="car python:['honda', 'subaru', 'acura']"> <span>
<li z:content="var:car">acura</li> <li>acura</li>
</span> </span>
</ul> </ul>
<!-- test attribute expansion --> <!-- test attribute expansion -->
<a href="http://python.org" z:attributes="href python:'http://python.org' ">python</a> <a href="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>
<!-- test insert/replace structure --> <!-- test insert/replace structure -->
<span z:content="structure python:None"></span> <span></span>
<span z:define="global x str:&lt;h3&gt;Header Level 3&lt;/h3&gt;"/> <span/>
<span z:define="global x python:'&amp;' + 'nbsp;;' + x"/> <span/>
&nbsp;<h3>Header Level 3</h3> &nbsp;<h3>Header Level 3</h3>
<span z:content="structure x">&nbsp;<h3>Header Level 3</h3></span> <span>&nbsp;<h3>Header Level 3</h3></span>
</body> </body>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<p xmlns:z="http://xml.zope.org/namespaces/tal"> <p>
<span z:define="local x str:hello brave new world"> <span>
<span z:content="text local:x">hello brave new world</span> <span>hello brave new world</span>
<span z:define="local x str:goodbye cruel world"> <span>
<span z:content="text local:x">goodbye cruel world</span> <span>goodbye cruel world</span>
</span> </span>
<span z:content="text local:x">hello brave new world</span> <span>hello brave new world</span>
</span> </span>
</p> </p>
<?xml version="1.0" ?> <?xml version="1.0" ?>
<p xmlns:z="http://xml.zope.org/namespaces/tal"> <p>
<span z:define="local x str:hello brave new world"> <span>
<span z:content="text local:x">hello brave new world</span> <span>hello brave new world</span>
<span z:define="local x str:goodbye cruel world"> <span>
<span z:content="text local:x">goodbye cruel world</span> <span>goodbye cruel world</span>
</span> </span>
<span z:content="text local:x">hello brave new world</span> <span>hello brave new world</span>
</span> </span>
</p> </p>
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <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> </ul>
<span z:define="global count python:2; global message str:hello world"/> <span/>
<ul m:use-macro="whoops"> <ul>
<li z:repeat="item python:range(count)"> <li>
0 0
hello world hello world
</li> </li>
<li z:repeat="item python:range(count)"> <li>
1 1
hello world hello world
</li> </li>
</ul> </ul>
<span z:define="global message str:goodbye cruel world"/> <span/>
<ul m:use-macro="whoops"> <ul>
<li z:repeat="item python:range(count)"> <li>
0 0
goodbye cruel world goodbye cruel world
</li> </li>
<li z:repeat="item python:range(count)"> <li>
1 1
goodbye cruel world goodbye cruel world
</li> </li>
</ul> </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> </body>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <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> </ul>
<span z:define="global count python:2; global message str:hello world"/> <span/>
<ul m:use-macro="whoops"> <ul>
<li z:repeat="item python:range(count)"> <li>
0 0
hello world hello world
</li> </li>
<li z:repeat="item python:range(count)"> <li>
1 1
hello world hello world
</li> </li>
</ul> </ul>
<span z:define="global message str:goodbye cruel world"/> <span/>
<ul m:use-macro="whoops"> <ul>
<li z:repeat="item python:range(count)"> <li>
0 0
goodbye cruel world goodbye cruel world
</li> </li>
<li z:repeat="item python:range(count)"> <li>
1 1
goodbye cruel world goodbye cruel world
</li> </li>
</ul> </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> </body>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <html>
<body xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="body"> <body>
<h1>This is the body of test5</h1> <h1>This is the body of test5</h1>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <html>
<body xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="body"> <body>
<h1>This is the body of test5</h1> <h1>This is the body of test5</h1>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <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> <h1>This is the body of test5</h1>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<html> <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> <h1>This is the body of test5</h1>
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<table xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="myTable"> <table>
<!-- macro definition with slots --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
</tr> </tr>
<tr> <tr>
<td>Bottom left</td> <td>Bottom left</td>
<td><span m:define-slot="bottomRight">Bottom Right</span></td> <td><span>Bottom Right</span></td>
</tr> </tr>
</table> </table>
<?xml version="1.0" ?> <?xml version="1.0" ?>
<table xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="myTable"> <table>
<!-- macro definition with slots --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
</tr> </tr>
<tr> <tr>
<td>Bottom left</td> <td>Bottom left</td>
<td><span m:define-slot="bottomRight">Bottom Right</span></td> <td><span>Bottom Right</span></td>
</tr> </tr>
</table> </table>
<?xml version="1.0" ?> <?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 --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</tr> </tr>
<tr> <tr>
<td>Bottom left</td> <td>Bottom left</td>
<td><span m:fill-slot="bottomRight"> <td><span>
<h1>Some headline</h1> <h1>Some headline</h1>
<p>This is the real contents of the bottom right slot.</p> <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. <p>It is supposed to contain a lot of text. Blah, blah, blab.
......
<?xml version="1.0" ?> <?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 --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</tr> </tr>
<tr> <tr>
<td>Bottom left</td> <td>Bottom left</td>
<td><span m:fill-slot="bottomRight"> <td><span>
<h1>Some headline</h1> <h1>Some headline</h1>
<p>This is the real contents of the bottom right slot.</p> <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. <p>It is supposed to contain a lot of text. Blah, blah, blab.
......
<html><body> <html><body>
<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="test/input/test07.xml/myTable"> <table>
<!-- macro definition with slots --> <!-- macro definition with slots -->
<tr> <tr>
<td>Top Left</td> <td>Top Left</td>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</tr> </tr>
<tr> <tr>
<td>Bottom left</td> <td>Bottom left</td>
<td><span m:fill-slot="bottomRight"> <td><span>
<h1>Some headline</h1> <h1>Some headline</h1>
<p>This is the real contents of the bottom right slot.</p> <p>This is the real contents of the bottom right slot.</p>
<hr> <hr>
......
<html xmlns:tal="http://xml.zope.org/namespaces/tal"> <html>
<a href="http://www.python.org">bar</a> <a href="http://www.python.org">bar</a>
<p tal:define="x python:1" tal:on-error="string:bad boy!">bad boy!</p> <p>bad boy!</p>
<p tal:on-error="string:x undefined">x undefined</p> <p>x undefined</p>
</html> </html>
<html xmlns:tal="http://xml.zope.org/namespaces/tal"> <html>
<a href="http://www.python.org">bar</a> <a href="http://www.python.org">bar</a>
<p tal:define="x python:1" tal:on-error="string:bad boy!">bad boy!</p> <p>bad boy!</p>
<p tal:on-error="string:x undefined">x undefined</p> <p>x undefined</p>
</html> </html>
<span tal:define="global true python:1; global false python:0"/> <span/>
<img ismap> <img ismap>
<img ismap="ismap"> <img ismap="ismap">
<img ismap="ismap"> <img ismap="ismap">
<img ismap="foo"> <img ismap="foo">
<img ismap tal:attributes="ismap true"> <img ismap>
<img tal:attributes="ismap false"> <img>
<img tal:attributes="ismap nothing"> <img>
<img ismap tal:attributes="ismap true"> <img ismap>
<img tal:attributes="ismap false"> <img>
<img tal:attributes="ismap nothing"> <img>
<img tal:attributes="ismap true" ismap> <img ismap>
<img tal:attributes="ismap false"> <img>
<img tal:attributes="ismap nothing"> <img>
<span tal:define="global x string:x.gif"/> <span/>
<img src="foo"> <img src="foo">
<img src="x.gif" tal:attributes="src x"> <img src="x.gif">
<img src tal:attributes="src nothing"> <img>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment