Merge 'unicode-bidi: isolate bidi-override' into 'unicode-bidi: isolate-override' per <http://lists.w3.org/Archives/Public/www-style/2012May/0541.html>

Author: fantasai

css3-text/Overview.src.html

@@ -167,6 +167,13 @@ <h3 id="values">
   keyword as their property value. For readability it has not been repeated
   explicitly.
 
+  <p>The <dfn>''currentcolor''</dfn> keyword here computes to itself and is
+  resolved to the value of 'color' after inheritance is performed. This is
+  so that the 'text-emphasis-color' by default matches the text 'color'.
+  <span class="issue">CSS3 Color has not yet been errata'd to define it this way;
+  currentcolor there is defined to compute to the value of 'color',
+  which gives it the wrong inheritance behavior.</span>
+
 <h3 id="terms">
 Terminology</h3>
 

css3-writing-modes/Overview.html

@@ -32,15 +32,15 @@
 
    <h1>CSS Writing Modes Module Level 3</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 12 June 2012</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 21 June 2012</h2>
 
    <dl>
     <dt>This version:
 
     <dd><a
      href="http://dev.w3.org/csswg/css3-writing-modes/">http://dev.w3.org/csswg/css3-writing-modes/</a>
      <!--
-    <dd><a href="http://www.w3.org/TR/2012/WD-css3-writing-modes-20120612/">http://www.w3.org/TR/2012/ED-css3-writing-modes-20120612/</a>
+    <dd><a href="http://www.w3.org/TR/2012/WD-css3-writing-modes-20120621/">http://www.w3.org/TR/2012/ED-css3-writing-modes-20120621/</a>
 -->
 
 
@@ -680,7 +680,8 @@ <h3 id=unicode-bidi><span class=secno>2.2. </span> Embeddings and
     <tr>
      <th><a href="#values">Value</a>:
 
-     <td>normal | embed | [ isolate || bidi-override ] | plaintext
+     <td>normal | embed | isolate | bidi-override | isolate-override |
+      plaintext
 
     <tr>
      <th>Initial:
@@ -713,7 +714,78 @@ <h3 id=unicode-bidi><span class=secno>2.2. </span> Embeddings and
      <td>specified value
   </table>
 
-  <p>Values for this property have the following meanings:
+  <p>Normally (i.e. when ‘<a href="#unicode-bidi0"><code
+   class=property>unicode-bidi</code></a>’ is ‘<a href="#normal"><code
+   class=css>normal</code></a>’) an inline element is transparent to the
+   unicode bidi algorithm; content is ordered as if it were not there. The
+   ‘<a href="#unicode-bidi0"><code
+   class=property>unicode-bidi</code></a>’ property allows inline elements
+   to enforce scoping of the algorithm, and to override the intrinsic
+   directionality of text.
+
+  <p>The following informative table summarizes the element-internal and
+   element-external effects of ‘<a href="#unicode-bidi0"><code
+   class=property>unicode-bidi</code></a>’:
+
+  <table class=data>
+   <caption>Effect of non-‘<a href="#normal"><code
+    class=css>normal</code></a>’ values of ‘<a
+    href="#unicode-bidi0"><code class=property>unicode-bidi</code></a>’ on
+    inline elements</caption>
+
+   <colgroup span=2></colgroup>
+
+   <colgroup span=3></colgroup>
+
+   <thead>
+    <tr>
+     <th colspan=2 rowspan=2>
+
+     <th colspan=3 scope=rowgroup><abbr
+      title="To surrounding contents, the element behaves as if its boundary were...">Outside</abbr>
+      
+
+    <tr>
+     <th><abbr
+      title="a strong character of the element's 'direction'.">strong</abbr>
+
+     <th><abbr title="a neutral character.">neutral</abbr>
+
+   <tbody>
+    <tr>
+     <th rowspan=3 scope=colgroup><abbr
+      title="Within the element, content is ordered as if...">Inside</abbr>
+
+     <th><abbr
+      title="the element's boundaries were strong characters of the element's 'direction'.">embed</abbr>
+      
+
+     <td>‘<a href="#embed"><code class=css>embed</code></a>’
+
+     <td>‘<a href="#isolate"><code class=css>isolate</code></a>’
+
+    <tr>
+     <th><abbr
+      title="all text consisted of strong characters of the element's 'direction'.">override</abbr>
+      
+
+     <td>‘<a href="#bidi-override"><code
+      class=css>bidi-override</code></a>’
+
+     <td>‘<a href="#isolate-override"><code
+      class=css>isolate-override</code></a>’
+
+    <tr>
+     <th><abbr
+      title="the element were a standalone paragraph ordered using UAX9 heuristics.">plaintext
+      </abbr>
+
+     <td>—
+
+     <td>‘<a href="#plaintext"><code class=css>plaintext</code></a>’
+  </table>
+
+  <p>Values for this property have the following (normative) meanings:
 
   <dl>
    <dt><dfn id=normal>normal</dfn>
