[Git][haskell-team/DHG_packages][master] pandoc: Fix tests for new commonmark-pandoc

[Ilias Tsitsimpis (@iliastsi)]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
22755973 by Ilias Tsitsimpis at 2024-10-23T23:25:39+03:00
pandoc: Fix tests for new commonmark-pandoc

- - - - -


4 changed files:

- p/haskell-pandoc/debian/changelog
- p/haskell-pandoc/debian/control
- + p/haskell-pandoc/debian/patches/fdbfb7a80795d22df26d19563658a86cf1c92191.patch
- p/haskell-pandoc/debian/patches/series


Changes:

=====================================
p/haskell-pandoc/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-pandoc (3.1.11.1-3) unstable; urgency=medium
+
+  * Fix tests to work with new commonmark-pandoc
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 23 Oct 2024 23:25:35 +0300
+
 haskell-pandoc (3.1.11.1-2) unstable; urgency=medium
 
   * Fix FTBFS due to test failures


=====================================
p/haskell-pandoc/debian/control
=====================================
@@ -48,7 +48,7 @@ Build-Depends: debhelper (>= 10),
  libghc-commonmark-extensions-dev (>= 0.2.5),
  libghc-commonmark-extensions-dev (<< 0.3),
  libghc-commonmark-extensions-prof,
- libghc-commonmark-pandoc-dev (>= 0.2.2),
+ libghc-commonmark-pandoc-dev (>= 0.2.2.2),
  libghc-commonmark-pandoc-dev (<< 0.3),
  libghc-commonmark-pandoc-prof,
  libghc-crypton-connection-dev (>= 0.3.1),


=====================================
p/haskell-pandoc/debian/patches/fdbfb7a80795d22df26d19563658a86cf1c92191.patch
=====================================
@@ -0,0 +1,40 @@
+commit fdbfb7a80795d22df26d19563658a86cf1c92191
+Author: John MacFarlane <jgm at berkeley.edu>
+Date:   Fri Sep 13 09:32:36 2024 -0700
+
+    T.P.Shared addPandocAttributes - modify for new commonmark-pandoc.
+    
+    The new commonmark-pandoc version automatically adds the
+    attribute `wrapper="1"` on all Divs and Spans that
+    are introduced just as containers for attributes that belong
+    properly to their contents.  So we don't need to add the
+    attribute here.
+    
+    This gives much better results in some cases. Previously the
+    wrapper attribute was being added even for explicit Divs and
+    Spans in djot, but it is not needed in these cases.
+
+Index: b/test/command/7863.md
+===================================================================
+--- a/test/command/7863.md
++++ b/test/command/7863.md
+@@ -10,10 +10,17 @@ key:
+ Text
+ ^D
+ [ Div
+-    ( "" , [] , [ ( "data-pos" , "8:1-9:1" ) ] )
++    ( ""
++    , []
++    , [ ( "wrapper" , "1" ) , ( "data-pos" , "8:1-9:1" ) ]
++    )
+     [ Para
+         [ Span
+-            ( "" , [] , [ ( "data-pos" , "8:1-8:5" ) ] ) [ Str "Text" ]
++            ( ""
++            , []
++            , [ ( "wrapper" , "1" ) , ( "data-pos" , "8:1-8:5" ) ]
++            )
++            [ Str "Text" ]
+         ]
+     ]
+ ]


=====================================
p/haskell-pandoc/debian/patches/series
=====================================
@@ -4,3 +4,4 @@ undo-xml-light-internal-library
 use-python3.patch
 4ca2de1715fa600ed087aaf88af164f104b04523.patch
 532bbc875bbcb52ddbaa02600bb856d7e32b795e.patch
+fdbfb7a80795d22df26d19563658a86cf1c92191.patch



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/227559738c3c756451478846d0e089b00e557be0

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/227559738c3c756451478846d0e089b00e557be0
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20241023/1681ab3e/attachment-0001.htm>