csswg/css3-lists Overview.html,1.64,1.65 Overview.src.html,1.113,1.114

Update of /sources/public/csswg/css3-lists
In directory hutz:/tmp/cvs-serv11104

Modified Files:
	Overview.html Overview.src.html 
Log Message:
Removing lingering references to 'hanging'


Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-lists/Overview.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- Overview.html	20 Jun 2011 21:10:15 -0000	1.64
+++ Overview.html	30 Jun 2011 23:13:30 -0000	1.65
@@ -25,25 +25,14 @@
 
    <h1>CSS Lists and Counters Module Level 3</h1>
 
-<<<<<<< Overview.html
-   <h2 class="no-num no-toc" id=longstatus-date>W3C Working Draft 20 June
-    2011</h2>
-=======
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 14 June 2011</h2>
->>>>>>> 1.63
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 30 June 2011</h2>
 
    <dl>
     <dt>This version:
 
-<<<<<<< Overview.html
-    <dd><a
-     href="http://www.w3.org/TR/2011/WD-css3-lists-20110620">http://www.w3.org/TR/2011/WD-css3-lists-20110620</a></dd>
-    <!-- <a href="http://dev.w3.org/csswg/css3-lists/">http://dev.w3.org/csswg/css3-lists/</a></dd>-->
-=======
-    <dd><!--<a href="http://www.w3.org/TR/2011/WD-css3-lists-20110614">http://www.w3.org/TR/2011/WD-css3-lists-20110614</a></dd>-->
+    <dd><!--<a href="http://www.w3.org/TR/2011/WD-css3-lists-20110630">http://www.w3.org/TR/2011/WD-css3-lists-20110630</a></dd>-->
      <a
      href="http://dev.w3.org/csswg/css3-lists/">http://dev.w3.org/csswg/css3-lists/</a>
->>>>>>> 1.63
 
     <dt>Latest version:
 
@@ -113,11 +102,8 @@
    href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>, which builds
    on CSS level&nbsp;1 <a href="#CSS1"
    rel=biblioentry>[CSS1]<!--{{CSS1}}--></a>. The main extensions compared to
-   level&nbsp;2 are a pseudo-element representing the list marker, a new
-   &lsquo;<code class=css>hanging</code>&rsquo; value for &lsquo;<a
-   href="#list-style-position"><code
-   class=property>list-style-position</code></a>&rsquo;, and a method for
-   authors to define their own list-styles.
+   level&nbsp;2 are a pseudo-element representing the list marker, and a
+   method for authors to define their own list-styles.
 
   <h2 class="no-num no-toc" id=status> Status of this document</h2>
   <!--begin-status-->
@@ -1347,9 +1333,9 @@
    class=property>type</code></a>&rsquo; descriptor; if this is missing the
    @counter-style <dfn id=is>is</dfn> invalid and must be ignored. The
    <i>&lt;counter-style-name></i> must be be a valid identifier and must not
-   be "decimal", "default", "hanging", "inherit", "initial", "inside",
-   "none", or "outside"; otherwise the @counter-style <dfn id=is0>is</dfn>
-   invalid and must be ignored.
+   be "decimal", "default", "inherit", "initial", "inside", "none", or
+   "outside"; otherwise the @counter-style <dfn id=is0>is</dfn> invalid and
+   must be ignored.
 
   <h3 id=counter-style-type><span class=secno>8.1. </span> Counter
    algorithms: the &lsquo;<a href="#descdef-type"><code
@@ -1643,43 +1629,22 @@
    <p>An "footnotes" counter style can be defined as:</p>
 
    <pre>
-<<<<<<< Overview.html
 @counter-style <dfn id=footnotes>footnotes</dfn> {
-=======
-@counter-style <dfn id=upper-alpha-symbolic>upper-alpha-symbolic</dfn> {
->>>>>>> 1.63
 	type: symbolic;
-<<<<<<< Overview.html
 	glyphs: '*' '⁑' '†' '‡';
 	suffix: '';
-=======
-	glyphs: 'A' 'B' 'C' 'D' 'E' 'F' 'G' 'H' 'I' 'J' 'K' 'L' 'M' 'N' 'O' 'P' 'Q' 'R' 'S' 'T' 'U' 'V' 'W' 'X' 'Y' 'Z';
->>>>>>> 1.63
 }
 		</pre>
 
    <p>It will then produce lists that look like:</p>
 
    <pre>
-<<<<<<< Overview.html
 *.   One
 ⁑.   Two
 †.   Three
 ‡.   Four
 **.  Five
 ⁑⁑.  Six
-=======
-A.    One
-B.    Two
-...
-Z.    Twenty-six
-AA.   Twenty-seven
-BB.   Twenty-eight
-...
-ZZ.   Fifty-two
-AAA.  Fifty-three
-BBB.  Fifty-four
->>>>>>> 1.63
 		</pre>
 
    <p class=note>Note the difference between this and the alphabetic
@@ -2785,23 +2750,13 @@
 	suffix: '';
 }
 
