fix: allow foreign namespaces in EPUB 2 SVGs

mattgarrish · web-flow · commit e3ffc3763b75 · 2020-06-22T10:25:38.000+02:00
* allow foreign namespaced elements and attributes in EPUB 2 SVGs
* Remove the restriction to HTML on foreignObject as that is an epub 3-specific rule
diff --git a/src/main/java/com/adobe/epubcheck/ops/OPSChecker.java b/src/main/java/com/adobe/epubcheck/ops/OPSChecker.java
@@ -56,7 +56,7 @@ public class OPSChecker implements ContentChecker, DocumentValidator
       .putAll(Predicates.and(mimetype("application/xhtml+xml"), version(EPUBVersion.VERSION_3)),
           XMLValidators.XHTML_30_RNC, XMLValidators.XHTML_30_SCH)
       .putAll(Predicates.and(mimetype("image/svg+xml"), version(EPUBVersion.VERSION_2)),
-          XMLValidators.SVG_20_RNG, XMLValidators.IDUNIQUE_20_SCH)
+          XMLValidators.SVG_20_NVDL, XMLValidators.IDUNIQUE_20_SCH)
       .putAll(Predicates.and(mimetype("image/svg+xml"), version(EPUBVersion.VERSION_3)),
           XMLValidators.SVG_30_NVDL)
       .putAll(
diff --git a/src/main/java/com/adobe/epubcheck/xml/XMLValidators.java b/src/main/java/com/adobe/epubcheck/xml/XMLValidators.java
@@ -36,7 +36,7 @@ public enum XMLValidators
   SEARCH_KEY_MAP_RNC("schema/30/dict/search-key-map.rnc"),
   SIG_20_RNG("schema/20/rng/signatures.rng"),
   SIG_30_RNC("schema/30/ocf-signatures-30.rnc"),
-  SVG_20_RNG("schema/20/rng/svg11.rng"),
+  SVG_20_NVDL("schema/20/rng/ops20-svg.nvdl"),
   SVG_30_RNC("schema/30/epub-svg-30.rnc"),
   SVG_30_NVDL("schema/30/epub-svg-30.nvdl"),
   SVG_30_SCH("schema/30/epub-svg-30.sch"),
diff --git a/src/main/resources/com/adobe/epubcheck/schema/20/rng/ops20-svg.nvdl b/src/main/resources/com/adobe/epubcheck/schema/20/rng/ops20-svg.nvdl
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="https://purl.oclc.org/dsdl/nvdl/ns/structure/1.0" startMode="svg">
+	<mode name="svg">
+		<namespace ns="https://www.w3.org/2000/svg">
+			<validate schema="svg11.rng" schemaType="application/relax-ng"
+				useMode="allowForeignNS">
+			</validate>
+		</namespace>
+	</mode>
+	<mode name="allowForeignNS">
+		<namespace ns="https://www.w3.org/1999/xhtml">
+			<attach/>
+		</namespace>
+		<namespace ns="https://www.idpf.org/2007/ops" match="attributes">
+			<attach/>
+		</namespace>
+		<namespace ns="https://www.w3.org/1999/xlink" match="attributes">
+			<attach/>
+		</namespace>
+		<namespace ns="https://www.w3.org/XML/1998/namespace" match="attributes">
+			<attach/>
+		</namespace>
+		<namespace ns="" match="attributes">
+			<attach/>
+		</namespace>
+		<anyNamespace match="elements attributes">
+			<allow/>
+		</anyNamespace>
+	</mode>
+</rules>
diff --git a/src/main/resources/com/adobe/epubcheck/schema/20/rng/ops20.nvdl b/src/main/resources/com/adobe/epubcheck/schema/20/rng/ops20.nvdl
@@ -12,7 +12,7 @@
 <!-- mode that allows arbitrary XHTML or SVG fragment -->
 <mode name="blessed-xhtml-svg">
    <namespace ns="https://www.w3.org/2000/svg">
-      <allow/>
+      <allow useMode="allowForeignNS"/>
    </namespace>
    <namespace ns="https://www.w3.org/1999/xhtml">
       <allow/>
@@ -27,7 +27,7 @@
       <attach/>
    </namespace>
    <namespace ns="https://www.w3.org/2000/svg">
-	  <attach/>
+   	<attach useMode="allowForeignNS"/>
    </namespace>
    <anyNamespace>
       <allow/>
@@ -46,7 +46,7 @@
 <!-- mode that validates SVG and OPS islands inside XHTML -->
 <mode name="xhtml-content">
    <namespace ns="https://www.w3.org/2000/svg">
-      <attach/>
+   	<attach useMode="allowForeignNS"/>
    </namespace>
    <namespace ns="https://www.w3.org/1999/xhtml">
       <attach/>
@@ -67,4 +67,24 @@
    </namespace>
 </mode>
 
+	<mode name="allowForeignNS">
+		<namespace ns="https://www.w3.org/1999/xhtml">
+			<attach/>
+		</namespace>
+		<namespace ns="https://www.idpf.org/2007/ops" match="attributes">
+			<attach/>
+		</namespace>
+		<namespace ns="https://www.w3.org/1999/xlink" match="attributes">
+			<attach/>
+		</namespace>
+		<namespace ns="https://www.w3.org/XML/1998/namespace" match="attributes">
+			<attach/>
+		</namespace>
+		<namespace ns="" match="attributes">
+			<attach/>
+		</namespace>
+		<anyNamespace match="elements attributes">
+			<allow/>
+		</anyNamespace>
+	</mode>
 </rules>
