Skip to content

Commit 504f2d0

Browse files
committed
[css-syntax][cssom] Move the definition of the environment encoding for <?xml-stylesheet?>
https://www.w3.org/Bugs/Public/show_bug.cgi?id=24391
1 parent d85e9a0 commit 504f2d0

4 files changed

Lines changed: 62 additions & 54 deletions

File tree

css-syntax/Overview.html

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</p>
5555
<h1 class="p-name no-ref" id=title>CSS Syntax Module Level 3</h1>
5656
<h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
57-
<span class=dt-updated><span class=value-title title=20140201>1 February 2014</span></span></span></h2>
57+
<span class=dt-updated><span class=value-title title=20140206>6 February 2014</span></span></span></h2>
5858
<div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/css-syntax/>http://dev.w3.org/csswg/css-syntax/</a><dt>Latest version:<dd><a href=http://www.w3.org/TR/css-syntax-3/>http://www.w3.org/TR/css-syntax-3/</a><dt>Editor’s Draft:<dd><a href=http://dev.w3.org/csswg/css-syntax/>http://dev.w3.org/csswg/css-syntax/</a><dt>Previous Versions:<dd><a href=http://www.w3.org/TR/2013/WD-css-syntax-3-20131105/ rel=previous>http://www.w3.org/TR/2013/WD-css-syntax-3-20131105/</a><dd><a href=http://www.w3.org/TR/2013/WD-css-syntax-3-20130919/ rel=previous>http://www.w3.org/TR/2013/WD-css-syntax-3-20130919/</a>
5959
<dt>Feedback:</dt>
6060
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-syntax%5D%20feedback">www-style@w3.org</a>
@@ -115,8 +115,7 @@ <h2 class="no-num no-toc no-ref heading settled heading" id=contents><span class
115115
Overview of the Parsing Model</a><li><a href=#input-byte-stream><span class=secno>3.2</span>
116116
The input byte stream</a><li><a href=#environment-encoding><span class=secno>3.3</span>
117117
Environment encoding</a><ul class=toc><li><a href=#environment-encoding-at-import><span class=secno>3.3.1</span>
118-
<span class=css data-link-type=maybe title=@import>@import</span> rules</a><li><a href=#environment-encoding-xml><span class=secno>3.3.2</span>
119-
XML</a></ul><li><a href=#input-preprocessing><span class=secno>3.4</span>
118+
<span class=css data-link-type=maybe title=@import>@import</span> rules</a></ul><li><a href=#input-preprocessing><span class=secno>3.4</span>
120119
Preprocessing the input stream</a></ul><li><a href=#tokenization><span class=secno>4</span>
121120
Tokenization</a><ul class=toc><li><a href=#token-diagrams><span class=secno>4.1</span>
122121
Token Railroad Diagrams</a><li><a href=#tokenizer-definitions><span class=secno>4.2</span>
@@ -241,7 +240,7 @@ <h2 class="heading settled heading" data-level=2 id=syntax-description><span cla
241240
<p> "<code>color: blue;</code>" is a declaration specifying that,
242241
for the elements that match the selector,
243242
their <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-color-3/#color0 title=color>color</a> property should have the value <span class=css data-link-type=maybe title=blue>blue</span>.
244-
Similiarly, their <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-text-decor-3/#text-decoration title=text-decoration>text-decoration</a> property should have the value <span class=css data-link-type=maybe title=underline>underline</span>.
243+
Similarly, their <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-text-decor-3/#text-decoration title=text-decoration>text-decoration</a> property should have the value <span class=css data-link-type=maybe title=underline>underline</span>.
245244
</div>
246245

247246
<p> At-rules are all different, but they have a basic structure in common.
@@ -533,6 +532,8 @@ <h3 class="heading settled heading" data-level=3.3 id=environment-encoding><span
533532

