Skip to content

Commit 33be34b

Browse files
committed
[css-counter-styles] Markup tweaks
--HG-- extra : rebase_source : f0f8bbbf095cc47ef7843637f316428bb6415d78
1 parent 922eda9 commit 33be34b

2 files changed

Lines changed: 78 additions & 88 deletions

File tree

css-counter-styles/Overview.html

Lines changed: 60 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -143,33 +143,30 @@ <h2 class="no-num no-toc" id=contents> Table of contents</h2>
143143
<li><a href="#counter-style-type"><span class=secno>3.1. </span> Counter
144144
algorithms: the ‘<code class=property>type</code>’ descriptor</a>
145145
<ul class=toc>
146-
<li><a href="#cycling-symbols-the-cyclic-type"><span
147-
class=secno>3.1.1. </span> Cycling Symbols: the ‘<code
148-
class=css>cyclic</code>’ type</a>
146+
<li><a href="#cyclic-type"><span class=secno>3.1.1. </span> Cycling
147+
Symbols: the ‘<code class=css>cyclic</code>’ type</a>
149148

150-
<li><a href="#exhaustible-symbols-the-fixed-type"><span
151-
class=secno>3.1.2. </span> Exhaustible Symbols: the ‘<code
152-
class=css>fixed</code>’ type</a>
149+
<li><a href="#fixed-type"><span class=secno>3.1.2. </span> Exhaustible
150+
Symbols: the ‘<code class=css>fixed</code>’ type</a>
153151

154-
<li><a href="#repeating-symbols-the-symbolic-type"><span
155-
class=secno>3.1.3. </span> Repeating Symbols: the ‘<code
156-
class=css>symbolic</code>’ type</a>
152+
<li><a href="#symbolic-type"><span class=secno>3.1.3. </span>
153+
Repeating Symbols: the ‘<code class=css>symbolic</code>’ type</a>
157154

158-
<li><a href="#bijective-numerals-the-alphabetic-type"><span
159-
class=secno>3.1.4. </span> Bijective Numerals: the ‘<code
160-
class=css>alphabetic</code>type</a>
155+
<li><a href="#alphabetic-type"><span class=secno>3.1.4. </span>
156+
Bijective Numerals: the ‘<code class=css>alphabetic</code>
157+
type</a>
161158

162-
<li><a href="#positional-numerals-the-numeric-type"><span
163-
class=secno>3.1.5. </span> Positional Numerals: the ‘<code
164-
class=css>numeric</code>type</a>
159+
<li><a href="#numeric-type"><span class=secno>3.1.5. </span>
160+
Positional Numerals: the ‘<code class=css>numeric</code>
161+
type</a>
165162

166-
<li><a href="#accumulating-numerals-the-additive-type"><span
167-
class=secno>3.1.6. </span> Accumulating Numerals: the ‘<code
168-
class=css>additive</code>type</a>
163+
<li><a href="#additive-type"><span class=secno>3.1.6. </span>
164+
Accumulating Numerals: the ‘<code class=css>additive</code>
165+
type</a>
169166

170-
<li><a href="#tweaking-existing-counter-styles-the-ove"><span
171-
class=secno>3.1.7. </span> Tweaking Existing Counter Styles: the
172-
<code class=css>override</code>type</a>
167+
<li><a href="#override-type"><span class=secno>3.1.7. </span> Tweaking
168+
Existing Counter Styles: the<code class=css>override</code>
169+
type</a>
173170
</ul>
174171

175172
<li><a href="#counter-style-negative"><span class=secno>3.2. </span>
@@ -450,11 +447,10 @@ <h3 id=counter-style-type><span class=secno>3.1. </span> Counter
450447
interpret their symbols as digits and build their representation
451448
accordingly. The types are defined as follows:
452449

453-
<h4 id=cycling-symbols-the-cyclic-type><span class=secno>3.1.1. </span>
454-
Cycling Symbols: the ‘<a href="#cyclic"><code
455-
class=css>cyclic</code></a>’ type</h4>
450+
<h4 id=cyclic-type><span class=secno>3.1.1. </span> Cycling Symbols: the
451+
<a href="#cyclic"><code class=css>cyclic</code></a>’ type</h4>
456452

