Skip to content

Commit ee4abb3

Browse files
committed
[css-cascade] Link every instance of 'origin' appropriately, to avoid confusion.
1 parent 1b1f88a commit ee4abb3

2 files changed

Lines changed: 30 additions & 24 deletions

File tree

css-cascade/Overview.html

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,8 @@ <h3 id=cascade><span class=secno>4.2. </span> Cascading Declarations</h3>
508508
<dd> The <a href="#origin"><i>origin</i></a> of a declaration is based on
509509
where it comes from and whether or not it is declared ‘<a
510510
href="#important"><code class=css>!important</code></a>’ (see below).
511-
The precedence of the various origins is, in descending order:
511+
The precedence of the various <a href="#origin"><i>origins</i></a> is, in
512+
descending order:
512513
<ol>
513514
<li>Transition declarations <a href="#CSS3-TRANSITIONS"
514515
rel=biblioentry>[CSS3-TRANSITIONS]<!--{{!CSS3-TRANSITIONS}}--></a>
@@ -541,8 +542,9 @@ <h3 id=cascade><span class=secno>4.2. </span> Cascading Declarations</h3>
541542
Transition and Animation declarations is still under <a
542543
href="http://lists.w3.org/Archives/Public/www-style/2013Mar/0297.html">discussion</a>.
543544

544-
<p> Declarations from origins earlier in this list win over declarations
545-
from later origins.
545+
<p> Declarations from <a href="#origin"><i>origins</i></a> earlier in
546+
this list win over declarations from later <a
547+
href="#origin"><i>origins</i></a>.
546548

547549
<dt id=cascade-scope>Scope
548550

@@ -608,7 +610,8 @@ <h3 id=cascade><span class=secno>4.2. </span> Cascading Declarations</h3>
608610
<h4 id=cascading-origins><span class=secno>4.2.1. </span> Cascading Origins</h4>
609611

610612
<p> Each style rule has an <dfn id=origin>origin</dfn>, which determines
611-
where it enters the cascade. CSS defines three core origins:
613+
where it enters the cascade. CSS defines three core <a
614+
href="#origin"><i>origins</i></a>:
612615

613616
<dl>
614617
<dt id=cascade-origin-author>Author
@@ -636,7 +639,8 @@ <h4 id=cascading-origins><span class=secno>4.2.1. </span> Cascading Origins</h4>
636639
user agent style sheet</a>.
637640
</dl>
638641

639-
<p> Extensions to CSS define the following additional origins:
642+
<p> Extensions to CSS define the following additional <a
643+
href="#origin"><i>origins</i></a>:
640644

641645
<dl>
642646
<dt id=cascade-origin-override>Override
@@ -659,12 +663,13 @@ <h4 id=cascading-origins><span class=secno>4.2.1. </span> Cascading Origins</h4>
659663
generate "virtual" rules representing their effects when running.
660664
</dl>
661665

662-
<p> In addition, several origins have twin origins defined the same way,
663-
but which contain the ‘<a href="#important"><code
664-
class=css>!important</code></a>’ rules.
666+
<p> In addition, several <a href="#origin"><i>origins</i></a> have twin <a
667+
href="#origin"><i>origins</i></a> defined the same way, but which contain
668+
the ‘<a href="#important"><code class=css>!important</code></a>
669+
rules.
665670

666-
<p> The normative list of CSS origins is defined in <a
667-
href="#cascade-origin">a previous section</a>.
671+
<p> The normative list of CSS <a href="#origin"><i>origins</i></a> is
672+
defined in <a href="#cascade-origin">a previous section</a>.
668673

669674
<h4 id=important-rules><span class=secno>4.2.2. </span><a
670675
href="#important"><code class=css>!important</code></a>’ rules</h4>
@@ -825,12 +830,13 @@ <h4 id=default><span class=secno>4.3.3. </span> Rolling back the cascade:
825830

