csswg/css3-gcpm Overview.html,1.197,1.198

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

Modified Files:
	Overview.html 
Log Message:
machine-generated

Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-gcpm/Overview.html,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- Overview.html	11 Jan 2012 00:34:58 -0000	1.197
+++ Overview.html	5 Feb 2012 23:40:07 -0000	1.198
@@ -21,13 +21,13 @@
 
    <h1>CSS Generated Content for Paged Media Module</h1>
 
-   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 11 January 2012</h2>
+   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 5 February 2012</h2>
 
    <dl>
     <dt>This version:
 
     <dd><a
-     href="http://www.w3.org/TR/2012/ED-css3-gcpm-20120111/">http://www.w3.org/TR/2012/ED-css3-gcpm-20120111/</a>
+     href="http://www.w3.org/TR/2012/ED-css3-gcpm-20120205/">http://www.w3.org/TR/2012/ED-css3-gcpm-20120205/</a>
 
     <dt>Latest version:
 
@@ -316,7 +316,7 @@
    <p>Consider this code:
 
    <pre>
-h1 { string-set: title content() }
+h1 { string-set: title contents }
 </pre>
 
    <p>Whenever an <code>h1</code> element is encountered, its textual content
@@ -401,77 +401,75 @@
     href="http://www.w3.org/TR/CSS21/syndata.html#counter">CSS 2.1 section
     4.3.5</a>
 
-   <dt>&lt;content&gt;
+   <dt>contents
 
-   <dd>the &lsquo;<code class=css>content()</code>&rsquo; function returns
-    the content of elements and pseudo-elements. The functional notation
-    accepts an optional argument:
-    <dl>
-     <dt>&lsquo;<code class=css>content()</code>&rsquo;
+   <dd>The textual content of the element, including the content of its
+    ::before and ::after pseudo-element. The content of the element's
+    descendants, including their respective ::before and ::after
+    pseudo-elements, are included in the returned content.
 
-     <dd>Without any arguments, the function returns the textual content of
-      the element, not including the content of its ::before and ::after
-      pseudo-element. The content of the element's descendants, including
-      their respective ::before and ::after pseudo-elements, are included in
-      the returned content.
+   <dt>content-element
 
-     <dt>&lsquo;<code class=css>content(before)</code>&rsquo;
+   <dd>The textual content of the element, not including the content of its
+    ::before and ::after pseudo-element. The content of the element's
+    descendants, including their respective ::before and ::after
+    pseudo-elements, are included in the returned content.
 
-     <dd>The function returns the textual content of the ::before
-      pseudo-element the content of the element.
+   <dt>content-before
 
-     <dt>&lsquo;<code class=css>content(after)</code>&rsquo;
+   <dd>The textual content of the ::before pseudo-element the content of the
+    element.
 
-     <dd>The function returns the textual content of the ::after
-      pseudo-element the content of the element.
+   <dt>content-after
 
-     <dt>&lsquo;<code class=css>content(first-letter)</code>&rsquo;
+   <dd>The textual content of the ::after pseudo-element the content of the
+    element.
 
-     <dd>The function returns the first letter of the content of the element.
-      The definition of a letter is the same as for :first-letter
-      pseudo-elements.
-      <p class=note>The expected use for &lsquo;<code
-       class=css>content(first-letter)</code>&rsquo; is to create one-letter
-       headers, e.g., in dictionaries.</p>
+   <dt>content-first-letter
 
-     <dt>&lsquo;<code class=css>env()</code>&rsquo;
+   <dd>The first letter of the content of the element. The definition of a
+    letter is the same as for :first-letter pseudo-elements.
+    <p class=note>The expected use for &lsquo;<code
+     class=css>content-first-letter</code>&rsquo; is to create one-letter
+     headers, e.g., in dictionaries.</p>
 
-     <dd>This function returns data from the local environment of the user at
-      the time of formatting. The function accepts one of these keywords:
-      <ul>
-       <li>env(url): returns the URL of the document
+   <dt>env()
 
-       <li>env(date): returns the date on the user's system at the time of
-        formatting
+   <dd>This function returns data from the local environment of the user at
+    the time of formatting. The function accepts one of these keywords:
+    <ul>
+     <li>env(url): returns the URL of the document
 
-       <li>env(time): returns the time on the user's system at the time of
-        formatting
+     <li>env(date): returns the date on the user's system at the time of
+      formatting
 
-       <li>env(date-time): returns the date and time on the user's system at
-        the time of formatting
-      </ul>
+     <li>env(time): returns the time on the user's system at the time of
+      formatting
 
-      <p>Information about date and time is formatted according to the locale
-       of the user's system.
+     <li>env(date-time): returns the date and time on the user's system at
+      the time of formatting
+    </ul>
 
