46179d5 · typeable/pandoc

git.iko.soy/typeable/pandoc

Use latest skylighting.

This adds `aria-hidden="true"` to the empty a elements, which helps people who use screen readers.

commit46179d5b3e84b5c709e09924cbda524230ebd3fe authorJohn MacFarlane <jgm@berkeley.edu> dateTue 12 May 2020, 13:51 (6 years ago) parent9c76c52

6 files changed+18−18

compare with master

unifiedsplit

pandoc.cabal+2−2 stack.yaml+2−2 test/command/5627.md+4−4 test/command/5650.md+4−4 test/lhs-test.html+3−3 test/lhs-test.html+lhs+3−3

pandoc.cabal+2−2

@@ -404,8 +404,8 @@ library

404404 tagsoup >= 0.14.6 && < 0.15,

405405 base64-bytestring >= 0.1 && < 1.2,

406406 zlib >= 0.5 && < 0.7,

407− skylighting >= 0.8.3.2 && < 0.9,

408− skylighting-core >= 0.8.3.2 && < 0.9,

407+ skylighting >= 0.8.4 && < 0.9,

408+ skylighting-core >= 0.8.4 && < 0.9,

409409 data-default >= 0.4 && < 0.8,

410410 temporary >= 1.1 && < 1.4,

411411 blaze-html >= 0.9 && < 0.10,

stack.yaml+2−2

@@ -19,8 +19,8 @@ extra-deps:

1919 commit: 2e6fe791ec5293acc925c2ccbe79c9c10d2b7e07

2020- texmath-0.12.0.2

2121- haddock-library-1.9.0

22−- skylighting-0.8.3.4

23−- skylighting-core-0.8.3.4

22+- skylighting-0.8.4

23+- skylighting-core-0.8.4

2424- regex-pcre-builtin-0.95.1.2.8.43

2525- regex-base-0.94.0.0

2626- doclayout-0.3

test/command/5627.md+4−4

@@ -20,8 +20,8 @@ Something

2020<li>Two <code>-->something<!--</code></li>

2121<li>Three</li>

2222</ol>

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

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

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

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

2525```

2626

2727```

@@ -46,8 +46,8 @@ Something

4646<li><code>-->something<!--</code></li>

4747<li>bye <code>-->something else<!--</code></li>

4848</ul>

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

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

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

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

5151```

5252

5353```

test/command/5650.md+4−4

@@ -5,8 +5,8 @@ a

55b

66```

77^D

8−<div class="sourceCode" id="foocb1"><pre class="sourceCode haskell"><code class="sourceCode haskell"><span id="foocb1-1"><a href="#foocb1-1"></a>a</span>

9−<span id="foocb1-2"><a href="#foocb1-2"></a>b</span></code></pre></div>

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

9+<span id="foocb1-2"><a href="#foocb1-2" aria-hidden="true"></a>b</span></code></pre></div>

1010````

1111

1212````

@@ -16,7 +16,7 @@ a

1616b

1717```

1818^D

19−<div class="sourceCode" id="foobar"><pre class="sourceCode haskell"><code class="sourceCode haskell"><span id="foobar-1"><a href="#foobar-1"></a>a</span>

20−<span id="foobar-2"><a href="#foobar-2"></a>b</span></code></pre></div>

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

20+<span id="foobar-2"><a href="#foobar-2" aria-hidden="true"></a>b</span></code></pre></div>

2121````

2222

test/lhs-test.html+3−3

@@ -83,9 +83,9 @@

8383<h1 id="lhs-test">lhs test</h1>

8484<p><code>unsplit</code> is an arrow that takes a pair of values and combines them to

8585return a single value:</p>

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

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

88−<span id="cb1-3"><a href="#cb1-3"></a> <span class="co">-- arr (\op (x,y) -> x `op` y)</span></span></code></pre></div>

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

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

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

8989<p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a

9090pair of values (one arrow on the first item of the pair and one arrow on the

9191second item of the pair).</p>

test/lhs-test.html+lhs+3−3

@@ -83,9 +83,9 @@

8383<h1 id="lhs-test">lhs test</h1>

8484<p><code>unsplit</code> is an arrow that takes a pair of values and combines them to

8585return a single value:</p>

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

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

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

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

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

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

8989<p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a

9090pair of values (one arrow on the first item of the pair and one arrow on the

9191second item of the pair).</p>