feat: update to latest schemas from the Nu HTML Checker

--------------------- Add `plaintext-only` value to `contenteditable` attribute validator/validator@228ea687b Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- add warnings for deprecated ARIA attributes (#1560) validator/validator@e61fbeb2c Co-authored-by: Steve Faulkner <faulkner.steve@gmail.com> --------------------- disallow aria attributes on datalist (#1557) validator/validator@b4849c04b Co-authored-by: Steve Faulkner <faulkner.steve@gmail.com> --------------------- allow role=button on area validator/validator@89ff1fc2b Co-authored-by: stevefaulkner <faulkner.steve@gmail.com> --------------------- fix: allow -1 for aria-colcount validator/validator@2466e73c4 Co-authored-by: Nick Schonning <nschonni@gmail.com> --------------------- fix: Allow -1 for aria-rowcount validator/validator@eac205b6b Co-authored-by: Nick Schonning <nschonni@gmail.com> --------------------- Add `fetchpriority` attribute validator/validator@7c9991405 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- Script type importmap (#1478) validator/validator@4054c56f5 Co-authored-by: Michał Niedziółka <niedziolek@hotmail.com> --------------------- Move “manifest” attribute to legacy-attributes list validator/validator@175e62d3a Co-authored-by: Michael[tm] Smith <mike@w3.org> --------------------- Pointer Events (#1481) validator/validator@5eb52a931 Co-authored-by: Michał Niedziółka <niedziolek@hotmail.com> --------------------- Report a better error message for obsolete “manifest” attribute validator/validator@ae924b625 Co-authored-by: Michael[tm] Smith <mike@w3.org> --------------------- onscrollend validator/validator@87287a97f Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- slot element validator/validator@d6cf423c1 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- Allow paragraphs in hgroup (#1467) validator/validator@3ff53973f Co-authored-by: Michał Niedziółka <niedziolek@hotmail.com> --------------------- blocking="render" (#1466) validator/validator@df5d4e23a Co-authored-by: Michał Niedziółka <niedziolek@hotmail.com> --------------------- inert validator/validator@507f551b2 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- hidden=until-found validator/validator@a424d55a8 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- media attribute in meta element validator/validator@af3e94d22 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- Sync event handlers validator/validator@58bea51c7 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- Remove manifest attribute validator/validator@66510f3ca Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- enterkeyhint validator/validator@70f3044d7 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- Form method dialog (#1443) validator/validator@0db229a44 Co-authored-by: Michał Niedziółka <niedziolek@hotmail.com> --------------------- imagesrcset and imagesizes in link (#1444) validator/validator@49656dbfc Co-authored-by: Michał Niedziółka <niedziolek@hotmail.com> --------------------- feat: add support width and height of source in picture validator/validator@176d98e4f Co-authored-by: Takeshi Kurosawa <kurosawa-takeshi@mitsue.co.jp> --------------------- Update: allow none/presentation on nav element (#1323) validator/validator@5e25edb39 Co-authored-by: Scott O'Hara <scottaohara@users.noreply.github.com> --------------------- Update schema/html5/web-forms.rnc validator/validator@95ba6c7cf Co-authored-by: Michael[tm] Smith <mike@w3.org> --------------------- update role allowances for button and input type=button validator/validator@6cc14c4d7 Co-authored-by: Scott O'Hara <scottaohara@users.noreply.github.com> --------------------- adds role=radio alowance to img alt=foo validator/validator@b013aa02b Co-authored-by: Scott O'Hara <scottaohara@users.noreply.github.com> --------------------- remove deprecated dpub role allowances validator/validator@b0fb152c0 Co-authored-by: Scott O'Hara <scottaohara@users.noreply.github.com> --------------------- allow section element to have role=group validator/validator@078341d37 Co-authored-by: Scott O'Hara <scottaohara@users.noreply.github.com>
w3c · Jul 7, 2023 · 2f6a2c7 · 2f6a2c7
1 parent d916df0
commit 2f6a2c7
Show file tree

Hide file tree

Showing 14 changed files with 222 additions and 92 deletions.
diff --git a/src/build/update-validator-schemas.sh b/src/build/update-validator-schemas.sh
@@ -57,7 +57,7 @@ git fetch $UPSTREAM
 
 ## Create patches since last update (to the `latest` tag)
 echo "Creating paches of changes since the last update"
-git format-patch -o $EPUBCHECK_DIR $LAST_SHA1..latest schema
+git format-patch -o $EPUBCHECK_DIR/ $LAST_SHA1..latest schema
 
 ## Get the SHA-1 of the `latest` tag
 LATEST=`git rev-list -n 1 latest`
@@ -85,4 +85,5 @@ git am *.patch
 # Remaing tasks:
 # - commit new last commit ID
 # - squash commits (add "Co-Authored by" credits)
+#   `git log --pretty=format:"---------------------%n%n%s%n%nhttps://github.com/validator/validator/commit/%h%n%nCo-authored-by: %aN <%aE>%n" $LAST-SHA1..latest schema``
 # - remove patch files
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/LAST_UPDATE b/src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/LAST_UPDATE
@@ -1 +1 @@
-9b11254fbe3c5cb2339794101e17e7d8ec844223
+b118bf6031b0b06797f3ccdc25d0f74c1447139a
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
@@ -10,8 +10,6 @@
 		(	common.attrs.contenteditable?
 		&	common.attrs.draggable?
 		&	common.attrs.hidden?
-		&	common.attrs.spellcheck?
-		&	common.attrs.autocapitalize?
 		)
 
 	common.attrs.other &= common.attrs.interact
@@ -20,7 +18,7 @@
 
 	common.attrs.contenteditable =
 		attribute contenteditable {
-			 "true" |  "false" |  ""
+			 "true" | "plaintext-only" | "false" |  ""
 		}
 
 ## Draggable Element: draggable
@@ -34,13 +32,39 @@
 
 	common.attrs.hidden =
 		attribute hidden {
-			 "hidden" |  ""
+			 "hidden" | "until-found" | ""
+		}
+
+## Global attributes applicable on elements with editable content
+
+	common.attrs.editing &=
+		(	common.attrs.inputmode?
+		&	common.attrs.spellcheck?
+		&	common.attrs.autocapitalize?
+		&	common.attrs.enterkeyhint?
+		)
+
+	common.attrs.other &= common.attrs.editing
+
+## Hint expected data type: inputmode
+
+	common.attrs.inputmode =
+		attribute inputmode {
+			( "none"
+			| "text"
+			| "tel"
+			| "url"
+			| "email"
+			| "numeric"
+			| "decimal"
+			| "search"
+			)
 		}
 
 ## Spellchecking and grammar checking: spellcheck
 
 	common.attrs.spellcheck =
-		attribute spellcheck{
+		attribute spellcheck {
 			 "true" |  "false" |  ""
 		}
 
@@ -57,14 +81,19 @@
 			)
 		}
 
