[css-text] Editorial tweaks to text-transform (mostly markup), plus clarify order of operations and put white-space collapsing first

fantasai · fantasai · commit ff45977ed47c · 2013-06-14T17:04:07.000+09:00
diff --git a/css-module/Overview.src.html b/css-module/Overview.src.html
@@ -141,8 +141,8 @@ <h3 id="values">
   definition conventions</a> from [[!CSS21]]. Value types not defined in
   this specification are defined in CSS Level 2 Revision 1 [[!CSS21]].
   Other CSS modules may expand the definitions of these value types: for
-  example [[CSS3COLOR]], when combined with this module, expands the
-  definition of the &lt;color&gt; value type as used in this specification.</p>
+  example [[CSS3VAL]], when combined with this module, expands the
+  definition of the <var>&lt;length&gt;</var> value type as used in this specification.</p>
   
   <p>In addition to the property-specific values listed in their definitions,
   all properties defined in this specification also accept the
diff --git a/css-text/Overview.html b/css-text/Overview.html
@@ -415,9 +415,9 @@ <h3 id=values><span class=secno>1.2. </span> Values</h3>
    this specification are defined in CSS Level 2 Revision 1 <a
    href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>. Other CSS
    modules may expand the definitions of these value types: for example <a
-   href="#CSS3COLOR" rel=biblioentry>[CSS3COLOR]<!--{{CSS3COLOR}}--></a>,
-   when combined with this module, expands the definition of the
-   &lt;color&gt; value type as used in this specification.
+   href="#CSS3VAL" rel=biblioentry>[CSS3VAL]<!--{{CSS3VAL}}--></a>, when
+   combined with this module, expands the definition of the
+   <var>&lt;length&gt;</var> value type as used in this specification.
 
   <p>In addition to the property-specific values listed in their definitions,
    all properties defined in this specification also accept the <a
@@ -569,6 +569,21 @@ <h3 id=text-transform><span class=secno>2.1. </span> <a name=caps-prop></a>
 -->
   </dl>
 
+  <p>The definition of “word“ used for ‘<code
+   class=css>capitalize</code>’ is UA-dependent; <a href="#UAX29"
+   rel=biblioentry>[UAX29]<!--{{!UAX29}}--></a> is suggested (but not
+   required) for determining such word boundaries. Authors should not expect
+   ‘<code class=css>capitalize</code>’ to follow language-specific
+   titlecasing conventions (such as skipping articles in English).
+
+  <div class=example>
+   <p>The following example converts the ASCII characters used in
+    abbreviations in Japanese text to their fullwidth variants so that they
+    lay out and line break like ideographs:
+
+   <pre>abbr:lang(ja) { text-transform: full-width; }</pre>
+  </div>
+
   <p>The case mapping rules for the character repertoire specified by the
    Unicode Standard can be found on the Unicode Consortium Web site <a
    href="#UNICODE" rel=biblioentry>[UNICODE]<!--{{!UNICODE}}--></a>. The UA
@@ -604,37 +619,23 @@ <h3 id=text-transform><span class=secno>2.1. </span> <a name=caps-prop></a>
     </div>
 -->
 
-  <p>The definition of "word" used for ‘<code
-   class=css>capitalize</code>’ is UA-dependent; <a href="#UAX29"
-   rel=biblioentry>[UAX29]<!--{{!UAX29}}--></a> is suggested (but not
-   required) for determining such word boundaries. Authors should not expect
-   ‘<code class=css>capitalize</code>’ to follow language-specific
-   titlecasing conventions (such as skipping articles in English).
-
   <p>The definition of fullwidth and halfwidth forms can be found on the
    Unicode consortium web site at <a href="#UAX11"
    rel=biblioentry>[UAX11]<!--{{!UAX11}}--></a>. The mapping to fullwidth
-   form is defined by taking code points with the &lt;wide&gt; or the
-   &lt;narrow&gt; tag in their Decomposition_Mapping in <a href="#UAX44"
-   rel=biblioentry>[UAX44]<!--{{!UAX44}}--></a>. For the &lt;narrow&gt; tag,
-   the mapping is from the code point to the decomposition (minus
-   &lt;narrow&gt; tag), and for the &lt;wide&gt; tag, the mapping is from the
-   decomposition (minus the &lt;wide&gt; tag) back to the original code
-   point.
+   form is defined by taking code points with the <code>&lt;wide&gt;</code>
+   or the <code>&lt;narrow&gt;</code> tag in their
+   <code>Decomposition_Mapping</code> in <a href="#UAX44"
+   rel=biblioentry>[UAX44]<!--{{!UAX44}}--></a>. For the
+   <code>&lt;narrow&gt;</code> tag, the mapping is from the code point to the
+   decomposition (minus <code>&lt;narrow&gt;</code> tag), and for the
+   <code>&lt;wide&gt;</code> tag, the mapping is from the decomposition
+   (minus the <code>&lt;wide&gt;</code> tag) back to the original code point.
 
   <p>Text transformation happens after <a href="#white-space-rules">white
    space processing</a>, which means that ‘<code
    class=css>full-width</code>’ transforms only preserved U+0020 spaces to
    U+3000.
 
