Updated tests for new HTML format.

Verified against old tests using tidy and diff.
This commit is contained in:
John MacFarlane 2011-02-04 20:37:58 -08:00
parent 99cb6076f8
commit 90647a56f6
11 changed files with 1265 additions and 1673 deletions

View file

@ -1,50 +1,15 @@
<h1 id="lhs-test" <h1 id="lhs-test">lhs test</h1>
>lhs test</h1
><p <p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p>
><code
>unsplit</code <pre class="sourceCode haskell"><code>&gt; <span class="ot">unsplit </span><span class="ot">::</span> (<span class="dt">Arrow</span> a) <span class="ot">=&gt;</span> (b <span class="ot">-&gt;</span> c <span class="ot">-&gt;</span> d) <span class="ot">-&gt;</span> a (b, c) d<br/>&gt; unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span class="fu">uncurry</span> <br/>&gt; <span class="co">-- arr (\op (x,y) -&gt; x `op` y) </span></code></pre>
> is an arrow that takes a pair of values and combines them to return a single value:</p
><pre class="sourceCode haskell" <p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p>
><code
>&gt; <span class="ot" <pre><code>f *** g = first f &gt;&gt;&gt; second g</code></pre>
>unsplit </span
><span class="ot" <p>Block quote:</p>
>::</span
> (<span class="dt" <blockquote>
>Arrow</span <p>foo bar</p>
> a) <span class="ot" </blockquote>
>=&gt;</span
> (b <span class="ot"
>-&gt;</span
> c <span class="ot"
>-&gt;</span
> d) <span class="ot"
>-&gt;</span
> a (b, c) d<br
/>&gt; unsplit <span class="fu"
>=</span
> arr <span class="fu"
>.</span
> <span class="fu"
>uncurry</span
> <br
/>&gt; <span class="co"
>-- arr (\op (x,y) -&gt; x `op` y) </span
></code
></pre
><p
><code
>(***)</code
> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p
><pre
><code
>f *** g = first f &gt;&gt;&gt; second g
</code
></pre
><p
>Block quote:</p
><blockquote
><p
>foo bar</p
></blockquote
>

View file

@ -25,55 +25,20 @@ code.sourceCode span.er { color: red; font-weight: bold; }
</style> </style>
</head> </head>
<body> <body>
<h1 id="lhs-test" <h1 id="lhs-test">lhs test</h1>
>lhs test</h1
><p <p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p>
><code
>unsplit</code <pre class="sourceCode"><code class="sourceCode haskell"><span class="ot">unsplit </span><span class="ot">::</span> (<span class="dt">Arrow</span> a) <span class="ot">=&gt;</span> (b <span class="ot">-&gt;</span> c <span class="ot">-&gt;</span> d) <span class="ot">-&gt;</span> a (b, c) d<br />unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span class="fu">uncurry</span> <br /> <span class="co">-- arr (\op (x,y) -&gt; x `op` y) </span></code></pre>
> is an arrow that takes a pair of values and combines them to return a single value:</p
><pre class="sourceCode" <p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p>
><code class="sourceCode haskell"
><span class="ot" <pre><code>f *** g = first f &gt;&gt;&gt; second g
>unsplit </span </code></pre>
><span class="ot"
>::</span <p>Block quote:</p>
> (<span class="dt"
>Arrow</span <blockquote>
> a) <span class="ot" <p>foo bar</p></blockquote>
>=&gt;</span
> (b <span class="ot"
>-&gt;</span
> c <span class="ot"
>-&gt;</span
> d) <span class="ot"
>-&gt;</span
> a (b, c) d<br
/>unsplit <span class="fu"
>=</span
> arr <span class="fu"
>.</span
> <span class="fu"
>uncurry</span
> <br
/> <span class="co"
>-- arr (\op (x,y) -&gt; x `op` y) </span
></code
></pre
><p
><code
>(***)</code
> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p
><pre
><code
>f *** g = first f &gt;&gt;&gt; second g
</code
></pre
><p
>Block quote:</p
><blockquote
><p
>foo bar</p
></blockquote
>
</body> </body>
</html> </html>

View file

