merge

Author: Tantek Çelik

css-ui/Overview.bs

@@ -7,7 +7,7 @@ Previous Version: http://www.w3.org/TR/2012/WD-css3-ui-20120117/
 Shortname: css-ui
 Level: 3
 Group: csswg
-!Issue Tracking: http://wiki.csswg.org/spec/css3-ui
+Issue Tracking: http://wiki.csswg.org/spec/css3-ui
 Status: ED
 Editor: Tantek Çelik, Mozilla http://www.mozilla.org, tantek@cs.stanford.edu, http://tantek.com
 

css-writing-modes/Overview.bs

@@ -9,17 +9,17 @@ ED: http://dev.w3.org/csswg/css-writing-modes-3/
 TR: http://www.w3.org/TR/css-writing-modes-3/
 Previous Version: http://www.w3.org/TR/2014/CR-css-writing-modes-3-20140320/
 !Issue Tracking: <a href="http://www.w3.org/Style/CSS/Tracker/products/30">http://www.w3.org/Style/CSS/Tracker/products/30</a>
-Editor: fantasai, Invited Expert, http://fantasai.inkedblade.net/contact
+Editor: Elika J. Etemad / fantasai, Invited Expert, http://fantasai.inkedblade.net/contact
 Editor: Koji Ishii, Google, kojiishi@gmail.com
-Former Editor: Shinyu Murakami, <a href="http://www.antenna.co.jp/">Antenna House</a>, murakami@antenna.co.jp
-Former Editor: Paul Nelson, <a href="http://www.microsoft.com/">Microsoft</a>, paulnel@microsoft.com
-Former Editor: Michel Suignard, <a href="http://www.microsoft.com/">Microsoft</a>, michelsu@microsoft.com
+Former Editor: Shinyu Murakami, Antenna House, murakami@antenna.co.jp
+Former Editor: Paul Nelson, Microsoft, paulnel@microsoft.com
+Former Editor: Michel Suignard, Microsoft, michelsu@microsoft.com
 Abstract: CSS Writing Modes Level 3 defines CSS support for various international writing modes, such as left-to-right (e.g. Latin or Indic), right-to-left (e.g. Hebrew or Arabic), bidirectional (e.g. mixed Latin and Arabic) and vertical (e.g. Asian scripts).
 At Risk: The ''use-glyph-orientation'' of 'text-orientation'
 At Risk: The ''digits'' value of 'text-combine-upright'.
 At Risk: The look-ahead/look-behind sequencing rules for 'text-combine-upright'.
 Ignored Terms: glyph orientation, *-left, *-right, *-top, *-bottom, block containers, text-combine-mode
-Link Defaults: css21 (property) display/min-height/max-height/min-width/max-width/clip, css-text-3 (property) letter-spacing, css-text-decor-3 (property) text-decoration, svg2 (property) glyph-orientation-vertical/glyph-orientation-horizontal
+Link Defaults: css21 (property) display/min-height/max-height/min-width/max-width/clip/left/right/bottom/top, css-text-3 (property) letter-spacing, css-text-decor-3 (property) text-decoration, svg2 (property) glyph-orientation-vertical/glyph-orientation-horizontal
 </pre>
 
 <style>
@@ -465,7 +465,7 @@ Embeddings and Overrides: the 'unicode-bidi' property</h3>
     should be used with extreme caution. However, for elements that are,
     in general, intended to be displayed as blocks, a setting of
     ''unicode-bidi: isolate'' is preferred to keep the element together
-    in case the 'display' is changed to ''inline''
+    in case the 'display' is changed to ''display/inline''
     (see example below).</p>
 
 <h3 id="bidi-example">
@@ -742,10 +742,10 @@ Block Flow Direction: the 'writing-mode' property</h3>
   <p>If a box has a different block flow direction than its containing
     block:
   <ul>
-   <li>If the box has a specified 'display' of ''inline'', its 'display'
+   <li>If the box has a specified 'display' of ''display/inline'', its 'display'
      computes to ''inline-block''. [[!CSS21]]
    <li>If the box has a specified 'display' of ''run-in'', its 'display'
