? data/contributors.data
Index: Makefile
===================================================================
RCS file: /sources/public/CSS/CSS2.1-test-suite/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	11 Apr 2008 20:29:22 -0000	1.15
+++ Makefile	12 Apr 2008 02:34:50 -0000
@@ -41,8 +41,8 @@
 	#
 	perl catalog.pl tests/*.xht
 	cp data/indices.css dist/indices.css
-	cp data/index.xht dist/index.xht
-	cp data/index.html dist/index.html
+	tpage --relative --define path=data/ data/index.xht > dist/index.xht
+	tpage --relative --define path=data/ data/index.html > dist/index.html
 	cp data/htaccess dist/.htaccess
 ifdef OFFICIAL
 	cp data/LICENSE-W3CD dist/LICENSE-W3CD
Index: data/index.content
===================================================================
RCS file: data/index.content
diff -N data/index.content
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ data/index.content	12 Apr 2008 02:34:50 -0000
@@ -0,0 +1,86 @@
+ <h1>CSS2.1 Conformance Test Suite</h1>
+
+ <p>This is a development version of the CSS2.1 Conformance Test Suite.</p>
+
+ <p>It is woefully incomplete and contains many incorrect tests. Please
+   check the latest version of the <a href="http://www.w3.org/TR/CSS21/">CSS2.1
+   specification</a> and the
+   <a href="http://www.w3.org/Style/css2-updates/CR-CSS21-20070719-errata.html">errata
+   list</a> before assuming a failure is due to an implementation bug and
+   not a test suite bug.</p>
+
+ <p>In time we hope to correct all errors and extend this test suite to
+  cover all of CSS2.1. Your help is welcome in this effort. The appropriate
+  mailing list for submitting tests and bug reports is
+  <a href="http://lists.w3.org/Archives/Public/public-css-testsuite/">public-css-testsuite@w3.org</a>.
+  More information on the contribution process and test guidelines is
+  available on the <a href="http://csswg.inkedblade.net/test/css2.1">wiki
+  page</a>.</p>
+
+ <p>Tests are currently available in three formats:</p>
+
+ <dl>
+   <dt><a href="xhtml1/">XHTML 1.1</a></dt>
+     <dd>XHTML 1.1 tests sent as <code>application/xhtml+xml</code></dd>
+   <dt><a href="html4/">HTML 4.01</a></dt>
+     <dd>HTML 4.01 tests sent as <code>text/html</code></dd>
+   <dt><a href="xhtml1print/">XHTML 1.1 for Printers</a></dt>
+     <dd>XHTML 1.1 tests with all images converted from PNG to JPEG
+       and formatted with headers and footers to ease testing of
+       embedded printer software. This is not a canonical format,
+       and some tests may fail due to the format conversion that
+       would otherwise pass in the above XHTML 1.1 format.</dd>
+  </dl>
+
+  <p>Note that many of the tests require the
+   <a href="http://dev.w3.org/CSS/fonts/ahem/">Ahem font to be installed</a>.
+   The tests that require this are marked with an 'a' at the end of the
+   filename, after the test type classification. Without the Ahem font
+   installed, these tests are of no value.</p>
+
+  <p>Most of the test suite makes the following assumptions:</p>
+  <ul>
+    <li>The X/HTML <code>div</code> element is assigned <code>display: block;</code>
+      and no other property declaration.</li>
+    <li>The X/HTML <code>span</code> element is assigned <code>display: inline;</code>
+      and no other property declaration.</li>
+    <li>The X/HTML <code>p</code> element is assigned <code>display: block;</code></li>
+    <li>The X/HTML <code>li</code> element is assigned <code>display: list-item;</code></li>
+    <li>The X/HTML table elements <code>table</code>, <code>tbody</code>,
+      <code>tr</code>, and <code>td</code> are assigned the <code>display</code>
+      values <code>table</code>, <code>table-row-group</code>,
+      <code>table-row</code>, and <code>table-cell</code>, respectively.</li>
+    <li>The device can display the sixteen color values associated with the color
+      keywords <code>black</code>, <code>white</code>, <code>gray</code>,
+      <code>silver</code>, <code>red</code>, <code>green</code>, <code>blue</code>,
+      <code>purple</code>, <code>yellow</code>, <code>orange</code>, <code>teal</code>,
+      <code>fuchsia</code>, <code>maroon</code>, <code>navy</code>, <code>aqua</code>,
+      and <code>lime</code> as distinct colors.</li>
+    <li>The UA is set to print background colors and, if it supports graphics, background images.
+    <li>The UA implements reasonable page-breaking behavior; e.g., it is assumed
+      that UAs will not break at every opportunity, but only near the end of
+      a page unless a page break is forced.</li>
+    <li>The UA implements reasonable line-breaking behavior; e.g., it is assumed
+      that spaces between alphanumeric characters provide line breaking
+      opportunities and that UAs will not break at every opportunity, but only
+      near the end of a line unless a line break is forced.</li>
+  </ul>
+
+  <p>In addition, some of the tests make one or more of the following
+   assumptions:</p>
+
+  <ul>
+    <li>The device is a full-color device.</li>
+    <li>The device has a viewport width of at least 640px (approx).</li>
+    <li>The resolution of the device is 96 CSS pixels per inch.</li>
+    <li>The UA imposes no minimum font size.</li>
+    <li>The 'medium' font-size computes to 16px.</li>
+    <li>The initial value of 'color' is black.</li>
+    <li>The canvas background is white.</li>
+    <li>The user stylesheet is empty (except where indicated by the tests).</li>
+    <li>The device is interactive and uses scroll bars.</li>
+  </ul>
+
+  <p>The tests that need these assumptions to be true have not yet been
+  marked, but it is likely that we will add a way to identify these
+  tests in due course.</p>
Index: data/index.html
===================================================================
RCS file: /sources/public/CSS/CSS2.1-test-suite/data/index.html,v
retrieving revision 1.7
diff -u -r1.7 index.html
--- data/index.html	11 Apr 2008 22:09:37 -0000	1.7
+++ data/index.html	12 Apr 2008 02:34:50 -0000
@@ -9,95 +9,7 @@
  </head>
  <body>
 
-  <!-- Please keep this file in sync with the XHTML version -->
-
- <h1>CSS2.1 Conformance Test Suite</h1>
-
- <p>This is a development version of the CSS2.1 Conformance Test Suite.</p>
-
- <p>It is woefully incomplete and contains many incorrect tests. Please
-   check the latest version of the <a href="http://www.w3.org/TR/CSS21/">CSS2.1
-   specification</a> and the
-   <a href="http://www.w3.org/Style/css2-updates/CR-CSS21-20070719-errata.html">errata
-   list</a> before assuming a failure is due to an implementation bug and
-   not a test suite bug.</p>
-
- <p>In time we hope to correct all errors and extend this test suite to
-  cover all of CSS2.1. Your help is welcome in this effort. The appropriate
-  mailing list for submitting tests and bug reports is
-  <a href="http://lists.w3.org/Archives/Public/public-css-testsuite/">public-css-testsuite@w3.org</a>.
-  More information on the contribution process and test guidelines is
-  available on the <a href="http://csswg.inkedblade.net/test/css2.1">wiki
-  page</a>.</p>
-
- <p>Tests are currently available in three formats:</p>
-
- <dl>
-   <dt><a href="xhtml1/">XHTML 1.1</a></dt>
-     <dd>XHTML 1.1 tests sent as <code>application/xhtml+xml</code></dd>
-   <dt><a href="html4/">HTML 4.01</a></dt>
-     <dd>HTML 4.01 tests sent as <code>text/html</code></dd>
-   <dt><a href="xhtml1print/">XHTML 1.1 for Printers</a></dt>
-     <dd>XHTML 1.1 tests with all images converted from PNG to JPEG
-       and formatted with headers and footers to ease testing of
-       embedded printer software. This is not a canonical format,
-       and some tests may fail due to the format conversion that
-       would otherwise pass in the above XHTML 1.1 format.</dd>
-  </dl>
-
-  <p>Note that many of the tests require the
-   <a href="http://dev.w3.org/CSS/fonts/ahem/">Ahem font to be installed</a>.
-   The tests that require this are marked with an 'a' at the end of the
-   filename, after the test type classification. Without the Ahem font
-   installed, these tests are of no value.</p>
-
-  <p>Most of the test suite makes the following assumptions:</p>
-  <ul>
-    <li>The X/HTML <code>div</code> element is assigned <code>display: block;</code>
-      and no other property declaration.</li>
-    <li>The X/HTML <code>span</code> element is assigned <code>display: inline;</code>
-      and no other property declaration.</li>
-    <li>The X/HTML <code>p</code> element is assigned <code>display: block;</code></li>
-    <li>The X/HTML <code>li</code> element is assigned <code>display: list-item;</code></li>
-    <li>The X/HTML table elements <code>table</code>, <code>tbody</code>,
-      <code>tr</code>, and <code>td</code> are assigned the <code>display</code>
-      values <code>table</code>, <code>table-row-group</code>,
-      <code>table-row</code>, and <code>table-cell</code>, respectively.</li>
-    <li>The device can display the sixteen color values associated with the color
-      keywords <code>black</code>, <code>white</code>, <code>gray</code>,
-      <code>silver</code>, <code>red</code>, <code>green</code>, <code>blue</code>,
-      <code>purple</code>, <code>yellow</code>, <code>orange</code>, <code>teal</code>,
-      <code>fuchsia</code>, <code>maroon</code>, <code>navy</code>, <code>aqua</code>,
-      and <code>lime</code> as distinct colors.</li>
-    <li>The UA is set to print background colorss and, if it supports graphics, background images.
-    <li>The UA implements reasonable page-breaking behavior; e.g., it is assumed
-      that UAs will not break at every opportunity, but only near the end of
-      a page unless a page break is forced.</li>
-    <li>The UA implements reasonable line-breaking behavior; e.g., it is assumed
-      that spaces between alphanumeric characters provide line breaking
-      opportunities and that UAs will not break at every opportunity, but only
-      near the end of a line unless a line break is forced.</li>
-  </ul>
-
-  <p>In addition, some of the tests make one or more of the following
-   assumptions:</p>
-
-  <ul>
-    <li>The device is a full-color device.</li>
-    <li>The device has a viewport width of at least 640px (approx).</li>
-    <li>The resolution of the device is 96 CSS pixels per inch.</li>
-    <li>The UA imposes no minimum font size.</li>
-    <li>The 'medium' font-size computes to 16px.</li>
-    <li>The initial value of 'color' is black.</li>
-    <li>The canvas background is white.</li>
-    <li>The user stylesheet is empty (except where indicated by the tests).</li>
-    <li>The device is interactive and uses scroll bars.</li>
-  </ul>
-
-  <p>The tests that need these assumptions to be true have not yet been
-  marked, but it is likely that we will add a way to identify these
-  tests in due course.</p>
-
+[% INSERT "${path}index.content" %]
 
 <h2>Acknowledgements</h2>
 
Index: data/index.xht
===================================================================
RCS file: /sources/public/CSS/CSS2.1-test-suite/data/index.xht,v
retrieving revision 1.7
diff -u -r1.7 index.xht
--- data/index.xht	11 Apr 2008 22:09:37 -0000	1.7
+++ data/index.xht	12 Apr 2008 02:34:50 -0000
@@ -9,95 +9,7 @@
  </head>
  <body>
 
- <!-- Please keep this file in sync with the HTML version -->
-
- <h1>CSS2.1 Conformance Test Suite</h1>
-
- <p>This is a development version of the CSS2.1 Conformance Test Suite.</p>
-
- <p>It is woefully incomplete and contains many incorrect tests. Please
-   check the latest version of the <a href="http://www.w3.org/TR/CSS21/">CSS2.1
-   specification</a> and the
-   <a href="http://www.w3.org/Style/css2-updates/CR-CSS21-20070719-errata.html">errata
-   list</a> before assuming a failure is due to an implementation bug and
-   not a test suite bug.</p>
-
- <p>In time we hope to correct all errors and extend this test suite to
-  cover all of CSS2.1. Your help is welcome in this effort. The appropriate
-  mailing list for submitting tests and bug reports is
-  <a href="http://lists.w3.org/Archives/Public/public-css-testsuite/">public-css-testsuite@w3.org</a>.
-  More information on the contribution process and test guidelines is
-  available on the <a href="http://csswg.inkedblade.net/test/css2.1">wiki
-  page</a>.</p>
-
- <p>Tests are currently available in three formats:</p>
-
- <dl>
-   <dt><a href="xhtml1/">XHTML 1.1</a></dt>
-     <dd>XHTML 1.1 tests sent as <code>application/xhtml+xml</code></dd>
-   <dt><a href="html4/">HTML 4.01</a></dt>
-     <dd>HTML 4.01 tests sent as <code>text/html</code></dd>
-   <dt><a href="xhtml1print/">XHTML 1.1 for Printers</a></dt>
-     <dd>XHTML 1.1 tests with all images converted from PNG to JPEG
-       and formatted with headers and footers to ease testing of
-       embedded printer software. This is not a canonical format,
-       and some tests may fail due to the format conversion that
-       would otherwise pass in the above XHTML 1.1 format.</dd>
-  </dl>
-
-  <p>Note that many of the tests require the
-   <a href="http://dev.w3.org/CSS/fonts/ahem/">Ahem font to be installed</a>.
-   The tests that require this are marked with an 'a' at the end of the
-   filename, after the test type classification. Without the Ahem font
-   installed, these tests are of no value.</p>
-
-  <p>Most of the test suite makes the following assumptions:</p>
-  <ul>
-    <li>The X/HTML <code>div</code> element is assigned <code>display: block;</code>
-      and no other property declaration.</li>
-    <li>The X/HTML <code>span</code> element is assigned <code>display: inline;</code>
-      and no other property declaration.</li>
-    <li>The X/HTML <code>p</code> element is assigned <code>display: block;</code></li>
-    <li>The X/HTML <code>li</code> element is assigned <code>display: list-item;</code></li>
-    <li>The X/HTML table elements <code>table</code>, <code>tbody</code>,
-      <code>tr</code>, and <code>td</code> are assigned the <code>display</code>
-      values <code>table</code>, <code>table-row-group</code>,
-      <code>table-row</code>, and <code>table-cell</code>, respectively.</li>
-    <li>The device can display the sixteen color values associated with the color
-      keywords <code>black</code>, <code>white</code>, <code>gray</code>,
-      <code>silver</code>, <code>red</code>, <code>green</code>, <code>blue</code>,
-      <code>purple</code>, <code>yellow</code>, <code>orange</code>, <code>teal</code>,
-      <code>fuchsia</code>, <code>maroon</code>, <code>navy</code>, <code>aqua</code>,
-      and <code>lime</code> as distinct colors.</li>
-    <li>The UA is set to print background colors and, if it supports graphics, background images.
-    <li>The UA implements reasonable page-breaking behavior; e.g., it is assumed
-      that UAs will not break at every opportunity, but only near the end of
-      a page unless a page break is forced.</li>
-    <li>The UA implements reasonable line-breaking behavior; e.g., it is assumed
-      that spaces between alphanumeric characters provide line breaking
-      opportunities and that UAs will not break at every opportunity, but only
-      near the end of a line unless a line break is forced.</li>
-  </ul>
-
-  <p>In addition, some of the tests make one or more of the following
-   assumptions:</p>
-
-  <ul>
-    <li>The device is a full-color device.</li>
-    <li>The device has a viewport width of at least 640px (approx).</li>
-    <li>The resolution of the device is 96 CSS pixels per inch.</li>
-    <li>The UA imposes no minimum font size.</li>
-    <li>The 'medium' font-size computes to 16px.</li>
-    <li>The initial value of 'color' is black.</li>
-    <li>The canvas background is white.</li>
-    <li>The user stylesheet is empty (except where indicated by the tests).</li>
-    <li>The device is interactive and uses scroll bars.</li>
-  </ul>
-
-  <p>The tests that need these assumptions to be true have not yet been
-  marked, but it is likely that we will add a way to identify these
-  tests in due course.</p>
-
+[% INSERT "${path}index.content" %]
 
 <h2>Acknowledgements</h2>
 


