Update text-decoration-line with f2f feedback

fantasai · fantasai · commit 2719a865969b · 2011-07-25T01:34:44.000Z
diff --git a/css3-text/Overview.html b/css3-text/Overview.html
@@ -90,7 +90,7 @@ <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 25 July 2011</h2>
     <dt>This version:
 
     <dd><a href="http://dev.w3.org/csswg/css3-text/Overview.html">$Date:
-     2011/07/24 23:27:22 $ (CVS $Revision$)</a> <!--
+     2011/07/25 01:19:21 $ (CVS $Revision$)</a> <!--
       <dd><a href="http://www.w3.org/TR/2011/WD-css3-text-20110725/">http://www.w3.org/TR/2011/WD-css3-text-20110725/</a></dd>
     -->
      
@@ -4277,8 +4277,9 @@ <h4 id=text-decoration-line><span class=secno>10.1.1. </span> Text
     <tr>
      <th>Value:
 
-     <td>none | underline || overline || line-through || [ cancel-underline
-      || cancel-overline || cancel-line-through | cancel-all ]
+     <td>none | [ underline | no-underline | replace-underline ] || [
+      overline | no-overline | replace-overline ] || [ line-through |
+      no-line-through | replace-line-through ] | remove-all
 
     <tr>
      <th>Initial:
@@ -4323,35 +4324,43 @@ <h4 id=text-decoration-line><span class=secno>10.1.1. </span> Text
 
    <dd>Each line of text is underlined.
 
-   <dt><dfn id=cancel-underline>cancel-underline</dfn>
+   <dt><dfn id=no-underline>no-underline</dfn>
 
    <dd>Inhibits propagated underlines.
 
+   <dt><dfn id=replace-underline>replace-underline</dfn>
+
+   <dd>Inhibits propagated underlines and produces an underline.
+
    <dt><dfn id=overline>overline</dfn>
 
    <dd>Each line of text has a line above it (i.e. on the opposite side from
     an underline).
 
-   <dt><dfn id=cancel-overline>cancel-overline</dfn>
+   <dt><dfn id=no-overline>no-overline</dfn>
 
    <dd>Inhibits propagated overlines.
 
+   <dt><dfn id=replace-overline>replace-overline</dfn>
+
+   <dd>Inhibits propagated overlines and produces an overline.
+
    <dt><dfn id=line-through>line-through</dfn>
 
    <dd>Each line of text has a line through the middle.
 
-   <dt><dfn id=cancel-line-through>cancel-line-through</dfn>
+   <dt><dfn id=no-line-through>no-line-through</dfn>
 
    <dd>Inhibits propagated line-throughs.
 
-   <dt><dfn id=cancel-all>cancel-all</dfn>
+   <dt><dfn id=replace-line-through>replace-line-through</dfn>
 
-   <dd>Inhibits propagated text decorations.
-  </dl>
+   <dd>Inhibits propagated line-throughs and produces an line-through.
 
-  <p class=issue>The use of "cancel-" instead of "no-" is incompatible with
-   XSL. It was motivated by the desire to make <code>text-decoration:
-   underline no-underline</code> less nonsensical.
+   <dt><dfn id=remove-all>remove-all</dfn>
+
+   <dd>Inhibits all propagated text decorations.
+  </dl>
 
   <h4 id=text-decoration-color><span class=secno>10.1.2. </span> Text
    Decoration Color: the &lsquo;<a href="#text-decoration-color0"><code
@@ -6422,8 +6431,9 @@ <h2 class=no-num id=appendix-h-full-property-index>Appendix H: Full
      <td><a class=property
       href="#text-decoration-line0">text-decoration-line</a>
 
-     <td>none | underline || overline || line-through || [ cancel-underline
-      || cancel-overline || cancel-line-through | cancel-all ]
+     <td>none | [ underline | no-underline | replace-underline ] || [
+      overline | no-overline | replace-overline ] || [ line-through |
+      no-line-through | replace-line-through ] | remove-all
 
      <td>none
 
@@ -6746,18 +6756,6 @@ <h2 class=no-num id=index>Appendix I: Index</h2>
    <li>block scripts, <a href="#block-scripts0" title="block
     scripts"><strong>#</strong></a>
 
-   <li>cancel-all, <a href="#cancel-all"
-    title=cancel-all><strong>10.1.1.</strong></a>
-
-   <li>cancel-line-through, <a href="#cancel-line-through"
-    title=cancel-line-through><strong>10.1.1.</strong></a>
-
-   <li>cancel-overline, <a href="#cancel-overline"
-    title=cancel-overline><strong>10.1.1.</strong></a>
-
-   <li>cancel-underline, <a href="#cancel-underline"
-    title=cancel-underline><strong>10.1.1.</strong></a>
-
    <li>character, <a href="#character"
     title=character><strong>1.</strong></a>
 