534533
<p class=note> Note: <a data-biblio-type=informative data-link-type=biblio href=#html title=html>[HTML]</a> defines <a href=http://www.whatwg.org/specs/web-apps/current-work/multipage/links.html#link-type-stylesheet>the environment encoding for <code>&lt;link rel=stylesheet&gt;</code></a>.
535534

535+
<p class=note> Note: <a data-biblio-type=informative data-link-type=biblio href=#cssom title=cssom>[CSSOM]</a> defines <a href=http://dev.w3.org/csswg/cssom/#requirements-on-user-agents-implementing-the-xml-stylesheet-processing-instruction>the environment encoding for <code>&lt;xml-stylesheet?&gt;</code></a>.
536+
536537
<h4 class="heading settled heading" data-level=3.3.1 id=environment-encoding-at-import><span class=secno>3.3.1 </span><span class=content>
537538
<a class=css data-link-type=maybe href=http://dev.w3.org/csswg/css-cascade-3/#at-ruledef-import title=@import>@import</a> rules</span><a class=self-link href=#environment-encoding-at-import></a></h4>
538539

@@ -541,25 +542,6 @@ <h4 class="heading settled heading" data-level=3.3.1 id=environment-encoding-at-
541542

542543
<p class=note> Note: This is expected to move to a future version of <a data-biblio-type=informative data-link-type=biblio href=#css3cascade title=css3cascade>[CSS3CASCADE]</a>.
543544

544-
<h4 class="heading settled heading" data-level=3.3.2 id=environment-encoding-xml><span class=secno>3.3.2 </span><span class=content>
545-
XML</span><a class=self-link href=#environment-encoding-xml></a></h4>
546-
547-
<p> For stylesheets referred to by an <a href=http://www.w3.org/TR/xml-stylesheet/#the-xml-stylesheet-processing-instruction><code>xml-stylesheet</code></a> processing instruction <a data-biblio-type=normative data-link-type=biblio href=#xmlstyle title=xmlstyle>[XMLSTYLE]</a>,
548-
the <a data-link-type=dfn href=#environment-encoding0 title="environment encoding">environment encoding</a> is determined as follows:
549-
550-
<p> <ul>
551-
<li>
552-
<a href=http://encoding.spec.whatwg.org/#concept-encoding-get>Get an encoding</a> <a data-biblio-type=normative data-link-type=biblio href=#encoding title=encoding>[ENCODING]</a>
553-
for the value of the <code>charset</code> <a href=http://www.w3.org/TR/xml-stylesheet/#dt-pseudo-attribute>pseudo-attribute</a> of the processing instruction, if any.
554-
If that does not return failure,
555-
use the return value as the environment encoding.
556-
557-
<li>
558-
Otherwise, use the encoding of the referring document.
559-
</ul>
560-
561-
<p class=note> Note: This is expected to move to <a data-biblio-type=informative data-link-type=biblio href=#cssom title=cssom>[CSSOM]</a>.
562-
563545

564546
<h3 class="heading settled heading" data-level=3.4 id=input-preprocessing><span class=secno>3.4 </span><span class=content>
565547
Preprocessing the input stream</span><a class=self-link href=#input-preprocessing></a></h3>
@@ -5010,7 +4992,7 @@ <h2 class="no-num no-ref heading settled heading" id=references><span class=cont
50104992

