[css-syntax][css-cascade] Move the definition of the environment encoding for @import

SimonSapin · SimonSapin · commit dc732b5f625c · 2014-02-06T16:44:47.000Z
diff --git a/css-cascade/Overview.html b/css-cascade/Overview.html
@@ -212,6 +212,9 @@ <h2 class="heading settled heading" data-level=2 id=at-import><span class=secno>
 	<p>
 		The <a data-link-type=dfn href=#origin title=origin>origin</a> of an imported style sheet is the same as the <a data-link-type=dfn href=#origin title=origin>origin</a> of the style sheet that imported it.
 
+	<p>
+		The <a data-link-type=dfn href=http://dev.w3.org/csswg/css-syntax-3/#environment-encoding0 title="environment encoding">environment encoding</a> of an imported style sheet is the encoding of the style sheet that imported it. <a data-biblio-type=informative data-link-type=biblio href=#css3syn title=css3syn>[CSS3SYN]</a>
+
 <h3 class="heading settled heading" data-level=2.1 id=content-type><span class=secno>2.1 </span><span class=content>
 Content-Type of CSS Style Sheets</span><a class=self-link href=#content-type></a></h3>
 
@@ -1191,7 +1194,7 @@ <h3 class="no-num no-ref heading settled heading" id=normative><span class=conte
 
 <h3 class="no-num no-ref heading settled heading" id=informative><span class=content>
 Informative References</span><a class=self-link href=#informative></a></h3>
-<div data-fill-with=informative-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=css3-break title=CSS3-BREAK><a class=self-link href=#css3-break></a>[CSS3-BREAK]<dd>Rossen Atanassov; Elika J. Etemad. <a href=http://www.w3.org/TR/2012/WD-css3-break-20120823/>CSS Fragmentation Module Level 3</a>. 23 August 2012. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2012/WD-css3-break-20120823/>http://www.w3.org/TR/2012/WD-css3-break-20120823/</a><dt id=css3-writing-modes title=CSS3-WRITING-MODES><a class=self-link href=#css3-writing-modes></a>[CSS3-WRITING-MODES]<dd>Elika J. Etemad; Koji Ishii. <a href=http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/>CSS Writing Modes Module Level 3</a>. 15 November 2012. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/>http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/</a><dt id=css3page title=CSS3PAGE><a class=self-link href=#css3page></a>[CSS3PAGE]<dd>Melinda Grant; et al. <a href=http://www.w3.org/TR/2013/WD-css3-page-20130314/>CSS Paged Media Module Level 3</a>. 14 March 2013. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/WD-css3-page-20130314/>http://www.w3.org/TR/2013/WD-css3-page-20130314/</a><dt id=html5 title=HTML5><a class=self-link href=#html5></a>[HTML5]<dd>Robin Berjon; et al. <a href=http://www.w3.org/TR/2013/CR-html5-20130806/>HTML5</a>. 6 August 2013. W3C Candidate Recommendation. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/CR-html5-20130806/>http://www.w3.org/TR/2013/CR-html5-20130806/</a><dt id=svg11 title=SVG11><a class=self-link href=#svg11></a>[SVG11]<dd>Erik Dahlström; et al. <a href=http://www.w3.org/TR/2011/REC-SVG11-20110816/>Scalable Vector Graphics (SVG) 1.1 (Second Edition)</a>. 16 August 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-SVG11-20110816/>http://www.w3.org/TR/2011/REC-SVG11-20110816/</a></dl></div>
+<div data-fill-with=informative-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=css3-break title=CSS3-BREAK><a class=self-link href=#css3-break></a>[CSS3-BREAK]<dd>Rossen Atanassov; Elika J. Etemad. <a href=http://www.w3.org/TR/2012/WD-css3-break-20120823/>CSS Fragmentation Module Level 3</a>. 23 August 2012. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2012/WD-css3-break-20120823/>http://www.w3.org/TR/2012/WD-css3-break-20120823/</a><dt id=css3-writing-modes title=CSS3-WRITING-MODES><a class=self-link href=#css3-writing-modes></a>[CSS3-WRITING-MODES]<dd>Elika J. Etemad; Koji Ishii. <a href=http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/>CSS Writing Modes Module Level 3</a>. 15 November 2012. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/>http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/</a><dt id=css3page title=CSS3PAGE><a class=self-link href=#css3page></a>[CSS3PAGE]<dd>Melinda Grant; et al. <a href=http://www.w3.org/TR/2013/WD-css3-page-20130314/>CSS Paged Media Module Level 3</a>. 14 March 2013. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/WD-css3-page-20130314/>http://www.w3.org/TR/2013/WD-css3-page-20130314/</a><dt id=css3syn title=CSS3SYN><a class=self-link href=#css3syn></a>[CSS3SYN]<dd>Tab Atkins Jr.; Simon Sapin. <a href=http://www.w3.org/TR/2013/WD-css-syntax-3-20131105/>CSS Syntax Module</a>. 5 November 2013. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/WD-css-syntax-3-20131105/>http://www.w3.org/TR/2013/WD-css-syntax-3-20131105/</a><dt id=html5 title=HTML5><a class=self-link href=#html5></a>[HTML5]<dd>Robin Berjon; et al. <a href=http://www.w3.org/TR/2013/CR-html5-20130806/>HTML5</a>. 6 August 2013. W3C Candidate Recommendation. (Work in progress.) URL: <a href=http://www.w3.org/TR/2013/CR-html5-20130806/>http://www.w3.org/TR/2013/CR-html5-20130806/</a><dt id=svg11 title=SVG11><a class=self-link href=#svg11></a>[SVG11]<dd>Erik Dahlström; et al. <a href=http://www.w3.org/TR/2011/REC-SVG11-20110816/>Scalable Vector Graphics (SVG) 1.1 (Second Edition)</a>. 16 August 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-SVG11-20110816/>http://www.w3.org/TR/2011/REC-SVG11-20110816/</a></dl></div>
 
 <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
 Index</span><a class=self-link href=#index></a></h2>