-      <p class=issue>Or, should there be a way to specify the locale? Or
-       should we simply format all in ISO format (e.g., 2010-03-30)?
+    <p>Information about date and time is formatted according to the locale
+     of the user's system.
 
-      <p class=note>On many systems, preformatted strings in the user's
-       locale can be found through the <a
-       href="http://www.opengroup.org/onlinepubs/009695399/functions/strftime.html">strftime</a>
-       function. The date, time and date-time strings can be found by using
-       the "%x", "%X" and "%c" conversion strings, respectively.
+    <p class=issue>Or, should there be a way to specify the locale? Or should
+     we simply format all in ISO format (e.g., 2010-03-30)?
 
-      <div class=example>
-       <pre>
+    <p class=note>On many systems, preformatted strings in the user's locale
+     can be found through the <a
+     href="http://www.opengroup.org/onlinepubs/009695399/functions/strftime.html">strftime</a>
+     function. The date, time and date-time strings can be found by using the
+     "%x", "%X" and "%c" conversion strings, respectively.
+
+    <div class=example>
+     <pre>
 @page {
   @top-right { content: env(url) }
   @bottom-right { content: env(date-time) }
 }
 </pre>
-      </div>
-    </dl>
+    </div>
   </dl>
   <!--<p class="issue">Should target-counter() and leader() also be allowed?</p>-->
 
@@ -498,7 +496,7 @@
   <div class=example>
    <pre>
 h2 { 
-  string-set: header "Chapter " counter(header) ": " content();
+  string-set: header "Chapter " counter(header) ": " contents;
   counter-increment: header;
 }
 </pre>
@@ -515,14 +513,14 @@
    <pre>
 h2:before { content: "Chapter " counter(header) } 
 h2 { 
-  string-set: header content(before) content();
+  string-set: header content-before content-element;
   counter-increment: header } 
 </pre>
   </div>
 
   <div class=example>
    <pre>
-dt { string-set: index content(first-letter) }
+dt { string-set: index content-first-letter }
 </pre>
   </div>
 
@@ -534,7 +532,7 @@
    <pre>
 title { 
   display: none;
-  string-set: header content();
+  string-set: header contents;
 }
 </pre>
   </div>
@@ -553,8 +551,8 @@
 @page { @top-center { content: string(header) }}
 @page { @right-middle { content: string(index) }}
 @page { @top-left { content: string(entry) }}
-h1 { string-set: header "Chapter " counter(chapter) content() }
-dt { string-set: index content(first-letter), entry content() }
+h1 { string-set: header "Chapter " counter(chapter) contents }
+dt { string-set: index content-first-letter, entry contents }
 </pre>
   </div>
 
@@ -598,7 +596,7 @@
 @page { @top-left { content: string(term, first) }}
 @page { @top-right { content: string(term, last) }}
 @page { @top-center { content: string(index, first) }}
-dt { string-set: index content(first-letter), term content() }
+dt { string-set: index content-first-letter, term contents }
 </pre>
   </div>
 
@@ -610,7 +608,7 @@
 
    <pre>
 @page { @top-center { content: string(chapter, first-except) }}
-h1 { string-set: chapter content() }
+h1 { string-set: chapter contents }
 </pre>
   </div>
 
@@ -1027,30 +1025,13 @@
    structure, or replaced content. &lsquo;<code
    class=css>target-text()</code>&rsquo; has one required argument: the url
    of the link. An optional second argument specifies exactly which content
-   is fetched. There are four possible values:
-
-  <dl>
-   <dt>&lsquo;<code class=css>content()</code>&rsquo;
-
-   <dd>refers to the textual content of the element, not including the
-    content of its ::before and ::after pseudo-element. The content of the
-    element's descendants, including their respective ::before and ::after
-    pseudo-elements, are included in the returned content.
-
-   <dt>&lsquo;<code class=css>content(before)</code>&rsquo;
-
-   <dd>refers to the content of the element's ::before pseudo-element. This
-    is the default value.
-
-   <dt>&lsquo;<code class=css>content(after)</code>&rsquo;
-
-   <dd>refers to the content of the element's ::after pseudo-element
-
-   <dt>&lsquo;<code class=css>content(first-letter)</code>&rsquo;
-
-   <dd>refers to the first letter of the textual content of the element, not
-    including the content of its ::before and ::after pseudo-element.
-  </dl>
+   is fetched. There are five possible values: &lsquo;<code
+   class=css>contents</code>&rsquo;, &lsquo;<code
+   class=css>content-element</code>&rsquo;, &lsquo;<code
+   class=css>content-before</code>&rsquo;, &lsquo;<code
+   class=css>content-after</code>&rsquo;, &lsquo;<code
+   class=css>content-first-letter</code>&rsquo;; these keywords are defined
+   above.
 
   <div class=example>
    <p>To generate this text