457-
<p> The <a href="#cyclic"><code class=css>cyclic</code></a> counter
453+
<p> The <dfn id=cyclic><code class=css>cyclic</code></dfn> counter
458454
type cycles repeatedly through its provided symbols, looping back to the
459455
beginning when it reaches the end of the list. It can be used for simple
460456
bullets (just provide a single <a href="#counter-symbol"><i>counter
@@ -464,8 +460,8 @@ <h4 id=cycling-symbols-the-cyclic-type><span class=secno>3.1.1. </span>
464460
href="#counter-symbol"><i>counter symbol</i></a> (if it exists) is used as
465461
the representation of the value 2, etc.
466462

467-
<p> If the type is <dfn id=cyclic><code
468-
class=css>cyclic</code></dfn>, the ‘<a href="#descdef-symbols"><code
463+
<p> If the type is <a href="#cyclic"><code
464+
class=css>cyclic</code></a>, the ‘<a href="#descdef-symbols"><code
469465
class=property>symbols</code></a>’ descriptor must contain at least one
470466
<a href="#counter-symbol"><i>counter symbol</i></a>, or else the ‘<a
471467
href="#at-counter-style"><code class=css>@counter-style</code></a>’ rule
@@ -497,9 +493,8 @@ <h4 id=cycling-symbols-the-cyclic-type><span class=secno>3.1.1. </span>
497493
(<var>value</var>-1) mod <var>N</var>) of the list of <i>counter
498494
symbols</i> (0-indexed).
499495

500-
<h4 id=exhaustible-symbols-the-fixed-type><span class=secno>3.1.2. </span>
501-
Exhaustible Symbols: the ‘<a href="#fixed"><code
502-
class=css>fixed</code></a>’ type</h4>
496+
<h4 id=fixed-type><span class=secno>3.1.2. </span> Exhaustible Symbols: the
497+
<a href="#fixed"><code class=css>fixed</code></a>’ type</h4>
503498

504499
<p> The <dfn id=fixed><code class=css>fixed</code></dfn> counter type
505500
runs through its list of counter symbols once, then falls back. It is
@@ -552,9 +547,8 @@ <h4 id=exhaustible-symbols-the-fixed-type><span class=secno>3.1.2. </span>
552547
exhausted, further values cannot be represented by this type, and must
553548
instead be represented by the fallback counter style.
554549

555-
<h4 id=repeating-symbols-the-symbolic-type><span class=secno>3.1.3. </span>
556-
Repeating Symbols: the ‘<a href="#symbolic"><code
557-
class=css>symbolic</code></a>’ type</h4>
550+
<h4 id=symbolic-type><span class=secno>3.1.3. </span> Repeating Symbols:
551+
the ‘<a href="#symbolic"><code class=css>symbolic</code></a>’ type</h4>
558552

559553
<p> The ‘<a href="#symbolic"><code class=css>symbolic</code></a>
560554
counter type cycles repeatedly through its provided symbols, doubling,
@@ -649,9 +643,8 @@ <h4 id=repeating-symbols-the-symbolic-type><span class=secno>3.1.3. </span>
649643
instead use the fallback style for representations that would be longer
650644
than 20 characters.
651645

652-
<h4 id=bijective-numerals-the-alphabetic-type><span class=secno>3.1.4.
653-
</span> Bijective Numerals: the ‘<a href="#alphabetic"><code
654-
class=css>alphabetic</code></a>’ type</h4>
646+
<h4 id=alphabetic-type><span class=secno>3.1.4. </span> Bijective Numerals:
647+
the ‘<a href="#alphabetic"><code class=css>alphabetic</code></a>’ type</h4>
655648

656649
<p> The ‘<a href="#alphabetic"><code class=css>alphabetic</code></a>
657650
counter type interprets the list of <i>counter symbols</i> as digits to an
@@ -766,19 +759,18 @@ <h4 id=bijective-numerals-the-alphabetic-type><span class=secno>3.1.4.
766759

767760
<p>Finally, return <var>S</var>.
768761

769-
<h4 id=positional-numerals-the-numeric-type><span class=secno>3.1.5.
770-
</span> Positional Numerals: the ‘<a href="#numeric"><code
771-
class=css>numeric</code></a>’ type</h4>
762+
<h4 id=numeric-type><span class=secno>3.1.5. </span> Positional Numerals:
763+
the ‘<a href="#numeric"><code class=css>numeric</code></a>’ type</h4>
772764

773-
<p> The <a href="#numeric"><code class=css>numeric</code></a> counter
774-
type cycles interprets the list of <i>counter symbols</i> as digits to a
775-
positional (place-value) numbering system, similar to the default <a
776-
href="#decimal"><i>decimal</i></a> counter style. The first <a
777-
href="#counter-symbol"><i>counter symbol</i></a> in the list is
765+
<p> The <dfn id=numeric><code class=css>numeric</code></dfn> counter
766+
type interprets the list of <i>counter symbols</i> as digits to a
767+
"place-value" numbering system, similar to the default <a
768+
href="#decimal"><code class=css>decimal</code></a> counter style. The
769+
first <a href="#counter-symbol"><i>counter symbol</i></a> in the list is
778770
interpreted as the digit 0, the second as the digit 1, and so on.
779771

