@markuplint/html-spec 3.0.0-alpha.66 → 3.0.0-dev.24

package/index.json

@@ -363,7 +363,7 @@
 					}
 				},
 				"class": {
-					"type": "<class-list>"
+					"type": "Any"
 				},
 				"id": {
 					"type": "DOMID"
@@ -1027,7 +1027,7 @@
 					"type": "BCP47"
 				},
 				"class": {
-					"type": "<class-list>"
+					"type": "Any"
 				},
 				"style": {
 					"type": "<css-declaration-list>"
@@ -22184,7 +22184,7 @@
 				"#text"
 			],
 			"#sectioning": ["article", "aside", "nav", "section"],
-			"#heading": ["h1", "h2", "h3", "h4", "h5", "h6", "hgroup"],
+			"#heading": ["h1", "h2", "h3", "h4", "h5", "h6", "hgroup:has(h1,h2,h3,h4,h5,h6)"],
 			"#phrasing": [
 				"a",
 				"abbr",
@@ -22268,6 +22268,83 @@
 				"textarea",
 				"video[controls]"
 			],
+			"#palpable": [
+				"a",
+				"abbr",
+				"address",
+				"article",
+				"aside",
+				"audio[controls]",
+				"b",
+				"bdi",
+				"bdo",
+				"blockquote",
+				"button",
+				"canvas",
+				"cite",
+				"code",
+				"data",
+				"details",
+				"dfn",
+				"div",
+				"dl:has(>:is(dt+dd))",
+				"em",
+				"embed",
+				"fieldset",
+				"figure",
+				"footer",
+				"form",
+				"h1",
+				"h2",
+				"h3",
+				"h4",
+				"h5",
+				"h6",
+				"header",
+				"hgroup",
+				"i",
+				"iframe",
+				"img",
+				"input:not([type='hidden' i])",
+				"ins",
+				"kbd",
+				"label",
+				"main",
+				"map",
+				"mark",
+				"math",
+				"menu:has(>li)",
+				"meter",
+				"nav",
+				"object",
+				"ol:has(>li)",
+				"output",
+				"p",
+				"pre",
+				"progress",
+				"q",
+				"ruby",
+				"s",
+				"samp",
+				"section",
+				"select",
+				"small",
+				"span",
+				"strong",
+				"sub",
+				"sup ",
+				"svg",
+				"table",
+				"text",
+				"area",
+				"time",
+				"u",
+				"ul:has(>li)",
+				"var",
+				"video",
+				"#custom",
+				"#text"
+			],
 			"#script-supporting": ["script", "template"],
 			"#SVGAnimation": [
 				"svg|animate",
@@ -22411,8 +22488,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#transparent",
-						"notAllowedDescendants": ["#interactive"]
+						"transparent": ":not(:model(interactive), a, [tabindex], :has(:model(interactive), a, [tabindex]))"
 					}
 				]
 			},
@@ -22433,7 +22509,7 @@
 				"properties": {
 					"global": true,
 					"role": true,
-					"whithout": [
+					"without": [
 						{
 							"type": "not-recommended",
 							"name": "aria-disabled",
@@ -22453,7 +22529,7 @@
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -22480,10 +22556,10 @@
 					"deprecated": true
 				},
 				"download": {
-					"description": "Causes the browser to treat the linked URL as a download. Can be used with or without a value: Without a value, the browser will suggest a filename/extension, generated from various sources: The Content-Disposition HTTP header The final segment in the URL path The media type (from the Content-Type header, the start of a data: URL, or Blob.type for a blob: URL) Defining a value suggests it as the filename. / and \\ characters are converted to underscores (_). Filesystems may forbid other characters in filenames, so browsers will adjust the suggested name if necessary. Note: download only works for same-origin URLs, or the blob: and data: schemes. How browsers treat downloads varies by browser, user settings, and other factors. The user may be prompted before a download starts, or the file may be saved automatically, or it may open automatically, either in an external application or in the browser itself. If the Content-Disposition header has different information from the download attribute, resulting behavior may differ: If the header specifies a filename, it takes priority over a filename specified in the download attribute. If the header specifies a disposition of inline, Chrome and Firefox prioritize the attribute and treat it as a download. Old Firefox versions (before 82) prioritize the header and will display the content inline."
+					"description": "Causes the browser to treat the linked URL as a download. Can be used with or without a filename value: Without a value, the browser will suggest a filename/extension, generated from various sources: The Content-Disposition HTTP header The final segment in the URL path The media type (from the Content-Type header, the start of a data: URL, or Blob.type for a blob: URL) filename: defining a value suggests it as the filename. / and \\ characters are converted to underscores (_). Filesystems may forbid other characters in filenames, so browsers will adjust the suggested name if necessary. Note: download only works for same-origin URLs, or the blob: and data: schemes. How browsers treat downloads varies by browser, user settings, and other factors. The user may be prompted before a download starts, or the file may be saved automatically, or it may open automatically, either in an external application or in the browser itself. If the Content-Disposition header has different information from the download attribute, resulting behavior may differ: If the header specifies a filename, it takes priority over a filename specified in the download attribute. If the header specifies a disposition of inline, Chrome and Firefox prioritize the attribute and treat it as a download. Old Firefox versions (before 82) prioritize the header and will display the content inline."
 				},
 				"href": {
-					"description": "The URL that the hyperlink points to. Links are not restricted to HTTP-based URLs — they can use any URL scheme supported by browsers: Sections of a page with fragment URLs Pieces of media files with media fragments Telephone numbers with tel: URLs Email addresses with mailto: URLs While web browsers may not support other URL schemes, web sites can with registerProtocolHandler()"
+					"description": "The URL that the hyperlink points to. Links are not restricted to HTTP-based URLs — they can use any URL scheme supported by browsers: Sections of a page with fragment URLs Pieces of media files with media fragments Telephone numbers with tel: URLs Email addresses with mailto: URLs While web browsers may not support other URL schemes, websites can with registerProtocolHandler()"
 				},
 				"hreflang": {
 					"description": "Hints at the human language of the linked URL. No built-in functionality. Allowed values are the same as the global lang attribute."
@@ -22510,7 +22586,7 @@
 					"deprecated": true
 				},
 				"target": {
-					"description": "Where to display the linked URL, as the name for a browsing context (a tab, window, or <iframe>). The following keywords have special meanings for where to load the URL: _self: the current browsing context. (Default) _blank: usually a new tab, but users can configure browsers to open a new window instead. _parent: the parent browsing context of the current one. If no parent, behaves as _self. _top: the topmost browsing context (the \"highest\" context that's an ancestor of the current one). If no ancestors, behaves as _self. Note: Setting target=\"_blank\" on <a> elements implicitly provides the same rel behavior as setting rel=\"noopener\" which does not set window.opener. See browser compatibility for support status."
+					"description": "Where to display the linked URL, as the name for a browsing context (a tab, window, or <iframe>). The following keywords have special meanings for where to load the URL: _self: the current browsing context. (Default) _blank: usually a new tab, but users can configure browsers to open a new window instead. _parent: the parent browsing context of the current one. If no parent, behaves as _self. _top: the topmost browsing context (the \"highest\" context that's an ancestor of the current one). If no ancestors, behaves as _self. Note: Setting target=\"_blank\" on <a> elements implicitly provides the same rel behavior as setting rel=\"noopener\" which does not set window.opener."
 				},
 				"type": {
 					"description": "Hints at the linked URL's format with a MIME type. No built-in functionality."
@@ -22520,12 +22596,12 @@
 		{
 			"name": "abbr",
 			"cite": "https://developer.mozilla.org/en-US/docs/Web/HTML/Element/abbr",
-			"description": "The <abbr> HTML element represents an abbreviation or acronym; the optional title attribute can provide an expansion or description for the abbreviation. If present, title must contain this full description and nothing else.",
+			"description": "The <abbr> HTML element represents an abbreviation or acronym.",
 			"categories": ["#flow", "#phrasing", "#palpable"],
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -22534,7 +22610,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -22555,7 +22631,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -22568,8 +22644,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow",
-						"notAllowedDescendants": ["address", "#heading", "#sectioning", "header", "footer"]
+						"oneOrMore": ":model(flow):not(address, :model(heading), :model(sectioning), header, foooter, :has(address, :model(heading), :model(sectioning), header, foooter))"
 					}
 				]
 			},
@@ -22578,7 +22653,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -22599,61 +22674,76 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {
 				"align": {
-					"description": "This attribute is used to position the applet on the page relative to content that might flow around it. The HTML 4.01 specification defines values of bottom, left, middle, right, and top, whereas Microsoft and Netscape also might support absbottom, absmiddle, baseline, center, and texttop."
+					"description": "This attribute is used to position the applet on the page relative to content that might flow around it. The HTML 4.01 specification defines values of bottom, left, middle, right, and top, whereas Microsoft and Netscape also might support absbottom, absmiddle, baseline, center, and texttop.",
+					"deprecated": true
 				},
 				"alt": {
-					"description": "This attribute causes a descriptive text alternate to be displayed on browsers that do not support Java. Page designers should also remember that content enclosed within the <applet> element may also be rendered as alternative text."
+					"description": "This attribute causes a descriptive text alternate to be displayed on browsers that do not support Java. Page designers should also remember that content enclosed within the <applet> element may also be rendered as alternative text.",
+					"deprecated": true
 				},
 				"archive": {
-					"description": "This attribute refers to an archived or compressed version of the applet and its associated class files, which might help reduce download time."
+					"description": "This attribute refers to an archived or compressed version of the applet and its associated class files, which might help reduce download time.",
+					"deprecated": true
 				},
 				"code": {
-					"description": "This attribute specifies the URL of the applet's class file to be loaded and executed. Applet filenames are identified by a .class filename extension. The URL specified by code might be relative to the codebase attribute."
+					"description": "This attribute specifies the URL of the applet's class file to be loaded and executed. Applet filenames are identified by a .class filename extension. The URL specified by code might be relative to the codebase attribute.",
+					"deprecated": true
 				},
 				"codebase": {
-					"description": "This attribute gives the absolute or relative URL of the directory where applets' .class files referenced by the code attribute are stored."
+					"description": "This attribute gives the absolute or relative URL of the directory where applets' .class files referenced by the code attribute are stored.",
+					"deprecated": true
 				},
 				"datafld": {
-					"description": "This attribute, supported by Internet Explorer 4 and higher, specifies the column name from the data source object that supplies the bound data. This attribute might be used to specify the various <param> elements passed to the Java applet."
+					"description": "This attribute, supported by Internet Explorer 4 and higher, specifies the column name from the data source object that supplies the bound data. This attribute might be used to specify the various <param> elements passed to the Java applet.",
+					"deprecated": true
 				},
 				"datasrc": {
-					"description": "Like datafld, this attribute is used for data binding under Internet Explorer 4. It indicates the id of the data source object that supplies the data that is bound to the <param> elements associated with the applet."
+					"description": "Like datafld, this attribute is used for data binding under Internet Explorer 4. It indicates the id of the data source object that supplies the data that is bound to the <param> elements associated with the applet.",
+					"deprecated": true
 				},
 				"height": {
-					"description": "This attribute specifies the height, in pixels, that the applet needs."
+					"description": "This attribute specifies the height, in pixels, that the applet needs.",
+					"deprecated": true
 				},
 				"hspace": {
-					"description": "This attribute specifies additional horizontal space, in pixels, to be reserved on either side of the applet."
+					"description": "This attribute specifies additional horizontal space, in pixels, to be reserved on either side of the applet.",
+					"deprecated": true
 				},
 				"mayscript": {
-					"description": "In the Netscape implementation, this attribute allows access to an applet by programs in a scripting language embedded in the document."
+					"description": "In the Netscape implementation, this attribute allows access to an applet by programs in a scripting language embedded in the document.",
+					"deprecated": true
 				},
 				"name": {
-					"description": "This attribute assigns a name to the applet so that it can be identified by other resources; particularly scripts."
+					"description": "This attribute assigns a name to the applet so that it can be identified by other resources; particularly scripts.",
+					"deprecated": true
 				},
 				"object": {
-					"description": "This attribute specifies the URL of a serialized representation of an applet."
+					"description": "This attribute specifies the URL of a serialized representation of an applet.",
+					"deprecated": true
 				},
 				"src": {
-					"description": "As defined for Internet Explorer 4 and higher, this attribute specifies a URL for an associated file for the applet. The meaning and use is unclear and not part of the HTML standard."
+					"description": "As defined for Internet Explorer 4 and higher, this attribute specifies a URL for an associated file for the applet. The meaning and use is unclear and not part of the HTML standard.",
+					"deprecated": true
 				},
 				"vspace": {
-					"description": "This attribute specifies additional vertical space, in pixels, to be reserved above and below the applet."
+					"description": "This attribute specifies additional vertical space, in pixels, to be reserved above and below the applet.",
+					"deprecated": true
 				},
 				"width": {
-					"description": "This attribute specifies in pixels the width that the applet needs."
+					"description": "This attribute specifies in pixels the width that the applet needs.",
+					"deprecated": true
 				}
 			}
 		},
 		{
 			"name": "area",
 			"cite": "https://developer.mozilla.org/en-US/docs/Web/HTML/Element/area",
-			"description": "The <area> HTML element defines an area inside an image map that has predefined clickable areas. An image map allows geometric areas on an image to be associated with hypertext link.",
+			"description": "The <area> HTML element defines an area inside an image map that has predefined clickable areas. An image map allows geometric areas on an image to be associated with hypertext links.",
 			"categories": ["#flow", "#phrasing"],
 			"contentModel": {
 				"contents": false,
@@ -22682,7 +22772,7 @@
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -22719,14 +22809,15 @@
 					"description": "The hyperlink target for the area. Its value is a valid URL. This attribute may be omitted; if so, the <area> element does not represent a hyperlink."
 				},
 				"hreflang": {
-					"description": "Indicates the language of the linked resource. Allowed values are defined by RFC 5646: Tags for Identifying Languages (also known as BCP 47). Use this attribute only if the href attribute is present."
+					"description": "Indicates the language of the linked resource. Allowed values are defined by RFC 5646: Tags for Identifying Languages (also known as BCP 47). Use this attribute only if the href attribute is present.",
+					"deprecated": true
 				},
 				"name": {
 					"description": "Define a names for the clickable area so that it can be scripted by older browsers.",
 					"deprecated": true
 				},
 				"nohref": {
-					"description": "Indicates that no hyperlink exists for the associated area. Note: Since HTML5, omitting the href attribute is sufficient.",
+					"description": "Indicates that no hyperlink exists for the associated area. Note: The nohref attribute is not necessary, as omitting the href attribute is sufficient.",
 					"deprecated": true
 				},
 				"ping": {
@@ -22762,7 +22853,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -22770,7 +22861,7 @@
 				"implicitRole": "article",
 				"permittedRoles": ["application", "document", "feed", "main", "none", "presentation", "region"]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -22787,7 +22878,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -22795,7 +22886,7 @@
 				"implicitRole": "complementary",
 				"permittedRoles": ["feed", "none", "note", "presentation", "region", "search"]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -22818,8 +22909,7 @@
 						"zeroOrMore": "track"
 					},
 					{
-						"zeroOrMore": "#transparent",
-						"notAllowedDescendants": ["audio", "video"]
+						"transparent": ":not(audio, video, :has(audio, video))"
 					}
 				],
 				"conditional": [
@@ -22830,8 +22920,7 @@
 								"zeroOrMore": "track"
 							},
 							{
-								"zeroOrMore": "#transparent",
-								"notAllowedDescendants": ["audio", "video"]
+								"transparent": ":not(audio, video, :has(audio, video))"
 							}
 						]
 					}
