7e8ea0a · typeable/pandoc

git.iko.soy/typeable/pandoc

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

commit7e8ea0ae74bcb56b3b91cc461fb7bd38468fe31b authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateFri 3 Jul 2009, 03:05 (17 years ago) parentc177c70

4 files changed+142−136

compare with master

unifiedsplit

Setup.hs+1−1 tests/lhs-test.fragment.html+lhs+49−47 tests/lhs-test.html+43−41 tests/lhs-test.html+lhs+49−47

Setup.hs+1−1

@@ -22,7 +22,7 @@ runTestSuite _ _ _ _ = do

2222 (outputPath, hOut) <- openTempFile tempPath "out"

2323 runProcess "pandoc" ["--version"] Nothing Nothing Nothing (Just hOut) Nothing >>= waitForProcess

2424 output <- readFile outputPath

25− let highlightingSupport = "+highlighting" `isInfixOf` output

25+ let highlightingSupport = "with syntax highlighting" `isInfixOf` output

2626 let testArgs = if highlightingSupport then ["lhs"] else []

2727 let testCmd = "runhaskell -i.. RunTests.hs " ++ unwords testArgs

2828 inDirectory "tests" $ runCommand testCmd >>= waitForProcess >>= exitWith

tests/lhs-test.fragment.html+lhs+49−47

@@ -1,49 +1,51 @@

1−<h1 id="lhs-test"

2−>lhs test</h1

3−><p

4−><code

5− >unsplit</code

6− > is an arrow that takes a pair of values and combines them to return a single value:</p

7−><pre class="sourceCode literatehaskell"

8−><code

9− ><span class="Char Special"

10− >></span

11− ><span class="Function FunctionDefinition"

12− > unsplit ::</span

13− ><span class="Normal NormalText"

14− > (Arrow a) => (b -> c -> d) -> a (b, c) d</span

15− ><br

16− /><span class="Char Special"

17− >></span

18− ><span class="Normal NormalText"

19− > unsplit = arr . </span

20− ><span class="Function"

21− >uncurry</span

22− ><span class="Normal NormalText"

23− > </span

24− ><br

25− /><span class="Char Special"

26− >></span

27− ><span class="Normal NormalText"

28− > </span

29− ><span class="Comment"

30− >-- arr (\op (x,y) -> x `op` y) </span

31− ><br

32− /></code

33− ></pre

34−><p

35−><code

36− >(***)</code

37− > 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

38−><pre

39−><code

40− >f *** g = first f >>> second g

1+<div id="lhs-test"

2+><h1

3+ >lhs test</h1

4+ ><p

5+ ><code

6+ >unsplit</code

7+ > is an arrow that takes a pair of values and combines them to return a single value:</p

8+ ><pre class="sourceCode literatehaskell"

9+ ><code

10+ ><span class="Char Special"

11+ >></span

12+ ><span class="Function FunctionDefinition"

13+ > unsplit ::</span

14+ ><span class="Normal NormalText"

15+ > (Arrow a) => (b -> c -> d) -> a (b, c) d</span

16+ ><br

17+ /><span class="Char Special"

18+ >></span

19+ ><span class="Normal NormalText"

20+ > unsplit = arr . </span

21+ ><span class="Function"

22+ >uncurry</span

23+ ><span class="Normal NormalText"

24+ > </span

25+ ><br

26+ /><span class="Char Special"

27+ >></span

28+ ><span class="Normal NormalText"

29+ > </span

30+ ><span class="Comment"

31+ >-- arr (\op (x,y) -> x `op` y) </span

32+ ><br

33+ /></code

34+ ></pre

35+ ><p

36+ ><code

37+ >(***)</code

38+ > 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

39+ ><pre

40+ ><code

41+ >f *** g = first f >>> second g

4142</code

42− ></pre

43−><p

44−>Block quote:</p

45−><blockquote

46−><p

47− >foo bar</p

48− ></blockquote

43+ ></pre

44+ ><p

45+ >Block quote:</p

46+ ><blockquote

47+ ><p

48+ >foo bar</p

49+ ></blockquote

50+ ></div

4951>

tests/lhs-test.html+43−41

@@ -29,48 +29,50 @@ pre.sourceCode span.Error { color: red; font-weight: bold; }

2929</style

3030 ></head

3131 ><body

32− ><h1 id="lhs-test"

33− >lhs test</h1

34− ><p

35− ><code

36− >unsplit</code

37− > is an arrow that takes a pair of values and combines them to return a single value:</p

38− ><pre class="sourceCode haskell"

39− ><code

40− ><span class="Function FunctionDefinition"

41− >unsplit ::</span

42− ><span class="Normal NormalText"

43− > (Arrow a) => (b -> c -> d) -> a (b, c) d</span

44− ><br

45− /><span class="Normal NormalText"

46− >unsplit = arr . </span

47− ><span class="Function"

48− >uncurry</span

