[css-syntax] Clarify how to decode from bytes

Author: SimonSapin

css-syntax/Overview.html

@@ -429,35 +429,40 @@ <h3 class="heading settled heading" data-level=3.2 id=input-byte-stream><span cl
 	which the user agent must use to decode the bytes into <a data-link-type=dfn href=#code-point title="code points">code points</a>.
 
 <p>	To decode the stream of bytes into a stream of <a data-link-type=dfn href=#code-point title="code points">code points</a>,
-	UAs must follow these steps.
+	UAs must use the <a href=http://encoding.spec.whatwg.org/#decode>decode</a> algorithm
+	defined in <a data-biblio-type=normative data-link-type=biblio href=#encoding title=encoding>[ENCODING]</a>,
+	with the fallback encoding determined as follows.
 
-<p>	The algorithms to <dfn data-dfn-type=dfn data-noexport="" id=get-an-encoding><a href=http://encoding.spec.whatwg.org/#concept-encoding-get>get an encoding</a><a class=self-link href=#get-an-encoding></a></dfn>
-	and <dfn data-dfn-type=dfn data-noexport="" id=decode><a href=http://encoding.spec.whatwg.org/#decode>decode</a><a class=self-link href=#decode></a></dfn>
-	are defined in <a data-biblio-type=normative data-link-type=biblio href=#encoding title=encoding>[ENCODING]</a>.
+<p class=note>	Note: The <a href=http://encoding.spec.whatwg.org/#decode>decode</a> algorithm
+	gives precedence to a byte order mark (BOM),
+	and only uses the fallback when none is found.
 
-<p>	First, <dfn data-dfn-type=dfn data-noexport="" id=determine-the-fallback-encoding>determine the fallback encoding<a class=self-link href=#determine-the-fallback-encoding></a></dfn>:
+<p>	To <dfn data-dfn-type=dfn data-noexport="" id=determine-the-fallback-encoding>determine the fallback encoding<a class=self-link href=#determine-the-fallback-encoding></a></dfn>:
 
 	<ol>
 		<li>
 			If HTTP or equivalent protocol defines an encoding (e.g. via the charset parameter of the Content-Type header),
-			<a data-link-type=dfn href=#get-an-encoding title="get an encoding">get an encoding</a> for the specified value.
+			<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>
+			for the specified value.
 			If that does not return failure,
 			use the return value as the fallback encoding.
 
 		<li>
 			Otherwise, check the byte stream. If the first several bytes match the hex sequence
 
 <pre>40 63 68 61 72 73 65 74 20 22 (not 22)* 22 3B</pre>
-<p>			then <a data-link-type=dfn href=#get-an-encoding title="get an encoding">get an encoding</a> for the sequence of <code>(not 22)*</code> bytes,
+<p>			then <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>
+			for the sequence of <code>(not 22)*</code> bytes,
 			decoded per <code>windows-1252</code>.
 
-<p class=note>			Note: Anything ASCII-compatible will do, so using <code>windows-1252</code> is fine.
+<p class=note>			Note: Anything ASCII-compatible will do since valid labels are all ASCII,
+			so using <code>windows-1252</code> is fine.
 
 
 <p class=note>			Note: The byte sequence above,
 			when decoded as ASCII,
 			is the string "<code>@charset "…";</code>",
-			where the "…" is the sequence of bytes corresponding to the encoding’s name.
+			where the "…" is the sequence of bytes corresponding to the encoding’s label.
 
 <p>			If the return value was <code>utf-16</code> or <code>utf-16be</code>,
 			use <code>utf-8</code> as the fallback encoding;
@@ -474,10 +479,6 @@ <h3 class="heading settled heading" data-level=3.2 id=input-byte-stream><span cl
 			Otherwise, use <code>utf-8</code> as the fallback encoding.
 	</ol>
 
-<p>		Then, <a data-link-type=dfn href=#decode title=decode>decode</a> the byte stream using the fallback encoding.
-
-<p class=note>	Note: the <a data-link-type=dfn href=#decode title=decode>decode</a> algorithm lets the byte order mark (BOM) take precedence,
-	hence the usage of the term "fallback" above.
 
 <h3 class="heading settled heading" data-level=3.3 id=environment-encoding><span class=secno>3.3 </span><span class=content>
 Environment encoding</span><a class=self-link href=#environment-encoding></a></h3>
@@ -502,7 +503,8 @@ <h4 class="heading settled heading" data-level=3.3.2 id=environment-encoding-htm
 
 <p>	<ul>
 		<li>
-			<a data-link-type=dfn href=#get-an-encoding title="get an encoding">Get an encoding</a> for the value of the <code>charset</code> attribute of the element, if any.
+			<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>
+			for the value of the <code>charset</code> attribute of the element, if any.
 			If that does not return failure,
 			use the return value as the environment encoding.
 
@@ -525,7 +527,8 @@ <h4 class="heading settled heading" data-level=3.3.3 id=environment-encoding-xml
 
 <p>	<ul>
 		<li>
-			<a data-link-type=dfn href=#get-an-encoding title="get an encoding">Get an encoding</a> 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.
+			<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>
+			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.
 			If that does not return failure,
 			use the return value as the environment encoding.
 
