opensource/pandoc
3
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-08-29 01:41:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to use latest dev citeproc.

Browse Source 
Fixed golden test regeneration in Docx reader test.
This commit is contained in:
John MacFarlane
2025-10-18 15:03:50 +02:00
parent eb9bfb6b96
commit 350b821d7c
5 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cabal.project
+4
View File
@@ -9,3 +9,7 @@ constraints: skylighting-format-blaze-html >= 0.1.1.3,
-- for now (commercialhaskell/stackage#7545):
data-default-class <= 0.2, data-default <= 0.8
source-repository-package
type: git
location: https://github.com/jgm/citeproc.git
tag: 4bb4c209fb1dd3fa6f6aaa5bfe76022059c0affa
stack.yaml
+2 -1
View File
@@ -15,9 +15,10 @@ extra-deps:
- hslua-packaging-2.3.2
- skylighting-core-0.14.7
- skylighting-0.14.7
- citeproc-0.10
- djot-0.1.2.3
- texmath-0.13.0.1
- git: https://github.com/jgm/citeproc.git
commit: 4bb4c209fb1dd3fa6f6aaa5bfe76022059c0affa
ghc-options:
"$locals": -fhide-source-paths -Wno-missing-home-modules
resolver: lts-24.9
test/Tests/Readers/Docx.hs
+2 -1
View File
@@ -57,7 +57,8 @@ testCompareWithOpts opts testName docxFP nativeFP =
(do df <- B.readFile docxFP
runIOorExplode (readDocx opts df))
(nativeDiff nativeFP)
(\a -> runIOorExplode (writeNative def a) >>= BS.writeFile nativeFP . UTF8.fromText)
(\a -> runIOorExplode (writeNative def{ writerTemplate = Just mempty} a)
>>= BS.writeFile nativeFP . UTF8.fromText)
testForWarningsWithOptsIO :: ReaderOptions -> String -> FilePath -> [String] -> IO TestTree
testForWarningsWithOptsIO opts name docxFile expected = do
test/docx/mendeley_citations_plus.native
+12 -7
View File
@@ -121,9 +121,9 @@ Pandoc
[ Str "ACM" , Space , Str "Inroads" ]
)
, ( "id" , MetaString "ITEM-1" )
, ( "issue" , MetaString "1" )
, ( "issue" , MetaInlines [ Str "1" ] )
, ( "issued" , MetaString "2011-02" )
, ( "page" , MetaString "32-37" )
, ( "page" , MetaInlines [ Str "32-37" ] )
, ( "publisher" , MetaInlines [ Str "ACM" ] )
, ( "publisher-place"
, MetaInlines
@@ -152,7 +152,7 @@ Pandoc
]
)
, ( "type" , MetaString "article-journal" )
, ( "volume" , MetaString "2" )
, ( "volume" , MetaInlines [ Str "2" ] )
])
, MetaMap
(fromList
@@ -206,7 +206,7 @@ Pandoc
]
)
, ( "id" , MetaString "ITEM-2" )
, ( "issue" , MetaString "4" )
, ( "issue" , MetaInlines [ Str "4" ] )
, ( "issued" , MetaString "2015" )
, ( "title"
, MetaInlines
@@ -246,7 +246,7 @@ Pandoc
]
)
, ( "type" , MetaString "article-journal" )
, ( "volume" , MetaString "6" )
, ( "volume" , MetaInlines [ Str "6" ] )
])
]
)
@@ -268,7 +268,7 @@ Pandoc
{ citationId = "ITEM-1"
, citationPrefix = [ Str "prefix" ]
, citationSuffix =
[ Str ",", Space , Str "123" , Space , Str "suffix" ]
[ Str "," , Space , Str "123" , Space , Str "suffix" ]
, citationMode = NormalCitation
, citationNoteNum = 0
, citationHash = 0
@@ -302,7 +302,12 @@ Pandoc
{ citationId = "ITEM-1"
, citationPrefix = [ Str "prefix" ]
, citationSuffix =
[ Str ",", Space , Str "10-20" , Space , Str "suffix" ]
[ Str ","
, Space
, Str "10-20"
, Space
, Str "suffix"
]
, citationMode = NormalCitation
, citationNoteNum = 0
, citationHash = 0
test/docx/zotero_citations_plus.native
+15 -9
View File
@@ -54,10 +54,12 @@ Pandoc
]
)
, ( "id" , MetaString "10" )
, ( "issue" , MetaString "18" )
, ( "issue" , MetaInlines [ Str "18" ] )
, ( "issued" , MetaString "2016" )
, ( "language" , MetaInlines [ Str "en" ] )
, ( "page" , MetaString "9852\8211\&9859" )
, ( "page"
, MetaInlines [ Str "9852\8211\&9859" ]
)
, ( "title"
, MetaInlines
[ Str "New"
@@ -90,7 +92,7 @@ Pandoc
]
)
, ( "type" , MetaString "article-journal" )
, ( "volume" , MetaString "43" )
, ( "volume" , MetaInlines [ Str "43" ] )
])
, MetaMap
(fromList
@@ -131,10 +133,12 @@ Pandoc
[ Str "Climate" , Space , Str "Dynamics" ]
)
, ( "id" , MetaString "109" )
, ( "issue" , MetaString "11-12" )
, ( "issue" , MetaInlines [ Str "11-12" ] )
, ( "issued" , MetaString "2013-12" )
, ( "language" , MetaInlines [ Str "en" ] )
, ( "page" , MetaString "3325\8211\&3338" )
, ( "page"
, MetaInlines [ Str "3325\8211\&3338" ]
)
, ( "title"
, MetaInlines
[ Str "A"
@@ -165,7 +169,7 @@ Pandoc
]
)
, ( "type" , MetaString "article-journal" )
, ( "volume" , MetaString "41" )
, ( "volume" , MetaInlines [ Str "41" ] )
])
, MetaMap
(fromList
@@ -280,7 +284,9 @@ Pandoc
, ( "id" , MetaString "6" )
, ( "issued" , MetaString "2016" )
, ( "language" , MetaInlines [ Str "en" ] )
, ( "page" , MetaString "3751\8211\&3777" )
, ( "page"
, MetaInlines [ Str "3751\8211\&3777" ]
)
, ( "title"
, MetaInlines
[ Str "The"
@@ -297,7 +303,7 @@ Pandoc
]
)
, ( "type" , MetaString "article-journal" )
, ( "volume" , MetaString "9" )
, ( "volume" , MetaInlines [ Str "9" ] )
])
]
)
@@ -412,7 +418,7 @@ Pandoc
{ citationId = "10"
, citationPrefix = [ Str "prefix" ]
, citationSuffix =
[ Str ",", Space , Str "2" , Space , Str "suffix" ]
[ Str "," , Space , Str "2" , Space , Str "suffix" ]
, citationMode = NormalCitation
, citationNoteNum = 0
, citationHash = 0