diff --git a/xml/relaxng/resources/resources/html5-schema/html5-all.rnc b/xml/relaxng/resources/resources/html5-schema/html5-all.rnc
deleted file mode 100644
index 64e18311f879..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5-all.rnc
+++ /dev/null
@@ -1,3 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "html5-svg-mathml.rnc"
-include "html5/html5full-rdfa.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5-its.rnc b/xml/relaxng/resources/resources/html5-schema/html5-its.rnc
deleted file mode 100644
index 29151500ecb9..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5-its.rnc
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2012 Jirka Kosek <jirka@kosek.cz>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-namespace local = ""
-
-include "html5-svg-mathml.rnc"
-include "html5/html5full.rnc"
-include "its2/its20-html5.rnc"
-
-common.attrs &= its-html-attributes
diff --git a/xml/relaxng/resources/resources/html5-schema/html5-no-microdata.rnc b/xml/relaxng/resources/resources/html5-schema/html5-no-microdata.rnc
deleted file mode 100644
index d59eab98b3a3..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5-no-microdata.rnc
+++ /dev/null
@@ -1,2 +0,0 @@
-include "html5-svg-mathml.rnc"
-include "html5/html5full-no-microdata.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5-rdfalite-w3c.rnc b/xml/relaxng/resources/resources/html5-schema/html5-rdfalite-w3c.rnc
deleted file mode 100644
index 6cbfa55d1643..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5-rdfalite-w3c.rnc
+++ /dev/null
@@ -1,2 +0,0 @@
-include "html5-svg-mathml.rnc"
-include "html5/html5full-rdfalite.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5-rdfalite.rnc b/xml/relaxng/resources/resources/html5-schema/html5-rdfalite.rnc
deleted file mode 100644
index 6cbfa55d1643..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5-rdfalite.rnc
+++ /dev/null
@@ -1,2 +0,0 @@
-include "html5-svg-mathml.rnc"
-include "html5/html5full-rdfalite.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5.rnc b/xml/relaxng/resources/resources/html5-schema/html5.rnc
index 64e18311f879..6d5b73bd63b4 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5.rnc
@@ -1,3 +1,13 @@
 default namespace = "http://www.w3.org/1999/xhtml"
+
+include "html5/html5.rnc"
+
+include "html5/common-ext.rnc"
+include "html5/embed-ext.rnc"
+include "html5/core-scripting-ext.rnc"
+include "html5/meta-ext.rnc"
+include "html5/rdfa.rnc"
+
+include "html5/legacy.rnc"
+
 include "html5-svg-mathml.rnc"
-include "html5/html5full-rdfa.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/applications.rnc b/xml/relaxng/resources/resources/html5-schema/html5/applications.rnc
index 865813b3a7e9..06954ac6fdfb 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/applications.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/applications.rnc
@@ -50,6 +50,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 	common.attrs.editing &=
 		(	common.attrs.inputmode?
 		&	common.attrs.spellcheck?
+		&	common.attrs.autocorrect?
+		&	common.attrs.writingsuggestions?
 		&	common.attrs.autocapitalize?
 		&	common.attrs.enterkeyhint?
 		)
@@ -78,6 +80,20 @@ datatypes w = "http://whattf.org/datatype-draft"
 			w:string "true" | w:string "false" | w:string ""
 		}
 
+## Autocorrection
+
+	common.attrs.autocorrect =
+		attribute autocorrect {
+			w:string "on" | w:string "off" | w:string ""
+		}
+
+## Writing suggestions
+
+	common.attrs.writingsuggestions  =
+		attribute writingsuggestions {
+			w:string "true" | w:string "false" | w:string ""
+		}
+
 ## Autocapitalization
 
 	common.attrs.autocapitalize =
@@ -136,14 +152,20 @@ datatypes w = "http://whattf.org/datatype-draft"
 	dialog.attrs =
 		(	common.attrs
 		&	dialog.attrs.open?
+		&	dialog.attrs.closedby?
 		&	(	common.attrs.aria.implicit.dialog
 			|	common.attrs.aria.role.alertdialog
+			|	common.attrs.aria.role.dialog
 			)?
 		)
 		dialog.attrs.open =
 			attribute open {
 				w:string "open" | w:string ""
 			}
+		dialog.attrs.closedby =
+			attribute closedby {
+				w:string "any" | w:string "closerequest" | w:string "none"
+			}
 	dialog.inner =
 		( common.inner.flow )
 	common.elem.flow |= dialog.elem
