- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 20 Aug 2009 07:43:10 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup In directory hutz:/tmp/cvs-serv5083 Modified Files: Makefile Overview.html command.checkbox.html command.command.html command.radio.html common-models.html datalist.html link.html meta.charset.html meta.http-equiv.content-language.html meta.http-equiv.content-type.html meta.http-equiv.default-style.html meta.http-equiv.refresh.html meta.name.html nav.html noscript.html script.html spec.html style.html Log Message: added ARIA-integration version at http://dev.w3.org/html5/markup/aria/ - based on validator.nu HTML5+ARIA schema Index: Overview.html =================================================================== RCS file: /sources/public/html5/markup/Overview.html,v retrieving revision 1.350 retrieving revision 1.351 diff -u -d -r1.350 -r1.351 --- Overview.html 16 Aug 2009 15:46:27 -0000 1.350 +++ Overview.html 20 Aug 2009 07:43:06 -0000 1.351 @@ -9,7 +9,7 @@ <body> <div class="head"> <h1>HTML 5: The Markup Language</h1> -<h2>Editor’s Draft <em>17 August 2009</em> +<h2>Editor’s Draft <em>20 August 2009</em> </h2> <dl> <dt>Latest Editor’s Draft:</dt> @@ -42,7 +42,7 @@ <p> - This document is the 17 August 2009 Editor’s Draft of + This document is the 20 August 2009 Editor’s Draft of <cite>HTML 5: The Markup Language</cite>. </p> <p> Index: meta.name.html =================================================================== RCS file: /sources/public/html5/markup/meta.name.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- meta.name.html 16 Aug 2009 15:46:28 -0000 1.13 +++ meta.name.html 20 Aug 2009 07:43:07 -0000 1.14 @@ -98,8 +98,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li></ul> + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li></ul> </div> </div> <hr class="footerbreak"></hr> Index: nav.html =================================================================== RCS file: /sources/public/html5/markup/nav.html,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- nav.html 16 Aug 2009 10:53:43 -0000 1.16 +++ nav.html 20 Aug 2009 07:43:07 -0000 1.17 @@ -61,6 +61,10 @@ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul> </div> + <div class="no-number no-toc" id="nav-display"> + <h2 class="element-subhead">Typical default display properties <a class="hash" href="#nav-display">#</a></h2> + <div class="css-props" id="nav-css"><div class="selectors"><span class="selector">nav</span> { +</div><div class="properties"><div class="css-property"><span class="prop-name">display</span>: <span class="prop-value">block</span>; }</div></div></div></div> <div class="no-number no-toc" id="nav-details"> <h2 class="element-subhead">Details <a class="hash" href="#nav-details">#</a></h2><div class="details"> <p>Not all groups of links on a page need to be in a <a href="nav.html#nav" class="element">nav</a> element — only Index: meta.http-equiv.content-type.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- meta.http-equiv.content-type.html 16 Aug 2009 10:53:43 -0000 1.14 +++ meta.http-equiv.content-type.html 20 Aug 2009 07:43:07 -0000 1.15 @@ -86,8 +86,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li></ul> + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li></ul> </div> <div class="no-number no-toc" id="meta.http-equiv.content-type-details"> Index: meta.http-equiv.content-language.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.content-language.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- meta.http-equiv.content-language.html 16 Aug 2009 10:53:43 -0000 1.7 +++ meta.http-equiv.content-language.html 20 Aug 2009 07:43:07 -0000 1.8 @@ -72,8 +72,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li></ul> + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li></ul> </div> </div> <hr class="footerbreak"></hr> Index: script.html =================================================================== RCS file: /sources/public/html5/markup/script.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- script.html 16 Aug 2009 15:46:28 -0000 1.18 +++ script.html 20 Aug 2009 07:43:07 -0000 1.19 @@ -119,8 +119,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li> <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul> </div> Index: meta.http-equiv.default-style.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.default-style.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- meta.http-equiv.default-style.html 16 Aug 2009 10:53:43 -0000 1.13 +++ meta.http-equiv.default-style.html 20 Aug 2009 07:43:07 -0000 1.14 @@ -81,8 +81,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li> <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> Index: command.command.html =================================================================== RCS file: /sources/public/html5/markup/command.command.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- command.command.html 16 Aug 2009 10:53:41 -0000 1.13 +++ command.command.html 20 Aug 2009 07:43:07 -0000 1.14 @@ -81,8 +81,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li> <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul> </div> </div> Index: link.html =================================================================== RCS file: /sources/public/html5/markup/link.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- link.html 16 Aug 2009 10:53:43 -0000 1.13 +++ link.html 20 Aug 2009 07:43:07 -0000 1.14 @@ -104,8 +104,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li> <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> Index: meta.http-equiv.refresh.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.refresh.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- meta.http-equiv.refresh.html 16 Aug 2009 10:53:43 -0000 1.11 +++ meta.http-equiv.refresh.html 20 Aug 2009 07:43:07 -0000 1.12 @@ -85,8 +85,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li> <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> Index: Makefile =================================================================== RCS file: /sources/public/html5/markup/Makefile,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- Makefile 16 Aug 2009 10:53:40 -0000 1.76 +++ Makefile 20 Aug 2009 07:43:06 -0000 1.77 @@ -22,11 +22,8 @@ #INCELIM_BASE_URL=http://dev.w3.org/buildtools/rng/deps/ INCELIM_DIR=rng-incelim-1.2 WHATTF_BASE_URL=http://svn.versiondude.net/whattf/syntax/trunk/relaxng/ -HTML_RNC=html.rnc -HTML_RNC_SOURCE=schema -HTML_RNG=$(basename $(notdir $(HTML_RNC))).rng -OTHER_RNG=$(foreach rnc,$(wildcard $(HTML_RNC_SOURCE)/*.rnc),$(basename $(notdir $(rnc))).rng) -HTML_COMPILED_RNG=$(basename $(HTML_RNG))-compiled.rng +OTHER_RNG=$(foreach rnc,$(wildcard schema/*.rnc),$(basename $(notdir $(rnc))).rng) +ARIA_OTHER_RNG=$(foreach rnc,$(wildcard schema/*.rnc),aria/$(basename $(notdir $(rnc))).rng) COMBINE_XSL_URL=http://dev.w3.org/buildtools/rng/combine/combine.xsl ELEMENTS=$(wildcard elements/*.html) @@ -40,40 +37,34 @@ all: Overview.html spec.html -$(HTML_RNC_SOURCE): patch-schema +schema: patch-schema ifeq ($(WHATTF_SCHEMA),) $(SVN) $(SVNFLAGS) checkout --depth=files $(WHATTF_BASE_URL) $@ else - cp -pR $(WHATTF_SCHEMA) $(HTML_RNC_SOURCE) + cp -pR $(WHATTF_SCHEMA) schema endif -$(PATCH) $(PATCHFLAGS) < $< -$(HTML_RNG): $(HTML_RNC_SOURCE) - $(TRANG) $(TRANGFLAGS) $(HTML_RNC) $(HTML_RNG) +html.rng: schema + $(TRANG) $(TRANGFLAGS) html.rnc $@ -$(HTML_COMPILED_RNG): $(HTML_RNG) +html-compiled.rng: html.rng INCELIM=$(realpath $(INCELIM_DIR)) sh $(INCELIM_DIR)/$(INCELIM) $(INCELIMFLAGS) $< -$(HTML_COMPILED_RNG).combined: $(HTML_COMPILED_RNG) tools/combine.xsl - $(XSLTPROC) $(XSLTPROCFLAGS) tools/combine.xsl $< > $@ - -#schema.rnc: $(HTML_COMPILED_RNG).combined -# $(TRANG) $(TRANGFLAGS) -I rng -O rnc $< $@.tmp -# # do correction for trang problem that creates undesirable -# # newlines before annotations -# $(PERL) $(PERLFLAGS) -p -e 'undef $$/; s/#\n\s*\n(\s*)#/#\n$$1#/g' $@.tmp > $@ +html-compiled.rng.combined: html-compiled.rng tools/combine.xsl tools/strip-comments.xsl + $(XSLTPROC) $(XSLTPROCFLAGS) tools/combine.xsl $< \ + | $(XSLTPROC) $(XSLTPROCFLAGS) tools/strip-comments.xsl - > $@ -#html.rnc.xml: schema.rnc -# echo "<schema>" > $@ -# $(PERL) $(PERLFLAGS) -p -e "s/&/&/g" $< | $(PERL) $(PERLFLAGS) -p -e "s/</</g" >> $@ -# echo "</schema>" >> $@ +html.rnc.spec.html: html-compiled.rng.combined + $(CURL) $(CURLFLAGS) -F "rngfile=@$(realpath $<);type=text/html" $(TRANG_HTML_SPEC_CGI) -o $@ + $(PERL) $(PERLFLAGS) -pi -e 'undef $$/; s/\s+<a[^<]+<\/a> notAllowed//g' $@ LICENSE.xml: schema/LICENSE echo "<license>" > $@ $(PERL) $(PERLFLAGS) -p -e "s/&/&/g" $< | $(PERL) $(PERLFLAGS) -p -e "s/</</g" >> $@ echo "</license>" >> $@ -$(HTML_RNC_SOURCE)/assertions.sch: $(HTML_RNC_SOURCE) +schema/assertions.sch: schema html.css: $(CURL) $(CURLFLAGS) -o $@ http://svn.webkit.org/repository/webkit/trunk/WebCore/css/html.css @@ -86,31 +77,11 @@ html.css.xml: html.css tools/css2xml ./tools/css2xml $< > $@ -#schema.html: $(HTML_COMPILED_RNG).combined -# $(CURL) $(CURLFLAGS) -F "rngfile=@$(realpath $<);type=text/html" $(TRANG_HTML_CGI) -o $@ - -$(HTML_COMPILED_RNG).combined.spec: $(HTML_COMPILED_RNG).combined tools/strip-comments.xsl - $(XSLTPROC) $(XSLTPROCFLAGS) tools/strip-comments.xsl $< > $@ - -html.rnc.spec.html: $(HTML_COMPILED_RNG).combined.spec - $(CURL) $(CURLFLAGS) -F "rngfile=@$(realpath $<);type=text/html" $(TRANG_HTML_SPEC_CGI) -o $@ - $(PERL) $(PERLFLAGS) -pi -e 'undef $$/; s/\s+& notAllowed//g' $@ - -webapps.html: - $(CURL) $(CURLFLAGS) http://www.whatwg.org/specs/web-apps/current-work/ \ - | $(PARSE) $(PARSEFLAGS) - > $@ - -elements-generated.html: webapps.html tools/get-elements.xsl - $(XSLTPROC) $(XSLTPROCFLAGS) tools/get-elements.xsl $< \ - | $(PERL) $(PERLFLAGS) -pi -e 'undef $$/; s/\s+<\/p>/<\/p>/g' \ - | $(PERL) $(PERLFLAGS) -pi -e 'undef $$/; s/ xmlns=""//g' \ - > $@ - elements/h2.html elements/h3.html elements/h4.html elements/h5.html elements/h6.html: elements/h1.html cp $< $@ -html.spec.src.html: $(HTML_COMPILED_RNG) html.rnc.spec.html \ - tools/generate-spec-source.xsl $(HTML_RNC_SOURCE)/assertions.sch \ +html.spec.src.html: html-compiled.rng html.rnc.spec.html \ + tools/generate-spec-source.xsl schema/assertions.sch \ src/head.html src/header.src.html src/intro-scope.html \ src/terms.html src/syntax.html src/documents.html \ $(ELEMENTS) src/attributes.html src/datatypes.html src/references.html \ @@ -119,20 +90,92 @@ Overview.html: html.spec.src.html src/status.html tools/specgen.xsl tools/toc.xsl tools/chunker.xsl $(XSLTPROC) $(XSLTPROCFLAGS) \ - --param chunk 1 --stringparam TOC-file "$@" --param quiet 1 \ + --param chunk 1 --stringparam TOC-file "Overview.html" --param quiet 1 \ tools/specgen.xsl $< \ | $(TOHTML) 2>/dev/null \ > $@ spec.html: html.spec.src.html src/status.html tools/specgen.xsl tools/toc.xsl $(XSLTPROC) $(XSLTPROCFLAGS) \ - --stringparam TOC-file "$@" \ + --stringparam TOC-file "spec.html" \ + tools/specgen.xsl $< \ + | $(TOHTML) 2>/dev/null \ + > $@ + +aria: aria/Overview.html aria/spec.html + +aria/html.rng: schema + $(TRANG) $(TRANGFLAGS) aria/html.rnc $@ + +aria/html-compiled.rng: aria/html.rng + INCELIM=$(realpath $(INCELIM_DIR)) sh $(INCELIM_DIR)/$(INCELIM) $(INCELIMFLAGS) $< + +aria/html-compiled.rng.combined: aria/html-compiled.rng tools/combine.xsl tools/strip-comments.xsl + $(XSLTPROC) $(XSLTPROCFLAGS) tools/combine.xsl $< \ + | $(XSLTPROC) $(XSLTPROCFLAGS) tools/strip-comments.xsl - > $@ + +aria/html.rnc.spec.html: aria/html-compiled.rng.combined + $(CURL) $(CURLFLAGS) -F "rngfile=@$(realpath $<);type=text/html" $(TRANG_HTML_SPEC_CGI) -o $@ + $(PERL) $(PERLFLAGS) -pi -e 'undef $$/; s/\s+<a[^<]+<\/a> notAllowed//g' $@ + +aria/html.spec.src.html: aria/html-compiled.rng aria/html.rnc.spec.html \ + tools/generate-spec-source.xsl schema/assertions.sch \ + src/head.html src/header.src.html src/intro-scope.html \ + src/terms.html src/syntax.html src/documents.html \ + $(ELEMENTS) src/attributes.html src/datatypes.html src/references.html \ + LICENSE.xml html.css.xml html.css.LICENSE.xml + $(XSLTPROC) $(XSLTPROCFLAGS) --param aria 1 --stringparam rnc-html "../aria/html.rnc.spec.html" tools/generate-spec-source.xsl $< > $@ + +aria/Overview.html: aria/html.spec.src.html src/status.html tools/specgen.xsl tools/toc.xsl tools/chunker.xsl + $(XSLTPROC) $(XSLTPROCFLAGS) \ + --param aria 1 --param chunk 1 --stringparam TOC-file "Overview.html" --param quiet 1 \ + tools/specgen.xsl $< \ + | $(TOHTML) 2>/dev/null \ + > $@ + +aria/spec.html: aria/html.spec.src.html src/status.html tools/specgen.xsl tools/toc.xsl + $(XSLTPROC) $(XSLTPROCFLAGS) \ + --stringparam TOC-file "spec.html" \ tools/specgen.xsl $< \ | $(TOHTML) 2>/dev/null \ > $@ +aria/style.css: style.css + cp $< $@ + +aria/W3C-ED.css: W3C-ED.css + cp $< $@ + +aria/logo-ED.png: logo-ED.png + cp $< $@ + +webapps.html: + $(CURL) $(CURLFLAGS) http://www.whatwg.org/specs/web-apps/current-work/ \ + | $(PARSE) $(PARSEFLAGS) - > $@ + +elements-generated.html: webapps.html tools/get-elements.xsl + $(XSLTPROC) $(XSLTPROCFLAGS) tools/get-elements.xsl $< \ + | $(PERL) $(PERLFLAGS) -pi -e 'undef $$/; s/\s+<\/p>/<\/p>/g' \ + | $(PERL) $(PERLFLAGS) -pi -e 'undef $$/; s/ xmlns=""//g' \ + > $@ + +#schema.rnc: html-compiled.rng.combined +# $(TRANG) $(TRANGFLAGS) -I rng -O rnc $< $@.tmp +# # do correction for trang problem that creates undesirable +# # newlines before annotations +# $(PERL) $(PERLFLAGS) -p -e 'undef $$/; s/#\n\s*\n(\s*)#/#\n$$1#/g' $@.tmp > $@ + +#html.rnc.xml: schema.rnc +# echo "<schema>" > $@ +# $(PERL) $(PERLFLAGS) -p -e "s/&/&/g" $< | $(PERL) $(PERLFLAGS) -p -e "s/</</g" >> $@ +# echo "</schema>" >> $@ + +#schema.html: html-compiled.rng.combined +# $(CURL) $(CURLFLAGS) -F "rngfile=@$(realpath $<);type=text/html" $(TRANG_HTML_CGI) -o $@ + clean: - $(RM) -r $(HTML_RNC_SOURCE) + $(RM) -r schema + $(RM) html.rng $(RM) html.rnc.spec.html $(RM) html.css $(RM) LICENSE.xml @@ -143,6 +186,13 @@ ifneq ($(OTHER_RNG),) $(RM) $(OTHER_RNG) endif - $(RM) $(HTML_COMPILED_RNG) - $(RM) $(HTML_COMPILED_RNG).combined - $(RM) $(HTML_COMPILED_RNG).combined.spec + $(RM) html-compiled.rng + $(RM) html-compiled.rng.combined + $(RM) aria/html.rng + $(RM) aria/html.rnc.spec.html + $(RM) aria/html.spec.src.html +ifneq ($(ARIA_OTHER_RNG),) + $(RM) $(ARIA_OTHER_RNG) +endif + $(RM) aria/html-compiled.rng + $(RM) aria/html-compiled.rng.combined Index: command.radio.html =================================================================== RCS file: /sources/public/html5/markup/command.radio.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- command.radio.html 16 Aug 2009 10:53:41 -0000 1.13 +++ command.radio.html 20 Aug 2009 07:43:07 -0000 1.14 @@ -93,8 +93,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li> <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul> </div> </div> Index: common-models.html =================================================================== RCS file: /sources/public/html5/markup/common-models.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- common-models.html 16 Aug 2009 10:53:41 -0000 1.15 +++ common-models.html 20 Aug 2009 07:43:07 -0000 1.16 @@ -80,8 +80,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed) + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>) </dd> </dl> </div> Index: style.html =================================================================== RCS file: /sources/public/html5/markup/style.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- style.html 16 Aug 2009 15:46:28 -0000 1.17 +++ style.html 20 Aug 2009 07:43:07 -0000 1.18 @@ -91,8 +91,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li> <li class="context-mdl"><a href="div.html#div-mdl">div</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li> Index: command.checkbox.html =================================================================== RCS file: /sources/public/html5/markup/command.checkbox.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- command.checkbox.html 16 Aug 2009 10:53:41 -0000 1.13 +++ command.checkbox.html 20 Aug 2009 07:43:07 -0000 1.14 @@ -88,8 +88,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li> <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul> </div> </div> Index: noscript.html =================================================================== RCS file: /sources/public/html5/markup/noscript.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- noscript.html 16 Aug 2009 10:53:43 -0000 1.15 +++ noscript.html 20 Aug 2009 07:43:07 -0000 1.16 @@ -85,8 +85,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li> <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li> <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul> </div> Index: spec.html =================================================================== RCS file: /sources/public/html5/markup/spec.html,v retrieving revision 1.96 retrieving revision 1.97 diff -u -d -r1.96 -r1.97 --- spec.html 16 Aug 2009 15:46:28 -0000 1.96 +++ spec.html 20 Aug 2009 07:43:07 -0000 1.97 @@ -9,7 +9,7 @@ <body> <div class="head"> <h1>HTML 5: The Markup Language</h1> -<h2>Editor’s Draft <em>17 August 2009</em> +<h2>Editor’s Draft <em>20 August 2009</em> </h2> <dl> <dt>Latest Editor’s Draft:</dt> @@ -41,7 +41,7 @@ <p> - This document is the 17 August 2009 Editor’s Draft of + This document is the 20 August 2009 Editor’s Draft of <cite>HTML 5: The Markup Language</cite>. </p> <p> @@ -4797,8 +4797,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li> <li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li> </ul> </div> @@ -4903,8 +4902,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li> <li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li> </ul> </div> @@ -5003,8 +5001,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li> <li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li> </ul> </div> @@ -5198,6 +5195,17 @@ <ul><li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li></ul> </div> + <div class="no-number no-toc" id="datalist-display"> + <h2 class="element-subhead">Typical default display properties <a class="hash" href="#datalist-display">#</a> +</h2> + <div class="css-props" id="datalist-css"> +<div class="selectors"> +<span class="selector">datalist</span> { +</div> +<div class="properties"><div class="css-property"> +<span class="prop-name">display</span>: <span class="prop-value">none</span>; }</div></div> +</div> +</div> <div class="no-number no-toc" id="datalist-details"> <h2 class="element-subhead">Details <a class="hash" href="#datalist-details">#</a> </h2> @@ -10602,8 +10610,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li> <li class="context-mdl"> <a href="#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="#link">link</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a> @@ -11000,8 +11007,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li></ul> + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li></ul> </div> </div> <div id="meta.http-equiv.refresh" class="section"> @@ -11092,8 +11098,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li> <li class="context-mdl"> <a href="#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="#link">link</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a> @@ -11187,8 +11192,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li> <li class="context-mdl"> <a href="#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="#link">link</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a> @@ -11272,8 +11276,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li></ul> + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li></ul> </div> </div> <div id="meta.charset" class="section"> @@ -11352,8 +11355,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li></ul> + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li></ul> </div> </div> <div id="meta.http-equiv.content-type" class="section"> @@ -11445,8 +11447,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li></ul> + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li></ul> </div> <div class="no-number no-toc" id="meta.http-equiv.content-type-details"> @@ -11702,6 +11703,17 @@ <ul><li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li></ul> </div> + <div class="no-number no-toc" id="nav-display"> + <h2 class="element-subhead">Typical default display properties <a class="hash" href="#nav-display">#</a> +</h2> + <div class="css-props" id="nav-css"> +<div class="selectors"> +<span class="selector">nav</span> { +</div> +<div class="properties"><div class="css-property"> +<span class="prop-name">display</span>: <span class="prop-value">block</span>; }</div></div> +</div> +</div> <div class="no-number no-toc" id="nav-details"> <h2 class="element-subhead">Details <a class="hash" href="#nav-details">#</a> </h2> @@ -11801,8 +11813,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li> <li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li> <li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li> </ul> @@ -12963,8 +12974,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li> <li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li> </ul> </div> @@ -13536,8 +13546,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li> + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li> <li class="context-mdl"> <a href="#div-mdl">div</a> = <a class="ref" href="#style.elem.scoped">style.elem.scoped</a><a href="#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a> (<a class="ref" href="#normal-character-data">normal-character-data</a> @@ -14886,8 +14895,7 @@ <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a> <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a> - <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed) + <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>) </dd> </dl> </div> Index: datalist.html =================================================================== RCS file: /sources/public/html5/markup/datalist.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- datalist.html 16 Aug 2009 10:53:41 -0000 1.15 +++ datalist.html 20 Aug 2009 07:43:07 -0000 1.16 @@ -50,6 +50,10 @@ <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul> </div> + <div class="no-number no-toc" id="datalist-display"> + <h2 class="element-subhead">Typical default display properties <a class="hash" href="#datalist-display">#</a></h2> + <div class="css-props" id="datalist-css"><div class="selectors"><span class="selector">datalist</span> { +</div><div class="properties"><div class="css-property"><span class="prop-name">display</span>: <span class="prop-value">none</span>; }</div></div></div></div> <div class="no-number no-toc" id="datalist-details"> <h2 class="element-subhead">Details <a class="hash" href="#datalist-details">#</a></h2><div class="details"> <p>The <a href="syntax.html#contents">contents</a> Index: meta.charset.html =================================================================== RCS file: /sources/public/html5/markup/meta.charset.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- meta.charset.html 16 Aug 2009 10:53:43 -0000 1.14 +++ meta.charset.html 20 Aug 2009 07:43:07 -0000 1.15 @@ -74,8 +74,7 @@ <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>) <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a> <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> notAllowed)</li></ul> + <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li></ul> </div> </div> <hr class="footerbreak"></hr>
Received on Thursday, 20 August 2009 07:43:51 UTC