@ -25,55 +25,20 @@ code.sourceCode span.er { color: red; font-weight: bold; }
</style> </style>
</head> </head>
<body> <body>
<h1 id="lhs-test" <h1 id="lhs-test">lhs test</h1>
>lhs test</h1
><p <p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p>
><code
>unsplit</code <pre class="sourceCode"><code class="sourceCode haskell">&gt; <span class="ot">unsplit </span><span class="ot">::</span> (<span class="dt">Arrow</span> a) <span class="ot">=&gt;</span> (b <span class="ot">-&gt;</span> c <span class="ot">-&gt;</span> d) <span class="ot">-&gt;</span> a (b, c) d<br />&gt; unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span class="fu">uncurry</span> <br />&gt; <span class="co">-- arr (\op (x,y) -&gt; x `op` y) </span></code></pre>
> is an arrow that takes a pair of values and combines them to return a single value:</p
><pre class="sourceCode" <p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p>
><code class="sourceCode haskell"
>&gt; <span class="ot" <pre><code>f *** g = first f &gt;&gt;&gt; second g
>unsplit </span </code></pre>
><span class="ot"
>::</span <p>Block quote:</p>
> (<span class="dt"
>Arrow</span <blockquote>
> a) <span class="ot" <p>foo bar</p></blockquote>
>=&gt;</span
> (b <span class="ot"
>-&gt;</span
> c <span class="ot"
>-&gt;</span
> d) <span class="ot"
>-&gt;</span
> a (b, c) d<br
/>&gt; unsplit <span class="fu"
>=</span
> arr <span class="fu"
>.</span
> <span class="fu"
>uncurry</span
> <br
/>&gt; <span class="co"
>-- arr (\op (x,y) -&gt; x `op` y) </span
></code
></pre
><p
><code
>(***)</code
> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p
><pre
><code
>f *** g = first f &gt;&gt;&gt; second g
</code
></pre
><p
>Block quote:</p
><blockquote
><p
>foo bar</p
></blockquote
>
</body> </body>
</html> </html>

View file

@ -6,34 +6,23 @@
<title></title> <title></title>
</head> </head>
<body> <body>
<h1 id="lhs-test" <h1 id="lhs-test">lhs test</h1>
>lhs test</h1
><p <p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p>
><code
>unsplit</code <pre class="sourceCode haskell"><code>unsplit :: (Arrow a) =&gt; (b -&gt; c -&gt; d) -&gt; a (b, c) d
> is an arrow that takes a pair of values and combines them to return a single value:</p
><pre class="sourceCode haskell"
><code
>unsplit :: (Arrow a) =&gt; (b -&gt; c -&gt; d) -&gt; a (b, c) d
unsplit = arr . uncurry unsplit = arr . uncurry
-- arr (\op (x,y) -&gt; x `op` y) -- arr (\op (x,y) -&gt; x `op` y)
</code </code></pre>
></pre
><p <p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p>
><code
>(***)</code <pre><code>f *** g = first f &gt;&gt;&gt; second g
> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p </code></pre>
><pre
><code <p>Block quote:</p>
>f *** g = first f &gt;&gt;&gt; second g
</code <blockquote>
></pre <p>foo bar</p></blockquote>
><p
>Block quote:</p
><blockquote
><p
>foo bar</p
></blockquote
>
</body> </body>
</html> </html>

View file

@ -6,34 +6,23 @@
<title></title> <title></title>
</head> </head>
<body> <body>
<h1 id="lhs-test" <h1 id="lhs-test">lhs test</h1>
>lhs test</h1
><p <p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p>
><code
>unsplit</code <pre class="sourceCode literate haskell"><code>&gt; unsplit :: (Arrow a) =&gt; (b -&gt; c -&gt; d) -&gt; a (b, c) d
> is an arrow that takes a pair of values and combines them to return a single value:</p
><pre class="sourceCode literate haskell"
><code
>&gt; unsplit :: (Arrow a) =&gt; (b -&gt; c -&gt; d) -&gt; a (b, c) d
&gt; unsplit = arr . uncurry &gt; unsplit = arr . uncurry
&gt; -- arr (\op (x,y) -&gt; x `op` y) &gt; -- arr (\op (x,y) -&gt; x `op` y)
</code </code></pre>
></pre
><p <p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p>
><code
>(***)</code <pre><code>f *** g = first f &gt;&gt;&gt; second g
> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p </code></pre>
><pre
><code <p>Block quote:</p>
>f *** g = first f &gt;&gt;&gt; second g
</code <blockquote>
></pre <p>foo bar</p></blockquote>
><p
>Block quote:</p
><blockquote
><p
>foo bar</p
></blockquote
>
</body> </body>
</html> </html>

View file