826831
<p> If the <a href="#cascaded-value0"><i>cascaded value</i></a> is the
827832
<a href="#default-keyword"><code class=css>default</code></a>
828-
keyword, then all declarations in the origin level to which it belongs are
829-
discarded from the cascade, resulting in a new <a
830-
href="#cascaded-value0"><i>cascaded value</i></a>. For this purpose, all
831-
author-originating styles (author and override, both normal and important)
832-
are treated as belonging to the same origin level. This continues until
833-
the <a href="#cascaded-value0"><i>cascaded value</i></a> is not ‘<a
833+
keyword, then all declarations in the <a href="#origin"><i>origin</i></a>
834+
level to which it belongs are discarded from the cascade, resulting in a
835+
new <a href="#cascaded-value0"><i>cascaded value</i></a>. For this
836+
purpose, all author-originating styles (author and override, both normal
837+
and important) are treated as belonging to the same <a
838+
href="#origin"><i>origin</i></a> level. This continues until the <a
839+
href="#cascaded-value0"><i>cascaded value</i></a> is not ‘<a
834840
href="#default-keyword"><code class=css>default</code></a>’ or until the
835841
<a href="#output-of-the-cascade"><i>output of the cascade</i></a> is
836842
empty.

css-cascade/Overview.src.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ <h3 id='cascade'>
318318
<dd>
319319
The <i>origin</i> of a declaration is based on where it comes from
320320
and whether or not it is declared ''!important'' (see below).
321-
The precedence of the various origins is, in descending order:
321+
The precedence of the various <i>origins</i> is, in descending order:
322322

323323
<ol>
324324
<li>Transition declarations [[!CSS3-TRANSITIONS]] <sup><a href="#animations-origin-note">[NOTE]</a></sup>
@@ -337,7 +337,7 @@ <h3 id='cascade'>
337337
The precise ordering of Transition and Animation declarations is still under <a href="http://lists.w3.org/Archives/Public/www-style/2013Mar/0297.html">discussion</a>.
338338

339339
<p>
340-
Declarations from origins earlier in this list win over declarations from later origins.
340+
Declarations from <i>origins</i> earlier in this list win over declarations from later <i>origins</i>.
341341

342342
<dt id='cascade-scope'>Scope
343343
<dd>
@@ -397,7 +397,7 @@ <h4 id='cascading-origins'>
397397
<p>
398398
Each style rule has an <dfn>origin</dfn>,
399399
which determines where it enters the cascade.
400-
CSS defines three core origins:
400+
CSS defines three core <i>origins</i>:
401401

402402
<dl>
403403
<dt id='cascade-origin-author'>Author
@@ -421,7 +421,7 @@ <h4 id='cascading-origins'>
421421
</dl>
422422

423423
<p>
424-
Extensions to CSS define the following additional origins:
424+
Extensions to CSS define the following additional <i>origins</i>:
425425

426426
<dl>
427427
<dt id='cascade-origin-override'>Override
@@ -440,11 +440,11 @@ <h4 id='cascading-origins'>
440440

441441
<p>
442442
In addition,
443-
several origins have twin origins defined the same way,
443+
several <i>origins</i> have twin <i>origins</i> defined the same way,
444444
but which contain the ''!important'' rules.
445445

446446
<p>
447-
The normative list of CSS origins is defined in <a href="#cascade-origin">a previous section</a>.
447+
The normative list of CSS <i>origins</i> is defined in <a href="#cascade-origin">a previous section</a>.
448448

449449
<h4 id='important-rules'>
450450
''!important'' rules</h4>
@@ -582,11 +582,11 @@ <h4 id="default">
582582

583583
<p>
584584
If the <i>cascaded value</i> is the ''default'' keyword,
585-
then all declarations in the origin level to which it belongs are discarded from the cascade,
585+
then all declarations in the <i>origin</i> level to which it belongs are discarded from the cascade,
586586
resulting in a new <i>cascaded value</i>.
587587
For this purpose, all author-originating styles
588588
(author and override, both normal and important)
589-
are treated as belonging to the same origin level.
589+
are treated as belonging to the same <i>origin</i> level.
590590
This continues until the <i>cascaded value</i> is not ''default''
591591
or until the <i>output of the cascade</i> is empty.
592592

0 commit comments

Comments
 (0)