@@ -155,7 +177,6 @@ datatypes w = "http://whattf.org/datatype-draft"
 	menu.attrs =
 		(	common.attrs
 		&	(	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
@@ -229,10 +250,15 @@ datatypes w = "http://whattf.org/datatype-draft"
 	details.attrs =
 		(	common.attrs
 		&	details.attrs.open?
+		&	details.attrs.name?
 		&	(	common.attrs.aria.implicit.group # aria-expanded must be true if open attr present; check by assertions
 			|	common.attrs.aria.role.group
 			)?
 		)
+		details.attrs.name =
+			attribute name {
+				w:non-empty-string
+			}
 		details.attrs.open =
 			attribute open {
 				w:string "open" | w:string ""
@@ -250,9 +276,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		element summary { summary.inner & summary.attrs }
 	summary.attrs =
 		(	common.attrs
-		&	(	common.attrs.aria.implicit.button
-			|	common.attrs.aria.role.button
-			)?
+		&	common.attrs.aria?
 		)
 	summary.inner =
 		(	common.inner.phrasing
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/aria.rnc b/xml/relaxng/resources/resources/html5-schema/html5/aria.rnc
index c2d62730e2e1..a192f8203184 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/aria.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/aria.rnc
@@ -11,6 +11,8 @@
 
 aria.global =
 	(	aria.prop.atomic?
+	&	aria.prop.braillelabel?
+	&	aria.prop.brailleroledescription?
 	&	aria.state.busy?
 	&	aria.prop.controls?
 	&	aria.state.current?
@@ -32,8 +34,6 @@ aria.global =
 	&	aria.prop.description?
 	)
 
-common.attrs.other &= aria.global?
-
 ## States and Properties for Native Roles
 
 common.attrs.aria.implicit.button |=
@@ -44,16 +44,22 @@ common.attrs.aria.implicit.button |=
 common.attrs.aria.implicit.cell |=
 	(	aria.prop.colspan?
 	&	aria.prop.rowspan?
+	&	aria.prop.colindex?	# ARIA 1.1 and 1.2
 	&	aria.prop.rowindex?
 	)
 
 common.attrs.aria.implicit.checkbox |=
-	(	aria.state.checked? )
+	(	aria.state.checked?
+	&	aria.state.expanded?
+	&	aria.prop.readonly?
+	&	aria.prop.required?
+	)
 
 common.attrs.aria.implicit.combobox |=
 	(	aria.state.expanded?
 	&	aria.prop.autocomplete?
 	&	aria.prop.required?
+	&	aria.prop.placeholder?
 	&	aria.prop.activedescendant?
 	&	aria.prop.readonly?
 	)
@@ -62,7 +68,9 @@ common.attrs.aria.implicit.definition |=
 	(	aria.state.expanded? )
 
 common.attrs.aria.implicit.dialog |=
-	(	aria.state.expanded? )
+	(	aria.state.expanded?
+	&	aria.prop.modal?
+	)
 
 common.attrs.aria.implicit.document |=
 	(	aria.state.expanded? )
@@ -73,6 +81,18 @@ common.attrs.aria.implicit.figure |=
 common.attrs.aria.implicit.form |=
 	(	aria.state.expanded? )
 
+common.attrs.aria.implicit.gridcell |=
+	(	aria.prop.level? # net inherited
+	&	aria.prop.readonly? # not inherited
+	&	aria.state.selected? # not inherited
+	&	aria.state.expanded?
+	&	aria.prop.required?
+	&	aria.prop.colspan?
+	&	aria.prop.colindex?
+	&	aria.prop.rowspan?
+	&	aria.prop.rowindex?
+	)
+
 common.attrs.aria.implicit.group |=
 	(	aria.state.expanded?
 	&	aria.prop.activedescendant?
@@ -93,7 +113,6 @@ common.attrs.aria.implicit.listbox |=
 	(	aria.prop.multiselectable?
 	&	aria.prop.required?
 	&	aria.prop.activedescendant?
-	&	aria.state.expanded?
 	)
 
 common.attrs.aria.implicit.listitem |=
@@ -122,6 +141,7 @@ common.attrs.aria.implicit.progressbar |=
 
 common.attrs.aria.implicit.radio |=
 	(	aria.prop.posinset?
+	&	aria.prop.required?
 	&	aria.prop.setsize?
 	&	aria.state.checked?
 	&	aria.state.selected?
@@ -143,6 +163,7 @@ common.attrs.aria.implicit.searchbox |=
 	(	aria.prop.activedescendant?
 	&	aria.prop.autocomplete?
 	&	aria.prop.multiline?
+	&	aria.prop.placeholder?
 	&	aria.prop.readonly?
 	&	aria.prop.required?
 	)
@@ -168,6 +189,7 @@ common.attrs.aria.implicit.spinbutton |=
 	&	aria.prop.valuemin?
 	&	aria.prop.valuenow?
 	&	aria.prop.valuetext?
+	&	aria.prop.placeholder?
 	&	aria.prop.required?
 	)
 
@@ -183,6 +205,7 @@ common.attrs.aria.implicit.textbox |=
 	(	aria.prop.activedescendant?
 	&	aria.prop.autocomplete?
 	&	aria.prop.multiline?
+	&	aria.prop.placeholder?
 	&	aria.prop.readonly?
 	&	aria.prop.required?
 	)
@@ -355,6 +378,18 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 			|	string "none" #default
 			}
 
+## braillelabel
+	aria.prop.braillelabel =
+		attribute aria-braillelabel {
+			string
+		}
+
+## brailleroledescription
+	aria.prop.brailleroledescription =
+		attribute aria-brailleroledescription {
+			string
+		}
+
 ## colcount
 	aria.prop.colcount =
 		attribute aria-colcount {
@@ -650,6 +685,7 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	aria.application =
 		(	aria.role.application
 		&	aria.state.expanded?
+		&	aria.prop.activedescendant?		# ARIA 1.1 and 1.2
 		)
 		aria.role.application =
 			attribute role { string "application" }
@@ -661,6 +697,8 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	aria.article =
 		(	aria.role.article
 		&	aria.state.expanded?
+		&	aria.prop.posinset?		# ARIA 1.1 and 1.2
+		&	aria.prop.setsize?		# ARIA 1.1 and 1.2
 		)
 		aria.role.article =
 			attribute role { string "article" }
@@ -679,6 +717,16 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	common.attrs.aria |= aria.banner
 	common.attrs.aria.landmark.banner |= aria.banner
 
+## blockquote - added in ARIA 1.2
+	aria.blockquote =
+		(	aria.role.blockquote
+		)
+		aria.role.blockquote =
+			attribute role { string "blockquote" }
+
+	common.attrs.aria |= aria.blockquote
+	common.attrs.aria.role.blockquote |= aria.blockquote
+
 ## button
 	aria.button =
 		(	aria.role.button
@@ -691,6 +739,16 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	common.attrs.aria |= aria.button
 	common.attrs.aria.role.button |= aria.button
 
+## caption - added in ARIA 1.2
+	aria.caption =
+		(	aria.role.caption
+		)
+		aria.role.caption =
+			attribute role { string "caption" }
+
+	common.attrs.aria |= aria.caption
+	common.attrs.aria.role.caption |= aria.caption
+
 ## cell
 	aria.cell =
 		(	aria.role.cell
@@ -708,6 +766,9 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	aria.checkbox =
 		(	aria.role.checkbox
 		&	aria.state.checked #required!
+		&	aria.state.expanded?	# ARIA 1.2 added
+		&	aria.prop.readonly? 	# ARIA 1.1 and 1.2
+		&	aria.prop.required? 	# ARIA 1.2 added
 		)
 		aria.role.checkbox =
 			attribute role { string "checkbox" }
@@ -715,6 +776,16 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	common.attrs.aria |= aria.checkbox
 	common.attrs.aria.role.checkbox |= aria.checkbox
 
+## code - added in ARIA 1.2
+	aria.code =
+		(	aria.role.code
+		)
+		aria.role.code =
+			attribute role { string "code" }
+
+	common.attrs.aria |= aria.code
+	common.attrs.aria.role.code |= aria.code
+
 # columnheader
 	aria.columnheader =
 		(	aria.role.columnheader
@@ -725,12 +796,14 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 		&	aria.prop.required?
 		&	aria.prop.colspan?
 		&	aria.prop.rowspan?
+		&	aria.prop.colindex?	# ARIA 1.1 and 1.2
 		&	aria.prop.rowindex?
 		)
 		aria.role.columnheader =
 			attribute role { string "columnheader" }
 
 	common.attrs.aria |= aria.columnheader
+	common.attrs.aria.role.columnheader |= aria.columnheader
 
 ## combobox
 	aria.combobox =
@@ -782,6 +855,16 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	common.attrs.aria |= aria.definition
 	common.attrs.aria.role.definition |= aria.definition
 
+## deletion - added in ARIA 1.2
+	aria.deletion =
+		(	aria.role.deletion
+		)
+		aria.role.deletion =
+			attribute role { string "deletion" }
+
+	common.attrs.aria |= aria.deletion
+	common.attrs.aria.role.deletion |= aria.deletion
+
 ## dialog
 	aria.dialog =
 		(	aria.role.dialog
@@ -794,17 +877,6 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	common.attrs.aria |= aria.dialog
 	common.attrs.aria.role.dialog |= aria.dialog
 
-## directory
-	aria.directory =
-		(	aria.role.directory
-		&	aria.state.expanded?
-		)
-		aria.role.directory =
-			attribute role { string "directory" }
-
-	common.attrs.aria |= aria.directory
-	common.attrs.aria.role.directory |= aria.directory
-
 ## document
 	aria.document =
 		(	aria.role.document
@@ -816,6 +888,16 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	common.attrs.aria |= aria.document
 	common.attrs.aria.landmark.document |= aria.document
 
+## emphasis - added in ARIA 1.2
+	aria.emphasis =
+		(	aria.role.emphasis
+		)
+		aria.role.emphasis =
+			attribute role { string "emphasis" }
+
+	common.attrs.aria |= aria.emphasis
+	common.attrs.aria.role.emphasis |= aria.emphasis
+
 ## feed
 	aria.feed =
 		(	aria.role.feed
@@ -864,6 +946,7 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 			attribute role { string "grid" }
 
 	common.attrs.aria |= aria.grid
+	common.attrs.aria.role.grid |= aria.grid
 
 ## gridcell
 	aria.gridcell =
@@ -882,6 +965,7 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 			attribute role { string "gridcell" }
 
 	common.attrs.aria |= aria.gridcell
+	common.attrs.aria.role.gridcell |= aria.gridcell
 
 ## group
 	aria.group =
@@ -922,7 +1006,7 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 ## heading
 	aria.heading =
 		(	aria.role.heading
-		&	aria.prop.level ? # not inherited
+		&	aria.prop.level 	# ARIA 1.1 and 1.2 required
 		&	aria.state.expanded?
 		)
 		aria.role.heading =
@@ -942,6 +1026,27 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	common.attrs.aria |= aria.img
 	common.attrs.aria.role.img |= aria.img
 
+## image
+	aria.image =
+		(	aria.role.image
+		&	aria.state.expanded?
+		)
+		aria.role.image =
+			attribute role { string "image" }
+
+	common.attrs.aria |= aria.image
+	common.attrs.aria.role.image |= aria.image
+
+## insertion - added in ARIA 1.2
+	aria.insertion =
+		(	aria.role.insertion
+		)
+		aria.role.insertion =
+			attribute role { string "insertion" }
+
+	common.attrs.aria |= aria.insertion
+	common.attrs.aria.role.insertion |= aria.insertion
+
 ## link
 	aria.link =
 		(	aria.role.link
@@ -970,7 +1075,7 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 		&	aria.prop.multiselectable? # not inherited
 		&	aria.prop.required?
 		&	aria.prop.activedescendant?
-		&	aria.state.expanded?
+		&	aria.prop.readonly? # ARIA 1.1 and 1.2
 		&	aria.prop.orientation?
 		)
 		aria.role.listbox =
@@ -1081,6 +1186,9 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	aria.menuitemcheckbox =
 		(	aria.role.menuitemcheckbox
 		&	aria.state.checked #required
+		&	aria.state.expanded?	# ARIA 1.2 added
+		&	aria.prop.posinset?		# ARIA 1.1 and 1.2
+		&	aria.prop.setsize?		# ARIA 1.1 and 1.2
 		)
 		aria.role.menuitemcheckbox =
 			attribute role { string "menuitemcheckbox" }
@@ -1099,6 +1207,7 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	aria.menuitemradio =
 		(	aria.role.menuitemradio
 		&	aria.state.checked #required
+		&	aria.state.expanded?	# ARIA 1.2 added
 		&	aria.state.selected?
 		&	aria.prop.posinset?
 		&	aria.prop.setsize?
@@ -1120,6 +1229,20 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 			attribute role { string "menuitemradio" }
 	common.attrs.aria.role.menuitemradio-checked-not-required |= aria.menuitemradio-checked-not-required
 
+## meter - added in ARIA 1.2
+	aria.meter =
+		(	aria.role.meter
+		&	aria.prop.valuemax? # optional
+		&	aria.prop.valuemin? # optional
+		&	aria.prop.valuetext? # inherited
+		&	aria.prop.valuenow # required
+		)
+		aria.role.meter =
+			attribute role { string "meter" }
+
+	common.attrs.aria |= aria.meter
+	common.attrs.aria.role.meter |= aria.meter
+
 ## navigation
 	aria.navigation =
 		(	aria.role.navigation
@@ -1164,6 +1287,16 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	common.attrs.aria |= aria.option
 	common.attrs.aria.role.option |= aria.option
 
+## paragraph - added in ARIA 1.2
+	aria.paragraph =
+		(	aria.role.paragraph
+		)
+		aria.role.paragraph =
+			attribute role { string "paragraph" }
+
+	common.attrs.aria |= aria.paragraph
+	common.attrs.aria.role.paragraph |= aria.paragraph
+
 ## presentation
 	aria.presentation =
 		(	aria.role.presentation )
@@ -1207,6 +1340,7 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 		(	aria.role.radiogroup
 		&	aria.prop.activedescendant?
 		&	aria.state.expanded?
+		&	aria.prop.readonly? # ARIA 1.1 and 1.2
 		&	aria.prop.required?
 		&	aria.prop.orientation?
 		)
@@ -1236,11 +1370,14 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 		&	aria.state.expanded?
 		&	aria.prop.colindex?
 		&	aria.prop.rowindex?
+		&	aria.prop.posinset?		# ARIA 1.2 added
+		&	aria.prop.setsize?		# ARIA 1.2 added
 		)
 		aria.role.row =
 			attribute role { string "row" }
 
 	common.attrs.aria |= aria.row
+	common.attrs.aria.role.row |= aria.row
 
 ## rowgroup
 	aria.rowgroup =
@@ -1264,12 +1401,14 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 		&	aria.prop.required?
 		&	aria.prop.colspan?
 		&	aria.prop.rowspan?
+		&	aria.prop.colindex?	# ARIA 1.1 and 1.2
 		&	aria.prop.rowindex?
 		)
 		aria.role.rowheader =
 			attribute role { string "rowheader" }
 
 	common.attrs.aria |= aria.rowheader
+	common.attrs.aria.role.rowheader |= aria.rowheader
 
 ## searchbox
 	aria.searchbox =
@@ -1277,6 +1416,7 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 		&	aria.prop.activedescendant?
 		&	aria.prop.autocomplete?
 		&	aria.prop.multiline?
+		&	aria.prop.placeholder?	# ARIA 1.1 and 1.2
 		&	aria.prop.readonly?
 		&	aria.prop.required?
 		)
@@ -1288,9 +1428,9 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 ## scrollbar
 	aria.scrollbar =
 		(	aria.role.scrollbar
-		&	aria.prop.orientation
-		&	aria.prop.valuemax
-		&	aria.prop.valuemin
+		&	aria.prop.orientation?	# ARIA 1.2 optional
+		&	aria.prop.valuemax? 	# ARIA 1.2 optional
+		&	aria.prop.valuemin?		# ARIA 1.2 optional
 		&	aria.prop.valuenow
 		&	aria.prop.valuetext?
 		)
@@ -1317,6 +1457,10 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 		(	aria.role.separator
 		&	aria.state.expanded?
 		&	aria.prop.orientation?
+		&	aria.prop.valuenow?		# ARIA 1.2 (required if focusable, absent otherwise)
+		&	aria.prop.valuemin?		# ARIA 1.2 (optional if focusable, absent otherwise)
+		&	aria.prop.valuemax?		# ARIA 1.2 (optional if focusable, absent otherwise)
+		&	aria.prop.valuetext?	# ARIA 1.2 (optional if focusable, absent otherwise)
 		)
 		aria.role.separator =
 			attribute role { string "separator" }
@@ -1327,10 +1471,11 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 ## slider
 	aria.slider =
 		(	aria.role.slider
-		&	aria.prop.valuemax
-		&	aria.prop.valuemin
+		&	aria.prop.valuemax? 		# optional in ARIA 1.2
+		&	aria.prop.valuemin? 		# optional in ARIA 1.2
 		&	aria.prop.valuenow
 		&	aria.prop.valuetext?
+		&	aria.prop.readonly? 		# ARIA 1.1 and 1.2
 		&	aria.prop.orientation?
 		)
 		aria.role.slider =
@@ -1342,10 +1487,12 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 ## spinbutton
 	aria.spinbutton =
 		(	aria.role.spinbutton
-		&	aria.prop.valuemax
-		&	aria.prop.valuemin
-		&	aria.prop.valuenow
+		&	aria.prop.valuemax? 			# optional in ARIA 1.2
+		&	aria.prop.valuemin? 			# optional in ARIA 1.2
+		&	aria.prop.valuenow? 			# optional in ARIA 1.2
 		&	aria.prop.valuetext?
+		&	aria.prop.activedescendant?		# ARIA 1.1 and 1.2
+		&	aria.prop.readonly? 			# ARIA 1.1 and 1.2
 		&	aria.prop.required?
 		)
 		aria.role.spinbutton =
@@ -1365,10 +1512,43 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	common.attrs.aria |= aria.status
 	common.attrs.aria.role.status |= aria.status
 
+## strong - added in ARIA 1.2
+	aria.strong =
+		(	aria.role.strong
+		)
+		aria.role.strong =
+			attribute role { string "strong" }
+
+	common.attrs.aria |= aria.strong
+	common.attrs.aria.role.strong |= aria.strong
+
+## subscript - added in ARIA 1.2
+	aria.subscript =
+		(	aria.role.subscript
+		)
+		aria.role.subscript =
+			attribute role { string "subscript" }
+
+	common.attrs.aria |= aria.subscript
+	common.attrs.aria.role.subscript |= aria.subscript
+
+## superscript - added in ARIA 1.2
+	aria.superscript =
+		(	aria.role.superscript
+		)
+		aria.role.superscript =
+			attribute role { string "superscript" }
+
+	common.attrs.aria |= aria.superscript
+	common.attrs.aria.role.superscript |= aria.superscript
+
 ## switch
 	aria.switch =
 		(	aria.role.switch
 		&	aria.state.checked #required!
+		&	aria.state.expanded?	# ARIA 1.2 added
+		&	aria.prop.readonly? 	# ARIA 1.1 and 1.2
+		&	aria.prop.required? 	# ARIA 1.2 added
 		)
 		aria.role.switch =
 			attribute role { string "switch" }
@@ -1449,6 +1629,7 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 		&	aria.prop.activedescendant?
 		&	aria.prop.autocomplete? # not inherited
 		&	aria.prop.multiline? # not inherited
+		&	aria.prop.placeholder?	# ARIA 1.1 and 1.2
 		&	aria.prop.readonly? # not inherited
 		&	aria.prop.required?
 		)
@@ -1458,6 +1639,16 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 	common.attrs.aria |= aria.textbox
 	common.attrs.aria.role.textbox |= aria.textbox
 
+## time - added in ARIA 1.2
+	aria.time =
+		(	aria.role.time
+		)
+		aria.role.time =
+			attribute role { string "time" }
+
+	common.attrs.aria |= aria.time
+	common.attrs.aria.role.time |= aria.time
+
 ## timer
 	aria.timer =
 		(	aria.role.timer
@@ -1467,6 +1658,7 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 			attribute role { string "timer" }
 
 	common.attrs.aria |= aria.timer
+	common.attrs.aria.role.timer |= aria.timer
 
 ## toolbar
 	aria.toolbar =
@@ -1490,6 +1682,7 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 			attribute role { string "tooltip" }
 
 	common.attrs.aria |= aria.tooltip
+	common.attrs.aria.role.tooltip |= aria.tooltip
 
 ## tree
 	aria.tree =
@@ -1523,6 +1716,7 @@ common.attrs.aria.implicit.search |= common.attrs.aria.implicit.landmark
 			attribute role { string "treegrid" }
 
 	common.attrs.aria |= aria.treegrid
+	common.attrs.aria.role.treegrid |= aria.treegrid
 
 ## treeitem
 	aria.treeitem =
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/block.rnc b/xml/relaxng/resources/resources/html5-schema/html5/block.rnc
index ee0cd1386027..75b9ab7e9307 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/block.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/block.rnc
@@ -62,8 +62,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		element ul { ul.inner & ul.attrs }
 	ul.attrs =
 		(	common.attrs
-		&	(	(	common.attrs.aria.role.directory
-				|	common.attrs.aria.role.group
+		&	(	(	common.attrs.aria.role.group
 				|	common.attrs.aria.role.list
 				|	common.attrs.aria.role.listbox
 				|	common.attrs.aria.role.menu
@@ -91,16 +90,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 	li.attrs =
 		(	common.attrs
 		&	(	common.attrs.aria.implicit.listitem
-			|	common.attrs.aria.role.listitem
-			|	common.attrs.aria.role.menuitem
-			|	common.attrs.aria.role.menuitemcheckbox
-			|	common.attrs.aria.role.menuitemradio
-			|	common.attrs.aria.role.option
-			|	common.attrs.aria.role.radio
-			|	common.attrs.aria.role.tab
-			|	common.attrs.aria.role.treeitem
-			|	common.attrs.aria.role.separator
-			|	common.attrs.aria.role.presentation
+			|	common.attrs.aria?
 			)?
 		)
 	li.inner =
@@ -115,8 +105,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	ol.attrs.start?
 		&	ol.attrs.reversed?
 		&	ol.attrs.type?
-		&	(	(	common.attrs.aria.role.directory
-				|	common.attrs.aria.role.group
+		&	(	(	common.attrs.aria.role.group
 				|	common.attrs.aria.role.list
 				|	common.attrs.aria.role.listbox
 				|	common.attrs.aria.role.menu
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/common.rnc b/xml/relaxng/resources/resources/html5-schema/html5/common.rnc
index 7da841331bd9..8692180e7879 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/common.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/common.rnc
@@ -105,6 +105,7 @@ common.attrs =
 	&	common.attrs.i18n
 	&	common.attrs.present
 	&	common.attrs.other
+	&	aria.global?
 	)
 
 common.attrs.basic =
@@ -494,7 +495,6 @@ common.attrs.aria.role.checkbox = ( notAllowed )
 common.attrs.aria.role.combobox = ( notAllowed )
 common.attrs.aria.role.complementary = ( notAllowed )
 common.attrs.aria.role.dialog = ( notAllowed )
-common.attrs.aria.role.directory = ( notAllowed )
 common.attrs.aria.role.document = ( notAllowed )
 common.attrs.aria.role.feed |= ( notAllowed )
 common.attrs.aria.role.figure |= ( notAllowed )
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/core-scripting.rnc b/xml/relaxng/resources/resources/html5-schema/html5/core-scripting.rnc
index b466f13ab6f5..d7c2ca7c2733 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/core-scripting.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/core-scripting.rnc
@@ -29,7 +29,6 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	script.attrs.async?
 		&	script.attrs.type?
 		&	script.attrs.nomodule?
-		&	script.attrs.charset?
 		&	script.attrs.language? # restricted in Schematron
 		&	script.attrs.integrity?
 		&	embedded.content.attrs.crossorigin?
@@ -51,16 +50,17 @@ datatypes w = "http://whattf.org/datatype-draft"
 			} & v5only
 		script.attrs.type =
 			attribute type {
-				w:string "module" | w:string "importmap" | w:string "" | common.data.scripttype # XXX without charset parameter!
+				( w:string ""
+				| w:string "module"
+				| w:string "importmap"
+				| w:string "speculationrules"
+				| common.data.scripttype
+				)
 			}
 		script.attrs.nomodule =
 			attribute nomodule {
 				w:string "nomodule" | w:string ""
 			}
-		script.attrs.charset =
-			attribute charset {
-				string
-			}
 		script.attrs.language =
 			attribute language {
 				string
@@ -118,6 +118,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	scripting.attr.onauxclick?
 		&	scripting.attr.onbeforeinput?
 		&	scripting.attr.onbeforematch?
+		&	scripting.attr.onbeforetoggle?
 		&	scripting.attr.onblur?
 		&	scripting.attr.oncancel?
 		&	scripting.attr.oncanplay?
@@ -125,6 +126,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	scripting.attr.onchange?
 		&	scripting.attr.onclick?
 		&	scripting.attr.onclose?
+		&	scripting.attr.oncommand?
 		&	scripting.attr.oncontextlost?
 		&	scripting.attr.oncontextmenu?
 		&	scripting.attr.oncontextrestored?
@@ -202,6 +204,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		attribute onbeforeinput { common.data.functionbody }
 	scripting.attr.onbeforematch =
 		attribute onbeforematch { common.data.functionbody }
+	scripting.attr.onbeforetoggle =
+		attribute onbeforetoggle { common.data.functionbody }
 	scripting.attr.onblur =
 		attribute onblur { common.data.functionbody }
 	scripting.attr.oncancel =
@@ -216,6 +220,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		attribute onclick { common.data.functionbody }
 	scripting.attr.onclose =
 		attribute onclose { common.data.functionbody }
+	scripting.attr.oncommand =
+		attribute oncommand { common.data.functionbody }
 	scripting.attr.oncontextlost =
 		attribute oncontextlost { common.data.functionbody }
 	scripting.attr.oncontextmenu =
@@ -389,6 +395,23 @@ datatypes w = "http://whattf.org/datatype-draft"
 	scripting.attr.onlostpointercapture =
 		attribute onlostpointercapture { common.data.functionbody }
 
+## Touch Events
+	common.attrs.scripting &=
+		(	scripting.attr.ontouchstart?
+		&	scripting.attr.ontouchend?
+		&	scripting.attr.ontouchmove?
+		&	scripting.attr.ontouchcancel?
+		)
+
+	scripting.attr.ontouchstart =
+		attribute ontouchstart { common.data.functionbody }
+	scripting.attr.ontouchend =
+		attribute ontouchend { common.data.functionbody }
+	scripting.attr.ontouchmove =
+		attribute ontouchmove { common.data.functionbody }
+	scripting.attr.ontouchcancel =
+		attribute ontouchcancel { common.data.functionbody }
+
 #	scripting.attr.common =
 #		(	scripting.attr.mouse
 #		&	scripting.attr.keyboard
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/embed.rnc b/xml/relaxng/resources/resources/html5-schema/html5/embed.rnc
index 1b92d5fc4db8..d79dcbac433e 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/embed.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/embed.rnc
@@ -12,8 +12,11 @@ namespace local = ""
 
 	shared-img.attrs =
 		(	common.attrs
-		&	img.attrs.src
-		&	img.attrs.srcset?
+		&	(
+				( img.attrs.src & img.attrs.srcset? )
+				|
+				( img.attrs.srcset & img.attrs.src? )
+			)
 		&	img.attrs.sizes?
 		&	img.attrs.generator-unable-to-provide-required-alt?
 		&	img.attrs.height?
@@ -23,7 +26,6 @@ namespace local = ""
 		&	img.attrs.decoding?
 		&	img.attrs.loading?
 		&	common.attrs.fetchpriority?
-		&	img.attrs.border? # obsolete
 		&	referrerpolicy?
 		&	embedded.content.attrs.crossorigin?
 		)
@@ -104,10 +106,6 @@ namespace local = ""
 			attribute loading {
 				w:string "lazy" | w:string "eager"
 			}
-		img.attrs.border =
-			attribute border {
-				common.data.zero
-			}
 	img.inner =
 		empty
 
@@ -231,6 +229,7 @@ namespace local = ""
 			                    | onauxclick
 			                    | onbeforeinput
 			                    | onbeforematch
+			                    | onbeforetoggle
 			                    | onblur
 			                    | oncancel
 			                    | oncanplay
@@ -238,6 +237,7 @@ namespace local = ""
 			                    | onchange
 			                    | onclick
 			                    | onclose
+			                    | oncommand
 			                    | oncontextlost
 			                    | oncontextmenu
 			                    | oncontextrestored
@@ -314,8 +314,15 @@ namespace local = ""
 			                    | onpointerleave
 			                    | ongotpointercapture
 			                    | onlostpointercapture
+			                    | ontouchstart
+			                    | ontouchend
+			                    | ontouchmove
+			                    | ontouchcancel
 			                    | role
+			                    | aria-activedescendant
 			                    | aria-atomic
+			                    | aria-braillelabel
+			                    | aria-brailleroledescription
 			                    | aria-busy
 			                    | aria-controls
 			                    | aria-current
@@ -340,6 +347,8 @@ namespace local = ""
 			                    | aria-required
 			                    | aria-roledescription
 			                    | spellcheck
+			                    | autocorrect
+			                    | writingsuggestions
 			                    | autocapitalize
 			                    | enterkeyhint
 			                    | accesskey
@@ -365,6 +374,11 @@ namespace local = ""
 			                    | rev
 			                    | inlist
 			                    | its-loc-note
+			                    | contextmenu
+			                    | dropzone
+			                    | onshow
+			                    | headingoffset
+			                    | headingreset
                                             | its-loc-note-type
                                             | its-loc-note-ref
                                             | its-term-info-ref
@@ -427,17 +441,13 @@ namespace local = ""
 		element object { object.inner.phrasing & object.attrs }
 	object.attrs =
 		(	common.attrs
-		&	(	(	object.attrs.data
-				&	object.attrs.type?
-				)
-			|	object.attrs.type
-			)
+		&	object.attrs.data
+		&	object.attrs.type?
 #		&	object.attrs.classid?
 #		&	object.attrs.codebase?
 #		&	object.attrs.codetype?
 		&	object.attrs.height?
 		&	object.attrs.width?
-		&	object.attrs.usemap?
 		&	object.attrs.name?
 		&	common-form.attrs.form?
 		&	(	common.attrs.aria.role.application
@@ -461,46 +471,18 @@ namespace local = ""
 			attribute width {
 				common.data.integer.non-negative
 			}
-		object.attrs.usemap =
-			attribute usemap {
-				common.data.hash-name
-			}
 		object.attrs.name =
 			attribute name {
 				common.data.browsing-context
 			}
 	object.inner.flow =
-		(	param.elem*
-		,	common.inner.transparent.flow
-		)
+		( common.inner.transparent.flow )
 	object.inner.phrasing =
-		(	param.elem*
-		,	common.inner.phrasing
-		)
+		( common.inner.phrasing )
 
 	common.elem.flow |= object.elem.flow
 	common.elem.phrasing |= object.elem.phrasing
 
-## Initialization Parameters: <param>
-
-	param.elem =
-		element param { param.inner & param.attrs }
-	param.attrs =
-		(	common.attrs
-		&	param.attrs.name
-		&	param.attrs.value
-		)
-		param.attrs.name =
-			attribute name {
-				string
-			}
-		param.attrs.value =
-			attribute value {
-				string
-			}
-	param.inner =
-		( empty )
-
 ## Inline Frame: <iframe>
 
 	iframe.elem =
@@ -598,6 +580,7 @@ namespace local = ""
 		&	common.attrs.i18n
 		&	common.attrs.present
 		&	common.attrs.other
+		&	aria.global?
 		&	shared-hyperlink.attrs.download?
 		&	(	area.attrs.alt
 			&	shared-hyperlink.attrs.href
@@ -605,8 +588,6 @@ namespace local = ""
 		&	shared-hyperlink.attrs.target?
 		&	shared-hyperlink.attrs.ping?
 		&	shared-hyperlink.attrs.rel?
-		&	shared-hyperlink.attrs.hreflang?
-		&	shared-hyperlink.attrs.type?
 		&	area.attrs.shape?
 		&	(	common.attrs.aria.role.link
 			|	common.attrs.aria.role.button
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/html5core.rnc b/xml/relaxng/resources/resources/html5-schema/html5/html5core.rnc
deleted file mode 100644
index fa4a63e2bce7..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/html5core.rnc
+++ /dev/null
@@ -1,13 +0,0 @@
-include "common.rnc" {
-        XMLonly = notAllowed
-        HTMLonly = empty
-        v5only = notAllowed
-}
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "core-scripting.rnc"
-include "meta.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/html5full-no-microdata.rnc b/xml/relaxng/resources/resources/html5-schema/html5/html5full-no-microdata.rnc
deleted file mode 100644
index 4f09cbd8e38e..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/html5full-no-microdata.rnc
+++ /dev/null
@@ -1,37 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "common.rnc" {
-        XMLonly = notAllowed
-        HTMLonly = empty
-        v5only = empty
-        nonHTMLizable = notAllowed
-        nonRoundtrippable = notAllowed
-}
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "core-scripting.rnc"
-include "structural.rnc"
-include "ruby.rnc"
-include "media.rnc"
-include "tables.rnc"
-include "form-datatypes.rnc"
-include "web-forms.rnc"
-include "web-forms2.rnc"
-include "web-components.rnc"
-include "applications.rnc"
-include "data.rnc"
-include "legacy.rnc"
-include "aria.rnc"
-include "meta.rnc" {
-        html.inner =
-            (    head.elem
-            ,    (    body.elem
-                 |    frameset.elem
-                 )
-            )
-}
-include "its20-html5.rnc"
-common.attrs &= its-html-attributes
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/html5full-rdfa.rnc b/xml/relaxng/resources/resources/html5-schema/html5/html5full-rdfa.rnc
deleted file mode 100644
index 36504e1026b1..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/html5full-rdfa.rnc
+++ /dev/null
@@ -1,42 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "common.rnc" {
-        XMLonly = notAllowed
-        HTMLonly = empty
-        v5only = empty
-        nonHTMLizable = notAllowed
-        nonRoundtrippable = notAllowed
-}
-include "common-ext.rnc"
-
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "embed-ext.rnc"
-include "core-scripting.rnc"
-include "core-scripting-ext.rnc"
-include "structural.rnc"
-include "ruby.rnc"
-include "media.rnc"
-include "tables.rnc"
-include "form-datatypes.rnc"
-include "web-forms.rnc"
-include "web-forms2.rnc"
-include "web-components.rnc"
-include "applications.rnc"
-include "data.rnc"
-include "legacy.rnc"
-include "aria.rnc"
-include "meta.rnc" {
-        html.inner =
-            (    head.elem
-            ,    (    body.elem
-                 |    frameset.elem
-                 )
-            )
-}
-include "meta-ext.rnc"
-include "microdata.rnc"
-include "rdfa.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/html5full-rdfalite.rnc b/xml/relaxng/resources/resources/html5-schema/html5/html5full-rdfalite.rnc
deleted file mode 100644
index d4cb9fc5388b..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/html5full-rdfalite.rnc
+++ /dev/null
@@ -1,41 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "common.rnc" {
-        XMLonly = notAllowed
-        HTMLonly = empty
-        v5only = empty
-        nonHTMLizable = notAllowed
-        nonRoundtrippable = notAllowed
-}
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "core-scripting.rnc"
-include "structural.rnc"
-include "ruby.rnc"
-include "media.rnc"
-include "tables.rnc"
-include "form-datatypes.rnc"
-include "web-forms.rnc"
-include "web-forms2.rnc"
-include "web-components.rnc"
-include "applications.rnc"
-include "data.rnc"
-include "legacy.rnc"
-include "aria.rnc"
-include "meta.rnc" {
-        html.inner =
-            (    head.elem
-            ,    (    body.elem
-                 |    frameset.elem
-                 )
-            )
-}
-include "its20-html5.rnc"
-common.attrs &= its-html-attributes
-include "microdata.rnc"
-include "rdfa.rnc" {
-        nonRDFaLite = notAllowed
-}
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/html5full.rnc b/xml/relaxng/resources/resources/html5-schema/html5/html5full.rnc
deleted file mode 100644
index e1a2047bf96c..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/html5full.rnc
+++ /dev/null
@@ -1,38 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "common.rnc" {
-        XMLonly = notAllowed
-        HTMLonly = empty
-        v5only = empty
-        nonHTMLizable = notAllowed
-        nonRoundtrippable = notAllowed
-}
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "core-scripting.rnc"
-include "structural.rnc"
-include "ruby.rnc"
-include "media.rnc"
-include "tables.rnc"
-include "form-datatypes.rnc"
-include "web-forms.rnc"
-include "web-forms2.rnc"
-include "web-components.rnc"
-include "applications.rnc"
-include "data.rnc"
-include "legacy.rnc"
-include "aria.rnc"
-include "meta.rnc" {
-        html.inner =
-            (    head.elem
-            ,    (    body.elem
-                 |    frameset.elem
-                 )
-            )
-}
-include "its20-html5.rnc"
-common.attrs &= its-html-attributes
-include "microdata.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/its20-html5-types.rnc b/xml/relaxng/resources/resources/html5-schema/html5/its20-html5-types.rnc
deleted file mode 100644
index aca26cfded7b..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/its20-html5-types.rnc
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright (c) 2012 Jirka Kosek <jirka@kosek.cz>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-datatypes w = "http://whattf.org/datatype-draft"
-
-its-confidence.type = xsd:double { minInclusive = "0" maxInclusive = "1" }
-
-its-locNote.type = string
-
-## The type of localization note
-its-locNoteType.type =
-    ## Localization note is an alert
-    w:string "alert"
-    |
-    ## Localization note is a description
-    w:string "description"
-
-its-locNoteRef.type = w:iri-ref
-
-its-termInfoRef.type = w:iri-ref
-
-## Indicates a term locally
-its-term.type =
-    ## The value 'yes' means that this is a term
-    w:string "yes"
-    |
-    ## The value 'no' means that this is not a term
-    w:string "no"
-
-its-termConfidence.type = its-confidence.type
-
-## States whether current context is regarded as "within text"
-its-withinText.type =
-    ## The element and its content are part of the flow of its parent element
-    w:string "yes"
-    |
-    ## The element splits the text flow of its parent element and its content is an independent text flow
-    w:string "no"
-    |
-    ## The element is part of the flow of its parent element, its content is an independent flow
-    w:string "nested"
-
-## A comma separated list of mappings between values in the content
-## and workflow specific values. The values may contain spaces; in
-## that case they MUST be delimited by quotation marks.
-its-domainMapping.type = string
-
-its-taConfidence.type = its-confidence.type
-
-its-taClassRef.type = w:iri-ref
-
-its-taIdentRef.type = w:iri-ref
-
-its-taIdent.type = string
-
-its-taSource.type = string
-
-its-localeFilterList.type = string
-
-its-localeFilterType.type = w:string "include" | w:string "exclude"
-
-its-person.type = string
-
-its-personRef.type = w:iri-ref
-
-its-org.type = string
-
-its-orgRef.type = w:iri-ref
-
-its-tool.type = string
-
-its-toolRef.type = w:iri-ref
-
-its-revPerson.type = string
-
-its-revPersonRef.type = w:iri-ref
-
-its-revOrg.type = string
-
-its-revOrgRef.type = w:iri-ref
-
-its-revTool.type = string
-
-its-revToolRef.type = w:iri-ref
-
-its-provRef.type = list { w:iri-ref+ }
-
-its-provenanceRecordsRef.type = w:iri-ref
-
-its-idValue.type = string
-
-its-space.type = "default" | "preserve"
-
-its-locQualityIssuesRef.type = w:iri-ref
-
-its-locQualityIssueType.type = w:string "terminology" | w:string "mistranslation" |
-  w:string "omission" | w:string "untranslated" | w:string "addition" | w:string "duplication" |
-  w:string "inconsistency" | w:string "grammar" | w:string "legal" | w:string "register" |
-  w:string "locale-specific-content" | w:string "locale-violation" | w:string "style" |
-  w:string "characters" | w:string "misspelling" | w:string "typographical" | w:string "formatting" |
-  w:string "inconsistent-entities" | w:string "numbers" | w:string "markup" | w:string "pattern-problem" |
-  w:string "whitespace" | w:string "internationalization" | w:string "length" | w:string "non-conformance" | w:string "uncategorized" |
-  w:string "other"
-
-its-locQualityIssueComment.type = string
-
-its-locQualityIssueSeverity.type =  xsd:double { minInclusive = "0" maxInclusive = "100" }
-
-its-locQualityIssueProfileRef.type = w:iri-ref
-
-its-locQualityIssueEnabled.type = w:string "yes" | w:string "no"
-
-its-locQualityRatingScore.type = xsd:double { minInclusive = "0" maxInclusive = "100" }
-
-its-locQualityRatingVote.type = xsd:integer
-
-its-locQualityRatingScoreThreshold.type = xsd:double { minInclusive = "0" maxInclusive = "100" }
-
-its-locQualityRatingVoteThreshold.type = xsd:integer
-
-its-locQualityRatingProfileRef.type = w:iri-ref
-
-its-mtConfidence.type = its-confidence.type
-
-its-allowedCharacters.type = string
-
-its-storageSize.type = xsd:nonNegativeInteger
-
-its-storageEncoding.type = string
-
-its-lineBreakType.type = w:string "cr" | w:string "lf" | w:string "crlf"
-
-its-annotatorsRef.type = string
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/its20-html5.rnc b/xml/relaxng/resources/resources/html5-schema/html5/its20-html5.rnc
deleted file mode 100644
index 33da35d8252d..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/its20-html5.rnc
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright (c) 2012 Jirka Kosek <jirka@kosek.cz>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-include "its20-html5-types.rnc"
-
-its-attribute.locNote.html = attribute its-loc-note { its-locNote.type }
-
-its-attribute.locNoteType.html = attribute its-loc-note-type { its-locNoteType.type }
-
-its-attribute.locNoteRef.html = attribute its-loc-note-ref { its-locNoteRef.type }
-
-its-attribute.termInfoRef.html = attribute its-term-info-ref { its-termInfoRef.type }
-
-its-attribute.term.html = attribute its-term { its-term.type }
-
-its-attribute.termConfidence.html = attribute its-term-confidence { its-termConfidence.type }
-
-its-attribute.withinText.html = attribute its-within-text { its-withinText.type }
-
-its-attribute.domainMapping.html = attribute its-domain-mapping { its-domainMapping.type }
-
-its-attribute.taConfidence.html = attribute its-ta-confidence { its-taConfidence.type }
-
-its-attribute.taClassRef.html = attribute its-ta-class-ref { its-taClassRef.type }
-
-its-attribute.taIdent.html = attribute its-ta-ident { its-taIdent.type }
-
-its-attribute.taIdentRef.html = attribute its-ta-ident-ref { its-taIdentRef.type }
-
-its-attribute.taSource.html = attribute its-ta-source { its-taSource.type }
-
-its-attribute.localeFilterList.html = attribute its-locale-filter-list { its-localeFilterList.type }
-
-its-attribute.localeFilterType.html = attribute its-locale-filter-type { its-localeFilterType.type }
-
-its-attribute.person.html = attribute its-person { its-person.type }
-
-its-attribute.personRef.html = attribute its-person-ref { its-personRef.type }
-
-its-attribute.org.html = attribute its-org { its-org.type }
-
-its-attribute.orgRef.html = attribute its-org-ref { its-orgRef.type }
-
-its-attribute.tool.html = attribute its-tool { its-tool.type }
-
-its-attribute.toolRef.html = attribute its-tool-ref { its-toolRef.type }
-
-its-attribute.revPerson.html = attribute its-rev-person { its-revPerson.type }
-
-its-attribute.revPersonRef.html = attribute its-rev-person-ref { its-revPersonRef.type }
-
-its-attribute.revOrg.html = attribute its-rev-org { its-revOrg.type }
-
-its-attribute.revOrgRef.html = attribute its-rev-org-ref { its-revOrgRef.type }
-
-its-attribute.revTool.html = attribute its-rev-tool { its-revTool.type }
-
-its-attribute.revToolRef.html = attribute its-rev-tool-ref { its-revToolRef.type }
-
-its-attribute.provRef.html = attribute its-prov-ref { its-provRef.type }
-
-its-attribute.provenanceRecordsRef.html = attribute its-provenance-records-ref { its-provenanceRecordsRef.type }
-
-its-attribute.locQualityIssuesRef.html = attribute its-loc-quality-issues-ref { its-locQualityIssuesRef.type }
-
-its-attribute.locQualityIssueType.html = attribute its-loc-quality-issue-type { its-locQualityIssueType.type }
-
-its-attribute.locQualityIssueComment.html = attribute its-loc-quality-issue-comment { its-locQualityIssueComment.type }
-
-its-attribute.locQualityIssueSeverity.html = attribute its-loc-quality-issue-severity { its-locQualityIssueSeverity.type }
-
-its-attribute.locQualityIssueProfileRef.html = attribute its-loc-quality-issue-profile-ref { its-locQualityIssueProfileRef.type }
-
-its-attribute.locQualityIssueEnabled.html = attribute its-loc-quality-issue-enabled { its-locQualityIssueEnabled.type }
-
-its-attribute.locQualityRatingScore.html = attribute its-loc-quality-rating-score { its-locQualityRatingScore.type }
-
-its-attribute.locQualityRatingVote.html = attribute its-loc-quality-rating-vote { its-locQualityRatingVote.type }
-
-its-attribute.locQualityRatingScoreThreshold.html = attribute its-loc-quality-rating-score-threshold { its-locQualityRatingScoreThreshold.type }
-
-its-attribute.locQualityRatingVoteThreshold.html = attribute its-loc-quality-rating-vote-threshold { its-locQualityRatingVoteThreshold.type }
-
-its-attribute.locQualityRatingProfileRef.html = attribute its-loc-quality-rating-profile-ref { its-locQualityRatingProfileRef.type }
-
-its-attribute.mtConfidence.html = attribute its-mt-confidence { its-mtConfidence.type }
-
-its-attribute.allowedCharacters.html = attribute its-allowed-characters { its-allowedCharacters.type }
-
-its-attribute.storageSize.html = attribute its-storage-size { its-storageSize.type }
-
-its-attribute.storageEncoding.html = attribute its-storage-encoding { its-storageEncoding.type }
-
-its-attribute.lineBreakType.html = attribute its-line-break-type { its-lineBreakType.type }
-
-its-attribute.annotatorsRef.html = attribute its-annotators-ref { its-annotatorsRef.type }
-
-its-html-attributes =
-  ((its-attribute.locNote.html | its-attribute.locNoteRef.html), its-attribute.locNoteType.html?)? &
-  (its-attribute.term.html, its-attribute.termInfoRef.html?, its-attribute.termConfidence.html?)? &
-  its-attribute.withinText.html? &
-  (its-attribute.taConfidence.html? &
-   (its-attribute.taClassRef.html? &
-   ((its-attribute.taSource.html, its-attribute.taIdent.html) | its-attribute.taIdentRef.html)?)) &
-  (its-attribute.localeFilterList.html, its-attribute.localeFilterType.html?)? &
-  ((
-   (its-attribute.person.html | its-attribute.personRef.html )? &
-   (its-attribute.org.html | its-attribute.orgRef.html )? &
-   (its-attribute.tool.html | its-attribute.toolRef.html )? &
-   (its-attribute.revPerson.html | its-attribute.revPersonRef.html )? &
-   (its-attribute.revOrg.html | its-attribute.revOrgRef.html )? &
-   (its-attribute.revTool.html | its-attribute.revToolRef.html )? &
-    its-attribute.provRef.html?)
-   | its-attribute.provenanceRecordsRef.html)? &
-  (its-attribute.locQualityIssuesRef.html
-  |
-  ((its-attribute.locQualityIssueType.html? & its-attribute.locQualityIssueComment.html?) & its-attribute.locQualityIssueSeverity.html? & its-attribute.locQualityIssueProfileRef.html? & its-attribute.locQualityIssueEnabled.html?)
-  )? &
-  (((its-attribute.locQualityRatingScore.html, its-attribute.locQualityRatingScoreThreshold.html?) | (its-attribute.locQualityRatingVote.html, its-attribute.locQualityRatingVoteThreshold.html?)), its-attribute.locQualityRatingProfileRef.html?)? &
-  its-attribute.mtConfidence.html? &
-  its-attribute.allowedCharacters.html? &
-  (its-attribute.storageSize.html, its-attribute.storageEncoding.html?, its-attribute.lineBreakType.html?)? &
-  its-attribute.annotatorsRef.html?
-
-# FIXME: Find way how to validate stand-off markup inside <script>
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/media.rnc b/xml/relaxng/resources/resources/html5-schema/html5/media.rnc
index 8b9cde06ec4c..5afcc9546573 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/media.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/media.rnc
@@ -44,6 +44,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		(	common.attrs
 		&	source.attrs.src
 		&	source.attrs.type?
+		&	source.attrs.media?
 		)
 		source.attrs.src =
 			attribute src {
@@ -53,6 +54,10 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute type {
 				common.data.mimetype
 			}
+		source.attrs.media =
+			attribute media {
+				common.data.mediaquery
+			}
 	source.inner =
 		( empty )
 
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/meta.rnc b/xml/relaxng/resources/resources/html5-schema/html5/meta.rnc
index c6f26d4e5967..8b501abe19d8 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/meta.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/meta.rnc
@@ -61,7 +61,9 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	body.attrs.onoffline?
 		&	body.attrs.ononline?
 		&	body.attrs.onpagehide?
+		&	body.attrs.onpagereveal?
 		&	body.attrs.onpageshow?
+		&	body.attrs.onpageswap?
 		&	body.attrs.onpopstate?
 		&	body.attrs.onrejectionhandled?
 		&	body.attrs.onstorage?
@@ -91,6 +93,10 @@ datatypes w = "http://whattf.org/datatype-draft"
 		attribute ononline { common.data.functionbody }
 	body.attrs.onpagehide =
 		attribute onpagehide { common.data.functionbody }
+	body.attrs.onpagereveal =
+		attribute onpagereveal { common.data.functionbody }
+	body.attrs.onpageswap =
+		attribute onpageswap { common.data.functionbody }
 	body.attrs.onpageshow =
 		attribute onpageshow { common.data.functionbody }
 	body.attrs.onpopstate =
@@ -176,30 +182,22 @@ datatypes w = "http://whattf.org/datatype-draft"
 			}
 		link.attrs.rel =
 			attribute rel {
-				string
+				w:rel-value
 			}
 		link.attrs.as =
 			attribute as {
-				string ""
-			|	string "audio"
-			|	string "audioworklet"
-			|	string "document"
-			|	string "embed"
+				string "audioworklet"
 			|	string "fetch"
 			|	string "font"
 			|	string "image"
-			|	string "manifest"
-			|	string "object"
+			|	string "json"
 			|	string "paintworklet"
-			|	string "report"
 			|	string "script"
 			|	string "serviceworker"
 			|	string "sharedworker"
 			|	string "style"
 			|	string "track"
-			|	string "video"
 			|	string "worker"
-			|	string "xslt"
 			}
 		link.attrs.integrity =
 			attribute integrity {
@@ -253,15 +251,10 @@ datatypes w = "http://whattf.org/datatype-draft"
 		element style { style.inner & style.attrs }
 	style.attrs =
 		(	common.attrs
-		&	style.attrs.type?
 		&	style.attrs.media?
 		&	common.attrs.blocking?
 		#	style.attrs.title included in common.attrs
 		)
-		style.attrs.type =
-			attribute type {
-				text
-			}
 		style.attrs.media =
 			attribute media {
 				common.data.mediaquery
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/phrase.rnc b/xml/relaxng/resources/resources/html5-schema/html5/phrase.rnc
index 60cbe83d2680..25f5efa24ded 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/phrase.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/phrase.rnc
@@ -42,15 +42,15 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	common.attrs.i18n
 		&	common.attrs.present
 		&	common.attrs.other
-		&	a.attrs.name?
 		&	common.attrs.aria?
+		&	aria.global?
 		)
 	a.attrs =
 		(	common.attrs.basic
 		&	common.attrs.i18n
 		&	common.attrs.present
 		&	common.attrs.other
-		&	a.attrs.name?
+		&	aria.global?
 		&	shared-hyperlink.attrs.download?
 		&	shared-hyperlink.attrs.target?
 		&	shared-hyperlink.attrs.rel?
@@ -59,10 +59,6 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	shared-hyperlink.attrs.ping?
 		&	referrerpolicy?
 		)
-		a.attrs.name =
-		  attribute name {
-		    common.data.id # XXX not what the spec says
-		  }
 	a.inner.phrasing =
 		( common.inner.phrasing )
 	a.inner.flow =
@@ -87,7 +83,7 @@ datatypes w = "http://whattf.org/datatype-draft"
     }
   shared-hyperlink.attrs.rel =
     attribute rel {
-      string
+      w:rel-value
     }
   shared-hyperlink.attrs.hreflang =
     attribute hreflang {
@@ -401,7 +397,11 @@ referrerpolicy =
 	br.elem =
 		element br { br.inner & br.attrs }
 	br.attrs =
-		(	common.attrs
+		(	common.attrs.basic
+		&	common.attrs.i18n
+		&	common.attrs.present
+		&	common.attrs.other
+		&	aria.state.hidden?
 		&	common.attrs.aria.role.presentation?
 		)
 	br.inner =
@@ -414,7 +414,11 @@ referrerpolicy =
 	wbr.elem =
 		element wbr { wbr.inner & wbr.attrs }
 	wbr.attrs =
-		(	common.attrs
+		(	common.attrs.basic
+		&	common.attrs.i18n
+		&	common.attrs.present
+		&	common.attrs.other
+		&	aria.state.hidden?
 		&	common.attrs.aria.role.presentation?
 		)
 	wbr.inner =
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/ruby.rnc b/xml/relaxng/resources/resources/html5-schema/html5/ruby.rnc
index 6d43e73d15b6..ee8ae000ecc3 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/ruby.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/ruby.rnc
@@ -19,13 +19,9 @@ namespace local = ""
 		(	(	common.inner.phrasing
 			|	rb.elem
 			)+
-		,	(	(	rt.elem
-				|	rtc.elem
-				)+
+		,	(	rt.elem+
 				|	(	rp.elem
-					,	(	(	rt.elem
-							|	rtc.elem
-							),
+					,	(	rt.elem,
 							rp.elem
 						)+
 					)
@@ -45,19 +41,16 @@ namespace local = ""
 	rt.inner =
 		( common.inner.phrasing )
 
-## Ruby Text Container: <rtc>
+## Ruby Parenthesis: <rp>
 
-	rtc.elem =
-		element rtc { rtc.inner & rtc.attrs }
-	rtc.attrs =
+	rp.elem =
+		element rp { rp.inner & rp.attrs }
+	rp.attrs =
 		(	common.attrs
 		&	common.attrs.aria?
 		)
-	rtc.inner =
-		(	common.inner.phrasing
-			|	rt.elem
-			|	rp.elem
-		)*
+	rp.inner =
+		( text )
 
 ## Ruby Base: <rb>
 
@@ -69,14 +62,3 @@ namespace local = ""
 		)
 	rb.inner =
 		( common.inner.phrasing )
-
-## Ruby Parenthesis: <rp>
-
-	rp.elem =
-		element rp { rp.inner & rp.attrs }
-	rp.attrs =
-		(	common.attrs
-		&	common.attrs.aria?
-		)
-	rp.inner =
-		( text )
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/sectional.rnc b/xml/relaxng/resources/resources/html5-schema/html5/sectional.rnc
index a4941d41301b..ab5198a2277e 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/sectional.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/sectional.rnc
@@ -1,3 +1,5 @@
+datatypes w = "http://whattf.org/datatype-draft"
+
 # #####################################################################
 ##  RELAX NG Schema for HTML 5: Sectioning Markup                     #
 # #####################################################################
@@ -135,6 +137,21 @@
 
 	common.elem.flow |= hgroup.elem
 
+## Heading levels & offsets
+
+	common.attrs.headingoffset =
+		attribute headingoffset {
+			common.data.integer.non-negative
+		}
+
+	common.attrs.headingreset =
+		attribute headingreset {
+			w:string "headingreset" | w:string ""
+		}
+
+	common.attrs.other &= common.attrs.headingoffset?
+	common.attrs.other &= common.attrs.headingreset?
+
 # #####################################################################
 ## Section Meta
 
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/tables.rnc b/xml/relaxng/resources/resources/html5-schema/html5/tables.rnc
index f942699fd4aa..2e21d21a8a9b 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/tables.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/tables.rnc
@@ -221,6 +221,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	tables.attrs.headers?
 #		&	tables.attrs.alignment
 		&	(	common.attrs.aria.implicit.cell
+			|	common.attrs.aria.implicit.gridcell
 			|	common.attrs.aria
 			)?
 		)
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/web-components.rnc b/xml/relaxng/resources/resources/html5-schema/html5/web-components.rnc
index 313cd7c3d1ec..c4daecb92a84 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/web-components.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/web-components.rnc
@@ -10,26 +10,32 @@ namespace c = "http://n.validator.nu/custom-elements/"
 	template.elem =
 		element template { template.inner & template.attrs }
 	template.attrs =
-		( common.attrs )
+		( common.attrs
+		& template.attrs.shadowrootmode?
+		& template.attrs.shadowrootdelegatesfocus?
+		& template.attrs.shadowrootclonable?
+		& template.attrs.shadowrootserializable?
+		& template.attrs.shadowrootcustomelementregistry?
+		)
 	template.attrs.shadowrootmode =
 			attribute shadowrootmode {
 				w:string "open" | w:string "closed"
 			}
 	template.attrs.shadowrootdelegatesfocus =
 			attribute shadowrootdelegatesfocus {
-				w:string "true" | w:string "false"
+				w:string "shadowrootdelegatesfocus" | w:string ""
 			}
 	template.attrs.shadowrootclonable =
 			attribute shadowrootclonable {
-				w:string "true" | w:string "false"
+				w:string "shadowrootclonable" | w:string ""
 			}
 	template.attrs.shadowrootserializable =
 			attribute shadowrootserializable {
-				w:string "true" | w:string "false"
+				w:string "shadowrootserializable" | w:string ""
 			}
 	template.attrs.shadowrootcustomelementregistry =
 			attribute shadowrootcustomelementregistry {
-				w:string "true" | w:string "false"
+				w:string "shadowrootcustomelementregistry" | w:string ""
 			}
 	template.inner =
 		(	common.inner.metadata
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/web-forms.rnc b/xml/relaxng/resources/resources/html5-schema/html5/web-forms.rnc
index 087aedfa0981..523f1aa38a69 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/web-forms.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/web-forms.rnc
@@ -174,8 +174,12 @@ datatypes w = "http://whattf.org/datatype-draft"
 			|	common.attrs.aria.role.menuitemradio
 			|	common.attrs.aria.role.option
 			|	common.attrs.aria.role.radio
+			|	common.attrs.aria.role.separator
 			|	common.attrs.aria.role.switch
 			|	common.attrs.aria.role.tab
+			|	common.attrs.aria.role.gridcell
+			|	common.attrs.aria.role.slider
+			|	common.attrs.aria.role.treeitem
 			)?
 		)
 		input.button.attrs.type =
@@ -202,6 +206,19 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	button.attrs.popover-controls
 		&	(	common.attrs.aria.implicit.button
 			|	common.attrs.aria.role.button
+			|	common.attrs.aria.role.checkbox
+			|	common.attrs.aria.role.combobox
+			|	common.attrs.aria.role.gridcell
+			|	common.attrs.aria.role.link
+			|	common.attrs.aria.role.menuitem
+			|	common.attrs.aria.role.menuitemcheckbox
+			|	common.attrs.aria.role.menuitemradio
+			|	common.attrs.aria.role.option
+			|	common.attrs.aria.role.radio
+			|	common.attrs.aria.role.slider
+			|	common.attrs.aria.role.switch
+			|	common.attrs.aria.role.tab
+			|	common.attrs.aria.role.treeitem
 			)?
 		)
 		input.submit.attrs.type =
@@ -227,6 +244,19 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	button.attrs.popover-controls
 		&	(	common.attrs.aria.implicit.button
 			|	common.attrs.aria.role.button
+			|	common.attrs.aria.role.checkbox
+			|	common.attrs.aria.role.combobox
+			|	common.attrs.aria.role.gridcell
+			|	common.attrs.aria.role.link
+			|	common.attrs.aria.role.menuitem
+			|	common.attrs.aria.role.menuitemcheckbox
+			|	common.attrs.aria.role.menuitemradio
+			|	common.attrs.aria.role.option
+			|	common.attrs.aria.role.radio
+			|	common.attrs.aria.role.slider
+			|	common.attrs.aria.role.switch
+			|	common.attrs.aria.role.tab
+			|	common.attrs.aria.role.treeitem
 			)?
 		)
 		input.reset.attrs.type =
@@ -296,12 +326,20 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	button.attrs.popover-controls
 		&	(	common.attrs.aria.implicit.button
 			|	common.attrs.aria.role.button
+			|	common.attrs.aria.role.checkbox
+			|	common.attrs.aria.role.combobox
+			|	common.attrs.aria.role.gridcell
 			|	common.attrs.aria.role.link
 			|	common.attrs.aria.role.menuitem
 			|	common.attrs.aria.role.menuitemcheckbox
 			|	common.attrs.aria.role.menuitemradio
+			|	common.attrs.aria.role.option
 			|	common.attrs.aria.role.radio
+			|	common.attrs.aria.role.separator
+			|	common.attrs.aria.role.slider
 			|	common.attrs.aria.role.switch
+			|	common.attrs.aria.role.tab
+			|	common.attrs.aria.role.treeitem
 			)?
 		)
 		input.image.attrs.type =
@@ -437,6 +475,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 	select.inner =
 		(	optgroup.elem*
 		&	option.elem*
+		&	hr.elem*
 		&	common.elem.script-supporting*
 		)
 
@@ -444,6 +483,23 @@ datatypes w = "http://whattf.org/datatype-draft"
 
 ## Shared Definitions for Complex Button
 
+	button.attrs.command =
+		attribute command {
+			(w:string "toggle-popover"
+			| w:string "show-popover"
+			| w:string "hide-popover"
+			| w:string "close"
+			| w:string "request-close"
+			| w:string "show-modal"
+			| xsd:string {
+				pattern = "--.*"
+			}
+			)
+		}
+	button.attrs.commandfor =
+		attribute commandfor {
+			common.data.idref
+		}
 	button.attrs.value =
 		attribute value {
 			string
@@ -471,6 +527,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		(	common.attrs
 		&	common-form.attrs
 		&	button.submit.attrs.type?
+		&	button.attrs.command?
+		&	button.attrs.commandfor?
 		&	button.attrs.value?
 		&	button.attrs.popover-controls
 		&	(	common.attrs.aria.implicit.button
@@ -483,7 +541,11 @@ datatypes w = "http://whattf.org/datatype-draft"
 			|	common.attrs.aria.role.menuitemradio
 			|	common.attrs.aria.role.option
 			|	common.attrs.aria.role.radio
+			|	common.attrs.aria.role.separator
 			|	common.attrs.aria.role.tab
+			|	common.attrs.aria.role.gridcell
+			|	common.attrs.aria.role.slider
+			|	common.attrs.aria.role.treeitem
 			)?
 		)
 		button.submit.attrs.type =
@@ -501,18 +563,25 @@ datatypes w = "http://whattf.org/datatype-draft"
 		(	common.attrs
 		&	common-form.attrs
 		&	button.reset.attrs.type
+		&	button.attrs.command?
+		&	button.attrs.commandfor?
 		&	button.attrs.value? #REVISIT I guess this still affects the DOM
 		&	button.attrs.popover-controls
 		&	(	common.attrs.aria.implicit.button
 			|	common.attrs.aria.role.button
 			|	common.attrs.aria.role.checkbox
+			|	common.attrs.aria.role.combobox
 			|	common.attrs.aria.role.link
 			|	common.attrs.aria.role.menuitem
 			|	common.attrs.aria.role.menuitemcheckbox
 			|	common.attrs.aria.role.menuitemradio
 			|	common.attrs.aria.role.option
 			|	common.attrs.aria.role.radio
+			|	common.attrs.aria.role.separator
 			|	common.attrs.aria.role.switch
+			|	common.attrs.aria.role.gridcell
+			|	common.attrs.aria.role.slider
+			|	common.attrs.aria.role.treeitem
 			)?
 		)
 		button.reset.attrs.type =
@@ -530,19 +599,26 @@ datatypes w = "http://whattf.org/datatype-draft"
 		(	common.attrs
 		&	common-form.attrs
 		&	button.button.attrs.type
+		&	button.attrs.command?
+		&	button.attrs.commandfor?
 		&	button.attrs.value? #REVISIT I guess this still affects the DOM
 		&	button.attrs.popover-controls
 		&	(	common.attrs.aria.implicit.button
 			|	common.attrs.aria.role.button
 			|	common.attrs.aria.role.checkbox
+			|	common.attrs.aria.role.combobox
 			|	common.attrs.aria.role.link
 			|	common.attrs.aria.role.menuitem
 			|	common.attrs.aria.role.menuitemcheckbox
 			|	common.attrs.aria.role.menuitemradio
 			|	common.attrs.aria.role.option
 			|	common.attrs.aria.role.radio
+			|	common.attrs.aria.role.separator
 			|	common.attrs.aria.role.switch
 			|	common.attrs.aria.role.tab
+			|	common.attrs.aria.role.gridcell
+			|	common.attrs.aria.role.slider
+			|	common.attrs.aria.role.treeitem
 			)?
 		)
 		button.button.attrs.type =
@@ -624,6 +700,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		element label { label.inner & label.attrs }
 	label.attrs =
 		(	common.attrs
+		&	common.attrs.aria?
 		&	label.attrs.for?
 		)
 		label.attrs.for =
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/web-forms2.rnc b/xml/relaxng/resources/resources/html5-schema/html5/web-forms2.rnc
index b96264bb1dfa..ecbef3c599d0 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5/web-forms2.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/html5/web-forms2.rnc
@@ -88,7 +88,6 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	shared-form.attrs.minlength?
 		&	shared-form.attrs.pattern?
 		&	shared-form.attrs.placeholder?
-		&	aria.prop.placeholder?
 		&	shared-form.attrs.readonly?
 		&	shared-form.attrs.required?
 		)
@@ -99,7 +98,6 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	shared-form.attrs.minlength?
 		&	shared-form.attrs.pattern?
 		&	shared-form.attrs.placeholder?
-		&	aria.prop.placeholder?
 		&	shared-form.attrs.readonly?
 		&	shared-form.attrs.required?
 		&	shared-form.attrs.size?
@@ -147,7 +145,9 @@ datatypes w = "http://whattf.org/datatype-draft"
 ## Hidden String: <input type='hidden'>, Extensions
 
 	input.hidden.attrs &=
-		input.attrs.autocomplete?
+		(	input.attrs.autocomplete?
+		&	shared-form.attrs.dirname?
+		)
 
 ## Text Field: <input type='text'>, Extensions
 
@@ -158,7 +158,6 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	shared-form.attrs.pattern?
 		&	shared-form.attrs.required?
 		&	shared-form.attrs.placeholder?
-		&	aria.prop.placeholder?
 		&	shared-form.attrs.minlength?
 		)
 
@@ -166,12 +165,13 @@ datatypes w = "http://whattf.org/datatype-draft"
 
 	input.password.attrs &=
 		(	input.attrs.autocomplete?
+		&	shared-form.attrs.dirname?
 		&	input.attrs.list?
 		&	shared-form.attrs.pattern?
 		&	shared-form.attrs.placeholder?
-		&	aria.prop.placeholder?
+		&	aria.prop.placeholder?  # specified here because type=password has no implicit role
 		&	shared-form.attrs.required?
-		&	aria.prop.required?
+		&	aria.prop.required?  # specified here because type=password has no implicit role
 		&	shared-form.attrs.minlength?
 		)
 
@@ -179,14 +179,12 @@ datatypes w = "http://whattf.org/datatype-draft"
 
 	input.checkbox.attrs &=
 		(	shared-input.attrs
-		&	aria.prop.required?
 		)
 
 ## Radiobutton: <input type='radio'>, Extensions
 
 	input.radio.attrs &=
 		(	shared-input.attrs
-		&	aria.prop.required?
 		)
 
 ## Scripting Hook Button: <input type='button'>, Extensions
@@ -198,6 +196,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 
 	input.submit.attrs &=
 		(	shared-input.attrs
+		&	shared-form.attrs.dirname?
 		&	shared-form.attrs.formaction?
 		&	shared-form.attrs.formenctype?
 		&	shared-form.attrs.formmethod?
@@ -504,6 +503,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input-no-list.attrs
+		&	shared-form.attrs.dirname?
 		&	input.email.attrs.type
 		&	(	(	input.attrs.multiple
 				&	input.email.attrs.value.multiple?
@@ -544,6 +544,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input-no-list.attrs
+		&	shared-form.attrs.dirname?
 		&	input.url.attrs.type
 		&	input.url.attrs.value?
 		&	(
@@ -602,6 +603,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		(	common.attrs
 		&	common-form.attrs
 		&	shared-input-no-list.attrs
+		&	shared-form.attrs.dirname?
 		&	input.tel.attrs.type
 		&	input.tel.attrs.value?
 		&	(
@@ -635,6 +637,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	common-form.attrs
 		&	input.color.attrs.type
 		&	input.color.attrs.value?
+		&	input.color.attrs.alpha?
+		&	input.color.attrs.colorspace?
 		&	shared-input.attrs
 		)
 		input.color.attrs.type =
@@ -645,6 +649,14 @@ datatypes w = "http://whattf.org/datatype-draft"
 			attribute value {
 				w:string "" | form.data.color
 			}
+		input.color.attrs.alpha =
+			attribute alpha {
+				w:string "alpha" | w:string ""
+			}
+		input.color.attrs.colorspace =
+			attribute colorspace {
+				w:string "limited-srgb" | w:string "display-p3"
+			}
 
 	input.elem |= input.color.elem
 
@@ -681,7 +693,6 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	shared-form.attrs.minlength?
 		&	shared-form.attrs.required?
 		&	textarea.attrs.placeholder?
-		&	aria.prop.placeholder?
 		&	shared-form.attrs.dirname?
 		&	textarea.attrs.rows?
 		&	(	(	textarea.attrs.wrap.hard
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5core-plus-web-forms2.rnc b/xml/relaxng/resources/resources/html5-schema/html5/xhtml5core-plus-web-forms2.rnc
deleted file mode 100644
index 0636b459690d..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5core-plus-web-forms2.rnc
+++ /dev/null
@@ -1,18 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "common.rnc" {
-        XMLonly = empty
-        HTMLonly = notAllowed
-        v5only = notAllowed
-}
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "core-scripting.rnc"
-include "meta.rnc"
-include "tables.rnc"
-include "form-datatypes.rnc"
-include "web-forms.rnc"
-include "web-forms2.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5core.rnc b/xml/relaxng/resources/resources/html5-schema/html5/xhtml5core.rnc
deleted file mode 100644
index acaa1f1e3313..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5core.rnc
+++ /dev/null
@@ -1,14 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "common.rnc" {
-        XMLonly = empty
-        HTMLonly = notAllowed
-        v5only = notAllowed
-}
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "core-scripting.rnc"
-include "meta.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-html-no-microdata.rnc b/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-html-no-microdata.rnc
deleted file mode 100644
index 9fcef130f549..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-html-no-microdata.rnc
+++ /dev/null
@@ -1,35 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "common.rnc" {
-        XMLonly = empty
-        HTMLonly = notAllowed
-        v5only = empty
-        nonHTMLizable = notAllowed
-        nonRoundtrippable = notAllowed
-}
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "core-scripting.rnc"
-include "structural.rnc"
-include "ruby.rnc"
-include "media.rnc"
-include "tables.rnc"
-include "form-datatypes.rnc"
-include "web-forms.rnc"
-include "web-forms2.rnc"
-include "web-components.rnc"
-include "applications.rnc"
-include "data.rnc"
-include "legacy.rnc"
-include "aria.rnc"
-include "meta.rnc" {
-        html.inner =
-            (    head.elem
-            ,    (    body.elem
-                 |    frameset.elem
-                 )
-            )
-}
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-html-rdfalite.rnc b/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-html-rdfalite.rnc
deleted file mode 100644
index 978f3d499b12..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-html-rdfalite.rnc
+++ /dev/null
@@ -1,39 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "common.rnc" {
-        XMLonly = empty
-        HTMLonly = notAllowed
-        v5only = empty
-        nonHTMLizable = notAllowed
-        nonRoundtrippable = notAllowed
-}
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "core-scripting.rnc"
-include "structural.rnc"
-include "ruby.rnc"
-include "media.rnc"
-include "tables.rnc"
-include "form-datatypes.rnc"
-include "web-forms.rnc"
-include "web-forms2.rnc"
-include "web-components.rnc"
-include "applications.rnc"
-include "data.rnc"
-include "legacy.rnc"
-include "aria.rnc"
-include "meta.rnc" {
-        html.inner =
-            (    head.elem
-            ,    (    body.elem
-                 |    frameset.elem
-                 )
-            )
-}
-include "microdata.rnc"
-include "rdfa.rnc" {
-        nonRDFaLite = notAllowed
-}
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-html.rnc b/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-html.rnc
deleted file mode 100644
index f171deccf59c..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-html.rnc
+++ /dev/null
@@ -1,36 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "common.rnc" {
-        XMLonly = empty
-        HTMLonly = notAllowed
-        v5only = empty
-        nonHTMLizable = notAllowed
-        nonRoundtrippable = notAllowed
-}
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "core-scripting.rnc"
-include "structural.rnc"
-include "ruby.rnc"
-include "media.rnc"
-include "tables.rnc"
-include "form-datatypes.rnc"
-include "web-forms.rnc"
-include "web-forms2.rnc"
-include "web-components.rnc"
-include "applications.rnc"
-include "data.rnc"
-include "legacy.rnc"
-include "aria.rnc"
-include "meta.rnc" {
-        html.inner =
-            (    head.elem
-            ,    (    body.elem
-                 |    frameset.elem
-                 )
-            )
-}
-include "microdata.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-xhtml-no-microdata.rnc b/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-xhtml-no-microdata.rnc
deleted file mode 100644
index 35e3c02ed2ff..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-xhtml-no-microdata.rnc
+++ /dev/null
@@ -1,33 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "common.rnc" {
-        XMLonly = empty
-        HTMLonly = notAllowed
-        v5only = empty
-}
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "core-scripting.rnc"
-include "structural.rnc"
-include "ruby.rnc"
-include "media.rnc"
-include "tables.rnc"
-include "form-datatypes.rnc"
-include "web-forms.rnc"
-include "web-forms2.rnc"
-include "web-components.rnc"
-include "applications.rnc"
-include "data.rnc"
-include "legacy.rnc"
-include "aria.rnc"
-include "meta.rnc" {
-        html.inner =
-            (    head.elem
-            ,    (    body.elem
-                 |    frameset.elem
-                 )
-            )
-}
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-xhtml-rdfa.rnc b/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-xhtml-rdfa.rnc
deleted file mode 100644
index a24ce6e2c107..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-xhtml-rdfa.rnc
+++ /dev/null
@@ -1,39 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "common.rnc" {
-        XMLonly = empty
-        HTMLonly = notAllowed
-        v5only = empty
-}
-include "common-ext.rnc"
-
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "embed-ext.rnc"
-include "core-scripting.rnc"
-include "core-scripting-ext.rnc"
-include "structural.rnc"
-include "ruby.rnc"
-include "media.rnc"
-include "tables.rnc"
-include "form-datatypes.rnc"
-include "web-forms.rnc"
-include "web-forms2.rnc"
-include "web-components.rnc"
-include "applications.rnc"
-include "data.rnc"
-include "legacy.rnc"
-include "aria.rnc"
-include "meta.rnc" {
-        html.inner =
-            (    head.elem
-            ,    (    body.elem
-                 |    frameset.elem
-                 )
-            )
-}
-include "microdata.rnc"
-include "rdfa.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-xhtml-rdfalite.rnc b/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-xhtml-rdfalite.rnc
deleted file mode 100644
index 4518a0887cfc..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-xhtml-rdfalite.rnc
+++ /dev/null
@@ -1,37 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "common.rnc" {
-        XMLonly = empty
-        HTMLonly = notAllowed
-        v5only = empty
-}
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "core-scripting.rnc"
-include "structural.rnc"
-include "ruby.rnc"
-include "media.rnc"
-include "tables.rnc"
-include "form-datatypes.rnc"
-include "web-forms.rnc"
-include "web-forms2.rnc"
-include "web-components.rnc"
-include "applications.rnc"
-include "data.rnc"
-include "legacy.rnc"
-include "aria.rnc"
-include "meta.rnc" {
-        html.inner =
-            (    head.elem
-            ,    (    body.elem
-                 |    frameset.elem
-                 )
-            )
-}
-include "microdata.rnc"
-include "rdfa.rnc" {
-        nonRDFaLite = notAllowed
-}
diff --git a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-xhtml.rnc b/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-xhtml.rnc
deleted file mode 100644
index 0c35b3e3dcaa..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/html5/xhtml5full-xhtml.rnc
+++ /dev/null
@@ -1,34 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "common.rnc" {
-        XMLonly = empty
-        HTMLonly = notAllowed
-        v5only = empty
-}
-start = html.elem
-include "phrase.rnc"
-include "block.rnc"
-include "sectional.rnc"
-include "revision.rnc"
-include "embed.rnc"
-include "core-scripting.rnc"
-include "structural.rnc"
-include "ruby.rnc"
-include "media.rnc"
-include "tables.rnc"
-include "form-datatypes.rnc"
-include "web-forms.rnc"
-include "web-forms2.rnc"
-include "web-components.rnc"
-include "applications.rnc"
-include "data.rnc"
-include "legacy.rnc"
-include "aria.rnc"
-include "meta.rnc" {
-        html.inner =
-            (    head.elem
-            ,    (    body.elem
-                 |    frameset.elem
-                 )
-            )
-}
-include "microdata.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/html5chars.ent b/xml/relaxng/resources/resources/html5-schema/html5chars.ent
index dc7b606d3c92..23b192c7178d 100644
--- a/xml/relaxng/resources/resources/html5-schema/html5chars.ent
+++ b/xml/relaxng/resources/resources/html5-schema/html5chars.ent
@@ -1,5 +1,5 @@
 <!--
- * Copyright 2000-2025 JetBrains s.r.o.
+ * Copyright 2000-2026 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xml/relaxng/resources/resources/html5-schema/svg-xhtml5-rdf-mathml.rnc b/xml/relaxng/resources/resources/html5-schema/svg-xhtml5-rdf-mathml.rnc
deleted file mode 100644
index 7a0db29ea27d..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/svg-xhtml5-rdf-mathml.rnc
+++ /dev/null
@@ -1,38 +0,0 @@
-namespace svg = "http://www.w3.org/2000/svg"
-namespace math = "http://www.w3.org/1998/Math/MathML"
-namespace rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-
-include "html5/xhtml5full-xhtml.rnc" {
-	start = svg
-}
-include "svg11/svg11-inc.rnc"
-include "svg11/inkscape.rnc"
-include "mml3/mathml3-inc.rnc"
-include "rdf/rdf.rnc"
-
-common.elem.metadata |= rdf.elem
-SVG.metadata.content |= rdf.elem
-
-common.elem.phrasing |= svg
-
-common.elem.phrasing |= math
-
-SVG.foreignObject.content |=
-	(	math
-	|	html.elem
-	|	body.elem
-	|	common.inner.flow
-	)
-
-annotation-xml.model.svg |= svg
-
-annotation-xml.model.xhtml |=
-	(	html.elem
-	|	common.elem.flow
-	)
-
-# in our integration, <mtext> is the only MathML "token element" that can
-# contain HTML element content; the <mi>, <mn>, <mo> and <ms> elements
-# cannot; see http://www.w3.org/Bugs/Public/show_bug.cgi?id=9859#c8 for a
-# rationale
-mtext.content |= common.elem.phrasing
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-graphics-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-graphics-attrib.rnc
index 5cc2cf85f5ba..dec55fe4d806 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-graphics-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-basic-graphics-attrib.rnc
@@ -1,4 +1,5 @@
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+namespace xsd = "http://www.w3.org/2001/XMLSchema-datatypes"
 
 
 ##
@@ -45,9 +46,17 @@ grammar {
         }?
     SVG.visibility.attrib =
         attribute visibility { string "visible" | string "hidden" | string "collapse" | string "inherit" }?
+    SVG.transform-origin.attrib =
+        attribute transform-origin { xsd:string }?
+    SVG.transform-box.attrib =
+        attribute transform-box {
+            string "content-box" | string "border-box" | string "fill-box" | string "stroke-box" | string "view-box"
+        }?
     SVG.Graphics.extra.attrib = empty
     SVG.Graphics.attrib &=
         SVG.display.attrib,
         SVG.visibility.attrib,
+        SVG.transform-origin.attrib,
+        SVG.transform-box.attrib,
         SVG.Graphics.extra.attrib
 }
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-extensibility.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-extensibility.rnc
index 55517678d866..7075d1b9a82a 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-extensibility.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-extensibility.rnc
@@ -45,8 +45,8 @@ attlist.foreignObject &=
     (common.attrs.aria.implicit.group | common.attrs.aria)?,
     attribute x { Coordinate.datatype }?,
     attribute y { Coordinate.datatype }?,
-    attribute width { Length.datatype },
-    attribute height { Length.datatype },
+    attribute width { Length.datatype }?,
+    attribute height { Length.datatype }?,
     attribute transform { TransformList.datatype }?
 
 ##
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-image.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-image.rnc
index 258958ce4bbf..1efdf5a9c7ea 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-image.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-image.rnc
@@ -51,8 +51,8 @@ grammar {
         (common.attrs.aria.implicit.img | common.attrs.aria)?,
         attribute x { Coordinate.datatype }?,
         attribute y { Coordinate.datatype }?,
-        attribute width { Length.datatype },
-        attribute height { Length.datatype },
+        attribute width { Length.datatype }?,
+        attribute height { Length.datatype }?,
         [ a:defaultValue = "xMidYMid meet" ]
         attribute preserveAspectRatio {
             PreserveAspectRatioSpec.datatype
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-paint-attrib.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-paint-attrib.rnc
index 914ba3eb5eae..bdd6d1db1c9a 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-paint-attrib.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-paint-attrib.rnc
@@ -53,6 +53,11 @@ grammar {
     SVG.fill.attrib = attribute fill { Paint.datatype }?
     SVG.fill-rule.attrib =
         attribute fill-rule { ClipFillRule.datatype }?
+    SVG.paint-order.attrib =
+        attribute paint-order {
+            list { ( "fill" | "stroke" | "markers") + }
+            | string "normal"
+        }?
     SVG.stroke.attrib = attribute stroke { Paint.datatype }?
     SVG.stroke-dasharray.attrib =
         attribute stroke-dasharray { StrokeDashArrayValue.datatype }?
@@ -74,6 +79,7 @@ grammar {
     SVG.Paint.attrib &=
         SVG.fill.attrib,
         SVG.fill-rule.attrib,
+        SVG.paint-order.attrib,
         SVG.stroke.attrib,
         SVG.stroke-dasharray.attrib,
         SVG.stroke-dashoffset.attrib,
diff --git a/xml/relaxng/resources/resources/html5-schema/svg11/svg-shape.rnc b/xml/relaxng/resources/resources/html5-schema/svg11/svg-shape.rnc
index a6ccd197cf8a..3a501fb64687 100644
--- a/xml/relaxng/resources/resources/html5-schema/svg11/svg-shape.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/svg11/svg-shape.rnc
@@ -58,7 +58,7 @@ grammar {
         SVG.Cursor.attrib,
         SVG.External.attrib,
         common.attrs.aria?,
-        attribute d { PathData.datatype },
+        attribute d { PathData.datatype }?,
         attribute pathLength { Number.datatype }?,
         attribute transform { TransformList.datatype }?
     a:documentation [
@@ -85,8 +85,8 @@ grammar {
         common.attrs.aria?,
         attribute x { Coordinate.datatype }?,
         attribute y { Coordinate.datatype }?,
-        attribute width { Length.datatype },
-        attribute height { Length.datatype },
+        attribute width { Length.datatype }?,
+        attribute height { Length.datatype }?,
         attribute rx { Length.datatype }?,
         attribute ry { Length.datatype }?,
         attribute transform { TransformList.datatype }?
@@ -114,7 +114,7 @@ grammar {
         common.attrs.aria?,
         attribute cx { Coordinate.datatype }?,
         attribute cy { Coordinate.datatype }?,
-        attribute r { Length.datatype },
+        attribute r { Length.datatype }?,
         attribute transform { TransformList.datatype }?
     a:documentation [ "\x{a}" ~ "    line: Line Element\x{a}" ~ "  " ]
     SVG.line.content = SVG.Description.class*, SVG.Animation.class*
@@ -164,8 +164,8 @@ grammar {
         common.attrs.aria?,
         attribute cx { Coordinate.datatype }?,
         attribute cy { Coordinate.datatype }?,
-        attribute rx { Length.datatype },
-        attribute ry { Length.datatype },
+        attribute rx { Length.datatype }?,
+        attribute ry { Length.datatype }?,
         attribute transform { TransformList.datatype }?
     a:documentation [
         "\x{a}" ~
@@ -191,7 +191,7 @@ grammar {
         SVG.Cursor.attrib,
         SVG.External.attrib,
         (common.attrs.aria.implicit.group | common.attrs.aria)?,
-        attribute points { Points.datatype },
+        attribute points { Points.datatype }?,
         attribute transform { TransformList.datatype }?
     a:documentation [
         "\x{a}" ~
@@ -216,6 +216,6 @@ grammar {
         SVG.Cursor.attrib,
         SVG.External.attrib,
         common.attrs.aria?,
-        attribute points { Points.datatype },
+        attribute points { Points.datatype }?,
         attribute transform { TransformList.datatype }?
 }
diff --git a/xml/relaxng/resources/resources/html5-schema/xhtml1-ruby-rdf-svg-mathml.rnc b/xml/relaxng/resources/resources/html5-schema/xhtml1-ruby-rdf-svg-mathml.rnc
deleted file mode 100644
index 0c36e3d0ad55..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/xhtml1-ruby-rdf-svg-mathml.rnc
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace svg = "http://www.w3.org/2000/svg"
-namespace math = "http://www.w3.org/1998/Math/MathML"
-namespace rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-datatypes w = "http://whattf.org/datatype-draft"
-
-include "xhtml10/xhtml-strict.rnc"
-include "svg11/svg11-inc.rnc"
-include "svg11/inkscape.rnc"
-include "mml3/mathml3-inc.rnc"
-include "rdf/rdf.rnc"
-include "xhtml10/ruby.rnc"
-include "html5/aria.rnc"
-
-head.content &= rdf.elem*
-SVG.metadata.content |= rdf.elem
-
-Inline.class |= svg
-
-Inline.class |= math
-
-SVG.foreignObject.content |=
-	(	math
-	|	html
-	|	body
-	|	Block.mix*
-	)
-
-annotation-xml.model.svg |= svg
-
-annotation-xml.model.xhtml |=
-	(	html
-	|	Block.class
-	|	Inline.class
-	)
-
-# in our integration, <mtext> is the only MathML "token element" that can
-# contain HTML element content; the <mi>, <mn>, <mo> and <ms> elements
-# cannot; see http://www.w3.org/Bugs/Public/show_bug.cgi?id=9859#c8 for a
-# rationale
-mtext.content |= Inline.class
-
-# datatypes needed for ARIA support
-common.data.float = w:float
-common.data.idref = w:IDREF
-common.data.idrefs = w:IDREFS
-common.data.integer.non-negative = w:integer-non-negative
-common.data.integer.positive = w:integer-positive
diff --git a/xml/relaxng/resources/resources/html5-schema/xhtml5-all.rnc b/xml/relaxng/resources/resources/html5-schema/xhtml5-all.rnc
deleted file mode 100644
index 43bf9ef5adba..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/xhtml5-all.rnc
+++ /dev/null
@@ -1,3 +0,0 @@
-default namespace = "http://www.w3.org/1999/xhtml"
-include "xhtml5-svg-mathml.rnc"
-include "html5/xhtml5full-xhtml-rdfa.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/xhtml5-no-microdata.rnc b/xml/relaxng/resources/resources/html5-schema/xhtml5-no-microdata.rnc
deleted file mode 100644
index 355fe83fc605..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/xhtml5-no-microdata.rnc
+++ /dev/null
@@ -1,2 +0,0 @@
-include "xhtml5-svg-mathml.rnc"
-include "html5/xhtml5full-xhtml-no-microdata.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/xhtml5-rdfalite-w3c.rnc b/xml/relaxng/resources/resources/html5-schema/xhtml5-rdfalite-w3c.rnc
deleted file mode 100644
index 1b16f3749ef6..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/xhtml5-rdfalite-w3c.rnc
+++ /dev/null
@@ -1,2 +0,0 @@
-include "xhtml5-svg-mathml.rnc"
-include "html5/xhtml5full-xhtml-rdfalite.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/xhtml5-rdfalite.rnc b/xml/relaxng/resources/resources/html5-schema/xhtml5-rdfalite.rnc
deleted file mode 100644
index 1b16f3749ef6..000000000000
--- a/xml/relaxng/resources/resources/html5-schema/xhtml5-rdfalite.rnc
+++ /dev/null
@@ -1,2 +0,0 @@
-include "xhtml5-svg-mathml.rnc"
-include "html5/xhtml5full-xhtml-rdfalite.rnc"
diff --git a/xml/relaxng/resources/resources/html5-schema/xhtml5.rnc b/xml/relaxng/resources/resources/html5-schema/xhtml5.rnc
index 43bf9ef5adba..066076c99e1d 100644
--- a/xml/relaxng/resources/resources/html5-schema/xhtml5.rnc
+++ b/xml/relaxng/resources/resources/html5-schema/xhtml5.rnc
@@ -1,3 +1,12 @@
 default namespace = "http://www.w3.org/1999/xhtml"
+
+include "html5/xhtml5.rnc"
+
+include "html5/common-ext.rnc"
+include "html5/embed-ext.rnc"
+include "html5/core-scripting-ext.rnc"
+include "html5/rdfa.rnc"
+
+include "html5/legacy.rnc"
+
 include "xhtml5-svg-mathml.rnc"
-include "html5/xhtml5full-xhtml-rdfa.rnc"
diff --git a/xml/relaxng/resources/resources/patches/0001_html5.patch b/xml/relaxng/resources/resources/patches/0001_html5.patch
deleted file mode 100644
index db93bcdbd2e9..000000000000
--- a/xml/relaxng/resources/resources/patches/0001_html5.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- /Users/denofevil/Code/sandbox/checker/syntax/relaxng/html5full-rdfa.rnc	2014-01-24 12:19:52.000000000 +0400
-+++ html5/html5full-rdfa.rnc	2014-01-24 13:28:00.000000000 +0400
-@@ -6,13 +6,17 @@
-         nonHTMLizable = notAllowed
-         nonRoundtrippable = notAllowed
- }
-+include "common-ext.rnc"
-+
- start = html.elem
- include "phrase.rnc"
- include "block.rnc"
- include "sectional.rnc"
- include "revision.rnc"
- include "embed.rnc"
-+include "embed-ext.rnc"
- include "core-scripting.rnc"
-+include "core-scripting-ext.rnc"
- include "structural.rnc"
- include "ruby.rnc"
- include "media.rnc"
-@@ -33,7 +37,6 @@
-                  )
-             )
- }
--include "its20-html5.rnc"
--common.attrs &= its-html-attributes
-+include "meta-ext.rnc"
- include "microdata.rnc"
- include "rdfa.rnc"
diff --git a/xml/relaxng/resources/resources/patches/0002_xhtml5.patch b/xml/relaxng/resources/resources/patches/0002_xhtml5.patch
deleted file mode 100644
index cd7da96d45ce..000000000000
--- a/xml/relaxng/resources/resources/patches/0002_xhtml5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- /Users/denofevil/Code/sandbox/checker/syntax/relaxng/xhtml5full-xhtml-rdfa.rnc	2014-01-24 12:19:52.000000000 +0400
-+++ html5/xhtml5full-xhtml-rdfa.rnc	2014-01-25 11:13:41.000000000 +0400
-@@ -4,13 +4,17 @@
-         HTMLonly = notAllowed
-         v5only = empty
- }
-+include "common-ext.rnc"
-+
- start = html.elem
- include "phrase.rnc"
- include "block.rnc"
- include "sectional.rnc"
- include "revision.rnc"
- include "embed.rnc"
-+include "embed-ext.rnc"
- include "core-scripting.rnc"
-+include "core-scripting-ext.rnc"
- include "structural.rnc"
- include "ruby.rnc"
- include "media.rnc"
diff --git a/xml/relaxng/resources/resources/patches/0005_html5_namespace.patch b/xml/relaxng/resources/resources/patches/0005_html5_namespace.patch
deleted file mode 100644
index 31748c49d4d1..000000000000
--- a/xml/relaxng/resources/resources/patches/0005_html5_namespace.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- /Users/denofevil/Code/sandbox/checker/validator/schema/html5-all.rnc	2014-01-24 12:18:54.000000000 +0400
-+++ html5-all.rnc	2014-01-24 15:46:08.000000000 +0400
-@@ -1,2 +1,3 @@
-+default namespace = "http://www.w3.org/1999/xhtml"
- include "html5-svg-mathml.rnc"
- include "html5/html5full-rdfa.rnc"
diff --git a/xml/relaxng/resources/resources/patches/0006_xhtml5_namespace.patch b/xml/relaxng/resources/resources/patches/0006_xhtml5_namespace.patch
deleted file mode 100644
index 1d6d7c94ff8c..000000000000
--- a/xml/relaxng/resources/resources/patches/0006_xhtml5_namespace.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- /Users/denofevil/Code/sandbox/checker/validator/schema/xhtml5-all.rnc	2014-01-24 12:18:54.000000000 +0400
-+++ xhtml5-all.rnc	2014-01-24 15:46:01.000000000 +0400
-@@ -1,2 +1,3 @@
-+default namespace = "http://www.w3.org/1999/xhtml"
- include "xhtml5-svg-mathml.rnc"
- include "html5/xhtml5full-xhtml-rdfa.rnc"
diff --git a/xml/relaxng/resources/resources/patches/0007_legacy.patch b/xml/relaxng/resources/resources/patches/0007_legacy.patch
deleted file mode 100644
index 67946ccbfcbe..000000000000
--- a/xml/relaxng/resources/resources/patches/0007_legacy.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: xml/relaxng/src/resources/html5-schema/html5/legacy.rnc
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
---- html5/legacy.rnc	(revision d1fb137d55cd5a5f1b9d6228d3bd49669e148540)
-+++ html5/legacy.rnc	(revision aebff73f628a2e4a9321b0530831e1e36b280397)
-@@ -142,6 +142,7 @@
- 		element applet { applet.inner.phrasing & applet.attrs }
- 	applet.attrs =
- 		(	common.attrs
-+		&	applet.attrs.alt?
- 		&	applet.attrs.archive?
- 		&	applet.attrs.code
- 		&	applet.attrs.codebase?
-@@ -149,6 +150,10 @@
- 		&	applet.attrs.height
- 		&	applet.attrs.width
- 		)
-+		applet.attrs.alt =
-+			attribute alt {
-+				string
-+			}
- 		applet.attrs.archive =
- 			attribute archive {
- 				common.data.uri #FIXME *comma* separated URI list (*grumble*)
diff --git a/xml/relaxng/resources/resources/patches/legacy.rnc b/xml/relaxng/resources/resources/patches/legacy.rnc
new file mode 100644
index 000000000000..9be59a33b189
--- /dev/null
+++ b/xml/relaxng/resources/resources/patches/legacy.rnc
@@ -0,0 +1,1536 @@
+datatypes w = "http://whattf.org/datatype-draft"
+# #####################################################################
+##  RELAX NG Schema for HTML 5: Obsolete Elements and Attributes      #
+# #####################################################################
+
+## In order to work around RELAX NG limitations and to thereby get more
+## useful error messages, the following elements and attributes are
+## allowed here but disallowed in the assertions-checking code.
+
+## Obsolete elements
+
+## Centering: <center>
+
+	center.elem =
+		element center { center.inner & center.attrs }
+	center.attrs =
+		( common.attrs )
+	center.inner =
+		( common.inner.flow )
+
+	common.elem.flow |= center.elem
+
+## Inline Styling: <font>
+
+	font.elem =
+		element font { font.inner & font.attrs }
+	font.attrs =
+		(	common.attrs
+		&	font.attrs.color?
+		&	font.attrs.face?
+		&	font.attrs.size?
+		&	common.attrs.aria?
+		)
+		font.attrs.color =
+			attribute color {
+				string
+			}
+		font.attrs.face =
+			attribute face {
+				string
+			}
+		font.attrs.size =
+			attribute size {
+				string
+			}
+	font.inner =
+		( common.inner.phrasing )
+
+	common.elem.phrasing |= font.elem
+
+## Base Font Size: <basefont>
+
+	basefont.elem =
+		element basefont { empty & basefont.attrs }
+	basefont.attrs =
+		(	common.attrs
+		&	basefont.attrs.color?
+		&	basefont.attrs.face?
+		&	basefont.attrs.size?
+		)
+		basefont.attrs.color =
+			attribute color {
+				string
+			}
+		basefont.attrs.face =
+			attribute face {
+				string
+			}
+		basefont.attrs.size =
+			attribute size {
+				string
+			}
+
+	common.elem.flow |= basefont.elem
+
+## Larger Font: <big>
+
+	big.elem =
+		element big { big.inner & big.attrs }
+	big.attrs =
+		( common.attrs )
+	big.inner =
+		( common.inner.flow )
+
+	common.elem.phrasing |= big.elem
+
+## Struck Text: <strike>
+
+	strike.elem =
+		element strike { strike.inner & strike.attrs }
+	strike.attrs =
+		( common.attrs )
+	strike.inner =
+		( common.inner.flow )
+
+	common.elem.phrasing |= strike.elem
+
+## Teletype: <tt>
+
+	tt.elem =
+		element tt { tt.inner & tt.attrs }
+	tt.attrs =
+		( common.attrs )
+	tt.inner =
+		( common.inner.flow )
+
+	common.elem.phrasing |= tt.elem
+
+## Abbreviation: <acronym>
+
+	acronym.elem =
+		element acronym { acronym.inner & acronym.attrs }
+	acronym.attrs =
+		( common.attrs )
+	acronym.inner =
+		( common.inner.flow )
+
+	common.elem.phrasing |= acronym.elem
+
+## Directory: <dir>
+
+	dir.elem =
+		element dir { dir.inner & dir.attrs }
+	dir.attrs =
+		(	common.attrs
+		&	dir.attrs.compact?
+		)
+	dir.attrs.compact =
+		attribute compact {
+			string
+		}
+	dir.inner =
+		( li.elem* )
+
+	common.elem.flow |= dir.elem
+
+## Java Applets: <applet>
+
+	applet.elem.flow =
+		element applet { applet.inner.flow & applet.attrs }
+	applet.elem.phrasing =
+		element applet { applet.inner.phrasing & applet.attrs }
+	applet.attrs =
+		(	common.attrs
+		&	applet.attrs.alt?
+		&	applet.attrs.archive?
+		&	applet.attrs.code
+		&	applet.attrs.codebase?
+		&	applet.attrs.name?
+		&	applet.attrs.height
+		&	applet.attrs.width
+		)
+		applet.attrs.alt =
+			attribute alt {
+				string
+			}
+		applet.attrs.archive =
+			attribute archive {
+				common.data.uri #FIXME *comma* separated URI list (*grumble*)
+			}
+		applet.attrs.code =
+			attribute code {
+				token
+			}
+		applet.attrs.codebase =
+			attribute codebase {
+				common.data.uri
+			}
+		applet.attrs.name =
+			attribute name {
+				string #FIXME refine
+			}
+		applet.attrs.height =
+			attribute height {
+				common.data.integer.positive
+			}
+		applet.attrs.width =
+			attribute width {
+				common.data.integer.positive
+			}
+	applet.inner.flow =
+		(	param.elem*
+		,	common.inner.flow
+		)
+	applet.inner.phrasing =
+		(	param.elem*
+		,	common.inner.phrasing
+		)
+
+	common.elem.flow |= applet.elem.flow
+	common.elem.phrasing |= applet.elem.phrasing
+
+## Frame Set: <frameset>
+
+	frameset.elem =
+		element frameset { frameset.inner & frameset.attrs }
+	frameset.attrs =
+		(	common.attrs
+		&	frameset.attrs.rows?
+		&	frameset.attrs.columns?
+		&	frameset.attrs.onunload?
+		)
+		frameset.attrs.rows =
+			attribute rows {
+				string
+			}
+		frameset.attrs.columns =
+			attribute columns {
+				string
+			}
+		frameset.attrs.onunload =
+			attribute onunload {
+				string
+			}
+	frameset.inner =
+		(
+			(	frameset.elem
+			|	frame.elem
+			)+
+			& noframes.elem?
+		)
+
+## Frame: <frame>
+
+	frame.elem =
+		element frame { empty & frame.attrs }
+	frame.attrs =
+		(	common.attrs.basic
+		&	common.attrs.i18n
+		&	common.attrs.present
+		&	common.attrs.other
+		&	frame.attrs.longdesc?
+		&	frame.attrs.name?
+		&	frame.attrs.src?
+		&	frame.attrs.frameborder?
+		&	frame.attrs.marginwidth?
+		&	frame.attrs.marginheight?
+		&	frame.attrs.noresize?
+		&	frame.attrs.scrolling?
+		)
+		frame.attrs.longdesc =
+			attribute longdesc {
+				string
+			}
+		frame.attrs.name =
+			attribute name {
+				string
+			}
+		frame.attrs.src =
+			attribute src {
+				string
+			}
+		frame.attrs.frameborder =
+			attribute frameborder {
+				string
+			}
+		frame.attrs.marginwidth =
+			attribute marginwidth {
+				string
+			}
+		frame.attrs.marginheight =
+			attribute marginheight {
+				string
+			}
+		frame.attrs.noresize =
+			attribute noresize {
+				string
+			}
+		frame.attrs.scrolling =
+			attribute scrolling {
+				string
+			}
+
+## Alternate no-frames content: <noframes>
+
+	noframes.elem =
+		element noframes { noframes.inner & noframes.attrs }
+	noframes.attrs =
+		( common.attrs )
+	noframes.inner =
+		( common.inner.flow )
+
+	common.elem.flow |= noframes.elem
+
+## "content-language" pragma directive: <meta http-equiv='content-language'>
+
+	meta.http-equiv.content-language.elem =
+		element meta { meta.inner & meta.http-equiv.content-language.attrs }
+	meta.http-equiv.content-language.attrs =
+		(	common.attrs.basic
+		&	common.attrs.i18n
+		&	common.attrs.present
+		&	common.attrs.other
+		&	meta.http-equiv.attrs.http-equiv.content-language
+		&	meta.http-equiv.attrs.content.content-language?
+		)
+		meta.http-equiv.attrs.http-equiv.content-language =
+			attribute http-equiv {
+				w:string "content-language"
+			}
+		meta.http-equiv.attrs.content.content-language =
+			attribute content {
+				string
+			}
+
+	common.elem.metadata |= meta.http-equiv.content-language.elem # not quite right per spec
+                                                               # if the definition is
+                                                               # reused in another language
+
+## Key-pair generator/input control: <keygen>
+
+	keygen.elem =
+		element keygen { keygen.inner & keygen.attrs* }
+	keygen.attrs = attribute * { text }
+	keygen.inner =
+		( empty )
+
+	common.elem.phrasing |= keygen.elem
+
+## Obsolete attributes
+
+## abbr attribute
+
+	td.attrs.abbr =
+		attribute abbr {
+			string
+		}
+	td.attrs &= td.attrs.abbr?
+
+	th.attrs.abbr =
+		attribute abbr {
+			string
+		}
+	th.attrs &= th.attrs.abbr?
+
+## archive attribute
+
+	object.attrs.archive =
+		attribute archive {
+			string
+		}
+	object.attrs &= object.attrs.archive?
+
+## axis attribute
+
+	td.attrs.axis =
+		attribute axis {
+			string
+		}
+	td.attrs &= td.attrs.axis?
+
+	th.attrs.axis =
+		attribute axis {
+			string
+		}
+	th.attrs &= th.attrs.axis?
+
+## charset attribute
+
+	link.attrs.charset =
+		attribute charset {
+			string
+		}
+	link.attrs &= link.attrs.charset?
+
+	a.attrs.charset =
+		attribute charset {
+			string
+		}
+	a.attrs &= a.attrs.charset?
+
+## classid attribute
+
+	object.attrs.classid =
+		attribute classid {
+			common.data.uri
+		}
+	object.attrs &= object.attrs.classid?
+
+## codebase attribute
+
+	object.attrs.codebase =
+		attribute codebase {
+			common.data.uri
+		}
+	object.attrs &= object.attrs.codebase?
+
+## codetype attribute
+
+	object.attrs.codetype =
+		attribute codetype {
+			common.data.mimetype
+		}
+	object.attrs &= object.attrs.codetype?
+
+## code attribute
+
+	object.attrs.code =
+		attribute code {
+			token
+		}
+	object.attrs &= object.attrs.code?
+
+## coords attribute
+
+	a.attrs.coords =
+		attribute coords {
+			string
+		}
+	a.attrs &= a.attrs.coords?
+
+## declare attribute
+
+	object.attrs.declare =
+		attribute declare {
+			string
+		}
+	object.attrs &= object.attrs.declare?
+
+## longdesc attribute
+
+	img.attrs.longdesc =
+		attribute longdesc {
+			common.data.uri.non-empty
+		}
+	img.attrs &= img.attrs.longdesc?
+
+	iframe.attrs.longdesc =
+		attribute longdesc {
+			string
+		}
+	iframe.attrs &= iframe.attrs.longdesc?
+
+## methods attribute
+
+	a.attrs.methods =
+		attribute methods {
+			string
+		}
+	a.attrs &= a.attrs.methods?
+
+	link.attrs.methods =
+		attribute methods {
+			string
+		}
+	link.attrs &= link.attrs.methods?
+
+## name attribute
+
+	img.attrs.name =
+		attribute name {
+			string
+		}
+	img.attrs &= img.attrs.name?
+
+	embed.attrs.name =
+		attribute name {
+			string
+		}
+	embed.attrs &= embed.attrs.name?
+
+	option.attrs.name =
+		attribute name {
+			string
+		}
+	option.attrs &= option.attrs.name?
+
+## nohref attribute
+
+	area.attrs.nohref =
+		attribute nohref {
+			string
+		}
+	area.attrs &= area.attrs.nohref?
+
+## profile attribute
+
+	head.attrs.profile =
+		attribute profile {
+			string
+		}
+	head.attrs &= head.attrs.profile?
+
+## rev attribute
+
+	link.attrs.rev =
+		attribute rev {
+			string
+		}
+	link.attrs &= link.attrs.rev?
+
+	a.attrs.rev =
+		attribute rev {
+			string
+		}
+	a.attrs &= a.attrs.rev?
+
+## scheme attribute
+
+	meta.attrs.scheme =
+		attribute scheme {
+			string
+		}
+	meta.name.attrs &= meta.attrs.scheme?
+
+## scope attribute
+
+	td.attrs.scope =
+		attribute scope {
+			string
+		}
+	td.attrs &= td.attrs.scope?
+
+## shape attribute
+
+	a.attrs.shape =
+		attribute shape {
+			string
+		}
+	a.attrs &= a.attrs.shape?
+
+## standby attribute
+
+	object.attrs.standby =
+		attribute standby {
+			string
+		}
+	object.attrs &= object.attrs.standby?
+
+## target attribute
+
+	link.attrs.target =
+		attribute target {
+			string
+		}
+	link.attrs &= link.attrs.target?
+
+## type attribute
+
+	param.attrs.type =
+		attribute type {
+			string
+		}
+	param.attrs &= param.attrs.type?
+
+## urn attribute
+
+	a.attrs.urn =
+		attribute urn {
+			string
+		}
+	a.attrs &= a.attrs.urn?
+
+	link.attrs.urn =
+		attribute urn {
+			string
+		}
+	link.attrs &= link.attrs.urn?
+
+## usemap attribute
+
+	input.attrs.usemap =
+		attribute usemap {
+			string
+		}
+	input.image.attrs &= input.attrs.usemap?
+
+## valuetype attribute
+
+	param.attrs.valuetype =
+		attribute valuetype {
+			string
+		}
+	param.attrs &= param.attrs.valuetype?
+
+## version attribute
+
+	html.attrs.version =
+		attribute version {
+			string
+		}
+	html.attrs &= html.attrs.version?
+
+## Obsolete ARIA attributes
+
+	aria.state.grabbed =
+		attribute aria-grabbed {
+			string
+		}
+	aria.state.dropeffect =
+		attribute aria-dropeffect {
+			string
+		}
+	aria.global &= aria.state.grabbed?
+	aria.global &= aria.state.dropeffect?
+
+## Obsolete style attributes
+
+## align attribute
+
+	caption.attrs.align =
+		attribute align {
+			string
+		}
+	caption.attrs &= caption.attrs.align?
+
+	col.attrs.align =
+		attribute align {
+			string
+		}
+	col.attrs &= col.attrs.align?
+
+	colgroup.attrs.align =
+		attribute align {
+			string
+		}
+	colgroup.attrs &= colgroup.attrs.align?
+
+	div.attrs.align =
+		attribute align {
+			string
+		}
+	div.attrs &= div.attrs.align?
+
+	embed.attrs.align =
+		attribute align {
+			string
+		}
+	embed.attrs &= embed.attrs.align?
+
+	h1.attrs.align =
+		attribute align {
+			string
+		}
+	h1.attrs &= h1.attrs.align?
+
+	h2.attrs.align =
+		attribute align {
+			string
+		}
+	h2.attrs &= h2.attrs.align?
+
+	h3.attrs.align =
+		attribute align {
+			string
+		}
+	h3.attrs &= h3.attrs.align?
+
+	h4.attrs.align =
+		attribute align {
+			string
+		}
+	h4.attrs &= h4.attrs.align?
+
+	h5.attrs.align =
+		attribute align {
+			string
+		}
+	h5.attrs &= h5.attrs.align?
+
+	h6.attrs.align =
+		attribute align {
+			string
+		}
+	h6.attrs &= h6.attrs.align?
+
+	hr.attrs.align =
+		attribute align {
+			string
+		}
+	hr.attrs &= hr.attrs.align?
+
+	iframe.attrs.align =
+		attribute align {
+			string
+		}
+	iframe.attrs &= iframe.attrs.align?
+
+	img.attrs.align =
+		attribute align {
+			string
+		}
+	img.attrs &= img.attrs.align?
+
+	input.attrs.align =
+		attribute align {
+			string
+		}
+	input.text.attrs &= input.attrs.align?
+	input.password.attrs &= input.attrs.align?
+	input.checkbox.attrs &= input.attrs.align?
+	input.radio.attrs &= input.attrs.align?
+	input.button.attrs &= input.attrs.align?
+	input.submit.attrs &= input.attrs.align?
+	input.reset.attrs &= input.attrs.align?
+	input.file.attrs &= input.attrs.align?
+	input.image.attrs &= input.attrs.align?
+	input.datetime.attrs &= input.attrs.align?
+	input.datetime-local.attrs &= input.attrs.align?
+	input.date.attrs &= input.attrs.align?
+	input.month.attrs &= input.attrs.align?
+	input.time.attrs &= input.attrs.align?
+	input.week.attrs &= input.attrs.align?
+	input.number.attrs &= input.attrs.align?
+	input.range.attrs &= input.attrs.align?
+	input.email.attrs &= input.attrs.align?
+	input.url.attrs &= input.attrs.align?
+	input.search.attrs &= input.attrs.align?
+	input.tel.attrs &= input.attrs.align?
+	input.color.attrs &= input.attrs.align?
+
+	legend.attrs.align =
+		attribute align {
+			string
+		}
+	legend.attrs &= legend.attrs.align?
+
+	object.attrs.align =
+		attribute align {
+			string
+		}
+	object.attrs &= object.attrs.align?
+
+	p.attrs.align =
+		attribute align {
+			string
+		}
+	p.attrs &= p.attrs.align?
+
+	table.attrs.align =
+		attribute align {
+			string
+		}
+	table.attrs &= table.attrs.align?
+
+	tbody.attrs.align =
+		attribute align {
+			string
+		}
+	tbody.attrs &= tbody.attrs.align?
+
+	td.attrs.align =
+		attribute align {
+			string
+		}
+	td.attrs &= td.attrs.align?
+
+	tfoot.attrs.align =
+		attribute align {
+			string
+		}
+	tfoot.attrs &= tfoot.attrs.align?
+
+	th.attrs.align =
+		attribute align {
+			string
+		}
+	th.attrs &= th.attrs.align?
+
+	thead.attrs.align =
+		attribute align {
+			string
+		}
+	thead.attrs &= thead.attrs.align?
+
+	tr.attrs.align =
+		attribute align {
+			string
+		}
+	tr.attrs &= tr.attrs.align?
+
+## alink attribute
+
+	body.attrs.alink =
+		attribute alink {
+			string
+		}
+	body.attrs &= body.attrs.alink?
+
+	iframe.attrs.allowtransparency =
+		attribute allowtransparency {
+			string
+		}
+	iframe.attrs &= iframe.attrs.allowtransparency?
+
+## background attribute
+
+	body.attrs.background =
+		attribute background {
+			string
+		}
+	body.attrs &= body.attrs.background?
+
+## color attribute
+
+	hr.attrs.color =
+		attribute color {
+			string
+		}
+	hr.attrs &= hr.attrs.color?
+
+
+## bgcolor attribute
+
+	body.attrs.bgcolor =
+		attribute bgcolor {
+			string
+		}
+	body.attrs &= body.attrs.bgcolor?
+
+	table.attrs.bgcolor =
+		attribute bgcolor {
+			string
+		}
+	table.attrs &= table.attrs.bgcolor?
+
+	tr.attrs.bgcolor =
+		attribute bgcolor {
+			string
+		}
+	tr.attrs &= tr.attrs.bgcolor?
+
+	td.attrs.bgcolor =
+		attribute bgcolor {
+			string
+		}
+	td.attrs &= td.attrs.bgcolor?
+
+	th.attrs.bgcolor =
+		attribute bgcolor {
+			string
+		}
+	th.attrs &= th.attrs.bgcolor?
+
+## border attribute
+
+	object.attrs.border =
+		attribute border {
+			string
+		}
+	object.attrs &= object.attrs.border?
+
+	table.attrs.border  =
+		attribute border {
+			string
+		}
+	table.attrs &= table.attrs.border?
+
+## cellpadding attribute
+
+	table.attrs.cellpadding =
+		attribute cellpadding {
+			string
+		}
+	table.attrs &= table.attrs.cellpadding?
+
+## cellspacing attribute
+
+	table.attrs.cellspacing =
+		attribute cellspacing {
+			string
+		}
+	table.attrs &= table.attrs.cellspacing?
+
+## char attribute
+
+	col.attrs.char =
+		attribute char {
+			string
+		}
+	col.attrs &= col.attrs.char?
+
+	colgroup.attrs.char =
+		attribute char {
+			string
+		}
+	colgroup.attrs &= colgroup.attrs.char?
+
+	tbody.attrs.char =
+		attribute char {
+			string
+		}
+	tbody.attrs &= tbody.attrs.char?
+
+	td.attrs.char =
+		attribute char {
+			string
+		}
+	td.attrs &= td.attrs.char?
+
+	tfoot.attrs.char =
+		attribute char {
+			string
+		}
+	tfoot.attrs &= tfoot.attrs.char?
+
+	th.attrs.char =
+		attribute char {
+			string
+		}
+	th.attrs &= th.attrs.char?
+
+	thead.attrs.char =
+		attribute char {
+			string
+		}
+	thead.attrs &= thead.attrs.char?
+
+	tr.attrs.char =
+		attribute char {
+			string
+		}
+	tr.attrs &= tr.attrs.char?
+
+## charoff attribute
+
+	col.attrs.charoff =
+		attribute charoff {
+			string
+		}
+	col.attrs &= col.attrs.charoff?
+
+	colgroup.attrs.charoff =
+		attribute charoff {
+			string
+		}
+	colgroup.attrs &= colgroup.attrs.charoff?
+
+	tbody.attrs.charoff =
+		attribute charoff {
+			string
+		}
+	tbody.attrs &= tbody.attrs.charoff?
+
+	td.attrs.charoff =
+		attribute charoff {
+			string
+		}
+	td.attrs &= td.attrs.charoff?
+
+	tfoot.attrs.charoff =
+		attribute charoff {
+			string
+		}
+	tfoot.attrs &= tfoot.attrs.charoff?
+
+	th.attrs.charoff =
+		attribute charoff {
+			string
+		}
+	th.attrs &= th.attrs.charoff?
+
+	thead.attrs.charoff =
+		attribute charoff {
+			string
+		}
+	thead.attrs &= thead.attrs.charoff?
+
+	tr.attrs.charoff =
+		attribute charoff {
+			string
+		}
+	tr.attrs &= tr.attrs.charoff?
+
+## clear attribute
+
+	br.attrs.clear =
+		attribute clear {
+			string
+		}
+	br.attrs &= br.attrs.clear?
+
+## compact attribute
+
+	dl.attrs.compact =
+		attribute compact {
+			string
+		}
+	dl.attrs &= dl.attrs.compact?
+
+	menu.attrs.compact =
+		attribute compact {
+			string
+		}
+	menu.attrs &= menu.attrs.compact?
+
+	ol.attrs.compact =
+		attribute compact {
+			string
+		}
+	ol.attrs &= ol.attrs.compact?
+
+	ul.attrs.compact =
+		attribute compact {
+			string
+		}
+	ul.attrs &= ul.attrs.compact?
+
+## frame attribute
+
+	table.attrs.frame =
+		attribute frame {
+			string
+		}
+	table.attrs &= table.attrs.frame?
+
+## frameborder attribute
+
+	iframe.attrs.frameborder =
+		attribute frameborder {
+			string
+		}
+	iframe.attrs &= iframe.attrs.frameborder?
+
+## height attribute
+
+	td.attrs.height =
+		attribute height {
+			string
+		}
+	td.attrs &= td.attrs.height?
+
+	th.attrs.height =
+		attribute height {
+			string
+		}
+	th.attrs &= th.attrs.height?
+
+## hspace attribute
+
+	embed.attrs.hspace =
+		attribute hspace {
+			string
+		}
+	embed.attrs &= embed.attrs.hspace?
+
+	iframe.attrs.hspace =
+		attribute hspace {
+			string
+		}
+	iframe.attrs &= iframe.attrs.hspace?
+
+	input.attrs.hspace =
+		attribute hspace {
+			string
+		}
+	input.text.attrs &= input.attrs.hspace?
+	input.password.attrs &= input.attrs.hspace?
+	input.checkbox.attrs &= input.attrs.hspace?
+	input.radio.attrs &= input.attrs.hspace?
+	input.button.attrs &= input.attrs.hspace?
+	input.submit.attrs &= input.attrs.hspace?
+	input.reset.attrs &= input.attrs.hspace?
+	input.file.attrs &= input.attrs.hspace?
+	input.image.attrs &= input.attrs.hspace?
+	input.datetime.attrs &= input.attrs.hspace?
+	input.datetime-local.attrs &= input.attrs.hspace?
+	input.date.attrs &= input.attrs.hspace?
+	input.month.attrs &= input.attrs.hspace?
+	input.time.attrs &= input.attrs.hspace?
+	input.week.attrs &= input.attrs.hspace?
+	input.number.attrs &= input.attrs.hspace?
+	input.range.attrs &= input.attrs.hspace?
+	input.email.attrs &= input.attrs.hspace?
+	input.url.attrs &= input.attrs.hspace?
+	input.search.attrs &= input.attrs.hspace?
+	input.tel.attrs &= input.attrs.hspace?
+	input.color.attrs &= input.attrs.hspace?
+
+	img.attrs.hspace =
+		attribute hspace {
+			string
+		}
+	img.attrs &= img.attrs.hspace?
+
+	object.attrs.hspace =
+		attribute hspace {
+			string
+		}
+	object.attrs &= object.attrs.hspace?
+
+## link attribute
+
+	body.attrs.link =
+		attribute link {
+			string
+		}
+	body.attrs &= body.attrs.link?
+
+## bottommargin attribute
+
+	body.attrs.bottommargin =
+		attribute bottommargin {
+			string
+		}
+	body.attrs &= body.attrs.bottommargin?
+
+## marginheight attribute
+
+	body.attrs.marginheight =
+		attribute marginheight {
+			string
+		}
+	body.attrs &= body.attrs.marginheight?
+
+	iframe.attrs.marginheight =
+		attribute marginheight {
+			string
+		}
+	iframe.attrs &= iframe.attrs.marginheight?
+
+## leftmargin attribute
+
+	body.attrs.leftmargin =
+		attribute leftmargin {
+			string
+		}
+	body.attrs &= body.attrs.leftmargin?
+
+## rightmargin attribute
+
+	body.attrs.rightmargin =
+		attribute rightmargin {
+			string
+		}
+	body.attrs &= body.attrs.rightmargin?
+
+## topmargin attribute
+
+	body.attrs.topmargin =
+		attribute topmargin {
+			string
+		}
+	body.attrs &= body.attrs.topmargin?
+
+## marginwidth attribute
+
+	body.attrs.marginwidth =
+		attribute marginwidth {
+			string
+		}
+	body.attrs &= body.attrs.marginwidth?
+
+	iframe.attrs.marginwidth =
+		attribute marginwidth {
+			string
+		}
+	iframe.attrs &= iframe.attrs.marginwidth?
+
+## noshade attribute
+
+	hr.attrs.noshade =
+		attribute noshade {
+			string
+		}
+	hr.attrs &= hr.attrs.noshade?
+
+## nowrap attribute
+
+	td.attrs.nowrap =
+		attribute nowrap {
+			string
+		}
+	td.attrs &= td.attrs.nowrap?
+
+	th.attrs.nowrap =
+		attribute nowrap {
+			string
+		}
+	th.attrs &= th.attrs.nowrap?
+
+## rules attribute
+
+	table.attrs.rules =
+		attribute rules {
+			string
+		}
+	table.attrs &= table.attrs.rules?
+
+## datapagesize attribute
+
+	table.attrs.datapagesize =
+		attribute datapagesize {
+			string
+		}
+	table.attrs &= table.attrs.datapagesize?
+
+## scrolling attribute
+
+	iframe.attrs.scrolling =
+		attribute scrolling {
+			string
+		}
+	iframe.attrs &= iframe.attrs.scrolling?
+
+## size attribute
+
+	hr.attrs.size =
+		attribute size {
+			string
+		}
+	hr.attrs &= hr.attrs.size?
+
+## summary attribute
+
+	table.attrs.summary =
+		attribute summary {
+			string
+		}
+	table.attrs &= table.attrs.summary?
+
+## text attribute
+
+	body.attrs.text =
+		attribute text {
+			string
+		}
+	body.attrs &= body.attrs.text?
+
+## type attribute
+
+	li.attrs.type =
+		attribute type {
+			string
+		}
+	li.attrs &= li.attrs.type?
+	oli.attrs &= li.attrs.type?
+
+	ul.attrs.type =
+		attribute type {
+			string
+		}
+	ul.attrs &= ul.attrs.type?
+
+## valign attribute
+
+	col.attrs.valign =
+		attribute valign {
+			string
+		}
+	col.attrs &= col.attrs.valign?
+
+	colgroup.attrs.valign =
+		attribute valign {
+			string
+		}
+	colgroup.attrs &= colgroup.attrs.valign?
+
+	table.attrs.valign =
+		attribute valign {
+			string
+		}
+	table.attrs &= table.attrs.valign?
+
+	tbody.attrs.valign =
+		attribute valign {
+			string
+		}
+	tbody.attrs &= tbody.attrs.valign?
+
+	td.attrs.valign =
+		attribute valign {
+			string
+		}
+	td.attrs &= td.attrs.valign?
+
+	tfoot.attrs.valign =
+		attribute valign {
+			string
+		}
+	tfoot.attrs &= tfoot.attrs.valign?
+
+	th.attrs.valign =
+		attribute valign {
+			string
+		}
+	th.attrs &= th.attrs.valign?
+
+	thead.attrs.valign =
+		attribute valign {
+			string
+		}
+	thead.attrs &= thead.attrs.valign?
+
+	tr.attrs.valign =
+		attribute valign {
+			string
+		}
+	tr.attrs &= tr.attrs.valign?
+
+## vlink attribute
+
+	body.attrs.vlink =
+		attribute vlink {
+			string
+		}
+	body.attrs &= body.attrs.vlink?
+
+## vspace attribute
+
+	embed.attrs.vspace =
+		attribute vspace {
+			string
+		}
+	embed.attrs &= embed.attrs.vspace?
+
+	iframe.attrs.vspace =
+		attribute vspace {
+			string
+		}
+	iframe.attrs &= iframe.attrs.vspace?
+
+	input.attrs.vspace =
+		attribute vspace {
+			string
+		}
+	input.text.attrs &= input.attrs.vspace?
+	input.password.attrs &= input.attrs.vspace?
+	input.checkbox.attrs &= input.attrs.vspace?
+	input.radio.attrs &= input.attrs.vspace?
+	input.button.attrs &= input.attrs.vspace?
+	input.submit.attrs &= input.attrs.vspace?
+	input.reset.attrs &= input.attrs.vspace?
+	input.file.attrs &= input.attrs.vspace?
+	input.image.attrs &= input.attrs.vspace?
+	input.datetime.attrs &= input.attrs.vspace?
+	input.datetime-local.attrs &= input.attrs.vspace?
+	input.date.attrs &= input.attrs.vspace?
+	input.month.attrs &= input.attrs.vspace?
+	input.time.attrs &= input.attrs.vspace?
+	input.week.attrs &= input.attrs.vspace?
+	input.number.attrs &= input.attrs.vspace?
+	input.range.attrs &= input.attrs.vspace?
+	input.email.attrs &= input.attrs.vspace?
+	input.url.attrs &= input.attrs.vspace?
+	input.search.attrs &= input.attrs.vspace?
+	input.tel.attrs &= input.attrs.vspace?
+	input.color.attrs &= input.attrs.vspace?
+
+	img.attrs.vspace =
+		attribute vspace {
+			string
+		}
+	img.attrs &= img.attrs.vspace?
+
+	object.attrs.vspace =
+		attribute vspace {
+			string
+		}
+	object.attrs &= object.attrs.vspace?
+
+## width attribute
+
+	col.attrs.width =
+		attribute width {
+			string
+		}
+	col.attrs &= col.attrs.width?
+
+	colgroup.attrs.width =
+		attribute width {
+			string
+		}
+	colgroup.attrs &= colgroup.attrs.width?
+
+	hr.attrs.width =
+		attribute width {
+			string
+		}
+	hr.attrs &= hr.attrs.width?
+
+	pre.attrs.width =
+		attribute width {
+			string
+		}
+	pre.attrs &= pre.attrs.width?
+
+	table.attrs.width =
+		attribute width {
+			string
+		}
+	table.attrs &= table.attrs.width?
+
+	td.attrs.width =
+		attribute width {
+			string
+		}
+	td.attrs &= td.attrs.width?
+
+	th.attrs.width =
+		attribute width {
+			string
+		}
+	th.attrs &= th.attrs.width?
+
+## event attribute
+
+	script.attrs.event =
+		attribute event {
+			string
+		}
+	script.attrs.imported &= script.attrs.event?
+	script.attrs.embedded &= script.attrs.event?
+
+## for attribute
+
+	script.attrs.for =
+		attribute for {
+			string
+		}
+	script.attrs.imported &= script.attrs.for?
+	script.attrs.embedded &= script.attrs.for?
+
+## datafld attribute
+
+	legacy.attrs.datafld =
+		attribute datafld {
+			string
+		}
+	span.attrs &= legacy.attrs.datafld?
+	div.attrs &= legacy.attrs.datafld?
+	object.attrs &= legacy.attrs.datafld?
+	input.text.attrs &= legacy.attrs.datafld?
+	input.password.attrs &= legacy.attrs.datafld?
+	input.checkbox.attrs &= legacy.attrs.datafld?
+	input.radio.attrs &= legacy.attrs.datafld?
+	input.button.attrs &= legacy.attrs.datafld?
+	input.submit.attrs &= legacy.attrs.datafld?
+	input.reset.attrs &= legacy.attrs.datafld?
+	input.file.attrs &= legacy.attrs.datafld?
+	input.image.attrs &= legacy.attrs.datafld?
+	input.datetime.attrs &= legacy.attrs.datafld?
+	input.datetime-local.attrs &= legacy.attrs.datafld?
+	input.date.attrs &= legacy.attrs.datafld?
+	input.month.attrs &= legacy.attrs.datafld?
+	input.time.attrs &= legacy.attrs.datafld?
+	input.week.attrs &= legacy.attrs.datafld?
+	input.number.attrs &= legacy.attrs.datafld?
+	input.range.attrs &= legacy.attrs.datafld?
+	input.email.attrs &= legacy.attrs.datafld?
+	input.url.attrs &= legacy.attrs.datafld?
+	input.search.attrs &= legacy.attrs.datafld?
+	input.tel.attrs &= legacy.attrs.datafld?
+	input.color.attrs &= legacy.attrs.datafld?
+	select.attrs &= legacy.attrs.datafld?
+	textarea.attrs &= legacy.attrs.datafld?
+	button.submit.attrs &= legacy.attrs.datafld?
+	button.reset.attrs &= legacy.attrs.datafld?
+	button.button.attrs &= legacy.attrs.datafld?
+	table.attrs &= legacy.attrs.datafld?
+
+## dataformatas attribute
+
+	legacy.attrs.dataformatas =
+		attribute dataformatas {
+			string
+		}
+	span.attrs &= legacy.attrs.dataformatas?
+	div.attrs &= legacy.attrs.dataformatas?
+	object.attrs &= legacy.attrs.dataformatas?
+	input.attrs &= legacy.attrs.dataformatas?
+	input.text.attrs &= legacy.attrs.dataformatas?
+	input.password.attrs &= legacy.attrs.dataformatas?
+	input.checkbox.attrs &= legacy.attrs.dataformatas?
+	input.radio.attrs &= legacy.attrs.dataformatas?
+	input.button.attrs &= legacy.attrs.dataformatas?
+	input.submit.attrs &= legacy.attrs.dataformatas?
+	input.reset.attrs &= legacy.attrs.dataformatas?
+	input.file.attrs &= legacy.attrs.dataformatas?
+	input.image.attrs &= legacy.attrs.dataformatas?
+	input.datetime.attrs &= legacy.attrs.dataformatas?
+	input.datetime-local.attrs &= legacy.attrs.dataformatas?
+	input.date.attrs &= legacy.attrs.dataformatas?
+	input.month.attrs &= legacy.attrs.dataformatas?
+	input.time.attrs &= legacy.attrs.dataformatas?
+	input.week.attrs &= legacy.attrs.dataformatas?
+	input.number.attrs &= legacy.attrs.dataformatas?
+	input.range.attrs &= legacy.attrs.dataformatas?
+	input.email.attrs &= legacy.attrs.dataformatas?
+	input.url.attrs &= legacy.attrs.dataformatas?
+	input.search.attrs &= legacy.attrs.dataformatas?
+	input.tel.attrs &= legacy.attrs.dataformatas?
+	input.color.attrs &= legacy.attrs.dataformatas?
+	select.attrs &= legacy.attrs.dataformatas?
+	textarea.attrs &= legacy.attrs.dataformatas?
+	button.submit.attrs &= legacy.attrs.dataformatas?
+	button.reset.attrs &= legacy.attrs.dataformatas?
+	button.button.attrs &= legacy.attrs.dataformatas?
+	table.attrs &= legacy.attrs.dataformatas?
+
+## datasrc attribute
+
+	legacy.attrs.datasrc =
+		attribute datasrc {
+			string
+		}
+	span.attrs &= legacy.attrs.datasrc?
+	div.attrs &= legacy.attrs.datasrc?
+	object.attrs &= legacy.attrs.datasrc?
+	input.text.attrs &= legacy.attrs.datasrc?
+	input.password.attrs &= legacy.attrs.datasrc?
+	input.checkbox.attrs &= legacy.attrs.datasrc?
+	input.radio.attrs &= legacy.attrs.datasrc?
+	input.button.attrs &= legacy.attrs.datasrc?
+	input.submit.attrs &= legacy.attrs.datasrc?
+	input.reset.attrs &= legacy.attrs.datasrc?
+	input.file.attrs &= legacy.attrs.datasrc?
+	input.image.attrs &= legacy.attrs.datasrc?
+	input.datetime.attrs &= legacy.attrs.datasrc?
+	input.datetime-local.attrs &= legacy.attrs.datasrc?
+	input.date.attrs &= legacy.attrs.datasrc?
+	input.month.attrs &= legacy.attrs.datasrc?
+	input.time.attrs &= legacy.attrs.datasrc?
+	input.week.attrs &= legacy.attrs.datasrc?
+	input.number.attrs &= legacy.attrs.datasrc?
+	input.range.attrs &= legacy.attrs.datasrc?
+	input.email.attrs &= legacy.attrs.datasrc?
+	input.url.attrs &= legacy.attrs.datasrc?
+	input.search.attrs &= legacy.attrs.datasrc?
+	input.tel.attrs &= legacy.attrs.datasrc?
+	input.color.attrs &= legacy.attrs.datasrc?
+	select.attrs &= legacy.attrs.datasrc?
+	textarea.attrs &= legacy.attrs.datasrc?
+	button.submit.attrs &= legacy.attrs.datasrc?
+	button.reset.attrs &= legacy.attrs.datasrc?
+	button.button.attrs &= legacy.attrs.datasrc?
+	table.attrs &= legacy.attrs.datasrc?
+
+## manifest attribute
+
+	html.attrs.manifest =
+		attribute manifest {
+			string
+		}
+
+	html.attrs &= html.attrs.manifest?
diff --git a/xml/relaxng/resources/resources/patches/patch_build.patch b/xml/relaxng/resources/resources/patches/patch_build.patch
index d3b3696419ad..ae0d1e8c9b4c 100644
--- a/xml/relaxng/resources/resources/patches/patch_build.patch
+++ b/xml/relaxng/resources/resources/patches/patch_build.patch
@@ -1,13 +1,12 @@
 diff --git a/build/build.py b/build/build.py
-index f3ab4a83..919a6576 100755
---- a/build/build.py
-+++ b/build/build.py
-@@ -1846,7 +1846,7 @@ def main(argv):
-             elif arg == 'checkout':
-                 pass
-             elif arg == 'build':
--                release.buildAll()
-+                buildSchemaDrivers()
-             elif arg == 'docker-build':
-                 dockerBuild()
-             elif arg == 'docker-run':
+--- a/build/build.py	(revision 2718ae6ca0ff39b1194c6cba66ace0e77cc45809)
++++ b/build/build.py	(date 1770809444251)
+@@ -2585,7 +2585,7 @@
+         elif task == 'checkout':
+             pass
+         elif task == 'build':
+-            release.buildAll()
++            buildSchemaDrivers()
+         elif task == 'docker-build':
+             dockerBuild()
+         elif task == 'docker-run':
diff --git a/xml/relaxng/scripts/update_html5_schema.sh b/xml/relaxng/scripts/update_html5_schema.sh
index 132e4513176b..4d8997e34de3 100755
--- a/xml/relaxng/scripts/update_html5_schema.sh
+++ b/xml/relaxng/scripts/update_html5_schema.sh
@@ -29,7 +29,6 @@ echo ">>>>> Collecting schemas"
 cd ../..
 mkdir result
 mkdir result/html5
-cp temp/validator/schema/*.rnc result
 rsync -r --include=*.rnc temp/validator/schema/* result
 rm -rf result/xhtml10
 pwd
@@ -55,16 +54,19 @@ cd ..
 
 echo
 echo ">>>>> Moving items in place"
-cp result/html5-all.rnc result/html5.rnc
-cp result/xhtml5-all.rnc result/xhtml5.rnc
 mv result/html5/LICENSE result
 
+# Use our root schema files
+cp html5-schema/*.rnc result
+
 # Retain our SVG 2.0 support
 cp -R html5-schema/svg20 result
 
+# Retain our rdf support
+cp -R html5-schema/rdf result
+
 # Remove unnecessary files
 rm result/html5/.htaccess
-rm result/html5/assertions.sch
 rm result/mml3/Makefile
 rm result/mml3/patch-vnu