feat: update HTML schemas from the HTML Checker

Imported changes up to commit: - validator/validator@d00d51a Fixes #1111
w3c · May 1, 2020 · 22fa3b1 · 22fa3b1
1 parent e732068
commit 22fa3b1
Show file tree

Hide file tree

Showing 28 changed files with 272 additions and 257 deletions.
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-type-attr.rnc b/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-type-attr.rnc
@@ -6,7 +6,7 @@
    ## to reset the definition of the class of attributes
    ## where epub:type is added in the nav doc schema, and
    ## common.attrs.other is augmented by other schemas.
-   ## We therefore augment common.attrs (and also attrobute
+   ## We therefore augment common.attrs (and also attribute
    ## lists that are not based on common.attrs) 
    common.attrs.basic &= epub.type.attr?
 

diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-xhtml-mathml3.rnc b/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-xhtml-mathml3.rnc
@@ -2,4 +2,9 @@ namespace math = "http://www.w3.org/1998/Math/MathML"
 
 include "epub-mathml3.rnc"
 
-common.elem.phrasing |= math
+common.elem.phrasing |= math
+
+math.attributes &=
+	(	common.attrs.aria.role.math
+	|	common.attrs.aria.implicit.math
+	)?
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/README b/src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/README
@@ -3,7 +3,12 @@ The modules in this directory are part of the schema that defines
 a vocabulary and grammar for EPUB3 XHTML Content Documents [1], 
 based on W3C HTML [2], with EPUB extensions. 
 
-The modules are derived from the schemas used in the Nu Html Checker [3]. 
+The modules are derived from the schemas used in the Nu Html Checker [3],
+up-to-date with commit d00d51a585175f09c67c150aeb6891d3695bfebf
+
+The file `epubcheck.patch` was created when first importing the HTML schemas,
+to document how the type system was adapted. It is not intended to be applied
+automatically as a patch file.
 
 [1] p://www.idpf.org/epub3/latest/contentdocs
 [2] https://www.w3.org/TR/html/

diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/applications.rnc b/src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/applications.rnc
@@ -98,18 +98,7 @@
 		(	common.attrs
 		&	dialog.attrs.open?
 		&	(	common.attrs.aria.implicit.dialog
-			|	common.attrs.aria.role.alert
 			|	common.attrs.aria.role.alertdialog
-			|	common.attrs.aria.role.application
-			|	common.attrs.aria.role.contentinfo
-			|	common.attrs.aria.role.dialog
-			|	common.attrs.aria.role.log
-			|	common.attrs.aria.role.marquee
-			|	common.attrs.aria.role.region
-			|	common.attrs.aria.role.status
-			|	common.attrs.aria.landmark.document
-			|	common.attrs.aria.landmark.main
-			|	common.attrs.aria.landmark.search
 			)?
 		)
 		dialog.attrs.open =
