diff options
| -rw-r--r-- | pandoc.cabal | 2 | ||||
| -rw-r--r-- | stack.yaml | 2 | ||||
| -rw-r--r-- | test/Tests/Writers/HTML.hs | 2 | ||||
| -rw-r--r-- | test/lhs-test.html | 2 | ||||
| -rw-r--r-- | test/lhs-test.html+lhs | 2 | ||||
| -rw-r--r-- | test/lhs-test.latex | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 11135c9cc..c8aa40edb 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -380,7 +380,7 @@ library tagsoup >= 0.14.6 && < 0.15, base64-bytestring >= 0.1 && < 1.1, zlib >= 0.5 && < 0.7, - skylighting >= 0.7.5 && < 0.8, + skylighting >= 0.7.6 && < 0.8, data-default >= 0.4 && < 0.8, temporary >= 1.1 && < 1.4, blaze-html >= 0.9 && < 0.10, diff --git a/stack.yaml b/stack.yaml index 33a850703..ac245fc04 100644 --- a/stack.yaml +++ b/stack.yaml @@ -20,6 +20,8 @@ packages: extra-dep: true extra-deps: - pandoc-citeproc-0.16.0.2 +- skylighting-0.7.6 +- skylighting-core-0.7.6 - ipynb-0.1 - texmath-0.11.2 ghc-options: diff --git a/test/Tests/Writers/HTML.hs b/test/Tests/Writers/HTML.hs index dfacda608..de8b1ef17 100644 --- a/test/Tests/Writers/HTML.hs +++ b/test/Tests/Writers/HTML.hs @@ -34,7 +34,7 @@ tests :: [TestTree] tests = [ testGroup "inline code" [ "basic" =: code "@&" =?> "<code>@&</code>" , "haskell" =: codeWith ("",["haskell"],[]) ">>=" - =?> "<code class=\"sourceCode haskell\"><span class=\"fu\">>>=</span></code>" + =?> "<code class=\"sourceCode haskell\"><span class=\"op\">>>=</span></code>" , "nolanguage" =: codeWith ("",["nolanguage"],[]) ">>=" =?> "<code class=\"nolanguage\">>>=</code>" ] diff --git a/test/lhs-test.html b/test/lhs-test.html index 03dd347ff..067c8c4f6 100644 --- a/test/lhs-test.html +++ b/test/lhs-test.html @@ -83,7 +83,7 @@ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warni <p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p> <div class="sourceCode" id="cb1"><pre class="sourceCode haskell literate"><code class="sourceCode haskell"><a class="sourceLine" id="cb1-1" title="1"><span class="ot">unsplit ::</span> (<span class="dt">Arrow</span> a) <span class="ot">=></span> (b <span class="ot">-></span> c <span class="ot">-></span> d) <span class="ot">-></span> a (b, c) d</a> -<a class="sourceLine" id="cb1-2" title="2">unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span class="fu">uncurry</span></a> +<a class="sourceLine" id="cb1-2" title="2">unsplit <span class="ot">=</span> arr <span class="op">.</span> <span class="fu">uncurry</span></a> <a class="sourceLine" id="cb1-3" title="3"> <span class="co">-- arr (\op (x,y) -> x `op` y)</span></a></code></pre></div> <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 diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs index ee0d8a299..8e29133dc 100644 --- a/test/lhs-test.html+lhs +++ b/test/lhs-test.html+lhs @@ -83,7 +83,7 @@ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warni <p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p> <div class="sourceCode" id="cb1"><pre class="sourceCode literatehaskell literate"><code class="sourceCode literatehaskell"><a class="sourceLine" id="cb1-1" title="1"><span class="ot">> unsplit ::</span> (<span class="dt">Arrow</span> a) <span class="ot">=></span> (b <span class="ot">-></span> c <span class="ot">-></span> d) <span class="ot">-></span> a (b, c) d</a> -<a class="sourceLine" id="cb1-2" title="2"><span class="ot">></span> unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span class="fu">uncurry</span></a> +<a class="sourceLine" id="cb1-2" title="2"><span class="ot">></span> unsplit <span class="ot">=</span> arr <span class="op">.</span> <span class="fu">uncurry</span></a> <a class="sourceLine" id="cb1-3" title="3"><span class="ot">></span> <span class="co">-- arr (\op (x,y) -> x `op` y)</span></a></code></pre></div> <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 diff --git a/test/lhs-test.latex b/test/lhs-test.latex index da7dfe6a0..2c464d488 100644 --- a/test/lhs-test.latex +++ b/test/lhs-test.latex @@ -109,7 +109,7 @@ return a single value: \begin{Shaded} \begin{Highlighting}[] \OtherTok{unsplit ::}\NormalTok{ (}\DataTypeTok{Arrow}\NormalTok{ a) }\OtherTok{=>}\NormalTok{ (b }\OtherTok{->}\NormalTok{ c }\OtherTok{->}\NormalTok{ d) }\OtherTok{->}\NormalTok{ a (b, c) d} -\NormalTok{unsplit }\FunctionTok{=}\NormalTok{ arr }\FunctionTok{.} \FunctionTok{uncurry} +\NormalTok{unsplit }\OtherTok{=}\NormalTok{ arr }\OperatorTok{.} \FunctionTok{uncurry} \CommentTok{-- arr (\textbackslash{}op (x,y) -> x `op` y)} \end{Highlighting} \end{Shaded} |