@@ -22845,7 +22934,7 @@
 					"role": "application"
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -22861,11 +22950,16 @@
 				"controls": {
 					"description": "If this attribute is present, the browser will offer controls to allow the user to control audio playback, including volume, seeking, and pause/resume playback."
 				},
+				"controlslist": {
+					"description": "The controlslist attribute, when specified, helps the browser select what controls to show for the audio element whenever the browser shows its own set of controls (that is, when the controls attribute is specified). The allowed values are nodownload, nofullscreen and noremoteplayback.",
+					"experimental": true,
+					"nonStandard": true
+				},
 				"crossorigin": {
-					"description": "This enumerated attribute indicates whether to use CORS to fetch the related audio file. CORS-enabled resources can be reused in the <canvas> element without being tainted. The allowed values are: anonymous Sends a cross-origin request without a credential. In other words, it sends the Origin: HTTP header without a cookie, X.509 certificate, or performing HTTP Basic authentication. If the server does not give credentials to the origin site (by not setting the Access-Control-Allow-Origin: HTTP header), the image will be tainted, and its usage restricted. use-credentials Sends a cross-origin request with a credential. In other words, it sends the Origin: HTTP header with a cookie, a certificate, or performing HTTP Basic authentication. If the server does not give credentials to the origin site (through Access-Control-Allow-Credentials: HTTP header), the image will be tainted and its usage restricted. When not present, the resource is fetched without a CORS request (i.e. without sending the Origin: HTTP header), preventing its non-tainted used in <canvas> elements. If invalid, it is handled as if the enumerated keyword anonymous was used. See CORS settings attributes for additional information."
+					"description": "This enumerated attribute indicates whether to use CORS to fetch the related audio file. CORS-enabled resources can be reused in the <canvas> element without being tainted. The allowed values are: anonymous Sends a cross-origin request without a credential. In other words, it sends the Origin: HTTP header without a cookie, X.509 certificate, or performing HTTP Basic authentication. If the server does not give credentials to the origin site (by not setting the Access-Control-Allow-Origin: HTTP header), the resource will be tainted, and its usage restricted. use-credentials Sends a cross-origin request with a credential. In other words, it sends the Origin: HTTP header with a cookie, a certificate, or performing HTTP Basic authentication. If the server does not give credentials to the origin site (through Access-Control-Allow-Credentials: HTTP header), the resource will be tainted and its usage restricted. When not present, the resource is fetched without a CORS request (i.e. without sending the Origin: HTTP header), preventing its non-tainted use in <canvas> elements. If invalid, it is handled as if the enumerated keyword anonymous was used. See CORS settings attributes for additional information."
 				},
 				"disableremoteplayback": {
-					"description": "A Boolean attribute used to disable the capability of remote playback in devices that are attached using wired (HDMI, DVI, etc.) and wireless technologies (Miracast, Chromecast, DLNA, AirPlay, etc). See this proposed specification for more information. Note: In Safari, you can use x-webkit-airplay=\"deny\" as a fallback.",
+					"description": "A Boolean attribute used to disable the capability of remote playback in devices that are attached using wired (HDMI, DVI, etc.) and wireless technologies (Miracast, Chromecast, DLNA, AirPlay, etc.). See this proposed specification for more information. Note: In Safari, you can use x-webkit-airplay=\"deny\" as a fallback.",
 					"experimental": true
 				},
 				"loop": {
@@ -22890,7 +22984,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -22899,7 +22993,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -22921,7 +23015,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -22941,7 +23035,7 @@
 		{
 			"name": "basefont",
 			"cite": "https://html.spec.whatwg.org/multipage/obsolete.html#non-conforming-features",
-			"description": "The <basefont> HTML element is deprecated. It sets a default font face, size, and color for the other elements which are descended from its parent element. With this set, the font's size can then be varied relative to the base size using the <font> element.",
+			"description": "CSS Fonts is a module of CSS that defines font-related properties and how font resources are loaded. It lets you define the style of a font, such as its family, size and weight, line height, and the glyph variants to use when multiple are available for a single character.",
 			"categories": [],
 			"contentModel": {
 				"contents": true
@@ -22950,20 +23044,10 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
-			"attributes": {
-				"color": {
-					"description": "This attribute sets the text color using either a named color or a color specified in the hexadecimal #RRGGBB format."
-				},
-				"face": {
-					"description": "This attribute contains a list of one or more font names. The document text in the default style is rendered in the first font face that the client's browser supports. If no font listed is installed on the local system, the browser typically defaults to the proportional or fixed-width font for that system."
-				},
-				"size": {
-					"description": "This attribute specifies the font size as either a numeric or relative value. Numeric values range from 1 to 7 with 1 being the smallest and 3 the default."
-				}
-			}
+			"attributes": {}
 		},
 		{
 			"name": "bdi",
@@ -22973,7 +23057,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -22982,7 +23066,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -22999,7 +23083,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -23008,7 +23092,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23033,7 +23117,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {
@@ -23063,7 +23147,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -23080,7 +23164,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -23093,7 +23177,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -23104,7 +23188,7 @@
 					"implicitRole": false
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23125,7 +23209,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -23145,7 +23229,7 @@
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23158,7 +23242,7 @@
 					"deprecated": true
 				},
 				"background": {
-					"description": "URI of a image to use as a background. Do not use this attribute! Use the CSS background property on the element instead.",
+					"description": "URI of an image to use as a background. Do not use this attribute! Use the CSS background property on the element instead.",
 					"deprecated": true
 				},
 				"bgcolor": {
@@ -23272,7 +23356,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -23289,7 +23373,7 @@
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23306,13 +23390,12 @@
 		{
 			"name": "button",
 			"cite": "https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button",
-			"description": "The <button> HTML element is an interactive element activated by a user with a mouse, keyboard, finger, voice command, or other assistive technology. Once activated, it then performs a programmable action, such as submitting a form or opening a dialog.",
+			"description": "The <button> HTML element is an interactive element activated by a user with a mouse, keyboard, finger, voice command, or other assistive technology. Once activated, it then performs an action, such as submitting a form or opening a dialog.",
 			"categories": ["#flow", "#phrasing", "#interactive", "#palpable"],
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing",
-						"notAllowedDescendants": ["#interactive"]
+						"oneOrMore": ":model(phrasing):not(:model(interactive), :has(:model(interactive)))"
 					}
 				]
 			},
@@ -23344,7 +23427,7 @@
 					]
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23379,7 +23462,7 @@
 					"description": "The URL that processes the information submitted by the button. Overrides the action attribute of the button's form owner. Does nothing if there is no form owner."
 				},
 				"formenctype": {
-					"description": "If the button is a submit button (it's inside/associated with a <form> and doesn't have type=\"button\"), specifies how to encode the form data that is submitted. Possible values: application/x-www-form-urlencoded: The default if the attribute is not used. multipart/form-data: Use to submit <input> elements with their type attributes set to file. text/plain: Specified as a debugging aid; shouldn't be used for real form submission. If this attribute is specified, it overrides the enctype attribute of the button's form owner."
+					"description": "If the button is a submit button (it's inside/associated with a <form> and doesn't have type=\"button\"), specifies how to encode the form data that is submitted. Possible values: application/x-www-form-urlencoded: The default if the attribute is not used. multipart/form-data: Used to submit <input> elements with their type attributes set to file. text/plain: Specified as a debugging aid; shouldn't be used for real form submission. If this attribute is specified, it overrides the enctype attribute of the button's form owner."
 				},
 				"formmethod": {
 					"description": "If the button is a submit button (it's inside/associated with a <form> and doesn't have type=\"button\"), this attribute specifies the HTTP method used to submit the form. Possible values: post: The data from the form are included in the body of the HTTP request when sent to the server. Use when the form contains information that shouldn't be public, like login credentials. get: The form data are appended to the form's action URL, with a ? as a separator, and the resulting URL is sent to the server. Use this method when the form has no side effects, like search forms. If specified, this attribute overrides the method attribute of the button's form owner."
@@ -23413,8 +23496,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing",
-						"notAllowedDescendants": ["#interactive"]
+						"transparent": ":not(:model(interactive), :has(:model(interactive)))"
 					}
 				]
 			},
@@ -23422,7 +23504,7 @@
 				"implicitRole": false,
 				"permittedRoles": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23435,7 +23517,7 @@
 					"defaultValue": "150"
 				},
 				"moz-opaque": {
-					"description": "Lets the canvas know whether or not translucency will be a factor. If the canvas knows there's no translucency, painting performance can be optimized. This is only supported by Mozilla-based browsers; use the standardized canvas.getContext('2d', { alpha: false }) instead.",
+					"description": "Lets the canvas know whether translucency will be a factor. If the canvas knows there's no translucency, painting performance can be optimized. This is only supported by Mozilla-based browsers; use the standardized canvas.getContext('2d', { alpha: false }) instead.",
 					"deprecated": true,
 					"nonStandard": true
 				},
@@ -23452,7 +23534,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -23467,7 +23549,7 @@
 					"implicitRole": false
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23493,7 +23575,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -23506,7 +23588,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -23515,7 +23597,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23532,7 +23614,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -23544,7 +23626,7 @@
 					"implicitRole": false
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23566,7 +23648,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23600,7 +23682,7 @@
 					"defaultValue": "1"
 				},
 				"valign": {
-					"description": "This attribute specifies the vertical alignment of the text within each cell of the column. Possible values for this attribute are: baseline, which will put the text as close to the bottom of the cell as it is possible, but align it on the baseline of the characters instead of the bottom of them. If characters are all of the size, this has the same effect as bottom. bottom, which will put the text as close to the bottom of the cell as it is possible; middle, which will center the text in the cell; and top, which will put the text as close to the top of the cell as it is possible. Note: Do not try to set the vertical-align property on a selector giving a <col> element. Because <td> elements are not descendant of the <col> element, they won't inherit it. If the table doesn't use a colspan attribute, use the td:nth-child(an+b) CSS selector where a is the total number of the columns in the table and b is the ordinal position of the column in the table. Only after this selector the vertical-align property can be used. If the table does use a colspan attribute, the effect can be achieved by combining adequate CSS attribute selectors like [colspan=n], though this is not trivial.",
+					"description": "This attribute specifies the vertical alignment of the text within each cell of the column. Possible values for this attribute are: baseline, which will put the text as close to the bottom of the cell as it is possible, but align it on the baseline of the characters instead of the bottom of them. If characters are all of the size, this has the same effect as bottom. bottom, which will put the text as close to the bottom of the cell as it is possible; middle, which will center the text in the cell; and top, which will put the text as close to the top of the cell as it is possible. Note: Do not try to set the vertical-align property on a selector giving a <col> element. Because <td> elements are not descendant of the <col> element, they won't inherit it. If the table doesn't use a colspan attribute, use the td:nth-child(an+b) CSS selector where 'a' is the total number of the columns in the table and 'b' is the ordinal position of the column in the table. Only after this selector the vertical-align property can be used. If the table does use a colspan attribute, the effect can be achieved by combining adequate CSS attribute selectors like [colspan=n], though this is not trivial.",
 					"deprecated": true
 				},
 				"width": {
@@ -23632,7 +23714,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23641,7 +23723,7 @@
 			},
 			"attributes": {
 				"align": {
-					"description": "This enumerated attribute specifies how horizontal alignment of each column cell content will be handled. Possible values are: left, aligning the content to the left of the cell center, centering the content in the cell right, aligning the content to the right of the cell justify, inserting spaces into the textual content so that the content is justified in the cell char, aligning the textual content on a special character with a minimal offset, defined by the char and charoff attributes. If this attribute is not set, the left value is assumed. The descendant <col> elements may override this value using their own align attribute. Note: Do not try to set the text-align property on a selector giving a <colgroup> element. Because <td> elements are not descendant of the <colgroup> element, they won't inherit it. If the table doesn't use a colspan attribute, use one td:nth-child(an+b) CSS selector per column, where a is the total number of the columns in the table and b is the ordinal position of this column in the table. Only after this selector the text-align property can be used. If the table does use a colspan attribute, the effect can be achieved by combining adequate CSS attribute selectors like [colspan=n], though this is not trivial.",
+					"description": "This enumerated attribute specifies how horizontal alignment of each column cell content will be handled. Possible values are: left, aligning the content to the left of the cell center, centering the content in the cell right, aligning the content to the right of the cell justify, inserting spaces into the textual content so that the content is justified in the cell char, aligning the textual content on a special character with a minimal offset, defined by the char and charoff attributes. If this attribute is not set, the left value is assumed. The descendant <col> elements may override this value using their own align attribute. Note: Do not try to set the text-align property on a selector giving a <colgroup> element. Because <td> elements are not descendant of the <colgroup> element, they won't inherit it. If the table doesn't use a colspan attribute, use one td:nth-child(an+b) CSS selector per column, where 'a' is the total number of the columns in the table and 'b' is the ordinal position of this column in the table. Only after this selector the text-align property can be used. If the table does use a colspan attribute, the effect can be achieved by combining adequate CSS attribute selectors like [colspan=n], though this is not trivial.",
 					"deprecated": true
 				},
 				"bgcolor": {
@@ -23666,7 +23748,7 @@
 					"defaultValue": "1"
 				},
 				"valign": {
-					"description": "This attribute specifies the vertical alignment of the text within each cell of the column. Possible values for this attribute are: baseline, which will put the text as close to the bottom of the cell as it is possible, but align it on the baseline of the characters instead of the bottom of them. If characters are all of the size, this has the same effect as bottom. bottom, which will put the text as close to the bottom of the cell as it is possible; middle, which will center the text in the cell; and top, which will put the text as close to the top of the cell as it is possible. Note: Do not try to set the vertical-align property on a selector giving a <colgroup> element. Because <td> elements are not descendant of the <colgroup> element, they won't inherit it. If the table doesn't use a colspan attribute, use the td:nth-child(an+b) CSS selector per column, where a is the total number of the columns in the table and b is the ordinal position of the column in the table. Only after this selector the vertical-align property can be used. If the table does use a colspan attribute, the effect can be achieved by combining adequate CSS attribute selectors like [colspan=n], though this is not trivial.",
+					"description": "This attribute specifies the vertical alignment of the text within each cell of the column. Possible values for this attribute are: baseline, which will put the text as close to the bottom of the cell as it is possible, but align it on the baseline of the characters instead of the bottom of them. If characters are all of the size, this has the same effect as bottom. bottom, which will put the text as close to the bottom of the cell as it is possible; middle, which will center the text in the cell; and top, which will put the text as close to the top of the cell as it is possible. Note: Do not try to set the vertical-align property on a selector giving a <colgroup> element. Because <td> elements are not descendant of the <colgroup> element, they won't inherit it. If the table doesn't use a colspan attribute, use the td:nth-child(an+b) CSS selector per column, where 'a' is the total number of the columns in the table and 'b' is the ordinal position of the column in the table. Only after this selector the vertical-align property can be used. If the table does use a colspan attribute, the effect can be achieved by combining adequate CSS attribute selectors like [colspan=n], though this is not trivial.",
 					"deprecated": true
 				}
 			}
@@ -23679,7 +23761,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -23688,7 +23770,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23712,12 +23794,12 @@
 						"choice": [
 							[
 								{
-									"zeroOrMore": "#phrasing"
+									"oneOrMore": ":model(phrasing)"
 								}
 							],
 							[
 								{
-									"zeroOrMore": ["option", "#script-supporting"]
+									"zeroOrMore": ["option", ":model(script-supporting)"]
 								}
 							]
 						]