-<<<<<<< Overview.html
-=======
-@counter-style <dfn id=footnote>footnote</dfn> {
-	type: symbolic;
-	glyphs: '\2A' '\2051' '\2020' '\2021';
-	/* '*' '⁑' '†' '‡' */
-	suffix: '';
-}
-
->>>>>>> 1.63
 @counter-style <dfn id=lower-alpha-symbolic>lower-alpha-symbolic</dfn> {
 	type: symbolic;
 	glyphs: '\61' '\62' '\63' '\64' '\65' '\66' '\67' '\68' '\69' '\6A' '\6B' '\6C' '\6D' '\6E' '\6F' '\70' '\71' '\72' '\73' '\74' '\75' '\76' '\77' '\78' '\79' '\7A';
 	/* 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 'u' 'v' 'w' 'x' 'y' 'z' */
 }
 
-@counter-style <dfn id=upper-alpha-symbolic0>upper-alpha-symbolic</dfn> {
+@counter-style <dfn id=upper-alpha-symbolic>upper-alpha-symbolic</dfn> {
 	type: symbolic;
 	glyphs: '\41' '\42' '\43' '\44' '\45' '\46' '\47' '\48' '\49' '\4A' '\4B' '\4C' '\4D' '\4E' '\4F' '\50' '\51' '\52' '\53' '\54' '\55' '\56' '\57' '\58' '\59' '\5A';
 	/* 'A' 'B' 'C' 'D' 'E' 'F' 'G' 'H' 'I' 'J' 'K' 'L' 'M' 'N' 'O' 'P' 'Q' 'R' 'S' 'T' 'U' 'V' 'W' 'X' 'Y' 'Z' */
@@ -4658,13 +4613,8 @@
    <li>fixed-decimal, <a href="#fixed-decimal"
     title=fixed-decimal><strong>8.1.3.</strong></a>
 
-<<<<<<< Overview.html
    <li>footnotes, <a href="#footnotes"
     title=footnotes><strong>8.1.4.</strong></a>
-=======
-   <li>footnote, <a href="#footnote" title=footnote><strong>9.4.</strong></a>
-    
->>>>>>> 1.63
 
    <li>fullwidth-decimal, <a href="#fullwidth-decimal"
     title=fullwidth-decimal><strong>9.2.</strong></a>
@@ -4967,8 +4917,6 @@
     title=upper-alpha><strong>9.3.</strong></a>
 
    <li>upper-alpha-symbolic, <a href="#upper-alpha-symbolic"
-    title=upper-alpha-symbolic><strong>8.1.4.</strong></a>, <a
-    href="#upper-alpha-symbolic0"
     title=upper-alpha-symbolic><strong>9.4.</strong></a>
 
    <li>upper-armenian, <a href="#upper-armenian"

Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-lists/Overview.src.html,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- Overview.src.html	20 Jun 2011 21:10:16 -0000	1.113
+++ Overview.src.html	30 Jun 2011 23:13:30 -0000	1.114
@@ -61,7 +61,7 @@
 	list styling. It includes and extends the functionality of
 	CSS level&nbsp;2 [[!CSS21]], which builds on CSS level&nbsp;1
 	[[CSS1]]. The main extensions compared to level&nbsp;2 are a pseudo-element
-	representing the list marker, a new	''hanging'' value for 'list-style-position', 
+	representing the list marker, 
 	and a method for authors to define their own list-styles.</p>
 
 
@@ -889,7 +889,7 @@
 	recognized or implemented by a given user agent must be ignored. @counter-style 
 	rules require a 'type' descriptor; if this is missing the @counter-style <dfn>is</dfn> 
 	invalid and must be ignored.  The <i>&lt;counter-style-name></i> must be be 
-	a valid identifier and must not be "decimal", "default", "hanging", "inherit", "initial", 
+	a valid identifier and must not be "decimal", "default", "inherit", "initial", 
 	"inside", "none", or "outside"; otherwise the @counter-style <dfn>is</dfn> invalid and 
 	must be ignored.</p>
 

Received on Thursday, 30 June 2011 23:13:33 UTC