Tweak word-break wording, add keep-words value per <http://littlepotato.webfreehosting.net/cjk-beyond-kinsokushori.php> (to be marked at-risk when we make the at-risk list, but adding here for comments).

Author: fantasai

css3-text/Overview.html

@@ -83,14 +83,14 @@
 
    <h1>CSS Text Level 3</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 28 January
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 30 January
     2011</h2>
 
    <dl>
     <dt>This version:
 
     <dd><a href="http://dev.w3.org/csswg/css3-text/Overview.html">$Date:
-     2011/01/26 06:11:27 $ (CVS $Revision$)</a> <!--<dd><a
+     2011/01/28 01:27:35 $ (CVS $Revision$)</a> <!--<dd><a
       href="http://www.w3.org/TR/2010/WD-css3-text-20101005/">http://www.w3.org/TR/2010/WD-css3-text-20101005/</a></dd> -->
 
 
@@ -1337,7 +1337,7 @@ <h3 id=word-break><span class=secno>5.2. </span> Word Breaking Rules: the
     <tr>
      <th>Value:
 
-     <td>normal | keep-all | break-all | hyphenate
+     <td>normal | keep-all | break-all | keep-words
 
     <tr>
      <th>Initial:
@@ -1376,41 +1376,37 @@ <h3 id=word-break><span class=secno>5.2. </span> Word Breaking Rules: the
   <dl>
    <dt><dfn id=normal1 title="word-break:normal"><code>normal</code></dfn>
 
-   <dd>Break words according to their usual rules.
+   <dd>Break lines according to their usual rules.
 
    <dt><dfn id=break-all
     title="word-break:break-all"><code>break-all</code></dfn>
 
-   <dd>Words may break between any two grapheme clusters within words.
+   <dd>Lines may break between any two grapheme clusters within words.
     Hyphenation is not applied. This option is used mostly in a context where
     the text is predominantly using CJK characters with few non-CJK excerpts
     and it is desired that the text be better distributed on each line.
 
    <dt><dfn id=keep-all
-    title="line-break:keep-all"><code>keep-all</code></dfn>
+    title="word-break:keep-all"><code>keep-all</code></dfn>
 
-   <dd><a href="#block-scripts">Block</a> characters no longer create implied
-    break points. Otherwise this option is equivalent to &lsquo;<code
+   <dd><a href="#block-scripts">Block</a> characters can no longer create
+    implied break points. Otherwise this option is equivalent to &lsquo;<code
     class=css>normal</code>&rsquo;. This option is mostly used where the
     presence of word separator characters still creates line-breaking
     opportunities, as in Korean.
 
-   <dt><dfn id=hyphenate
-    title="word-break:hyphenate"><code>hyphenate</code></dfn>
-
-   <dd>Words may be broken at an appropriate hyphenation point in addition to
-    opportunities available under &lsquo;<code
-    class=css>normal</code>&rsquo;.
-    <p class=issue>This value is proposed to replace the &lsquo;<a
-     href="#hyphens0"><code class=property>hyphens</code></a>&rsquo;
-     property. Other values could be added as &lsquo;<code
-     class=css>word-break: hyphenate-all</code>&rsquo; and &lsquo;<code
-     class=css>word-break: none</code>&rsquo;
+   <dd><dfn id=keep-words
+    title="word-break:keep-words"><code>keep-words</code></dfn>
+
+   <dd>Lines may not break within words, even in <a
+    href="#block-scripts">block scripts</a> (which would require the use of a
+    dictionary in languages such as Chinese and Japanese). This option is
+    sometimes used in combination with start-aligned (unjustified) text.
   </dl>
 
   <p>When shaping scripts such as Arabic are allowed to break within words
-   due to &lsquo;<code class=css>break-all</code>&rsquo; or hyphenation, the
-   characters must still be shaped as if the word were not broken.
+   due to &lsquo;<code class=css>break-all</code>&rsquo;, the characters must
+   still be shaped as if the word were not broken.
 
   <h2 id=hyphenation><span class=secno>6. </span>Hyphenation</h2>
 
@@ -1524,6 +1520,10 @@ <h3 id=hyphens><span class=secno>6.1. </span>Hyphenation Control: the
    <code>xml:lang</code>) and for which it has an appropriate hyphenation
    resource.
 
+  <p>When shaping scripts such as Arabic are allowed to break within words
+   due to hyphenation, the characters must still be shaped as if the word
+   were not broken.
+
   <h3 id=hyphenate-character><span class=secno>6.2. </span> Hyphens: the
    &lsquo;<a href="#hyphenate-character0"><code
    class=property>hyphenate-character</code></a>&rsquo; property</h3>
@@ -5138,6 +5138,10 @@ <h3 class=no-num id=recent-changes> Changes from the <a
     class=property>word-break</code></a>&rsquo; and adjusted explanation of
     properties to match this split.
 
+   <li>Added &lsquo;<code class=css>keep-words</code>&rsquo; value to
+    &lsquo;<a href="#word-break0"><code
+    class=property>word-break</code></a>&rsquo;.
+
    <li>Renamed &lsquo;<code class=css>newspaper</code>&rsquo; value of
     &lsquo;<a href="#line-break0"><code
     class=property>line-break</code></a>&rsquo; to &lsquo;<code
