diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
| commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /xml/relaxng/src/resources/html5-schema/html5/common.rnc | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
| download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'xml/relaxng/src/resources/html5-schema/html5/common.rnc')
| -rwxr-xr-x | xml/relaxng/src/resources/html5-schema/html5/common.rnc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/xml/relaxng/src/resources/html5-schema/html5/common.rnc b/xml/relaxng/src/resources/html5-schema/html5/common.rnc index 9f1e65673bd2..09afb1454233 100755 --- a/xml/relaxng/src/resources/html5-schema/html5/common.rnc +++ b/xml/relaxng/src/resources/html5-schema/html5/common.rnc @@ -113,9 +113,7 @@ common.attrs = ) common.attrs.basic = - ( ( common.attrs.id - | common.attrs.xml-id - )? # REVISIT assuming only either one is allowed + ( common.attrs.id? & common.attrs.class? & common.attrs.title? & common.attrs.base? @@ -125,10 +123,6 @@ common.attrs.basic = attribute id { common.data.id } - common.attrs.xml-id = - attribute xml:id { - xsd:NCName - } & XMLonly common.attrs.class = attribute class { common.data.tokens @@ -387,6 +381,10 @@ common.attrs.other = common.data.keylabellist = w:keylabellist +## List of Source Sizes + common.data.source.size.list = + w:source-size-list + ## Microdata Properties common.data.microdata-properties = list { w:microdata-property+ } @@ -466,7 +464,7 @@ common.attrs.aria.implicit.article = ( notAllowed ) common.attrs.aria.implicit.banner = ( notAllowed ) common.attrs.aria.implicit.button = ( notAllowed ) common.attrs.aria.implicit.checkbox = ( notAllowed ) -common.attrs.aria.implicit.columnheader = ( notAllowed ) +common.attrs.aria.implicit.column-or-row-header = ( notAllowed ) common.attrs.aria.implicit.combobox = ( notAllowed ) common.attrs.aria.implicit.complementary = ( notAllowed ) common.attrs.aria.implicit.contentinfo = ( notAllowed ) @@ -486,7 +484,6 @@ common.attrs.aria.implicit.option = ( notAllowed ) common.attrs.aria.implicit.progressbar = ( notAllowed ) common.attrs.aria.implicit.radio = ( notAllowed ) common.attrs.aria.implicit.region = ( notAllowed ) -common.attrs.aria.implicit.rowheader = ( notAllowed ) common.attrs.aria.implicit.section = ( notAllowed ) common.attrs.aria.implicit.select = ( notAllowed ) common.attrs.aria.implicit.slider = ( notAllowed ) |