@@ -23732,7 +23814,7 @@
 					"role": "listbox"
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23749,7 +23831,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -23764,7 +23846,7 @@
 					"implicitRole": "definition"
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23774,6 +23856,7 @@
 			"attributes": {
 				"nowrap": {
 					"description": "If the value of this attribute is set to yes, the definition text will not wrap. The default value is no.",
+					"deprecated": true,
 					"nonStandard": true
 				}
 			}
@@ -23786,7 +23869,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#transparent"
+						"transparent": "*"
 					}
 				]
 			},
@@ -23798,7 +23881,7 @@
 					"implicitRole": false
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23825,7 +23908,7 @@
 						"require": "summary"
 					},
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -23837,7 +23920,7 @@
 					"role": "group"
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23858,8 +23941,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing",
-						"notAllowedDescendants": ["dfn"]
+						"oneOrMore": ":model(phrasing):not(dfn, :has(dfn))"
 					}
 				]
 			},
@@ -23867,7 +23949,7 @@
 				"implicitRole": "term",
 				"permittedRoles": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23884,7 +23966,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -23896,7 +23978,7 @@
 					"role": "dialog"
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -23924,12 +24006,13 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {
 				"compact": {
-					"description": "This Boolean attribute hints that the list should be rendered in a compact style. The interpretation of this attribute depends on the user agent and it doesn't work in all browsers."
+					"description": "This Boolean attribute hints that the list should be rendered in a compact style. The interpretation of this attribute depends on the user agent and it doesn't work in all browsers.",
+					"deprecated": true
 				}
 			}
 		},
@@ -23941,7 +24024,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				],
 				"conditional": [
@@ -23949,19 +24032,19 @@
 						"condition": "dl > div",
 						"contents": [
 							{
-								"zeroOrMore": "#script-supporting"
+								"zeroOrMore": ":model(script-supporting)"
 							},
 							{
 								"oneOrMore": "dt"
 							},
 							{
-								"zeroOrMore": "#script-supporting"
+								"zeroOrMore": ":model(script-supporting)"
 							},
 							{
 								"oneOrMore": "dd"
 							},
 							{
-								"zeroOrMore": "#script-supporting"
+								"zeroOrMore": ":model(script-supporting)"
 							}
 						]
 					}
@@ -23981,7 +24064,7 @@
 					"permittedRoles": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24003,26 +24086,32 @@
 								{
 									"oneOrMore": [
 										{
-											"zeroOrMore": "#script-supporting"
+											"zeroOrMore": ":model(script-supporting)"
 										},
 										{
 											"oneOrMore": "dt"
 										},
 										{
-											"zeroOrMore": "#script-supporting"
+											"zeroOrMore": ":model(script-supporting)"
 										},
 										{
 											"oneOrMore": "dd"
 										},
 										{
-											"zeroOrMore": "#script-supporting"
+											"zeroOrMore": ":model(script-supporting)"
 										}
 									]
 								}
 							],
 							[
 								{
-									"oneOrMore": ["div", "#script-supporting"]
+									"zeroOrMore": ":model(script-supporting)"
+								},
+								{
+									"oneOrMore": "div"
+								},
+								{
+									"zeroOrMore": ":model(script-supporting)"
 								}
 							]
 						]
@@ -24033,7 +24122,7 @@
 				"implicitRole": false,
 				"permittedRoles": ["group", "list", "none", "presentation"]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24050,8 +24139,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow",
-						"notAllowedDescendants": ["header", "footer", "#sectioning", "#heading"]
+						"oneOrMore": ":model(flow):not(header, footer, :model(sectioning), :model(heading), :has(header, footer, :model(sectioning), :model(heading)))"
 					}
 				]
 			},
@@ -24062,7 +24150,7 @@
 					"implicitRole": "term"
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24079,7 +24167,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -24091,7 +24179,7 @@
 					"implicitRole": false
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24112,7 +24200,7 @@
 				"implicitRole": false,
 				"permittedRoles": ["application", "document", "img", "none", "presentation"]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24147,7 +24235,7 @@
 						"optional": "legend"
 					},
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -24155,7 +24243,7 @@
 				"implicitRole": "group",
 				"permittedRoles": ["radiogroup", "presentation", "none"]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24183,7 +24271,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -24192,7 +24280,7 @@
 				"permittedRoles": ["group", "none", "presentation"],
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24209,15 +24297,26 @@
 			"contentModel": {
 				"contents": [
 					{
-						"interleave": [
+						"choice": [
 							[
 								{
-									"optional": "figcaption"
+									"require": "figcaption"
+								},
+								{
+									"oneOrMore": ":model(flow)"
 								}
 							],
 							[
 								{
-									"zeroOrMore": "#flow"
+									"oneOrMore": ":model(flow)"
+								},
+								{
+									"require": "figcaption"
+								}
+							],
+							[
+								{
+									"oneOrMore": ":model(flow)"
 								}
 							]
 						]
@@ -24233,7 +24332,7 @@
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24254,18 +24353,21 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {
 				"color": {
-					"description": "This attribute sets the text color using either a named color or a color specified in the hexadecimal #RRGGBB format."
+					"description": "This attribute sets the text color using either a named color or a color specified in the hexadecimal #RRGGBB format.",
+					"deprecated": true
 				},
 				"face": {
-					"description": "This attribute contains a comma-separated list of one or more font names. The document text in the default style is rendered in the first font face that the client's browser supports. If no font listed is installed on the local system, the browser typically defaults to the proportional or fixed-width font for that system."
+					"description": "This attribute contains a comma-separated list of one or more font names. The document text in the default style is rendered in the first font face that the client's browser supports. If no font listed is installed on the local system, the browser typically defaults to the proportional or fixed-width font for that system.",
+					"deprecated": true
 				},
 				"size": {
-					"description": "This attribute specifies the font size as either a numeric or relative value. Numeric values range from 1 to 7 with 1 being the smallest and 3 the default. It can be defined using a relative value, like +2 or -3, which set it relative to the value of the size attribute of the <basefont> element, or relative to 3, the default value, if none does exist."
+					"description": "This attribute specifies the font size as either a numeric or relative value. Numeric values range from 1 to 7 with 1 being the smallest and 3 the default. It can be defined using a relative value, like +2 or -3, which sets it relative to 3, the default value.",
+					"deprecated": true
 				}
 			}
 		},
@@ -24277,8 +24379,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow",
-						"notAllowedDescendants": ["header", "footer"]
+						"oneOrMore": ":model(flow):not(header, footer, :has(header, footer))"
 					}
 				]
 			},
@@ -24300,7 +24401,7 @@
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24317,8 +24418,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow",
-						"notAllowedDescendants": ["form"]
+						"oneOrMore": ":model(flow):not(form, :has(form))"
 					}
 				]
 			},
@@ -24334,7 +24434,7 @@
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24343,7 +24443,7 @@
 			},
 			"attributes": {
 				"accept": {
-					"description": "Comma-separated content types the server accepts. Note: This attribute was removed in HTML5 and should not be used. Instead, use the accept attribute on <input type=file> elements.",
+					"description": "Comma-separated content types the server accepts. Note: This attribute has been deprecated and should not be used. Instead, use the accept attribute on <input type=file> elements.",
 					"deprecated": true
 				},
 				"accept-charset": {
@@ -24423,30 +24523,37 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {
 				"frameborder": {
-					"description": "This attribute allows you to specify a frame's border."
+					"description": "This attribute allows you to specify a frame's border.",
+					"deprecated": true
 				},
 				"marginheight": {
-					"description": "This attribute defines the height of the margin between frames."
+					"description": "This attribute defines the height of the margin between frames.",
+					"deprecated": true
 				},
 				"marginwidth": {
-					"description": "This attribute defines the width of the margin between frames."
+					"description": "This attribute defines the width of the margin between frames.",
+					"deprecated": true
 				},
 				"name": {
-					"description": "This attribute is used for labeling frames. Without labeling, every link will open in the frame that it's in – the closest parent frame. See the target attribute for more information."
+					"description": "This attribute is used for labeling frames. Without labeling, every link will open in the frame that it's in – the closest parent frame. See the target attribute for more information.",
+					"deprecated": true
 				},
 				"noresize": {
-					"description": "This attribute prevents resizing of frames by users."
+					"description": "This attribute prevents resizing of frames by users.",
+					"deprecated": true
 				},
 				"scrolling": {
-					"description": "This attribute defines the existence of a scrollbar. If this attribute is not used, the browser adds a scrollbar when necessary. There are two choices: \"yes\" for forcing a scrollbar even when it is not necessary and \"no\" for forcing no scrollbar even when it is necessary."
+					"description": "This attribute defines the existence of a scrollbar. If this attribute is not used, the browser adds a scrollbar when necessary. There are two choices: \"yes\" for forcing a scrollbar even when it is not necessary and \"no\" for forcing no scrollbar even when it is necessary.",
+					"deprecated": true
 				},
 				"src": {
-					"description": "This attribute specifies the document that will be displayed by the frame."
+					"description": "This attribute specifies the document that will be displayed by the frame.",
+					"deprecated": true
 				}
 			}
 		},
@@ -24462,15 +24569,17 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {
 				"cols": {
-					"description": "This attribute specifies the number and size of horizontal spaces in a frameset."
+					"description": "This attribute specifies the number and size of horizontal spaces in a frameset.",
+					"deprecated": true
 				},
 				"rows": {
-					"description": "This attribute specifies the number and size of vertical spaces in a frameset."
+					"description": "This attribute specifies the number and size of vertical spaces in a frameset.",
+					"deprecated": true
 				}
 			}
 		},
@@ -24482,7 +24591,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -24493,7 +24602,7 @@
 				},
 				"permittedRoles": ["tab", "presentation", "none"]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24510,7 +24619,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -24521,7 +24630,7 @@
 				},
 				"permittedRoles": ["tab", "presentation", "none"]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24538,7 +24647,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -24549,7 +24658,7 @@
 				},
 				"permittedRoles": ["tab", "presentation", "none"]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24566,7 +24675,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -24577,7 +24686,7 @@
 				},
 				"permittedRoles": ["tab", "presentation", "none"]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24594,7 +24703,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -24605,7 +24714,7 @@
 				},
 				"permittedRoles": ["tab", "presentation", "none"]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24622,7 +24731,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -24633,7 +24742,7 @@
 				},
 				"permittedRoles": ["tab", "presentation", "none"]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24650,15 +24759,13 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#metadata",
-						"ignore": "title"
+						"zeroOrMore": ":model(metadata):not(title)"
 					},
 					{
 						"require": "title"
 					},
 					{
-						"zeroOrMore": "#metadata",
-						"ignore": "title"
+						"zeroOrMore": ":model(metadata):not(title)"
 					}
 				]
 			},
@@ -24667,7 +24774,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24677,7 +24784,8 @@
 			"attributes": {
 				"profile": {
 					"description": "The URIs of one or more metadata profiles, separated by white space.",
-					"deprecated": true
+					"deprecated": true,
+					"nonStandard": true
 				}
 			}
 		},
@@ -24689,8 +24797,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow",
-						"notAllowedDescendants": ["header", "footer"]
+						"oneOrMore": ":model(flow):not(header, footer, :has(header, footer))"
 					}
 				]
 			},
