diff options
author | John MacFarlane <jgm@berkeley.edu> | 2020-05-12 13:51:48 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2020-05-12 14:37:07 -0700 |
commit | 46179d5b3e84b5c709e09924cbda524230ebd3fe (patch) | |
tree | 0f3da4bc4f2a0e508f8608ec3ab1e0b73e18c42b | |
parent | 9c76c52e9bb1481234b8ee5ef9c524a5a61d43bd (diff) | |
download | pandoc-46179d5b3e84b5c709e09924cbda524230ebd3fe.tar.gz |
Use latest skylighting.
This adds `aria-hidden="true"` to the empty a elements, which
helps people who use screen readers.
-rw-r--r-- | pandoc.cabal | 4 | ||||
-rw-r--r-- | stack.yaml | 4 | ||||
-rw-r--r-- | test/command/5627.md | 8 | ||||
-rw-r--r-- | test/command/5650.md | 8 | ||||
-rw-r--r-- | test/lhs-test.html | 6 | ||||
-rw-r--r-- | test/lhs-test.html+lhs | 6 |
6 files changed, 18 insertions, 18 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 98b91cc81..d768cc784 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -404,8 +404,8 @@ library tagsoup >= 0.14.6 && < 0.15, base64-bytestring >= 0.1 && < 1.2, zlib >= 0.5 && < 0.7, - skylighting >= 0.8.3.2 && < 0.9, - skylighting-core >= 0.8.3.2 && < 0.9, + skylighting >= 0.8.4 && < 0.9, + skylighting-core >= 0.8.4 && < 0.9, 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 77f8155a5..183ddb10d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -19,8 +19,8 @@ extra-deps: commit: 2e6fe791ec5293acc925c2ccbe79c9c10d2b7e07 - texmath-0.12.0.2 - haddock-library-1.9.0 -- skylighting-0.8.3.4 -- skylighting-core-0.8.3.4 +- skylighting-0.8.4 +- skylighting-core-0.8.4 - regex-pcre-builtin-0.95.1.2.8.43 - regex-base-0.94.0.0 - doclayout-0.3 diff --git a/test/command/5627.md b/test/command/5627.md index 0f67a083f..41fec0038 100644 --- a/test/command/5627.md +++ b/test/command/5627.md @@ -20,8 +20,8 @@ Something <li>Two <code>-->something<!--</code></li> <li>Three</li> </ol> -<div class="sourceCode" id="cb1"><pre class="sourceCode html"><code class="sourceCode html"><span id="cb1-1"><a href="#cb1-1"></a>--><span class="co"><!--<script>alert('Escaped!')</script></span></span></code></pre></div> -<div class="sourceCode" id="cb2"><pre class="sourceCode html"><code class="sourceCode html"><span id="cb2-1"><a href="#cb2-1"></a>Something</span></code></pre></div> +<div class="sourceCode" id="cb1"><pre class="sourceCode html"><code class="sourceCode html"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true"></a>--><span class="co"><!--<script>alert('Escaped!')</script></span></span></code></pre></div> +<div class="sourceCode" id="cb2"><pre class="sourceCode html"><code class="sourceCode html"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true"></a>Something</span></code></pre></div> ``` ``` @@ -46,8 +46,8 @@ Something <li><code>-->something<!--</code></li> <li>bye <code>-->something else<!--</code></li> </ul> -<div class="sourceCode" id="cb1"><pre class="sourceCode html"><code class="sourceCode html"><span id="cb1-1"><a href="#cb1-1"></a>--><span class="co"><!--<script>alert('Escaped!')</script></span></span></code></pre></div> -<div class="sourceCode" id="cb2"><pre class="sourceCode html"><code class="sourceCode html"><span id="cb2-1"><a href="#cb2-1"></a>Something</span></code></pre></div> +<div class="sourceCode" id="cb1"><pre class="sourceCode html"><code class="sourceCode html"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true"></a>--><span class="co"><!--<script>alert('Escaped!')</script></span></span></code></pre></div> +<div class="sourceCode" id="cb2"><pre class="sourceCode html"><code class="sourceCode html"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true"></a>Something</span></code></pre></div> ``` ``` diff --git a/test/command/5650.md b/test/command/5650.md index 0618f415f..2f36c6066 100644 --- a/test/command/5650.md +++ b/test/command/5650.md @@ -5,8 +5,8 @@ a b ``` ^D -<div class="sourceCode" id="foocb1"><pre class="sourceCode haskell"><code class="sourceCode haskell"><span id="foocb1-1"><a href="#foocb1-1"></a>a</span> -<span id="foocb1-2"><a href="#foocb1-2"></a>b</span></code></pre></div> +<div class="sourceCode" id="foocb1"><pre class="sourceCode haskell"><code class="sourceCode haskell"><span id="foocb1-1"><a href="#foocb1-1" aria-hidden="true"></a>a</span> +<span id="foocb1-2"><a href="#foocb1-2" aria-hidden="true"></a>b</span></code></pre></div> ```` ```` @@ -16,7 +16,7 @@ a b ``` ^D -<div class="sourceCode" id="foobar"><pre class="sourceCode haskell"><code class="sourceCode haskell"><span id="foobar-1"><a href="#foobar-1"></a>a</span> -<span id="foobar-2"><a href="#foobar-2"></a>b</span></code></pre></div> +<div class="sourceCode" id="foobar"><pre class="sourceCode haskell"><code class="sourceCode haskell"><span id="foobar-1"><a href="#foobar-1" aria-hidden="true"></a>a</span> +<span id="foobar-2"><a href="#foobar-2" aria-hidden="true"></a>b</span></code></pre></div> ```` diff --git a/test/lhs-test.html b/test/lhs-test.html index 8153a4be1..8ec8e5dd9 100644 --- a/test/lhs-test.html +++ b/test/lhs-test.html @@ -83,9 +83,9 @@ <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> -<div class="sourceCode" id="cb1"><pre class="sourceCode haskell literate"><code class="sourceCode haskell"><span id="cb1-1"><a href="#cb1-1"></a><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</span> -<span id="cb1-2"><a href="#cb1-2"></a>unsplit <span class="ot">=</span> arr <span class="op">.</span> <span class="fu">uncurry</span></span> -<span id="cb1-3"><a href="#cb1-3"></a> <span class="co">-- arr (\op (x,y) -> x `op` y)</span></span></code></pre></div> +<div class="sourceCode" id="cb1"><pre class="sourceCode haskell literate"><code class="sourceCode haskell"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true"></a><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</span> +<span id="cb1-2"><a href="#cb1-2" aria-hidden="true"></a>unsplit <span class="ot">=</span> arr <span class="op">.</span> <span class="fu">uncurry</span></span> +<span id="cb1-3"><a href="#cb1-3" aria-hidden="true"></a> <span class="co">-- arr (\op (x,y) -> x `op` y)</span></span></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 second item of the pair).</p> diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs index 0ada9fac8..22f807e17 100644 --- a/test/lhs-test.html+lhs +++ b/test/lhs-test.html+lhs @@ -83,9 +83,9 @@ <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> -<div class="sourceCode" id="cb1"><pre class="sourceCode literatehaskell literate"><code class="sourceCode literatehaskell"><span id="cb1-1"><a href="#cb1-1"></a><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</span> -<span id="cb1-2"><a href="#cb1-2"></a><span class="ot">></span> unsplit <span class="ot">=</span> arr <span class="op">.</span> <span class="fu">uncurry</span></span> -<span id="cb1-3"><a href="#cb1-3"></a><span class="ot">></span> <span class="co">-- arr (\op (x,y) -> x `op` y)</span></span></code></pre></div> +<div class="sourceCode" id="cb1"><pre class="sourceCode literatehaskell literate"><code class="sourceCode literatehaskell"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true"></a><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</span> +<span id="cb1-2"><a href="#cb1-2" aria-hidden="true"></a><span class="ot">></span> unsplit <span class="ot">=</span> arr <span class="op">.</span> <span class="fu">uncurry</span></span> +<span id="cb1-3"><a href="#cb1-3" aria-hidden="true"></a><span class="ot">></span> <span class="co">-- arr (\op (x,y) -> x `op` y)</span></span></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 second item of the pair).</p> |