update html schema

GitOrigin-RevId: 3b44d84780235619112d92903792f9bf8770f22c
This commit is contained in:
Dennis Ushakov
2019-09-30 10:03:28 +00:00
committed by intellij-monorepo-bot
parent 8ed3a181d3
commit 12fc2fd09e
8 changed files with 34 additions and 56 deletions
@@ -201,7 +201,25 @@ common.attrs.present =
}
common.attrs.other =
empty
( common.attrs.autofocus?
& common.attrs.inputmode?
& common.attrs.nonce?
)
common.attrs.autofocus =
attribute autofocus {
w:string "autofocus" | w:string ""
}
common.attrs.inputmode =
attribute inputmode {
string
}
common.attrs.nonce =
attribute nonce {
string
}
# #####################################################################
## Common Datatypes #
@@ -17,7 +17,6 @@ datatypes w = "http://whattf.org/datatype-draft"
& script.attrs.nomodule?
& script.attrs.language? # restricted in Schematron
& script.attrs.integrity?
& script.attrs.nonce?
& embedded.content.attrs.crossorigin?
& referrerpolicy?
& ( common.attrs.aria.role.presentation
@@ -36,7 +35,6 @@ datatypes w = "http://whattf.org/datatype-draft"
& script.attrs.charset?
& script.attrs.language? # restricted in Schematron
& script.attrs.integrity?
& script.attrs.nonce?
& embedded.content.attrs.crossorigin?
& referrerpolicy?
& ( common.attrs.aria.role.presentation
@@ -75,10 +73,6 @@ datatypes w = "http://whattf.org/datatype-draft"
attribute integrity {
common.data.integrity
}
script.attrs.nonce =
attribute nonce{
string
}
script.inner.embedded =
( common.inner.anything )
script.inner.imported =
@@ -174,9 +174,12 @@ namespace local = ""
| translate
| style
| tabindex
| autofocus
| contenteditable
| draggable
| hidden
| inputmode
| nonce
| onabort
| onautocomplete
| onautocompleteerror
@@ -355,7 +358,6 @@ namespace local = ""
)
| object.attrs.type
)
& object.attrs.typemustmatch?
# & object.attrs.classid?
# & object.attrs.codebase?
# & object.attrs.codetype?
@@ -378,10 +380,6 @@ namespace local = ""
attribute type {
common.data.mimetype
}
object.attrs.typemustmatch =
attribute typemustmatch {
w:string "typemustmatch" | w:string ""
} & v5only
object.attrs.height =
attribute height {
common.data.integer.non-negative
@@ -153,7 +153,6 @@ datatypes w = "http://whattf.org/datatype-draft"
& link.attrs.rel
& link.attrs.as?
& link.attrs.integrity?
& link.attrs.nonce?
& shared-hyperlink.attrs.hreflang?
& shared-hyperlink.attrs.media?
& shared-hyperlink.attrs.type?
@@ -204,10 +203,6 @@ datatypes w = "http://whattf.org/datatype-draft"
attribute integrity {
common.data.integrity
}
link.attrs.nonce =
attribute nonce{
string
}
link.attrs.sizes =
attribute sizes {
w:string "any" | common.data.sizes
@@ -246,7 +241,6 @@ datatypes w = "http://whattf.org/datatype-draft"
( common.attrs
& style.attrs.type?
& style.attrs.media?
& style.attrs.nonce?
# style.attrs.title included in common.attrs
& ( common.attrs.aria.role.presentation
| common.attrs.aria.role.menuitem
@@ -260,10 +254,6 @@ datatypes w = "http://whattf.org/datatype-draft"
attribute media {
common.data.mediaquery
}
style.attrs.nonce =
attribute nonce{
string
}
style.inner =
( common.inner.anything )
@@ -48,11 +48,6 @@ datatypes w = "http://whattf.org/datatype-draft"
w:string "formnovalidate" | w:string ""
}
shared-form.attrs.autofocus =
attribute autofocus {
w:string "autofocus" | w:string ""
}
shared-form.attrs.pattern =
attribute pattern {
form.data.pattern
@@ -78,11 +73,6 @@ datatypes w = "http://whattf.org/datatype-draft"
form.data.nonemptystring
}
shared-form.attrs.inputmode =
attribute inputmode {
string
}
shared-form.attrs.minlength =
attribute minlength {
common.data.integer.non-negative
@@ -90,9 +80,8 @@ datatypes w = "http://whattf.org/datatype-draft"
## Shared attributes for <input>
shared-input.attrs =
shared-input-no-size.attrs =
( input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& shared-form.attrs.maxlength?
& shared-form.attrs.minlength?
@@ -100,6 +89,10 @@ datatypes w = "http://whattf.org/datatype-draft"
& shared-form.attrs.placeholder?
& shared-form.attrs.readonly?
& shared-form.attrs.required?
)
shared-input.attrs =
( shared-input-no-size.attrs
& shared-form.attrs.size?
)
@@ -146,13 +139,11 @@ datatypes w = "http://whattf.org/datatype-draft"
input.text.attrs &=
( input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& shared-form.attrs.dirname?
& input.attrs.list?
& shared-form.attrs.pattern?
& shared-form.attrs.required?
& shared-form.attrs.placeholder?
& shared-form.attrs.inputmode?
& shared-form.attrs.minlength?
)
@@ -160,7 +151,6 @@ datatypes w = "http://whattf.org/datatype-draft"
input.password.attrs &=
( input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& shared-form.attrs.pattern?
& shared-form.attrs.placeholder?
@@ -419,7 +409,7 @@ datatypes w = "http://whattf.org/datatype-draft"
input.number.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& shared-input-no-size.attrs
& input.number.attrs.type
& input.number.attrs.min?
& input.number.attrs.max?
@@ -455,7 +445,7 @@ datatypes w = "http://whattf.org/datatype-draft"
input.range.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& shared-input-no-size.attrs
& input.range.attrs.type
& input.range.attrs.min?
& input.range.attrs.max?
@@ -653,7 +643,6 @@ datatypes w = "http://whattf.org/datatype-draft"
textarea.attrs &=
( shared-form.attrs.maxlength?
& shared-form.attrs.minlength?
& shared-form.attrs.autofocus?
& shared-form.attrs.required?
& textarea.attrs.placeholder?
& shared-form.attrs.dirname?
@@ -665,7 +654,6 @@ datatypes w = "http://whattf.org/datatype-draft"
& textarea.attrs.cols?
)
)
& shared-form.attrs.inputmode?
& input.attrs.autocomplete.any?
)
textarea.attrs.wrap.hard =
@@ -702,22 +690,12 @@ datatypes w = "http://whattf.org/datatype-draft"
button.submit.attrs &=
( shared-form.attrs.formaction?
& shared-form.attrs.autofocus?
& shared-form.attrs.formenctype?
& shared-form.attrs.formmethod?
& shared-form.attrs.formtarget?
& shared-form.attrs.formnovalidate?
)
## Complex Reset Button: <button type='reset'>, extensions
button.reset.attrs &=
( shared-form.attrs.autofocus? )
## Complex Push Button: <button type='button'>, extensions
button.button.attrs &=
( shared-form.attrs.autofocus? )
## Form: <form>, extensions
form.attrs &=
@@ -749,7 +727,6 @@ datatypes w = "http://whattf.org/datatype-draft"
## Selection Menu: <select>, Extensions
select.attrs &=
( shared-form.attrs.autofocus?
& shared-form.attrs.required?
( shared-form.attrs.required?
& input.attrs.autocomplete.any?
)
@@ -109,7 +109,6 @@ grammar {
attribute d { PathData.datatype }?,
attribute orientation { text }?,
attribute arabic-form { text }?,
attribute lang { LanguageCodes.datatype }?,
attribute horiz-adv-x { Number.datatype }?,
attribute vert-origin-x { Number.datatype }?,
attribute vert-origin-y { Number.datatype }?,
@@ -26,7 +26,9 @@ datatypes w = "http://whattf.org/datatype-draft"
grammar {
SVG.id.attrib = attribute id { w:xml-name }?
SVG.base.attrib = attribute xml:base { URI.datatype }?
SVG.lang.attrib = attribute xml:lang { LanguageCode.datatype }?
SVG.lang.attrib = ( attribute xml:lang { LanguageCode.datatype }
| attribute lang { LanguageCode.datatype }
)?
SVG.space.attrib = attribute xml:space { string "default" | string "preserve" }?
SVG.tabindex.attrib = attribute tabindex { Integer.datatype }?
SVG.focusable.attrib = attribute focusable { string "true" | string "false" }?
@@ -60,7 +60,7 @@ grammar {
##
## a language code, as per [RFC3066]
##
LanguageCode.datatype = xsd:language
LanguageCode.datatype = ( xsd:language | string "" )
##
## comma-separated list of language codes, as per [RFC3066]