Use florian's text to merge @text-transform issues.

fantasai · fantasai · commit 5ad4f19eb642 · 2012-01-06T22:37:37.000Z
diff --git a/css3-text/Overview.html b/css3-text/Overview.html
@@ -34,8 +34,8 @@ <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 6 January 2012</h2>
    <dl>
     <dt>This version:
 
-    <dd><a href="http://dev.w3.org/csswg/css3-text/">$Date: 2012/01/05
-     19:38:38 $ (CVS $Revision$)</a> <!--
+    <dd><a href="http://dev.w3.org/csswg/css3-text/">$Date: 2012/01/06
+     05:12:54 $ (CVS $Revision$)</a> <!--
       <dd><a href="http://www.w3.org/TR/2012/WD-css3-text-20120106/">http://www.w3.org/TR/2012/WD-css3-text-20120106/</a></dd>
     -->
      
@@ -657,15 +657,13 @@ <h3 id=text-transform><span class=secno>2.1. </span> <a name=caps-prop></a>
    href="http://www.microsoft.com/typography/otspec/features_ae.htm#case">case</a>
    feature in OpenType). Should we turn that on by default, as they suggest?
 
-  <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
-   &lsquo;<a href="#text-transform0"><code
-   class=css>@text-transform</code></a>&rsquo; rule similar to &lsquo;<code
-   class=css>@counter-style</code>&rsquo; from <a href="#CSS3LIST"
-   rel=biblioentry>[CSS3LIST]<!--{{CSS3LIST}}--></a>.
-
-  <p class=issue>The &lsquo;<code class=css>full-size-kana</code>&rsquo;
-   value may be replaced by a generic text transform mechanism.
+  <p class=issue>CSS may introduce the ability to create custom mapping
+   tables for less common text transforms, such as by an &lsquo;<a
+   href="#text-transform0"><code class=css>@text-transform</code></a>&rsquo;
+   rule similar to &lsquo;<code class=css>@counter-style</code>&rsquo; from
+   <a href="#CSS3LIST" rel=biblioentry>[CSS3LIST]<!--{{CSS3LIST}}--></a>, and
+   this mechanism may be used to replace &lsquo;<code
+   class=css>full-size-kana</code>&rsquo;.
 
   <h2 id=white-space-processing><span class=secno>3. </span> White Space
    Processing</h2>
diff --git a/css3-text/Overview.src.html b/css3-text/Overview.src.html
@@ -342,12 +342,10 @@ <h3 id="text-transform">
         <a href="http://www.microsoft.com/typography/otspec/features_ae.htm#case">case</a>
       feature in OpenType). Should we turn that on by default, as they suggest?</p>
       
-    <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
-      ''@text-transform'' rule similar to ''@counter-style'' from [[CSS3LIST]].
-
-    <p class="issue">The ''full-size-kana'' value may be replaced by a
-      generic text transform mechanism.
+    <p class="issue">CSS may introduce the ability to create custom mapping
+      tables for less common text transforms, such as by an ''@text-transform''
+      rule similar to ''@counter-style'' from [[CSS3LIST]], and this mechanism
+      may be used to replace ''full-size-kana''.
 
 <h2 id="white-space-processing">
   White Space Processing</h2>
diff --git a/css4-text/Overview.html b/css4-text/Overview.html
@@ -29,14 +29,14 @@
 
    <h1>CSS Text Level 4</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 3 January 2012</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 6 January 2012</h2>
 
    <dl>
     <dt>This version:
 
-    <dd><a href="http://dev.w3.org/csswg/css3-text/">$Date: 2011/11/23
-     10:55:51 $ (CVS $Revision$)</a> <!--
-      <dd><a href="http://www.w3.org/TR/2012/WD-css3-text-20120103/">http://www.w3.org/TR/2012/WD-css3-text-20120103/</a></dd>
+    <dd><a href="http://dev.w3.org/csswg/css3-text/">$Date: 2012/01/03
+     18:35:26 $ (CVS $Revision$)</a> <!--
+      <dd><a href="http://www.w3.org/TR/2012/WD-css3-text-20120106/">http://www.w3.org/TR/2012/WD-css3-text-20120106/</a></dd>
     -->
      
 
@@ -686,12 +686,13 @@ <h3 id=text-transform><span class=secno>2.1. </span> <a name=caps-prop></a>
    href="http://www.microsoft.com/typography/otspec/features_ae.htm#case">case</a>
    feature in OpenType). Should we turn that on by default, as they suggest?
 