@@ -24712,7 +24819,7 @@
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24724,22 +24831,30 @@
 		{
 			"name": "hgroup",
 			"cite": "https://developer.mozilla.org/en-US/docs/Web/HTML/Element/hgroup",
-			"description": "The <hgroup> HTML element represents a multi-level heading for a section of a document. It groups a set of <h1>–<h6> elements.",
+			"description": "The <hgroup> HTML element represents a heading and related content. It groups a single <h1>–<h6> element with one or more <p>.",
 			"categories": ["#flow", "#heading", "#palpable"],
 			"contentModel": {
 				"contents": [
 					{
-						"oneOrMore": [
-							{
-								"zeroOrMore": "#script-supporting"
-							},
-							{
-								"oneOrMore": ["h1", "h2", "h3", "h4", "h5", "h6"]
-							},
-							{
-								"zeroOrMore": "#script-supporting"
-							}
-						]
+						"zeroOrMore": ":model(script-supporting)"
+					},
+					{
+						"zeroOrMore": "p"
+					},
+					{
+						"zeroOrMore": ":model(script-supporting)"
+					},
+					{
+						"require": ["h1", "h2", "h3", "h4", "h5", "h6"]
+					},
+					{
+						"zeroOrMore": ":model(script-supporting)"
+					},
+					{
+						"zeroOrMore": "p"
+					},
+					{
+						"zeroOrMore": ":model(script-supporting)"
 					}
 				]
 			},
@@ -24751,7 +24866,7 @@
 					"implicitRole": false
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24776,7 +24891,7 @@
 					"role": "separator"
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24786,23 +24901,28 @@
 			"attributes": {
 				"align": {
 					"description": "Sets the alignment of the rule on the page. If no value is specified, the default value is left.",
-					"deprecated": true
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"color": {
 					"description": "Sets the color of the rule through color name or hexadecimal value.",
+					"deprecated": true,
 					"nonStandard": true
 				},
 				"noshade": {
 					"description": "Sets the rule to have no shading.",
-					"deprecated": true
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"size": {
 					"description": "Sets the height, in pixels, of the rule.",
-					"deprecated": true
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"width": {
 					"description": "Sets the length of the rule on the page through a pixel or percentage value.",
-					"deprecated": true
+					"deprecated": true,
+					"nonStandard": true
 				}
 			}
 		},
@@ -24826,7 +24946,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24836,7 +24956,8 @@
 			"attributes": {
 				"manifest": {
 					"description": "Specifies the URI of a resource manifest indicating resources that should be cached locally.",
-					"deprecated": true
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"version": {
 					"description": "Specifies the version of the HTML Document Type Definition that governs the current document. This attribute is not needed, because it is redundant with the version information in the document type declaration.",
@@ -24855,7 +24976,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -24864,7 +24985,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24879,17 +25000,13 @@
 			"description": "The <iframe> HTML element represents a nested browsing context, embedding another HTML page into the current one.",
 			"categories": ["#flow", "#phrasing", "#embedded", "#interactive", "#palpable"],
 			"contentModel": {
-				"contents": [
-					{
-						"zeroOrMore": "#transparent"
-					}
-				]
+				"contents": false
 			},
 			"aria": {
 				"implicitRole": false,
 				"permittedRoles": ["application", "document", "img", "none", "presentation"]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -24910,14 +25027,16 @@
 					"type": "Boolean"
 				},
 				"allowpaymentrequest": {
-					"description": "Set to true if a cross-origin <iframe> should be allowed to invoke the Payment Request API. Note: This attribute is considered a legacy attribute and redefined as allow=\"payment\"."
+					"description": "Set to true if a cross-origin <iframe> should be allowed to invoke the Payment Request API. Note: This attribute is considered a legacy attribute and redefined as allow=\"payment\".",
+					"experimental": true
 				},
 				"csp": {
 					"description": "A Content Security Policy enforced for the embedded resource. See HTMLIFrameElement.csp for details.",
 					"experimental": true
 				},
 				"fetchpriority": {
-					"description": "Provides a hint of the relative priority to use when fetching the iframe document. Allowed values: high Signals a high-priority fetch relative to other iframe documents. low Signals a low-priority fetch relative to other iframe documents. auto Default: Signals automatic determination of fetch priority relative to other iframe documents."
+					"description": "Provides a hint of the relative priority to use when fetching the iframe document. Allowed values: high Signals a high-priority fetch relative to other iframe documents. low Signals a low-priority fetch relative to other iframe documents. auto Default: Signals automatic determination of fetch priority relative to other iframe documents.",
+					"experimental": true
 				},
 				"frameborder": {
 					"description": "The value 1 (the default) draws a border around this frame. The value 0 removes the border around this frame, but you should instead use the CSS property border to control <iframe> borders.",
@@ -25061,7 +25180,7 @@
 					]
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -25097,7 +25216,7 @@
 					"experimental": true
 				},
 				"height": {
-					"description": "The intrinsic height of the image, in pixels. Must be an integer without a unit."
+					"description": "The intrinsic height of the image, in pixels. Must be an integer without a unit. Note: Including height and width enables the aspect ratio of the image to be calculated by the browser prior to the image being loaded. This aspect ratio is used to reserve the space needed to display the image, reducing or even preventing a layout shift when the image is downloaded and painted to the screen. Reducing layout shift is a major component of good user experience and web performance."
 				},
 				"hspace": {
 					"description": "The number of pixels of white space on the left and right of the image. Use the margin CSS property instead.",
@@ -25108,7 +25227,7 @@
 					"condition": "a[href] img"
 				},
 				"loading": {
-					"description": "Indicates how the browser should load the image: eager: Loads the image immediately, regardless of whether or not the image is currently within the visible viewport (this is the default value). lazy: Defers loading the image until it reaches a calculated distance from the viewport, as defined by the browser. The intent is to avoid the network and storage bandwidth needed to handle the image until it's reasonably certain that it will be needed. This generally improves the performance of the content in most typical use cases. Note: Loading is only deferred when JavaScript is enabled. This is an anti-tracking measure, because if a user agent supported lazy loading when scripting is disabled, it would still be possible for a site to track a user's approximate scroll position throughout a session, by strategically placing images in a page's markup such that a server can track how many images are requested and when."
+					"description": "Indicates how the browser should load the image: eager Loads the image immediately, regardless of whether or not the image is currently within the visible viewport (this is the default value). lazy Defers loading the image until it reaches a calculated distance from the viewport, as defined by the browser. The intent is to avoid the network and storage bandwidth needed to handle the image until it's reasonably certain that it will be needed. This generally improves the performance of the content in most typical use cases. Note: Loading is only deferred when JavaScript is enabled. This is an anti-tracking measure, because if a user agent supported lazy loading when scripting is disabled, it would still be possible for a site to track a user's approximate scroll position throughout a session, by strategically placing images in a page's markup such that a server can track how many images are requested and when."
 				},
 				"longdesc": {
 					"description": "A link to a more detailed description of the image. Possible values are a URL or an element id. Note: This attribute is mentioned in the latest W3C version, HTML 5.2, but has been removed from the WHATWG's HTML Living Standard. It has an uncertain future; authors should use a WAI-ARIA alternative such as aria-describedby or aria-details.",
@@ -25129,7 +25248,7 @@
 					"required": true
 				},
 				"srcset": {
-					"description": "One or more strings separated by commas, indicating possible image sources for the user agent to use. Each string is composed of: A URL to an image Optionally, whitespace followed by one of: A width descriptor (a positive integer directly followed by w). The width descriptor is divided by the source size given in the sizes attribute to calculate the effective pixel density. A pixel density descriptor (a positive floating point number directly followed by x). If no descriptor is specified, the source is assigned the default descriptor of 1x. It is incorrect to mix width descriptors and pixel density descriptors in the same srcset attribute. Duplicate descriptors (for instance, two sources in the same srcset which are both described with 2x) are also invalid. The user agent selects any of the available sources at its discretion. This provides them with significant leeway to tailor their selection based on things like user preferences or bandwidth conditions. See our Responsive images tutorial for an example."
+					"description": "One or more strings separated by commas, indicating possible image sources for the user agent to use. Each string is composed of: A URL to an image Optionally, whitespace followed by one of: A width descriptor (a positive integer directly followed by w). The width descriptor is divided by the source size given in the sizes attribute to calculate the effective pixel density. A pixel density descriptor (a positive floating point number directly followed by x). If no descriptor is specified, the source is assigned the default descriptor of 1x. It is incorrect to mix width descriptors and pixel density descriptors in the same srcset attribute. Duplicate descriptors (for instance, two sources in the same srcset which are both described with 2x) are also invalid. If the srcset attribute uses width descriptors, the sizes attribute must also be present, or the srcset itself will be ignored. The user agent selects any of the available sources at its discretion. This provides them with significant leeway to tailor their selection based on things like user preferences or bandwidth conditions. See our Responsive images tutorial for an example."
 				},
 				"usemap": {
 					"type": "HashName",
@@ -25177,7 +25296,7 @@
 						"properties": {
 							"global": true,
 							"role": true,
-							"whithout": [
+							"without": [
 								{
 									"type": "must-not",
 									"name": "aria-checked",
@@ -25195,7 +25314,7 @@
 						"properties": {
 							"global": true,
 							"role": true,
-							"whithout": [
+							"without": [
 								{
 									"type": "must-not",
 									"name": "aria-checked",
@@ -25283,7 +25402,7 @@
 						"properties": {
 							"global": true,
 							"role": true,
-							"whithout": [
+							"without": [
 								{
 									"type": "must-not",
 									"name": "aria-checked",
@@ -25301,7 +25420,7 @@
 						"properties": {
 							"global": true,
 							"role": "slider",
-							"whithout": [
+							"without": [
 								{
 									"type": "should-not",
 									"name": "aria-valuemax"
@@ -25351,7 +25470,7 @@
 						"properties": {
 							"global": true,
 							"role": "combobox",
-							"whithout": [
+							"without": [
 								{
 									"type": "should-not",
 									"name": "aria-haspopup"
@@ -25407,7 +25526,7 @@
 							"properties": {
 								"global": true,
 								"role": true,
-								"whithout": [
+								"without": [
 									{
 										"type": "should-not",
 										"name": "aria-checked",
@@ -25425,7 +25544,7 @@
 							"properties": {
 								"global": true,
 								"role": true,
-								"whithout": [
+								"without": [
 									{
 										"type": "should-not",
 										"name": "aria-hecked"
@@ -25516,7 +25635,7 @@
 							"properties": {
 								"global": true,
 								"role": true,
-								"whithout": [
+								"without": [
 									{
 										"type": "should-not",
 										"name": "aria-checked",
@@ -25534,7 +25653,7 @@
 							"properties": {
 								"global": true,
 								"role": "slider",
-								"whithout": [
+								"without": [
 									{
 										"type": "should-not",
 										"name": "aria-valuemax"
@@ -25584,7 +25703,7 @@
 							"properties": {
 								"global": true,
 								"role": "combobox",
-								"whithout": [
+								"without": [
 									{
 										"type": "should-not",
 										"name": "aria-haspopup"
@@ -25619,7 +25738,7 @@
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -25678,7 +25797,7 @@
 					]
 				},
 				"autocorrect": {
-					"description": "(Safari only). A string which indicates whether or not to activate automatic correction while the user is editing this field. Permitted values are: on Enable automatic correction of typos, as well as processing of text substitutions if any are configured. off Disable automatic correction and text substitutions.",
+					"description": "(Safari only). A string which indicates whether to activate automatic correction while the user is editing this field. Permitted values are: on Enable automatic correction of typos, as well as processing of text substitutions if any are configured. off Disable automatic correction and text substitutions.",
 					"nonStandard": true
 				},
 				"autofocus": {
@@ -25964,7 +26083,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#transparent"
+						"transparent": "*"
 					}
 				]
 			},
@@ -25976,7 +26095,7 @@
 					"implicitRole": false
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26004,7 +26123,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -26017,7 +26136,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -26026,7 +26145,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26047,7 +26166,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {
@@ -26079,8 +26198,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing",
-						"notAllowedDescendants": ["label"]
+						"oneOrMore": ":model(phrasing):not(label, :has(label))"
 					}
 				]
 			},
@@ -26089,7 +26207,7 @@
 				"permittedRoles": false,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26110,7 +26228,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#phrasing", "#heading"]
+						"zeroOrMore": [":model(phrasing)", ":model(heading)"]
 					}
 				]
 			},
@@ -26119,7 +26237,7 @@
 				"permittedRoles": false,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26136,7 +26254,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -26155,7 +26273,7 @@
 					"treeitem"
 				]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26165,7 +26283,8 @@
 			"attributes": {
 				"type": {
 					"description": "This character attribute indicates the numbering type: a: lowercase letters A: uppercase letters i: lowercase Roman numerals I: uppercase Roman numerals 1: numbers This type overrides the one used by its parent <ol> element, if any. Note: This attribute has been deprecated; use the CSS list-style-type property instead.",
-					"deprecated": true
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"value": {
 					"type": "Int",
@@ -26186,7 +26305,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26253,7 +26372,8 @@
 					"type": "Boolean"
 				},
 				"fetchpriority": {
-					"description": "Provides a hint of the relative priority to use when fetching a preloaded resource. Allowed values: high Signals a high-priority fetch relative to other resources of the same type. low Signals a low-priority fetch relative to other resources of the same type. auto Default: Signals automatic determination of fetch priority relative to other resources of the same type."
+					"description": "Provides a hint of the relative priority to use when fetching a preloaded resource. Allowed values: high Signals a high-priority fetch relative to other resources of the same type. low Signals a low-priority fetch relative to other resources of the same type. auto Default: Signals automatic determination of fetch priority relative to other resources of the same type.",
+					"experimental": true
 				},
 				"href": {
 					"description": "This attribute specifies the URL of the linked resource. A URL can be absolute or relative."
@@ -26278,10 +26398,11 @@
 					"requiredEither": ["rel"]
 				},
 				"media": {
-					"description": "This attribute specifies the media that the linked resource applies to. Its value must be a media type / media query. This attribute is mainly useful when linking to external stylesheets — it allows the user agent to pick the best adapted one for the device it runs on. Note: In HTML 4, this can only be a simple white-space-separated list of media description literals, i.e., media types and groups, where defined and allowed as values for this attribute, such as print, screen, aural, braille. HTML5 extended this to any kind of media queries, which are a superset of the allowed values of HTML 4. Browsers not supporting CSS3 Media Queries won't necessarily recognize the adequate link; do not forget to set fallback links, the restricted set of media queries defined in HTML 4."
+					"description": "This attribute specifies the media that the linked resource applies to. Its value must be a media type / media query. This attribute is mainly useful when linking to external stylesheets — it allows the user agent to pick the best adapted one for the device it runs on. Note: In HTML 4, this can only be a simple white-space-separated list of media description literals, i.e., media types and groups, where defined and allowed as values for this attribute, such as print, screen, aural, braille. HTML5 extended this to any kind of media queries, which are a superset of the allowed values of HTML 4. Browsers not supporting CSS Media Queries won't necessarily recognize the adequate link; do not forget to set fallback links, the restricted set of media queries defined in HTML 4."
 				},
 				"methods": {
 					"description": "The value of this attribute provides information about the functions that might be performed on an object. The values generally are given by the HTTP protocol when it is used, but it might (for similar reasons as for the title attribute) be useful to include advisory information in advance in the link. For example, the browser might choose a different rendering of a link as a function of the methods specified; something that is searchable might get a different icon, or an outside link might render with an indication of leaving the current site. This attribute is not well understood nor supported, even by the defining browser, Internet Explorer 4.",
+					"deprecated": true,
 					"nonStandard": true
 				},
 				"prefetch": {
@@ -26289,8 +26410,7 @@
 					"experimental": true
 				},
 				"referrerpolicy": {
-					"description": "A string indicating which referrer to use when fetching the resource: no-referrer means that the Referer header will not be sent. no-referrer-when-downgrade means that no Referer header will be sent when navigating to an origin without TLS (HTTPS). This is a user agent's default behavior, if no policy is otherwise specified. origin means that the referrer will be the origin of the page, which is roughly the scheme, the host, and the port. origin-when-cross-origin means that navigating to other origins will be limited to the scheme, the host, and the port, while navigating on the same origin will include the referrer's path. unsafe-url means that the referrer will include the origin and the path (but not the fragment, password, or username). This case is unsafe because it can leak origins and paths from TLS-protected resources to insecure origins.",
-					"experimental": true
+					"description": "A string indicating which referrer to use when fetching the resource: no-referrer means that the Referer header will not be sent. no-referrer-when-downgrade means that no Referer header will be sent when navigating to an origin without TLS (HTTPS). This is a user agent's default behavior, if no policy is otherwise specified. origin means that the referrer will be the origin of the page, which is roughly the scheme, the host, and the port. origin-when-cross-origin means that navigating to other origins will be limited to the scheme, the host, and the port, while navigating on the same origin will include the referrer's path. unsafe-url means that the referrer will include the origin and the path (but not the fragment, password, or username). This case is unsafe because it can leak origins and paths from TLS-protected resources to insecure origins."
 				},
 				"rel": {
 					"type": [
@@ -26325,7 +26445,7 @@
 					"requiredEither": ["itemprop"]
 				},
 				"rev": {
-					"description": "The value of this attribute shows the relationship of the current document to the linked document, as defined by the href attribute. The attribute thus defines the reverse relationship compared to the value of the rel attribute. Link type values for the attribute are similar to the possible values for rel. Note: Instead of rev, you should use the rel attribute with the opposite link type value. For example, to establish the reverse link for made, specify author. Also this attribute doesn't stand for \"revision\" and must not be used with a version number, even though many sites misuse it in this way.",
+					"description": "The value of this attribute shows the relationship of the current document to the linked document, as defined by the href attribute. The attribute thus defines the reverse relationship compared to the value of the rel attribute. Link type values for the attribute are similar to the possible values for rel. Note: Instead of rev, you should use the rel attribute with the opposite link type value. For example, to establish the reverse link for made, specify author. Also, this attribute doesn't stand for \"revision\" and must not be used with a version number, even though many sites misuse it in this way.",
 					"obsolete": true,
 					"deprecated": true
 				},
@@ -26341,7 +26461,7 @@
 				},
 				"target": {
 					"description": "Defines the frame or window name that has the defined linking relationship or that will show the rendering of any linked resource.",
-					"nonStandard": true
+					"deprecated": true
 				},
 				"title": {
 					"description": "The title attribute has special semantics on the <link> element. When used on a <link rel=\"stylesheet\"> it defines a default or an alternate stylesheet."
@@ -26363,7 +26483,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -26376,7 +26496,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -26388,7 +26508,7 @@
 					"role": "main"
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26405,7 +26525,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#transparent"
+						"transparent": "*"
 					}
 				]
 			},
@@ -26414,7 +26534,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26430,12 +26550,12 @@
 		{
 			"name": "mark",
 			"cite": "https://developer.mozilla.org/en-US/docs/Web/HTML/Element/mark",
-			"description": "The <mark> HTML element represents text which is marked or highlighted for reference or notation purposes, due to the marked passage's relevance or importance in the enclosing context.",
+			"description": "The <mark> HTML element represents text which is marked or highlighted for reference or notation purposes due to the marked passage's relevance in the enclosing context.",
 			"categories": ["#flow", "#phrasing", "#palpable"],
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -26444,7 +26564,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26465,49 +26585,60 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {
 				"behavior": {
-					"description": "Sets how the text is scrolled within the marquee. Possible values are scroll, slide and alternate. If no value is specified, the default value is scroll."
+					"description": "Sets how the text is scrolled within the marquee. Possible values are scroll, slide and alternate. If no value is specified, the default value is scroll.",
+					"deprecated": true
 				},
 				"bgcolor": {
-					"description": "Sets the background color through color name or hexadecimal value."
+					"description": "Sets the background color through color name or hexadecimal value.",
+					"deprecated": true
 				},
 				"direction": {
-					"description": "Sets the direction of the scrolling within the marquee. Possible values are left, right, up and down. If no value is specified, the default value is left."
+					"description": "Sets the direction of the scrolling within the marquee. Possible values are left, right, up and down. If no value is specified, the default value is left.",
+					"deprecated": true
 				},
 				"height": {
-					"description": "Sets the height in pixels or percentage value."
+					"description": "Sets the height in pixels or percentage value.",
+					"deprecated": true
 				},
 				"hspace": {
-					"description": "Sets the horizontal margin"
+					"description": "Sets the horizontal margin",
+					"deprecated": true
 				},
 				"loop": {
-					"description": "Sets the number of times the marquee will scroll. If no value is specified, the default value is −1, which means the marquee will scroll continuously."
+					"description": "Sets the number of times the marquee will scroll. If no value is specified, the default value is −1, which means the marquee will scroll continuously.",
+					"deprecated": true
 				},
 				"scrollamount": {
-					"description": "Sets the amount of scrolling at each interval in pixels. The default value is 6."
+					"description": "Sets the amount of scrolling at each interval in pixels. The default value is 6.",
+					"deprecated": true
 				},
 				"scrolldelay": {
-					"description": "Sets the interval between each scroll movement in milliseconds. The default value is 85. Note that any value smaller than 60 is ignored and the value 60 is used instead, unlesstruespeedis specified."
+					"description": "Sets the interval between each scroll movement in milliseconds. The default value is 85. Note that any value smaller than 60 is ignored and the value 60 is used instead unless truespeed is specified.",
+					"deprecated": true
 				},
 				"truespeed": {
-					"description": "By default,scrolldelayvalues lower than 60 are ignored. Iftruespeedis present, those values are not ignored."
+					"description": "By default, scrolldelay values lower than 60 are ignored. If truespeed is present, those values are not ignored.",
+					"deprecated": true
 				},
 				"vspace": {
-					"description": "Sets the vertical margin in pixels or percentage value."
+					"description": "Sets the vertical margin in pixels or percentage value.",
+					"deprecated": true
 				},
 				"width": {
-					"description": "Sets the width in pixels or percentage value."
+					"description": "Sets the width in pixels or percentage value.",
+					"deprecated": true
 				}
 			}
 		},
 		{
 			"name": "math",
 			"cite": "https://developer.mozilla.org/en-US/docs/Web/HTML/Element/math",
-			"description": "The top-level element in MathML is <math>. Every valid MathML instance must be wrapped in <math> tags. In addition you must not nest a second <math> element in another, but you can have an arbitrary number of other child elements in it.",
+			"description": "The <math> MathML element is the top-level MathML element, used to write a single mathematical formula. It can be placed in HTML content where flow content is permitted.",
 			"categories": [],
 			"contentModel": {
 				"contents": true
@@ -26520,21 +26651,25 @@
 					"role": "math"
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true
 			},
-			"attributes": {}
+			"attributes": {
+				"display": {
+					"description": "This enumerated attribute specifies how the enclosed MathML markup should be rendered. It can have one of the following values: block, which means that this element will be displayed in its own block outside the current span of text and with math-style set to normal. inline, which means that this element will be displayed inside the current span of text and with math-style set to compact. If not present, its default value is inline."
+				}
+			}
 		},
 		{
 			"name": "menu",
 			"cite": "https://developer.mozilla.org/en-US/docs/Web/HTML/Element/menu",
-			"description": "The <menu> HTML element is a semantic alternative to <ul>. It represents an unordered list of items (represented by <li> elements), each of which represents a link or other command that the user can activate.",
+			"description": "The <menu> HTML element is described in the HTML specification as a semantic alternative to <ul>, but treated by browsers (and exposed through the accessibility tree) as no different than <ul>. It represents an unordered list of items (which are represented by <li> elements).",
 			"categories": ["#flow", "#palpable"],
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["li", "#script-supporting"]
+						"zeroOrMore": ["li", ":model(script-supporting)"]
 					}
 				]
 			},
@@ -26572,7 +26707,7 @@
 					]
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26593,33 +26728,47 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {
 				"checked": {
-					"description": "Boolean attribute which indicates whether the command is selected. May only be used when the type attribute is checkbox or radio."
+					"description": "Boolean attribute which indicates whether the command is selected. May only be used when the type attribute is checkbox or radio.",
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"command": {
-					"description": "Specifies the ID of a separate element, indicating a command to be invoked indirectly. May not be used within a menu item that also includes the attributes checked, disabled, icon, label, radiogroup or type."
+					"description": "Specifies the ID of a separate element, indicating a command to be invoked indirectly. May not be used within a menu item that also includes the attributes checked, disabled, icon, label, radiogroup or type.",
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"default": {
-					"description": "This Boolean attribute indicates use of the same command as the menu's subject element (such as a button or input)."
+					"description": "This Boolean attribute indicates use of the same command as the menu's subject element (such as a button or input).",
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"disabled": {
-					"description": "Boolean attribute which indicates that the command is not available in the current state. Note that disabled is distinct from hidden; the disabled attribute is appropriate in any context where a change in circumstances might render the command relevant."
+					"description": "Boolean attribute which indicates that the command is not available in the current state. Note that disabled is distinct from hidden; the disabled attribute is appropriate in any context where a change in circumstances might render the command relevant.",
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"icon": {
-					"description": "Image URL, used to provide a picture to represent the command."
+					"description": "Image URL, used to provide a picture to represent the command.",
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"label": {
 					"description": "The name of the command as shown to the user. Required when a command attribute is not present."
 				},
 				"radiogroup": {
-					"description": "This attribute specifies the name of a group of commands to be toggled as radio buttons when selected. May only be used where the type attribute is radio."
+					"description": "This attribute specifies the name of a group of commands to be toggled as radio buttons when selected. May only be used where the type attribute is radio.",
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"type": {
-					"description": "This attribute indicates the kind of command, and can be one of three values. command: A regular command with an associated action. This is the missing value default. checkbox: Represents a command that can be toggled between two different states. radio: Represent one selection from a group of commands that can be toggled as radio buttons."
+					"description": "This attribute indicates the kind of command, and can be one of three values. command: A regular command with an associated action. This is the missing value default. checkbox: Represents a command that can be toggled between two different states. radio: Represent one selection from a group of commands that can be toggled as radio buttons.",
+					"deprecated": true,
+					"nonStandard": true
 				}
 			}
 		},
@@ -26636,7 +26785,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26692,8 +26841,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing",
-						"notAllowedDescendants": ["meter"]
+						"oneOrMore": ":model(phrasing):not(meter, :has(meter))"
 					}
 				]
 			},
@@ -26702,7 +26850,7 @@
 				"permittedRoles": false,
 				"properties": {
 					"global": true,
-					"whithout": [
+					"without": [
 						{
 							"type": "should-not",
 							"name": "aria-valuemax"
@@ -26714,7 +26862,7 @@
 					]
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26754,7 +26902,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -26767,7 +26915,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -26778,7 +26926,7 @@
 					"permittedRoles": ["menu", "menubar", "tablist"]
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26799,7 +26947,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -26816,7 +26964,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -26833,7 +26981,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -26850,7 +26998,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -26863,7 +27011,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"transparent": ":not(noscript)"
 					}
 				]
 			},
@@ -26872,7 +27020,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26889,7 +27037,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -26897,7 +27045,7 @@
 				"implicitRole": false,
 				"permittedRoles": ["application", "document", "img"]
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -26932,14 +27080,14 @@
 					"requiredEither": ["type"]
 				},
 				"declare": {
-					"description": "The presence of this Boolean attribute makes this element a declaration only. The object must be instantiated by a subsequent <object> element. In HTML5, repeat the <object> element completely each time that the resource is reused.",
+					"description": "The presence of this Boolean attribute makes this element a declaration only. The object must be instantiated by a subsequent <object> element. Repeat the <object> element completely each time the resource is reused.",
 					"deprecated": true
 				},
 				"form": {
 					"description": "The form element, if any, that the object element is associated with (its form owner). The value of the attribute must be an ID of a <form> element in the same document."
 				},
 				"height": {
-					"description": "The height of the displayed resource, in CSS pixels. -- (Absolute values only. NO percentages)"
+					"description": "The height of the displayed resource, in CSS pixels. — (Absolute values only. NO percentages)"
 				},
 				"name": {
 					"type": "BrowsingContextName"
@@ -26956,7 +27104,7 @@
 					"description": "A hash-name reference to a <map> element; that is a '#' followed by the value of a name of a map element."
 				},
 				"width": {
-					"description": "The width of the display resource, in CSS pixels. -- (Absolute values only. NO percentages)"
+					"description": "The width of the display resource, in CSS pixels. — (Absolute values only. NO percentages)"
 				}
 			}
 		},
@@ -26968,7 +27116,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["li", "#script-supporting"]
+						"zeroOrMore": ["li", ":model(script-supporting)"]
 					}
 				]
 			},
@@ -27006,7 +27154,7 @@
 					]
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27050,7 +27198,7 @@
 					"role": "group"
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27108,7 +27256,7 @@
 				"properties": {
 					"global": true,
 					"role": "option",
-					"whithout": [
+					"without": [
 						{
 							"type": "should-not",
 							"name": "aria-selected"
@@ -27116,7 +27264,7 @@
 					]
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27147,7 +27295,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -27155,7 +27303,7 @@
 				"implicitRole": "status",
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27183,7 +27331,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -27195,7 +27343,7 @@
 					"implicitRole": false
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27216,7 +27364,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {
@@ -27246,19 +27394,19 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#script-supporting"
+						"zeroOrMore": ":model(script-supporting)"
 					},
 					{
 						"zeroOrMore": "source"
 					},
 					{
-						"zeroOrMore": "#script-supporting"
+						"zeroOrMore": ":model(script-supporting)"
 					},
 					{
 						"require": "img"
 					},
 					{
-						"zeroOrMore": "#script-supporting"
+						"zeroOrMore": ":model(script-supporting)"
 					}
 				]
 			},
@@ -27277,7 +27425,7 @@
 					"properties": false
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27298,7 +27446,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -27311,7 +27459,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#transparent"
+						"transparent": "*"
 					}
 				]
 			},
@@ -27319,7 +27467,7 @@
 				"implicitRole": false,
 				"permittedRoles": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27345,7 +27493,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -27354,7 +27502,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27369,10 +27517,12 @@
 				},
 				"width": {
 					"description": "Contains the preferred count of characters that a line should have. Though technically still implemented, this attribute has no visual effect; to achieve such an effect, use CSS width instead.",
-					"deprecated": true
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"wrap": {
 					"description": "Is a hint indicating how the overflow must happen. In modern browser this hint is ignored and no visual effect results in its present; to achieve such an effect, use CSS white-space instead.",
+					"deprecated": true,
 					"nonStandard": true
 				}
 			}
@@ -27385,8 +27535,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing",
-						"notAllowedDescendants": ["progress"]
+						"oneOrMore": ":model(phrasing):not(progress, :has(progress))"
 					}
 				]
 			},
@@ -27396,7 +27545,7 @@
 				"properties": {
 					"global": true,
 					"role": "progressbar",
-					"whithout": [
+					"without": [
 						{
 							"type": "should-not",
 							"name": "aria-valuemax"
@@ -27404,7 +27553,7 @@
 					]
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27428,8 +27577,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing",
-						"notAllowedDescendants": ["progress"]
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -27438,7 +27586,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27463,7 +27611,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -27476,8 +27624,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing",
-						"notAllowedDescendants": ["progress"]
+						"oneOrMore": "#text"
 					}
 				]
 			},
@@ -27485,7 +27632,7 @@
 				"implicitRole": false,
 				"permittedRoles": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27502,7 +27649,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -27511,7 +27658,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27532,7 +27679,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -27547,8 +27694,7 @@
 					{
 						"oneOrMore": [
 							{
-								"require": "#phrasing",
-								"notAllowedDescendants": ["ruby"]
+								"require": ":model(phrasing):not(ruby, :has(ruby))"
 							},
 							{
 								"choice": [
@@ -27586,7 +27732,7 @@
 				"implicitRole": false,
 				"permittedRoles": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27603,7 +27749,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -27612,7 +27758,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27629,7 +27775,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -27638,7 +27784,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27664,7 +27810,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27696,14 +27842,16 @@
 					"ineffective": ["[type='module' i]", ":not([src])", "[async]"]
 				},
 				"fetchpriority": {
-					"description": "Provides a hint of the relative priority to use when fetching an external script. Allowed values: high Signals a high-priority fetch relative to other external scripts. low Signals a low-priority fetch relative to other external scripts. auto Default: Signals automatic determination of fetch priority relative to other external scripts."
+					"description": "Provides a hint of the relative priority to use when fetching an external script. Allowed values: high Signals a high-priority fetch relative to other external scripts. low Signals a low-priority fetch relative to other external scripts. auto Default: Signals automatic determination of fetch priority relative to other external scripts.",
+					"experimental": true
 				},
 				"integrity": {
 					"condition": "[src]"
 				},
 				"language": {
 					"description": "Like the type attribute, this attribute identifies the scripting language in use. Unlike the type attribute, however, this attribute's possible values were never standardized. The type attribute should be used instead.",
-					"deprecated": true
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"nomodule": {
 					"type": "Boolean",
@@ -27722,7 +27870,7 @@
 					"type": [
 						"MIMEType",
 						{
-							"enum": ["module"],
+							"enum": ["module", "importmap"],
 							"caseInsensitive": true
 						}
 					]
@@ -27737,7 +27885,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -27794,7 +27942,7 @@
 					]
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27821,7 +27969,7 @@
 				"properties": {
 					"global": true,
 					"role": ["combobox", "menu"],
-					"whithout": [
+					"without": [
 						{
 							"type": "should-not",
 							"name": "aria-multiselectable"
@@ -27835,7 +27983,7 @@
 						"properties": {
 							"global": true,
 							"role": "listbox",
-							"whithout": [
+							"without": [
 								{
 									"type": "should-not",
 									"name": "aria-multiselectable"
@@ -27845,7 +27993,7 @@
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27891,7 +28039,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#transparent"
+						"transparent": "*"
 					}
 				]
 			},
@@ -27900,7 +28048,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27921,7 +28069,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -27930,7 +28078,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27942,7 +28090,7 @@
 		{
 			"name": "source",
 			"cite": "https://developer.mozilla.org/en-US/docs/Web/HTML/Element/source",
-			"description": "The <source> HTML element specifies multiple media resources for the <picture>, the <audio> element, or the <video> element. It is an empty element, meaning that it has no content and does not have a closing tag. It is commonly used to offer the same media content in multiple file formats in order to provide compatibility with a broad range of browsers given their differing support for image file formats and media file formats.",
+			"description": "The <source> HTML element specifies multiple media resources for the <picture>, the <audio> element, or the <video> element. It is a void element, meaning that it has no content and does not have a closing tag. It is commonly used to offer the same media content in multiple file formats in order to provide compatibility with a broad range of browsers given their differing support for image file formats and media file formats.",
 			"categories": [],
 			"contentModel": {
 				"contents": false
@@ -27952,7 +28100,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -27989,7 +28137,7 @@
 		{
 			"name": "spacer",
 			"cite": "https://html.spec.whatwg.org/multipage/obsolete.html#non-conforming-features",
-			"description": "The <spacer> HTML element is an obsolete HTML element which allowed insertion of empty spaces on pages. It was devised by Netscape to accomplish the same effect as a single-pixel layout image, which was something web designers used to use to add white spaces to web pages without actually using an image. However, <spacer> no longer supported by any major browser and the same effects can now be achieved using simple CSS.",
+			"description": "The <spacer> HTML element is an obsolete HTML element which allowed insertion of empty spaces on pages. It was devised by Netscape to accomplish the same effect as a single-pixel layout image, which was something web designers used to use to add white spaces to web pages without actually using an image. However, <spacer> is no longer supported by any major browser and the same effects can now be achieved using simple CSS.",
 			"categories": [],
 			"contentModel": {
 				"contents": true
@@ -27998,7 +28146,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {
@@ -28027,7 +28175,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -28036,7 +28184,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28057,7 +28205,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -28070,7 +28218,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -28082,7 +28230,7 @@
 					"implicitRole": false
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28108,7 +28256,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28144,7 +28292,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -28156,7 +28304,7 @@
 					"implicitRole": false
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28176,12 +28324,12 @@
 						"choice": [
 							[
 								{
-									"zeroOrMore": "#phrasing"
+									"oneOrMore": ":model(phrasing)"
 								}
 							],
 							[
 								{
-									"require": "#heading"
+									"require": ":model(heading)"
 								}
 							]
 						]
@@ -28196,7 +28344,7 @@
 					"role": "button"
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28213,7 +28361,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -28225,7 +28373,7 @@
 					"implicitRole": false
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28242,25 +28390,25 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#script-supporting"
+						"zeroOrMore": ":model(script-supporting)"
 					},
 					{
 						"optional": "caption"
 					},
 					{
-						"zeroOrMore": "#script-supporting"
+						"zeroOrMore": ":model(script-supporting)"
 					},
 					{
 						"zeroOrMore": "colgroup"
 					},
 					{
-						"zeroOrMore": "#script-supporting"
+						"zeroOrMore": ":model(script-supporting)"
 					},
 					{
 						"optional": "thead"
 					},
 					{
-						"zeroOrMore": "#script-supporting"
+						"zeroOrMore": ":model(script-supporting)"
 					},
 					{
 						"choice": [
@@ -28277,13 +28425,13 @@
 						]
 					},
 					{
-						"zeroOrMore": "#script-supporting"
+						"zeroOrMore": ":model(script-supporting)"
 					},
 					{
 						"optional": "tfoot"
 					},
 					{
-						"zeroOrMore": "#script-supporting"
+						"zeroOrMore": ":model(script-supporting)"
 					}
 				]
 			},
@@ -28291,7 +28439,7 @@
 				"implicitRole": "table",
 				"permittedRoles": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28353,7 +28501,7 @@
 				"implicitRole": "rowgroup",
 				"permittedRoles": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28391,7 +28539,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow"
+						"oneOrMore": ":model(flow)"
 					}
 				]
 			},
@@ -28399,18 +28547,18 @@
 				"implicitRole": false,
 				"permittedRoles": true,
 				"conditions": {
-					"table:is(:not([role]), [role=table]) > :is(thead, tfoot, tbody) > tr > td": {
+					"table:is(:not([role]), [role=table]) > :is(thead, tfoot, tbody) > tr > td, table:is(:not([role]), [role=table]) > tr > td": {
 						"implicitRole": "cell"
 					},
-					"table:is([role=grid], [role=treegrid]) > :is(thead, tfoot, tbody) > tr > td": {
+					"table:is([role=grid], [role=treegrid]) > :is(thead, tfoot, tbody) > tr > td, table:is([role=grid], [role=treegrid]) > tr > td": {
 						"implicitRole": "gridcell"
 					},
-					"table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > :is(thead, tfoot, tbody) > tr > td": {
+					"table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > :is(thead, tfoot, tbody) > tr > td, table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > tr > td": {
 						"permittedRoles": false
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28424,7 +28572,7 @@
 					"deprecated": true
 				},
 				"align": {
-					"description": "This enumerated attribute specifies how the cell content's horizontal alignment will be handled. Possible values are: left: The content is aligned to the left of the cell. center: The content is centered in the cell. right: The content is aligned to the right of the cell. justify (with text only): The content is stretched out inside the cell so that it covers its entire width. char (with text only): The content is aligned to a character inside the <th> element with minimal offset. This character is defined by the char and charoff attributes Unimplemented (see bug 2212). The default value when this attribute is not specified is left. Note: To achieve the same effect as the left, center, right or justify values, apply the CSS text-align property to the element. To achieve the same effect as the char value, give the text-align property the same value you would use for the char. Unimplemented in CSS3.",
+					"description": "This enumerated attribute specifies how the cell content's horizontal alignment will be handled. Possible values are: left: The content is aligned to the left of the cell. center: The content is centered in the cell. right: The content is aligned to the right of the cell. justify (with text only): The content is stretched out inside the cell so that it covers its entire width. char (with text only): The content is aligned to a character inside the <th> element with minimal offset. This character is defined by the char and charoff attributes Unimplemented (see bug 2212). The default value when this attribute is not specified is left. Note: To achieve the same effect as the left, center, right or justify values, apply the CSS text-align property to the element. To achieve the same effect as the char value, give the text-align property the same value you would use for the char. Unimplemented in CSS.",
 					"deprecated": true
 				},
 				"axis": {
@@ -28476,18 +28624,14 @@
 			"description": "The <template> HTML element is a mechanism for holding HTML that is not to be rendered immediately when a page is loaded but may be instantiated subsequently during runtime using JavaScript.",
 			"categories": ["#metadata", "#flow", "#phrasing", "#script-supporting"],
 			"contentModel": {
-				"contents": [
-					{
-						"zeroOrMore": "#transparent"
-					}
-				]
+				"contents": true
 			},
 			"aria": {
 				"implicitRole": false,
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28516,7 +28660,7 @@
 					"role": "textbox"
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28539,7 +28683,7 @@
 					"description": "This attribute indicates whether the value of the control can be automatically completed by the browser. Possible values are: off: The user must explicitly enter a value into this field for every use, or the document provides its own auto-completion method; the browser does not automatically complete the entry. on: The browser can automatically complete the value based on values that the user has entered during previous uses. If the autocomplete attribute is not specified on a <textarea> element, then the browser uses the autocomplete attribute value of the <textarea> element's form owner. The form owner is either the <form> element that this <textarea> element is a descendant of or the form element whose id is specified by the form attribute of the input element. For more information, see the autocomplete attribute in <form>."
 				},
 				"autocorrect": {
-					"description": "A string which indicates whether or not to activate automatic spelling correction and processing of text substitutions (if any are configured) while the user is editing this textarea. Permitted values are: on Enable automatic spelling correction and text substitutions. off Disable automatic spelling correction and text substitutions.",
+					"description": "A string which indicates whether to activate automatic spelling correction and processing of text substitutions (if any are configured) while the user is editing this textarea. Permitted values are: on Enable automatic spelling correction and text substitutions. off Disable automatic spelling correction and text substitutions.",
 					"nonStandard": true
 				},
 				"autofocus": {
@@ -28611,7 +28755,7 @@
 				"implicitRole": "rowgroup",
 				"permittedRoles": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28620,7 +28764,7 @@
 			},
 			"attributes": {
 				"align": {
-					"description": "This enumerated attribute specifies how horizontal alignment of each cell content will be handled. Possible values are: left, aligning the content to the left of the cell center, centering the content in the cell right, aligning the content to the right of the cell justify, inserting spaces into the textual content so that the content is justified in the cell char, aligning the textual content on a special character with a minimal offset, defined by the char and charoff attributes. If this attribute is not set, the left value is assumed. Note: To achieve the same effect as the left, center, right or justify values, use the CSS text-align property on it. To achieve the same effect as the char value, in CSS3, you can use the value of the char as the value of the text-align property Unimplemented.",
+					"description": "This enumerated attribute specifies how horizontal alignment of each cell content will be handled. Possible values are: left, aligning the content to the left of the cell center, centering the content in the cell right, aligning the content to the right of the cell justify, inserting spaces into the textual content so that the content is justified in the cell char, aligning the textual content on a special character with a minimal offset, defined by the char and charoff attributes. If this attribute is not set, the left value is assumed. Note: To achieve the same effect as the left, center, right or justify values, use the CSS text-align property on it. To achieve the same effect as the char value, in CSS, you can use the value of the char as the value of the text-align property Unimplemented.",
 					"deprecated": true
 				},
 				"bgcolor": {
@@ -28649,8 +28793,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#flow",
-						"notAllowedDescendants": ["header", "footer", "#sectioning", "#heading"]
+						"oneOrMore": ":model(flow):not(header, footer, :model(sectioning), :model(heading), :has(header, footer, :model(sectioning), :model(heading)))"
 					}
 				]
 			},
@@ -28658,30 +28801,30 @@
 				"implicitRole": false,
 				"permittedRoles": true,
 				"conditions": {
-					"table:is(:not([role]), [role=table]) > :is(thead, tfoot, tbody) > tr > th": {
+					"table:is(:not([role]), [role=table]) > :is(thead, tfoot, tbody) > tr > th, table:is(:not([role]), [role=table]) > tr > th": {
 						"implicitRole": "cell"
 					},
-					"table:is([role=grid], [role=treegrid]) > :is(thead, tfoot, tbody) > tr > th": {
+					"table:is([role=grid], [role=treegrid]) > :is(thead, tfoot, tbody) > tr > th, table:is([role=grid], [role=treegrid]) > tr > th": {
 						"implicitRole": "gridcell"
 					},
 					"table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > thead > tr > th:not([scope])": {
 						"implicitRole": "columnheader"
 					},
-					"table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > :is(tfoot, tbody) > tr > th:not([scope])": {
+					"table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > :is(tfoot, tbody) > tr > th:not([scope]), table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > tr > th:not([scope])": {
 						"implicitRole": "rowheader"
 					},
-					"table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > :is(thead, tfoot, tbody) > tr > th[scope=col]": {
+					"table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > :is(thead, tfoot, tbody) > tr > th[scope=col], table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > tr > th[scope=col]": {
 						"implicitRole": "columnheader"
 					},
-					"table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > :is(thead, tfoot, tbody) > tr > th[scope=row]": {
+					"table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > :is(thead, tfoot, tbody) > tr > th[scope=row], table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > tr > th[scope=row]": {
 						"implicitRole": "rowheader"
 					},
-					"table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > :is(thead, tfoot, tbody) > tr > th": {
+					"table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > :is(thead, tfoot, tbody) > tr > th, table:is(:not([role]), [role=table], [role=grid], [role=treegrid]) > tr > th": {
 						"permittedRoles": false
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28702,9 +28845,8 @@
 					"deprecated": true
 				},
 				"bgcolor": {
-					"description": "This attribute defines the background color of each cell in a column. It consists of a 6-digit hexadecimal code as defined in sRGB and is prefixed by '#'. This attribute may be used with one of sixteen predefined color strings: black = \"#000000\" green = \"#008000\" silver = \"#C0C0C0\" lime = \"#00FF00\" gray = \"#808080\" olive = \"#808000\" white = \"#FFFFFF\" yellow = \"#FFFF00\" maroon = \"#800000\" navy = \"#000080\" red = \"#FF0000\" blue = \"#0000FF\" purple = \"#800080\" teal = \"#008080\" fuchsia = \"#FF00FF\" aqua = \"#00FFFF\" Note: Do not use this attribute, as it is non-standard and only implemented in some versions of Microsoft Internet Explorer: The <th> element should be styled using CSS. To create a similar effect use the background-color property in CSS instead.",
-					"deprecated": true,
-					"nonStandard": true
+					"description": "This attribute defines the background color of each cell in a column. It consists of a 6-digit hexadecimal code as defined in sRGB and is prefixed by '#'.",
+					"deprecated": true
 				},
 				"char": {
 					"description": "The content in the cell element is aligned to a character. Typical values include a period (.) to align numbers or monetary values. If align is not set to char, this attribute is ignored. Note: Do not use this attribute as it is obsolete in the latest standard. To achieve the same effect, you can specify the character as the first value of the text-align property.",
@@ -28760,7 +28902,7 @@
 				"implicitRole": "rowgroup",
 				"permittedRoles": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28769,16 +28911,15 @@
 			},
 			"attributes": {
 				"align": {
-					"description": "This enumerated attribute specifies how horizontal alignment of each cell content will be handled. Possible values are: left, aligning the content to the left of the cell center, centering the content in the cell right, aligning the content to the right of the cell justify, inserting spaces into the textual content so that the content is justified in the cell char, aligning the textual content on a special character with a minimal offset, defined by the char and charoff attributes. If this attribute is not set, the left value is assumed. Warning: Do not use this attribute as it is obsolete (not supported) in the latest standard. To achieve the same effect as the left, center, right or justify values, use the CSS text-align property on it. To achieve the same effect as the char value, in CSS3, you can use the value of the char as the value of the text-align property.",
+					"description": "This enumerated attribute specifies how horizontal alignment of each cell content will be handled. Possible values are: left, aligning the content to the left of the cell center, centering the content in the cell right, aligning the content to the right of the cell justify, inserting spaces into the textual content so that the content is justified in the cell char, aligning the textual content on a special character with a minimal offset, defined by the char and charoff attributes. If this attribute is not set, the left value is assumed. Warning: Do not use this attribute as it is obsolete (not supported) in the latest standard. To align values, use the CSS text-align property instead.",
 					"deprecated": true
 				},
 				"bgcolor": {
-					"description": "This attribute defines the background color of each cell of the column. It is one of the 6-digit hexadecimal code as defined in sRGB, prefixed by a '#'. One of the sixteen predefined color strings may be used: black = \"#000000\" green = \"#008000\" silver = \"#C0C0C0\" lime = \"#00FF00\" gray = \"#808080\" olive = \"#808000\" white = \"#FFFFFF\" yellow = \"#FFFF00\" maroon = \"#800000\" navy = \"#000080\" red = \"#FF0000\" blue = \"#0000FF\" purple = \"#800080\" teal = \"#008080\" fuchsia = \"#FF00FF\" aqua = \"#00FFFF\" Note: Do not use this attribute, as it is non-standard and only implemented in some versions of Microsoft Internet Explorer: the <thead> element should be styled using CSS. To give a similar effect to the bgcolor attribute, use the CSS property background-color, on the relevant <td> or <th> elements.",
-					"deprecated": true,
-					"nonStandard": true
+					"description": "This attribute defines the background color of each column cell. It accepts a 6-digit hexadecimal color or a named color. Alpha transparency is not supported. Note: Do not use this attribute, as it is non-standard. The thead element should be styled using the CSS background-color property, which can be applied to any element, including the thead, <tr>, <td> and <th> elements.",
+					"deprecated": true
 				},
 				"char": {
-					"description": "This attribute is used to set the character to align the cells in a column on. Typical values for this include a period (.) when attempting to align numbers or monetary values. If align is not set to char, this attribute is ignored. Note: Do not use this attribute as it is obsolete (and not supported) in the latest standard. To achieve the same effect as the char, in CSS3, you can use the character set using the char attribute as the value of the text-align property.",
+					"description": "This attribute is used to set the character to align the cells in a column on. Typical values for this include a period (.) when attempting to align numbers or monetary values. If align is not set to char, this attribute is ignored. Note: Do not use this attribute as it is obsolete (and not supported) in the latest standard.",
 					"deprecated": true
 				},
 				"charoff": {
@@ -28799,7 +28940,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -28811,7 +28952,7 @@
 					"implicitRole": false
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28841,7 +28982,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28858,7 +28999,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["th", "td", "#script-supporting"]
+						"zeroOrMore": ["th", "td", ":model(script-supporting)"]
 					}
 				]
 			},
@@ -28871,7 +29012,7 @@
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28884,11 +29025,11 @@
 					"deprecated": true
 				},
 				"bgcolor": {
-					"description": "A string specifying a color to apply to the backgrounds of each of the row's cells. This can be either an hexadecimal #RRGGBB or #RGB value or a color keyword. Omitting the attribute or setting it to null in JavaScript causes the row's cells to inherit the row's parent element's background color. Note: The <tr> element should be styled using CSS. To give a similar effect as the bgcolor attribute, use the CSS property background-color.",
+					"description": "A string specifying a color to apply to the backgrounds of each of the row's cells. This can be either a hexadecimal #RRGGBB or #RGB value or a color keyword. Omitting the attribute or setting it to null in JavaScript causes the row's cells to inherit the row's parent element's background color. Note: The <tr> element should be styled using CSS. To give a similar effect as the bgcolor attribute, use the CSS property background-color.",
 					"deprecated": true
 				},
 				"char": {
-					"description": "A string which sets the character to align the cells in each of the row's columns on (each row's centering that uses the same character gets aligned with others using the same character . Typical values for this include a period (\".\") or comma (\",\") when attempting to align numbers or monetary values. If align is not set to char, this attribute is ignored. Note: This attribute is not only obsolete, but was rarely implemented anyway. To achieve the same effect as the char attribute, set the CSS text-align property to the same string you would specify for the char property, such as text-align: \".\".",
+					"description": "A string which sets the character to align the cells in each of the row's columns on (each row's centering that uses the same character gets aligned with others using the same character. Typical values for this include a period (\".\") or comma (\",\") when attempting to align numbers or monetary values. If align is not set to char, this attribute is ignored. Note: This attribute is not only obsolete, but was rarely implemented anyway. To achieve the same effect as the char attribute, set the CSS text-align property to the same string you would specify for the char property, such as text-align: \".\".",
 					"deprecated": true
 				},
 				"charoff": {
@@ -28896,7 +29037,7 @@
 					"deprecated": true
 				},
 				"valign": {
-					"description": "A string specifying the vertical alignment of the text within each cell in the row. Possible values for this attribute are: baseline Aligns each cell's content text as closely as possible to the bottom of the cell, handling alignment of different fonts and font sizes by aligning the characters along the baseline of the font(s) used in the row. If all of the characters in the row are the same size, the effect is the same as bottom. bottom, Draws the text in each of the row's cells as closely as possible to the bottom edge of those cells. middle Each cell's text is vertically centered. top Each cell's text is drawn as closely as possible to the top edge of the containing cell. Note: Don't use the obsolete valign attribute. Instead, add the CSS vertical-align property to the row.",
+					"description": "A string specifying the vertical alignment of the text within each cell in the row. Possible values for this attribute are: baseline Aligns each cell's content text as closely as possible to the bottom of the cell, handling alignment of different fonts and font sizes by aligning the characters along the baseline of the font(s) used in the row. If all the characters in the row are the same size, the effect is the same as bottom. bottom, Draws the text in each of the row's cells as closely as possible to the bottom edge of those cells. middle Each cell's text is vertically centered. top Each cell's text is drawn as closely as possible to the top edge of the containing cell. Note: Don't use the obsolete valign attribute. Instead, add the CSS vertical-align property to the row.",
 					"deprecated": true
 				}
 			}
@@ -28914,7 +29055,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28956,7 +29097,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -28969,7 +29110,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -28978,7 +29119,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -28995,7 +29136,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["li", "#script-supporting"]
+						"zeroOrMore": ["li", ":model(script-supporting)"]
 					}
 				]
 			},
@@ -29033,7 +29174,7 @@
 					]
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -29043,11 +29184,13 @@
 			"attributes": {
 				"compact": {
 					"description": "This Boolean attribute hints that the list should be rendered in a compact style. The interpretation of this attribute depends on the user agent, and it doesn't work in all browsers. Warning: Do not use this attribute, as it has been deprecated: use CSS instead. To give a similar effect as the compact attribute, the CSS property line-height can be used with a value of 80%.",
-					"deprecated": true
+					"deprecated": true,
+					"nonStandard": true
 				},
 				"type": {
 					"description": "This attribute sets the bullet style for the list. The values defined under HTML3.2 and the transitional version of HTML 4.0/4.01 are: circle disc square A fourth bullet type has been defined in the WebTV interface, but not all browsers support it: triangle. If not present and if no CSS list-style-type property applies to the element, the user agent selects a bullet type depending on the nesting level of the list. Warning: Do not use this attribute, as it has been deprecated; use the CSS list-style-type property instead.",
-					"deprecated": true
+					"deprecated": true,
+					"nonStandard": true
 				}
 			}
 		},
@@ -29059,7 +29202,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": "#phrasing"
+						"oneOrMore": ":model(phrasing)"
 					}
 				]
 			},
@@ -29068,7 +29211,7 @@
 				"permittedRoles": true,
 				"namingProhibited": true
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -29091,8 +29234,7 @@
 						"zeroOrMore": "track"
 					},
 					{
-						"zeroOrMore": "#transparent",
-						"notAllowedDescendants": ["audio", "video"]
+						"transparent": ":not(audio, video, :has(audio, video))"
 					}
 				],
 				"conditional": [
@@ -29103,8 +29245,7 @@
 								"zeroOrMore": "track"
 							},
 							{
-								"zeroOrMore": "#transparent",
-								"notAllowedDescendants": ["audio", "video"]
+								"transparent": ":not(audio, video, :has(audio, video))"
 							}
 						]
 					}
@@ -29118,7 +29259,7 @@
 					"role": "application"
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -29159,14 +29300,14 @@
 					}
 				},
 				"crossorigin": {
-					"description": "This enumerated attribute indicates whether to use CORS to fetch the related video. CORS-enabled resources can be reused in the <canvas> element without being tainted. The allowed values are: anonymous Sends a cross-origin request without a credential. In other words, it sends the Origin: HTTP header without a cookie, X.509 certificate, or performing HTTP Basic authentication. If the server does not give credentials to the origin site (by not setting the Access-Control-Allow-Origin: HTTP header), the image will be tainted, and its usage restricted. use-credentials Sends a cross-origin request with a credential. In other words, it sends the Origin: HTTP header with a cookie, a certificate, or performing HTTP Basic authentication. If the server does not give credentials to the origin site (through Access-Control-Allow-Credentials: HTTP header), the image will be tainted and its usage restricted. When not present, the resource is fetched without a CORS request (i.e. without sending the Origin: HTTP header), preventing its non-tainted used in <canvas> elements. If invalid, it is handled as if the enumerated keyword anonymous was used. See CORS settings attributes for additional information."
+					"description": "This enumerated attribute indicates whether to use CORS to fetch the related video. CORS-enabled resources can be reused in the <canvas> element without being tainted. The allowed values are: anonymous Sends a cross-origin request without a credential. In other words, it sends the Origin: HTTP header without a cookie, X.509 certificate, or performing HTTP Basic authentication. If the server does not give credentials to the origin site (by not setting the Access-Control-Allow-Origin: HTTP header), the resource will be tainted, and its usage restricted. use-credentials Sends a cross-origin request with a credential. In other words, it sends the Origin: HTTP header with a cookie, a certificate, or performing HTTP Basic authentication. If the server does not give credentials to the origin site (through Access-Control-Allow-Credentials: HTTP header), the resource will be tainted and its usage restricted. When not present, the resource is fetched without a CORS request (i.e. without sending the Origin: HTTP header), preventing its non-tainted use in <canvas> elements. If invalid, it is handled as if the enumerated keyword anonymous was used. See CORS settings attributes for additional information."
 				},
 				"disablepictureinpicture": {
 					"description": "Prevents the browser from suggesting a Picture-in-Picture context menu or to request Picture-in-Picture automatically in some cases.",
 					"experimental": true
 				},
 				"disableremoteplayback": {
-					"description": "A Boolean attribute used to disable the capability of remote playback in devices that are attached using wired (HDMI, DVI, etc.) and wireless technologies (Miracast, Chromecast, DLNA, AirPlay, etc). In Safari, you can use x-webkit-airplay=\"deny\" as a fallback.",
+					"description": "A Boolean attribute used to disable the capability of remote playback in devices that are attached using wired (HDMI, DVI, etc.) and wireless technologies (Miracast, Chromecast, DLNA, AirPlay, etc.). In Safari, you can use x-webkit-airplay=\"deny\" as a fallback.",
 					"experimental": true
 				},
 				"height": {
@@ -29185,7 +29326,7 @@
 					"type": "URL"
 				},
 				"preload": {
-					"description": "This enumerated attribute is intended to provide a hint to the browser about what the author thinks will lead to the best user experience with regards to what content is loaded before the video is played. It may have one of the following values: none: Indicates that the video should not be preloaded. metadata: Indicates that only video metadata (e.g. length) is fetched. auto: Indicates that the whole video file can be downloaded, even if the user is not expected to use it. empty string: Synonym of the auto value. The default value is different for each browser. The spec advises it to be set to metadata. Note: The autoplay attribute has precedence over preload. If autoplay is specified, the browser would obviously need to start downloading the video for playback. The specification does not force the browser to follow the value of this attribute; it is a mere hint."
+					"description": "This enumerated attribute is intended to provide a hint to the browser about what the author thinks will lead to the best user experience regarding what content is loaded before the video is played. It may have one of the following values: none: Indicates that the video should not be preloaded. metadata: Indicates that only video metadata (e.g. length) is fetched. auto: Indicates that the whole video file can be downloaded, even if the user is not expected to use it. empty string: Synonym of the auto value. The default value is different for each browser. The spec advises it to be set to metadata. Note: The autoplay attribute has precedence over preload. If autoplay is specified, the browser would obviously need to start downloading the video for playback. The specification does not force the browser to follow the value of this attribute; it is a mere hint."
 				},
 				"src": {
 					"description": "The URL of the video to embed. This is optional; you may instead use the <source> element within the video block to specify the video to embed."
@@ -29213,7 +29354,7 @@
 					"permittedRoles": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -29234,7 +29375,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -29251,15 +29392,14 @@
 						"condition": "svg|switch > svg|a",
 						"contents": [
 							{
-								"zeroOrMore": "#transparent"
+								"transparent": "*"
 							}
 						]
 					}
 				],
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "#transparent"],
-						"ignore": "svg|a"
+						"transparent": "*, :model(SVGDescriptive):not(svg|a, :has(svg|a))"
 					}
 				]
 			},
@@ -29270,12 +29410,12 @@
 					"graphics-aam": true
 				},
 				"conditions": {
-					"[href], [xlink:href]": {
+					"[href], [xlink|href]": {
 						"implicitRole": "link"
 					}
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -29367,8 +29507,7 @@
 			},
 			"attributes": {
 				"download": {
-					"description": "Instructs browsers to download a URL instead of navigating to it, so the user will be prompted to save it as a local file. Value type: <string> ; Default value: none; Animatable: no",
-					"experimental": true
+					"description": "Instructs browsers to download a URL instead of navigating to it, so the user will be prompted to save it as a local file. Value type: <string> ; Default value: none; Animatable: no"
 				},
 				"href": {
 					"description": "The URL or URL fragment the hyperlink points to. Value type: <URL> ; Default value: none; Animatable: yes"
@@ -29381,12 +29520,10 @@
 					"experimental": true
 				},
 				"referrerpolicy": {
-					"description": "Which referrer to send when fetching the URL. Value type: no-referrer|no-referrer-when-downgrade|same-origin|origin|strict-origin|origin-when-cross-origin|strict-origin-when-cross-origin|unsafe-url ; Default value: none; Animatable: no",
-					"experimental": true
+					"description": "Which referrer to send when fetching the URL. Value type: no-referrer|no-referrer-when-downgrade|same-origin|origin|strict-origin|origin-when-cross-origin|strict-origin-when-cross-origin|unsafe-url ; Default value: none; Animatable: no"
 				},
 				"rel": {
-					"description": "The relationship of the target object to the link object. Value type: <list-of-Link-Types> ; Default value: none; Animatable: yes",
-					"experimental": true
+					"description": "The relationship of the target object to the link object. Value type: <list-of-Link-Types> ; Default value: none; Animatable: yes"
 				},
 				"target": {
 					"description": "Where to display the linked URL. Value type: _self|_parent|_top|_blank|<name> ; Default value: _self; Animatable: yes"
@@ -29413,33 +29550,40 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {
 				"dx": {
-					"description": "This attribute indicates a shift along the x-axis on the position of the element. Value type: <list-of-coordinates> ; Default value: Relative x-coordinate of ancestor <text> or <tspan>; Animatable: yes"
+					"description": "This attribute indicates a shift along the x-axis on the position of the element. Value type: <list-of-coordinates> ; Default value: Relative x-coordinate of ancestor <text> or <tspan>; Animatable: yes",
+					"deprecated": true
 				},
 				"dy": {
-					"description": "This attribute indicates a shift along the x-axis on the position of the element. Value type: <list-of-coordinates> ; Default value: Relative y-coordinate of ancestor <text> or <tspan>; Animatable: yes"
+					"description": "This attribute indicates a shift along the x-axis on the position of the element. Value type: <list-of-coordinates> ; Default value: Relative y-coordinate of ancestor <text> or <tspan>; Animatable: yes",
+					"deprecated": true
 				},
 				"format": {
-					"description": "The format of the given font. Value type: <string> ; Default value: none; Animatable: no"
+					"description": "The format of the given font. Value type: <string> ; Default value: none; Animatable: no",
+					"deprecated": true
 				},
 				"glyphRef": {
-					"description": "The glyph identifier, the format of which is dependent on the format defined by the format attribute of the given font. Value type: <string> ; Default value: none; Animatable: no"
+					"description": "The glyph identifier, the format of which is dependent on the format defined by the format attribute of the given font. Value type: <string> ; Default value: none; Animatable: no",
+					"deprecated": true
 				},
 				"rotate": {
-					"description": "This attribute defines the supplemental rotation that will be applied to the element. Value type: <list-of-numbers> ; Default value: none; Animatable: yes (non-additive)"
+					"description": "This attribute defines the supplemental rotation that will be applied to the element. Value type: <list-of-numbers> ; Default value: none; Animatable: yes (non-additive)",
+					"deprecated": true
 				},
 				"x": {
-					"description": "This attribute defines the corresponding absolute x-coordinates for rendering the element. Value type: <list-of-coordinates> ; Default value: Absolute x-coordinate of ancestor <text> or <tspan>; Animatable: yes"
+					"description": "This attribute defines the corresponding absolute x-coordinates for rendering the element. Value type: <list-of-coordinates> ; Default value: Absolute x-coordinate of ancestor <text> or <tspan>; Animatable: yes",
+					"deprecated": true
 				},
 				"xlink:href": {
 					"description": "An <iri> reference either to a <glyph> element in an SVG document or to an <altGlyphDef> element. If the reference is to a <glyph> element and that glyph is available, then that glyph is rendered instead of the character(s) that are inside of the <altGlyph> element. If the reference is to an <altGlyphDef> element, then if an appropriate set of alternate glyphs is located from processing the <altGlyphDef> element, then those alternate glyphs are rendered instead of the character(s) that are inside of the <altGlyph> element. Value type: <iri> ; Default value: none; Animatable: no"
 				},
 				"y": {
-					"description": "This attribute defines the corresponding absolute y-coordinates for rendering the element. Value type: <list-of-coordinates> ; Default value: Absolute y-coordinate of ancestor <text> or <tspan>; Animatable: yes"
+					"description": "This attribute defines the corresponding absolute y-coordinates for rendering the element. Value type: <list-of-coordinates> ; Default value: Absolute y-coordinate of ancestor <text> or <tspan>; Animatable: yes",
+					"deprecated": true
 				}
 			}
 		},
@@ -29456,7 +29600,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -29474,7 +29618,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -29488,7 +29632,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|script"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|script"]
 					}
 				]
 			},
@@ -29497,7 +29641,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -29605,7 +29749,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -29619,10 +29763,10 @@
 			"contentModel": {
 				"contents": [
 					{
-						"interleave": [
+						"choice": [
 							[
 								{
-									"oneOrMore": ["#SVGDescriptive", "svg|script"]
+									"oneOrMore": [":model(SVGDescriptive)", "svg|script"]
 								},
 								{
 									"optional": "svg|mpath"
@@ -29633,7 +29777,7 @@
 									"optional": "svg|mpath"
 								},
 								{
-									"oneOrMore": ["#SVGDescriptive", "svg|script"]
+									"oneOrMore": [":model(SVGDescriptive)", "svg|script"]
 								}
 							]
 						]
@@ -29645,7 +29789,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -29692,7 +29836,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|script"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|script"]
 					}
 				]
 			},
@@ -29701,7 +29845,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -29743,9 +29887,9 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
 							"svg|clipPath",
 							"svg|marker",
 							"svg|mask",
@@ -29760,7 +29904,7 @@
 				"permittedRoles": false,
 				"properties": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -29868,9 +30012,9 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGShape",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGShape)",
 							"svg|text",
 							"svg|use",
 							"svg|script"
@@ -29882,7 +30026,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGConditionalProcessingAttrs": ["requiredFeatures", "requiredExtensions", "systemLanguage"],
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
@@ -29981,7 +30125,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -29996,11 +30140,11 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
-							"#SVGShape",
-							"#SVGStructural",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
+							":model(SVGShape)",
+							":model(SVGStructural)",
 							"svg|a",
 							"svg|clipPath",
 							"svg|filter",
@@ -30021,7 +30165,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -30108,7 +30252,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"require": ["#SVGOtherXMLNamespace", "#text"]
+						"require": [":model(SVGDescriptive)", ":model(SVGNeverRendered)", "#text"]
 					}
 				]
 			},
@@ -30116,7 +30260,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -30133,7 +30277,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"require": ["#SVGDescriptive", "svg|script"]
+						"require": [":model(SVGDescriptive)", "svg|script"]
 					}
 				]
 			},
@@ -30141,7 +30285,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#SVGConditionalProcessingAttrs": ["requiredExtensions", "systemLanguage"],
@@ -30167,9 +30311,9 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
 							"svg|clipPath",
 							"svg|marker",
 							"svg|mask",
@@ -30186,7 +30330,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -30297,7 +30441,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -30305,7 +30449,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result", "in"],
@@ -30414,7 +30558,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -30422,7 +30566,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result", "in"],
@@ -30521,7 +30665,7 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGDescriptive",
+							":model(SVGDescriptive)",
 							"svg|feFuncA",
 							"svg|feFuncR",
 							"svg|feFuncB",
@@ -30535,7 +30679,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result", "in"],
@@ -30621,7 +30765,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -30629,7 +30773,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result", "in"],
@@ -30765,7 +30909,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -30773,7 +30917,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result", "in"],
@@ -30907,21 +31051,21 @@
 			"contentModel": {
 				"contents": [
 					{
-						"interleave": [
+						"choice": [
 							[
 								{
-									"zeroOrMore": ["#SVGDescriptive", "svg|script"]
+									"zeroOrMore": [":model(SVGDescriptive)", "svg|script"]
 								},
 								{
-									"require": "#SVGLightSource"
+									"require": ":model(SVGLightSource)"
 								}
 							],
 							[
 								{
-									"require": "#SVGLightSource"
+									"require": ":model(SVGLightSource)"
 								},
 								{
-									"zeroOrMore": ["#SVGDescriptive", "svg|script"]
+									"zeroOrMore": [":model(SVGDescriptive)", "svg|script"]
 								}
 							]
 						]
@@ -30932,7 +31076,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result", "in"],
@@ -31034,7 +31178,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -31042,7 +31186,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result"],
@@ -31167,7 +31311,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -31175,7 +31319,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space"]
 			},
@@ -31201,7 +31345,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -31209,7 +31353,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result", "in"],
@@ -31311,7 +31455,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -31319,7 +31463,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result"],
@@ -31414,7 +31558,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -31422,7 +31566,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space"],
 				"#SVGTransferFunctionAttrs": [
@@ -31446,7 +31590,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -31454,7 +31598,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space"],
 				"#SVGTransferFunctionAttrs": [
@@ -31478,7 +31622,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -31486,7 +31630,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space"],
 				"#SVGTransferFunctionAttrs": [
@@ -31510,7 +31654,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -31518,7 +31662,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space"],
 				"#SVGTransferFunctionAttrs": [
@@ -31542,7 +31686,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -31550,7 +31694,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result", "in"],
@@ -31650,7 +31794,7 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGDescriptive",
+							":model(SVGDescriptive)",
 							"svg|animate",
 							"svg|animateTransform",
 							"svg|script",
@@ -31663,7 +31807,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result"],
@@ -31777,7 +31921,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|feMergeNode", "svg|script"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|feMergeNode", "svg|script"]
 					}
 				]
 			},
@@ -31785,7 +31929,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result"],
@@ -31871,7 +32015,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -31879,7 +32023,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space"],
 				"#SVGFilterPrimitiveAttrs": ["in"]
@@ -31895,7 +32039,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -31903,7 +32047,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result", "in"],
@@ -32003,7 +32147,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -32011,7 +32155,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result", "in"],
@@ -32108,7 +32252,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -32116,7 +32260,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space"]
 			},
@@ -32147,21 +32291,21 @@
 			"contentModel": {
 				"contents": [
 					{
-						"interleave": [
+						"choice": [
 							[
 								{
-									"zeroOrMore": ["#SVGDescriptive", "svg|script"]
+									"zeroOrMore": [":model(SVGDescriptive)", "svg|script"]
 								},
 								{
-									"require": "#SVGLightSource"
+									"require": ":model(SVGLightSource)"
 								}
 							],
 							[
 								{
-									"require": "#SVGLightSource"
+									"require": ":model(SVGLightSource)"
 								},
 								{
-									"zeroOrMore": ["#SVGDescriptive", "svg|script"]
+									"zeroOrMore": [":model(SVGDescriptive)", "svg|script"]
 								}
 							]
 						]
@@ -32172,7 +32316,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result", "in"],
@@ -32278,7 +32422,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -32286,7 +32430,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space"]
 			},
@@ -32341,7 +32485,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -32349,7 +32493,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result", "in"],
@@ -32435,7 +32579,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|animate", "svg|script", "svg|set"]
 					}
 				]
 			},
@@ -32443,7 +32587,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height", "result"],
@@ -32525,7 +32669,7 @@
 					"animatable": true
 				},
 				"numOctaves": {
-					"type": "<positive-integer>",
+					"type": "<integer>",
 					"defaultValue": "1",
 					"animatable": true
 				},
@@ -32559,7 +32703,13 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "#SVGFilterPrimitive", "svg|animate", "svg|script", "svg|set"]
+						"zeroOrMore": [
+							":model(SVGDescriptive)",
+							"#SVGFilterPrimitive",
+							"svg|animate",
+							"svg|script",
+							"svg|set"
+						]
 					}
 				]
 			},
@@ -32567,7 +32717,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
 				"#SVGFilterPrimitiveAttrs": ["x", "y", "width", "height"],
@@ -32697,7 +32847,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -32715,7 +32865,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -32733,7 +32883,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -32751,7 +32901,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -32769,7 +32919,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -32787,7 +32937,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -32808,7 +32958,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -32916,11 +33066,11 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
-							"#SVGShape",
-							"#SVGStructural",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
+							":model(SVGShape)",
+							":model(SVGStructural)",
 							"svg|a",
 							"svg|clipPath",
 							"svg|filter",
@@ -32944,7 +33094,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -33038,7 +33188,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -33056,7 +33206,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -33074,7 +33224,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -33089,8 +33239,8 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
 							"svg|clipPath",
 							"svg|mask",
 							"svg|script",
@@ -33106,7 +33256,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -33218,9 +33368,9 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
 							"svg|clipPath",
 							"svg|marker",
 							"svg|mask",
@@ -33237,7 +33387,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -33353,7 +33503,7 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGDescriptive",
+							":model(SVGDescriptive)",
 							"svg|animate",
 							"svg|animateTransform",
 							"svg|script",
@@ -33368,7 +33518,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -33504,11 +33654,11 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
-							"#SVGShape",
-							"#SVGStructural",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
+							":model(SVGShape)",
+							":model(SVGStructural)",
 							"svg|a",
 							"svg|clipPath",
 							"svg|filter",
@@ -33529,7 +33679,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -33680,11 +33830,11 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGShape",
-							"#SVGStructural",
-							"#SVGGradient",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGShape)",
+							":model(SVGStructural)",
+							":model(SVGGradient)",
 							"svg|a",
 							"svg|altGlyphDef",
 							"svg|clipPath",
@@ -33711,7 +33861,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#SVGConditionalProcessingAttrs": ["requiredFeatures", "requiredExtensions", "systemLanguage"],
 				"#SVGCoreAttrs": ["id", "xml:base", "xml:lang", "xml:space", "class", "style"],
@@ -33819,7 +33969,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGOtherXMLNamespace", "#text"]
+						"zeroOrMore": [":model(SVGDescriptive)", ":model(SVGNeverRendered)", "#text"]
 					}
 				]
 			},
@@ -33827,7 +33977,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -33848,7 +33998,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -33862,7 +34012,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|script"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|script"]
 					}
 				]
 			},