@@ -126,12 +115,14 @@
 		element menu { menu.inner & menu.attrs }
 	menu.attrs =
 		(	common.attrs
-		&	(	common.attrs.aria.implicit.toolbar
+		&	(	common.attrs.aria.implicit.list
 			|	common.attrs.aria.role.directory
+			|	common.attrs.aria.role.group
 			|	common.attrs.aria.role.list
 			|	common.attrs.aria.role.listbox
 			|	common.attrs.aria.role.menu
 			|	common.attrs.aria.role.menubar
+			|	common.attrs.aria.role.radiogroup
 			|	common.attrs.aria.role.tablist
 			|	common.attrs.aria.role.toolbar
 			|	common.attrs.aria.role.tree

diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/aria.rnc b/src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/aria.rnc
@@ -104,6 +104,9 @@ common.attrs.aria.implicit.listitem |=
 	&	aria.state.expanded?
 	)
 
+common.attrs.aria.implicit.math |=
+	(	aria.state.expanded? )
+
 common.attrs.aria.implicit.option |=
 	(	aria.prop.posinset?
 	&	aria.prop.setsize?
@@ -146,6 +149,14 @@ common.attrs.aria.implicit.searchbox |=
 	&	aria.prop.required?
 	)
 
+common.attrs.aria.implicit.separator |=
+	(	aria.prop.valuemax?
+	&	aria.prop.valuemin?
+	&	aria.prop.valuenow?
+	&	aria.prop.valuetext?
+	&	aria.prop.orientation?
+	)
+
 common.attrs.aria.implicit.slider |=
 	(	aria.prop.valuemax?
 	&	aria.prop.valuemin?
@@ -276,34 +287,9 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
 ## dropeffect
 	aria.state.dropeffect =
 		attribute aria-dropeffect
-			{	token "none" #default
-			| token "popup"
-			| token "execute"
-			|	list 
-				{	( string "copy" )
-				,	( string "execute" )?
-				}
-			|	list 
-				{	( string "move" )
-				,	( string "execute" )?
-				}
-			|	list 
-				{	( string "link" )
-				,	( string "execute" )?
-				}
-			|	list 
-				{	( string "execute" )
-				,	( string "copy" )
-				}
-			|	list 
-				{	( string "execute" )
-				,	( string "move" )
-				}
-			|	list 
-				{	( string "execute" )
-				,	( string "link" )
-				}
-			}
+			{	
+				list { ("copy" | "execute" | "link" | "move" | "none" | "popup") + } 
+		}
 
 ## expanded
 	aria.state.expanded =
@@ -1047,6 +1033,7 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
 			attribute role { string "math" }
 
 	common.attrs.aria |= aria.math
+	common.attrs.aria.role.math |= aria.math
 
 ## menu
 	aria.menu =
@@ -1292,6 +1279,7 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
 			attribute role { string "scrollbar" }
 
 	common.attrs.aria |= aria.scrollbar
+	common.attrs.aria.role.scrollbar |= aria.scrollbar
 
 ## search
 	aria.search =

diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/block.rnc b/src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/block.rnc
@@ -1,4 +1,5 @@
 
+
 # #####################################################################
 ##  RELAX NG Schema for HTML 5: Basic Prose Markup                    #
 # #####################################################################
@@ -25,7 +26,8 @@
 		element hr { hr.inner & hr.attrs }
 	hr.attrs =
 		(	common.attrs
-		&	(	common.attrs.aria.role.separator
+		&	(	common.attrs.aria.implicit.separator
+			|	common.attrs.aria.role.separator
 			|	common.attrs.aria.role.presentation
 			|	common.attrs.aria.role.doc-pagebreak
 			)?
@@ -278,4 +280,11 @@
 		)
 	legend.inner =
 		(	common.inner.phrasing
+		&	h1.elem?
+		&	h2.elem?
+		&	h3.elem?
+		&	h4.elem?
+		&	h5.elem?
+		&	h6.elem?
+		&	hgroup.elem?
 		)
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/common.rnc b/src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/common.rnc
@@ -1,4 +1,5 @@
 
+
 # #####################################################################
 ##  RELAX NG Schema for HTML 5: Common Definitions                    #
 # #####################################################################
@@ -200,7 +201,25 @@ common.attrs.present =
 		}
 
 common.attrs.other =
-	empty
+	(	common.attrs.autofocus?
+	&	common.attrs.inputmode?
+	&	common.attrs.nonce?
+	)
+
+	common.attrs.autofocus = 
+		attribute autofocus {
+			"autofocus" | ""
+		}
+
+	common.attrs.inputmode =
+		attribute inputmode {
+			string
+		}
+
+	common.attrs.nonce =
+		attribute nonce {
+			string
+		}
 
 # #####################################################################
 ##  Common Datatypes                                                  #
@@ -459,7 +478,6 @@ common.attrs.aria.role.cell |= ( notAllowed )
 common.attrs.aria.role.checkbox = ( notAllowed )
 common.attrs.aria.role.combobox = ( notAllowed )
 common.attrs.aria.role.complementary = ( notAllowed )
-common.attrs.aria.role.contentinfo = ( notAllowed )
 common.attrs.aria.role.dialog = ( notAllowed )
 common.attrs.aria.role.directory = ( notAllowed )
 common.attrs.aria.role.document = ( notAllowed )
@@ -480,7 +498,6 @@ common.attrs.aria.role.menubar = ( notAllowed )
 common.attrs.aria.role.menuitem = ( notAllowed )
 common.attrs.aria.role.menuitemcheckbox = ( notAllowed )
 common.attrs.aria.role.menuitemradio = ( notAllowed )
-common.attrs.aria.role.note = ( notAllowed )
 common.attrs.aria.role.option = ( notAllowed )
 common.attrs.aria.role.presentation = ( notAllowed )
 common.attrs.aria.role.progressbar = ( notAllowed )
@@ -525,6 +542,7 @@ common.attrs.aria.implicit.list = ( notAllowed )
 common.attrs.aria.implicit.listbox = ( notAllowed )
 common.attrs.aria.implicit.listitem = ( notAllowed )
 common.attrs.aria.implicit.main = ( notAllowed )
+common.attrs.aria.implicit.math |= ( notAllowed )
 common.attrs.aria.implicit.navigation = ( notAllowed )
 common.attrs.aria.implicit.option = ( notAllowed )
 common.attrs.aria.implicit.progressbar = ( notAllowed )
@@ -535,6 +553,7 @@ common.attrs.aria.implicit.rowgroup |= ( notAllowed )
 common.attrs.aria.implicit.searchbox |= ( notAllowed )
 common.attrs.aria.implicit.section = ( notAllowed )
 common.attrs.aria.implicit.select = ( notAllowed )
+common.attrs.aria.implicit.separator = ( notAllowed )
 common.attrs.aria.implicit.slider = ( notAllowed )
 common.attrs.aria.implicit.spinbutton = ( notAllowed )
 common.attrs.aria.implicit.status = ( notAllowed )