diff options
| author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2009-07-03 03:05:29 +0000 |
|---|---|---|
| committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2009-07-03 03:05:29 +0000 |
| commit | 7e8ea0ae74bcb56b3b91cc461fb7bd38468fe31b (patch) | |
| tree | eda3b6f687ca4a4adfdf34e6642537d775debe4e | |
| parent | c177c7095938e8db29044c0f8194e53c6a2be61f (diff) | |
| download | pandoc-7e8ea0ae74bcb56b3b91cc461fb7bd38468fe31b.tar.gz | |
Fixed lhs test cases.
+ Changed Setup.hs in accord with change in '--version'
output.
+ Changed lhs test cases in accord with change in
the way HTML headers are written (they are now put
in divs, and the id is put on the div rather than the
header itself).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1588 788f1e2b-df1e-0410-8736-df70ead52e1b
| -rw-r--r-- | Setup.hs | 2 | ||||
| -rw-r--r-- | tests/lhs-test.fragment.html+lhs | 96 | ||||
| -rw-r--r-- | tests/lhs-test.html | 84 | ||||
| -rw-r--r-- | tests/lhs-test.html+lhs | 96 |
4 files changed, 142 insertions, 136 deletions
@@ -22,7 +22,7 @@ runTestSuite _ _ _ _ = do (outputPath, hOut) <- openTempFile tempPath "out" runProcess "pandoc" ["--version"] Nothing Nothing Nothing (Just hOut) Nothing >>= waitForProcess output <- readFile outputPath - let highlightingSupport = "+highlighting" `isInfixOf` output + let highlightingSupport = "with syntax highlighting" `isInfixOf` output let testArgs = if highlightingSupport then ["lhs"] else [] let testCmd = "runhaskell -i.. RunTests.hs " ++ unwords testArgs inDirectory "tests" $ runCommand testCmd >>= waitForProcess >>= exitWith diff --git a/tests/lhs-test.fragment.html+lhs b/tests/lhs-test.fragment.html+lhs index 27f25eb8c..2100db251 100644 --- a/tests/lhs-test.fragment.html+lhs +++ b/tests/lhs-test.fragment.html+lhs @@ -1,49 +1,51 @@ -<h1 id="lhs-test" ->lhs test</h1 -><p -><code - >unsplit</code - > is an arrow that takes a pair of values and combines them to return a single value:</p -><pre class="sourceCode literatehaskell" -><code - ><span class="Char Special" - >></span - ><span class="Function FunctionDefinition" - > unsplit ::</span - ><span class="Normal NormalText" - > (Arrow a) => (b -> c -> d) -> a (b, c) d</span - ><br - /><span class="Char Special" - >></span - ><span class="Normal NormalText" - > unsplit = arr . </span - ><span class="Function" - >uncurry</span - ><span class="Normal NormalText" - > </span - ><br - /><span class="Char Special" - >></span - ><span class="Normal NormalText" - > </span - ><span class="Comment" - >-- arr (\op (x,y) -> x `op` y) </span - ><br - /></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 >>> second g +<div id="lhs-test" +><h1 + >lhs test</h1 + ><p + ><code + >unsplit</code + > is an arrow that takes a pair of values and combines them to return a single value:</p + ><pre class="sourceCode literatehaskell" + ><code + ><span class="Char Special" + >></span + ><span class="Function FunctionDefinition" + > unsplit ::</span + ><span class="Normal NormalText" + > (Arrow a) => (b -> c -> d) -> a (b, c) d</span + ><br + /><span class="Char Special" + >></span + ><span class="Normal NormalText" + > unsplit = arr . </span + ><span class="Function" + >uncurry</span + ><span class="Normal NormalText" + > </span + ><br + /><span class="Char Special" + >></span + ><span class="Normal NormalText" + > </span + ><span class="Comment" + >-- arr (\op (x,y) -> x `op` y) </span + ><br + /></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 >>> second g </code - ></pre -><p ->Block quote:</p -><blockquote -><p - >foo bar</p - ></blockquote + ></pre + ><p + >Block quote:</p + ><blockquote + ><p + >foo bar</p + ></blockquote + ></div > diff --git a/tests/lhs-test.html b/tests/lhs-test.html index 2aa29edb2..5ab1ee102 100644 --- a/tests/lhs-test.html +++ b/tests/lhs-test.html @@ -29,48 +29,50 @@ pre.sourceCode span.Error { color: red; font-weight: bold; } </style ></head ><body - ><h1 id="lhs-test" - >lhs test</h1 - ><p - ><code - >unsplit</code - > is an arrow that takes a pair of values and combines them to return a single value:</p - ><pre class="sourceCode haskell" - ><code - ><span class="Function FunctionDefinition" - >unsplit ::</span - ><span class="Normal NormalText" - > (Arrow a) => (b -> c -> d) -> a (b, c) d</span - ><br - /><span class="Normal NormalText" - >unsplit = arr . </span - ><span class="Function" - >uncurry</span - ><span class="Normal NormalText" - > </span - ><br - /><span class="Normal NormalText" - > </span - ><span class="Comment" - >-- arr (\op (x,y) -> x `op` y) </span - ><br - /></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 >>> second g + ><div id="lhs-test" + ><h1 + >lhs test</h1 + ><p + ><code + >unsplit</code + > is an arrow that takes a pair of values and combines them to return a single value:</p + ><pre class="sourceCode haskell" + ><code + ><span class="Function FunctionDefinition" + >unsplit ::</span + ><span class="Normal NormalText" + > (Arrow a) => (b -> c -> d) -> a (b, c) d</span + ><br + /><span class="Normal NormalText" + >unsplit = arr . </span + ><span class="Function" + >uncurry</span + ><span class="Normal NormalText" + > </span + ><br + /><span class="Normal NormalText" + > </span + ><span class="Comment" + >-- arr (\op (x,y) -> x `op` y) </span + ><br + /></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 >>> second g </code - ></pre - ><p - >Block quote:</p - ><blockquote - ><p - >foo bar</p - ></blockquote + ></pre + ><p + >Block quote:</p + ><blockquote + ><p + >foo bar</p + ></blockquote + ></div ></body ></html > diff --git a/tests/lhs-test.html+lhs b/tests/lhs-test.html+lhs index 8b171bd0f..d57ffc652 100644 --- a/tests/lhs-test.html+lhs +++ b/tests/lhs-test.html+lhs @@ -29,54 +29,56 @@ pre.sourceCode span.Error { color: red; font-weight: bold; } </style ></head ><body - ><h1 id="lhs-test" - >lhs test</h1 - ><p - ><code - >unsplit</code - > is an arrow that takes a pair of values and combines them to return a single value:</p - ><pre class="sourceCode literatehaskell" - ><code - ><span class="Char Special" - >></span - ><span class="Function FunctionDefinition" - > unsplit ::</span - ><span class="Normal NormalText" - > (Arrow a) => (b -> c -> d) -> a (b, c) d</span - ><br - /><span class="Char Special" - >></span - ><span class="Normal NormalText" - > unsplit = arr . </span - ><span class="Function" - >uncurry</span - ><span class="Normal NormalText" - > </span - ><br - /><span class="Char Special" - >></span - ><span class="Normal NormalText" - > </span - ><span class="Comment" - >-- arr (\op (x,y) -> x `op` y) </span - ><br - /></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 >>> second g + ><div id="lhs-test" + ><h1 + >lhs test</h1 + ><p + ><code + >unsplit</code + > is an arrow that takes a pair of values and combines them to return a single value:</p + ><pre class="sourceCode literatehaskell" + ><code + ><span class="Char Special" + >></span + ><span class="Function FunctionDefinition" + > unsplit ::</span + ><span class="Normal NormalText" + > (Arrow a) => (b -> c -> d) -> a (b, c) d</span + ><br + /><span class="Char Special" + >></span + ><span class="Normal NormalText" + > unsplit = arr . </span + ><span class="Function" + >uncurry</span + ><span class="Normal NormalText" + > </span + ><br + /><span class="Char Special" + >></span + ><span class="Normal NormalText" + > </span + ><span class="Comment" + >-- arr (\op (x,y) -> x `op` y) </span + ><br + /></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 >>> second g </code - ></pre - ><p - >Block quote:</p - ><blockquote - ><p - >foo bar</p - ></blockquote + ></pre + ><p + >Block quote:</p + ><blockquote + ><p + >foo bar</p + ></blockquote + ></div ></body ></html > |