50114993
<h3 class="no-num no-ref heading settled heading" id=normative><span class=content>
50124994
Normative References</span><a class=self-link href=#normative></a></h3>
5013-
<div data-fill-with=normative-references><dl><dt id=css21 title=CSS21><a class=self-link href=#css21></a>[CSS21]<dd>Bert Bos; et al. <a href=http://www.w3.org/TR/2011/REC-CSS2-20110607>Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification</a>. 7 June 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-CSS2-20110607>http://www.w3.org/TR/2011/REC-CSS2-20110607</a><dt id=css3cascade title=CSS3CASCADE><a class=self-link href=#css3cascade></a>[CSS3CASCADE]<dd>Håkon Wium Lie; Elika J. Etemad; Tab Atkins Jr.. <a href=http://www.w3.org/TR/2013/CR-css-cascade-3-20131003/>CSS Cascading and Inheritance Level 3</a>. 3 October 2013. W3C Candidate Recommendation. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/CR-css-cascade-3-20131003/>http://www.w3.org/TR/2013/CR-css-cascade-3-20131003/</a><dt id=encoding title=ENCODING><a class=self-link href=#encoding></a>[ENCODING]<dd>Anne van Kesteren; Joshua Bell. <a href=http://encoding.spec.whatwg.org/>Encoding</a>. Living Standard. URL: <a href=http://encoding.spec.whatwg.org/>http://encoding.spec.whatwg.org/</a><dt id=rfc2119 title=RFC2119><a class=self-link href=#rfc2119></a>[RFC2119]<dd>S. Bradner. <a href=http://www.ietf.org/rfc/rfc2119.txt>Key words for use in RFCs to Indicate Requirement Levels</a>. URL: <a href=http://www.ietf.org/rfc/rfc2119.txt>http://www.ietf.org/rfc/rfc2119.txt</a><dt id=select title=SELECT><a class=self-link href=#select></a>[SELECT]<dd>Tantek Çelik; et al. <a href=http://www.w3.org/TR/2011/REC-css3-selectors-20110929/>Selectors Level 3</a>. 29 September 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-css3-selectors-20110929/>http://www.w3.org/TR/2011/REC-css3-selectors-20110929/</a><dt id=unicode title=UNICODE><a class=self-link href=#unicode></a>[UNICODE]<dd>The Unicode Consortium. <a href=http://www.unicode.org/standard/versions/enumeratedversions.html>The Unicode Standard</a>. 2012. Defined by: The Unicode Standard, Version 6.2.0 (Mountain View, CA: The Unicode Consortium, 2012. ISBN 978-1-936213-07-8), as updated from time to time by the publication of new versions URL: <a href=http://www.unicode.org/standard/versions/enumeratedversions.html>http://www.unicode.org/standard/versions/enumeratedversions.html</a><dt id=xmlstyle title=XMLSTYLE><a class=self-link href=#xmlstyle></a>[XMLSTYLE]<dd>James Clark. <a href=http://www.w3.org/1999/06/REC-xml-stylesheet-19990629>Associating Style Sheets with XML documents</a>. 29 June 1999. W3C Recommendation. URL: <a href=http://www.w3.org/1999/06/REC-xml-stylesheet-19990629>http://www.w3.org/1999/06/REC-xml-stylesheet-19990629</a></dl></div>
4995+
<div data-fill-with=normative-references><dl><dt id=css21 title=CSS21><a class=self-link href=#css21></a>[CSS21]<dd>Bert Bos; et al. <a href=http://www.w3.org/TR/2011/REC-CSS2-20110607>Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification</a>. 7 June 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-CSS2-20110607>http://www.w3.org/TR/2011/REC-CSS2-20110607</a><dt id=css3cascade title=CSS3CASCADE><a class=self-link href=#css3cascade></a>[CSS3CASCADE]<dd>Håkon Wium Lie; Elika J. Etemad; Tab Atkins Jr.. <a href=http://www.w3.org/TR/2013/CR-css-cascade-3-20131003/>CSS Cascading and Inheritance Level 3</a>. 3 October 2013. W3C Candidate Recommendation. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/CR-css-cascade-3-20131003/>http://www.w3.org/TR/2013/CR-css-cascade-3-20131003/</a><dt id=encoding title=ENCODING><a class=self-link href=#encoding></a>[ENCODING]<dd>Anne van Kesteren; Joshua Bell. <a href=http://encoding.spec.whatwg.org/>Encoding</a>. Living Standard. URL: <a href=http://encoding.spec.whatwg.org/>http://encoding.spec.whatwg.org/</a><dt id=rfc2119 title=RFC2119><a class=self-link href=#rfc2119></a>[RFC2119]<dd>S. Bradner. <a href=http://www.ietf.org/rfc/rfc2119.txt>Key words for use in RFCs to Indicate Requirement Levels</a>. URL: <a href=http://www.ietf.org/rfc/rfc2119.txt>http://www.ietf.org/rfc/rfc2119.txt</a><dt id=select title=SELECT><a class=self-link href=#select></a>[SELECT]<dd>Tantek Çelik; et al. <a href=http://www.w3.org/TR/2011/REC-css3-selectors-20110929/>Selectors Level 3</a>. 29 September 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-css3-selectors-20110929/>http://www.w3.org/TR/2011/REC-css3-selectors-20110929/</a><dt id=unicode title=UNICODE><a class=self-link href=#unicode></a>[UNICODE]<dd>The Unicode Consortium. <a href=http://www.unicode.org/standard/versions/enumeratedversions.html>The Unicode Standard</a>. 2012. Defined by: The Unicode Standard, Version 6.2.0 (Mountain View, CA: The Unicode Consortium, 2012. ISBN 978-1-936213-07-8), as updated from time to time by the publication of new versions URL: <a href=http://www.unicode.org/standard/versions/enumeratedversions.html>http://www.unicode.org/standard/versions/enumeratedversions.html</a></dl></div>
50144996

