simonwuelker
diff --git a/‎css-gcpm/Overview.src.html‎
Lines changed: 143 additions & 106 deletions b/‎css-gcpm/Overview.src.html‎
Lines changed: 143 additions & 106 deletions
@@ -12,7 +12,7 @@
 .example img { display: block }
 .example { background: #ddd }
 body { line-height: 1.3 }
-.remove, .unimplemented { background: #fdd }
+.remove, .unimplemented { display: none }
 
 table.string-set-example { font-family: monospace; border-collapse: collapse }
 table.string-set-example div.pre { 
@@ -880,12 +880,11 @@ <h3>The ''target-text'' value</h3>
 
 <h2>Footnotes</h2>
 
-<p>When an element is turned into a footnote, certain magical things
-happen. The element is moved to the footnote area, a footnote call is
+<p>When an element is turned into a footnote, certain things
+happen: the element is moved to the footnote area, a footnote call is
 left behind in its place, a footnote marker is displayed before the
 element, and the footnote counter is incremented.
 
-
 <p>A footnote is a note typically placed at the bottom of a page that
 comments on, or cites, a reference. References to footnotes are marked
 with a <em>footnote call</em> in the main text which corresponds to
@@ -2506,10 +2505,11 @@ <h2>Paged presentations</h2>
 
 </dl>
 
+<!--
 <p class=issue>Is "paginated" a better word?
 <p class=issue>Should controls be specified on a separate property, or on an attribute (like HTML's video element)?
 <p class=issue>Should the axis (x/y) be specified on a separate property?
-
+-->
 
 <div class=example>
 <p>In this example, the root element is constrained to have the same
@@ -3257,23 +3257,22 @@ <h3>Floating inside and outside pages</h3>
 <p class=issue>Should there be a way to combine float: top/bottom with left/right?
 <p class=issue>Should there be a way to delete page floats that end up lonesome on pages?
 
-<!--
 
-<h3>Float reference</h3>
+<h3>Wrapping around page floats</h3>
 
 <table class=propdef>
     <tr>
       <td><em>Name:</em>
-      <td><dfn>float-reference</dfn>
+      <td><dfn>float-wrap</dfn>
     <tr>
       <td><em>Value:</em>
-    <td>auto | page
+      <td>none | wrap 
     <tr>
       <td><em>Initial:</em>
-      <td>auto
+      <td>none
     <tr>
       <td><em>Applies to:</em>
-      <td>floated elements
+      <td>page floats
     <tr>
       <td><em>Inherited:</em>
       <td>no
@@ -3282,108 +3281,23 @@ <h3>Float reference</h3>
       <td>N/A
     <tr>
       <td><em>Media:</em>
-      <td>visual, paged
+      <td>visual
     <tr>
       <td><em>Computed&nbsp;value:</em>
-      <td>as specified
+      <td>specified value
 </table>
 
-<p>This property indicates the reference for page floats. Values are:
-
-<dl>
-<dt>auto
-<dd>the column or the element is the reference
-<dt>page
-<dd>the page is the reference
-</dl>
-
-<p class=issue>Should this be a value on 'column-span' instead? E.g.: 'column-span: page'?
-
--->
-
-<h2>Page and column floats, alternative syntax</h2>
-
-<p>This section describes an alternative syntax for page and column floats.
-
-<p>Four new keywords on 'float' have been added:
+<p>This property indicates whether other content may wrap around a page float:
 
 <dl>
+<dt>none
 
-<dt>left, right, top, bottom
-<dd>relative to physical viewport
-
-<dt>line-left, line-right
-<dd>relative to inline axis
-
-<dt>before, after
-<dd>relative to block direction
-
-<dt>inside, outside
-<dd>as described in the previous section
-
-<dt>footnote
-<dd>as described above
-
-<dt>columns(n)
-<dd>makes the float span n columns, and sets the float context to be the multicol element
-
-<dt>page
-<dd>sets the float context to be the page
-
-</dl>
-
-
-
-<div class=example>
-<p>Float figure to the top right corner of the multicol element, spanning two columns:
-
-<pre>
-.figure { float: top rigth columns(2); width: 100% }
-</pre>
-
-<img alt="sample rendering" src=8.png>
-</div>
-
-<div class=example>
-<p>Float figure to top of the last column of the multicol element on the current page:
-<pre>
-.figure { float: top right columns(1) }
-</pre>
-
-<img alt="sample rendering" src=6.png>
-</div>
-
-<div class=example>
-<p>Float figure to the top right of the current element, allowing other content on its side:
-
-<pre>
-.figure { float: top right; width: 60% }
-</pre>
-<img alt="sample rendering" src=13.png>
-</div>
-
-
-<div class=example>
-<p>Escape the multicol element and float to the top right of the page area:
-
-<pre>
-.figure { float: top right page }
-</pre>
-</div>
-
-
-
-
-<h2>Exclusions</h2>
-
-<h3>Exclusions based on floats</h3>
+<dd>other content may not wrap around the page float
 
-<p>A new value on 'float' is introduced to support intrusion in columns:
+<dt>wrap
 
-<dl>
-<dt>intrude
+<dd>other content may wrap around the page float
 
-<dd>The element may intrude neighboring columns; if the element is not in a multi-column element, this keyword has no effect.
 </dl>
 
 </dl>
@@ -3393,7 +3307,7 @@ <h3>Exclusions based on floats</h3>
 <div class=example>
 
 <pre class=css>
-img { float: left intrude; width: 120%;  }
+img { float: top; column-span: 2; float-wrap: wrap; width: 120%;  }
 </pre>
 
 <p>In this example, the image is wider than the column and will
@@ -3407,8 +3321,6 @@ <h3>Exclusions based on floats</h3>
 
 
 
-
-
 <h3>The 'float-offset' property</h3>
 
 <table class=propdef>
@@ -3532,6 +3444,131 @@ <h3>The 'float-offset' property</h3>
 </div>
 
 
+
+
+<!--
+
+<h3>Float reference</h3>
+
+<table class=propdef>
+    <tr>
+      <td><em>Name:</em>
+      <td><dfn>float-reference</dfn>
+    <tr>
+      <td><em>Value:</em>
+    <td>auto | page
+    <tr>
+      <td><em>Initial:</em>
+      <td>auto
+    <tr>
+      <td><em>Applies to:</em>
+      <td>floated elements
+    <tr>
+      <td><em>Inherited:</em>
+      <td>no
+    <tr>
+      <td><em>Percentages:</em>
+      <td>N/A
+    <tr>
+      <td><em>Media:</em>
+      <td>visual, paged
+    <tr>
+      <td><em>Computed&nbsp;value:</em>
+      <td>as specified
+</table>
+
+<p>This property indicates the reference for page floats. Values are:
+
+<dl>
+<dt>auto
+<dd>the column or the element is the reference
+<dt>page
+<dd>the page is the reference
+</dl>
+
+<p class=issue>Should this be a value on 'column-span' instead? E.g.: 'column-span: page'?
+
+-->
+
+<!--
+<h2>Page and column floats, alternative syntax</h2>
+
+<p>This section describes an alternative syntax for page and column floats.
+
+<p>Four new keywords on 'float' have been added:
+
+<dl>
+
+<dt>left, right, top, bottom
+<dd>relative to physical viewport
+
+<dt>line-left, line-right
+<dd>relative to inline axis
+
+<dt>before, after
+<dd>relative to block direction
+
+<dt>inside, outside
+<dd>as described in the previous section
+
+<dt>footnote
+<dd>as described above
+
+<dt>columns(n)
+<dd>makes the float span n columns, and sets the float context to be the multicol element
+
+<dt>page
+<dd>sets the float context to be the page
+
+</dl>
+
+
+
+<div class=example>
+<p>Float figure to the top right corner of the multicol element, spanning two columns:
+
+<pre>
+.figure { float: top rigth columns(2); width: 100% }
+</pre>
+
+<img alt="sample rendering" src=8.png>
+</div>
+
+<div class=example>
+<p>Float figure to top of the last column of the multicol element on the current page:
+<pre>
+.figure { float: top right columns(1) }
+</pre>
+
+<img alt="sample rendering" src=6.png>
+</div>
+
+<div class=example>
+<p>Float figure to the top right of the current element, allowing other content on its side:
+
+<pre>
+.figure { float: top right; width: 60% }
+</pre>
+<img alt="sample rendering" src=13.png>
+</div>
+
+
+<div class=example>
+<p>Escape the multicol element and float to the top right of the page area:
+
+<pre>
+.figure { float: top right page }
+</pre>
+</div>
+
+-->
+
+
+<h2>Exclusions</h2>
+
+<P>...
+
+
 <h3>The 'clear-side' property</h3>
 
 <table class=propdef>