w3c
diff --git a/‎src/main/java/com/adobe/epubcheck/ops/OPSChecker.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/main/java/com/adobe/epubcheck/ops/OPSChecker.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/com/adobe/epubcheck/xml/XMLValidators.java
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎src/main/java/com/adobe/epubcheck/xml/XMLValidators.java
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.nvdl
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.nvdl
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.rnc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.rnc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-informative.rnc
Copy file name to clipboard
+2-11Lines changed: 2 additions & 11 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-informative.rnc
Copy file name to clipboard
+2-11Lines changed: 2 additions & 11 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.nvdl
Copy file name to clipboard
+33-2Lines changed: 33 additions & 2 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.nvdl
Copy file name to clipboard
+33-2Lines changed: 33 additions & 2 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.rnc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.rnc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.sch
Copy file name to clipboard
-5Lines changed: 0 additions & 5 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.sch
Copy file name to clipboard
-5Lines changed: 0 additions & 5 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg-inc.rnc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg-inc.rnc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-xhtml-inc.rnc
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions b/‎src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-xhtml-inc.rnc
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions
@@ -56,7 +56,7 @@ 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_RNC, XMLValidators.XHTML_30_SCH, XMLValidators.SVG_INFORMATIVE_30_NVDL)
+          XMLValidators.XHTML_30_NVDL, XMLValidators.SVG_INFORMATIVE_30_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)),
 
@@ -45,6 +45,7 @@ public enum XMLValidators
   XHTML_20_SCH("schema/20/sch/xhtml.sch"),
   XHTML_30_SCH("schema/30/epub-xhtml-30.sch"),
   XHTML_30_RNC("schema/30/epub-xhtml-30.rnc"),
+  XHTML_30_NVDL("schema/30/epub-xhtml-30.nvdl"),
   XHTML_EDUPUB_STRUCTURE_SCH("schema/30/edupub/edu-structure.sch"),
   XHTML_EDUPUB_SEMANTICS_SCH("schema/30/edupub/edu-semantics.sch"),
   XHTML_DATANAV_SCH("schema/30/datanav/datanav-xhtml.sch"),
 
@@ -5,6 +5,7 @@
 			<validate schema="epub-svg-30.rnc" schemaType="application/relax-ng-compact-syntax"
 				useMode="allowForeignNS">
 				<context path="foreignObject" useMode="attachAnyNS"/>
+				<context path="title" useMode="allowOnlyHTML"/>
 			</validate>
 			<validate schema="epub-svg-30.sch" useMode="attachAnyNS"/>
 		</namespace>
@@ -34,4 +35,27 @@
 			<attach/>
 		</anyNamespace>
 	</mode>
+	<mode name="allowOnlyHTML">
+		<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="attributes">
+			<allow/>
+		</anyNamespace>
+		<anyNamespace>
+			<reject/>
+		</anyNamespace>
+	</mode>
 </rules>
@@ -1,17 +1,17 @@
 namespace svg = "https://www.w3.org/2000/svg"
 
-include "./mod/epub-xhtml.rnc" {
+include "./mod/epub-xhtml-inc.rnc" {
   start = svg
 }
 include "./mod/epub-mathml3.rnc"
 include "./mod/epub-svg-inc.rnc"
 
-svg.title.content |= common.elem.phrasing
+svg.title.content |= common.inner.anyhtml
 
 svg.foreignObject.content |= 
   ( body.elem
   | common.inner.flow
   | math 
   )
 
-mtext.content |= common.elem.phrasing
+mtext.content |= common.elem.phrasing
@@ -17,14 +17,5 @@ SVG.Core.attrib &= aria.global?
 SVG.Core.extra.attrib &= epub.type.attr?
 
 ## Do not check restricted elements, they are checked in normative schemas
-SVG.foreignObject.content |= any.content
-SVG.title.content |= any.content
-
-## Anything
-
-## Any attribute from any namespace, other than the special cases
-any.attr = attribute * { text }*
-## Any element from any namespace, other than the special cases
-any.elem = element * { any.content & any.attr }
-## Any content from any namespace
-any.content = text & any.elem*
+SVG.foreignObject.content |= common.inner.anything
+SVG.title.content |= common.inner.anything 
@@ -1,15 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="https://purl.oclc.org/dsdl/nvdl/ns/structure/1.0" startMode="html">
+<rules xmlns="https://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"
+  xmlns:svg="https://www.w3.org/2000/svg" startMode="html">
   <mode name="html">
     <namespace ns="https://www.w3.org/1999/xhtml">
       <validate schema="epub-xhtml-30.rnc" schemaType="application/relax-ng-compact-syntax"
-        useMode="attach"/>
+        useMode="attach">
+        <context path="title" useMode="allowOnlyHTML"/>
+      </validate>
       <validate schema="epub-xhtml-30.sch" useMode="attach"/>
     </namespace>
   </mode>
   <mode name="attach">
+    <namespace ns="https://www.w3.org/2000/svg">
+      <attach>
+        <context path="title" useMode="allowOnlyHTML"/>
+      </attach>
+    </namespace>
     <anyNamespace>
       <attach/>
     </anyNamespace>
   </mode>
+  <mode name="allowOnlyHTML">
+    <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="attributes">
+      <allow/>
+    </anyNamespace>
+    <anyNamespace>
+      <reject/>
+    </anyNamespace>
+  </mode>
 </rules>
@@ -1,6 +1,6 @@
 namespace svg = "https://www.w3.org/2000/svg"
 
-include "./mod/epub-xhtml.rnc"
+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 }?
@@ -11,7 +11,7 @@ common.elem.phrasing |= math
 
 math.attributes &= aria.global?
 
-svg.title.content |= common.elem.phrasing
+svg.title.content |= common.inner.anyhtml
 
 svg.foreignObject.content |= 
   ( common.inner.flow
 
@@ -152,11 +152,6 @@
         <param name="descendant" value="h:label"/>
     </pattern>
 
-    <pattern id="descendant-svgtitle-svg" is-a="disallowed-descendants">
-        <param name="ancestor" value="svg:title"/>
-        <param name="descendant" value="svg:*"/>
-    </pattern>
-
     <pattern id="bdo-dir" is-a="required-attr">
         <param name="elem" value="h:bdo"/>
         <param name="attr" value="dir"/>
 
@@ -27,7 +27,7 @@ svg.foreignObject.content = notAllowed
 ### SVG title element restrictions
 svg.title =
   element title { any.attr & svg.title.content }
-svg.title.content = text
+svg.title.content = text 
 
 ## Anything
 
 
@@ -0,0 +1,18 @@
+
+# #####################################################################
+##  RELAX NG Schema for EPUB HTML 5: For inclusion in master schema   #
+# #####################################################################
+
+## Include the main XHTML schema
+
+include "./epub-xhtml.rnc"
+
+## HTML fragments
+
+# Note: the default HMTL schema does not define such a category, so we
+# do our best to include what makes sense here
+
+  common.inner.anyhtml = 
+      html.elem
+    | body.elem
+    | common.inner.flow