@ -35,25 +35,31 @@
<h4>July 15, 2006</h4> <h4>July 15, 2006</h4>
</div> </div>
<div class="slide"> <div class="slide">
<h1
>First slide</h1
><ul <h1>First slide</h1>
><li
>first bullet</li <ul>
><li <li>
>second bullet</li first bullet</li>
></ul <li>
></div> second bullet</li>
</ul>
</div>
<div class="slide"> <div class="slide">
<h1
>Math</h1
><ul <h1>Math</h1>
><li
><span class="math" <ul>
>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span <li>
></li <span class="math">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span></li>
></ul </ul>
></div>
</div>
</div> </div>
</body> </body>
</html> </html>

View file

@ -17,8 +17,7 @@
<link rel="stylesheet" href="ui/default/opera.css" type="text/css" media="projection" id="operaFix" /> <link rel="stylesheet" href="ui/default/opera.css" type="text/css" media="projection" id="operaFix" />
<!-- S5 JS --> <!-- S5 JS -->
<script src="ui/default/slides.js" type="text/javascript"></script> <script src="ui/default/slides.js" type="text/javascript"></script>
<script type="text/javascript" <script type="text/javascript">/*
>/*
LaTeXMathML.js from http://math.etsu.edu/LaTeXMathML/ LaTeXMathML.js from http://math.etsu.edu/LaTeXMathML/
Adapted by Jeff Knisely and Douglas Woodall from ASCIIMathML.js v. 1.4.7, Adapted by Jeff Knisely and Douglas Woodall from ASCIIMathML.js v. 1.4.7,
(c) 2005 Peter Jipsen http://www.chapman.edu/~jipsen. (c) 2005 Peter Jipsen http://www.chapman.edu/~jipsen.
@ -216,8 +215,7 @@
{existing();generic();};} {existing();generic();};}
else else
{window.onload=generic;}} {window.onload=generic;}}
</script </script>
>
</head> </head>
<body> <body>
<div class="layout"> <div class="layout">
@ -236,25 +234,31 @@
<h4>July 15, 2006</h4> <h4>July 15, 2006</h4>
</div> </div>
<div class="slide"> <div class="slide">
<h1
>First slide</h1
><ul class="incremental" <h1>First slide</h1>
><li
>first bullet</li <ul class="incremental">
><li <li>
>second bullet</li first bullet</li>
></ul <li>
></div> second bullet</li>
</ul>
</div>
<div class="slide"> <div class="slide">
<h1
>Math</h1
><ul class="incremental" <h1>Math</h1>
><li
><span class="LaTeX" <ul class="incremental">
>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span <li>
></li <span class="LaTeX">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span></li>
></ul </ul>
></div>
</div>
</div> </div>
</body> </body>
</html> </html>

View file

@ -1,17 +1,15 @@
<h1 id="first-slide" <h1 id="first-slide">First slide</h1>
>First slide</h1
><ul <ul>
><li <li>
>first bullet</li first bullet</li>
><li <li>
>second bullet</li second bullet</li>
></ul </ul>
><h1 id="math"
>Math</h1 <h1 id="math">Math</h1>
><ul
><li <ul>
><span class="math" <li>
>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span <span class="math">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span></li>
></li </ul>
></ul
>

View file

@ -13,23 +13,21 @@
<body> <body>
STUFF INSERTED STUFF INSERTED
<h1 class="title">My S5 Document</h1> <h1 class="title">My S5 Document</h1>
<h1 id="first-slide" <h1 id="first-slide">First slide</h1>
>First slide</h1
><ul <ul>
><li <li>
>first bullet</li first bullet</li>
><li <li>
>second bullet</li second bullet</li>
></ul </ul>
><h1 id="math"
>Math</h1 <h1 id="math">Math</h1>
><ul
><li <ul>
><span class="math" <li>
>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span <span class="math">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span></li>
></li </ul>
></ul
>
STUFF INSERTED STUFF INSERTED
</body> </body>
</html> </html>

View file

@ -1,301 +1,234 @@
<p <p>Simple table with caption:</p>
>Simple table with caption:</p
><table <table><caption>Demonstration of simple table syntax.</caption><thead><tr class="header"><th align="right">
><caption Right</th>
>Demonstration of simple table syntax.</caption <th align="left">
><thead Left</th>
><tr class="header" <th align="center">
><th align="right" Center</th>
>Right</th <th align="left">
><th align="left" Default</th>
>Left</th </tr>
><th align="center" </thead><tbody><tr class="odd"><td align="right">
>Center</th 12</td>
><th align="left" <td align="left">
>Default</th 12</td>
></tr <td align="center">
></thead 12</td>
><tbody <td align="left">
><tr class="odd" 12</td>
><td align="right" </tr>
>12</td <tr class="even"><td align="right">
><td align="left" 123</td>
>12</td <td align="left">
><td align="center" 123</td>
>12</td <td align="center">
><td align="left" 123</td>
>12</td <td align="left">
></tr 123</td>
><tr class="even" </tr>
><td align="right" <tr class="odd"><td align="right">
>123</td 1</td>
><td align="left" <td align="left">
>123</td 1</td>
><td align="center" <td align="center">
>123</td 1</td>
><td align="left" <td align="left">
>123</td 1</td>
></tr </tr>
><tr class="odd" </tbody></table>
><td align="right"
>1</td <p>Simple table without caption:</p>
><td align="left"
>1</td <table><thead><tr class="header"><th align="right">
><td align="center" Right</th>
>1</td <th align="left">
><td align="left" Left</th>
>1</td <th align="center">
></tr Center</th>
></tbody <th align="left">
></table Default</th>
><p </tr>
>Simple table without caption:</p </thead><tbody><tr class="odd"><td align="right">
><table 12</td>
><thead <td align="left">
><tr class="header" 12</td>
><th align="right" <td align="center">
>Right</th 12</td>
><th align="left" <td align="left">
>Left</th 12</td>
><th align="center" </tr>
>Center</th <tr class="even"><td align="right">
><th align="left" 123</td>
>Default</th <td align="left">
></tr 123</td>
></thead <td align="center">
><tbody 123</td>
><tr class="odd" <td align="left">
><td align="right" 123</td>
>12</td </tr>
><td align="left" <tr class="odd"><td align="right">
>12</td 1</td>
><td align="center" <td align="left">
>12</td 1</td>
><td align="left" <td align="center">
>12</td 1</td>
></tr <td align="left">
><tr class="even" 1</td>
><td align="right" </tr>
>123</td </tbody></table>
><td align="left"
>123</td <p>Simple table indented two spaces:</p>
><td align="center"
>123</td <table><caption>Demonstration of simple table syntax.</caption><thead><tr class="header"><th align="right">
><td align="left" Right</th>
>123</td <th align="left">
></tr Left</th>
><tr class="odd" <th align="center">
><td align="right" Center</th>
>1</td <th align="left">
><td align="left" Default</th>
>1</td </tr>
><td align="center" </thead><tbody><tr class="odd"><td align="right">
>1</td 12</td>
><td align="left" <td align="left">
>1</td 12</td>
></tr <td align="center">
></tbody 12</td>
></table <td align="left">
><p 12</td>
>Simple table indented two spaces:</p </tr>
><table <tr class="even"><td align="right">
><caption 123</td>
>Demonstration of simple table syntax.</caption <td align="left">
><thead 123</td>
><tr class="header" <td align="center">
><th align="right" 123</td>
>Right</th <td align="left">
><th align="left" 123</td>
>Left</th </tr>
><th align="center" <tr class="odd"><td align="right">
>Center</th 1</td>
><th align="left" <td align="left">
>Default</th 1</td>
></tr <td align="center">
></thead 1</td>
><tbody <td align="left">
><tr class="odd" 1</td>
><td align="right" </tr>
>12</td </tbody></table>
><td align="left"
>12</td <p>Multiline table with caption:</p>
><td align="center"
>12</td <table><caption>Here's the caption. It may span multiple lines.</caption><col width="15%" /><col width="13%" /><col width="16%" /><col width="33%" /><thead><tr class="header"><th align="center">
><td align="left" Centered Header</th>
>12</td <th align="left">
></tr Left Aligned</th>
><tr class="even" <th align="right">
><td align="right" Right Aligned</th>
>123</td <th align="left">
><td align="left" Default aligned</th>
>123</td </tr>
><td align="center" </thead><tbody><tr class="odd"><td align="center">
>123</td First</td>
><td align="left" <td align="left">
>123</td row</td>
></tr <td align="right">
><tr class="odd" 12.0</td>
><td align="right" <td align="left">
>1</td Example of a row that spans multiple lines.</td>
><td align="left" </tr>
>1</td <tr class="even"><td align="center">
><td align="center" Second</td>
>1</td <td align="left">
><td align="left" row</td>
>1</td <td align="right">
></tr 5.0</td>
></tbody <td align="left">
></table Here's another one. Note the blank line between rows.</td>
><p </tr>
>Multiline table with caption:</p </tbody></table>
><table
><caption <p>Multiline table without caption:</p>
>Here's the caption. It may span multiple lines.</caption
><col width="15%" <table><col width="15%" /><col width="13%" /><col width="16%" /><col width="33%" /><thead><tr class="header"><th align="center">
/><col width="13%" Centered Header</th>
/><col width="16%" <th align="left">
/><col width="33%" Left Aligned</th>
/><thead <th align="right">
><tr class="header" Right Aligned</th>
><th align="center" <th align="left">
>Centered Header</th Default aligned</th>
><th align="left" </tr>
>Left Aligned</th </thead><tbody><tr class="odd"><td align="center">
><th align="right" First</td>
>Right Aligned</th <td align="left">
><th align="left" row</td>
>Default aligned</th <td align="right">
></tr 12.0</td>
></thead <td align="left">
><tbody Example of a row that spans multiple lines.</td>
><tr class="odd" </tr>
><td align="center" <tr class="even"><td align="center">
>First</td Second</td>
><td align="left" <td align="left">
>row</td row</td>
><td align="right" <td align="right">
>12.0</td 5.0</td>
><td align="left" <td align="left">
>Example of a row that spans multiple lines.</td Here's another one. Note the blank line between rows.</td>
></tr </tr>
><tr class="even" </tbody></table>
><td align="center"
>Second</td <p>Table without column headers:</p>
><td align="left"
>row</td <table><tbody><tr class="odd"><td align="right">
><td align="right" 12</td>
>5.0</td <td align="left">
><td align="left" 12</td>
>Here's another one. Note the blank line between rows.</td <td align="center">
></tr 12</td>
></tbody <td align="right">
></table 12</td>
><p </tr>
>Multiline table without caption:</p <tr class="even"><td align="right">
><table 123</td>
><col width="15%" <td align="left">
/><col width="13%" 123</td>
/><col width="16%" <td align="center">
/><col width="33%" 123</td>
/><thead <td align="right">
><tr class="header" 123</td>
><th align="center" </tr>
>Centered Header</th <tr class="odd"><td align="right">
><th align="left" 1</td>
>Left Aligned</th <td align="left">
><th align="right" 1</td>
>Right Aligned</th <td align="center">
><th align="left" 1</td>
>Default aligned</th <td align="right">
></tr 1</td>
></thead </tr>
><tbody </tbody></table>
><tr class="odd"
><td align="center" <p>Multiline table without column headers:</p>
>First</td
><td align="left" <table><col width="15%" /><col width="13%" /><col width="16%" /><col width="33%" /><tbody><tr class="odd"><td align="center">
>row</td First</td>
><td align="right" <td align="left">
>12.0</td row</td>
><td align="left" <td align="right">
>Example of a row that spans multiple lines.</td 12.0</td>
></tr <td align="left">
><tr class="even" Example of a row that spans multiple lines.</td>
><td align="center" </tr>
>Second</td <tr class="even"><td align="center">
><td align="left" Second</td>
>row</td <td align="left">
><td align="right" row</td>
>5.0</td <td align="right">
><td align="left" 5.0</td>
>Here's another one. Note the blank line between rows.</td <td align="left">
></tr Here's another one. Note the blank line between rows.</td>
></tbody </tr>
></table </tbody></table>
><p
>Table without column headers:</p
><table
><tbody
><tr class="odd"
><td align="right"
>12</td
><td align="left"
>12</td
><td align="center"
>12</td
><td align="right"
>12</td
></tr
><tr class="even"
><td align="right"
>123</td
><td align="left"
>123</td
><td align="center"
>123</td
><td align="right"
>123</td
></tr
><tr class="odd"
><td align="right"
>1</td
><td align="left"
>1</td
><td align="center"
>1</td
><td align="right"
>1</td
></tr
></tbody
></table
><p
>Multiline table without column headers:</p
><table
><col width="15%"
/><col width="13%"
/><col width="16%"
/><col width="33%"
/><tbody
><tr class="odd"
><td align="center"
>First</td
><td align="left"
>row</td
><td align="right"
>12.0</td
><td align="left"
>Example of a row that spans multiple lines.</td
></tr
><tr class="even"
><td align="center"
>Second</td
><td align="left"
>row</td
><td align="right"
>5.0</td
><td align="left"
>Here's another one. Note the blank line between rows.</td
></tr
></tbody
></table
>

File diff suppressed because it is too large Load diff