-     computes to ''block''. [[!CSS21]]
+     computes to ''display/block''. [[!CSS21]]
    <li>If the box is a block container, then it establishes a new block
      formatting context.
   </ul>
@@ -982,14 +982,14 @@ Baseline Alignment</h3>
       The glyphs are aligned by matching up the positions of the dominant
       baseline in their corresponding fonts.
     <li><strong>Aligning a child inline-level box within its parent.</strong>
-      For the 'vertical-align' value of ''baseline'', child is aligned to
+      For the 'vertical-align' value of ''vertical-align/baseline'', child is aligned to
       the parent by matching the parent's dominant baseline to the same
       baseline in the child. (E.g. if the parent's dominant baseline is
       alphabetic, then the child's alphabetic baseline is matched to the
       parent's alphabetic baseline, even if the child's dominant baseline
       is something else.)
       For values of ''sub'', ''super'', ''&lt;length&gt;'', and
-      ''&lt;percentage&gt;'', the baselines are aligned as for ''baseline'',
+      ''&lt;percentage&gt;'', the baselines are aligned as for ''vertical-align/baseline'',
       but the child is shifted according to the offset given by its
       'vertical-align' value.
       <div class="example">
@@ -1403,11 +1403,11 @@ Abstract Dimensions</h3>
       <dd>The axis in the inline dimension, i.e. the <i>horizontal
         axis</i> in horizontal writing modes and the <i>vertical axis</i>
         in vertical writing modes.</dd>
-    <dt><dfn lt="block size | block-size">block-size</dfn>
+    <dt><dfn lt="block size | block-size">block size</dfn>
       <dd>A measurement in the block dimension:
         refers to the physical height (vertical dimension) in horizontal writing modes,
         and to the physical width (horizontal dimension) in vertical writing modes.
-    <dt><dfn lt="inline size | inline-size">inline-size</dfn>
+    <dt><dfn lt="inline size | inline-size">inline size</dfn>
       <dd>A measurement in the inline dimension:
         refers to the physical width (horizontal dimension) in horizontal writing modes,
         and to the physical height (vertical dimension) in vertical writing modes.
@@ -1728,7 +1728,7 @@ Principles of Layout in Vertical Writing Modes</h3>
       and the first row on the right (the <i>block-start</i> side).
       The table's 'margin-right' and 'margin-left' would collapse
       with margins before (on the right) and after (on the left) the table, respectively,
-      and if the table had ''auto'' values for 'margin-top' and 'margin-bottom'
+      and if the table had ''margin/auto'' values for 'margin-top' and 'margin-bottom'
       it would be centered vertically within its block flow.
     <div class="figure">
       <p><a href="diagrams/vertical-table.svg">
@@ -1851,7 +1851,7 @@ Orthogonal Flows</h3>
       <em>containing block</em> of the box establishing the <i>orthogonal flow</i>.
   </ul>
 
-  <p>Since ''auto'' margins are resolved consistent with the containing
+  <p>Since ''margin/auto'' margins are resolved consistent with the containing
     block's writing mode, a box establishing an <i>orthogonal flow</i> can,
     once sized, be aligned or centered within its containing block just
     like other block-level boxes by using auto margins.
@@ -1946,7 +1946,7 @@ Auto-sizing Block Containers in Orthogonal Flows</h4>
         thus avoiding T-shaped documents.
         Authors can control the measure of these columns by setting 'column-width',
         or disable this behavior by setting the <i>inline-size</i> property
-        to a non-''width/auto'' value such as ''max-content''.
+        to a non-''width/auto'' value such as ''width/max-content''.
         <br style="clear:both;">
       </div>
 
@@ -1962,7 +1962,7 @@ Auto-sizing Block Containers in Orthogonal Flows</h4>
     </ul>
 
     <li><strong>Calculate the used column length:</strong>