@@ -1068,7 +1049,7 @@
    <pre>
 h2 { counter-increment: chapter }
 a { content: "Chapter " target-counter(attr(href, url), chapter) 
-   ' ("'  target-text(attr(href), content()) '") on page '
+   ' ("'  target-text(attr(href), content-element) '") on page '
    target-counter(attr(href, url), page);
 </pre>
   </div>
@@ -1148,6 +1129,8 @@
 &lt;p id=words>&lt;span class="call">[3]&lt;/span> Most often.
 </pre>
 
+   <p class=issue>define &lsquo;<code class=css>target-pull</code>&rsquo;
+
    <p>When shown in a legacy browser, the content of the element will be
     shown as a clickable link to an endnote. When printed according to this
     specification, there will be a footnote:
@@ -2495,12 +2478,13 @@
     <tr>
      <td><em>Value:</em>
 
-     <td>content() | &lt;string>
+     <td>none | contents | content-before | content-element | content-after |
+      &lt;string>
 
     <tr>
      <td><em>Initial:</em>
 
-     <td>content()
+     <td>none
 
     <tr>
      <td><em>Applies to:</em>
@@ -2534,8 +2518,8 @@
   <div class=example>
    <pre>
 a { bookmark-label: attr(title, string) }
-h1 { bookmark-label: content() }
-h2 { bookmark-label: content(before) }
+h1 { bookmark-label: contents }
+h2 { bookmark-label: content-before }
 #frog { bookmark-label: "The green frog" }
 </pre>
   </div>
@@ -2826,7 +2810,7 @@
   <p>The properties accept these values:
 
   <dl>
-   <dt>link-rel()
+   <dt>go()
 
    <dd>the function takes one argument, which refers to the <tt>rel</tt>
     attribute of the <tt>link</tt> element
@@ -2836,10 +2820,10 @@
 &lt;link rel=previous href=g3.html>
 &lt;link rel=next href=g1.html>
 ...
-@-o-navigation {
-  nav-up: link-rel(index); 
-  nav-left: link-rel(previous); 
-  nav-right: link-rel(next); 
+@navigation {
+  nav-up: go(index); 
+  nav-left: go(previous); 
+  nav-right: go(next); 
 }
 </pre>
     </div>
@@ -2849,45 +2833,40 @@
      One possible solution for other languages is "link[rel=index] { nav-up:
      attr(href) }"
 
-    <p class=issue>The "link-rel" name is a bit academic, perhaps the "go()"
-     name can be used instead?
-
-   <dt>go()
+   <dt>&lsquo;<code class=css>back</code>&rsquo;
 
-   <dd>The function takes one argument: <tt>back</tt>, which takes the user
-    one step back in history.
+   <dd>The keyword takes the user one step back in the history of browsed
+    pages.
     <div class=example>
      <pre>
 @navigation {
-  nav-left: go(back); 
+  nav-left: back; 
 }
 </pre>
     </div>
 
-   <dt>
-
-   <dt>url-doc()
+   <dt>url()
 
    <dd>The funcation takes one argument: a URL. Relative URLs are relative to
-    the document, not to the style sheet.
+    the style sheet.
     <div class=example>
      <pre>
 @navigation {
-  nav-up: url-doc(..);
-  nav-down: url-doc(a1.html);
+  nav-up: url(..);
+  nav-down: url(a1.html);
 }
 </pre>
     </div>
 
-   <dt>url()
+   <dt>url-doc()
 
-   <dd>The funcation takes one argument: a URL. Relative URLs are relative to
-    the style sheet.
+   <dd>The function is identical to url(), except that relative URLs are
+    relative to the document, not to the style sheet.
     <div class=example>
      <pre>
 @navigation {
-  nav-up: url(..);
-  nav-down: url(a1.html);
+  nav-up: url-doc(..);
+  nav-down: url-doc(a1.html);
 }
 </pre>
     </div>
@@ -3908,6 +3887,8 @@
 h6 { bookmark-level: 6 }
 </pre>
 
+  <p class=issue>Add grammar for functions defined in this spec.
+
   <h2 class=no-num id=acknowledgments>Acknowledgments</h2>
 
   <p>This document has been improved by Bert Bos, Michael Day, Melinda Grant,
@@ -4047,9 +4028,10 @@
     <tr>
      <th><a class=property href="#bookmark-label">bookmark-label</a>
 
-     <td>content() | &lt;string>
+     <td>none | contents | content-before | content-element | content-after |
+      &lt;string>
 
-     <td>content()
+     <td>none
 
      <td>all elements
 

Received on Sunday, 5 February 2012 23:42:12 UTC