diff --git a/MANUAL.txt b/MANUAL.txt
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -1,7 +1,7 @@
---
title: Pandoc User's Guide
author: John MacFarlane
-date: February 14, 2024
+date: February 17, 2024
---
# Synopsis
diff --git a/changelog.md b/changelog.md
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,21 @@
# Revision history for pandoc
+## pandoc 3.1.12.1 (2024-02-17)
+
+ * EPUB writer: omit EPUBv3-specific accessibility features on epub2
+ (#9469). Fixes a regression in 3.1.12.
+
+ * More fixes for SVG ids with `--self-contained` (#9467).
+ This generalizes the fix to #9420 so it applies to things like
+ `style="fill(url(#..."` and should fix problems with SVGs including
+ gradients.
+
+ * Powerpoint writer: properly handle math in headings and tables (#9465).
+ This ensures that paragraphs containing math are wrapped in
+ a `mc:AlternateContent` node as required.
+
+ * Makefile: make validate-epub check v2 output too.
+
## pandoc 3.1.12 (2024-02-14)
* Add `djot` as input and output format. Djot is a light markup syntax
diff --git a/pandoc.cabal b/pandoc.cabal
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: pandoc
-version: 3.1.12
+version: 3.1.12.1
build-type: Simple
license: GPL-2.0-or-later
license-file: COPYING.md
diff --git a/src/Text/Pandoc/SelfContained.hs b/src/Text/Pandoc/SelfContained.hs
--- a/src/Text/Pandoc/SelfContained.hs
+++ b/src/Text/Pandoc/SelfContained.hs
@@ -179,17 +179,21 @@
[(k,v) | (k,v) <- attrs', k /= "id"]
modify $ \st ->
st{ svgMap = M.insert hash (svgid, attrs'') (svgMap st) }
+ let fixUrl x =
+ case T.breakOn "url(#" x of
+ (_,"") -> x
+ (before, after) -> before <>
+ "url(#" <> svgid <> "_" <> T.drop 5 after
let addIdPrefix ("id", x) = ("id", svgid <> "_" <> x)
addIdPrefix (k, x)
| k == "xlink:href" || k == "href" =
case T.uncons x of
Just ('#', x') -> (k, "#" <> svgid <> "_" <> x')
_ -> (k, x)
- addIdPrefix ("clip-path", x) = ("clip-path",
- case T.stripPrefix "url(#" x of
- Just x' -> "url(#" <> svgid <> "_" <> x'
- Nothing -> x)
- addIdPrefix kv = kv
+ -- this clause handles things like
+ -- style="fill:url(#radialGradient46);stroke:none",
+ -- adding the svg id prefix to the anchor:
+ addIdPrefix (k, x) = (k, fixUrl x)
let ensureUniqueId (TagOpen tname ats) =
TagOpen tname (map addIdPrefix ats)
ensureUniqueId x = x
diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs
--- a/src/Text/Pandoc/Writers/EPUB.hs
+++ b/src/Text/Pandoc/Writers/EPUB.hs
@@ -638,10 +638,9 @@
([("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 @@
++ 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))
diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs
--- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs
@@ -1054,7 +1054,8 @@
[mknode "a:bodyPr" [] (), mknode "a:lstStyle" [] ()] <> elements
return
( 1
- , mknode "p:sp" [] [ mknode "p:nvSpPr" []
+ , surroundWithMathAlternate $
+ mknode "p:sp" [] [ mknode "p:nvSpPr" []
[ mknode "p:cNvPr" [("id","1"), ("name","TextBox 3")] ()
, mknode "p:cNvSpPr" [("txBox", "1")] ()
, mknode "p:nvPr" [] ()
@@ -1353,7 +1354,7 @@
graphicFrameToElements layout tbls cptn
shapeToElements _ (RawOOXMLShape str) = return
[(Nothing, Text (CData CDataRaw str Nothing))]
-shapeToElements layout shp = do
+shapeToElements layout shp@(TextBox _) = do
(shapeId, element) <- shapeToElement layout shp
return [(shapeId, Elem element)]
@@ -1538,7 +1539,9 @@
let txBody = mknode "p:txBody" [] $
[mknode "a:bodyPr" [] (), mknode "a:lstStyle" [] ()] <>
[element]
- return (Just shapeIdNum, replaceNamedChildren ns "p" "txBody" [txBody] sp)
+ return (Just shapeIdNum,
+ surroundWithMathAlternate $
+ replaceNamedChildren ns "p" "txBody" [txBody] sp)
-- XXX: TODO
| otherwise = return (Nothing, mknode "p:sp" [] ())
@@ -2008,6 +2011,7 @@
let txBody = mknode "p:txBody" [] $
[mknode "a:bodyPr" [] (), mknode "a:lstStyle" [] ()] <> elements
return $
+ surroundWithMathAlternate $
mknode "p:sp" []
[ mknode "p:nvSpPr" []
[ mknode "p:cNvPr" [ ("id", "3")
diff --git a/test/command/9467.md b/test/command/9467.md
new file mode 100644
--- /dev/null
+++ b/test/command/9467.md
@@ -0,0 +1,58 @@
+```
+% pandoc --embed-resources
+
+^D
+
+
+```
diff --git a/test/command/9467.svg b/test/command/9467.svg
new file mode 100644
--- /dev/null
+++ b/test/command/9467.svg
@@ -0,0 +1,56 @@
+
+
+
+