Skip to content

Commit d7f94b4

Browse files
tabatkinstabatkins
committed
Removing lingering references to 'hanging'
1 parent 2f3a468 commit d7f94b4

2 files changed

Lines changed: 10 additions & 62 deletions

File tree

‎css3-lists/Overview.html‎

Lines changed: 8 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,14 @@
2525

2626
<h1>CSS Lists and Counters Module Level 3</h1>
2727

28-
<<<<<<< Overview.html
29-
<h2 class="no-num no-toc" id=longstatus-date>W3C Working Draft 20 June
30-
2011</h2>
31-
=======
32-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 14 June 2011</h2>
33-
>>>>>>> 1.63
28+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 30 June 2011</h2>
3429

3530
<dl>
3631
<dt>This version:
3732

38-
<<<<<<< Overview.html
39-
<dd><a
40-
href="http://www.w3.org/TR/2011/WD-css3-lists-20110620">http://www.w3.org/TR/2011/WD-css3-lists-20110620</a></dd>
41-
<!-- <a href="http://dev.w3.org/csswg/css3-lists/">http://dev.w3.org/csswg/css3-lists/</a></dd>-->
42-
=======
43-
<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>-->
33+
<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>-->
4434
<a
4535
href="http://dev.w3.org/csswg/css3-lists/">http://dev.w3.org/csswg/css3-lists/</a>
46-
>>>>>>> 1.63
4736

4837
<dt>Latest version:
4938

@@ -113,11 +102,8 @@ <h2 class="no-num no-toc" id=abstract> Abstract</h2>
113102
href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>, which builds
114103
on CSS level&nbsp;1 <a href="#CSS1"
115104
rel=biblioentry>[CSS1]<!--{{CSS1}}--></a>. The main extensions compared to
116-
level&nbsp;2 are a pseudo-element representing the list marker, a new
117-
&lsquo;<code class=css>hanging</code>&rsquo; value for &lsquo;<a
118-
href="#list-style-position"><code
119-
class=property>list-style-position</code></a>&rsquo;, and a method for
120-
authors to define their own list-styles.
105+
level&nbsp;2 are a pseudo-element representing the list marker, and a
106+
method for authors to define their own list-styles.
121107

122108
<h2 class="no-num no-toc" id=status> Status of this document</h2>
123109
<!--begin-status-->
@@ -1347,9 +1333,9 @@ <h2 id=counter-style><span class=secno>8. </span> Defining Custom Counter
13471333
class=property>type</code></a>&rsquo; descriptor; if this is missing the
13481334
@counter-style <dfn id=is>is</dfn> invalid and must be ignored. The
13491335
<i>&lt;counter-style-name></i> must be be a valid identifier and must not
1350-
be "decimal", "default", "hanging", "inherit", "initial", "inside",
1351-
"none", or "outside"; otherwise the @counter-style <dfn id=is0>is</dfn>
1352-
invalid and must be ignored.
1336+
be "decimal", "default", "inherit", "initial", "inside", "none", or
1337+
"outside"; otherwise the @counter-style <dfn id=is0>is</dfn> invalid and
1338+
must be ignored.
13531339

13541340
<h3 id=counter-style-type><span class=secno>8.1. </span> Counter
13551341
algorithms: the &lsquo;<a href="#descdef-type"><code
@@ -1643,43 +1629,22 @@ <h4 id=symbolic><span class=secno>8.1.4. </span> symbolic</h4>
16431629
<p>An "footnotes" counter style can be defined as:</p>
16441630