-  <div class=example>
-   <p>The following example converts the ASCII characters in abbreviations in
-    Japanese to their fullwidth variants so that they lay out and line break
-    like ideographs:
-
-   <pre>abbr:lang(ja) { text-transform: full-width; }</pre>
-  </div>
-
   <p class=note> A future level of CSS may introduce the ability to create
    custom mapping tables for less common text transforms, such as by an
    ‘<code class=css>@text-transform</code>’ rule similar to ‘<code
@@ -3467,15 +3468,6 @@ <h3 class=no-num id=informative-ref>Informative references</h3>
    </dd>
    <!---->
 
-   <dt id=CSS3COLOR>[CSS3COLOR]
-
-   <dd>Tantek Çelik; Chris Lilley; L. David Baron. <a
-    href="http://www.w3.org/TR/2011/REC-css3-color-20110607"><cite>CSS Color
-    Module Level 3.</cite></a> 7 June 2011. W3C Recommendation. URL: <a
-    href="http://www.w3.org/TR/2011/REC-css3-color-20110607">http://www.w3.org/TR/2011/REC-css3-color-20110607</a>
-   </dd>
-   <!---->
-
    <dt id=CSS3VAL>[CSS3VAL]
 
    <dd>Håkon Wium Lie; Tab Atkins; Elika J. Etemad. <a
@@ -3703,14 +3695,14 @@ <h2 class=no-num id=appendix-f-text-processing-order-of-oper>Appendix F:
    layout is the same.)
 
   <ol>
+   <li><a href="#white-space-rules">white space processing</a> part I
+    (pre-wrapping)
+
    <li><a
     href="http://www.w3.org/TR/css3-writing-modes/#text-combine-horizontal">text
     combination</a> <a href="#CSS3-WRITING-MODES"
     rel=biblioentry>[CSS3-WRITING-MODES]<!--{{!CSS3-WRITING-MODES}}--></a>
 
-   <li><a href="#white-space-rules">white space processing</a> part I
-    (pre-wrapping)
-
    <li><a href="#text-transform">text transformation</a>
 
    <li><a href="#wrapping">text wrapping</a> while applying per line:
@@ -3731,10 +3723,12 @@ <h2 class=no-num id=appendix-f-text-processing-order-of-oper>Appendix F:
       orientation</a> <a href="#CSS3-WRITING-MODES"
       rel=biblioentry>[CSS3-WRITING-MODES]<!--{{!CSS3-WRITING-MODES}}--></a>
 
-     <li><a href="#spacing">default spacing</a>
+     <li>‘<a href="#letter-spacing0"><code
+      class=property>letter-spacing</code></a>’ and ‘<a
+      href="#word-spacing0"><code class=property>word-spacing</code></a>’
 
      <li><a href="http://www.w3.org/TR/css3-fonts/">font/glyph selection and
-      kerning</a> <a href="#CSS21"
+      positioning</a> <a href="#CSS21"
       rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> / <a href="#CSS3-FONTS"
       rel=biblioentry>[CSS3-FONTS]<!--{{!CSS3-FONTS}}--></a>
 
diff --git a/css-text/Overview.src.html b/css-text/Overview.src.html
@@ -207,8 +207,8 @@ <h3 id="values">
   definition conventions</a> from [[!CSS21]]. Value types not defined in
   this specification are defined in CSS Level 2 Revision 1 [[!CSS21]].
   Other CSS modules may expand the definitions of these value types: for
-  example [[CSS3COLOR]], when combined with this module, expands the
-  definition of the &lt;color&gt; value type as used in this specification.</p>
+  example [[CSS3VAL]], when combined with this module, expands the
+  definition of the <var>&lt;length&gt;</var> value type as used in this specification.</p>
 
   <p>In addition to the property-specific values listed in their definitions,
   all properties defined in this specification also accept the
@@ -333,6 +333,19 @@ <h3 id="text-transform">
 -->
     </dl>
 