@@ -6870,6 +6868,9 @@ <h2 class=no-num id=index>Appendix I: Index</h2>
    <li>line-through, <a href="#line-through"
     title=line-through><strong>10.1.1.</strong></a>
 
+   <li>no-line-through, <a href="#no-line-through"
+    title=no-line-through><strong>10.1.1.</strong></a>
+
    <li>&lsquo;<code class=css>none</code>&rsquo;, <a href="#none0"
     title="''none''"><strong>5.5.</strong></a>
 
@@ -6879,6 +6880,12 @@ <h2 class=no-num id=index>Appendix I: Index</h2>
    <li>Non-ideographic numerals, <a href="#non-ideographic-numerals"
     title="Non-ideographic numerals"><strong>8.3.2.</strong></a>
 
+   <li>no-overline, <a href="#no-overline"
+    title=no-overline><strong>10.1.1.</strong></a>
+
+   <li>no-underline, <a href="#no-underline"
+    title=no-underline><strong>10.1.1.</strong></a>
+
    <li>overflow-wrap, <a href="#overflow-wrap0"
     title=overflow-wrap><strong>6.2.</strong></a>
 
@@ -6903,6 +6910,18 @@ <h2 class=no-num id=index>Appendix I: Index</h2>
    <li>preserved, <a href="#preserved"
     title=preserved><strong>3.3.</strong></a>
 
+   <li>remove-all, <a href="#remove-all"
+    title=remove-all><strong>10.1.1.</strong></a>
+
+   <li>replace-line-through, <a href="#replace-line-through"
+    title=replace-line-through><strong>10.1.1.</strong></a>
+
+   <li>replace-overline, <a href="#replace-overline"
+    title=replace-overline><strong>10.1.1.</strong></a>
+
+   <li>replace-underline, <a href="#replace-underline"
+    title=replace-underline><strong>10.1.1.</strong></a>
+
    <li>&lt;shadow&gt;, <a href="#ltshadowgt"
     title="&lt;shadow&gt;"><strong>10.3.</strong></a>
 
diff --git a/css3-text/Overview.src.html b/css3-text/Overview.src.html
@@ -3182,8 +3182,11 @@ <h4 id="text-decoration-line">
           </tr>
           <tr>
             <th>Value:</th>
-            <td>none | underline || overline || line-through ||
-                [ cancel-underline || cancel-overline || cancel-line-through | cancel-all ]
+            <td>none | 
+                [ underline    | no-underline    | replace-underline ] ||
+                [ overline     | no-overline     | replace-overline ]  ||
+                [ line-through | no-line-through | replace-line-through ] |
+                remove-all
             </td>
           </tr>
           <tr>
@@ -3221,25 +3224,27 @@ <h4 id="text-decoration-line">
           <dd>Neither produces nor inhibits text decoration.
         <dt><dfn>underline</dfn>
           <dd>Each line of text is underlined.
-        <dt><dfn>cancel-underline</dfn>
+        <dt><dfn>no-underline</dfn>
           <dd>Inhibits propagated underlines.
+        <dt><dfn>replace-underline</dfn>
+          <dd>Inhibits propagated underlines and produces an underline.
         <dt><dfn>overline</dfn>
           <dd>Each line of text has a line above it (i.e. on the opposite
           side from an underline).
-        <dt><dfn>cancel-overline</dfn>
+        <dt><dfn>no-overline</dfn>
           <dd>Inhibits propagated overlines.
+        <dt><dfn>replace-overline</dfn>
+          <dd>Inhibits propagated overlines and produces an overline.
         <dt><dfn>line-through</dfn>
           <dd>Each line of text has a line through the middle.
-        <dt><dfn>cancel-line-through</dfn>
+        <dt><dfn>no-line-through</dfn>
           <dd>Inhibits propagated line-throughs.
-        <dt><dfn>cancel-all</dfn>
-          <dd>Inhibits propagated text decorations.
+        <dt><dfn>replace-line-through</dfn>
+          <dd>Inhibits propagated line-throughs and produces an line-through.
+        <dt><dfn>remove-all</dfn>
+          <dd>Inhibits all propagated text decorations.
       </dl>
 
-    <p class="issue">The use of "cancel-" instead of "no-" is incompatible
-      with XSL. It was motivated by the desire to make
-        <code>text-decoration: underline no-underline</code> less nonsensical.
-
     <h4 id="text-decoration-color">
       Text Decoration Color: the 'text-decoration-color' property</h4>
 