@@ -33870,7 +34020,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -33892,9 +34042,9 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
 							"svg|clipPath",
 							"svg|marker",
 							"svg|mask",
@@ -33911,7 +34061,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -34012,11 +34162,11 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
-							"#SVGShape",
-							"#SVGStructural",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
+							":model(SVGShape)",
+							":model(SVGStructural)",
 							"svg|a",
 							"svg|clipPath",
 							"svg|filter",
@@ -34037,7 +34187,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -34157,7 +34307,7 @@
 					"description": "This attribute determines the x coordinate shift of the pattern tile. Value type: <length>|<percentage> ; Default value: 0; Animatable: yes"
 				},
 				"xlink:href": {
-					"description": "This attribute reference a template pattern that provides default values for the <pattern> attributes. Value type: <URL>; Default value: none; Animatable: yes Note: For browsers implementing href, if both href and xlink:href are set, xlink:href will be ignored and only href will be used.",
+					"description": "This attribute references a template pattern that provides default values for the <pattern> attributes. Value type: <URL>; Default value: none; Animatable: yes Note: For browsers implementing href, if both href and xlink:href are set, xlink:href will be ignored and only href will be used.",
 					"deprecated": true
 				},
 				"y": {
@@ -34175,9 +34325,9 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
 							"svg|clipPath",
 							"svg|marker",
 							"svg|mask",
@@ -34194,7 +34344,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -34294,9 +34444,9 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
 							"svg|clipPath",
 							"svg|marker",
 							"svg|mask",
@@ -34313,7 +34463,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -34413,7 +34563,7 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGDescriptive",
+							":model(SVGDescriptive)",
 							"svg|animate",
 							"svg|animateTransform",
 							"svg|script",
@@ -34428,7 +34578,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -34572,9 +34722,9 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
 							"svg|clipPath",
 							"svg|marker",
 							"svg|mask",
@@ -34591,7 +34741,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -34710,7 +34860,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGOtherXMLNamespace", "#text"]
+						"zeroOrMore": [":model(SVGNeverRendered)", ":model(SVGStructurallyExternal)", "#text"]
 					}
 				]
 			},
