diff options
| author | John MacFarlane <[email protected]> | 2024-02-16 13:42:30 -0800 |
|---|---|---|
| committer | John MacFarlane <[email protected]> | 2024-02-16 13:42:30 -0800 |
| commit | fc55d0037628a098436ca0fb8c823f2cec4b674b (patch) | |
| tree | 39dae5afe564361e811acd43ca0d9fe0aa013e96 | |
| parent | b506171578944ae274b9b39ee92474858425f570 (diff) | |
EPUB writer: omit EPUBv3-specific accessibility stuff on epub2.
Closes #9469. Fixes a regression in 3.1.12.
| -rw-r--r-- | src/Text/Pandoc/Writers/EPUB.hs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs index 8c9c9dee2..15b2625d5 100644 --- a/src/Text/Pandoc/Writers/EPUB.hs +++ b/src/Text/Pandoc/Writers/EPUB.hs @@ -638,10 +638,9 @@ pandocToEPUB version opts doc = do ([("version", case version of EPUB2 -> "2.0" EPUB3 -> "3.0") - ,("xmlns","http://www.idpf.org/2007/opf") - ,("xml:lang", epubLanguage metadata) - ,("unique-identifier","epub-id-1") - ] ++ + ,("xmlns","http://www.idpf.org/2007/opf")] ++ + [("xml:lang", epubLanguage metadata) | version == EPUB3] ++ + [("unique-identifier","epub-id-1")] ++ [("prefix","ibooks: http://vocabulary.itunes.apple.com/rdf/ibooks/vocabulary-extensions-1.0/") | version == EPUB3]) $ [ metadataElement version metadata currentTime , unode "manifest" $ @@ -1008,8 +1007,13 @@ metadataElement version md currentTime = ++ publisherNodes ++ sourceNodes ++ relationNodes ++ coverageNodes ++ rightsNodes ++ coverImageNodes ++ modifiedNodes ++ belongsToCollectionNodes - ++ accessModeNodes ++ accessModeSufficientNodes ++ accessibilityFeatureNodes - ++ accessibilityHazardNodes ++ accessibilitySummaryNodes + ++ case version of + EPUB2 -> [] + EPUB3 -> accessModeNodes ++ + accessModeSufficientNodes ++ + accessibilityFeatureNodes ++ + accessibilityHazardNodes ++ + accessibilitySummaryNodes metaprop = if version == EPUB2 then "name" else "property" withIds base f = concat . zipWith f (map (\x -> base <> T.cons '-' (tshow x)) |