[Zope3-checkins] CVS: Zope3/src/zope/tal/tests/input - __init__.py:1.2 test01.html:1.2 test01.xml:1.2 test02.html:1.2 test02.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.2 test06.xml:1.2 test07.html:1.2 test07.xml:1.2 test08.html:1.2 test08.xml:1.2 test09.html:1.2 test09.xml:1.2 test10.html:1.2 test11.html:1.2 test11.xml:1.2 test12.html:1.2 test13.html:1.2 test14.html:1.2 test14.xml:1.2 test15.html:1.2 test16.html:1.2 test16.xml:1.2 test17.html:1.2 test17.xml:1.2 test18.html:1.2 test18.xml:1.2 test19.html:1.2 test20.html:1.2 test21.html:1.2 test22.html:1.2 test23.html:1.2 test24.html:1.2 test25.html:1.2 test26.html:1.2 test27.html:1.2 test28.html:1.2 test29.html:1.2 test30.html:1.2 test31.html:1.2 test32.html:1.2 test_metal1.html:1.2 test_metal2.html:1.2 test_metal3.html:1.2
Jim Fulton
jim@zope.com
Wed, 25 Dec 2002 09:16:06 -0500
Update of /cvs-repository/Zope3/src/zope/tal/tests/input
In directory cvs.zope.org:/tmp/cvs-serv20790/src/zope/tal/tests/input
Added Files:
__init__.py test01.html test01.xml test02.html test02.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 test09.html test09.xml test10.html
test11.html test11.xml test12.html test13.html test14.html
test14.xml test15.html test16.html test16.xml test17.html
test17.xml test18.html test18.xml test19.html test20.html
test21.html test22.html test23.html test24.html test25.html
test26.html test27.html test28.html test29.html test30.html
test31.html test32.html test_metal1.html test_metal2.html
test_metal3.html
Log Message:
Grand renaming:
- Renamed most files (especially python modules) to lower case.
- Moved views and interfaces into separate hierarchies within each
project, where each top-level directory under the zope package
is a separate project.
- Moved everything to src from lib/python.
lib/python will eventually go away. I need access to the cvs
repository to make this happen, however.
There are probably some bits that are broken. All tests pass
and zope runs, but I haven't tried everything. There are a number
of cleanups I'll work on tomorrow.
=== Zope3/src/zope/tal/tests/input/__init__.py 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:03 2002
+++ Zope3/src/zope/tal/tests/input/__init__.py Wed Dec 25 09:15:31 2002
@@ -0,0 +1,2 @@
+#
+# This file is necessary to make this directory a package.
=== Zope3/src/zope/tal/tests/input/test01.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:03 2002
+++ Zope3/src/zope/tal/tests/input/test01.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,56 @@
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "DTD/xhtml1-transitional.dtd">
+<html>
+
+ <head>dadada</head>
+
+ <body xmlns:z="http://xml.zope.org/namespaces/tal" z:define="foo python:1">
+<h1 z:condition="python:0">This title is not displayed</h1>
+ <h1 z:condition="python:1" z:content="str:This
+Is
+The
+Replaced
+Title">Title</h1>
+
+ <!-- test entity references -->
+ &HarryPotter;
+
+ <!-- examples adapted from TemplateAttributeLanguageSyntax -->
+
+ <span z:content="str:here/id"/>
+
+ <p z:define="x str:template/title; global five python:2+3;" z:content="text var:five"/>
+
+ <p z:repeat="car python:['honda', 'subaru', 'acura']">
+ <span z:replace="var:car"/>
+ </p>
+
+ <p xml:foo="bar">foo bar</p>
+
+ <!-- more examples -->
+
+ <ul>
+ <span z:repeat="car python:['honda', 'subaru', 'acura']">
+ <li z:content="var:car">Car Name</li>
+ </span>
+ </ul>
+
+ <!-- test attribute expansion -->
+
+ <a href="foo" z:attributes="href python:'http://python.org' ">python</a>
+ <a z:attributes="href python:'http://python.org' ">python</a>
+
+ <!-- test insert/replace structure -->
+ <span z:content="structure python:None" />
+ <span z:replace="structure python:None" />
+
+ <span z:define="global x str:<h3>Header Level 3</h3>" />
+ <span z:define="global x python:'&' + 'nbsp;;' + x" />
+
+ <span z:replace="structure x" />
+ <span z:content="structure x" />
+
+ </body>
+
+</html>
=== Zope3/src/zope/tal/tests/input/test01.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:03 2002
+++ Zope3/src/zope/tal/tests/input/test01.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +1,57 @@
+<?xml version="1.0" ?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "DTD/xhtml1-transitional.dtd">
+<html>
+
+ <head>dadada</head>
+
+ <body xmlns:z="http://xml.zope.org/namespaces/tal" z:define="foo python:1">
+<h1 z:condition="python:0">This title is not displayed</h1>
+ <h1 z:condition="python:1" z:content="str:This
+Is
+The
+Replaced
+Title">Title</h1>
+
+ <!-- test entity references -->
+ &HarryPotter;
+
+ <!-- examples adapted from TemplateAttributeLanguageSyntax -->
+
+ <span z:content="str:here/id"/>
+
+ <p z:define="x str:template/title; global five python:2+3;" z:content="text var:five"/>
+
+ <p z:repeat="car python:['honda', 'subaru', 'acura']">
+ <span z:replace="var:car"/>
+ </p>
+
+ <p xml:foo="bar">foo bar</p>
+
+ <!-- more examples -->
+
+ <ul>
+ <span z:repeat="car python:['honda', 'subaru', 'acura']">
+ <li z:content="var:car">Car Name</li>
+ </span>
+ </ul>
+
+ <!-- test attribute expansion -->
+
+ <a href="foo" z:attributes="href python:'http://python.org' ">python</a>
+ <a z:attributes="href python:'http://python.org' ">python</a>
+
+ <!-- test insert/replace structure -->
+ <span z:content="structure python:None" />
+ <span z:replace="structure python:None" />
+
+ <span z:define="global x str:<h3>Header Level 3</h3>" />
+ <span z:define="global x python:'&' + 'nbsp;;' + x" />
+
+ <span z:replace="structure x" />
+ <span z:content="structure x" />
+
+ </body>
+
+</html>
=== Zope3/src/zope/tal/tests/input/test02.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:03 2002
+++ Zope3/src/zope/tal/tests/input/test02.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,118 @@
+<biztalk_1 xmlns="urn:schemas-biztalk-org:biztalk:biztalk_1">
+
+<foo:header xmlns:foo="whomping-willow" plain="guido" quote='"' apostrophe="'" both=""'" lt="<" gt=">" amp="&" foo="">
+ <manifest>
+ <document>
+ <name>sample1</name>
+ <description>a simple invoice</description>
+ </document>
+ </manifest>
+</foo:header>
+
+<body>
+
+<!-- sample1.xml is an example of a simple invoice for a small restaurant supplies order -->
+
+<Invoice xmlns="urn:http://schemas.biztalk.org/united_rest_com/yw7sg15x.xml">
+ <Header>
+ <InvoiceNumber>01786</InvoiceNumber>
+ <InvoiceDate>2000-03-17</InvoiceDate> <!-- March 17th, 2000 -->
+ <OrderNo>55377</OrderNo>
+ <OrderDate>2000-03-15</OrderDate> <!-- March 15th, 2000 -->
+ <CustomerPO>GJ03405</CustomerPO>
+ <ShipMethod>DAVE 1</ShipMethod>
+ <ShipDate>2000-03-17</ShipDate> <!-- March 17th, 2000 -->
+ <CustomerID>K5211(34)</CustomerID>
+ <SalesPersonCode>23</SalesPersonCode>
+ <TaxID>23</TaxID>
+ </Header>
+ <InvoiceTo>
+ <Name>SHIPWRIGHT RESTAURANTS LIMITED</Name>
+ <AddressLine>125 NORTH SERVICE ROAD W</AddressLine>
+ <AddressLine>WESTLAKE ACCESS</AddressLine>
+ <City>NORTH BAY</City>
+ <PostCode>L8B1O5</PostCode>
+ <State>ONTARIO</State>
+ <Country>CANADA</Country>
+ </InvoiceTo>
+ <ShipTo>
+ <Name/>
+ <AddressLine>ATTN: PAULINE DEGRASSI</AddressLine>
+ <City/>
+ <PostCode/>
+ <State/>
+ <Country/>
+ </ShipTo>
+ <DetailLines>
+ <DetailLine>
+ <QuantityShipped>1</QuantityShipped>
+ <UnitOfMeasure>CS</UnitOfMeasure>
+ <PartNumber>DM 5309</PartNumber>
+ <PartDescription>#1013 12 OZ.MUNICH STEIN</PartDescription>
+ <UnitPrice>37.72</UnitPrice>
+ <LineTotal>37.72</LineTotal>
+ </DetailLine>
+ <DetailLine>
+ <QuantityShipped>6</QuantityShipped>
+ <UnitOfMeasure>DZ</UnitOfMeasure>
+ <PartNumber>ON 6420</PartNumber>
+ <PartDescription>PROVINCIAL DINNER FORK</PartDescription>
+ <UnitPrice>17.98</UnitPrice>
+ <LineTotal>107.88</LineTotal>
+ </DetailLine>
+ <DetailLine>
+ <QuantityShipped>72</QuantityShipped>
+ <UnitOfMeasure>EA</UnitOfMeasure>
+ <PartNumber>JR20643</PartNumber>
+ <PartDescription>PLASTIC HANDLED STEAK KNIFE</PartDescription>
+ <UnitPrice>.81</UnitPrice>
+ <LineTotal>58.32</LineTotal>
+ </DetailLine>
+ <DetailLine>
+ <QuantityShipped>6</QuantityShipped>
+ <UnitOfMeasure>DZ</UnitOfMeasure>
+ <PartNumber>ON 6410</PartNumber>
+ <PartDescription>PROVINCIAL TEASPOONS</PartDescription>
+ <UnitPrice>12.16</UnitPrice>
+ <LineTotal>72.96</LineTotal>
+ </DetailLine>
+ <DetailLine>
+ <QuantityShipped>0</QuantityShipped>
+ <UnitOfMeasure>DZ</UnitOfMeasure>
+ <PartNumber>ON 6411</PartNumber>
+ <PartDescription>PROVINCIAL RD BOWL SPOON</PartDescription>
+ <QuantityBackOrdered>6</QuantityBackOrdered>
+ <UnitPrice>17.98</UnitPrice>
+ <LineTotal>0.00</LineTotal>
+ </DetailLine>
+ <DetailLine>
+ <QuantityShipped>1</QuantityShipped>
+ <UnitOfMeasure>EA</UnitOfMeasure>
+ <PartNumber>DO 3218</PartNumber>
+ <PartDescription>34 OZ DUAL DIAL SCALE AM3218</PartDescription>
+ <UnitPrice>70.00</UnitPrice>
+ <DiscountPercentage>5.0</DiscountPercentage>
+ <LineTotal>66.50</LineTotal>
+ </DetailLine>
+ <DetailLine>
+ <QuantityShipped>1</QuantityShipped>
+ <UnitOfMeasure>CS</UnitOfMeasure>
+ <PartNumber>DM 195</PartNumber>
+ <PartDescription>20 OZ.BEER PUB GLASS</PartDescription>
+ <UnitPrice>55.90</UnitPrice>
+ <LineTotal>55.90</LineTotal>
+ </DetailLine>
+ </DetailLines>
+ <Totals>
+ <SubTotal>399.28</SubTotal>
+ <DiscountTotal>3.50</DiscountTotal>
+ <FreightTotal>23.75</FreightTotal>
+ <GSTTotal>29.61</GSTTotal>
+ <ProvTaxTotal>33.84</ProvTaxTotal>
+ <OtherTotal>33.84</OtherTotal>
+ <InvoiceTotal>486.48</InvoiceTotal>
+ </Totals>
+</Invoice>
+
+</body>
+</biztalk_1>
=== Zope3/src/zope/tal/tests/input/test02.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:03 2002
+++ Zope3/src/zope/tal/tests/input/test02.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +1,119 @@
+<?xml version="1.0" ?>
+<biztalk_1 xmlns="urn:schemas-biztalk-org:biztalk:biztalk_1">
+
+<foo:header xmlns:foo="whomping-willow" plain="guido" quote='"' apostrophe="'" both=""'" lt="<" gt=">" amp="&" foo="">
+ <manifest>
+ <document>
+ <name>sample1</name>
+ <description>a simple invoice</description>
+ </document>
+ </manifest>
+</foo:header>
+
+<body>
+
+<!-- sample1.xml is an example of a simple invoice for a small restaurant supplies order -->
+
+<Invoice xmlns="urn:http://schemas.biztalk.org/united_rest_com/yw7sg15x.xml">
+ <Header>
+ <InvoiceNumber>01786</InvoiceNumber>
+ <InvoiceDate>2000-03-17</InvoiceDate> <!-- March 17th, 2000 -->
+ <OrderNo>55377</OrderNo>
+ <OrderDate>2000-03-15</OrderDate> <!-- March 15th, 2000 -->
+ <CustomerPO>GJ03405</CustomerPO>
+ <ShipMethod>DAVE 1</ShipMethod>
+ <ShipDate>2000-03-17</ShipDate> <!-- March 17th, 2000 -->
+ <CustomerID>K5211(34)</CustomerID>
+ <SalesPersonCode>23</SalesPersonCode>
+ <TaxID>23</TaxID>
+ </Header>
+ <InvoiceTo>
+ <Name>SHIPWRIGHT RESTAURANTS LIMITED</Name>
+ <AddressLine>125 NORTH SERVICE ROAD W</AddressLine>
+ <AddressLine>WESTLAKE ACCESS</AddressLine>
+ <City>NORTH BAY</City>
+ <PostCode>L8B1O5</PostCode>
+ <State>ONTARIO</State>
+ <Country>CANADA</Country>
+ </InvoiceTo>
+ <ShipTo>
+ <Name/>
+ <AddressLine>ATTN: PAULINE DEGRASSI</AddressLine>
+ <City/>
+ <PostCode/>
+ <State/>
+ <Country/>
+ </ShipTo>
+ <DetailLines>
+ <DetailLine>
+ <QuantityShipped>1</QuantityShipped>
+ <UnitOfMeasure>CS</UnitOfMeasure>
+ <PartNumber>DM 5309</PartNumber>
+ <PartDescription>#1013 12 OZ.MUNICH STEIN</PartDescription>
+ <UnitPrice>37.72</UnitPrice>
+ <LineTotal>37.72</LineTotal>
+ </DetailLine>
+ <DetailLine>
+ <QuantityShipped>6</QuantityShipped>
+ <UnitOfMeasure>DZ</UnitOfMeasure>
+ <PartNumber>ON 6420</PartNumber>
+ <PartDescription>PROVINCIAL DINNER FORK</PartDescription>
+ <UnitPrice>17.98</UnitPrice>
+ <LineTotal>107.88</LineTotal>
+ </DetailLine>
+ <DetailLine>
+ <QuantityShipped>72</QuantityShipped>
+ <UnitOfMeasure>EA</UnitOfMeasure>
+ <PartNumber>JR20643</PartNumber>
+ <PartDescription>PLASTIC HANDLED STEAK KNIFE</PartDescription>
+ <UnitPrice>.81</UnitPrice>
+ <LineTotal>58.32</LineTotal>
+ </DetailLine>
+ <DetailLine>
+ <QuantityShipped>6</QuantityShipped>
+ <UnitOfMeasure>DZ</UnitOfMeasure>
+ <PartNumber>ON 6410</PartNumber>
+ <PartDescription>PROVINCIAL TEASPOONS</PartDescription>
+ <UnitPrice>12.16</UnitPrice>
+ <LineTotal>72.96</LineTotal>
+ </DetailLine>
+ <DetailLine>
+ <QuantityShipped>0</QuantityShipped>
+ <UnitOfMeasure>DZ</UnitOfMeasure>
+ <PartNumber>ON 6411</PartNumber>
+ <PartDescription>PROVINCIAL RD BOWL SPOON</PartDescription>
+ <QuantityBackOrdered>6</QuantityBackOrdered>
+ <UnitPrice>17.98</UnitPrice>
+ <LineTotal>0.00</LineTotal>
+ </DetailLine>
+ <DetailLine>
+ <QuantityShipped>1</QuantityShipped>
+ <UnitOfMeasure>EA</UnitOfMeasure>
+ <PartNumber>DO 3218</PartNumber>
+ <PartDescription>34 OZ DUAL DIAL SCALE AM3218</PartDescription>
+ <UnitPrice>70.00</UnitPrice>
+ <DiscountPercentage>5.0</DiscountPercentage>
+ <LineTotal>66.50</LineTotal>
+ </DetailLine>
+ <DetailLine>
+ <QuantityShipped>1</QuantityShipped>
+ <UnitOfMeasure>CS</UnitOfMeasure>
+ <PartNumber>DM 195</PartNumber>
+ <PartDescription>20 OZ.BEER PUB GLASS</PartDescription>
+ <UnitPrice>55.90</UnitPrice>
+ <LineTotal>55.90</LineTotal>
+ </DetailLine>
+ </DetailLines>
+ <Totals>
+ <SubTotal>399.28</SubTotal>
+ <DiscountTotal>3.50</DiscountTotal>
+ <FreightTotal>23.75</FreightTotal>
+ <GSTTotal>29.61</GSTTotal>
+ <ProvTaxTotal>33.84</ProvTaxTotal>
+ <OtherTotal>33.84</OtherTotal>
+ <InvoiceTotal>486.48</InvoiceTotal>
+ </Totals>
+</Invoice>
+
+</body>
+</biztalk_1>
=== Zope3/src/zope/tal/tests/input/test03.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:03 2002
+++ Zope3/src/zope/tal/tests/input/test03.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,9 @@
+<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">outer variable x, first appearance</span>
+ <span z:define="local x str:goodbye cruel world">
+ <span z:content="text local:x">inner variable x</span>
+ </span>
+ <span z:content="text local:x">outer variable x, second appearance</span>
+ </span>
+</p>
=== Zope3/src/zope/tal/tests/input/test03.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:03 2002
+++ Zope3/src/zope/tal/tests/input/test03.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +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">outer variable x, first appearance</span>
+ <span z:define="local x str:goodbye cruel world">
+ <span z:content="text local:x">inner variable x</span>
+ </span>
+ <span z:content="text local:x">outer variable x, second appearance</span>
+ </span>
+</p>
=== Zope3/src/zope/tal/tests/input/test04.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:03 2002
+++ Zope3/src/zope/tal/tests/input/test04.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,26 @@
+<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">
+
+ <ul m:define-macro="whoops">
+ <li z:repeat="item python:range(count)">
+ <span z:replace="item">1</span>
+ <span z:replace="global:message"/>
+ </li>
+ </ul>
+
+ <span z:define="global count python:2; global message str:hello world"/>
+
+ <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>
+
+ </body>
+
+</html>
=== Zope3/src/zope/tal/tests/input/test04.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:03 2002
+++ Zope3/src/zope/tal/tests/input/test04.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +1,27 @@
+<?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">
+
+ <ul m:define-macro="whoops">
+ <li z:repeat="item python:range(count)">
+ <span z:replace="item">1</span>
+ <span z:replace="global:message"/>
+ </li>
+ </ul>
+
+ <span z:define="global count python:2; global message str:hello world"/>
+
+ <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>
+
+ </body>
+
+</html>
=== Zope3/src/zope/tal/tests/input/test05.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:03 2002
+++ Zope3/src/zope/tal/tests/input/test05.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,9 @@
+<html>
+
+ <body xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="body">
+
+ <h1>This is the body of test5</h1>
+
+ </body>
+
+</html>
=== Zope3/src/zope/tal/tests/input/test05.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:04 2002
+++ Zope3/src/zope/tal/tests/input/test05.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+<html>
+
+ <body xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="body">
+
+ <h1>This is the body of test5</h1>
+
+ </body>
+
+</html>
=== Zope3/src/zope/tal/tests/input/test06.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:04 2002
+++ Zope3/src/zope/tal/tests/input/test06.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,6 @@
+<html>
+ <body xmlns:m="http://xml.zope.org/namespaces/metal"
+ m:use-macro="tests/input/test05.html/body">
+ dummy body in test6
+ </body>
+</html>
=== Zope3/src/zope/tal/tests/input/test06.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:04 2002
+++ Zope3/src/zope/tal/tests/input/test06.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +1,7 @@
+<?xml version="1.0" ?>
+<html>
+ <body xmlns:m="http://xml.zope.org/namespaces/metal"
+ m:use-macro="tests/input/test05.xml/body">
+ dummy body in test6
+ </body>
+</html>
=== Zope3/src/zope/tal/tests/input/test07.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:04 2002
+++ Zope3/src/zope/tal/tests/input/test07.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,11 @@
+<table xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="myTable">
+<!-- macro definition with slots -->
+ <tr>
+ <td>Top Left</td>
+ <td>Top Right</td>
+ </tr>
+ <tr>
+ <td>Bottom left</td>
+ <td><span m:define-slot="bottomRight">Bottom Right</span></td>
+ </tr>
+</table>
=== Zope3/src/zope/tal/tests/input/test07.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:04 2002
+++ Zope3/src/zope/tal/tests/input/test07.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<table xmlns:m="http://xml.zope.org/namespaces/metal" m:define-macro="myTable">
+<!-- macro definition with slots -->
+ <tr>
+ <td>Top Left</td>
+ <td>Top Right</td>
+ </tr>
+ <tr>
+ <td>Bottom left</td>
+ <td><span m:define-slot="bottomRight">Bottom Right</span></td>
+ </tr>
+</table>
=== Zope3/src/zope/tal/tests/input/test08.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:04 2002
+++ Zope3/src/zope/tal/tests/input/test08.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,44 @@
+<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="tests/input/test07.html/myTable">
+<!-- macro use with slots -->
+ <tr>
+ <td>
+ <span m:fill-slot="bottomRight">
+ <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.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb.</p>
+ <p>It is supposed to contain a lot of text. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb.</p>
+ <p>It is supposed to contain a lot of text. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb.</p>
+ </span>
+ </td>
+ </tr>
+</table>
=== Zope3/src/zope/tal/tests/input/test08.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:04 2002
+++ Zope3/src/zope/tal/tests/input/test08.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="tests/input/test07.xml/myTable">
+<!-- macro use with slots -->
+ <tr>
+ <td>
+ <span m:fill-slot="bottomRight">
+ <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.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb.</p>
+ <p>It is supposed to contain a lot of text. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb.</p>
+ <p>It is supposed to contain a lot of text. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb.</p>
+ </span>
+ </td>
+ </tr>
+</table>
=== Zope3/src/zope/tal/tests/input/test09.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:04 2002
+++ Zope3/src/zope/tal/tests/input/test09.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,30 @@
+<html>
+<body>
+<p>
+ Just a bunch of text.
+<p>more text...
+<ul>
+ <li>first item
+ <li>second item
+
+ <ol>
+ <li>second list, first item
+ <li>second list, second item
+ <dl compact>
+ <dt>term 1
+ <dt>term 2
+ <dd>definition
+ </dl>
+ </ol>
+
+ <li>Now let's have a paragraph...
+ <p>My Paragraph
+ </li>
+
+ <li>And a table in a list item:
+ <table>
+ </table>
+</ul>
+
+</body>
+</html>
=== Zope3/src/zope/tal/tests/input/test09.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:04 2002
+++ Zope3/src/zope/tal/tests/input/test09.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +1,30 @@
+<html>
+<body>
+<p>
+ Just a bunch of text.</p>
+<p>more text...</p>
+<ul>
+ <li>first item</li>
+ <li>second item
+
+ <ol>
+ <li>second list, first item</li>
+ <li>second list, second item
+ <dl compact="">
+ <dt>term 1</dt>
+ <dt>term 2</dt>
+ <dd>definition</dd>
+ </dl></li>
+ </ol></li>
+
+ <li>Now let's have a paragraph...
+ <p>My Paragraph</p>
+ </li>
+
+ <li>And a table in a list item:
+ <table>
+ </table></li>
+</ul>
+
+</body>
+</html>
=== Zope3/src/zope/tal/tests/input/test10.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test10.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,48 @@
+<html><body>
+<table xmlns:m="http://xml.zope.org/namespaces/metal" m:use-macro="tests/input/test07.html/myTable">
+<!-- macro use with slots -->
+ <tr>
+ <td>
+ <span m:fill-slot="bottomRight">
+ <h1>Some headline</h1>
+ <p>This is the real contents of the bottom right slot.</p>
+ <hr>
+ <p>It is supposed to contain a lot of text. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb.</p>
+ <p>It is supposed to contain a lot of text. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb.</p>
+ <p>It is supposed to contain a lot of text. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb. Blah, blah, blab.
+ Blabber, blabber, blah. Baah, baah, barb.</p>
+ <br><br>
+ </span>
+ </td>
+ </tr>
+</table>
+</body></html>
=== Zope3/src/zope/tal/tests/input/test11.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test11.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,14 @@
+<html xmlns:tal="http://xml.zope.org/namespaces/tal">
+ <p tal:replace="structure string:<a>bar</a>"
+ tal:attributes="href string:http://www.python.org">dummy text</p>
+ <p tal:define="x python:1" tal:on-error="string:bad boy!">
+ <span tal:define="x python:2">
+ <span tal:define="x python:3">
+ <span tal:content="python:1/0"/>
+ </span>
+ </span>
+ </p>
+ <p tal:on-error="string:x undefined">
+ <span tal:content="x"/>
+ </p>
+</html>
=== Zope3/src/zope/tal/tests/input/test11.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test11.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +1,14 @@
+<html xmlns:tal="http://xml.zope.org/namespaces/tal">
+ <p tal:replace="structure string:<a>bar</a>"
+ tal:attributes="href string:http://www.python.org">dummy text</p>
+ <p tal:define="x python:1" tal:on-error="string:bad boy!">
+ <span tal:define="x python:2">
+ <span tal:define="x python:3">
+ <span tal:content="python:1/0"/>
+ </span>
+ </span>
+ </p>
+ <p tal:on-error="string:x undefined">
+ <span tal:content="x"/>
+ </p>
+</html>
=== Zope3/src/zope/tal/tests/input/test12.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test12.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,24 @@
+<span tal:define="global true python:1; global false python:0" />
+
+<img ismap>
+<img ismap=ismap>
+<img ismap="ismap">
+<img ismap="foo">
+
+<img ismap tal:attributes="ismap true">
+<img ismap tal:attributes="ismap false">
+<img ismap tal:attributes="ismap nothing">
+
+<img ismap="foo" tal:attributes="ismap true">
+<img ismap="foo" tal:attributes="ismap false">
+<img ismap="foo" tal:attributes="ismap nothing">
+
+<img tal:attributes="ismap true">
+<img tal:attributes="ismap false">
+<img tal:attributes="ismap nothing">
+
+<span tal:define="global x string:x.gif" />
+
+<img src="foo">
+<img src="foo" tal:attributes="src x">
+<img src="foo" tal:attributes="src nothing">
=== Zope3/src/zope/tal/tests/input/test13.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test13.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,7 @@
+Here's a stray greater than: >
+
+<script>
+ <!-- no comment -->
+ <notag>
+ &noentity;
+</script>
=== Zope3/src/zope/tal/tests/input/test14.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test14.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,10 @@
+<table>
+ <tr>
+ <td tal:repeat="x python:['car', 'bike', 'broomstick']" tal:content="x">
+ </td>
+ </tr>
+</table>
+
+<p>
+ <span tal:repeat="x python:['Harry', 'Ron', 'Hermione']" tal:replace="x" />
+</p>
=== Zope3/src/zope/tal/tests/input/test14.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test14.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<html xmlns:tal="http://xml.zope.org/namespaces/tal">
+
+<table>
+ <tr>
+ <td tal:repeat="x python:['car', 'bike', 'broomstick']" tal:content="x">
+ </td>
+ </tr>
+</table>
+
+<p>
+ <span tal:repeat="x python:['Harry', 'Ron', 'Hermione']" tal:replace="x" />
+</p>
+
+</html>
=== Zope3/src/zope/tal/tests/input/test15.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test15.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,26 @@
+<span metal:define-macro="INNER">
+ <span metal:define-slot="INNERSLOT">INNERSLOT</span>
+</span>
+
+<xxx metal:use-macro="INNER">
+ <xxx metal:fill-slot="INNERSLOT">inner-argument</xxx>
+</xxx>
+
+<div metal:define-macro="OUTER">
+<div metal:use-macro="INNER">
+ <xxx metal:define-slot="OUTERSLOT" metal:fill-slot="INNERSLOT">
+ OUTERSLOT
+ </xxx>
+</div>
+</div>
+
+<div metal:use-macro="OUTER">
+<span>
+ <xxx>
+ <div metal:fill-slot="OUTERSLOT">outer-argument</div>
+ </xxx>
+</span>
+</div>
+
+<div metal:use-macro="OUTER">
+</div>
=== Zope3/src/zope/tal/tests/input/test16.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test16.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,2 @@
+<a href="valid/link.html"
+ tal:attributes="href python:'/base/' + attrs['href']">blah, blah</a>
=== Zope3/src/zope/tal/tests/input/test16.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test16.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<body xmlns:tal="http://xml.zope.org/namespaces/tal">
+
+<img href="foo" Alt="bar"
+ tal:attributes="Href string:about:foo;alT string:baz" />
+
+</body>
=== Zope3/src/zope/tal/tests/input/test17.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test17.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,6 @@
+<tal:block tal:content="string:Yes">No</tal:block>
+<tal:block content="string:Yes">No</tal:block>
+<tal:block>Yes</tal:block>
+
+<metal:block tal:content="string:Yes">No</metal:block>
+<metal:block>Yes</metal:block>
=== Zope3/src/zope/tal/tests/input/test17.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test17.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<body xmlns:z="http://xml.zope.org/namespaces/tal"
+ xmlns:z2="http://xml.zope.org/namespaces/metal">
+<z:block z:content="string:Yes">No</z:block>
+<z:block content="string:Yes">No</z:block>
+<z:block>Yes</z:block>
+
+<z2:block z:content="string:Yes">No</z2:block>
+<z2:block>Yes</z2:block>
+</body>
=== Zope3/src/zope/tal/tests/input/test18.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test18.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,16 @@
+<p tal:omit-tag="">Content</p>
+<p tal:omit-tag=""></p>
+<img tal:omit-tag="">
+
+<p tal:omit-tag="string:Yes">Content</p>
+<p tal:omit-tag="string:Yes"></p>
+<img tal:omit-tag="string:Yes">
+
+<p tal:omit-tag="nothing">Content</p>
+<p tal:omit-tag="nothing"></p>
+<img tal:omit-tag="nothing">
+
+<p tal:define="txt string:Yes" tal:omit-tag="" tal:content="txt">No</p>
+<p tal:define="txt string:Yes" tal:omit-tag="" tal:replace="txt">No</p>
+<p tal:omit-tag="" tal:content="default">Yes</p>
+<p tal:omit-tag="" tal:replace="default">Yes</p>
=== Zope3/src/zope/tal/tests/input/test18.xml 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test18.xml Wed Dec 25 09:15:31 2002
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<body xmlns:tal="http://xml.zope.org/namespaces/tal"
+ xmlns:metal="http://xml.zope.org/namespaces/metal">
+<p tal:omit-tag="">Content</p>
+<p tal:omit-tag=""></p>
+<img tal:omit-tag=""/>
+
+<p tal:omit-tag="string:Yes">Content</p>
+<p tal:omit-tag="string:Yes"></p>
+<img tal:omit-tag="string:Yes"/>
+
+<p tal:omit-tag="nothing">Content</p>
+<p tal:omit-tag="nothing"></p>
+<img tal:omit-tag="nothing" />
+
+<p tal:define="txt string:Yes" tal:omit-tag="" tal:content="txt">No</p>
+<p tal:define="txt string:Yes" tal:omit-tag="" tal:replace="txt">No</p>
+<p tal:omit-tag="" tal:content="default">Yes</p>
+<p tal:omit-tag="" tal:replace="default">Yes</p>
+</body>
=== Zope3/src/zope/tal/tests/input/test19.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test19.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,5 @@
+<span i18n:translate="">Replace this</span>
+<span i18n:translate="msgid">This is a
+translated string</span>
+<span i18n:translate="">And another
+translated string</span>
=== Zope3/src/zope/tal/tests/input/test20.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test20.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1 @@
+<span i18n:translate="">replaceable <p tal:replace="str:here">content</p></span>
=== Zope3/src/zope/tal/tests/input/test21.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test21.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,4 @@
+<span i18n:translate="">
+ <span tal:replace="str:Lomax" i18n:name="name" /> was born in
+ <span tal:replace="str:Antarctica" i18n:name="country" />.
+</span>
=== Zope3/src/zope/tal/tests/input/test22.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test22.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,4 @@
+<span i18n:translate="">
+ <span i18n:name="name"><b>Jim</b></span> was born in
+ <span i18n:name="country">the USA</span>.
+</span>
=== Zope3/src/zope/tal/tests/input/test23.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test23.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,2 @@
+<span i18n:data="here/currentTime"
+ i18n:translate="timefmt">2:32 pm</span>
=== Zope3/src/zope/tal/tests/input/test24.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test24.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,3 @@
+<input name="Delete"
+ tal:attributes="name string:delete_button"
+ i18n:attributes="name">
=== Zope3/src/zope/tal/tests/input/test25.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:05 2002
+++ Zope3/src/zope/tal/tests/input/test25.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1 @@
+<input name="Delete" i18n:attributes="name">
=== Zope3/src/zope/tal/tests/input/test26.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:06 2002
+++ Zope3/src/zope/tal/tests/input/test26.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,3 @@
+<span i18n:translate="jobnum">
+ Job #<span tal:replace="context/@@object_name"
+ i18n:name="jobnum">NN</span></span>
=== Zope3/src/zope/tal/tests/input/test27.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:06 2002
+++ Zope3/src/zope/tal/tests/input/test27.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,5 @@
+<p i18n:translate="verify">Your contact email address is recorded as
+ <a href="mailto:user@example.com"
+ tal:content="request/submitter"
+ i18n:name="email">user@host.com</a>
+</p>
=== Zope3/src/zope/tal/tests/input/test28.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:06 2002
+++ Zope3/src/zope/tal/tests/input/test28.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,5 @@
+<p i18n:translate="verify">Your contact email address is recorded as
+ <span i18n:name="email">
+ <a href="mailto:user@example.com"
+ tal:content="request/submitter">user@host.com</a></span>
+</p>
=== Zope3/src/zope/tal/tests/input/test29.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:06 2002
+++ Zope3/src/zope/tal/tests/input/test29.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,4 @@
+At the tone the time will be
+<span i18n:data="here/currentTime"
+ i18n:translate="timefmt"
+ i18n:name="time">2:32 pm</span>... beep!
=== Zope3/src/zope/tal/tests/input/test30.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:06 2002
+++ Zope3/src/zope/tal/tests/input/test30.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,6 @@
+<p i18n:translate="verify">Your contact email address is recorded as
+<a href="user@host.com"
+ tal:attributes="href string:mailto:${request/submitter}"
+ tal:content="request/submitter"
+ i18n:name="email">user@host.com</a>
+</p>
=== Zope3/src/zope/tal/tests/input/test31.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:06 2002
+++ Zope3/src/zope/tal/tests/input/test31.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,7 @@
+<p i18n:translate="verify">Your contact email address is recorded as
+<span i18n:name="email">
+<a href="user@host.com"
+ tal:attributes="href string:mailto:${request/submitter}"
+ tal:content="request/submitter">
+ user@host.com</a></span>
+</p>
=== Zope3/src/zope/tal/tests/input/test32.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:06 2002
+++ Zope3/src/zope/tal/tests/input/test32.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,4 @@
+<span i18n:translate="origin">
+ <span tal:content="str:Lomax" i18n:name="name" /> was born in
+ <span tal:content="str:Antarctica" i18n:name="country" />.
+</span>
=== Zope3/src/zope/tal/tests/input/test_metal1.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:06 2002
+++ Zope3/src/zope/tal/tests/input/test_metal1.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,61 @@
+<span metal:define-macro="OUTER">
+ AAA
+ <span metal:define-macro="INNER">INNER</span>
+ BBB
+</span>
+
+<xxx metal:use-macro="OUTER">
+</xxx>
+
+<xxx metal:use-macro="INNER">
+</xxx>
+
+<span metal:define-macro="OUTER2">
+ AAA
+ <xxx metal:define-slot="OUTERSLOT">
+ <span metal:define-macro="INNER2">INNER</span>
+ </xxx>
+ BBB
+</span>
+
+<xxx metal:use-macro="OUTER2">
+</xxx>
+
+<xxx metal:use-macro="INNER2">
+</xxx>
+
+<xxx metal:use-macro="OUTER2">
+ <yyy metal:fill-slot="OUTERSLOT">OUTERSLOT</yyy>
+</xxx>
+
+<span metal:define-macro="OUTER3">
+ AAA
+ <xxx metal:define-slot="OUTERSLOT">
+ <span metal:define-macro="INNER3">INNER
+ <xxx metal:define-slot="INNERSLOT">INNERSLOT</xxx>
+ </span>
+ </xxx>
+ BBB
+</span>
+
+<xxx metal:use-macro="OUTER3">
+</xxx>
+
+<xxx metal:use-macro="OUTER3">
+ <yyy metal:fill-slot="OUTERSLOT">OUTERSLOT</yyy>
+</xxx>
+
+<xxx metal:use-macro="INNER3">
+</xxx>
+
+<xxx metal:use-macro="INNER3">
+ <yyy metal:fill-slot="INNERSLOT">INNERSLOT</yyy>
+</xxx>
+
+<xxx metal:use-macro="INNER3">
+ <yyy metal:fill-slot="INNERSLOT">
+ <zzz metal:define-macro="INSLOT">INSLOT</zzz>
+ </yyy>
+</xxx>
+
+<xxx metal:use-macro="INSLOT"></xxx>
=== Zope3/src/zope/tal/tests/input/test_metal2.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:06 2002
+++ Zope3/src/zope/tal/tests/input/test_metal2.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1,7 @@
+<div metal:define-macro="OUTER">
+ OUTER
+ <span metal:define-macro="INNER">INNER</span>
+ OUTER
+</div>
+
+<div metal:use-macro="OUTER"/>
=== Zope3/src/zope/tal/tests/input/test_metal3.html 1.1 => 1.2 ===
--- /dev/null Wed Dec 25 09:16:06 2002
+++ Zope3/src/zope/tal/tests/input/test_metal3.html Wed Dec 25 09:15:31 2002
@@ -0,0 +1 @@
+<span tal:attributes="class string:foo">Should not get attr in metal</span>