@@ -34718,7 +34868,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -34755,7 +34905,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGDescriptive", "svg|script"]
+						"zeroOrMore": [":model(SVGDescriptive)", "svg|script"]
 					}
 				]
 			},
@@ -34763,7 +34913,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -34807,7 +34957,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -34918,7 +35068,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -34948,11 +35098,11 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
-							"#SVGShape",
-							"#SVGStructural",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
+							":model(SVGShape)",
+							":model(SVGStructural)",
 							"svg|a",
 							"svg|clipPath",
 							"svg|filter",
@@ -34976,7 +35126,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -35114,8 +35264,8 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGShape",
+							":model(SVGAnimation)",
+							":model(SVGShape)",
 							"svg|a",
 							"svg|foreignObject",
 							"svg|g",
@@ -35132,7 +35282,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -35223,11 +35373,11 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
-							"#SVGShape",
-							"#SVGStructural",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
+							":model(SVGShape)",
+							":model(SVGStructural)",
 							"svg|a",
 							"svg|clipPath",
 							"svg|filter",
@@ -35251,7 +35401,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -35313,10 +35463,10 @@
 					{
 						"zeroOrMore": [
 							"#text",
-							"#SVGAnimation",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
-							"#SVGTextContentChild",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
+							":model(SVGTextContentChild)",
 							"svg|a",
 							"svg|clipPath",
 							"svg|marker",
@@ -35334,7 +35484,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -35461,8 +35611,8 @@
 					{
 						"zeroOrMore": [
 							"#text",
-							"#SVGDescriptive",
-							"#SVGPaintServer",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
 							"svg|a",
 							"svg|animate",
 							"svg|clipPath",
@@ -35483,7 +35633,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -35623,7 +35773,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGOtherXMLNamespace", "#text"]
+						"zeroOrMore": [":model(SVGDescriptive)", ":model(SVGNeverRendered)", "#text"]
 					}
 				]
 			},
@@ -35631,7 +35781,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#DocumentElementEventAttrs": true,
 				"#GlobalEventAttrs": true,
@@ -35652,7 +35802,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}
@@ -35667,8 +35817,8 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGDescriptive",
-							"#SVGPaintServer",
+							":model(SVGDescriptive)",
+							":model(SVGPaintServer)",
 							"svg|a",
 							"svg|animate",
 							"svg|script",