-  <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
-   &lsquo;<a href="#text-transform0"><code
-   class=css>@text-transform</code></a>&rsquo; rule similar to &lsquo;<code
-   class=css>@counter-style</code>&rsquo; from <a href="#CSS3LIST"
-   rel=biblioentry>[CSS3LIST]<!--{{CSS3LIST}}--></a>.
+  <p class=issue>CSS may introduce the ability to create custom mapping
+   tables for less common text transforms, such as by an &lsquo;<a
+   href="#text-transform0"><code class=css>@text-transform</code></a>&rsquo;
+   rule similar to &lsquo;<code class=css>@counter-style</code>&rsquo; from
+   <a href="#CSS3LIST" rel=biblioentry>[CSS3LIST]<!--{{CSS3LIST}}--></a>, and
+   this mechanism may be used to replace &lsquo;<code
+   class=css>full-size-kana</code>&rsquo;.
 
   <h2 id=white-space-processing><span class=secno>3. </span> White Space
    Processing</h2>
@@ -1533,6 +1534,37 @@ <h3 id=word-break><span class=secno>4.2. </span> Word Breaking Rules: the
     line-breaking opportunities, as in Korean.
   </dl>
 
+  <div class=example>
+   <p class=issue>Add example here
+
+   <p>Here's a mixed-script sample text:
+
+   <p><q>这是一些汉字 and some Latin text و کمی نوشتنن
+    عربی and some Thai.</q></p>
+
+   <p>The break-points are determined as follows (indicated by &middot;):
+
+   <dl>
+    <dt>&lsquo;<code class=css>word-break: normal</code>&rsquo;
+
+    <dd>
+     <p><q>这&middot;是一些汉字 and some Latin text و کمی
+      نوشتنن عربی and some Thai.</q></p>
+
+    <dt>&lsquo;<code class=css>word-break: break-all</code>&rsquo;
+
+    <dd>
+     <p><q>这是一些汉字 and some Latin text و کمی نوشتنن
+      عربی and some Thai.</q></p>
+
+    <dt>&lsquo;<code class=css>word-break: keep-all</code>&rsquo;
+
+    <dd>
+     <p><q>这是一些汉字 and some Latin text و کمی نوشتنن
+      عربی and some Thai.</q></p>
+   </dl>
+  </div>
+
   <p>When shaping scripts such as Arabic are allowed to break within words
    due to &lsquo;<code class=css>break-all</code>&rsquo;, the characters must
    still be shaped as if the word were not broken.
diff --git a/css4-text/Overview.src.html b/css4-text/Overview.src.html
@@ -337,9 +337,10 @@ <h3 id="text-transform">
         <a href="http://www.microsoft.com/typography/otspec/features_ae.htm#case">case</a>
       feature in OpenType). Should we turn that on by default, as they suggest?</p>
       
-    <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
-      ''@text-transform'' rule similar to ''@counter-style'' from [[CSS3LIST]].
+    <p class="issue">CSS may introduce the ability to create custom mapping
+      tables for less common text transforms, such as by an ''@text-transform''
+      rule similar to ''@counter-style'' from [[CSS3LIST]], and this mechanism
+      may be used to replace ''full-size-kana''.
 
 <h2 id="white-space-processing">
   White Space Processing</h2>
@@ -1009,6 +1010,32 @@ <h3 id="word-break">
         characters still creates line-breaking opportunities, as in Korean.</dd>
     </dl>
 
+    <div class="example">
+      <p class="issue">Add example here
+      <p>Here's a mixed-script sample text:
+      <p><q>这是一些汉字 and some Latin text
+       و کمی نوشتنن عربی 
+      and some Thai.</q></p>
+      <p>The break-points are determined as follows (indicated by &middot;):
+      <dl>
+        <dt>''word-break: normal''</dt>
+        <dd>
+      <p><q>这&middot;是一些汉字 and some Latin text
+       و کمی نوشتنن عربی 
+      and some Thai.</q></p>
+        <dt>''word-break: break-all''</dt>
+        <dd>
+      <p><q>这是一些汉字 and some Latin text
+       و کمی نوشتنن عربی 
+      and some Thai.</q></p>
+        <dt>''word-break: keep-all''</dt>
+        <dd>
+      <p><q>这是一些汉字 and some Latin text
+       و کمی نوشتنن عربی 
+      and some Thai.</q></p>
+      </dl>
+    </div>
+
     <p>When shaping scripts such as Arabic are allowed to break within words
       due to ''break-all'', the characters must still be shaped as if the
       word were not broken.</p>
