Fix text-combine to handle bidi and line-breaking correctly.

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 2 August 2012</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 14 August 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-20120802/">http://www.w3.org/TR/2012/ED-css3-writing-modes-20120802/</a>
+    <dd><a href="http://www.w3.org/TR/2012/WD-css3-writing-modes-20120814/">http://www.w3.org/TR/2012/ED-css3-writing-modes-20120814/</a>
 -->
 
 
@@ -3293,10 +3293,13 @@ <h3 id=text-combine-horizontal><span class=secno>9.1. </span>
    horizontally and vertically within the measured 1em square. The baseline
    of the resulting composition chosen such that the square is centered
    between the text-over and text-under baselines of its parent inline box
-   prior to any baseline alignment shift. For text layout purposes, e.g. bidi
-   ordering, line-breaking, emphasis marks, text-decoration, etc. the
-   resulting composition is treated as a single glyph representing the Object
-   Replacement Character U+FFFC.
+   prior to any baseline alignment shift. For bidi reordering, the
+   composition is treated the same as a character with ‘<code
+   class=css>text-orientation: upright</code>’. For line breaking, the
+   composition is treated as a regular inline with its actual contents. For
+   other text layout purposes, e.g. emphasis marks, text-decoration, spacing,
+   etc. the resulting composition is treated as a single glyph representing
+   the Object Replacement Character U+FFFC.
 
   <p>In some fonts, the ideographic glyphs are given a compressed design such
    that they are 1em wide but shorter than 1em tall. To accommodate such
@@ -4488,25 +4491,24 @@ <h2 class=no-num id=property-index> Property Index</h2>
      <td>visual
 
     <tr>
-     <th><span class=property>‘caption-side’</span>
+     <th><span class=property></span>
 
-     <td>‘head’ | ‘foot’
+     <td>
 
-     <td>head
+     <td>as defined in [CSS21]
 
-     <td>same as CSS2.1
+     <td>as defined in [CSS21]
 
-     <td>same as CSS2.1
+     <td>as defined in [CSS21]
 
-     <td>same as CSS2.1
+     <td>as defined in [CSS21]
 
-     <td>same as CSS2.1
+     <td>as defined in [CSS21]
 
     <tr>
-     <th><span class=property>‘column-width’</span>
+     <th><span class=property></span>
 
-     <td>‘min-content’ | ‘max-content’ | ‘fill-available’ |
-      ‘fit-content’
+     <td>
 
      <td>as defined in [CSS3COL]
 
@@ -4519,25 +4521,19 @@ <h2 class=no-num id=property-index> Property Index</h2>
      <td>as defined in [CSS3COL]
 
     <tr>
-     <th><span class=property>‘width’</span>, <span
-      class=property>‘min-width’</span>, <span
-      class=property>‘max-width’</span>, <span
-      class=property>‘height’</span>, <span
-      class=property>‘min-height’</span>, <span
-      class=property>‘max-height’</span>
+     <th><span class=property></span>
 
-     <td>‘min-content’ | ‘max-content’ | ‘fill-available’ |
-      ‘fit-content’
+     <td>
 
-     <td>as defined in [CSS21]
+     <td>head
 
-     <td>as defined in [CSS21]
+     <td>same as CSS2.1
 
-     <td>as defined in [CSS21]
+     <td>same as CSS2.1
 
-     <td>as defined in [CSS21]
+     <td>same as CSS2.1
 
-     <td>as defined in [CSS21]
+     <td>same as CSS2.1
 
     <tr>
      <th><a class=property

css3-writing-modes/Overview.src.html

@@ -2435,8 +2435,10 @@ <h3 id="text-combine-horizontal">
     The baseline of the resulting composition chosen such that the
     square is centered between the text-over and text-under baselines
     of its parent inline box prior to any baseline alignment shift.
-    For text layout purposes,
-    e.g. bidi ordering, line-breaking, emphasis marks, text-decoration,
+    For bidi reordering, the composition is treated the same as a character with ''text-orientation: upright''.
+    For line breaking, the composition is treated as a regular inline with its actual contents.
+    For other text layout purposes,
+    e.g. emphasis marks, text-decoration, spacing,
     etc. the resulting composition is treated as a single glyph
     representing the Object Replacement Character U+FFFC.