@@ -35686,7 +35836,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -35810,8 +35960,8 @@
 				"contents": [
 					{
 						"zeroOrMore": [
-							"#SVGAnimation",
-							"#SVGDescriptive",
+							":model(SVGAnimation)",
+							":model(SVGDescriptive)",
 							"svg|clipPath",
 							"svg|mask",
 							"svg|script",
@@ -35827,7 +35977,7 @@
 					"graphics-aam": true
 				}
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -35941,7 +36091,7 @@
 			"contentModel": {
 				"contents": [
 					{
-						"zeroOrMore": ["#SVGAnimation", "#SVGDescriptive", "svg|script", "svg|style"]
+						"zeroOrMore": [":model(SVGAnimation)", ":model(SVGDescriptive)", "svg|script", "svg|style"]
 					}
 				]
 			},
@@ -35949,7 +36099,7 @@
 				"implicitRole": false,
 				"permittedRoles": false
 			},
-			"omittion": false,
+			"omission": false,
 			"globalAttrs": {
 				"#ARIAAttrs": true,
 				"#DocumentElementEventAttrs": true,
@@ -35990,7 +36140,7 @@
 				"permittedRoles": true,
 				"implicitRole": false
 			},
-			"omittion": false,
+			"omission": false,
 			"obsolete": true,
 			"globalAttrs": {},
 			"attributes": {}