@@ -5038,7 +5041,6 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
 <li>&lt;dashndashdigit-ident&gt;, <a href=#typedef-dashndashdigit-ident title="section 6.2">6.2</a>
 <li>declaration, <a href=#declaration title="section 5">5</a>
 <li>&lt;declaration-list&gt;, <a href=#typedef-declaration-list title="section 7.1">7.1</a>
-<li>decode, <a href=#decode title="section 3.2">3.2</a>
 <li>&lt;delim-token&gt;, <a href=#typedef-delim-token title="section 4">4</a>
 <li>determine the fallback encoding, <a href=#determine-the-fallback-encoding title="section 3.2">3.2</a>
 <li>digit, <a href=#digit title="section 4.2">4.2</a>
@@ -5052,7 +5054,6 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
 <li>escaping, <a href=#escaping0 title="section 2.1">2.1</a>
 <li>function, <a href=#function title="section 5">5</a>
 <li>&lt;function-token&gt;, <a href=#typedef-function-token title="section 4">4</a>
-<li>get an encoding, <a href=#get-an-encoding title="section 3.2">3.2</a>
 <li>&lt;hash-token&gt;, <a href=#typedef-hash-token title="section 4">4</a>
 <li>hex digit, <a href=#hex-digit title="section 4.2">4.2</a>
 <li>identifier, <a href=#identifier title="section 4.2">4.2</a>

css-syntax/Overview.src.html

@@ -265,18 +265,21 @@ <h3 id="input-byte-stream">
 	which the user agent must use to decode the bytes into <a>code points</a>.
 
 	To decode the stream of bytes into a stream of <a>code points</a>,
-	UAs must follow these steps.
+	UAs must use the <a href="http://encoding.spec.whatwg.org/#decode">decode</a> algorithm
+	defined in [[!ENCODING]],
+	with the fallback encoding determined as follows.
 
-	The algorithms to <dfn><a href="http://encoding.spec.whatwg.org/#concept-encoding-get">get an encoding</a></dfn>
-	and <dfn><a href="http://encoding.spec.whatwg.org/#decode">decode</a></dfn>
-	are defined in [[!ENCODING]].
+	Note: The <a href="http://encoding.spec.whatwg.org/#decode">decode</a> algorithm
+	gives precedence to a byte order mark (BOM),
+	and only uses the fallback when none is found.
 
-	First, <dfn>determine the fallback encoding</dfn>:
+	To <dfn>determine the fallback encoding</dfn>:
 
 	<ol>
 		<li>
 			If HTTP or equivalent protocol defines an encoding (e.g. via the charset parameter of the Content-Type header),
-			<a>get an encoding</a> for the specified value.
+			<a href="http://encoding.spec.whatwg.org/#concept-encoding-get">get an encoding</a> [[!ENCODING]]
+			for the specified value.
 			If that does not return failure,
 			use the return value as the fallback encoding.
 
@@ -285,16 +288,18 @@ <h3 id="input-byte-stream">
 
 			<pre>40 63 68 61 72 73 65 74 20 22 (not 22)* 22 3B</pre>
 
-			then <a>get an encoding</a> for the sequence of <code>(not 22)*</code> bytes,
+			then <a href="http://encoding.spec.whatwg.org/#concept-encoding-get">get an encoding</a> [[!ENCODING]]
+			for the sequence of <code>(not 22)*</code> bytes,
 			decoded per <code>windows-1252</code>.
 
-			Note: Anything ASCII-compatible will do, so using <code>windows-1252</code> is fine.
+			Note: Anything ASCII-compatible will do since valid labels are all ASCII,
+			so using <code>windows-1252</code> is fine.
 
 
 			Note: The byte sequence above,
 			when decoded as ASCII,
 			is the string "<code>@charset "…";</code>",
-			where the "…" is the sequence of bytes corresponding to the encoding's name.
+			where the "…" is the sequence of bytes corresponding to the encoding's label.
 
 			If the return value was <code>utf-16</code> or <code>utf-16be</code>,
 			use <code>utf-8</code> as the fallback encoding;
@@ -311,10 +316,6 @@ <h3 id="input-byte-stream">
 			Otherwise, use <code>utf-8</code> as the fallback encoding.
 	</ol>
 
-		Then, <a>decode</a> the byte stream using the fallback encoding.
-
-	Note: the <a>decode</a> algorithm lets the byte order mark (BOM) take precedence,
-	hence the usage of the term "fallback" above.
 
 <h3 id="environment-encoding">
 Environment encoding</h3>
@@ -339,7 +340,8 @@ <h4 id="environment-encoding-html">
 
 	<ul>
 		<li>
-			<a>Get an encoding</a> for the value of the <code>charset</code> attribute of the element, if any.
+			<a href="http://encoding.spec.whatwg.org/#concept-encoding-get">Get an encoding</a> [[!ENCODING]]
+			for the value of the <code>charset</code> attribute of the element, if any.
 			If that does not return failure,
 			use the return value as the environment encoding.
 
@@ -365,7 +367,8 @@ <h4 id="environment-encoding-xml">
 
 	<ul>
 		<li>
-			<a>Get an encoding</a> 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.
+			<a href="http://encoding.spec.whatwg.org/#concept-encoding-get">Get an encoding</a> [[!ENCODING]]
+			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.
 			If that does not return failure,
 			use the return value as the environment encoding.