-      If the computed <i>block-size</i> is ''auto''
+      If the computed <i>block-size</i> is ''height/auto''
       and the specified value of at least one of 'column-count' and 'column-width' was ''column-width/auto'',
       use the box’s <i>block-size</i> (if that is <i>definite</i>),
       else the <i>fill-available block-size</i> of the box (if that is <i>definite</i>),
@@ -2104,16 +2104,16 @@ Line-Relative Mappings</h3>
 
   <p>The <i>line-right</i> and <i>line-left</i> directions are calculated
     with respect to the writing mode of the box and used
-    to interpret the ''left'' and ''right'' values of the
+    to interpret the <css>left</css> and <css>right</css> values of the
     following properties:
   <ul>
     <li>the 'text-align' property [[!CSS21]]
   </ul>
 
   <p>The <i>line-right</i> and <i>line-left</i> directions are calculated
     with respect to the writing mode of the <em>containing
-    block</em> of the box and used to interpret the ''left''
-    and ''right'' values of the following properties:
+    block</em> of the box and used to interpret the <css>left</css>
+    and <css>right</css> values of the following properties:
   <ul>
     <li>the 'float' property [[!CSS21]]
     <li>the 'clear' property [[!CSS21]]
@@ -2164,25 +2164,25 @@ Table Caption Mappings: the 'caption-side' keywords</h3>
     <dfn value for='caption-side'>block-start</dfn> and <dfn value for='caption-side'>block-end</dfn>,
     which position the caption before and after the table box, respectively.
     For tables with ''horizontal-tb'' writing mode,
-    they are equivalent to the existing ''top'' and ''bottom'' values, respectively. [[!CSS21]]
+    they are equivalent to the existing ''caption-side/top'' and ''caption-side/bottom'' values, respectively. [[!CSS21]]
 
   <p class='note'>For implementations that support the ''top-outside''
     and ''bottom-outside'' model, corresponding ''start-outside'' and
     ''end-outside'' are similarly introduced.
 
-  <p>Implementations that support the ''top'' and ''bottom'' values
+  <p>Implementations that support the ''caption-side/top'' and ''caption-side/bottom'' values
     of the 'caption-side' property but do not support side captions
-    (i.e. ''left'' and ''right'' captions in horizontal writing modes)
-    must treat both ''top'' and ''bottom'' as <a value>block-start</a>,
+    (i.e. ''caption-side/left'' and ''captionright'' captions in horizontal writing modes)
+    must treat both ''caption-side/top'' and ''captionbottom'' as <a value>block-start</a>,
     when the table is in a vertical writing mode.
 
   <p>For implementations that do support side captions
-    (i.e. the ''left'' and ''right'' values from the obsolete CSS&nbsp;2.0 specification [[CSS2]]),
+    (i.e. the ''caption-side/left'' and ''caption-side/right'' values from the obsolete CSS&nbsp;2.0 specification [[CSS2]]),
     this module also introduces the ''inline-start'' and ''inline-end'' values,
     which behave similarly and which position the
     caption on the <i>inline-start</i> and <i>inline-end</i> sides of the table box,
     calculated with respect to the writing mode of the table box.
-    For such implementations, the ''top'' and ''bottom'' values must place the
+    For such implementations, the ''caption-side/top'' and ''caption-side/bottom'' values must place the
     caption on the top and bottom sides of the table box, respectively.
 
   <p class="note">The CSS2.0 side caption model had some
@@ -2514,7 +2514,7 @@ Full-width Characters</h5>
 <h2 class="no-num" id="changes">Changes</h2>
   <h3 class="no-num" id="changes-201311">
   Changes since the <a href="http://www.w3.org/TR/2014/CR-css-writing-modes-3-20140320/">March
-  2014 CSS Writing Modes Module Level 3 Candidate Recommendation</h3>
+  2014 CSS Writing Modes Module Level 3 Candidate Recommendation</a>
   <ul>
     <li>Fixed orthogonal flows auto-sizing rules to better handle shrink-wrapping.
   </ul>