+    <p>The definition of “word“ used for ''capitalize'' is UA-dependent;
+      [[!UAX29]] is suggested (but not required) for determining such word
+      boundaries. Authors should not expect ''capitalize'' to follow
+      language-specific titlecasing conventions (such as skipping articles
+      in English).
+
+    <div class="example">
+      <p>The following example converts the ASCII characters
+        used in abbreviations in Japanese text to their fullwidth variants
+        so that they lay out and line break like ideographs:
+      <pre>abbr:lang(ja) { text-transform: full-width; }</pre>
+    </div>
+
     <p>The case mapping rules for the character repertoire specified by the
       Unicode Standard can be found on the Unicode Consortium Web site
       [[!UNICODE]]. The UA must use the full case mappings for Unicode
@@ -370,32 +383,21 @@ <h3 id="text-transform">
     </div>
 -->
 
-    <p>The definition of "word" used for ''capitalize'' is UA-dependent;
-      [[!UAX29]] is suggested (but not required) for determining such word
-      boundaries. Authors should not expect ''capitalize'' to follow
-      language-specific titlecasing conventions (such as skipping articles
-      in English).
-
     <p>The definition of fullwidth and halfwidth forms can be found on the
       Unicode consortium web site at [[!UAX11]].
       The mapping to fullwidth form is defined by taking code points with
-      the &lt;wide&gt; or the &lt;narrow&gt; tag in their Decomposition_Mapping
-      in [[!UAX44]]. For the &lt;narrow&gt; tag, the mapping is from the code
-      point to the decomposition (minus &lt;narrow&gt; tag), and for the
-      &lt;wide&gt; tag, the mapping is from the decomposition (minus the
-      &lt;wide&gt; tag) back to the original code point.</p>
+      the <code>&lt;wide&gt;</code> or the <code>&lt;narrow&gt;</code> tag
+      in their <code>Decomposition_Mapping</code> in [[!UAX44]].
+      For the <code>&lt;narrow&gt;</code> tag, 
+      the mapping is from the code point to the decomposition (minus <code>&lt;narrow&gt;</code> tag),
+      and for the <code>&lt;wide&gt;</code> tag,
+      the mapping is from the decomposition (minus the <code>&lt;wide&gt;</code> tag)
+      back to the original code point.
 
     <p>Text transformation happens after <a href="#white-space-rules">white
       space processing</a>, which means that ''full-width'' transforms
       only preserved U+0020 spaces to U+3000.
 
-    <div class="example">
-      <p>The following example converts the ASCII characters in abbreviations
-        in Japanese to their fullwidth variants so that they lay out and line
-        break like ideographs:
-      <pre>abbr:lang(ja) { text-transform: full-width; }</pre>
-    </div>
-
     <p class="note">
       A future level of CSS may introduce the ability to create custom mapping
       tables for less common text transforms, such as by an ''@text-transform''
@@ -2733,17 +2735,17 @@ <h2 class="no-num">Appendix F:
     are not bound to this order as long as the resulting layout is the same.)
 
   <ol>
-    <li><a href="http://www.w3.org/TR/css3-writing-modes/#text-combine-horizontal">text combination</a> [[!CSS3-WRITING-MODES]]
     <li><a href="#white-space-rules">white space processing</a> part I (pre-wrapping)
+    <li><a href="http://www.w3.org/TR/css3-writing-modes/#text-combine-horizontal">text combination</a> [[!CSS3-WRITING-MODES]]
     <li><a href="#text-transform">text transformation</a>
     <li><a href="#wrapping">text wrapping</a> while applying per line:
       <ol>
         <li><a href="#text-indent">indentation</a>
         <li><a href="http://www.w3.org/TR/css3-writing-modes/#text-direction">bidirectional reordering</a> [[!CSS21]] / [[!CSS3-WRITING-MODES]]
         <li><a href="#white-space-rules">white space processing</a> part II
         <li><a href="http://www.w3.org/TR/css3-writing-modes/#text-orientation">text orientation</a> [[!CSS3-WRITING-MODES]]
-        <li><a href="#spacing">default spacing</a>
-        <li><a href="http://www.w3.org/TR/css3-fonts/">font/glyph selection and kerning</a> [[!CSS21]] / [[!CSS3-FONTS]]
+        <li>'letter-spacing' and 'word-spacing'
+        <li><a href="http://www.w3.org/TR/css3-fonts/">font/glyph selection and positioning</a> [[!CSS21]] / [[!CSS3-FONTS]]
         <li><a href="#hanging-punctuation">hanging punctuation</a>
       </ol>
     <li><a href="#justification">justification</a> (which may affect glyph selection and/or text wrapping, looping back into that step)
