fix: check MathML and XHTML content in epub:switch

FWIW :P Fixes #835
w3c · Jan 12, 2019 · 39556e8 · 39556e8
1 parent 9058524
commit 39556e8
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 3 deletions.
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-switch.rnc b/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-switch.rnc
@@ -1,5 +1,7 @@
 
    namespace epub = "http://www.idpf.org/2007/ops"
+   namespace m = "http://www.w3.org/1998/Math/MathML"
+   namespace h = "http://www.w3.org/1999/xhtml"
 
    common.elem.flow |= epub.switch.flow
    common.elem.phrasing |= epub.switch.phrasing
@@ -14,7 +16,7 @@
 
    epub.case.flow.content = epub.switch.any 
    epub.case.phrasing.content = epub.switch.any
-   epub.switch.any = (epub.switch.anyElement | text)*
+   epub.switch.any = (common.elem.flow | epub.switch.anyElement | text)*
 
    epub.default.flow.content = common.inner.flow
    epub.default.phrasing.content = common.inner.phrasing
@@ -25,8 +27,10 @@
 
    epub.case.rn.attr = attribute required-namespace { datatype.URI }
 
-   epub.switch.anyElement = element * {
+   epub.switch.anyElement = element * - (m:* | h:*) {
       (attribute * { text }
       | text
-      | epub.switch.anyElement)*
+      | epub.switch.anyElement
+      | common.elem.flow
+      )*
    }   
diff --git a/src/test/java/com/adobe/epubcheck/ops/OPSCheckerTest.java b/src/test/java/com/adobe/epubcheck/ops/OPSCheckerTest.java
@@ -321,6 +321,14 @@ public void testValidateXHTMLSwitch001()
     testValidateDocument("xhtml/valid/switch-001.xhtml", "application/xhtml+xml",
         EPUBVersion.VERSION_3);
   }
+
+  @Test
+  public void testValidateXHTMLSwitchMathCase()
+  {
+    Collections.addAll(expectedErrors, MessageId.RSC_005);
+    testValidateDocument("xhtml/invalid/switch-invalid-mathml.xhtml", "application/xhtml+xml",
+        EPUBVersion.VERSION_3);
+  }
 
   @Test
   public void testValidateXHTMLTables001()

diff --git a/src/test/resources/30/single/xhtml/invalid/switch-invalid-mathml.xhtml b/src/test/resources/30/single/xhtml/invalid/switch-invalid-mathml.xhtml
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+    <head>
+        <title>MathML invalid 001</title>
+        <meta charset="UTF-8" />
+    </head>
+    <body>
+        <h1>nested math tags should be invalid even inside epub switch</h1>
+        <epub:switch>
+            <epub:case required-namespace="http://www.w3.org/1998/Math/MathML">
+                <math alttext="placeholder" display="block" overflow="scroll"
+                    xmlns="http://www.w3.org/1998/Math/MathML">
+                    <math alttext="a">
+                        <mn>11</mn>
+                        <mo>,</mo>
+                        <mo>−</mo>
+                        <mn>3</mn>
+                        <mo>,</mo>
+                        <mn>5</mn>
+                    </math>
+                </math>
+            </epub:case>
+            <epub:default>
+                <img src="../Images/Image0001.svg" alt="" /></epub:default>
+        </epub:switch>
+    </body>
+</html>