49− ><span class="Normal NormalText"

50− > </span

51− ><br

52− /><span class="Normal NormalText"

53− > </span

54− ><span class="Comment"

55− >-- arr (\op (x,y) -> x `op` y) </span

56− ><br

57− /></code

58− ></pre

59− ><p

60− ><code

61− >(***)</code

62− > 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

63− ><pre

64− ><code

65− >f *** g = first f >>> second g

32+ ><div id="lhs-test"

33+ ><h1

34+ >lhs test</h1

35+ ><p

36+ ><code

37+ >unsplit</code

38+ > is an arrow that takes a pair of values and combines them to return a single value:</p

39+ ><pre class="sourceCode haskell"

40+ ><code

41+ ><span class="Function FunctionDefinition"

42+ >unsplit ::</span

43+ ><span class="Normal NormalText"

44+ > (Arrow a) => (b -> c -> d) -> a (b, c) d</span

45+ ><br

46+ /><span class="Normal NormalText"

47+ >unsplit = arr . </span

48+ ><span class="Function"

49+ >uncurry</span

50+ ><span class="Normal NormalText"

51+ > </span

52+ ><br

53+ /><span class="Normal NormalText"

54+ > </span

55+ ><span class="Comment"

56+ >-- arr (\op (x,y) -> x `op` y) </span

57+ ><br

58+ /></code

59+ ></pre

60+ ><p

61+ ><code

62+ >(***)</code

63+ > 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

64+ ><pre

65+ ><code

66+ >f *** g = first f >>> second g

6667</code

67− ></pre

68− ><p

69− >Block quote:</p

70− ><blockquote

71− ><p

72− >foo bar</p

73− ></blockquote

68+ ></pre

69+ ><p

70+ >Block quote:</p

71+ ><blockquote

72+ ><p

73+ >foo bar</p

74+ ></blockquote

75+ ></div

7476 ></body

7577 ></html

7678>

tests/lhs-test.html+lhs+49−47

@@ -29,54 +29,56 @@ pre.sourceCode span.Error { color: red; font-weight: bold; }

2929</style

3030 ></head

3131 ><body

32− ><h1 id="lhs-test"

33− >lhs test</h1

34− ><p

35− ><code

36− >unsplit</code

37− > is an arrow that takes a pair of values and combines them to return a single value:</p

38− ><pre class="sourceCode literatehaskell"

39− ><code

40− ><span class="Char Special"

41− >></span

42− ><span class="Function FunctionDefinition"

43− > unsplit ::</span

44− ><span class="Normal NormalText"

45− > (Arrow a) => (b -> c -> d) -> a (b, c) d</span

46− ><br

47− /><span class="Char Special"

48− >></span

49− ><span class="Normal NormalText"

50− > unsplit = arr . </span

51− ><span class="Function"

52− >uncurry</span

53− ><span class="Normal NormalText"

54− > </span

55− ><br

56− /><span class="Char Special"

57− >></span

58− ><span class="Normal NormalText"

59− > </span

60− ><span class="Comment"

61− >-- arr (\op (x,y) -> x `op` y) </span

62− ><br

63− /></code

64− ></pre

65− ><p

66− ><code

67− >(***)</code

68− > 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

69− ><pre

70− ><code

71− >f *** g = first f >>> second g

32+ ><div id="lhs-test"

33+ ><h1

34+ >lhs test</h1

35+ ><p

36+ ><code

37+ >unsplit</code

38+ > is an arrow that takes a pair of values and combines them to return a single value:</p

39+ ><pre class="sourceCode literatehaskell"

40+ ><code

41+ ><span class="Char Special"

42+ >></span

43+ ><span class="Function FunctionDefinition"

44+ > unsplit ::</span

45+ ><span class="Normal NormalText"

46+ > (Arrow a) => (b -> c -> d) -> a (b, c) d</span

47+ ><br

48+ /><span class="Char Special"

49+ >></span

50+ ><span class="Normal NormalText"

51+ > unsplit = arr . </span

52+ ><span class="Function"

53+ >uncurry</span

54+ ><span class="Normal NormalText"

55+ > </span

56+ ><br

57+ /><span class="Char Special"

58+ >></span

59+ ><span class="Normal NormalText"

60+ > </span

61+ ><span class="Comment"

62+ >-- arr (\op (x,y) -> x `op` y) </span

63+ ><br

64+ /></code

65+ ></pre

66+ ><p

67+ ><code

68+ >(***)</code

69+ > 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

70+ ><pre

71+ ><code

72+ >f *** g = first f >>> second g

7273</code

73− ></pre

74− ><p

75− >Block quote:</p

76− ><blockquote

77− ><p

78− >foo bar</p

79− ></blockquote

74+ ></pre

75+ ><p

76+ >Block quote:</p

77+ ><blockquote

78+ ><p

79+ >foo bar</p

80+ ></blockquote

81+ ></div

8082 ></body

8183 ></html

8284>