From: John MacFarlane Date: Tue, 12 May 2020 13:51:48 -0700 Subject: Use latest skylighting. This adds `aria-hidden="true"` to the empty a elements, which helps people who use screen readers. Origin: https://github.com/jgm/pandoc/commit/8d0c124e5f76af6aa08acf9b0c526822f65e232b Origin: https://github.com/jgm/pandoc/commit/112e98def6baf3433e99fbaa3e7280cad16f5422 --- pandoc.cabal | 4 ++-- stack.yaml | 4 ++-- test/command/5627.md | 8 ++++---- test/command/5650.md | 8 ++++---- test/lhs-test.html | 6 +++--- test/lhs-test.html+lhs | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pandoc.cabal b/pandoc.cabal index f6c03a0..a8b9f8e 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -404,8 +404,8 @@ library tagsoup >= 0.14.6 && < 0.15, base64-bytestring >= 0.1 && < 1.1, zlib >= 0.5 && < 0.7, - skylighting >= 0.8.3.2 && < 0.9, - skylighting-core >= 0.8.3.2 && < 0.9, + skylighting >= 0.8.5 && < 0.9, + skylighting-core >= 0.8.5 && < 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 b56beb7..92a80f7 100644 --- a/stack.yaml +++ b/stack.yaml @@ -15,8 +15,8 @@ extra-deps: - pandoc-types-1.20 - texmath-0.12.0.1 - haddock-library-1.8.0 -- skylighting-0.8.3.2 -- skylighting-core-0.8.3.2 +- skylighting-0.8.5 +- skylighting-core-0.8.5 - regex-pcre-builtin-0.95.0.8.8.35 - doclayout-0.3 - emojis-0.1 diff --git a/test/command/5627.md b/test/command/5627.md index 0f67a08..41fec00 100644 --- a/test/command/5627.md +++ b/test/command/5627.md @@ -20,8 +20,8 @@ Something
  • Two -->something<!--
  • Three
    • -
    --><!--<script>alert('Escaped!')</script>
    -
    Something
    +
    --><!--<script>alert('Escaped!')</script>
    +
    Something
    ``` ``` @@ -46,8 +46,8 @@ Something
  • -->something<!--
  • bye -->something else<!--
    • -
    --><!--<script>alert('Escaped!')</script>
    -
    Something
    +
    --><!--<script>alert('Escaped!')</script>
    +
    Something
    ``` ``` diff --git a/test/command/5650.md b/test/command/5650.md index 0618f41..2f36c60 100644 --- a/test/command/5650.md +++ b/test/command/5650.md @@ -5,8 +5,8 @@ a b ``` ^D -
    a
-b
    +
    a
+b
    ```` ```` @@ -16,7 +16,7 @@ a b ``` ^D -
    a
-b
    +
    a
+b
    ```` diff --git a/test/lhs-test.html b/test/lhs-test.html index 6bde36c..43ff13e 100644 --- a/test/lhs-test.html +++ b/test/lhs-test.html @@ -80,9 +80,9 @@

    lhs test

    unsplit is an arrow that takes a pair of values and combines them to return a single value:

    -
    unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
-unsplit = arr . uncurry
-          -- arr (\op (x,y) -> x `op` y)
    +
    unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
+unsplit = arr . uncurry
+          -- arr (\op (x,y) -> x `op` y)

    (***) 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).

    diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs index e86bfd6..8cdf3f2 100644 --- a/test/lhs-test.html+lhs +++ b/test/lhs-test.html+lhs @@ -80,9 +80,9 @@

    lhs test

    unsplit is an arrow that takes a pair of values and combines them to return a single value:

    -
    > unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
-> unsplit = arr . uncurry
->           -- arr (\op (x,y) -> x `op` y)
    +
    > unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
+> unsplit = arr . uncurry
+>           -- arr (\op (x,y) -> x `op` y)

    (***) 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).