changeset
[css-*] Replace s/rule ?set/style rule/, except in grammars.
Sat, 08 Jun 2013 14:19:52 +0900
- author
- Simon Sapin <simon.sapin@exyr.org>
- date
- Sat, 08 Jun 2013 14:19:52 +0900
- changeset 8381
- 7e80b7d0224f
- parent 8380
- ae77d6a3ead3
- child 8382
- 6eda4d3d60ec
[css-*] Replace s/rule ?set/style rule/, except in grammars.
Having three names for the same concept is silly.
"Rule set" is confusing as it implies multiple rules,
while it in fact refers to a single rule.
CSS OM and other specs already use "style rule".
This changes "rule set" and "ruleset" to "style rule",
except when used in a grammar.
(The normative definiton of the Core Grammar is in 2.1
which is harder to change.)
This is missing a few changes in css-fonts,
since its source is not version-controlled in this repository.
1.1 --- a/css-cascade/Overview.html Sat Jun 08 11:18:20 2013 +0900 1.2 +++ b/css-cascade/Overview.html Sat Jun 08 14:19:52 2013 +0900 1.3 @@ -9,7 +9,7 @@ 1.4 rel=dcterms.rights> 1.5 <meta content="CSS Cascading and Inheritance Level 3" name=dcterms.title> 1.6 <meta content=text name=dcterms.type> 1.7 - <meta content=2013-05-01 name=dcterms.date> 1.8 + <meta content=2013-06-08 name=dcterms.date> 1.9 <meta content="Håkon Wium Lie" name=dcterms.creator> 1.10 <meta content="Elika J. Etemad" name=dcterms.creator> 1.11 <meta content="Tab Atkins Jr." name=dcterms.creator> 1.12 @@ -28,11 +28,11 @@ 1.13 1.14 <h1>CSS Cascading and Inheritance Level 3</h1> 1.15 1.16 - <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 1 May 2013</h2> 1.17 + <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 8 June 2013</h2> 1.18 1.19 <dl><!-- 1.20 <dt>This version: 1.21 - <dd><a href="http://dev.w3.org/csswg/css3-cascade/">http://www.w3.org/TR/2013/WD-css3-cascade-20130501/</a> 1.22 + <dd><a href="http://dev.w3.org/csswg/css3-cascade/">http://www.w3.org/TR/2013/WD-css3-cascade-20130608/</a> 1.23 --> 1.24 1.25 <dt>Latest version: 1.26 @@ -260,24 +260,21 @@ 1.27 rel=biblioentry>[CSS3PAGE]<!--{{CSS3PAGE}}--></a>. 1.28 1.29 <h2 id=at-import><span class=secno>2. </span> Importing style sheets: the 1.30 - ‘<a href="#lsquoatimportrsquo"><code class=css>@import</code></a>’ 1.31 - rule</h2> 1.32 + ‘<a href="#atimport"><code class=css>@import</code></a>’ rule</h2> 1.33 1.34 - <p> The <dfn id=lsquoatimportrsquo>‘<code 1.35 - class=css>@import</code>’</dfn> rule allows users to import style rules 1.36 - from other style sheets. Any ‘<a href="#lsquoatimportrsquo"><code 1.37 - class=css>@import</code></a>’ rules must follow all ‘<code 1.38 - class=css>@charset</code>’ rules and precede all other at-rules and rule 1.39 - sets in a style sheet. The ‘<a href="#lsquoatimportrsquo"><code 1.40 - class=css>@import</code></a>’ keyword must be followed by the URI of the 1.41 - style sheet to include. A string is also allowed; it will be interpreted 1.42 - as if it had url(…) around it. 1.43 + <p> The <dfn id=atimport>‘<code class=css>@import</code>’</dfn> rule 1.44 + allows users to import style rules from other style sheets. Any ‘<a 1.45 + href="#atimport"><code class=css>@import</code></a>’ rules must follow 1.46 + all ‘<code class=css>@charset</code>’ rules and precede all other 1.47 + at-rules and style rules in a style sheet. The ‘<a 1.48 + href="#atimport"><code class=css>@import</code></a>’ keyword must be 1.49 + followed by the URI of the style sheet to include. A string is also 1.50 + allowed; it will be interpreted as if it had url(…) around it. 1.51 1.52 <div class=example> 1.53 <p> The following lines are equivalent in meaning and illustrate both 1.54 - ‘<a href="#lsquoatimportrsquo"><code class=css>@import</code></a>’ 1.55 - syntaxes (one with ‘<code class=css>url()</code>’ and one with a bare 1.56 - string): 1.57 + ‘<a href="#atimport"><code class=css>@import</code></a>’ syntaxes 1.58 + (one with ‘<code class=css>url()</code>’ and one with a bare string): 1.59 1.60 <pre><!-- 1.61 -->@import "mystyle.css"; 1.62 @@ -287,8 +284,8 @@ 1.63 1.64 <p> So that user agents can avoid retrieving resources for unsupported 1.65 media types, authors may specify media-dependent ‘<a 1.66 - href="#lsquoatimportrsquo"><code class=css>@import</code></a>’ rules. 1.67 - Such media-dependent imports include a comma-separated list of “media 1.68 + href="#atimport"><code class=css>@import</code></a>’ rules. Such 1.69 + media-dependent imports include a comma-separated list of “media 1.70 queries” after the URI. In the absence of any media query, the import is 1.71 unconditional. (Specifying ‘<a href="#all"><code 1.72 class=css>all</code></a>’ for the medium has the same effect.) The UA 1.73 @@ -296,9 +293,8 @@ 1.74 to true. 1.75 1.76 <div class=example> 1.77 - <p> The following rules illustrate how ‘<a 1.78 - href="#lsquoatimportrsquo"><code class=css>@import</code></a>’ rules 1.79 - can be made media-dependent: 1.80 + <p> The following rules illustrate how ‘<a href="#atimport"><code 1.81 + class=css>@import</code></a>’ rules can be made media-dependent: 1.82 1.83 <pre><!-- 1.84 -->@import url("fineprint.css") print; 1.85 @@ -485,7 +481,7 @@ 1.86 rel=biblioentry>[CSS3-CONDITIONAL]<!--{{!CSS3-CONDITIONAL}}--></a> with a 1.87 false condition. 1.88 1.89 - <li> It belongs to a ruleset whose selector matches the element. <a 1.90 + <li> It belongs to a style rule whose selector matches the element. <a 1.91 href="#SELECT" rel=biblioentry>[SELECT]<!--{{!SELECT}}--></a> (Taking <a 1.92 href="http://www.w3.org/TR/selectors4/#scoping">scoping</a> into account, 1.93 if necessary.) 1.94 @@ -590,22 +586,22 @@ 1.95 <dd> The <a href="http://www.w3.org/TR/selectors/#specificity">Selectors 1.96 module</a> <a href="#SELECT" 1.97 rel=biblioentry>[SELECT]<!--{{!SELECT}}--></a> describes how to compute 1.98 - the specificity of a selector. For the purpose of this step, a ruleset 1.99 + the specificity of a selector. For the purpose of this step, a style rule 1.100 without a selector (such as the <a 1.101 href="http://www.w3.org/TR/css-style-attr/#interpret">contents of a style 1.102 attribute</a>) is considered to have a specificity higher than any 1.103 - selector. The declaration belonging to a ruleset whose selector has the 1.104 - highest specificity wins. 1.105 + selector. The declaration belonging to a style rule whose selector has 1.106 + the highest specificity wins. 1.107 1.108 <dt id=cascade-order>Order of appearance. 1.109 1.110 <dd> Rules from imported style sheets are treated as if their stylesheets 1.111 - were substituted in place of the ‘<a href="#lsquoatimportrsquo"><code 1.112 + were substituted in place of the ‘<a href="#atimport"><code 1.113 class=css>@import</code></a>’ rule. Stylesheets independently linked by 1.114 the originating document are treated as if they were concatenated in 1.115 linking order, as determined by the host document language. Style 1.116 - attributes are treated as if their rulesets were concatenated in document 1.117 - order, after any stylesheets. The last declaration wins. 1.118 + attributes are treated as if their style rules were concatenated in 1.119 + document order, after any stylesheets. The last declaration wins. 1.120 </dl> 1.121 1.122 <p> The <dfn id=output-of-the-cascade>output of the cascade</dfn> is a 1.123 @@ -1202,10 +1198,10 @@ 1.124 <dt id=CSS3-CONDITIONAL>[CSS3-CONDITIONAL] 1.125 1.126 <dd>L. David Baron. <a 1.127 - href="http://www.w3.org/TR/2012/WD-css3-conditional-20121213/"><cite>CSS 1.128 - Conditional Rules Module Level 3.</cite></a> 13 December 2012. W3C 1.129 - Working Draft. (Work in progress.) URL: <a 1.130 - href="http://www.w3.org/TR/2012/WD-css3-conditional-20121213/">http://www.w3.org/TR/2012/WD-css3-conditional-20121213/</a> 1.131 + href="http://www.w3.org/TR/2013/CR-css3-conditional-20130404/"><cite>CSS 1.132 + Conditional Rules Module Level 3.</cite></a> 4 April 2013. W3C Candidate 1.133 + Recommendation. (Work in progress.) URL: <a 1.134 + href="http://www.w3.org/TR/2013/CR-css3-conditional-20130404/">http://www.w3.org/TR/2013/CR-css3-conditional-20130404/</a> 1.135 </dd> 1.136 <!----> 1.137 1.138 @@ -1327,7 +1323,7 @@ 1.139 <li>‘<code class=css>default</code>’, <a href="#default-keyword" 1.140 title="section 4.3.3."><strong>4.3.3.</strong></a> 1.141 1.142 - <li>‘<code class=css>@import</code>’, <a href="#lsquoatimportrsquo" 1.143 + <li>‘<code class=css>@import</code>’, <a href="#atimport" 1.144 title="section 2."><strong>2.</strong></a> 1.145 1.146 <li>‘<code class=css>inherit</code>’, <a href="#inherit-keyword"
2.1 --- a/css-cascade/Overview.src.html Sat Jun 08 11:18:20 2013 +0900 2.2 +++ b/css-cascade/Overview.src.html Sat Jun 08 14:19:52 2013 +0900 2.3 @@ -96,7 +96,7 @@ 2.4 <p> 2.5 The <dfn>''@import''</dfn> rule allows users to import style rules from other style sheets. 2.6 Any ''@import'' rules must follow all ''@charset'' rules 2.7 - and precede all other at-rules and rule sets in a style sheet. 2.8 + and precede all other at-rules and style rules in a style sheet. 2.9 The ''@import'' keyword must be followed by the URI of the style sheet to include. 2.10 A string is also allowed; 2.11 it will be interpreted as if it had url(…) around it. 2.12 @@ -288,7 +288,7 @@ 2.13 It is not qualified by a conditional rule [[!CSS3-CONDITIONAL]] with a false condition. 2.14 2.15 <li> 2.16 - It belongs to a ruleset whose selector matches the element. [[!SELECT]] 2.17 + It belongs to a style rule whose selector matches the element. [[!SELECT]] 2.18 (Taking <a href="http://www.w3.org/TR/selectors4/#scoping">scoping</a> into account, if necessary.) 2.19 </ul> 2.20 2.21 @@ -378,10 +378,10 @@ 2.22 <dd> 2.23 The <a href="http://www.w3.org/TR/selectors/#specificity">Selectors module</a> [[!SELECT]] describes how to compute the specificity of a selector. 2.24 For the purpose of this step, 2.25 - a ruleset without a selector 2.26 + a style rule without a selector 2.27 (such as the <a href="http://www.w3.org/TR/css-style-attr/#interpret">contents of a style attribute</a>) 2.28 is considered to have a specificity higher than any selector. 2.29 - The declaration belonging to a ruleset whose selector has the highest specificity wins. 2.30 + The declaration belonging to a style rule whose selector has the highest specificity wins. 2.31 2.32 2.33 <dt id='cascade-order'>Order of appearance. 2.34 @@ -389,7 +389,7 @@ 2.35 Rules from imported style sheets are treated as if their stylesheets were substituted in place of the ''@import'' rule. 2.36 Stylesheets independently linked by the originating document are treated as if they were concatenated in linking order, 2.37 as determined by the host document language. 2.38 - Style attributes are treated as if their rulesets were concatenated in document order, after any stylesheets. 2.39 + Style attributes are treated as if their style rules were concatenated in document order, after any stylesheets. 2.40 The last declaration wins. 2.41 </dl> 2.42
3.1 --- a/css-conditional/Overview.html Sat Jun 08 11:18:20 2013 +0900 3.2 +++ b/css-conditional/Overview.html Sat Jun 08 14:19:52 2013 +0900 3.3 @@ -12,7 +12,7 @@ 3.4 rel=dcterms.rights> 3.5 <meta content="CSS Conditional Rules Module Level 3" name=dcterms.title> 3.6 <meta content=text name=dcterms.type> 3.7 - <meta content=2013-06-03 name=dcterms.date> 3.8 + <meta content=2013-06-08 name=dcterms.date> 3.9 <meta content="L. David Baron" name=dcterms.creator> 3.10 <meta content=W3C name=dcterms.publisher> 3.11 <meta content="http://dev.w3.org/csswg/css3-conditional/" 3.12 @@ -33,14 +33,14 @@ 3.13 <h1 class=p-name>CSS Conditional Rules Module Level 3</h1> 3.14 3.15 <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft <span 3.16 - class=dt-updated><span class=value-title title=20130603>3 June 3.17 + class=dt-updated><span class=value-title title=20130608> 8 June 3.18 2013</span></span></h2> 3.19 3.20 <dl> 3.21 <dt>This version: 3.22 3.23 <dd><a class=u-url href="http://dev.w3.org/csswg/css3-conditional/"> 3.24 - http://www.w3.org/TR/2013/ED-css3-conditional-20130603/</a> 3.25 + http://www.w3.org/TR/2013/ED-css3-conditional-20130608/</a> 3.26 3.27 <dt>Latest version: 3.28 3.29 @@ -300,7 +300,7 @@ 3.30 3.31 <p><a href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> defines 3.32 one type of conditional group rule, the ‘<code 3.33 - class=css>@media</code>’ rule, and allows only rulesets (not other 3.34 + class=css>@media</code>’ rule, and allows only style rules (not other 3.35 @-rules) inside of it. The ‘<code class=css>@media</code>’ rule 3.36 provides the ability to have media-specific style sheets, which is also 3.37 provided by style sheet linking features such as ‘<code 3.38 @@ -441,10 +441,10 @@ 3.39 rule body</dfn>, which is a block (pair of braces) containing a sequence 3.40 of rules. 3.41 3.42 - <p>A group rule body is allowed to contain rulesets and any @-rules that 3.43 - are allowed at the top level of a style sheet before and after a ruleset. 3.44 - This means that @-rules that must occur at the beginning of the style 3.45 - sheet (such as ‘<code class=css>@charset</code>’, ‘<code 3.46 + <p>A group rule body is allowed to contain style rules and any @-rules that 3.47 + are allowed at the top level of a style sheet before and after a style 3.48 + rule. This means that @-rules that must occur at the beginning of the 3.49 + style sheet (such as ‘<code class=css>@charset</code>’, ‘<code 3.50 class=css>@import</code>’, and ‘<code class=css>@namespace</code>’ 3.51 rules) are not allowed inside of conditional group rules. Conditional 3.52 group rules can be nested. 3.53 @@ -452,6 +452,9 @@ 3.54 <p>In terms of the grammar, this specification defines the following 3.55 productions for use in the grammar of conditional group rules: 3.56 3.57 + <p class=note>Note: Style rules are defined in grammars by the 3.58 + <code>ruleset</code> production. 3.59 + 3.60 <pre><dfn id="nested_statement">nested_statement</dfn> 3.61 : ruleset | <a 3.62 href="#media"><i>media</i></a> | page | font_face_rule | keyframes_rule | 3.63 @@ -500,7 +503,7 @@ 3.64 <strong>must</strong> process such rules as <a 3.65 href="#processing">described above</a>. 3.66 3.67 - <p>Any rules that are not allowed after a ruleset (e.g., ‘<code 3.68 + <p>Any rules that are not allowed after a style rule (e.g., ‘<code 3.69 class=css>@charset</code>’, ‘<code class=css>@import</code>’, or 3.70 ‘<code class=css>@namespace</code>’ rules) are also not allowed after 3.71 a conditional group rule. Therefore, style sheets <strong>must 3.72 @@ -950,9 +953,9 @@ 3.73 the ‘<code class=css>@supports</code>’ rule in this specification) 3.74 that works correctly for the features implemented. This applies especially 3.75 to compound values; implementations must implement all parts of the value 3.76 - in order to consider the declaration supported, either inside a ruleset or 3.77 - in the declaration condition of an ‘<code class=css>@supports</code>’ 3.78 - rule.</p> 3.79 + in order to consider the declaration supported, either inside a style rule 3.80 + or in the declaration condition of an ‘<code 3.81 + class=css>@supports</code>’ rule.</p> 3.82 <!-- 3.83 <h2 id="at-document">Document queries: the '@document' rule</h2> 3.84
4.1 --- a/css-conditional/Overview.src.html Sat Jun 08 11:18:20 2013 +0900 4.2 +++ b/css-conditional/Overview.src.html Sat Jun 08 14:19:52 2013 +0900 4.3 @@ -8,7 +8,7 @@ 4.4 <link href="../csslogo.ico" rel="shortcut icon" type="image/x-icon"> 4.5 <link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/W3C-[STATUS].css"> 4.6 <script src="http://test.csswg.org/harness/annotate.js#CSS3-CONDITIONAL_DEV" 4.7 - type="text/javascript" defer></script 4.8 + type="text/javascript" defer></script> 4.9 </head> 4.10 <body class="h-entry"> 4.11 4.12 @@ -131,7 +131,7 @@ 4.13 <p><em>This section is not normative.</em> 4.14 4.15 <p>[[!CSS21]] defines one type of conditional group rule, the 4.16 - '@media' rule, and allows only rulesets (not other @-rules) 4.17 + '@media' rule, and allows only style rules (not other @-rules) 4.18 inside of it. The '@media' rule provides the ability to 4.19 have media-specific style sheets, which is also provided by style 4.20 sheet linking features such as '@import' and 4.21 @@ -258,9 +258,9 @@ 4.22 specific to the type of rule followed by a <dfn>group rule body</dfn>, 4.23 which is a block (pair of braces) containing a sequence of rules.</p> 4.24 4.25 -<p>A group rule body is allowed to contain rulesets and any @-rules that 4.26 +<p>A group rule body is allowed to contain style rules and any @-rules that 4.27 are allowed at the top level of a style sheet before and after a 4.28 -ruleset. This means that @-rules that must occur at the beginning of 4.29 +style rule. This means that @-rules that must occur at the beginning of 4.30 the style sheet (such as '@charset', '@import', 4.31 and '@namespace' rules) are not allowed inside of conditional group 4.32 rules. Conditional group rules can be nested.</p> 4.33 @@ -268,6 +268,9 @@ 4.34 <p>In terms of the grammar, this specification defines the following 4.35 productions for use in the grammar of conditional group rules:</p> 4.36 4.37 +<p class=note>Note: Style rules are defined in grammars 4.38 +by the <code>ruleset</code> production.</p> 4.39 + 4.40 <pre><dfn>nested_statement</dfn> 4.41 : ruleset | <i>media</i> | page | font_face_rule | keyframes_rule | 4.42 <i>supports_rule</i> 4.43 @@ -308,7 +311,7 @@ 4.44 <strong>must</strong> process such rules as <a 4.45 href="#processing">described above</a>.</p> 4.46 4.47 -<p>Any rules that are not allowed after a ruleset (e.g., ''@charset'', 4.48 +<p>Any rules that are not allowed after a style rule (e.g., ''@charset'', 4.49 ''@import'', or ''@namespace'' rules) are also not allowed after a 4.50 conditional group rule. Therefore, style sheets <strong>must 4.51 not</strong> place such rules after a conditional group rules, and CSS 4.52 @@ -676,7 +679,7 @@ 4.53 provided by the ''@supports'' rule in this specification) that works 4.54 correctly for the features implemented. This applies especially to 4.55 compound values; implementations must implement all parts of the value 4.56 -in order to consider the declaration supported, either inside a ruleset 4.57 +in order to consider the declaration supported, either inside a style rule 4.58 or in the declaration condition of an ''@supports'' rule.</p> 4.59 4.60 <!--
5.1 --- a/css-hierarchies/Overview.html Sat Jun 08 11:18:20 2013 +0900 5.2 +++ b/css-hierarchies/Overview.html Sat Jun 08 14:19:52 2013 +0900 5.3 @@ -11,9 +11,9 @@ 5.4 5.5 <meta content="CSS Hierarchies Module Level 3" name=dcterms.title> 5.6 <meta content=text name=dcterms.type> 5.7 - <meta content=2013-03-18 name=dcterms.issued> 5.8 - <meta content="http://dev.w3.org/csswg/css3-hierarchies/ <!--" 5.9 - name=dcterms.creator> 5.10 + <meta content=2013-06-08 name=dcterms.date> 5.11 + <meta content="Shane Stephens" name=dcterms.creator> 5.12 + <meta content="Tab Atkins Jr." name=dcterms.creator> 5.13 <meta content=W3C name=dcterms.publisher> 5.14 <meta content="http://dev.w3.org/csswg/css3-hierarchies/" 5.15 name=dcterms.identifier> 5.16 @@ -52,7 +52,7 @@ 5.17 <h1>CSS Hierarchies Module Level 3</h1> 5.18 5.19 <h2 class="no-num no-toc" id=unofficial-proposal-draft-date>Unofficial 5.20 - Proposal Draft 18 March 2013</h2> 5.21 + Proposal Draft 8 June 2013</h2> 5.22 5.23 <dl> 5.24 <dt>This version: 5.25 @@ -66,13 +66,6 @@ 5.26 5.27 <dd><a 5.28 href="//www.w3.org/TR/css3-hierarchies/">http://www.w3.org/TR/css3-hierarchies/</a> 5.29 - <dt>Feedback:</dt> 5.30 - <dd><a href="mailto:www-style@w3.org?subject=%5Bcss-hierarchies%5D%20feedback" 5.31 - >www-style@w3.org</a> 5.32 - with subject line “<kbd>[css-hierarchies] 5.33 - <var>… message topic …</var></kbd>” 5.34 - (<a rel="discussion" href="http://lists.w3.org/Archives/Public/www-style/" 5.35 - >archives</a>) 5.36 5.37 <dt>Editor's draft: 5.38 5.39 @@ -84,6 +77,15 @@ 5.40 http://www.w3.org/PreviousVersionURI</a> 5.41 --> 5.42 5.43 + <dt>Feedback: 5.44 + 5.45 + <dd><a 5.46 + href="mailto:www-style@w3.org?subject=%5Bcss-hierarchies%5D%20feedback">www-style@w3.org</a> 5.47 + with subject line “<kbd>[css-hierarchies] <var>… message topic 5.48 + …</var></kbd>” (<a 5.49 + href="http://lists.w3.org/Archives/Public/www-style/" 5.50 + rel=discussion>archives</a>) 5.51 + 5.52 <dt>Editors: 5.53 5.54 <dd class=vcard><span class=fn>Shane Stephens</span>, <span 5.55 @@ -294,9 +296,9 @@ 5.56 <p>In order to accomplish nesting, this specification defines a new simple 5.57 selector called the nesting selector, represented in selectors by the 5.58 ‘<code class=css>&</code>’ character. All complex selectors in the 5.59 - selector lists of nested rule sets must start with the nesting selector. 5.60 - The nesting selector represents the elements matched by the parent rule 5.61 - set's selector list. 5.62 + selector lists of nested style rules must start with the nesting selector. 5.63 + The nesting selector represents the elements matched by the parent style 5.64 + rule's selector list. 5.65 5.66 <p class=issue>Introducing the ‘<code class=css>&</code>’ character 5.67 will cause issues with CSS embedded directly in XML, as it's the first 5.68 @@ -640,16 +642,16 @@ 5.69 <!-- Sorted by label --> 5.70 5.71 <dl class=bibliography> 5.72 - <dt style="display: none"><!-- keeps the doc valid if the DL is empty --> 5.73 + <dd style="display: none"><!-- keeps the doc valid if the DL is empty --> 5.74 <!----> 5.75 5.76 <dt id=CSS21>[CSS21] 5.77 5.78 <dd>Bert Bos; et al. <a 5.79 - href="http://www.w3.org/TR/2011/REC-CSS2-20110607/"><cite>Cascading Style 5.80 + href="http://www.w3.org/TR/2011/REC-CSS2-20110607"><cite>Cascading Style 5.81 Sheets Level 2 Revision 1 (CSS 2.1) Specification.</cite></a> 7 June 5.82 2011. W3C Recommendation. URL: <a 5.83 - href="http://www.w3.org/TR/2011/REC-CSS2-20110607/">http://www.w3.org/TR/2011/REC-CSS2-20110607/</a> 5.84 + href="http://www.w3.org/TR/2011/REC-CSS2-20110607">http://www.w3.org/TR/2011/REC-CSS2-20110607</a> 5.85 </dd> 5.86 <!----> 5.87 5.88 @@ -678,7 +680,7 @@ 5.89 <!-- Sorted by label --> 5.90 5.91 <dl class=bibliography> 5.92 - <dt style="display: none"><!-- keeps the doc valid if the DL is empty --> 5.93 + <dd style="display: none"><!-- keeps the doc valid if the DL is empty --> 5.94 <!----> 5.95 5.96 <dt id=CSS1>[CSS1]
6.1 --- a/css-hierarchies/Overview.src.html Sat Jun 08 11:18:20 2013 +0900 6.2 +++ b/css-hierarchies/Overview.src.html Sat Jun 08 14:19:52 2013 +0900 6.3 @@ -181,7 +181,7 @@ 6.4 6.5 <p>This specification provides a mechanism that allows for the nesting of style rules within other style rules. A nested style rule can used anywhere that a declaration can be used.</p> 6.6 6.7 - <p>In order to accomplish nesting, this specification defines a new simple selector called the nesting selector, represented in selectors by the '&' character. All complex selectors in the selector lists of nested rule sets must start with the nesting selector. The nesting selector represents the elements matched by the parent rule set's selector list.</p> 6.8 + <p>In order to accomplish nesting, this specification defines a new simple selector called the nesting selector, represented in selectors by the '&' character. All complex selectors in the selector lists of nested style rules must start with the nesting selector. The nesting selector represents the elements matched by the parent style rule's selector list.</p> 6.9 6.10 <p class='issue'>Introducing the ''&'' character will cause issues with CSS embedded directly in XML, as it's the first character used in CSS syntax that either requires escaping or using CDATA. Do we need to change this?</p> 6.11
7.1 --- a/css-namespaces/Overview.html Sat Jun 08 11:18:20 2013 +0900 7.2 +++ b/css-namespaces/Overview.html Sat Jun 08 14:19:52 2013 +0900 7.3 @@ -1,12 +1,24 @@ 7.4 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> 7.5 7.6 <html lang=en> 7.7 - <head><meta content="text/html; charset=utf-8" http-equiv=Content-Type> 7.8 + <head profile="http://dublincore.org/documents/2008/08/04/dc-html/ "> 7.9 + <meta content="text/html; charset=utf-8" http-equiv=Content-Type> 7.10 + <title>CSS Namespaces Module</title> 7.11 7.12 - <title>CSS Namespaces Module</title> 7.13 + <link href="http://purl.org/dc/terms/" rel=schema.dcterms> 7.14 + <link href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright" 7.15 + rel=dcterms.rights> 7.16 + <meta content="CSS Namespaces Module" name=dcterms.title> 7.17 + <meta content=text name=dcterms.type> 7.18 + <meta content=2013-06-08 name=dcterms.date> 7.19 + <meta content="Elika J. Etemad" name=dcterms.creator> 7.20 + <meta content="Anne van Kesteren" name=dcterms.creator> 7.21 + <meta content=W3C name=dcterms.publisher> 7.22 + <meta content="http://dev.w3.org/csswg/css3-namespace/" 7.23 + name=dcterms.identifier> 7.24 <link href="../default.css" rel=stylesheet type="text/css"> 7.25 <link href="http://www.w3.org/StyleSheets/TR/W3C-ED" rel=stylesheet 7.26 - type="text/css"> 7.27 + type="text/css"> 7.28 7.29 <body> 7.30 <div class=head> <!--begin-logo--> 7.31 @@ -15,17 +27,16 @@ 7.32 7.33 <h1>CSS Namespaces Module</h1> 7.34 7.35 - <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 3 January 2012</h2> 7.36 + <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 8 June 2013</h2> 7.37 7.38 <dl> 7.39 <dt>This version:</dt> 7.40 <!-- 7.41 - <dd><a href="http://www.w3.org/TR/2012/ED-css3-namespace-20120103/">http://www.w3.org/TR/2012/PR-css3-namespace-20120103/</a></dd> 7.42 + <dd><a href="http://dev.w3.org/csswg/css3-namespace/">http://www.w3.org/TR/2013/PR-css3-namespace-20130608/</a></dd> 7.43 --> 7.44 7.45 <dd><a 7.46 href="http://dev.w3.org/csswg/css3-namespace/">http://dev.w3.org/csswg/css3-namespace/</a> 7.47 - 7.48 7.49 <dt>Latest version: 7.50 7.51 @@ -36,13 +47,15 @@ 7.52 7.53 <dd><a 7.54 href="http://www.w3.org/TR/2008/CR-css3-namespace-20080523/">http://www.w3.org/TR/2008/CR-css3-namespace-20080523/</a> 7.55 - <dt>Feedback:</dt> 7.56 - <dd><a href="mailto:www-style@w3.org?subject=%5Bcss-namespaces%5D%20feedback" 7.57 - >www-style@w3.org</a> 7.58 - with subject line “<kbd>[css-namespaces] 7.59 - <var>… message topic …</var></kbd>” 7.60 - (<a rel="discussion" href="http://lists.w3.org/Archives/Public/www-style/" 7.61 - >archives</a>) 7.62 + 7.63 + <dt>Feedback: 7.64 + 7.65 + <dd><a 7.66 + href="mailto:www-style@w3.org?subject=%5Bcss-namespaces%5D%20feedback">www-style@w3.org</a> 7.67 + with subject line “<kbd>[css-namespaces] <var>… message topic 7.68 + …</var></kbd>” (<a 7.69 + href="http://lists.w3.org/Archives/Public/www-style/" 7.70 + rel=discussion>archives</a>) 7.71 7.72 <dt>Editors: 7.73 7.74 @@ -60,14 +73,14 @@ 7.75 <!--begin-copyright--> 7.76 <p class=copyright><a 7.77 href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright" 7.78 - rel=license>Copyright</a> © 2012 <a 7.79 - href="http://www.w3.org/"><acronym 7.80 - title="World Wide Web Consortium">W3C</acronym></a><sup>®</sup> (<a 7.81 - href="http://www.csail.mit.edu/"><acronym 7.82 - title="Massachusetts Institute of Technology">MIT</acronym></a>, <a 7.83 - href="http://www.ercim.eu/"><acronym 7.84 - title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, 7.85 - <a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a 7.86 + rel=license>Copyright</a> © 2013 <a href="http://www.w3.org/"><abbr 7.87 + title="World Wide Web Consortium">W3C</abbr></a><sup>®</sup> (<a 7.88 + href="http://www.csail.mit.edu/"><abbr 7.89 + title="Massachusetts Institute of Technology">MIT</abbr></a>, <a 7.90 + href="http://www.ercim.eu/"><abbr 7.91 + title="European Research Consortium for Informatics and Mathematics">ERCIM</abbr></a>, 7.92 + <a href="http://www.keio.ac.jp/">Keio</a>, <a 7.93 + href="http://ev.buaa.edu.cn/">Beihang</a>), All Rights Reserved. W3C <a 7.94 href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, 7.95 <a 7.96 href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> 7.97 @@ -101,24 +114,25 @@ 7.98 www-style@w3.org</a> (see <a 7.99 href="http://www.w3.org/Mail/Request">instructions</a>) is preferred for 7.100 discussion of this specification. When sending e-mail, please put the text 7.101 - “css3-namespace” in the subject, preferably like this: 7.102 - “[<!---->css3-namespace<!---->] <em>…summary of 7.103 - comment…</em>” 7.104 + “css3-namespace” in the subject, preferably like this: 7.105 + “[<!---->css3-namespace<!---->] <em>…summary of comment…</em>” 7.106 7.107 - <p>This document was produced by the <a href="/Style/CSS/members">CSS 7.108 - Working Group</a> (part of the <a href="/Style/">Style Activity</a>). 7.109 + <p>This document was produced by the <a 7.110 + href="http://www.w3.org/Style/CSS/members">CSS Working Group</a> (part of 7.111 + the <a href="http://www.w3.org/Style/">Style Activity</a>). 7.112 7.113 <p>This document was produced by a group operating under the <a 7.114 - href="/Consortium/Patent-Policy-20040205/">5 February 2004 W3C Patent 7.115 - Policy</a>. W3C maintains a <a href="/2004/01/pp-impl/32061/status" 7.116 + href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 7.117 + 2004 W3C Patent Policy</a>. W3C maintains a <a 7.118 + href="http://www.w3.org/2004/01/pp-impl/32061/status" 7.119 rel=disclosure>public list of any patent disclosures</a> made in 7.120 connection with the deliverables of the group; that page also includes 7.121 instructions for disclosing a patent. An individual who has actual 7.122 knowledge of a patent which the individual believes contains <a 7.123 - href="/Consortium/Patent-Policy-20040205/#def-essential">Essential 7.124 + href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential 7.125 Claim(s)</a> must disclose the information in accordance with <a 7.126 - href="/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the 7.127 - W3C Patent Policy</a>.</p> 7.128 + href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 7.129 + 6 of the W3C Patent Policy</a>.</p> 7.130 <!--end-status--> 7.131 7.132 <p>A CSS Namespace <a href="http://www.w3.org/Style/CSS/Test/">Test 7.133 @@ -144,7 +158,6 @@ 7.134 <li><a href="#conformance"><span class=secno>2. </span>Conformance</a> 7.135 <ul class=toc> 7.136 <li><a href="#terminology"><span class=secno>2.1. </span>Terminology</a> 7.137 - 7.138 </ul> 7.139 7.140 <li><a href="#declaration"><span class=secno>3. </span>Declaring 7.141 @@ -177,7 +190,7 @@ 7.142 <div> 7.143 <h2 id=intro><span class=secno>1. </span>Introduction</h2> 7.144 7.145 - <p><em>This section is non-normative.</em></p> 7.146 + <p><em>This section is non-normative.</em> 7.147 7.148 <p>This CSS Namespaces module defines syntax for using namespaces in CSS. 7.149 It defines the <code>@namespace</code> rule for declaring a default 7.150 @@ -196,7 +209,7 @@ 7.151 rules, as well as all style rules that make use of namespace qualified 7.152 names. The syntax of delimiting namespace prefixes in CSS was 7.153 deliberately chosen so that these CSS clients would ignore the style 7.154 - rules rather than possibly match them incorrectly.</p> 7.155 + rules rather than possibly match them incorrectly. 7.156 </div> 7.157 7.158 <div> 7.159 @@ -205,7 +218,7 @@ 7.160 <p>A document or implementation cannot conform to CSS Namespaces alone, 7.161 but can claim conformance to CSS Namespaces if it satisfies the 7.162 conformance requirements in this specification when implementing CSS or 7.163 - another host language that normatively references this specification.</p> 7.164 + another host language that normatively references this specification. 7.165 7.166 <p>Conformance to CSS Namespaces is defined for two classes: 7.167 7.168 @@ -231,20 +244,20 @@ 7.169 readability, these words do not appear in all uppercase letters in this 7.170 specification. All of the text of this specification is normative except 7.171 sections explicitly marked as non-normative, examples, and notes. <a 7.172 - href="#RFC2119" rel=biblioentry>[RFC2119]<!--{{!RFC2119}}--></a></p> 7.173 + href="#RFC2119" rel=biblioentry>[RFC2119]<!--{{!RFC2119}}--></a> 7.174 7.175 <p>Examples in this specification are introduced with the words "for 7.176 example" or are set apart from the normative text with 7.177 <code>class="example"</code>, like this: 7.178 7.179 <div class=example> 7.180 - <p>This is an example of an informative example.</p> 7.181 + <p>This is an example of an informative example. 7.182 </div> 7.183 7.184 <p>Informative notes begin with the word "Note" and are set apart from the 7.185 normative text with <code>class="note"</code>, like this: 7.186 7.187 - <p class=note>Note, this is an informative note.</p> 7.188 + <p class=note>Note, this is an informative note. 7.189 7.190 <h3 id=terminology><span class=secno>2.1. </span>Terminology</h3> 7.191 7.192 @@ -253,20 +266,20 @@ 7.193 rel=biblioentry>[XML-NAMES]<!--{{!XML-NAMES}}--></a> However, the syntax 7.194 defined here is not restricted to representing XML element and attribute 7.195 names and may represent other kinds of namespaces as defined by the host 7.196 - language.</p> 7.197 + language. 7.198 7.199 <p>In CSS Namespaces a namespace name consisting of the empty string is 7.200 - taken to represent the null namespace or lack of a namespace.</p> 7.201 + taken to represent the null namespace or lack of a namespace. 7.202 7.203 <div class=example> 7.204 - <p>For example, given the namespace declarations:</p> 7.205 + <p>For example, given the namespace declarations: 7.206 7.207 <pre>@namespace empty ""; 7.208 <!-- -->@namespace "";</pre> 7.209 7.210 <p>The <a href="http://www.w3.org/TR/css3-selectors/#type-selectors">type 7.211 selectors</a> <code>elem</code>, <code>|elem</code>, and 7.212 - <code>empty|elem</code> are equivalent.</p> 7.213 + <code>empty|elem</code> are equivalent. 7.214 </div> 7.215 </div> 7.216 7.217 @@ -279,7 +292,7 @@ 7.218 declares a namespace prefix and associates it with a given namespace name 7.219 (a string). This namespace prefix can then be used in namespace-qualified 7.220 names such as the <a href="#css-qnames">CSS qualified names</a> defined 7.221 - below.</p> 7.222 + below. 7.223 7.224 <div class=example> 7.225 <pre>@namespace "http://www.w3.org/1999/xhtml"; 7.226 @@ -287,11 +300,11 @@ 7.227 7.228 <p>The first rule declares a default namespace 7.229 <code>http://www.w3.org/1999/xhtml</code> to be applied to names that 7.230 - have no explicit namespace component.</p> 7.231 + have no explicit namespace component. 7.232 7.233 <p>The second rule declares a namespace prefix <code>svg</code> that is 7.234 used to apply the namespace <code>http://www.w3.org/2000/svg</code> 7.235 - where the <code>svg</code> namespace prefix is used.</p> 7.236 + where the <code>svg</code> namespace prefix is used. 7.237 </div> 7.238 7.239 <p id=expanded-name-match>In CSS Namespaces, as in Namespaces in XML 1.0, 7.240 @@ -300,17 +313,17 @@ 7.241 namespace name) that is significant. Thus the actual prefixes used in a 7.242 CSS style sheet, and whether they are defaulted or not, are independent 7.243 of the namespace prefixes used in the markup and whether these are 7.244 - defaulted or not.</p> 7.245 + defaulted or not. 7.246 7.247 <div class=example> 7.248 - <p>For example, given the following XML document:</p> 7.249 + <p>For example, given the following XML document: 7.250 7.251 <pre><!-- 7.252 --><qml:elem xmlns:qml="http://example.com/q-markup"></qml:elem><!-- 7.253 --></pre> 7.254 7.255 <p>and the following <code>@namespace</code> declarations at the 7.256 - beginning of a CSS file:</p> 7.257 + beginning of a CSS file: 7.258 7.259 <pre><!-- 7.260 -->@namespace Q "http://example.com/q-markup"; 7.261 @@ -319,7 +332,7 @@ 7.262 7.263 <p>The selectors <code>Q|elem</code> and <code>lq|elem</code> in that CSS 7.264 file would both match the element <code><qml:elem></code>. (The 7.265 - selector <code>qml|elem</code> would be invalid.)</p> 7.266 + selector <code>qml|elem</code> would be invalid.) 7.267 </div> 7.268 7.269 <h3 id=syntax><span class=secno>3.1. </span>Syntax</h3> 7.270 @@ -327,7 +340,7 @@ 7.271 <p>The syntax for the <code>@namespace</code> rule is as follows (using 7.272 the notation from the <a 7.273 href="http://www.w3.org/TR/CSS21/grammar.html">Grammar appendix of CSS 7.274 - 2.1</a> <a href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>):</p> 7.275 + 2.1</a> <a href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>): 7.276 7.277 <pre><!-- 7.278 -->namespace 7.279 @@ -338,15 +351,15 @@ 7.280 <!-- --> ;<!-- 7.281 --></pre> 7.282 7.283 - <p>with the new token:</p> 7.284 + <p>with the new token: 7.285 7.286 <pre>@{N}{A}{M}{E}{S}{P}{A}{C}{E} {return NAMESPACE_SYM;}</pre> 7.287 7.288 <p>Any <code>@namespace</code> rules must follow all @charset and @import 7.289 - rules and precede all other non-ignored at-rules and rule sets in a style 7.290 - sheet. For CSS syntax this adds <code>[ namespace [S|CDO|CDC]* ]*</code> 7.291 - immediately after <code>[ import [S|CDO|CDC]* ]*</code> in the 7.292 - <code>stylesheet</code> grammar.</p> 7.293 + rules and precede all other non-ignored at-rules and style rules in a 7.294 + style sheet. For CSS syntax this adds <code>[ namespace [S|CDO|CDC]* 7.295 + ]*</code> immediately after <code>[ import [S|CDO|CDC]* ]*</code> in the 7.296 + <code>stylesheet</code> grammar. 7.297 7.298 <p>A syntactically invalid <code>@namespace</code> rule (whether malformed 7.299 or misplaced) must be <a 7.300 @@ -354,22 +367,22 @@ 7.301 <a href="http://www.w3.org/TR/CSS21/conform.html#style-sheet">style 7.302 sheet</a> containing an invalid <code>@namespace</code> rule is not a <a 7.303 href="http://www.w3.org/TR/CSS21/conform.html#valid-style-sheet">valid 7.304 - style sheet</a>.</p> 7.305 + style sheet</a>. 7.306 7.307 <p>A URI string parsed from the <code>URI</code> syntax must be treated as 7.308 a literal string: as with the <code>STRING</code> syntax, no URI-specific 7.309 - normalization is applied.</p> 7.310 + normalization is applied. 7.311 7.312 - <p>All strings—including the empty string and strings representing 7.313 - invalid URIs—are valid namespace names in <code>@namespace</code> 7.314 - declarations.</p> 7.315 + <p>All strings—including the empty string and strings representing 7.316 + invalid URIs—are valid namespace names in <code>@namespace</code> 7.317 + declarations. 7.318 7.319 <h3 id=scope><span class=secno>3.2. </span>Scope</h3> 7.320 7.321 <p>The namespace prefix is declared only within the style sheet in which 7.322 its <code>@namespace</code> rule appears. It is not declared in any style 7.323 sheets importing or imported by that style sheet, nor in any other style 7.324 - sheets applying to the document.</p> 7.325 + sheets applying to the document. 7.326 7.327 <h3 id=prefixes><span class=secno>3.3. </span>Declaring Prefixes</h3> 7.328 7.329 @@ -383,7 +396,7 @@ 7.330 declaration declares all prefixes that map to the same NFC representation as 7.331 the given prefix to the same namespace name. (See [[!UNICODE]] for the definition 7.332 of NFC normalization.) --> 7.333 - 7.334 + 7.335 <p>If in the namespace declaration the namespace prefix is omitted, then 7.336 the namespace so declared is the default namespace. The <dfn 7.337 id=default-namespace>default namespace</dfn> may apply to names that have 7.338 @@ -392,19 +405,19 @@ 7.339 following <a href="#XML-NAMES" 7.340 rel=biblioentry>[XML-NAMES]<!--{{!XML-NAMES}}--></a>, in Selectors <a 7.341 href="#SELECT" rel=biblioentry>[SELECT]<!--{{SELECT}}--></a> the default 7.342 - namespace applies to type selectors—but it does not apply to 7.343 - attribute selectors. There is no default value for the default namespace: 7.344 - modules that assign unqualified names to the default namespace must 7.345 - define how those unqualified names are to be interpreted when no default 7.346 - namespace is declared.</p> 7.347 + namespace applies to type selectors—but it does not apply to attribute 7.348 + selectors. There is no default value for the default namespace: modules 7.349 + that assign unqualified names to the default namespace must define how 7.350 + those unqualified names are to be interpreted when no default namespace 7.351 + is declared. 7.352 7.353 <p class=note>Note that using default namespaces in conjunction with type 7.354 selectors can cause UAs that support default namespaces and UAs that 7.355 - don't support default namespaces to interpret selectors differently.</p> 7.356 + don't support default namespaces to interpret selectors differently. 7.357 7.358 <p>If a namespace prefix or default namespace is declared more than once 7.359 only the last declaration shall be used. Declaring a namespace prefix or 7.360 - default namespace more than once is nonconforming.</p> 7.361 + default namespace more than once is nonconforming. 7.362 </div> 7.363 7.364 <div> 7.365 @@ -421,15 +434,15 @@ 7.366 that the namespace name part of the expanded name has no value. Some 7.367 contexts (as defined by the host language) may allow the use of an 7.368 asterisk (<code>*</code>, U+002A) as a wildcard prefix to indicate a name 7.369 - in any namespace, including no namespace.</p> 7.370 + in any namespace, including no namespace. 7.371 7.372 <div class=example> 7.373 - <p>Given the namespace declarations:</p> 7.374 + <p>Given the namespace declarations: 7.375 7.376 <pre>@namespace toto "http://toto.example.org"; 7.377 <!-- -->@namespace "http://example.com/foo";</pre> 7.378 7.379 - <p>In a context where the default namespace applies</p> 7.380 + <p>In a context where the default namespace applies 7.381 7.382 <dl> 7.383 <dt><code>toto|A</code> 7.384 @@ -460,7 +473,7 @@ 7.385 the <a href="http://www.w3.org/TR/CSS21/grammar.html">Grammar appendix of 7.386 CSS 2.1</a>. <a href="#CSS21" 7.387 rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> Note this means that 7.388 - comments, but not white space, are implicitly allowed between tokens.):</p> 7.389 + comments, but not white space, are implicitly allowed between tokens.): 7.390 7.391 <pre><!-- 7.392 -->qname_prefix 7.393 @@ -483,14 +496,14 @@ 7.394 should treat undeclared namespace prefixes as a parsing error that will 7.395 cause the selector or declaration (etc.) to be considered invalid and, in 7.396 CSS, <a 7.397 - href="http://www.w3.org/TR/CSS21/conform.html#ignore">ignored</a>.</p> 7.398 + href="http://www.w3.org/TR/CSS21/conform.html#ignore">ignored</a>. 7.399 7.400 <div class=example> 7.401 <p>For example, the Selectors module <a href="#SELECT" 7.402 rel=biblioentry>[SELECT]<!--{{SELECT}}--></a> defines a type selector 7.403 with an undeclared namespace prefix to be an invalid selector, and CSS 7.404 <a href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> requires 7.405 - rule sets with an invalid selector to be completely ignored.</p> 7.406 + style rules with an invalid selector to be completely ignored. 7.407 </div> 7.408 </div> 7.409 7.410 @@ -498,12 +511,12 @@ 7.411 7.412 <p>This draft borrows heavily from earlier drafts on CSS namespace support 7.413 by Chris Lilley and by Peter Linss and early (unpublished) drafts on CSS 7.414 - and XML by Håkon Lie and Bert Bos, and XML Namespaces and CSS by 7.415 - Bert Bos and Steven Pemberton. Many current and former members of the CSS 7.416 - Working Group have contributed to this document. Discussions on 7.417 - www-style@w3.org and in other places have also contributed ideas to this 7.418 - specification. Special thanks goes to L. David Baron, Karl Dubost, Ian 7.419 - Hickson, Bjöern Höhrmann, and Lachlan Hunt for their comments. 7.420 + and XML by Håkon Lie and Bert Bos, and XML Namespaces and CSS by Bert Bos 7.421 + and Steven Pemberton. Many current and former members of the CSS Working 7.422 + Group have contributed to this document. Discussions on www-style@w3.org 7.423 + and in other places have also contributed ideas to this specification. 7.424 + Special thanks goes to L. David Baron, Karl Dubost, Ian Hickson, Bjöern 7.425 + Höhrmann, and Lachlan Hunt for their comments. 7.426 7.427 <h2 class=no-num id=references>References</h2> 7.428 7.429 @@ -512,17 +525,17 @@ 7.430 <!-- Sorted by label --> 7.431 7.432 <dl class=bibliography> 7.433 - <dt style="display: none"><!-- keeps the doc valid if the DL is empty --> 7.434 + <dd style="display: none"><!-- keeps the doc valid if the DL is empty --> 7.435 <!----> 7.436 7.437 <dt id=CSS21>[CSS21] 7.438 7.439 <dd>Bert Bos; et al. <a 7.440 href="http://www.w3.org/TR/2011/REC-CSS2-20110607"><cite>Cascading Style 7.441 - Sheets Level 2 Revision 1 (CSS 2.1) Specification.</cite></a> 7 June 7.442 + Sheets Level 2 Revision 1 (CSS 2.1) Specification.</cite></a> 7 June 7.443 2011. W3C Recommendation. URL: <a 7.444 href="http://www.w3.org/TR/2011/REC-CSS2-20110607">http://www.w3.org/TR/2011/REC-CSS2-20110607</a> 7.445 - </dd> 7.446 + </dd> 7.447 <!----> 7.448 7.449 <dt id=RFC2119>[RFC2119] 7.450 @@ -531,7 +544,7 @@ 7.451 words for use in RFCs to Indicate Requirement Levels.</cite></a> Internet 7.452 RFC 2119. URL: <a 7.453 href="http://www.ietf.org/rfc/rfc2119.txt">http://www.ietf.org/rfc/rfc2119.txt</a> 7.454 - </dd> 7.455 + </dd> 7.456 <!----> 7.457 7.458 <dt id=XML-NAMES>[XML-NAMES] 7.459 @@ -541,7 +554,7 @@ 7.460 in XML 1.0 (Third Edition).</cite></a> 8 December 2009. W3C 7.461 Recommendation. URL: <a 7.462 href="http://www.w3.org/TR/2009/REC-xml-names-20091208/">http://www.w3.org/TR/2009/REC-xml-names-20091208/</a> 7.463 - </dd> 7.464 + </dd> 7.465 <!----> 7.466 </dl> 7.467 <!--end-normative--> 7.468 @@ -551,16 +564,16 @@ 7.469 <!-- Sorted by label --> 7.470 7.471 <dl class=bibliography> 7.472 - <dt style="display: none"><!-- keeps the doc valid if the DL is empty --> 7.473 + <dd style="display: none"><!-- keeps the doc valid if the DL is empty --> 7.474 <!----> 7.475 7.476 <dt id=SELECT>[SELECT] 7.477 7.478 - <dd>Tantek Çelik; et al. <a 7.479 + <dd>Tantek Çelik; et al. <a 7.480 href="http://www.w3.org/TR/2011/REC-css3-selectors-20110929/"><cite>Selectors 7.481 Level 3.</cite></a> 29 September 2011. W3C Recommendation. URL: <a 7.482 href="http://www.w3.org/TR/2011/REC-css3-selectors-20110929/">http://www.w3.org/TR/2011/REC-css3-selectors-20110929/</a> 7.483 - </dd> 7.484 + </dd> 7.485 <!----> 7.486 </dl> 7.487 <!--end-informative-->
8.1 --- a/css-namespaces/Overview.src.html Sat Jun 08 11:18:20 2013 +0900 8.2 +++ b/css-namespaces/Overview.src.html Sat Jun 08 14:19:52 2013 +0900 8.3 @@ -229,7 +229,7 @@ 8.4 <pre>@{N}{A}{M}{E}{S}{P}{A}{C}{E} {return NAMESPACE_SYM;}</pre> 8.5 8.6 <p>Any <code>@namespace</code> rules must follow all @charset and @import 8.7 - rules and precede all other non-ignored at-rules and rule sets in a style 8.8 + rules and precede all other non-ignored at-rules and style rules in a style 8.9 sheet. For CSS syntax this adds <code>[ namespace [S|CDO|CDC]* ]*</code> 8.10 immediately after <code>[ import [S|CDO|CDC]* ]*</code> in the 8.11 <code>stylesheet</code> grammar.</p> 8.12 @@ -361,7 +361,7 @@ 8.13 <div class="example"> 8.14 <p>For example, the Selectors module [[SELECT]] defines a type selector with 8.15 an undeclared namespace prefix to be an invalid selector, and CSS 8.16 - [[!CSS21]] requires rule sets with an invalid selector to be completely 8.17 + [[!CSS21]] requires style rules with an invalid selector to be completely 8.18 ignored.</p> 8.19 </div> 8.20 </div>
9.1 --- a/css-page/Overview.html Sat Jun 08 11:18:20 2013 +0900 9.2 +++ b/css-page/Overview.html Sat Jun 08 14:19:52 2013 +0900 9.3 @@ -4,18 +4,18 @@ 9.4 <head profile="http://dublincore.org/documents/2008/08/04/dc-html/ "> 9.5 <title> CSS Paged Media Module Level 3</title> 9.6 9.7 - <link href="http://purl.org/dc/terms/" rel=schema.dc> 9.8 + <link href="http://purl.org/dc/terms/" rel=schema.dcterms> 9.9 <link href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright" 9.10 - rel=dc.rights> 9.11 - <meta content=" CSS Paged Media Module Level 3" name=dc.title> 9.12 - <meta content=text name=dc.type> 9.13 - <meta content=2013-03-20 name=dc.date> 9.14 - <meta content="Melinda Grant" name=dc.creator> 9.15 - <meta content="Håkon Wium Lie" name=dc.creator> 9.16 - <meta content="Elika J. Etemad" name=dc.creator> 9.17 - <meta content="Simon Sapin" name=dc.creator> 9.18 - <meta content=W3C name=dc.publisher> 9.19 - <meta content="http://dev.w3.org/csswg/css3-page/" name=dc.identifier> 9.20 + rel=dcterms.rights> 9.21 + <meta content=" CSS Paged Media Module Level 3" name=dcterms.title> 9.22 + <meta content=text name=dcterms.type> 9.23 + <meta content=2013-06-08 name=dcterms.date> 9.24 + <meta content="Melinda Grant" name=dcterms.creator> 9.25 + <meta content="Håkon Wium Lie" name=dcterms.creator> 9.26 + <meta content="Elika J. Etemad" name=dcterms.creator> 9.27 + <meta content="Simon Sapin" name=dcterms.creator> 9.28 + <meta content=W3C name=dcterms.publisher> 9.29 + <meta content="http://dev.w3.org/csswg/css3-page/" name=dcterms.identifier> 9.30 <meta content="text/html; charset=utf-8" http-equiv=Content-Type> 9.31 <link href="../default.css" rel=stylesheet type="text/css"> 9.32 <link href="http://www.w3.org/StyleSheets/TR/W3C-ED.css" rel=stylesheet 9.33 @@ -100,7 +100,7 @@ 9.34 <h1 class=p-name>CSS Paged Media Module Level 3</h1> 9.35 9.36 <h2 class="no-num no-toc" id=w3c-working>Editor's Draft <span 9.37 - class=dt-updated><span class=value-title title=20130320>20 March 9.38 + class=dt-updated><span class=value-title title=20130608> 8 June 9.39 2013</span></span></h2> 9.40 9.41 <dl> 9.42 @@ -108,7 +108,7 @@ 9.43 9.44 <dd><a class=u-url 9.45 href="http://dev.w3.org/csswg/css3-page/">http://dev.w3.org/csswg/css3-page/</a></dd> 9.46 - <!-- <dd><a class="u-url" href="http://dev.w3.org/csswg/css3-page/">http://www.w3.org/TR/2013/WD-css3-page-20130320</a></dd> --> 9.47 + <!-- <dd><a class="u-url" href="http://dev.w3.org/csswg/css3-page/">http://www.w3.org/TR/2013/WD-css3-page-20130608</a></dd> --> 9.48 9.49 <dt>Latest version: 9.50 9.51 @@ -130,13 +130,14 @@ 9.52 <dd><a href="http://www.w3.org/Style/CSS/Tracker/products/13" 9.53 rel=issues>http://www.w3.org/Style/CSS/Tracker/products/13</a> 9.54 9.55 - <dt>Feedback:</dt> 9.56 - <dd><a href="mailto:www-style@w3.org?subject=%5Bcss-page%5D%20feedback" 9.57 - >www-style@w3.org</a> 9.58 - with subject line “<kbd>[css-page] 9.59 - <var>… message topic …</var></kbd>” 9.60 - (<a rel="discussion" href="http://lists.w3.org/Archives/Public/www-style/" 9.61 - >archives</a>) 9.62 + <dt>Feedback: 9.63 + 9.64 + <dd><a 9.65 + href="mailto:www-style@w3.org?subject=%5Bcss-page%5D%20feedback">www-style@w3.org</a> 9.66 + with subject line “<kbd>[css-page] <var>… message topic 9.67 + …</var></kbd>” (<a 9.68 + href="http://lists.w3.org/Archives/Public/www-style/" 9.69 + rel=discussion>archives</a>) 9.70 9.71 <dt>Editors: 9.72 9.73 @@ -1186,8 +1187,7 @@ 9.74 9.75 <p>Declarations in page and margin contexts <a 9.76 href="http://www.w3.org/TR/CSS21/cascade.html">cascade</a> just like 9.77 - declarations in <a 9.78 - href="http://www.w3.org/TR/CSS21/syndata.html#rule-sets">rule sets</a>. 9.79 + declarations in style rule for elements. 9.80 9.81 <p>The <dfn id=specificity>specificity</dfn> of page a selector is 9.82 computed in a manner analogous to the computations defined in the <a 9.83 @@ -3463,7 +3463,7 @@ 9.84 href="#using-named-pages">named</a>. 9.85 9.86 <li>The ‘<a href="#blank"><code class=css>:blank</code></a>’ 9.87 - pseudo-class was imported from the <a 9.88 + pseudo-class was imported from the <a 9.89 href="http://dev.w3.org/csswg/css3-gcpm/">Generated Content for Paged 9.90 Media</a> module. 9.91 9.92 @@ -3515,17 +3515,17 @@ 9.93 <h3 class=no-num id=normative-references>Normative References</h3> 9.94 <!--begin-normative--> <!-- Sorted by label --> 9.95 <dl class=bibliography> 9.96 - <dt 9.97 + <dd 9.98 style="display: none"><!-- keeps the doc valid if the DL is empty --> 9.99 <!----> 9.100 9.101 <dt id=CSS21>[CSS21] 9.102 9.103 <dd>Bert Bos; et al. <a 9.104 - href="http://www.w3.org/TR/2011/REC-CSS2-20110607/"><cite>Cascading 9.105 + href="http://www.w3.org/TR/2011/REC-CSS2-20110607"><cite>Cascading 9.106 Style Sheets Level 2 Revision 1 (CSS 2.1) Specification.</cite></a> 7 9.107 June 2011. W3C Recommendation. URL: <a 9.108 - href="http://www.w3.org/TR/2011/REC-CSS2-20110607/">http://www.w3.org/TR/2011/REC-CSS2-20110607/</a> 9.109 + href="http://www.w3.org/TR/2011/REC-CSS2-20110607">http://www.w3.org/TR/2011/REC-CSS2-20110607</a> 9.110 </dd> 9.111 <!----> 9.112 9.113 @@ -3600,7 +3600,7 @@ 9.114 <h3 class=no-num id=informative-references>Informative References</h3> 9.115 <!--begin-informative--> <!-- Sorted by label --> 9.116 <dl class=bibliography> 9.117 - <dt 9.118 + <dd 9.119 style="display: none"><!-- keeps the doc valid if the DL is empty --> 9.120 <!----> 9.121 9.122 @@ -3637,10 +3637,10 @@ 9.123 <dt id=CSS3VAL>[CSS3VAL] 9.124 9.125 <dd>Håkon Wium Lie; Tab Atkins; Elika J. Etemad. <a 9.126 - href="http://www.w3.org/TR/2012/CR-css3-values-20120828/"><cite>CSS 9.127 - Values and Units Module Level 3.</cite></a> 28 August 2012. W3C 9.128 - Candidate Recommendation. (Work in progress.) URL: <a 9.129 - href="http://www.w3.org/TR/2012/CR-css3-values-20120828/">http://www.w3.org/TR/2012/CR-css3-values-20120828/</a> 9.130 + href="http://www.w3.org/TR/2013/CR-css3-values-20130404/"><cite>CSS 9.131 + Values and Units Module Level 3.</cite></a> 4 April 2013. W3C Candidate 9.132 + Recommendation. (Work in progress.) URL: <a 9.133 + href="http://www.w3.org/TR/2013/CR-css3-values-20130404/">http://www.w3.org/TR/2013/CR-css3-values-20130404/</a> 9.134 </dd> 9.135 <!----> 9.136
10.1 --- a/css-page/Overview.src.html Sat Jun 08 11:18:20 2013 +0900 10.2 +++ b/css-page/Overview.src.html Sat Jun 08 14:19:52 2013 +0900 10.3 @@ -834,7 +834,7 @@ 10.4 10.5 <h3 id="cascading-and-page-context">Cascading in the page context</h3> 10.6 10.7 -<p>Declarations in page and margin contexts <a href="http://www.w3.org/TR/CSS21/cascade.html">cascade</a> just like declarations in <a href="http://www.w3.org/TR/CSS21/syndata.html#rule-sets">rule sets</a>.</p> 10.8 +<p>Declarations in page and margin contexts <a href="http://www.w3.org/TR/CSS21/cascade.html">cascade</a> just like declarations in style rule for elements.</p> 10.9 10.10 <p>The <dfn>specificity</dfn> of page a selector is computed in a manner 10.11 analogous to the computations defined in
11.1 --- a/css-text-4/Overview.html Sat Jun 08 11:18:20 2013 +0900 11.2 +++ b/css-text-4/Overview.html Sat Jun 08 14:19:52 2013 +0900 11.3 @@ -11,7 +11,7 @@ 11.4 rel=dcterms.rights> 11.5 <meta content="CSS Text Level 4" name=dcterms.title> 11.6 <meta content=text name=dcterms.type> 11.7 - <meta content=2012-10-28 name=dcterms.date> 11.8 + <meta content=2013-06-08 name=dcterms.date> 11.9 <meta content="Elika J. Etemad" name=dcterms.creator> 11.10 <meta content="Koji Ishii" name=dcterms.creator> 11.11 <meta content=W3C name=dcterms.publisher> 11.12 @@ -39,15 +39,14 @@ 11.13 11.14 <h1>CSS Text Level 4</h1> 11.15 11.16 - <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 28 October 11.17 - 2012</h2> 11.18 + <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 8 June 2013</h2> 11.19 11.20 <dl> 11.21 <dt>This version: 11.22 11.23 <dd><a href="http://dev.w3.org/csswg/css3-text/">$Date$ (CVS 11.24 $Revision$)</a> <!-- 11.25 - <dd><a href="http://www.w3.org/TR/2012/WD-css3-text-20121028/">http://www.w3.org/TR/2012/WD-css3-text-20121028/</a></dd> 11.26 + <dd><a href="http://www.w3.org/TR/2013/WD-css3-text-20130608/">http://www.w3.org/TR/2013/WD-css3-text-20130608/</a></dd> 11.27 --> 11.28 11.29 <dt>Latest version: 11.30 @@ -85,7 +84,7 @@ 11.31 <!--begin-copyright--> 11.32 <p class=copyright><a 11.33 href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright" 11.34 - rel=license>Copyright</a> © 2012 <a href="http://www.w3.org/"><abbr 11.35 + rel=license>Copyright</a> © 2013 <a href="http://www.w3.org/"><abbr 11.36 title="World Wide Web Consortium">W3C</abbr></a><sup>®</sup> (<a 11.37 href="http://www.csail.mit.edu/"><abbr 11.38 title="Massachusetts Institute of Technology">MIT</abbr></a>, <a 11.39 @@ -2360,7 +2359,7 @@ 11.40 class=property href="#text-justify">‘<code 11.41 class=property>text-justify</code>’</a> property. 11.42 11.43 - <dt><dfn id=string title="text-align:<string>">‘<code 11.44 + <dt><dfn id=ltstringgt title="text-align:<string>">‘<code 11.45 class=css><span title="<string>"><a class=noxref 11.46 href="http://www.w3.org/TR/CSS21/syndata.html#value-def-string"><span 11.47 class=value-inst-string><string></span></a></span></code>’</dfn> 11.48 @@ -2933,11 +2932,12 @@ 11.49 lengthen or shorten Arabic segments (e.g. by substituting in swash forms 11.50 or optional ligatures). Because elongation rules depend on the typeface 11.51 style, the UA should rely on on the font whenever possible rather than 11.52 - inserting kashida based on a font-independent ruleset. The UA should limit 11.53 - elongation so that, e.g. in multi-script lines a short stretch of Arabic 11.54 - will not be forced to soak up too much of the extra space by itself. If 11.55 - the UA does not support cursive elongation, then, as with connected 11.56 - scripts, no expansion points exist between characters of these scripts. 11.57 + inserting kashida based on a font-independent style rule. The UA should 11.58 + limit elongation so that, e.g. in multi-script lines a short stretch of 11.59 + Arabic will not be forced to soak up too much of the extra space by 11.60 + itself. If the UA does not support cursive elongation, then, as with 11.61 + connected scripts, no expansion points exist between characters of these 11.62 + scripts. 11.63 11.64 <p>The UA may enable or break optional ligatures or use other font features 11.65 such as alternate glyphs or glyph compression to help justify the text 11.66 @@ -2999,15 +2999,14 @@ 11.67 11.68 <h2 id=spacing><span class=secno>8. </span> Spacing</h2> 11.69 11.70 - <p>The <dfn 11.71 - id=spacing-limit><spacing-limit></dfn> value type, which is to 11.72 - represent an optimum, minimum, and maximum for ‘<a 11.73 + <p>The <dfn id=ltspacing-limitgt><spacing-limit></dfn> value type, 11.74 + which is to represent an optimum, minimum, and maximum for ‘<a 11.75 href="#word-spacing0"><code class=property>word-spacing</code></a>’ and 11.76 ‘<a href="#letter-spacing0"><code 11.77 class=property>letter-spacing</code></a>’, is defined as 11.78 11.79 <pre class=prod><dfn 11.80 - id=spacing-limit><spacing-limit></dfn> = [ normal | <lenh> | <percentage>]{1,3} 11.81 + id=ltspacing-limit><spacing-limit></dfn> = [ normal | <length> | <percentage>]{1,3} 11.82 11.83 </pre> 11.84 11.85 @@ -3035,14 +3034,14 @@ 11.86 href="#connected-scripts">connected</a> or <a 11.87 href="#cursive-scripts">cursive</a> characters is always zero. 11.88 11.89 - <dt><dfn id=lenhgt 11.90 + <dt><dfn id=ltlengthgt 11.91 title="<spacing-limit>:<length>">‘<code 11.92 class=css><length></code>’</dfn> 11.93 11.94 <dd>Specifies extra spacing <em>in addition to</em> the normal spacing. 11.95 Values may be negative, but there may be implementation-dependent limits. 11.96 11.97 - <dt><dfn id=percentage 11.98 + <dt><dfn id=ltpercentagegt 11.99 title="<spacing-limit>:<percentage>">‘<code 11.100 class=css><percentage></code>’</dfn> 11.101 11.102 @@ -4867,7 +4866,7 @@ 11.103 class=css>﹅</code>’, and the open sesame is U+FE46 ‘<code 11.104 class=css>﹆</code>’. 11.105 11.106 - <dt><dfn id=string0 title="text-emphasis:sesame">‘<code 11.107 + <dt><dfn id=ltstringgt0 title="text-emphasis:sesame">‘<code 11.108 class=css><var><string></var></code>’</dfn> 11.109 11.110 <dd>Display the given string as marks. Authors should not specify more 11.111 @@ -5631,8 +5630,8 @@ 11.112 <tr> 11.113 <th>Value: 11.114 11.115 - <td>none | [<a href="#shadow"><var><shadow></var></a>, ] * <a 11.116 - href="#shadow"><var><shadow></var></a> 11.117 + <td>none | [<a href="#ltshadowgt"><var><shadow></var></a>, ] * <a 11.118 + href="#ltshadowgt"><var><shadow></var></a> 11.119 11.120 <tr> 11.121 <th>Initial: 11.122 @@ -5667,7 +5666,7 @@ 11.123 11.124 <p>This property accepts a comma-separated list of shadow effects to be 11.125 applied to the text of the element. <dfn 11.126 - id=shadow><shadow></dfn> is the same as defined for the ‘<code 11.127 + id=ltshadowgt><shadow></dfn> is the same as defined for the ‘<code 11.128 class=property>box-shadow</code>’ property except that the ‘<code 11.129 class=css>inset</code>’ keyword is not allowed. The shadow is applied to 11.130 all of the element's text as well as any text decorations it specifies. 11.131 @@ -6030,10 +6029,10 @@ 11.132 <dt id=CSS3VAL>[CSS3VAL] 11.133 11.134 <dd>Håkon Wium Lie; Tab Atkins; Elika J. Etemad. <a 11.135 - href="http://www.w3.org/TR/2012/CR-css3-values-20120828/"><cite>CSS 11.136 - Values and Units Module Level 3.</cite></a> 28 August 2012. W3C Candidate 11.137 + href="http://www.w3.org/TR/2013/CR-css3-values-20130404/"><cite>CSS 11.138 + Values and Units Module Level 3.</cite></a> 4 April 2013. W3C Candidate 11.139 Recommendation. (Work in progress.) URL: <a 11.140 - href="http://www.w3.org/TR/2012/CR-css3-values-20120828/">http://www.w3.org/TR/2012/CR-css3-values-20120828/</a> 11.141 + href="http://www.w3.org/TR/2013/CR-css3-values-20130404/">http://www.w3.org/TR/2013/CR-css3-values-20130404/</a> 11.142 </dd> 11.143 <!----> 11.144
12.1 --- a/css-text-4/Overview.src.html Sat Jun 08 11:18:20 2013 +0900 12.2 +++ b/css-text-4/Overview.src.html Sat Jun 08 14:19:52 2013 +0900 12.3 @@ -2105,7 +2105,7 @@ 12.4 or shorten Arabic segments (e.g. by substituting in swash forms or 12.5 optional ligatures). Because elongation rules depend on the typeface 12.6 style, the UA should rely on on the font whenever possible rather 12.7 - than inserting kashida based on a font-independent ruleset. The UA 12.8 + than inserting kashida based on a font-independent style rule. The UA 12.9 should limit elongation so that, e.g. in multi-script lines a short 12.10 stretch of Arabic will not be forced to soak up too much of the 12.11 extra space by itself. If the UA does not support cursive elongation,
13.1 --- a/css-text/Overview.html Sat Jun 08 11:18:20 2013 +0900 13.2 +++ b/css-text/Overview.html Sat Jun 08 14:19:52 2013 +0900 13.3 @@ -10,12 +10,11 @@ 13.4 rel=dcterms.rights> 13.5 <meta content="CSS Text Module Level 3 (CSS3 Text)" name=dcterms.title> 13.6 <meta content=text name=dcterms.type> 13.7 - <meta content=2013-05-13 name=dcterms.date> 13.8 + <meta content=2013-06-08 name=dcterms.date> 13.9 <meta content="Elika J. Etemad" name=dcterms.creator> 13.10 <meta content="Koji Ishii" name=dcterms.creator> 13.11 <meta content=W3C name=dcterms.publisher> 13.12 <meta content="http://dev.w3.org/csswg/css3-text/" name=dcterms.identifier> 13.13 - <script src='http://test.csswg.org/harness/annotate.js#CSS3-TEXT_DEV' type='text/javascript' defer></script> 13.14 <link href="#contents" rel=contents><!--<link rel=index href="#index">--> 13.15 13.16 <link href="../default.css" rel=stylesheet type="text/css"> 13.17 @@ -36,6 +35,9 @@ 13.18 </style> 13.19 <link href="http://www.w3.org/StyleSheets/TR/W3C-ED.css" rel=stylesheet 13.20 type="text/css"> 13.21 + <script defer=defer 13.22 + src="http://test.csswg.org/harness/annotate.js#CSS3-TEXT_DEV" 13.23 + type="text/javascript"></script> 13.24 13.25 <body> 13.26 <div class=head> <!--begin-logo--> 13.27 @@ -44,12 +46,12 @@ 13.28 13.29 <h1>CSS Text Module Level 3</h1> 13.30 13.31 - <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 13 May 2013</h2> 13.32 + <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 8 June 2013</h2> 13.33 13.34 <dl> 13.35 <dt>This version:</dt> 13.36 <!-- 13.37 - <dd><a href="http://www.w3.org/TR/2013/WD-css3-text-20130513/">http://www.w3.org/TR/2013/WD-css3-text-20130513/</a></dd> 13.38 + <dd><a href="http://www.w3.org/TR/2013/WD-css3-text-20130608/">http://www.w3.org/TR/2013/WD-css3-text-20130608/</a></dd> 13.39 --> 13.40 13.41 <dd><a 13.42 @@ -2418,7 +2420,7 @@ 13.43 or shorten Arabic segments (e.g. by substituting in swash forms or 13.44 optional ligatures). Because elongation rules depend on the typeface 13.45 style, the UA should rely on on the font whenever possible rather 13.46 - than inserting kashida based on a font-independent ruleset. The UA 13.47 + than inserting kashida based on a font-independent style rule. The UA 13.48 should limit elongation so that, e.g. in multi-script lines a short 13.49 stretch of Arabic will not be forced to soak up too much of the 13.50 extra space by itself. If the UA does not support cursive elongation, 13.51 @@ -2562,14 +2564,14 @@ 13.52 user agent; see <a href="#normal-spacing">below</a>. A ‘<code 13.53 class=css>normal</code>’ optimum spacing value computes to zero. 13.54 13.55 - <dt><dfn id=lenhgt title="word-spacing:<length>">‘<code 13.56 + <dt><dfn id=ltlengthgt title="word-spacing:<length>">‘<code 13.57 class=css><length></code>’</dfn> 13.58 13.59 <dd>Specifies extra spacing <em>in addition to</em> the intrinsic 13.60 inter-word spacing defined by the font. Values may be negative, but there 13.61 may be implementation-dependent limits. 13.62 13.63 - <dt><dfn id=percentage 13.64 + <dt><dfn id=ltpercentagegt 13.65 title="word-spacing:<percentage>">‘<code 13.66 class=css><percentage></code>’</dfn> 13.67 13.68 @@ -2689,7 +2691,7 @@ 13.69 href="#character"><i>characters</i></a> as defined by the current font. 13.70 Typically this is zero. 13.71 13.72 - <dt><dfn id=lenhgt0 title="word-spacing:<length>">‘<code 13.73 + <dt><dfn id=ltlengthgt0 title="word-spacing:<length>">‘<code 13.74 class=css><length></code>’</dfn> 13.75 13.76 <dd>Specifies additional spacing between <a 13.77 @@ -3447,10 +3449,10 @@ 13.78 <dt id=CSS3VAL>[CSS3VAL] 13.79 13.80 <dd>Håkon Wium Lie; Tab Atkins; Elika J. Etemad. <a 13.81 - href="http://www.w3.org/TR/2012/CR-css3-values-20120828/"><cite>CSS 13.82 - Values and Units Module Level 3.</cite></a> 28 August 2012. W3C Candidate 13.83 + href="http://www.w3.org/TR/2013/CR-css3-values-20130404/"><cite>CSS 13.84 + Values and Units Module Level 3.</cite></a> 4 April 2013. W3C Candidate 13.85 Recommendation. (Work in progress.) URL: <a 13.86 - href="http://www.w3.org/TR/2012/CR-css3-values-20120828/">http://www.w3.org/TR/2012/CR-css3-values-20120828/</a> 13.87 + href="http://www.w3.org/TR/2013/CR-css3-values-20130404/">http://www.w3.org/TR/2013/CR-css3-values-20130404/</a> 13.88 </dd> 13.89 <!----> 13.90
14.1 --- a/css-text/Overview.src.html Sat Jun 08 11:18:20 2013 +0900 14.2 +++ b/css-text/Overview.src.html Sat Jun 08 14:19:52 2013 +0900 14.3 @@ -1838,7 +1838,7 @@ 14.4 or shorten Arabic segments (e.g. by substituting in swash forms or 14.5 optional ligatures). Because elongation rules depend on the typeface 14.6 style, the UA should rely on on the font whenever possible rather 14.7 - than inserting kashida based on a font-independent ruleset. The UA 14.8 + than inserting kashida based on a font-independent style rule. The UA 14.9 should limit elongation so that, e.g. in multi-script lines a short 14.10 stretch of Arabic will not be forced to soak up too much of the 14.11 extra space by itself. If the UA does not support cursive elongation,
15.1 --- a/cssom/Overview.html Sat Jun 08 11:18:20 2013 +0900 15.2 +++ b/cssom/Overview.html Sat Jun 08 14:19:52 2013 +0900 15.3 @@ -1824,7 +1824,7 @@ 15.4 <li><p>If <var title="">new rule</var> cannot be inserted into <var title="">list</var> at the zero-index position <var title="">index</var> due to constraints 15.5 specified by CSS, then <a class="external" href="http://dom.spec.whatwg.org/#concept-throw" title="concept-throw">throw</a> 15.6 a <code class="external"><a href="http://dom.spec.whatwg.org/#hierarchyrequesterror">HierarchyRequestError</a></code> exception. <a href="#refsCSS">[CSS]</a></p> 15.7 - <p class="note">For example, a CSS style sheet cannot contain an <code title="">@import</code> at-rule after a rule set.</li> 15.8 + <p class="note">For example, a CSS style sheet cannot contain an <code title="">@import</code> at-rule after a style rule.</li> 15.9 <li><p>If <var title="">new rule</var> is an <code title="">@namespace</code> at-rule, and <var title="">list</var> contains anything other than 15.10 <code title="">@charset</code> at-rules, <code title="">@import</code> at-rules, and <code title="">@namespace</code> at-rules, 15.11 <a class="external" href="http://dom.spec.whatwg.org/#concept-throw" title="concept-throw">throw</a> an <code class="external"><a href="http://dom.spec.whatwg.org/#invalidstateerror">InvalidStateError</a></code> exception. 15.12 @@ -1956,7 +1956,9 @@ 15.13 // 15.14 --> 15.15 15.16 -<p>The <code><a href="#cssstylerule">CSSStyleRule</a></code> interface represents a rule set.</p> 15.17 +<p>The <code><a href="#cssstylerule">CSSStyleRule</a></code> interface represents a style rule.</p> 15.18 + 15.19 +<p class="note">CSS 2.1 calls style rule <a href="http://www.w3.org/TR/CSS21/syndata.html#rule-sets">rule sets</a>.</p> 15.20 15.21 <pre class="idl">interface <dfn id="cssstylerule">CSSStyleRule</dfn> : <a href="#cssrule">CSSRule</a> { 15.22 attribute DOMString <a href="#dom-cssstylerule-selectortext" title="dom-CSSStyleRule-selectorText">selectorText</a>; 15.23 @@ -1972,7 +1974,7 @@ 15.24 <li><p>Otherwise, if the algorithm returns a null value, do nothing.</li> 15.25 </ol> 15.26 15.27 -<p>The <dfn id="dom-cssstylerule-style" title="dom-CSSStyleRule-style"><code>style</code></dfn> attribute must return a <code><a href="#cssstyledeclaration">CSSStyleDeclaration</a></code> object for the rule set.</p> 15.28 +<p>The <dfn id="dom-cssstylerule-style" title="dom-CSSStyleRule-style"><code>style</code></dfn> attribute must return a <code><a href="#cssstyledeclaration">CSSStyleDeclaration</a></code> object for the style rule.</p> 15.29 15.30 15.31 <h4 id="the-csscharsetrule-interface"><span class="secno">6.4.4 </span>The <code title="">CSSCharsetRule</code> Interface</h4>
16.1 --- a/cssom/Overview.src.html Sat Jun 08 11:18:20 2013 +0900 16.2 +++ b/cssom/Overview.src.html Sat Jun 08 14:19:52 2013 +0900 16.3 @@ -1755,7 +1755,7 @@ 16.4 <li><p>If <var title>new rule</var> cannot be inserted into <var title>list</var> at the zero-index position <var title>index</var> due to constraints 16.5 specified by CSS, then <span data-anolis-spec='dom' title='concept-throw'>throw</span> 16.6 a <code data-anolis-spec='dom'>HierarchyRequestError</code> exception. <span data-anolis-ref>CSS</span></p> 16.7 - <p class='note'>For example, a CSS style sheet cannot contain an <code title>@import</code> at-rule after a rule set.</p></li> 16.8 + <p class='note'>For example, a CSS style sheet cannot contain an <code title>@import</code> at-rule after a style rule.</p></li> 16.9 <li><p>If <var title>new rule</var> is an <code title>@namespace</code> at-rule, and <var title>list</var> contains anything other than 16.10 <code title>@charset</code> at-rules, <code title>@import</code> at-rules, and <code title>@namespace</code> at-rules, 16.11 <span data-anolis-spec='dom' title='concept-throw'>throw</span> an <code data-anolis-spec=dom>InvalidStateError</code> exception. 16.12 @@ -1887,7 +1887,9 @@ 16.13 // 16.14 --> 16.15 16.16 -<p>The <code>CSSStyleRule</code> interface represents a rule set.</p> 16.17 +<p>The <code>CSSStyleRule</code> interface represents a style rule.</p> 16.18 + 16.19 +<p class=note>CSS 2.1 calls style rule <a href="http://www.w3.org/TR/CSS21/syndata.html#rule-sets">rule sets</a>.</p> 16.20 16.21 <pre class=idl>interface <dfn>CSSStyleRule</dfn> : <span>CSSRule</span> { 16.22 attribute DOMString <span title=dom-CSSStyleRule-selectorText>selectorText</span>; 16.23 @@ -1903,7 +1905,7 @@ 16.24 <li><p>Otherwise, if the algorithm returns a null value, do nothing.</p></li> 16.25 </ol> 16.26 16.27 -<p>The <dfn title=dom-CSSStyleRule-style><code>style</code></dfn> attribute must return a <code>CSSStyleDeclaration</code> object for the rule set.</p> 16.28 +<p>The <dfn title=dom-CSSStyleRule-style><code>style</code></dfn> attribute must return a <code>CSSStyleDeclaration</code> object for the style rule.</p> 16.29 16.30 16.31 <h4>The <code title>CSSCharsetRule</code> Interface</h4>