780-
<p> If the type is <dfn id=numeric><code
781-
class=css>numeric</code></dfn>, the ‘<a href="#descdef-symbols"><code
772+
<p> If the type is <a href="#numeric"><code
773+
class=css>numeric</code></a>, the ‘<a href="#descdef-symbols"><code
782774
class=property>symbols</code></a>’ descriptor must contain at least two
783775
<i>counter symbols</i>, or else the ‘<a href="#at-counter-style"><code
784776
class=css>@counter-style</code></a>’ rule is invalid. This type is
@@ -842,17 +834,16 @@ <h4 id=positional-numerals-the-numeric-type><span class=secno>3.1.5.
842834
<li>Return <var>S</var>.
843835
</ol>
844836

845-
<h4 id=accumulating-numerals-the-additive-type><span class=secno>3.1.6.
846-
</span> Accumulating Numerals: the ‘<a href="#additive"><code
837+
<h4 id=additive-type><span class=secno>3.1.6. </span> Accumulating
838+
Numerals: the ‘<a href="#additive"><code
847839
class=css>additive</code></a>’ type</h4>
848840

849841
<p> The <dfn id=additive><code class=css>additive</code></dfn>
850842
counter type is used to represent "sign-value" numbering systems, which,
851843
rather than using reusing digits in different positions to change their
852-
value, simply define additional digits with much larger values, so that
853-
the value of the number can be obtained by adding all the digits together.
854-
This is used in Roman numerals and other numbering systems around the
855-
world.
844+
value, define additional digits with much larger values, so that the value
845+
of the number can be obtained by adding all the digits together. This is
846+
used in Roman numerals and other numbering systems around the world.
856847

857848
<p> If the type is ‘<a href="#additive"><code
858849
class=css>additive</code></a>’, the ‘<a
@@ -942,27 +933,25 @@ <h4 id=accumulating-numerals-the-additive-type><span class=secno>3.1.6.
942933
instead use the fallback style for representations that would be longer
943934
than 20 characters.
944935

945-
<h4 id=tweaking-existing-counter-styles-the-ove><span class=secno>3.1.7.
946-
</span> Tweaking Existing Counter Styles: the ‘<a href="#override"><code
936+
<h4 id=override-type><span class=secno>3.1.7. </span> Tweaking Existing
937+
Counter Styles: the ‘<a href="#override"><code
947938
class=css>override</code></a>’ type</h4>
948939

949-
<p> The <dfn id=override>override</dfn> type allows an author to use the
950-
<i>algorithm</i> of another counter style, but alter other aspects, such
951-
as the negative sign or the suffix. If a counter style uses the <a
952-
href="#override"><i>override</i></a> type, any unspecified descriptors
953-
must be taken from the overridden counter style specified, rather than
954-
taking their initial values.
955-
956-
<p> If a @counter-style uses the <a href="#override"><i>override</i></a>
957-
type, it must not contain a ‘<a href="#descdef-symbols"><code
958-
class=property>symbols</code></a>’ or ‘<a
959-
href="#descdef-additive-symbols"><code
960-
class=property>additive-symbols</code></a>’ descriptor, or else the
961-
<a href="#at-counter-style"><code
962-
class=css>@counter-style</code></a>’ rule is invalid. If the specified
963-
counter style name isn't the name of any currently-defined counter style,
964-
it must be treated as if it was overriding the <a
965-
href="#decimal"><i>decimal</i></a> counter style.
940+
<p> The <dfn id=override><code class=css>override</code></dfn> type
941+
allows an author to use the <i>algorithm</i> of another counter style, but
942+
alter other aspects, such as the negative sign or the suffix. If a counter
943+
style uses the ‘<a href="#override"><code
944+
class=css>override</code></a>’ type, any unspecified descriptors must be
945+
taken from the overridden counter style specified, rather than taking
946+
their initial values.
947+
948+
<p> If a @counter-style uses the ‘<code class=css>override' type, it must
949+
not contain a 'symbols' or 'additive-symbols' descriptor, or else the
950+
</code>’@counter-style'‘<code class=css> rule is invalid. If the
951+
specified counter style name isn</code>’t the name of any
952+
currently-defined counter style, it must be treated as if it was
953+
overriding the ‘<a href="#decimal"><code class=css>decimal</code></a>
954+
counter style.
966955

967956
<h3 id=counter-style-negative><span class=secno>3.2. </span> Formatting
968957
negative values: the ‘<a href="#descdef-negative"><code

css-counter-styles/Overview.src.html

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,11 @@ <h3 id='counter-style-type'>
220220
build their representation accordingly. The types are defined as follows:
221221

222222

223-
<h4>
223+
<h4 id="cyclic-type">
224224
Cycling Symbols: the ''cyclic'' type</h4>
225225