50154997
<h3 class="no-num no-ref heading settled heading" id=informative><span class=content>
50164998
Informative References</span><a class=self-link href=#informative></a></h3>

css-syntax/Overview.src.html

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ <h2 id='syntax-description'>
7373
"<code>color: blue;</code>" is a declaration specifying that,
7474
for the elements that match the selector,
7575
their 'color' property should have the value ''blue''.
76-
Similiarly, their 'text-decoration' property should have the value ''underline''.
76+
Similarly, their 'text-decoration' property should have the value ''underline''.
7777
</div>
7878

7979
At-rules are all different, but they have a basic structure in common.
@@ -372,6 +372,8 @@ <h3 id="environment-encoding">
372372

373373
Note: [[HTML]] defines <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/links.html#link-type-stylesheet">the environment encoding for <code>&lt;link rel=stylesheet></code></a>.
374374

375+
Note: [[CSSOM]] defines <a href="http://dev.w3.org/csswg/cssom/#requirements-on-user-agents-implementing-the-xml-stylesheet-processing-instruction">the environment encoding for <code>&lt;xml-stylesheet?></code></a>.
376+
375377
<h4 id="environment-encoding-at-import">
376378
''@import'' rules</h4>
377379

@@ -380,25 +382,6 @@ <h4 id="environment-encoding-at-import">
380382

381383
Note: This is expected to move to a future version of [[CSS3CASCADE]].
382384

383-
<h4 id="environment-encoding-xml">
384-
XML</h4>
385-
386-
For stylesheets referred to by an <a href=http://www.w3.org/TR/xml-stylesheet/#the-xml-stylesheet-processing-instruction><code>xml-stylesheet</code></a> processing instruction [[!XMLSTYLE]],
387-
the <a>environment encoding</a> is determined as follows:
388-
389-
<ul>
390-
<li>
391-
<a href="http://encoding.spec.whatwg.org/#concept-encoding-get">Get an encoding</a> [[!ENCODING]]
392-
for the value of the <code>charset</code> <a href=http://www.w3.org/TR/xml-stylesheet/#dt-pseudo-attribute>pseudo-attribute</a> of the processing instruction, if any.
393-
If that does not return failure,
394-
use the return value as the environment encoding.
395-
396-
<li>
397-
Otherwise, use the encoding of the referring document.
398-
</ul>
399-
400-
Note: This is expected to move to [[CSSOM]].
401-
402385

403386
<h3 id="input-preprocessing">
404387
Preprocessing the input stream</h3>

0 commit comments

Comments
 (0)