fix: disallow epub:prefix on embedded SVG

rdeltour · rdeltour · commit 623f5ad8c9e5 · 2024-12-23T11:16:05.000+01:00
Fix #1535
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.rnc b/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.rnc
@@ -12,3 +12,6 @@ include "./mod/epub-xhtml-svg-mathml.rnc" {
 
 # Allow `body` element as a child of `foreignObject` 
 svg.foreignObject.inner |= body.elem 
+
+# Allow `epub:prefix` attribute on `svg` root
+svg.attrs &= epub.prefix.attr.ns?
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg-forgiving-inc.rnc b/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg-forgiving-inc.rnc
@@ -19,9 +19,7 @@
   svg =
     element svg { svg.inner & svg.attrs }
   svg.attrs =
-    ( svg.epubtype.allowed.attrs
-      & epub.prefix.attr.ns?
-    )
+    ( svg.epubtype.allowed.attrs )
   svg.inner =
     ( svg.any.inner )
 
diff --git a/src/test/resources/epub3/D-vocabularies/files/prefix-attribute-on-svg-error.xhtml b/src/test/resources/epub3/D-vocabularies/files/prefix-attribute-on-svg-error.xhtml
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html xmlns="https://www.w3.org/1999/xhtml" xmlns:epub="https://www.idpf.org/2007/ops" xml:lang="en"
+	lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title>Test</title>
+	</head>
+	<body>
+		<h1>Loomings</h1>
+		<p>Call me Ishmael.</p>
+		<svg xmlns="https://www.w3.org/2000/svg" epub:prefix="my: https://example.org/vocab/">
+			<title>SVG</title>
+			<desc>Description</desc>
+			<circle r="10"/>
+		</svg>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/D-vocabularies/vocabularies.feature b/src/test/resources/epub3/D-vocabularies/vocabularies.feature
@@ -106,13 +106,22 @@ Feature: EPUB 3 — Vocabularies — Vocabulary association
 
 	Rule: EPUB creators MUST only specify the `prefix` attribute on the root element of the respective format.
 
+		Note that for SVG embedded by inclusion, prefixes MUST be declared on the root html element.
+
 		@spec @xref:sec-prefix-attr
 		Example: Report a `prefix` attribute on an XHTML `head` element
 			When checking file 'prefix-attribute-on-head-error.xhtml'
 			Then error RSC-005 is reported
 			And the message contains 'attribute "epub:prefix" not allowed here'
 			And no other errors or warnings are reported
 
+		@spec @xref:sec-prefix-attr
+		Example: Report a `prefix` attribute on an XHTML embedded `svg` element
+			When checking file 'prefix-attribute-on-svg-error.xhtml'
+			Then error RSC-005 is reported
+		  And the message contains 'attribute "epub:prefix" not allowed here'
+			And no other errors or warnings are reported
+
 
 	Rule: EPUB creators MUST NOT declare the prefix '_'.
 
