update html5 schema

This commit is contained in:
Dennis Ushakov
2015-04-09 16:27:39 -07:00
parent 8867b5f881
commit 4d8b7ae50d
39 changed files with 159 additions and 1598 deletions
@@ -11,7 +11,7 @@ import com.intellij.xml.Html5SchemaProvider;
* @author Eugene.Kudelevsky
*/
public class DefaultHtmlDoctypeInitialConfigurator {
public static final int VERSION = 1;
public static final int VERSION = 2;
public DefaultHtmlDoctypeInitialConfigurator(ProjectManager projectManager,
PropertiesComponent propertiesComponent) {
View File
@@ -23,6 +23,6 @@ namespace local = ""
include "html5-svg-mathml.rnc"
include "html5/html5full.rnc"
include "its20-html5.rnc"
include "its2/its20-html5.rnc"
common.attrs &= its-html-attributes
@@ -13,6 +13,9 @@ SVG.foreignObject.content |=
| common.inner.flow
)
SVG.Core.attrib &= common.attrs.aria?
SVG.Core.attrib &= aria.global?
annotation-xml.model.svg |= svg
annotation-xml.model.xhtml |=
View File
-1
View File
@@ -1162,7 +1162,6 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
## timer
aria.timer =
( aria.role.timer
& aria.prop.activedescendant?
& aria.state.expanded?
)
aria.role.timer =
+2
View File
@@ -96,6 +96,7 @@ datatypes w = "http://whattf.org/datatype-draft"
| common.attrs.aria.role.option
| common.attrs.aria.role.tab
| common.attrs.aria.role.treeitem
| common.attrs.aria.role.separator
| common.attrs.aria.role.presentation
)?
)
@@ -157,6 +158,7 @@ datatypes w = "http://whattf.org/datatype-draft"
| common.attrs.aria.role.menuitemradio
| common.attrs.aria.role.option
| common.attrs.aria.role.treeitem
| common.attrs.aria.role.separator
| common.attrs.aria.role.presentation
)?
)
+5
View File
@@ -367,6 +367,11 @@ common.attrs.other =
string
# w:default-style
## X-UA-Compatible
common.data.x-ua-compatible =
string
## Media Queries
common.data.mediaquery =
+3
View File
@@ -114,6 +114,7 @@ datatypes w = "http://whattf.org/datatype-draft"
& scripting.attr.oncanplaythrough?
& scripting.attr.onchange?
& scripting.attr.onclick?
& scripting.attr.onclose?
& scripting.attr.oncontextmenu?
& scripting.attr.ondblclick?
& scripting.attr.ondrag?
@@ -176,6 +177,8 @@ datatypes w = "http://whattf.org/datatype-draft"
attribute onchange { common.data.functionbody }
scripting.attr.onclick =
attribute onclick { common.data.functionbody }
scripting.attr.onclose =
attribute onclose { common.data.functionbody }
scripting.attr.oncontextmenu =
attribute oncontextmenu { common.data.functionbody }
scripting.attr.ondblclick =
+2 -6
View File
@@ -11,9 +11,7 @@ datatypes w = "http://whattf.org/datatype-draft"
time.attrs =
( common.attrs
& time.attrs.datetime?
& ( common.attrs.aria.role.presentation
| common.attrs.aria.role.menuitem
)?
& common.attrs.aria?
)
time.attrs.datetime =
attribute datetime {
@@ -39,9 +37,7 @@ datatypes w = "http://whattf.org/datatype-draft"
data.attrs =
( common.attrs
& data.attrs.value
& ( common.attrs.aria.role.presentation
| common.attrs.aria.role.menuitem
)?
& common.attrs.aria?
)
data.attrs.value =
attribute value {
+6
View File
@@ -174,6 +174,7 @@ namespace local = ""
| oncanplaythrough
| onchange
| onclick
| onclose
| oncontextmenu
| ondblclick
| ondrag
@@ -341,6 +342,7 @@ namespace local = ""
)
| object.attrs.type
)
& object.attrs.typemustmatch?
# & object.attrs.classid?
# & object.attrs.codebase?
# & object.attrs.codetype?
@@ -363,6 +365,10 @@ 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
View File
View File
@@ -29,7 +29,7 @@ its-locNote.type = string
its-locNoteType.type =
## Localization note is an alert
w:string "alert"
|
|
## Localization note is a description
w:string "description"
@@ -41,7 +41,7 @@ its-termInfoRef.type = w:iri-ref
its-term.type =
## The value 'yes' means that this is a term
w:string "yes"
|
|
## The value 'no' means that this is not a term
w:string "no"
@@ -51,10 +51,10 @@ its-termConfidence.type = its-confidence.type
its-withinText.type =
## The element and its content are part of the flow of its parent element
w:string "yes"
|
|
## The element splits the text flow of its parent element and its content is an independent text flow
w:string "no"
|
|
## The element is part of the flow of its parent element, its content is an independent flow
w:string "nested"
@@ -148,4 +148,4 @@ its-storageEncoding.type = string
its-lineBreakType.type = w:string "cr" | w:string "lf" | w:string "crlf"
its-annotatorsRef.type = string
its-annotatorsRef.type = string
@@ -131,7 +131,7 @@ its-html-attributes =
its-attribute.provRef.html?)
| its-attribute.provenanceRecordsRef.html)? &
(its-attribute.locQualityIssuesRef.html
|
|
((its-attribute.locQualityIssueType.html? & its-attribute.locQualityIssueComment.html?) & its-attribute.locQualityIssueSeverity.html? & its-attribute.locQualityIssueProfileRef.html? & its-attribute.locQualityIssueEnabled.html?)
)? &
(((its-attribute.locQualityRatingScore.html, its-attribute.locQualityRatingScoreThreshold.html?) | (its-attribute.locQualityRatingVote.html, its-attribute.locQualityRatingVoteThreshold.html?)), its-attribute.locQualityRatingProfileRef.html?)? &
@@ -140,4 +140,4 @@ its-html-attributes =
(its-attribute.storageSize.html, its-attribute.storageEncoding.html?, its-attribute.lineBreakType.html?)? &
its-attribute.annotatorsRef.html?
# FIXME: Find way how to validate stand-off markup inside <script>
# FIXME: Find way how to validate stand-off markup inside <script>
View File
+26 -1
View File
@@ -249,7 +249,7 @@ datatypes w = "http://whattf.org/datatype-draft"
)
meta.name.attrs.name =
attribute name {
w:meta-name
w:non-empty-string
}
meta.name.attrs.content =
attribute content {
@@ -315,6 +315,31 @@ datatypes w = "http://whattf.org/datatype-draft"
# if the definition is
# reused in another language
## "x-ua-compatible" pragma directive: <meta http-equiv='x-ua-compatible'>
meta.http-equiv.x-ua-compatible.elem =
element meta { meta.inner & meta.http-equiv.x-ua-compatible.attrs }
meta.http-equiv.x-ua-compatible.attrs =
( common.attrs.basic
& common.attrs.i18n
& common.attrs.present
& common.attrs.other
& meta.http-equiv.attrs.http-equiv.x-ua-compatible
& meta.http-equiv.attrs.content.x-ua-compatible
& ( common.attrs.aria.role.presentation
| common.attrs.aria.role.menuitem
)?
)
meta.http-equiv.attrs.http-equiv.x-ua-compatible =
attribute http-equiv {
w:string "x-ua-compatible"
}
meta.http-equiv.attrs.content.x-ua-compatible =
attribute content {
common.data.x-ua-compatible
}
common.elem.metadata |= meta.http-equiv.x-ua-compatible.elem
## Inline Character Encoding Statement for HTML: <meta charset>
meta.charset.elem =
View File
View File
View File
View File
View File
View File
View File
View File
View File
View File
+90 -147
View File
@@ -80,6 +80,18 @@ datatypes w = "http://whattf.org/datatype-draft"
## Shared attributes for <input>
shared-input.attrs =
( input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& shared-form.attrs.maxlength?
& shared-form.attrs.pattern?
& shared-form.attrs.placeholder?
& shared-form.attrs.readonly?
& shared-form.attrs.required?
& shared-form.attrs.size?
)
input.attrs.autocomplete =
attribute autocomplete {
w:string "on" | w:string "off"
@@ -108,77 +120,73 @@ datatypes w = "http://whattf.org/datatype-draft"
## Text Field: <input type='text'>, Extensions
input.text.attrs &=
( input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& shared-form.attrs.pattern?
& shared-form.attrs.required?
& shared-form.attrs.placeholder?
( 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?
)
## Password Field: <input type='password'>, Extensions
input.password.attrs &=
( input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& shared-form.attrs.pattern?
& shared-form.attrs.required?
( input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& shared-form.attrs.pattern?
& shared-form.attrs.placeholder?
& shared-form.attrs.required?
)
## Checkbox <input type='checkbox'>, Extensions
input.checkbox.attrs &=
( shared-form.attrs.autofocus?
& shared-form.attrs.required?
)
( shared-input.attrs )
## Radiobutton: <input type='radio'>, Extensions
input.radio.attrs &=
( shared-form.attrs.autofocus?
& shared-form.attrs.required?
)
( shared-input.attrs )
## Scripting Hook Button: <input type='button'>, Extensions
input.button.attrs &=
( shared-form.attrs.autofocus? )
( shared-input.attrs )
## Submit Button: <input type='submit'>, Extensions
input.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?
( shared-input.attrs
& shared-form.attrs.formaction?
& shared-form.attrs.formenctype?
& shared-form.attrs.formmethod?
& shared-form.attrs.formtarget?
& shared-form.attrs.formnovalidate?
)
## Reset Button: <input type='reset'>, Extensions
input.reset.attrs &=
( shared-form.attrs.autofocus? )
( shared-input.attrs )
## File Upload: <input type='file'>, Extensions
input.file.attrs &=
( shared-form.attrs.autofocus?
& shared-form.attrs.required?
& input.attrs.multiple?
( shared-input.attrs
& input.attrs.multiple?
)
## Image Submit Button: <input type='image'>, Extensions
input.image.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?
( shared-input.attrs
& shared-form.attrs.formaction?
& shared-form.attrs.formenctype?
& shared-form.attrs.formmethod?
& shared-form.attrs.formtarget?
& shared-form.attrs.formnovalidate?
& input.image.attrs.height?
& input.image.attrs.width?
)
@@ -198,16 +206,12 @@ datatypes w = "http://whattf.org/datatype-draft"
input.datetime.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& input.datetime.attrs.type
& input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& input.datetime.attrs.min?
& input.datetime.attrs.max?
& input.attrs.step.float?
& shared-form.attrs.readonly?
& shared-form.attrs.required?
& input.datetime.attrs.value?
& input.datetime.attrs.min?
& input.datetime.attrs.max?
& input.attrs.step.float?
& input.datetime.attrs.value?
& common.attrs.aria?
)
input.datetime.attrs.type =
@@ -236,16 +240,12 @@ datatypes w = "http://whattf.org/datatype-draft"
input.datetime-local.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& input.datetime-local.attrs.type
& input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& input.datetime-local.attrs.min?
& input.datetime-local.attrs.max?
& input.attrs.step.float?
& shared-form.attrs.readonly?
& shared-form.attrs.required?
& input.datetime-local.attrs.value?
& input.datetime-local.attrs.min?
& input.datetime-local.attrs.max?
& input.attrs.step.float?
& input.datetime-local.attrs.value?
& common.attrs.aria?
)
input.datetime-local.attrs.type =
@@ -274,16 +274,12 @@ datatypes w = "http://whattf.org/datatype-draft"
input.date.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& input.date.attrs.type
& input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& input.date.attrs.min?
& input.date.attrs.max?
& input.attrs.step.integer?
& shared-form.attrs.readonly?
& shared-form.attrs.required?
& input.date.attrs.value?
& input.date.attrs.min?
& input.date.attrs.max?
& input.attrs.step.integer?
& input.date.attrs.value?
& common.attrs.aria?
)
input.date.attrs.type =
@@ -312,16 +308,12 @@ datatypes w = "http://whattf.org/datatype-draft"
input.month.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& input.month.attrs.type
& input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& input.month.attrs.min?
& input.month.attrs.max?
& input.attrs.step.integer?
& shared-form.attrs.readonly?
& shared-form.attrs.required?
& input.month.attrs.value?
& input.month.attrs.min?
& input.month.attrs.max?
& input.attrs.step.integer?
& input.month.attrs.value?
& common.attrs.aria?
)
input.month.attrs.type =
@@ -350,16 +342,12 @@ datatypes w = "http://whattf.org/datatype-draft"
input.time.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& input.time.attrs.type
& input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& input.time.attrs.min?
& input.time.attrs.max?
& input.attrs.step.float?
& shared-form.attrs.readonly?
& shared-form.attrs.required?
& input.time.attrs.value?
& input.time.attrs.min?
& input.time.attrs.max?
& input.attrs.step.float?
& input.time.attrs.value?
& common.attrs.aria?
)
input.time.attrs.type =
@@ -388,16 +376,12 @@ datatypes w = "http://whattf.org/datatype-draft"
input.week.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& input.week.attrs.type
& input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& input.week.attrs.min?
& input.week.attrs.max?
& input.attrs.step.integer?
& shared-form.attrs.readonly?
& shared-form.attrs.required?
& input.week.attrs.value?
& input.week.attrs.min?
& input.week.attrs.max?
& input.attrs.step.integer?
& input.week.attrs.value?
& common.attrs.aria?
)
input.week.attrs.type =
@@ -426,17 +410,12 @@ datatypes w = "http://whattf.org/datatype-draft"
input.number.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& input.number.attrs.type
& input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& input.number.attrs.min?
& input.number.attrs.max?
& input.attrs.step.float?
& shared-form.attrs.readonly?
& shared-form.attrs.required?
& shared-form.attrs.placeholder?
& input.number.attrs.value?
& input.number.attrs.min?
& input.number.attrs.max?
& input.attrs.step.float?
& input.number.attrs.value?
& ( common.attrs.aria.implicit.spinbutton
| common.attrs.aria.role.spinbutton
)?
@@ -467,14 +446,12 @@ datatypes w = "http://whattf.org/datatype-draft"
input.range.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& input.range.attrs.type
& input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& input.range.attrs.min?
& input.range.attrs.max?
& input.attrs.step.float?
& input.range.attrs.value?
& input.range.attrs.min?
& input.range.attrs.max?
& input.attrs.step.float?
& input.range.attrs.value?
& ( common.attrs.aria.implicit.slider
| common.attrs.aria.role.slider
)?
@@ -505,16 +482,8 @@ datatypes w = "http://whattf.org/datatype-draft"
input.email.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& input.email.attrs.type
& input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& shared-form.attrs.maxlength?
& shared-form.attrs.pattern?
& shared-form.attrs.readonly?
& shared-form.attrs.required?
& shared-form.attrs.size?
& shared-form.attrs.placeholder?
& ( ( input.attrs.multiple
& input.email.attrs.value.multiple?
)
@@ -548,17 +517,9 @@ datatypes w = "http://whattf.org/datatype-draft"
input.url.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& input.url.attrs.type
& input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& shared-form.attrs.maxlength?
& shared-form.attrs.pattern?
& shared-form.attrs.readonly?
& shared-form.attrs.required?
& shared-form.attrs.size?
& shared-form.attrs.placeholder?
& input.url.attrs.value?
& input.url.attrs.value?
& ( common.attrs.aria.implicit.textbox
| common.attrs.aria.implicit.combobox
| common.attrs.aria.role.textbox
@@ -583,18 +544,10 @@ datatypes w = "http://whattf.org/datatype-draft"
input.search.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& input.search.attrs.type
& input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& shared-form.attrs.maxlength?
& shared-form.attrs.pattern?
& shared-form.attrs.readonly?
& shared-form.attrs.required?
& shared-form.attrs.size?
& shared-form.attrs.placeholder?
& input.search.attrs.value?
& shared-form.attrs.dirname?
& input.search.attrs.value?
& ( common.attrs.aria.implicit.textbox
| common.attrs.aria.implicit.combobox
| common.attrs.aria.role.textbox
@@ -619,17 +572,9 @@ datatypes w = "http://whattf.org/datatype-draft"
input.tel.attrs =
( common.attrs
& common-form.attrs
& shared-input.attrs
& input.tel.attrs.type
& input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& shared-form.attrs.maxlength?
& shared-form.attrs.pattern?
& shared-form.attrs.readonly?
& shared-form.attrs.required?
& shared-form.attrs.size?
& shared-form.attrs.placeholder?
& input.tel.attrs.value?
& input.tel.attrs.value?
& ( common.attrs.aria.implicit.textbox
| common.attrs.aria.implicit.combobox
| common.attrs.aria.role.textbox
@@ -655,10 +600,8 @@ datatypes w = "http://whattf.org/datatype-draft"
( common.attrs
& common-form.attrs
& input.color.attrs.type
& input.attrs.autocomplete?
& shared-form.attrs.autofocus?
& input.attrs.list?
& input.color.attrs.value?
& input.color.attrs.value?
& shared-input.attrs
& common.attrs.aria?
)
input.color.attrs.type =
@@ -1,5 +1,5 @@
<!--
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ its-locNote.type = string
its-locNoteType.type =
## Localization note is an alert
w:string "alert"
|
|
## Localization note is a description
w:string "description"
@@ -41,7 +41,7 @@ its-termInfoRef.type = w:iri-ref
its-term.type =
## The value 'yes' means that this is a term
w:string "yes"
|
|
## The value 'no' means that this is not a term
w:string "no"
@@ -51,10 +51,10 @@ its-termConfidence.type = its-confidence.type
its-withinText.type =
## The element and its content are part of the flow of its parent element
w:string "yes"
|
|
## The element splits the text flow of its parent element and its content is an independent text flow
w:string "no"
|
|
## The element is part of the flow of its parent element, its content is an independent flow
w:string "nested"
@@ -148,4 +148,4 @@ its-storageEncoding.type = string
its-lineBreakType.type = w:string "cr" | w:string "lf" | w:string "crlf"
its-annotatorsRef.type = string
its-annotatorsRef.type = string
@@ -131,7 +131,7 @@ its-html-attributes =
its-attribute.provRef.html?)
| its-attribute.provenanceRecordsRef.html)? &
(its-attribute.locQualityIssuesRef.html
|
|
((its-attribute.locQualityIssueType.html? & its-attribute.locQualityIssueComment.html?) & its-attribute.locQualityIssueSeverity.html? & its-attribute.locQualityIssueProfileRef.html? & its-attribute.locQualityIssueEnabled.html?)
)? &
(((its-attribute.locQualityRatingScore.html, its-attribute.locQualityRatingScoreThreshold.html?) | (its-attribute.locQualityRatingVote.html, its-attribute.locQualityRatingVoteThreshold.html?)), its-attribute.locQualityRatingProfileRef.html?)? &
@@ -140,4 +140,4 @@ its-html-attributes =
(its-attribute.storageSize.html, its-attribute.storageEncoding.html?, its-attribute.lineBreakType.html?)? &
its-attribute.annotatorsRef.html?
# FIXME: Find way how to validate stand-off markup inside <script>
# FIXME: Find way how to validate stand-off markup inside <script>
File diff suppressed because it is too large Load Diff
View File
@@ -6,7 +6,7 @@ include "html5/xhtml5full-xhtml.rnc" {
start = svg
}
include "svg11/svg11-inc.rnc"
include "inkscape/inkscape.rnc"
include "svg11/inkscape.rnc"
include "mml3/mathml3-inc.rnc"
include "rdf/rdf.rnc"
@@ -9,7 +9,7 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
## This is SVG, a language for describing two-dimensional graphics in XML.
## Copyright 2001, 2002 W3C (MIT, INRIA, Keio), All Rights Reserved.
##
## Modifications Copyright 2007 Mozilla Foundation
## Modifications Copyright 2007-2014 Mozilla Foundation
##
## $Id$
##
@@ -53,7 +53,7 @@ grammar {
SVG.base.attrib,
SVG.lang.attrib,
SVG.Core.extra.attrib,
attribute type { ContentType.datatype },
attribute type { ContentType.datatype }?,
attribute media { MediaDesc.datatype }?,
attribute title { Text.datatype }?
}
@@ -4,7 +4,7 @@ namespace rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
include "xhtml10/xhtml-strict.rnc"
include "svg11/svg11-inc.rnc"
include "inkscape/inkscape.rnc"
include "svg11/inkscape.rnc"
include "mml3/mathml3-inc.rnc"
include "rdf/rdf.rnc"
include "xhtml10/ruby.rnc"
@@ -3,7 +3,7 @@ namespace math = "http://www.w3.org/1998/Math/MathML"
namespace rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
include "svg11/svg11-inc.rnc"
include "inkscape/inkscape.rnc"
include "svg11/inkscape.rnc"
include "mml3/mathml3-inc.rnc"
include "rdf/rdf.rnc"