[] (0) Clarify the encoding aliases mess.

git-svn-id: http://svn.whatwg.org/webapps@3368 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jul 7, 2009 · 614a4cd · 614a4cd
1 parent b0413ba
commit 614a4cd
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 18 deletions.
diff --git a/index b/index
@@ -4976,13 +4976,29 @@ a.<a href=#dom-uda-protocol title=dom-uda-protocol>protocol</a> = 'https'; // ch
   <p class=example>For instance, "GB_2312-80" and "g.b.2312(80)" are
   considered equivalent names.</p>
 
-  <hr><p>When a user agent would otherwise use an encoding specified by a
-  label given in the first column of the following table to either
-  convert content to Unicode characters or convert Unicode characters
-  to bytes, it must instead use the encoding given in the cell in the
-  second column of the same row. When a byte or sequence of bytes is
-  treated differently due to this encoding aliasing, it is said to
-  have been <dfn id=misinterpreted-for-compatibility>misinterpreted for compatibility</dfn>.</p>
+<!-- this bit will be replaced by actual alias registrations in due course -->
+
+  <p>In addition, user agents must support the aliases given in the
+  following table, so that labels from the first column are treated as
+  equivalent to the labels given in the corresponding cell from the
+  second column on the same row.</p>
+
+  <table><caption>Additional character encoding aliases</caption>
+   <thead><tr><th> Alias <th> Corresponding encoding <th> References
+   <tbody><tr><td> x-sjis <td> Windows-31J <td>
+         <a href=#refsSHIFTJIS>[SHIFTJIS]</a>
+         <a href=#refsWIN31J>[WIN31J]</a>
+    <tr><td> Windows-932 <td> Windows-31J <td>
+         <a href=#refsWIN31J>[WIN31J]</a>
+    <tr><td> x-x-big5 <td> Big5 <td>
+         <a href=#refsBIG5>[BIG5]</a>
+   </table><!-- end of bit that will be replaced by actual alias registrations in due course --><hr><p>When a user agent would otherwise use an encoding given in the
+  first column of the following table to either convert content to
+  Unicode characters or convert Unicode characters to bytes, it must
+  instead use the encoding given in the cell in the second column of
+  the same row. When a byte or sequence of bytes is treated
+  differently due to this encoding aliasing, it is said to have been
+  <dfn id=misinterpreted-for-compatibility>misinterpreted for compatibility</dfn>.</p>
 
   <table><caption>Character encoding overrides</caption>
    <thead><tr><th> Input encoding <th> Replacement encoding <th> References
@@ -5016,8 +5032,6 @@ a.<a href=#dom-uda-protocol title=dom-uda-protocol>protocol</a> = 'https'; // ch
     <tr><td> US-ASCII <td> Windows-1252 <td>
          <a href=#refsRFC1345>[RFC1345]</a>
          <a href=#refsWIN1252>[WIN1252]</a>
-    <tr><td> x-x-big5 <td> Big5 <td>
-         <a href=#refsBIG5>[BIG5]</a>
    </table><p class=note>The requirement to treat certain encodings as other
   encodings according to the table above is a <a href=#willful-violation>willful
   violation</a> of the W3C Character Model specification, motivated

diff --git a/source b/source
@@ -4660,15 +4660,39 @@ a.<span title="dom-uda-protocol">protocol</span> = 'https'; // change just the s
   <p class="example">For instance, "GB_2312-80" and "g.b.2312(80)" are
   considered equivalent names.</p>
 
+<!-- this bit will be replaced by actual alias registrations in due course -->
+
+  <p>In addition, user agents must support the aliases given in the
+  following table, so that labels from the first column are treated as
+  equivalent to the labels given in the corresponding cell from the
+  second column on the same row.</p>
+
+  <table>
+   <caption>Additional character encoding aliases</caption>
+   <thead>
+    <tr> <th> Alias <th> Corresponding encoding <th> References
+   <tbody>
+    <tr> <td> x-sjis <td> Windows-31J <td>
+         <a href="#refsSHIFTJIS">[SHIFTJIS]</a>
+         <a href="#refsWIN31J">[WIN31J]</a>
+    <tr> <td> Windows-932 <td> Windows-31J <td>
+         <a href="#refsWIN31J">[WIN31J]</a>
+    <tr> <td> x-x-big5 <td> Big5 <td>
+         <a href="#refsBIG5">[BIG5]</a>
+   </tbody>
+  </table>
+
+<!-- end of bit that will be replaced by actual alias registrations in due course -->
+
   <hr>
 
-  <p>When a user agent would otherwise use an encoding specified by a
-  label given in the first column of the following table to either
-  convert content to Unicode characters or convert Unicode characters
-  to bytes, it must instead use the encoding given in the cell in the
-  second column of the same row. When a byte or sequence of bytes is
-  treated differently due to this encoding aliasing, it is said to
-  have been <dfn>misinterpreted for compatibility</dfn>.</p>
+  <p>When a user agent would otherwise use an encoding given in the
+  first column of the following table to either convert content to
+  Unicode characters or convert Unicode characters to bytes, it must
+  instead use the encoding given in the cell in the second column of
+  the same row. When a byte or sequence of bytes is treated
+  differently due to this encoding aliasing, it is said to have been
+  <dfn>misinterpreted for compatibility</dfn>.</p>
 
   <table>
    <caption>Character encoding overrides</caption>
@@ -4706,8 +4730,6 @@ a.<span title="dom-uda-protocol">protocol</span> = 'https'; // change just the s
     <tr> <td> US-ASCII <td> Windows-1252 <td>
          <a href="#refsRFC1345">[RFC1345]</a>
          <a href="#refsWIN1252">[WIN1252]</a>
-    <tr> <td> x-x-big5 <td> Big5 <td>
-         <a href="#refsBIG5">[BIG5]</a>
    </tbody>
   </table>