16451631
<pre>
1646-
<<<<<<< Overview.html
16471632
@counter-style <dfn id=footnotes>footnotes</dfn> {
1648-
=======
1649-
@counter-style <dfn id=upper-alpha-symbolic>upper-alpha-symbolic</dfn> {
1650-
>>>>>>> 1.63
16511633
type: symbolic;
1652-
<<<<<<< Overview.html
16531634
glyphs: '*' '⁑' '†' '‡';
16541635
suffix: '';
1655-
=======
1656-
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';
1657-
>>>>>>> 1.63
16581636
}
16591637
</pre>
16601638

16611639
<p>It will then produce lists that look like:</p>
16621640

16631641
<pre>
1664-
<<<<<<< Overview.html
16651642
*. One
16661643
⁑. Two
16671644
†. Three
16681645
‡. Four
16691646
**. Five
16701647
⁑⁑. Six
1671-
=======
1672-
A. One
1673-
B. Two
1674-
...
1675-
Z. Twenty-six
1676-
AA. Twenty-seven
1677-
BB. Twenty-eight
1678-
...
1679-
ZZ. Fifty-two
1680-
AAA. Fifty-three
1681-
BBB. Fifty-four
1682-
>>>>>>> 1.63
16831648
</pre>
16841649

16851650
<p class=note>Note the difference between this and the alphabetic
@@ -2785,23 +2750,13 @@ <h3 id=predefined-symbolic><span class=secno>9.4. </span> Predefined
27852750
suffix: '';
27862751
}
27872752

2788-
<<<<<<< Overview.html
2789-
=======
2790-
@counter-style <dfn id=footnote>footnote</dfn> {
2791-
type: symbolic;
2792-
glyphs: '\2A' '\2051' '\2020' '\2021';
2793-
/* '*' '⁑' '†' '‡' */
2794-
suffix: '';
2795-
}
2796-
2797-
>>>>>>> 1.63
27982753
@counter-style <dfn id=lower-alpha-symbolic>lower-alpha-symbolic</dfn> {
27992754
type: symbolic;
28002755
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';
28012756
/* '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' */
28022757
}
28032758

2804-
@counter-style <dfn id=upper-alpha-symbolic0>upper-alpha-symbolic</dfn> {
2759+
@counter-style <dfn id=upper-alpha-symbolic>upper-alpha-symbolic</dfn> {
28052760
type: symbolic;
28062761
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';
28072762
/* '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 @@ <h2 class=no-num id=index>Index</h2>
46584613
<li>fixed-decimal, <a href="#fixed-decimal"
46594614
title=fixed-decimal><strong>8.1.3.</strong></a>
46604615

4661-
<<<<<<< Overview.html
46624616
<li>footnotes, <a href="#footnotes"
46634617
title=footnotes><strong>8.1.4.</strong></a>
4664-
=======
4665-
<li>footnote, <a href="#footnote" title=footnote><strong>9.4.</strong></a>
4666-
4667-
>>>>>>> 1.63
46684618

46694619
<li>fullwidth-decimal, <a href="#fullwidth-decimal"
46704620
title=fullwidth-decimal><strong>9.2.</strong></a>
@@ -4967,8 +4917,6 @@ <h2 class=no-num id=index>Index</h2>
49674917
title=upper-alpha><strong>9.3.</strong></a>
49684918

49694919
<li>upper-alpha-symbolic, <a href="#upper-alpha-symbolic"
4970-
title=upper-alpha-symbolic><strong>8.1.4.</strong></a>, <a
4971-
href="#upper-alpha-symbolic0"
49724920
title=upper-alpha-symbolic><strong>9.4.</strong></a>
49734921

49744922
<li>upper-armenian, <a href="#upper-armenian"

‎css3-lists/Overview.src.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ <h2 class="no-num no-toc" id="abstract">
6161
list styling. It includes and extends the functionality of
6262
CSS level&nbsp;2 [[!CSS21]], which builds on CSS level&nbsp;1
6363
[[CSS1]]. The main extensions compared to level&nbsp;2 are a pseudo-element
64-
representing the list marker, a new ''hanging'' value for 'list-style-position',
64+
representing the list marker,
6565
and a method for authors to define their own list-styles.</p>
6666

6767

@@ -889,7 +889,7 @@ <h2 id='counter-style'>
889889
recognized or implemented by a given user agent must be ignored. @counter-style
890890
rules require a 'type' descriptor; if this is missing the @counter-style <dfn>is</dfn>
891891
invalid and must be ignored. The <i>&lt;counter-style-name></i> must be be
892-
a valid identifier and must not be "decimal", "default", "hanging", "inherit", "initial",
892+
a valid identifier and must not be "decimal", "default", "inherit", "initial",
893893
"inside", "none", or "outside"; otherwise the @counter-style <dfn>is</dfn> invalid and
894894
must be ignored.</p>
895895

0 commit comments

Comments
 (0)