w3c
diff --git a/‎src/main/java/com/adobe/epubcheck/ops/OPSChecker.java
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/main/java/com/adobe/epubcheck/ops/OPSChecker.java
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/xml/XMLValidators.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/main/java/com/adobe/epubcheck/xml/XMLValidators.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-nav-30.rnc
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-nav-30.rnc
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-informative.nvdl renamed to ‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30-informative.nvdl
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-informative.nvdl renamed to ‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30-informative.nvdl
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30-informative.rnc
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30-informative.rnc
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.rnc
Copy file name to clipboard
+10-13Lines changed: 10 additions & 13 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.rnc
Copy file name to clipboard
+10-13Lines changed: 10 additions & 13 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-informative.rnc
Copy file name to clipboard
-21Lines changed: 0 additions & 21 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-informative.rnc
Copy file name to clipboard
-21Lines changed: 0 additions & 21 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.rnc
Copy file name to clipboard
+4-17Lines changed: 4 additions & 17 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.rnc
Copy file name to clipboard
+4-17Lines changed: 4 additions & 17 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-mathml3.rnc renamed to ‎src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-mathml3-inc.rnc
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-mathml3.rnc renamed to ‎src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-mathml3-inc.rnc
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-prefix-attr.rnc
Copy file name to clipboard
+16-6Lines changed: 16 additions & 6 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-prefix-attr.rnc
Copy file name to clipboard
+16-6Lines changed: 16 additions & 6 deletions
@@ -56,11 +56,11 @@ public class OPSChecker extends PublicationResourceChecker
       .putAll(Predicates.and(mimetype("application/xhtml+xml"), version(EPUBVersion.VERSION_2)),
           XMLValidators.XHTML_20_NVDL, XMLValidators.XHTML_20_SCH, XMLValidators.IDUNIQUE_20_SCH)
       .putAll(Predicates.and(mimetype("application/xhtml+xml"), version(EPUBVersion.VERSION_3)),
-          XMLValidators.XHTML_30_NVDL, XMLValidators.SVG_INFORMATIVE_30_NVDL)
+          XMLValidators.XHTML_30_NVDL, XMLValidators.SVG_30_INFORMATIVE_NVDL)
       .putAll(Predicates.and(mimetype("image/svg+xml"), version(EPUBVersion.VERSION_2)),
           XMLValidators.SVG_20_NVDL, XMLValidators.IDUNIQUE_20_SCH)
       .putAll(Predicates.and(mimetype("image/svg+xml"), version(EPUBVersion.VERSION_3)),
-          XMLValidators.SVG_30_NVDL, XMLValidators.SVG_INFORMATIVE_30_NVDL)
+          XMLValidators.SVG_30_NVDL, XMLValidators.SVG_30_INFORMATIVE_NVDL)
       .putAll(
           and(or(profile(EPUBProfile.DICT), hasPubType(PublicationType.DICTIONARY)),
               mimetype("application/xhtml+xml"), version(EPUBVersion.VERSION_3)),
 
@@ -39,7 +39,7 @@ public enum XMLValidators
   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_INFORMATIVE_30_NVDL("schema/30/epub-svg-informative.nvdl", false),
+  SVG_30_INFORMATIVE_NVDL("schema/30/epub-svg-30-informative.nvdl", false),
   SVG_30_SCH("schema/30/epub-svg-30.sch"),
   XHTML_20_NVDL("schema/20/rng/ops20.nvdl"),
   XHTML_20_SCH("schema/20/sch/xhtml.sch"),
 
@@ -2,6 +2,11 @@
    default namespace = "https://www.w3.org/1999/xhtml"
    namespace epub = "https://www.idpf.org/2007/ops"
 
+ 
+# #####################################################################
+##  RELAX NG Schema for EPUB: EPUB Navigation Documents               #
+# #####################################################################
+   
    include "epub-xhtml-30.rnc" {   
         nav.attrs = nav.attrs.noepubtype
    }
 
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rules xmlns="https://purl.oclc.org/dsdl/nvdl/ns/structure/1.0">
 	<namespace ns="https://www.w3.org/2000/svg">
-		<validate schema="epub-svg-informative.rnc" schemaType="application/relax-ng-compact-syntax"/>
+		<validate schema="epub-svg-30-informative.rnc" schemaType="application/relax-ng-compact-syntax"/>
 	</namespace>
 	<namespace ns="" match="attributes">
 		<attach/>
 
@@ -0,0 +1,17 @@
+  namespace svg = "https://www.w3.org/2000/svg"
+
+# #####################################################################
+##  RELAX NG Schema for EPUB: EPUB SVG and XHTML (+ MathML)           #
+##         strict SVG grammar check (informative only)                #
+# #####################################################################
+
+include "./mod/epub-xhtml-inc.rnc" {
+  # This schema applies both to XHTML and SVG documents
+  start = svg | html.elem
+}
+include "./mod/epub-svg-strict-inc.rnc"
+include "./mod/epub-mathml3-inc.rnc"
+include "./mod/epub-shared-inc.rnc"
+
+common.elem.phrasing |= svg
+common.elem.phrasing |= math
@@ -1,17 +1,14 @@
-namespace svg = "https://www.w3.org/2000/svg"
 
-include "./mod/epub-xhtml-inc.rnc" {
+# #####################################################################
+##  RELAX NG Schema for EPUB: EPUB SVG (+ XHTML, + MathML)            #
+# #####################################################################
+
+include "./mod/epub-xhtml-svg-mathml.rnc" {
   start = svg
+  
+  # Override the `id` attribute to require a valid XML ID
+  svg.attr.id = attribute id { xsd:ID }?
 }
-include "./mod/epub-mathml3.rnc"
-include "./mod/epub-svg-inc.rnc"
-
-svg.title.content |= common.inner.anyhtml
-
-svg.foreignObject.content |= 
-  ( body.elem
-  | common.inner.flow
-  | math 
-  )
 
-mtext.content |= common.elem.phrasing
+# Allow `body` element as a child of `foreignObject` 
+svg.foreignObject.inner |= body.elem 
@@ -1,19 +1,6 @@
-namespace svg = "https://www.w3.org/2000/svg"
 
-include "./mod/epub-xhtml-inc.rnc"
-include "./mod/epub-mathml3.rnc"
-include "./mod/epub-svg-inc.rnc" {
-  svg.attr.id = attribute id { datatype.html5.token }?
-}
+# #####################################################################
+##  RELAX NG Schema for EPUB: EPUB XHTML (+ SVG, + MathML)            #
+# #####################################################################
 
-common.elem.phrasing |= svg
-common.elem.phrasing |= math
-
-math.attributes &= aria.global?
-
-svg.title.content |= common.inner.anyhtml
-
-svg.foreignObject.content |= 
-  ( common.inner.flow
-  | math 
-  )
+include "./mod/epub-xhtml-svg-mathml.rnc"
@@ -29,16 +29,18 @@ include "mathml/mathml3-inc.rnc" {
     # override annotation-xml with EPUB restrictions
     annotation-xml = epub.annotation-xml
 }
-
 # Common attribute extensions
 # - SSML attributes 
 CommonAtt &= epub.ssml.ph.attr?
 # - xml:base
 CommonAtt &= common.attrs.xmlbase?
+# - ARIA
+CommonAtt  &= aria.global?
 
 annotation-xml.model.xhtml |= common.inner.flow
 annotation-xml.model.svg |= svg
 
+
 # The following comes from validator.nu’s xhtml5-svg-mathml.rnc driver:
 # in our integration, <mtext> is the only MathML "token element" that can
 # contain HTML element content; the <mi>, <mn>, <mo> and <ms> elements
@@ -84,4 +86,3 @@ epub.annotation-xml =
           attribute name {
             xsd:NCName
           }
-
 
@@ -1,8 +1,18 @@
 
+  namespace epub = "https://www.idpf.org/2007/ops"
 
-   namespace epub = "https://www.idpf.org/2007/ops"
-      
-   html.attrs &=  epub.prefix.attr.ns?
-      
-   epub.prefix.attr = attribute prefix { datatype.prefixdecl }   
-   epub.prefix.attr.ns = attribute epub:prefix { datatype.prefixdecl }
+# #####################################################################
+##  RELAX NG Schema for EPUB: EPUB prefix attributes                  #
+# #####################################################################
+
+## prefix attributes
+
+  epub.prefix.attr =
+    attribute prefix {
+      datatype.prefixdecl
+    }   
+
+  epub.prefix.attr.ns =
+    attribute epub:prefix {
+      datatype.prefixdecl
+    }