# HG changeset patch
# User Daniel Veillard <veillard@src.gnome.org>
# Date 987600385 0
#      Wed Apr 18 13:26:25 2001 +0000
# Node ID e63efa8be9a11f0e94382263d93a23573db37541
# Parent  83208a4a73e6e357e9790c07e2404e93e39c83f6
- tests/general/bug-5-.out tests/multiple/out/*.orig
  tests/xmlspec/REC-xml-20001006*.html: fixed the test output
  following the libxml changes
Daniel

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr 18 15:24:50 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* tests/general/bug-5-.out tests/multiple/out/*.orig
+	  tests/xmlspec/REC-xml-20001006*.html: fixed the test output
+	  following the libxml changes
+
 Wed Apr 18 12:05:04 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* libxslt/functions.c: applied TOM's patch to key()
diff --git a/tests/general/bug-5-.out b/tests/general/bug-5-.out
--- a/tests/general/bug-5-.out
+++ b/tests/general/bug-5-.out
@@ -15,15 +15,15 @@
 PROD
 "><td>Apple</td><td>Proj. Rev: 255750</td><td>Actual Rev: 85.53</td></tr><tr class="
 ACT
-"><td>PICK</td><td>Proj. Rev: 0</td><td>Act. Rev: 50</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>PICK</td><td>Proj. Rev: 0</td><td>Act. Rev: 50</td></tr><tr><td valign="top"><table><tr class="NR"><td>Non-Recurring</td><td>Number: 1</td><td>Proj. Rev: 0</td><td>Act. Rev: 50</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Birch</td><td>1</td><td>0</td><td>50</td></tr><tr class="NR"/></table></td><td valign="top"/></tr><tr class="
 ACT
 "/><tr class="
 ACT
-"><td>EAT</td><td>Proj. Rev: 0</td><td>Act. Rev: 0</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>EAT</td><td>Proj. Rev: 0</td><td>Act. Rev: 0</td></tr><tr><td valign="top"><table><tr class="NR"><td>Non-Recurring</td><td>Number: 68</td><td>Proj. Rev: 0</td><td>Act. Rev: 0</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Pine</td><td>6</td><td>0</td><td>0</td></tr><tr><td>Elm</td><td>60</td><td>0</td><td>0</td></tr><tr><td>Birch</td><td>2</td><td>0</td><td>0</td></tr><tr class="NR"/></table></td><td valign="top"/></tr><tr class="
 ACT
 "/><tr class="
 ACT
-"><td>SQUEEZE</td><td>Proj. Rev: 255750</td><td>Act. Rev: 35.53</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>SQUEEZE</td><td>Proj. Rev: 255750</td><td>Act. Rev: 35.53</td></tr><tr><td valign="top"/><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 109</td><td>Proj. Rev: 255750</td><td>Act. Rev: 35.53</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Pine</td><td>7</td><td>19250</td><td>16.61</td></tr><tr><td>Elm</td><td>96</td><td>220000</td><td>11.76</td></tr><tr><td>Birch</td><td>6</td><td>16500</td><td>7.16</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 PROD
@@ -31,15 +31,15 @@
 PROD
 "><td>Orange</td><td>Proj. Rev: 1743250</td><td>Actual Rev: 10695.229999999</td></tr><tr class="
 ACT
-"><td>PICK</td><td>Proj. Rev: 1159000</td><td>Act. Rev: 9964.479999999</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>PICK</td><td>Proj. Rev: 1159000</td><td>Act. Rev: 9964.479999999</td></tr><tr><td valign="top"><table><tr class="NR"><td>Non-Recurring</td><td>Number: 229</td><td>Proj. Rev: 0</td><td>Act. Rev: 8300</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Pine</td><td>34</td><td>0</td><td>1420</td></tr><tr><td>Almond</td><td>1</td><td>0</td><td>25</td></tr><tr><td>Birch</td><td>8</td><td>0</td><td>300</td></tr><tr><td>Elm</td><td>186</td><td>0</td><td>6555</td></tr><tr class="NR"/></table></td><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 284</td><td>Proj. Rev: 1159000</td><td>Act. Rev: 1664.479999999</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Pine</td><td>36</td><td>171000</td><td>221.3</td></tr><tr><td>Elm</td><td>240</td><td>950000</td><td>1412.34</td></tr><tr><td>Birch</td><td>8</td><td>38000</td><td>30.84</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 ACT
-"><td>EAT</td><td>Proj. Rev: 0</td><td>Act. Rev: 0</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>EAT</td><td>Proj. Rev: 0</td><td>Act. Rev: 0</td></tr><tr><td valign="top"><table><tr class="NR"><td>Non-Recurring</td><td>Number: 101</td><td>Proj. Rev: 0</td><td>Act. Rev: 0</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Pine</td><td>34</td><td>0</td><td>0</td></tr><tr><td>Almond</td><td>1</td><td>0</td><td>0</td></tr><tr><td>Elm</td><td>62</td><td>0</td><td>0</td></tr><tr><td>Birch</td><td>4</td><td>0</td><td>0</td></tr><tr class="NR"/></table></td><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 8</td><td>Proj. Rev: 0</td><td>Act. Rev: 0</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Birch</td><td>8</td><td>0</td><td>0</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 ACT
-"><td>SQUEEZE</td><td>Proj. Rev: 584250</td><td>Act. Rev: 730.749999999</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>SQUEEZE</td><td>Proj. Rev: 584250</td><td>Act. Rev: 730.749999999</td></tr><tr><td valign="top"/><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 123</td><td>Proj. Rev: 584250</td><td>Act. Rev: 730.749999999</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Pine</td><td>36</td><td>171000</td><td>221.3</td></tr><tr><td>Elm</td><td>80</td><td>380000</td><td>470.78</td></tr><tr><td>Birch</td><td>4</td><td>19000</td><td>15.42</td></tr><tr><td>Almond</td><td>3</td><td>14250</td><td>23.25</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 PROD
@@ -47,11 +47,11 @@
 PROD
 "><td>Banana</td><td>Proj. Rev: 110250</td><td>Actual Rev: 202.9</td></tr><tr class="
 ACT
-"><td>PICK</td><td>Proj. Rev: 98000</td><td>Act. Rev: 202.9</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>PICK</td><td>Proj. Rev: 98000</td><td>Act. Rev: 202.9</td></tr><tr><td valign="top"><table><tr class="NR"><td>Non-Recurring</td><td>Number: 2</td><td>Proj. Rev: 0</td><td>Act. Rev: 100</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Elm</td><td>2</td><td>0</td><td>100</td></tr><tr class="NR"/></table></td><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 8</td><td>Proj. Rev: 98000</td><td>Act. Rev: 102.9</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Pine</td><td>1</td><td>12250</td><td>12.25</td></tr><tr><td>Elm</td><td>6</td><td>73500</td><td>78.4</td></tr><tr><td>Almond</td><td>1</td><td>12250</td><td>12.25</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 ACT
-"><td>EAT</td><td>Proj. Rev: 12250</td><td>Act. Rev: 0</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>EAT</td><td>Proj. Rev: 12250</td><td>Act. Rev: 0</td></tr><tr><td valign="top"/><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 1</td><td>Proj. Rev: 12250</td><td>Act. Rev: 0</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Almond</td><td>1</td><td>12250</td><td>0</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 PROD
@@ -59,7 +59,7 @@
 PROD
 "><td>Nectarine</td><td>Proj. Rev: 5950</td><td>Actual Rev: -5.95</td></tr><tr class="
 ACT
-"><td>SQUEEZE</td><td>Proj. Rev: 5950</td><td>Act. Rev: -5.95</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>SQUEEZE</td><td>Proj. Rev: 5950</td><td>Act. Rev: -5.95</td></tr><tr><td valign="top"/><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 1</td><td>Proj. Rev: 5950</td><td>Act. Rev: -5.95</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Pine</td><td>1</td><td>5950</td><td>-5.95</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 PROD
@@ -67,15 +67,15 @@
 PROD
 "><td>Pineapple</td><td>Proj. Rev: 36250</td><td>Actual Rev: 73.129999999</td></tr><tr class="
 ACT
-"><td>PICK</td><td>Proj. Rev: 23750</td><td>Act. Rev: 68.75</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>PICK</td><td>Proj. Rev: 23750</td><td>Act. Rev: 68.75</td></tr><tr><td valign="top"><table><tr class="NR"><td>Non-Recurring</td><td>Number: 1</td><td>Proj. Rev: 0</td><td>Act. Rev: 50</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Pine</td><td>1</td><td>0</td><td>50</td></tr><tr class="NR"/></table></td><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 3</td><td>Proj. Rev: 23750</td><td>Act. Rev: 18.75</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Pine</td><td>2</td><td>17500</td><td>8.75</td></tr><tr><td>Birch</td><td>1</td><td>6250</td><td>10</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 ACT
-"><td>EAT</td><td>Proj. Rev: 0</td><td>Act. Rev: 0</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>EAT</td><td>Proj. Rev: 0</td><td>Act. Rev: 0</td></tr><tr><td valign="top"><table><tr class="NR"><td>Non-Recurring</td><td>Number: 1</td><td>Proj. Rev: 0</td><td>Act. Rev: 0</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Elm</td><td>1</td><td>0</td><td>0</td></tr><tr class="NR"/></table></td><td valign="top"/></tr><tr class="
 ACT
 "/><tr class="
 ACT
-"><td>SQUEEZE</td><td>Proj. Rev: 12500</td><td>Act. Rev: 4.379999999</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>SQUEEZE</td><td>Proj. Rev: 12500</td><td>Act. Rev: 4.379999999</td></tr><tr><td valign="top"/><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 2</td><td>Proj. Rev: 12500</td><td>Act. Rev: 4.379999999</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Elm</td><td>2</td><td>12500</td><td>4.38</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 PROD
@@ -83,7 +83,7 @@
 PROD
 "><td>Coconut</td><td>Proj. Rev: 13750</td><td>Actual Rev: 17.87</td></tr><tr class="
 ACT
-"><td>PICK</td><td>Proj. Rev: 13750</td><td>Act. Rev: 17.87</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>PICK</td><td>Proj. Rev: 13750</td><td>Act. Rev: 17.87</td></tr><tr><td valign="top"/><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 1</td><td>Proj. Rev: 13750</td><td>Act. Rev: 17.87</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Elm</td><td>1</td><td>13750</td><td>17.87</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 PROD
@@ -91,7 +91,7 @@
 PROD
 "><td>Guava</td><td>Proj. Rev: 14995</td><td>Actual Rev: -19.489999999</td></tr><tr class="
 ACT
-"><td>SQUEEZE</td><td>Proj. Rev: 14995</td><td>Act. Rev: -19.489999999</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>SQUEEZE</td><td>Proj. Rev: 14995</td><td>Act. Rev: -19.489999999</td></tr><tr><td valign="top"/><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 1</td><td>Proj. Rev: 14995</td><td>Act. Rev: -19.489999999</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Pine</td><td>1</td><td>14995</td><td>-19.49</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 PROD
@@ -99,7 +99,7 @@
 PROD
 "><td>Pear</td><td>Proj. Rev: 29995</td><td>Actual Rev: 38.99</td></tr><tr class="
 ACT
-"><td>PICK</td><td>Proj. Rev: 29995</td><td>Act. Rev: 38.99</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>PICK</td><td>Proj. Rev: 29995</td><td>Act. Rev: 38.99</td></tr><tr><td valign="top"/><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 1</td><td>Proj. Rev: 29995</td><td>Act. Rev: 38.99</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Pine</td><td>1</td><td>29995</td><td>38.99</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 PROD
@@ -107,11 +107,11 @@
 PROD
 "><td>Raisin</td><td>Proj. Rev: 299925</td><td>Actual Rev: 227.949999999</td></tr><tr class="
 ACT
-"><td>EAT</td><td>Proj. Rev: 0</td><td>Act. Rev: 0</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>EAT</td><td>Proj. Rev: 0</td><td>Act. Rev: 0</td></tr><tr><td valign="top"><table><tr class="NR"><td>Non-Recurring</td><td>Number: 17</td><td>Proj. Rev: 0</td><td>Act. Rev: 0</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Oak</td><td>17</td><td>0</td><td>0</td></tr><tr class="NR"/></table></td><td valign="top"/></tr><tr class="
 ACT
 "/><tr class="
 ACT
-"><td>SQUEEZE</td><td>Proj. Rev: 299925</td><td>Act. Rev: 227.949999999</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>SQUEEZE</td><td>Proj. Rev: 299925</td><td>Act. Rev: 227.949999999</td></tr><tr><td valign="top"/><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 15</td><td>Proj. Rev: 299925</td><td>Act. Rev: 227.949999999</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Oak</td><td>15</td><td>299925</td><td>227.95</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 PROD
@@ -119,7 +119,7 @@
 PROD
 "><td>Fig</td><td>Proj. Rev: 74990</td><td>Actual Rev: 136.24</td></tr><tr class="
 ACT
-"><td>PICK</td><td>Proj. Rev: 74990</td><td>Act. Rev: 136.24</td></tr><tr><td valign="top"/><td valign="top"/></tr><tr class="
+"><td>PICK</td><td>Proj. Rev: 74990</td><td>Act. Rev: 136.24</td></tr><tr><td valign="top"><table><tr class="NR"><td>Non-Recurring</td><td>Number: 1</td><td>Proj. Rev: 0</td><td>Act. Rev: 50</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Oak</td><td>1</td><td>0</td><td>50</td></tr><tr class="NR"/></table></td><td valign="top"><table><tr class="RC"><td>Recurring</td><td>Number: 2</td><td>Proj. Rev: 74990</td><td>Act. Rev: 86.239999999</td></tr><tr><td>Segment</td><td>Number</td><td>Proj. Rev</td><td>Act. Rev</td></tr><tr><td>Oak</td><td>2</td><td>74990</td><td>86.24</td></tr><tr class="RC"/></table></td></tr><tr class="
 ACT
 "/><tr class="
 PROD
diff --git a/tests/multiple/out/lettera.orig b/tests/multiple/out/lettera.orig
--- a/tests/multiple/out/lettera.orig
+++ b/tests/multiple/out/lettera.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>A</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterb.orig b/tests/multiple/out/letterb.orig
--- a/tests/multiple/out/letterb.orig
+++ b/tests/multiple/out/letterb.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>B</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterc.orig b/tests/multiple/out/letterc.orig
--- a/tests/multiple/out/letterc.orig
+++ b/tests/multiple/out/letterc.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>C</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterd.orig b/tests/multiple/out/letterd.orig
--- a/tests/multiple/out/letterd.orig
+++ b/tests/multiple/out/letterd.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>D</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/lettere.orig b/tests/multiple/out/lettere.orig
--- a/tests/multiple/out/lettere.orig
+++ b/tests/multiple/out/lettere.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>E</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterf.orig b/tests/multiple/out/letterf.orig
--- a/tests/multiple/out/letterf.orig
+++ b/tests/multiple/out/letterf.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>F</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterg.orig b/tests/multiple/out/letterg.orig
--- a/tests/multiple/out/letterg.orig
+++ b/tests/multiple/out/letterg.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>G</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterh.orig b/tests/multiple/out/letterh.orig
--- a/tests/multiple/out/letterh.orig
+++ b/tests/multiple/out/letterh.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>H</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterij.orig b/tests/multiple/out/letterij.orig
--- a/tests/multiple/out/letterij.orig
+++ b/tests/multiple/out/letterij.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>I, J</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterk.orig b/tests/multiple/out/letterk.orig
--- a/tests/multiple/out/letterk.orig
+++ b/tests/multiple/out/letterk.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>K</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterl.orig b/tests/multiple/out/letterl.orig
--- a/tests/multiple/out/letterl.orig
+++ b/tests/multiple/out/letterl.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>L</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterm.orig b/tests/multiple/out/letterm.orig
--- a/tests/multiple/out/letterm.orig
+++ b/tests/multiple/out/letterm.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>M</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/lettern.orig b/tests/multiple/out/lettern.orig
--- a/tests/multiple/out/lettern.orig
+++ b/tests/multiple/out/lettern.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>N</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/lettero.orig b/tests/multiple/out/lettero.orig
--- a/tests/multiple/out/lettero.orig
+++ b/tests/multiple/out/lettero.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>O</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterp.orig b/tests/multiple/out/letterp.orig
--- a/tests/multiple/out/letterp.orig
+++ b/tests/multiple/out/letterp.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>P</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterq.orig b/tests/multiple/out/letterq.orig
--- a/tests/multiple/out/letterq.orig
+++ b/tests/multiple/out/letterq.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>Q</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterr.orig b/tests/multiple/out/letterr.orig
--- a/tests/multiple/out/letterr.orig
+++ b/tests/multiple/out/letterr.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>R</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letters.orig b/tests/multiple/out/letters.orig
--- a/tests/multiple/out/letters.orig
+++ b/tests/multiple/out/letters.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>S</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/lettert.orig b/tests/multiple/out/lettert.orig
--- a/tests/multiple/out/lettert.orig
+++ b/tests/multiple/out/lettert.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>T</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letteruv.orig b/tests/multiple/out/letteruv.orig
--- a/tests/multiple/out/letteruv.orig
+++ b/tests/multiple/out/letteruv.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>U, V</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterw.orig b/tests/multiple/out/letterw.orig
--- a/tests/multiple/out/letterw.orig
+++ b/tests/multiple/out/letterw.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>W</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterx.orig b/tests/multiple/out/letterx.orig
--- a/tests/multiple/out/letterx.orig
+++ b/tests/multiple/out/letterx.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>X</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/lettery.orig b/tests/multiple/out/lettery.orig
--- a/tests/multiple/out/lettery.orig
+++ b/tests/multiple/out/lettery.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>Y</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/letterz.orig b/tests/multiple/out/letterz.orig
--- a/tests/multiple/out/letterz.orig
+++ b/tests/multiple/out/letterz.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>Z</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/multiple/out/titlepage.orig b/tests/multiple/out/titlepage.orig
--- a/tests/multiple/out/titlepage.orig
+++ b/tests/multiple/out/titlepage.orig
@@ -1,6 +1,6 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <title>Canting Dictionary</title>
 </head>
 <body bgcolor="#FFFAFA" text="#330000">
diff --git a/tests/xmlspec/REC-xml-20001006-review.html b/tests/xmlspec/REC-xml-20001006-review.html
--- a/tests/xmlspec/REC-xml-20001006-review.html
+++ b/tests/xmlspec/REC-xml-20001006-review.html
@@ -1,5 +1,6 @@
 <html lang="EN">
 <head>
+<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Extensible Markup Language (XML) 1.0 (Second Edition) -- Review Version</title>
 <style type="text/css">
@@ -175,7 +176,7 @@
 <br>C <a href="#sec-xml-and-sgml">XML and SGML</a> (Non-Normative)<br>D <a href="#sec-entexpand">Expansion of Entity and Character References</a> (Non-Normative)<br>E <a href="#determinism">Deterministic Content Models</a> (Non-Normative)<br>F <a href="#sec-guessing">Autodetection
 of Character Encodings</a> (Non-Normative)<br>����F.1 <a href="#sec-guessing-no-ext-info">Detection Without External Encoding Information</a>
 <br>����F.2 <a href="#sec-guessing-with-ext-info">Priorities in the Presence of External Encoding Information</a>
-<br>G <a href="#sec-xml-wg">W3C XML Working Group</a> (Non-Normative)<br>H <a href="#sec-core-wg">W3C XML Core Group</a> (Non-Normative)<br>I <a href="#id2657817">Production Notes</a> (Non-Normative)<br>
+<br>G <a href="#sec-xml-wg">W3C XML Working Group</a> (Non-Normative)<br>H <a href="#sec-core-wg">W3C XML Core Group</a> (Non-Normative)<br>I <a href="#id2657962">Production Notes</a> (Non-Normative)<br>
 </p>
 </div>
 <hr>
@@ -4378,7 +4379,7 @@
 <div class="diff-add"><div class="div1">
 
 <h2>
-<a name="id2657817"></a>I Production Notes (Non-Normative)</h2>
+<a name="id2657962"></a>I Production Notes (Non-Normative)</h2>
 <p>This Second Edition was encoded in the <a href="http://www.w3.org/XML/1998/06/xmlspec-v21.dtd">XMLspec
 DTD</a> (which has <a href="http://www.w3.org/XML/1998/06/xmlspec-report-v21.htm">documentation</a>
 available). The HTML versions were produced with a combination of the <a href="http://www.w3.org/XML/1998/06/xmlspec.xsl">xmlspec.xsl</a>, <a href="http://www.w3.org/XML/1998/06/diffspec.xsl">diffspec.xsl</a>,
diff --git a/tests/xmlspec/REC-xml-20001006.html b/tests/xmlspec/REC-xml-20001006.html
--- a/tests/xmlspec/REC-xml-20001006.html
+++ b/tests/xmlspec/REC-xml-20001006.html
@@ -1,5 +1,6 @@
 <html lang="EN">
 <head>
+<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Extensible Markup Language (XML) 1.0 (Second Edition)</title>
 <style type="text/css">
@@ -154,7 +155,7 @@
 <br>C <a href="#sec-xml-and-sgml">XML and SGML</a> (Non-Normative)<br>D <a href="#sec-entexpand">Expansion of Entity and Character References</a> (Non-Normative)<br>E <a href="#determinism">Deterministic Content Models</a> (Non-Normative)<br>F <a href="#sec-guessing">Autodetection
 of Character Encodings</a> (Non-Normative)<br>����F.1 <a href="#sec-guessing-no-ext-info">Detection Without External Encoding Information</a>
 <br>����F.2 <a href="#sec-guessing-with-ext-info">Priorities in the Presence of External Encoding Information</a>
-<br>G <a href="#sec-xml-wg">W3C XML Working Group</a> (Non-Normative)<br>H <a href="#sec-core-wg">W3C XML Core Group</a> (Non-Normative)<br>I <a href="#id2657817">Production Notes</a> (Non-Normative)<br>
+<br>G <a href="#sec-xml-wg">W3C XML Working Group</a> (Non-Normative)<br>H <a href="#sec-core-wg">W3C XML Core Group</a> (Non-Normative)<br>I <a href="#id2657962">Production Notes</a> (Non-Normative)<br>
 </p>
 </div>
 <hr>
@@ -4027,7 +4028,7 @@
 <div class="div1">
 
 <h2>
-<a name="id2657817"></a>I Production Notes (Non-Normative)</h2>
+<a name="id2657962"></a>I Production Notes (Non-Normative)</h2>
 <p>This Second Edition was encoded in the <a href="http://www.w3.org/XML/1998/06/xmlspec-v21.dtd">XMLspec
 DTD</a> (which has <a href="http://www.w3.org/XML/1998/06/xmlspec-report-v21.htm">documentation</a>
 available). The HTML versions were produced with a combination of the <a href="http://www.w3.org/XML/1998/06/xmlspec.xsl">xmlspec.xsl</a>, <a href="http://www.w3.org/XML/1998/06/diffspec.xsl">diffspec.xsl</a>,