csswg/css3-gcpm Overview.html,1.136,1.137

Update of /sources/public/csswg/css3-gcpm
In directory hutz:/tmp/cvs-serv28822

Modified Files:
	Overview.html 
Log Message:
x

Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-gcpm/Overview.html,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- Overview.html	25 Oct 2011 19:06:26 -0000	1.136
+++ Overview.html	25 Oct 2011 19:58:24 -0000	1.137
@@ -322,21 +322,25 @@
     <ul class=toc>
      <li><a href="#float-modifiers"><span class=secno>15.1. </span>Float
       modifiers</a>
+    </ul>
 
-     <li><a href="#floating-inside-and-outside-pages"><span class=secno>15.2.
+   <li><a href="#multi-column-float-intrusion"><span class=secno>16.
+    </span>Multi-column float intrusion</a>
+    <ul class=toc>
+     <li><a href="#floating-inside-and-outside-pages"><span class=secno>16.1.
       </span>Floating inside and outside pages</a>
     </ul>
 
    <li><a href="#aligning-baselines-in-multi-column-layou"><span
-    class=secno>16. </span>Aligning baselines in multi-column layouts</a>
+    class=secno>17. </span>Aligning baselines in multi-column layouts</a>
 
-   <li><a href="#the-first-page-pseudo-element"><span class=secno>17.
+   <li><a href="#the-first-page-pseudo-element"><span class=secno>18.
     </span>The &lsquo;<code class=property>first-page</code>&rsquo;
     pseudo-element</a>
 
-   <li><a href="#conformance"><span class=secno>18. </span>Conformance</a>
+   <li><a href="#conformance"><span class=secno>19. </span>Conformance</a>
 
-   <li><a href="#appendix-a-default-style-sheet"><span class=secno>19.
+   <li><a href="#appendix-a-default-style-sheet"><span class=secno>20.
     </span>Appendix A: Default style sheet</a>
 
    <li class=no-num><a href="#acknowledgments">Acknowledgments</a>
@@ -3295,8 +3299,11 @@
 
    <h3 id=float-modifiers><span class=secno>15.1. </span>Float modifiers</h3>
 
-   <p>These new values on &lsquo;<code class=property>float</code>&rsquo; can
-    be combined with the other values:
+   <p>These values on &lsquo;<code class=property>float</code>&rsquo; can be
+    combined with &lsquo;<code class=property>top</code>&rsquo;/&lsquo;<code
+    class=property>bottom</code>&rsquo;/&lsquo;<code
+    class=property>top-corner</code>&rsquo;/&lsquo;<code
+    class=property>bottom-corner</code>&rsquo; values:
 
    <dl>
     <dt>next-page
@@ -3312,24 +3319,48 @@
     <dt>unless-room
 
     <dd>Only float the box if it otherwise would have lead to a column or
-     page break
-     <p class=issue>Can this value be combined with all other values? E.g.,
-      does "left unless-room" make sense?
+     page break.
 
-    <dt>intrude
+    <dt>left
 
-    <dd>The element may intrude neighboring columns; if the element is not in
-     a multi-column element, this keyword has no effect.
+    <dt>right
    </dl>
 
    <div class=example>
     <pre>
 .figure { float: top next-column }
+.figure { float: next-column top }
 .figure { float: top unless-room }
 .figure { float: top-corner next-page }
 </pre>
    </div>
 
+   <p>Also, &lsquo;<code class=property>snap</code>&rsquo; can be combined
+    with &lsquo;<code class=property>left</code>&rsquo; and &lsquo;<code
+    class=property>right</code>&rsquo;.
+
+   <h2 id=multi-column-float-intrusion><span class=secno>16.
+    </span>Multi-column float intrusion</h2>
+
+   <p>A new value on &lsquo;<code class=property>float</code>&rsquo; is
+    introduced to support intrusion in columns:
+
+   <dl>
+    <dt>intrude
+
+    <dd>The element may intrude neighboring columns; if the element is not in
+     a multi-column element, this keyword has no effect.
+   </dl>
+
+   <p>The &lsquo;<code class=property>intrude</code>&rsquo; value only works
+    in combination with one of these keywords: &lsquo;<code
+    class=property>left</code>&rsquo;/&lsquo;<code
+    class=property>right</code>&rsquo;/&lsquo;<code
+    class=property>top</code>&rsquo;/&lsquo;<code
+    class=property>bottom</code>&rsquo;/&lsquo;<code
+    class=property>top-corner</code>&rsquo;/&lsquo;<code
+    class=property>bottom-corner</code>&rsquo;.
+
    <div class=example>
     <pre class=css>
 img { float: left intrude; width: 120%;  }
@@ -3341,12 +3372,7 @@
      src=1.png>
    </div>
 
-   <p class=issue>Would it be better to have these modifiers on a new
-    property, e.g. &lsquo;<code class=property>float-adjust</code>&rsquo;.
-    This way, the &lsquo;<code class=property>float</code>&rsquo; property
-    would only need to take one value.
-
-   <h3 id=floating-inside-and-outside-pages><span class=secno>15.2.
+   <h3 id=floating-inside-and-outside-pages><span class=secno>16.1.
     </span>Floating inside and outside pages</h3>
 
    <p>Two allow content to flow to the inside and outside of a page, these
@@ -3373,7 +3399,7 @@
 </pre>
    </div>
 
-   <h2 id=aligning-baselines-in-multi-column-layou><span class=secno>16.
+   <h2 id=aligning-baselines-in-multi-column-layou><span class=secno>17.
     </span>Aligning baselines in multi-column layouts</h2>
 
    <p>In multi-column layouts, baselines are typically aligned between
@@ -3418,7 +3444,7 @@
     class=property>line-stacking-strategy</code>&rsquo; property is <a
     href="http://www.w3.org/TR/xsl/#line-stacking-strategy">used in XSL</a>.
 
-   <h2 id=the-first-page-pseudo-element><span class=secno>17. </span>The
+   <h2 id=the-first-page-pseudo-element><span class=secno>18. </span>The
     &lsquo;<code class=property>first-page</code>&rsquo; pseudo-element</h2>
    <!--
 <p>The 'first-page' pseudo-element selects the content of an element
@@ -3459,7 +3485,7 @@
      page of each chapter:
 
     <pre>
-  div.chapter { columns: 20em; break-before: left }
+  div.chapter { break-before: left }
   div.chapter::first-page { padding-left: 4em }
 </pre>
    </div>
@@ -3523,10 +3549,10 @@
 
 -->
    
-   <h2 id=conformance><span class=secno>18. </span>Conformance</h2>
+   <h2 id=conformance><span class=secno>19. </span>Conformance</h2>
    <!--User agents that support hyphenation and support this specification must a-->
    
-   <h2 id=appendix-a-default-style-sheet><span class=secno>19.
+   <h2 id=appendix-a-default-style-sheet><span class=secno>20.
     </span>Appendix A: Default style sheet</h2>
 
    <p class=issue>

Received on Tuesday, 25 October 2011 19:58:32 UTC