-## Application Cache: manifest
+## Type of Enter button on virtual keyboards: enterkeyhint
 
-	html.attrs.manifest =
-		attribute manifest {
-			common.data.uri.non-empty
+	common.attrs.enterkeyhint =
+		attribute enterkeyhint {
+			( "enter"
+			| "done"
+			| "go"
+			| "next"
+			| "previous"
+			| "search"
+			| "send"
+			)
 		}
-
-	html.attrs &= html.attrs.manifest?
 
 ## Progess Indicator: <progress>
 

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
@@ -17,10 +17,8 @@ aria.global =
 	&	aria.prop.describedby?
 	&	aria.prop.details?
 	&	aria.state.disabled?
-	&	aria.state.dropeffect?
 	&	aria.prop.errormessage?
 	&	aria.prop.flowto?
-	&	aria.state.grabbed?
 	&	aria.prop.haspopup?
 	&	aria.state.hidden?
 	&	aria.state.invalid?
@@ -288,13 +286,6 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
 			|	string "false" #default
 			}
 
-## dropeffect
-	aria.state.dropeffect =
-		attribute aria-dropeffect
-			{	
-				list { ("copy" | "execute" | "link" | "move" | "none" | "popup") + } 
-		}
-
 ## expanded
 	aria.state.expanded =
 		attribute aria-expanded 
@@ -303,14 +294,6 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
 			|	string "undefined" #default
 			}
 
-## grabbed
-	aria.state.grabbed =
-		attribute aria-grabbed 
-			{	string "true"
-			|	string "false"
-			|	string "undefined" #default
-			}
-
 ## hidden
 	aria.state.hidden =
 		attribute aria-hidden 
@@ -374,7 +357,9 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
 ## colcount
 	aria.prop.colcount =
 		attribute aria-colcount {
-			common.data.integer.positive
+			(	common.data.integer.non-negative
+                        |	string "-1"
+                        )
 		}
 
 ## colindex
@@ -576,7 +561,9 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
 ## rowcount
 	aria.prop.rowcount =
 		attribute aria-rowcount {
-			common.data.integer.positive
+			(	common.data.integer.non-negative
+                        |	string "-1"
+                        )
 		}
 
 ## rowindex

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
@@ -101,8 +101,6 @@
 			|	common.attrs.aria.role.treeitem
 			|	common.attrs.aria.role.separator
 			|	common.attrs.aria.role.presentation
-			|	common.attrs.aria.role.doc-biblioentry
-			|	common.attrs.aria.role.doc-endnote
 			)?
 		)
 	li.inner =

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
@@ -202,25 +202,35 @@ common.attrs.present =
 
 common.attrs.other =
 	(	common.attrs.autofocus?
-	&	common.attrs.inputmode?
 	&	common.attrs.nonce?
+	&	common.attrs.inert?
 	)
 
 	common.attrs.autofocus = 
 		attribute autofocus {
 			"autofocus" | ""
 		}
 
-	common.attrs.inputmode =
-		attribute inputmode {
-			string
+	common.attrs.blocking = 
+		attribute blocking {
+			list { "render" }
+		}
+
+	common.attrs.fetchpriority =
+		attribute fetchpriority {
+			"high" | "low" | "auto"
 		}
 
 	common.attrs.nonce =
 		attribute nonce {
 			string
 		}
 
+	common.attrs.inert = 
+		attribute inert {
+			string "inert" | string ""
+		}
+
 # #####################################################################
 ##  Common Datatypes                                                  #
 # #####################################################################