(merge)

Author: bert-github

css-variables/Overview.html

@@ -255,8 +255,8 @@ <h4>Setting named strings: the 'string-set' property</h4>
 <p>The name space of named strings is different from other sets of
 names in CSS.
 
-<p>The 'string-set' property copies text as well as white-space into
-the named string. 
+<p>The textual content is processed as if 'white-space: normal' had been set. 
+
 
 <div class="example">
 <pre>
@@ -2097,10 +2097,12 @@ <h2>Page marks and bleed area</h2>
 <h2>Bookmarks</h2>
 
 <p>Some document formats have the capability of holding bookmarks.
-Bookmarks are typically shown outside the document itself, often a
-tree-structured and clickable table of contents to help navigate in
-the electronic version of the document. To generate bookmarks, these
-properties are defined:
+Bookmarks are typically shown outside the document itself, often in a
+tree-structured and clickable table of contents. To generate
+bookmarks, these properties are defined: 'bookmark-level',
+'bookmark-label', and 'bookmark-state'.
+
+<h3>'bookmark-level'</h3>
 
 <table class=propdef>
     <tr>
@@ -2129,9 +2131,22 @@ <h2>Bookmarks</h2>
       <td>specified value
 </table>
 
+
 <p>This property describes what level a certain bookmark has in a
-hierarchical bookmark structure. The highest level is ''1'', then
-''2'', ''3'' etc.
+hierarchical bookmark structure. The values are:
+
+<dl>
+
+<dt>none
+
+<dd>no bookmark is generated
+
+<dt>&lt;integer>
+
+<dd>Indicates the level of the bookmark; the highest level is ''1'', then ''2'', ''3'' etc. A bookmark will be generated only if 'bookmark-label' also has a value different from 'none'.
+
+</dl>
+
 
 <div class="example">
 <pre>
@@ -2142,13 +2157,15 @@ <h2>Bookmarks</h2>
 </div>
 
 
+<h3>'bookmark-label'</h3>
+
 <table class=propdef>
     <tr>
       <td><em>Name:</em>
       <td><dfn>bookmark-label</dfn>
     <tr>
       <td><em>Value:</em>
-      <td>[ &lt;content-list> ]+ | none
+      <td>&lt;content-list> | none
     <tr>
       <td><em>Initial:</em>
       <td>none
@@ -2169,7 +2186,18 @@ <h2>Bookmarks</h2>
       <td>specified value
 </table>
 
-<p>This property specifies the label of the bookmark, i.e., the text that will represent the bookmark in the bookmark structure. &lt;content-list> is defined on the 'string-set' property.
+<p>This property specifies the label of the bookmark, i.e., the text that will represent the bookmark in the bookmark structure. The values are:
+
+<dl>
+
+<dt>&lt;content-list>, as defined on the 'string-set' property. A bookmark will be generated only if 'bookmark-level' also has a value different from 'none'.
+
+<dt>none
+
+<dd>no bookmark is generated
+
+</dl>
+
 
 <div class="example">
 <pre>
@@ -2181,6 +2209,8 @@ <h2>Bookmarks</h2>
 </pre>
 </div>
 
+<!--
+
 <table class=propdef>
     <tr>
       <td><em>Name:</em>
@@ -2225,6 +2255,9 @@ <h2>Bookmarks</h2>
 .example { bookmark-target: url(http://www.example.com) }
 </div>
 
+-->
+
+<h3>'bookmark-state'</h3>
 
 <table class=propdef>
     <tr>
@@ -2569,36 +2602,44 @@ <h2>Page and column floats</h2>
 <dt>bottom-corner
 <dd>similar to 'top-corner', exept the box is floated to the bottom
 
-<dt>snap(&lt;length>)
+<!--
+<dt>snap(&lt;length>, [top | bottom])
 
 <dd>same as 'top' if the box is naturally near the top; same as
 'bottom' if the box is naturally near the bottom. If the box naturally
 leads to a (page/column) break, the box is floated to the top of the
-next page/column. The length value specifies how far from the
-top/bottom the element can be influenced.
+next page/column. The first optionaloptional length value specifies how far from the
+top/bottom the element can be influenced, The second
+-->
 
-<div class=example>
-<p>In this example, tables will snap to the top/bottom if the top/bottom of the border box is closer than '3em' from the top/bottom of the page/column.
+<dt>snap(&lt;length> &lt;length>? [, top | bottom | near ]?)
 
-<pre>
-table { float: snap(3em) }
-</pre>
-</div>
+<dd><p>Makes the element float to the top or bottom if it naturally appears within a certain distance from the top or bottom. The length value(s) specifies the maxium distance from the top/bottom that an element must be within in order to be floated; one length value specifies the distance from both the top and the bottom, two length values specify the distance from the top and  bottom, respectively. If an element is within the specified distance from both the top and the bottom, bottom wins. 
+
+<p>The optional keyword value specifies where the element is floated: top, bottom, or the nearest of the two. The initial value is 'near'.
 
-<p>If the functional notation is not used, an implementation-dependent value is used. 
+<p>An element is considered to be a float if it has a snap() value, even if the element does not appear within the specified distance. This way, it can be determined whether an element is float or not without laying out the document. 
+
+<dt>snap
+
+<dd>same as <tt>snap(2em, near)</tt>
+
+</dl>
 
 <div class=example>
+<p>In this example, tables will snap to the top/bottom if the top/bottom of the border box is closer than '3em' from the top/bottom of the page/column.
+
 <pre>
 table { float: snap }
+table { float: snap(3em) }
+table { float: snap(3em, bottom) }
+table { float: snap(3em 2em, bottom) }
 </pre>
 </div>
 
 <p class=issue>Should we define a reasonable default (say, 3em) instead of relying on implementation-specific values? 
-<p class=issue>Do numberic values make sense, like for orphans/widows
-<p class=issue>Does the "snap" solution address all use cases for "unless-room"/"unless-fit"?
-
+<p class=issue>Do numberic values (in addition to length values) make sense, like for orphans/widows
 
-</dl>
 
 <!--
 The 'widows'/'orphans' properties may be consulted to determine if the box is near the top/bottom. 
@@ -3578,6 +3619,16 @@ <h2>Selecting lines</h2>
 </pre>
 </div>
 
+<h2>Conditional text</h2>
+
+<div class=example>
+<pre>
+  a:target-layout(attr(href url), same-page) { content: " on this page" }
+  a:target-layout(attr(href url), next-page) { content: " on the next page" }
+  a:target-layout(attr(href url), previous-page) { content: " on the previous page" }
+</pre>
+</div>
+
 
 <h2>Conformance</h2>
 
@@ -3623,7 +3674,7 @@ <h2 class=no-num id=acknowledgments>Acknowledgments</h2>
 Miller, Werner Donn&eacute;, Tarquin (Mark) Wilton-Jones, Michel Fortin,
 Christian Roth, Brady Duga, Del Merritt, Ladd Van Tol, Tab Atkins Jr.,
 Jacob Grundtvig Refstrup,  James Elmore, Ian Tindale, Murakami Shinyu, Paul E.
-Merrell, Philip Taylor, Brad Kemper, Peter Linss, Daniel Glazman, Tantek &#xC7;elik, Florian Rivoal, Alex Mogilevsky.</p>
+Merrell, Philip Taylor, Brad Kemper, Peter Linss, Daniel Glazman, Tantek &#xC7;elik, Florian Rivoal, Alex Mogilevsky, Simon Sapin, Cameron McCormack, Liam R E Quin, Peter Moulder.</p>
 
 <h2 class=no-num id=references>References</h2>