- From: Tab Atkins Jr.. via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 18 Nov 2011 00:47:59 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-lists
In directory hutz:/tmp/cvs-serv5386
Modified Files:
Overview.html Overview.src.html
Log Message:
Rewrote the ::marker 'content' generation to properly use <image>, <string>, and <counter-style> types.
Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-lists/Overview.html,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- Overview.html 18 Nov 2011 00:44:58 -0000 1.89
+++ Overview.html 18 Nov 2011 00:47:21 -0000 1.90
@@ -1047,29 +1047,26 @@
<ol>
<li>If the computed value of ‘<a href="#list-style-image"><code
- class=property>list-style-image</code></a>’ is a valid image, then
- the computed value of the ‘<code
+ class=property>list-style-image</code></a>’ is a valid <image>,
+ then the computed value of the ‘<code
class=property>content</code>’ property is that image.
<li>Otherwise, if the computed value of ‘<a
href="#list-style-type"><code
- class=property>list-style-type</code></a>’ is a string, then the
- computed value of the ‘<code class=property>content</code>’
- property is that string.
+ class=property>list-style-type</code></a>’ is a <string>, then
+ the computed value of the ‘<code
+ class=property>content</code>’ property is that string.
<li>Otherwise, if the computed value of ‘<a
href="#list-style-type"><code
- class=property>list-style-type</code></a>’ is the name of a counter
- style, then the computed value of the ‘<code
- class=property>content</code>’ property is
- <code><counter-prefix> counter(list-item, <counter-name>)
- <counter-suffix></code>, where <i><counter-name></i> is the
- computed value of the ‘<a href="#list-style-type"><code
- class=property>list-style-type</code></a>’ property and
- <i><counter-prefix></i> and <i><counter-suffix></i> are the values
- of the <a href="#prefix"><i title=counter-prefix>prefix</i></a> and <a
- href="#suffix"><i title=counter-suffix>suffix</i></a> descriptors for the
- counter style with that name.
+ class=property>list-style-type</code></a>’ is a valid <a
+ href="#ltcounter-style"><i><counter-style></i></a>, then the computed
+ value of the ‘<code class=property>content</code>’ property
+ is <code><counter-prefix> counter(list-item, <counter-style>)
+ <counter-suffix></code>, where <i><counter-prefix></i> and
+ <i><counter-suffix></i> are the values of the <a href="#prefix"><i
+ title=counter-prefix>prefix</i></a> and <a href="#suffix"><i
+ title=counter-suffix>suffix</i></a> descriptors for the counter style.
<li>Otherwise the computed value is ‘<a href="#none"><code
class=css>none</code></a>’.
Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-lists/Overview.src.html,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- Overview.src.html 18 Nov 2011 00:44:58 -0000 1.136
+++ Overview.src.html 18 Nov 2011 00:47:47 -0000 1.137
@@ -634,13 +634,13 @@
according to the following algorithm:</p>
<ol>
- <li>If the computed value of 'list-style-image' is a valid image, then
+ <li>If the computed value of 'list-style-image' is a valid <image>, then
the computed value of the 'content' property is that image.</li>
- <li>Otherwise, if the computed value of 'list-style-type' is a string, then
+ <li>Otherwise, if the computed value of 'list-style-type' is a <string>, then
the computed value of the 'content' property is that string.</li>
- <li>Otherwise, if the computed value of 'list-style-type' is the name of a counter style, then the computed value of the 'content' property is <code><counter-prefix> counter(list-item, <counter-name>) <counter-suffix></code>, where <i><counter-name></i> is the computed value of the 'list-style-type' property and <i><counter-prefix></i> and <i><counter-suffix></i> are the values of the <i title='counter-prefix'>prefix</i> and <i title='counter-suffix'>suffix</i> descriptors for the counter style with that name.</li>
+ <li>Otherwise, if the computed value of 'list-style-type' is a valid <i><counter-style></i>, then the computed value of the 'content' property is <code><counter-prefix> counter(list-item, <counter-style>) <counter-suffix></code>, where <i><counter-prefix></i> and <i><counter-suffix></i> are the values of the <i title='counter-prefix'>prefix</i> and <i title='counter-suffix'>suffix</i> descriptors for the counter style.</li>
<li>Otherwise the computed value is ''none''.</li>
</ol>
Received on Friday, 18 November 2011 00:48:04 UTC