@@ -759,6 +831,16 @@ <h3 id=unicode-bidi><span class=secno>2.2. </span> Embeddings and
     rtl</code>’, at the start of the element and a PDF (U+202C) at the end
     of the element.
 
+   <dt><dfn id=isolate-override>isolate-override<dfn></dfn></dfn>
+
+   <dd>This combines the isolation behavior of ‘<a href="#isolate"><code
+    class=css>isolate</code></a>’ with the override behavior of ‘<a
+    href="#bidi-override"><code class=css>bidi-override</code></a>’: to
+    surrounding content, it is equivalent to ‘<a href="#isolate"><code
+    class=css>isolate</code></a>’, but within the element content is
+    ordered as if ‘<a href="#bidi-override"><code
+    class=css>bidi-override</code></a>’ were specified.
+
    <dt><dfn id=plaintext>plaintext</dfn>
 
    <dd>
@@ -4522,7 +4604,8 @@ <h2 class=no-num id=property-index> Property Index</h2>
     <tr>
      <th><a class=property href="#unicode-bidi0">unicode-bidi</a>
 
-     <td>normal | embed | [ isolate || bidi-override ] | plaintext
+     <td>normal | embed | isolate | bidi-override | isolate-override |
+      plaintext
 
      <td>normal
 

css3-writing-modes/Overview.src.html

@@ -347,7 +347,7 @@ <h3 id="unicode-bidi">
         </tr>
         <tr>
           <th><a href="#values">Value</a>:</th>
-          <td>normal | embed | [ isolate || bidi-override ] | plaintext
+          <td>normal | embed | isolate | bidi-override | isolate-override | plaintext
         </tr>
         <tr>
           <th>Initial:</th>
@@ -376,7 +376,40 @@ <h3 id="unicode-bidi">
       </tbody>
     </table>
 
-  <p>Values for this property have the following meanings:</p>
+  <p>Normally (i.e. when 'unicode-bidi' is ''normal'')
+    an inline element is transparent to the unicode bidi algorithm;
+    content is ordered as if it were not there.
+    The 'unicode-bidi' property allows inline elements to enforce scoping of the algorithm,
+    and to override the intrinsic directionality of text.
+
+  <p>The following informative table summarizes the element-internal and
+    element-external effects of 'unicode-bidi':
+
+  <table class="data">
+    <caption>Effect of non-''normal'' values of 'unicode-bidi' on inline elements</caption>
+    <colgroup span=2></colgroup>
+    <colgroup span=3></colgroup>
+    <thead>
+      <tr><th colspan=2 rowspan=2>
+          <th colspan=3 scope=rowgroup><abbr title="To surrounding contents, the element behaves as if its boundary were...">Outside</abbr>
+      <tr><th><abbr title="a strong character of the element's 'direction'.">strong</abbr>
+          <th><abbr title="a neutral character.">neutral</abbr>
+    </thead>
+    <tbody>
+      <tr><th rowspan=3 scope=colgroup><abbr title="Within the element, content is ordered as if...">Inside</abbr>
+          <th><abbr title="the element's boundaries were strong characters of the element's 'direction'.">embed</abbr>
+          <td>''embed''
+          <td>''isolate''
+      <tr><th><abbr title="all text consisted of strong characters of the element's 'direction'.">override</abbr>
+          <td>''bidi-override''
+          <td>''isolate-override''
+      <tr><th><abbr title="the element were a standalone paragraph ordered using UAX9 heuristics.">plaintext</a>
+          <td>&mdash;
+          <td>''plaintext''
+    </tbody>
+  </table>
+
+  <p>Values for this property have the following (normative) meanings:</p>
 
   <dl>
     <dt><dfn>normal</dfn></dt>
@@ -411,6 +444,11 @@ <h3 id="unicode-bidi">
       is ignored. This corresponds to adding a LRO (U+202D), for ''direction:
       ltr'', or RLO (U+202E), for ''direction: rtl'', at the start of the
       element and a PDF (U+202C) at the end of the element.</dd>
+    <dt><dfn>isolate-override<dfn></dt>
+    <dd>This combines the isolation behavior of ''isolate'' with the
+      override behavior of ''bidi-override'': to surrounding content,
+      it is equivalent to ''isolate'', but within the element content
+      is ordered as if ''bidi-override'' were specified.
     <dt><dfn>plaintext</dfn></dt>
     <dd><p>This value behaves as ''isolate'' except that for the purposes of
       the Unicode bidirectional algorithm, the base directionality of each