From fc55d0037628a098436ca0fb8c823f2cec4b674b Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Fri, 16 Feb 2024 13:42:30 -0800
Subject: EPUB writer: omit EPUBv3-specific accessibility stuff on epub2.

Closes #9469.  Fixes a regression in 3.1.12.
---
 src/Text/Pandoc/Writers/EPUB.hs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src')

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))
-- 
cgit v1.2.3