diff --git a/css-cascade/Overview.src.html b/css-cascade/Overview.src.html
@@ -118,6 +118,9 @@ <h2 id="at-import">
 	<p>
 		The <i>origin</i> of an imported style sheet is the same as the <i>origin</i> of the style sheet that imported it.
 
+	<p>
+		The <i>environment encoding</i> of an imported style sheet is the encoding of the style sheet that imported it. [[CSS3SYN]]
+
 <h3 id='content-type'>
 Content-Type of CSS Style Sheets</h3>
 
diff --git a/css-syntax/Overview.html b/css-syntax/Overview.html
@@ -118,8 +118,7 @@ <h2 class="no-num no-toc no-ref heading settled heading" id=contents><span class
 Tokenizing and Parsing CSS</a><ul class=toc><li><a href=#parsing-overview><span class=secno>3.1</span>
 Overview of the Parsing Model</a><li><a href=#input-byte-stream><span class=secno>3.2</span>
 The input byte stream</a><li><a href=#environment-encoding><span class=secno>3.3</span>
-Environment encoding</a><ul class=toc><li><a href=#environment-encoding-at-import><span class=secno>3.3.1</span>
-<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>
+Environment encoding</a><li><a href=#input-preprocessing><span class=secno>3.4</span>
 Preprocessing the input stream</a></ul><li><a href=#tokenization><span class=secno>4</span>
 Tokenization</a><ul class=toc><li><a href=#token-diagrams><span class=secno>4.1</span>
 Token Railroad Diagrams</a><li><a href=#tokenizer-definitions><span class=secno>4.2</span>
@@ -538,13 +537,7 @@ <h3 class="heading settled heading" data-level=3.3 id=environment-encoding><span
 
 <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>.
 
-<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>
-<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>
-
-<p>	For stylesheets referred to by an <a class=css data-link-type=maybe href=http://dev.w3.org/csswg/css-cascade-3/#at-ruledef-import title=@import>@import</a> CSS rule <a data-biblio-type=normative data-link-type=biblio href=#css3cascade title=css3cascade>[CSS3CASCADE]</a>,
-	the <a data-link-type=dfn href=#environment-encoding0 title="environment encoding">environment encoding</a> is the encoding of the referring stylesheet.
-
-<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>.
+<p class=note>	Note: <a data-biblio-type=informative data-link-type=biblio href=#css3cascade title=css3cascade>[CSS3CASCADE]</a> defines <a href=http://dev.w3.org/csswg/css-cascade/#at-ruledef-import>the environment encoding for <code>@import</code></a>.
 
 
 <h3 class="heading settled heading" data-level=3.4 id=input-preprocessing><span class=secno>3.4 </span><span class=content>
diff --git a/css-syntax/Overview.src.html b/css-syntax/Overview.src.html
@@ -374,13 +374,7 @@ <h3 id="environment-encoding">
 
 	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>.
 
-<h4 id="environment-encoding-at-import">
-''@import'' rules</h4>
-
-	For stylesheets referred to by an ''@import'' CSS rule [[!CSS3CASCADE]],
-	the <a>environment encoding</a> is the encoding of the referring stylesheet.
-
-	Note: This is expected to move to a future version of [[CSS3CASCADE]].
+	Note: [[CSS3CASCADE]] defines <a href="http://dev.w3.org/csswg/css-cascade/#at-ruledef-import">the environment encoding for <code>@import</code></a>.
 
 
 <h3 id="input-preprocessing">