@@ -5878,7 +5882,7 @@ <h2 class=no-num id=appendix-b-property-index> Appendix B: Property index</h2>
     <tr valign=baseline>
      <td><a class=property href="#word-break0">word-break</a>
 
-     <td>normal | keep-all | break-all | hyphenate
+     <td>normal | keep-all | break-all | keep-words
 
      <td>normal
 
@@ -6063,9 +6067,6 @@ <h2 class=no-num id=index>Index</h2>
    <li>line-break:auto, <a href="#auto"
     title="line-break:auto"><strong>5.1.</strong></a>
 
-   <li>line-break:keep-all, <a href="#keep-all"
-    title="line-break:keep-all"><strong>5.2.</strong></a>
-
    <li>line-break:loose, <a href="#loose"
     title="line-break:loose"><strong>5.1.</strong></a>
 
@@ -6364,8 +6365,11 @@ <h2 class=no-num id=index>Index</h2>
    <li>word-break:break-all, <a href="#break-all"
     title="word-break:break-all"><strong>5.2.</strong></a>
 
-   <li>word-break:hyphenate, <a href="#hyphenate"
-    title="word-break:hyphenate"><strong>5.2.</strong></a>
+   <li>word-break:keep-all, <a href="#keep-all"
+    title="word-break:keep-all"><strong>5.2.</strong></a>
+
+   <li>word-break:keep-words, <a href="#keep-words"
+    title="word-break:keep-words"><strong>5.2.</strong></a>
 
    <li>word-break:normal, <a href="#normal1"
     title="word-break:normal"><strong>5.2.</strong></a>

css3-text/Overview.src.html

@@ -898,7 +898,7 @@ <h3 id="word-break">
         </tr>
         <tr>
           <th>Value:</th>
-          <td>normal | keep-all | break-all | hyphenate</td>
+          <td>normal | keep-all | break-all | keep-words</td>
         </tr>
         <tr>
           <th>Initial:</th>
@@ -932,29 +932,28 @@ <h3 id="word-break">
 
     <dl>
       <dt><dfn title="word-break:normal"><code>normal</code></dfn></dt>
-      <dd>Break words according to their usual rules.</dd>
+      <dd>Break lines according to their usual rules.</dd>
       <dt><dfn title="word-break:break-all"><code>break-all</code></dfn></dt>
-      <dd>Words may break between any two grapheme clusters within words.
+      <dd>Lines may break between any two grapheme clusters within words.
         Hyphenation is not applied. This option is used mostly in a context where
         the text is predominantly using CJK characters with few non-CJK excerpts
         and it is desired that the text be better distributed on each line.</dd>
-      <dt><dfn title="line-break:keep-all"><code>keep-all</code></dfn></dt>
-      <dd><a href="#block-scripts">Block</a> characters no longer create
+      <dt><dfn title="word-break:keep-all"><code>keep-all</code></dfn></dt>
+      <dd><a href="#block-scripts">Block</a> characters can no longer create
         implied break points. Otherwise this option is equivalent to
         ''normal''.
         This option is mostly used where the presence of word separator
         characters still creates line-breaking opportunities, as in Korean.</dd>
-      <dt><dfn title="word-break:hyphenate"><code>hyphenate</code></dfn></dt>
-      <dd>Words may be broken at an appropriate hyphenation point in addition
-        to opportunities available under ''normal''.
-        <p class="issue">This value is proposed to replace the 'hyphens'
-          property. Other values could be added as ''word-break: hyphenate-all''
-          and ''word-break: none''</p></dd>
+      <dd><dfn title="word-break:keep-words"><code>keep-words</code></dfn></dt>
+      <dd>Lines may not break within words, even in
+        <a href="#block-scripts">block scripts</a> (which would require the use
+        of a dictionary in languages such as Chinese and Japanese). This option
+        is sometimes used in combination with start-aligned (unjustified) text.</dd>
     </dl>
 
     <p>When shaping scripts such as Arabic are allowed to break within words
-      due to ''break-all'' or hyphenation, the characters must still be shaped
-      as if the word were not broken.</p>
+      due to ''break-all'', the characters must still be shaped as if the
+      word were not broken.</p>
 
 <h2 id="hyphenation">Hyphenation</h2>
 
@@ -1040,6 +1039,10 @@ <h3 id="hyphens">Hyphenation Control: the 'hyphens' property</h3>
       or XML <code>xml:lang</code>) and for which it has an appropriate
       hyphenation resource.
 
+    <p>When shaping scripts such as Arabic are allowed to break within words
+      due to hyphenation, the characters must still be shaped as if the word
+      were not broken.</p>
+
   <h3 id="hyphenate-character">
     Hyphens: the 'hyphenate-character' property</h3>
 
@@ -3944,6 +3947,7 @@ <h3 class="no-num" id="recent-changes">
       property, consistent with behavior in MSIE.
     <li>Moved ''keep-all'' value of 'line-break' back to 'word-break' and
       adjusted explanation of properties to match this split.
+    <li>Added ''keep-words'' value to 'word-break'.
     <li>Renamed ''newspaper'' value of 'line-break' to ''loose''.
     <li>Copied hyphenation controls over from
       <a href="http://www.w3.org/TR/css3-gcpm">CSS3 Generated Content for Paged Media Module</a>