226226
<p>
227-
The ''cyclic'' counter type cycles repeatedly through its provided symbols,
227+
The <dfn>''cyclic''</dfn> counter type cycles repeatedly through its provided symbols,
228228
looping back to the beginning when it reaches the end of the list.
229229
It can be used for simple bullets
230230
(just provide a single <i>counter symbol</i>),
@@ -233,7 +233,7 @@ <h4>
233233
the second <i>counter symbol</i> (if it exists) is used as the representation of the value 2, etc.
234234

235235
<p>
236-
If the type is <dfn>''cyclic''</dfn>,
236+
If the type is ''cyclic'',
237237
the 'symbols' descriptor must contain at least one <i>counter symbol</i>,
238238
or else the ''@counter-style'' rule is invalid.
239239
This type is defined over all counter values.
@@ -266,7 +266,7 @@ <h4>
266266
of the list of <i>counter symbols</i> (0-indexed).
267267

268268

269-
<h4>
269+
<h4 id="fixed-type">
270270
Exhaustible Symbols: the ''fixed'' type</h4>
271271

272272
<p>
@@ -321,7 +321,7 @@ <h4>
321321

322322

323323

324-
<h4>
324+
<h4 id="symbolic-type">
325325
Repeating Symbols: the ''symbolic'' type</h4>
326326

327327
<p>
@@ -410,7 +410,7 @@ <h4>
410410
but they may choose to instead use the fallback style for representations that would be longer than 20 characters.
411411

412412

413-
<h4>
413+
<h4 id="alphabetic-type">
414414
Bijective Numerals: the ''alphabetic'' type</h4>
415415

416416
<p>
@@ -517,18 +517,19 @@ <h4>
517517

518518
<p>Finally, return <var>S</var>.
519519

520-
<h4>
520+
<h4 id="numeric-type">
521521
Positional Numerals: the ''numeric'' type</h4>
522522

523523
<p>
524-
The ''numeric'' counter type cycles interprets the list of <i>counter symbols</i> as digits to a positional (place-value) numbering system,
525-
similar to the default <i>decimal</i> counter style.
524+
The <dfn>''numeric''</dfn> counter type interprets the list of <i>counter symbols</i>
525+
as digits to a "place-value" numbering system,
526+
similar to the default ''decimal'' counter style.
526527
The first <i>counter symbol</i> in the list is interpreted as the digit 0,
527528
the second as the digit 1,
528529
and so on.
529530

530531
<p>
531-
If the type is <dfn>''numeric''</dfn>,
532+
If the type is ''numeric'',
532533
the 'symbols' descriptor must contain at least two <i>counter symbols</i>,
533534
or else the ''@counter-style'' rule is invalid.
534535
This type is defined over all counter values.
@@ -589,13 +590,13 @@ <h4>
589590
</ol>
590591

591592

592-
<h4>
593+
<h4 id="additive-type">
593594
Accumulating Numerals: the ''additive'' type</h4>
594595

595596
<p>
596597
The <dfn>''additive''</dfn> counter type is used to represent "sign-value" numbering systems,
597598
which, rather than using reusing digits in different positions to change their value,
598-
simply define additional digits with much larger values,
599+
define additional digits with much larger values,
599600
so that the value of the number can be obtained by adding all the digits together.
600601
This is used in Roman numerals
601602
and other numbering systems around the world.
@@ -672,23 +673,23 @@ <h4>
672673
but they may choose to instead use the fallback style for representations that would be longer than 20 characters.
673674

674675

675-
<h4>
676+
<h4 id="override-type">
676677
Tweaking Existing Counter Styles: the ''override'' type</h4>
677678

678679
<p>
679-
The <dfn>override</dfn> type allows an author to use the <i>algorithm</i> of another counter style,
680+
The <dfn>''override''</dfn> type allows an author to use the <i>algorithm</i> of another counter style,
680681
but alter other aspects,
681682
such as the negative sign or the suffix.
682-
If a counter style uses the <i>override</i> type,
683+
If a counter style uses the ''override'' type,
683684
any unspecified descriptors must be taken from the overridden counter style specified,
684685
rather than taking their initial values.
685686

686687
<p>
687-
If a @counter-style uses the <i>override</i> type,
688+
If a @counter-style uses the ''override' type,
688689
it must not contain a 'symbols' or 'additive-symbols' descriptor,
689690
or else the ''@counter-style'' rule is invalid.
690691
If the specified counter style name isn't the name of any currently-defined counter style,
691-
it must be treated as if it was overriding the <i>decimal</i> counter style.
692+
it must be treated as if it was overriding the ''decimal'' counter style.
692693

693694

694695
<h3 id='counter-style-negative'>

0 commit comments

Comments
 (0)