Skip to content

Commit 12cd269

Browse files
committed
Use qname instead of wqname for attr(). <http://www.w3.org/mid/507D558E.9090702@kozea.fr>
1 parent aa52047 commit 12cd269

2 files changed

Lines changed: 10 additions & 37 deletions

File tree

css3-values/Overview.html

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,7 +1439,7 @@ <h4 id=calc-syntax><span class=secno>8.1.1. </span> Syntax</h4>
14391439
calc : "calc(" S* sum S* ")";
14401440
sum : product [ S+ [ "+" | "-" ] S+ product ]*;
14411441
product : unit [ S* [ "*" S* unit | "/" S* NUMBER ] ]*;
1442-
attr : "attr(" S* wqname [ S+ type-keyword ]? S* [ "," [ unit | calc ] S* ]? ")";
1442+
attr : "attr(" S* qname [ S+ type-keyword ]? S* [ "," [ unit | calc ] S* ]? ")";
14431443
unit : [ NUMBER | DIMENSION | PERCENTAGE | "(" S* sum S* ")" | calc | attr ];</pre>
14441444

14451445
<p class=note>Note that the grammar requires spaces around binary ‘<code
@@ -1711,7 +1711,7 @@ <h3 id=attr-notation><span class=secno>8.3. </span> Attribute References:
17111711

17121712
<p> where &lt;attr-name> is a <a
17131713
href="http://dev.w3.org/csswg/css3-namespace/#css-qnames">CSS qualified
1714-
name</a> (the wqname production in <a href="#CSS3NAMESPACE"
1714+
name</a> (the qname production in <a href="#CSS3NAMESPACE"
17151715
rel=biblioentry>[CSS3NAMESPACE]<!--{{!CSS3NAMESPACE}}--></a>) that
17161716
represents an attribute name. (In the absence of namespacing, this will
17171717
just be a CSS identifier.)
@@ -2245,33 +2245,14 @@ <h3 class=no-num id=cr-exit-criteria> CR exit criteria</h3>
22452245
<h2 class=no-num id=changes>Changes</h2>
22462246

22472247
<p>Changes since the <a
2248-
href="http://www.w3.org/TR/2012/WD-css3-values-20120308/">8 March 2012
2249-
Last Call Working Draft</a> include many clarifications as well as the
2250-
following:
2248+
href="http://www.w3.org/TR/2012/CR-css3-values-20120828/">28 August
2249+
Candidate Recommendation</a> are:
22512250

22522251
<ul>
2253-
<li>Renamed ‘<code class=css>cycle()</code>’ to ‘<a
2254-
href="#toggle"><code class=css>toggle()</code></a>’.
2255-
2256-
<li><a href="#calc"><code class=css>calc()</code></a>’ can now accept
2257-
and return <a href="#integer-value"><var>&lt;integer></var></a> types.
2258-
2259-
<li><a href="#calc"><code class=css>calc()</code></a>’ may now be
2260-
nested (to simplify handling of macros and variables).
2261-
2262-
<li>Tightened up the handling of fallback values in ‘<a
2263-
href="#attr"><code class=css>attr()</code></a>’.
2264-
2265-
<li>Clarified parsing rules used in ‘<a href="#attr"><code
2266-
class=css>attr()</code></a>’.
2267-
2268-
<li>Added ‘<a href="#vmax-unit"><code class=css>vmax</code></a>’ unit.
2252+
<li>Corrected <code>wqname</code> in the ‘<a href="#attr"><code
2253+
class=css>attr()</code></a>’ syntax to <code>qname</code>
22692254
</ul>
22702255

2271-
<p>A <a
2272-
href="http://dev.w3.org/csswg/css3-values/issues-lc-2012">disposition of
2273-
last-call comments</a> is available.
2274-
22752256
<h2 class=no-num id=references>References</h2>
22762257

22772258
<h3 class=no-num id=normative-references>Normative references</h3>

css3-values/Overview.src.html

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ <h4 id='calc-syntax'>
985985
calc : "calc(" S* sum S* ")";
986986
sum : product [ S+ [ "+" | "-" ] S+ product ]*;
987987
product : unit [ S* [ "*" S* unit | "/" S* NUMBER ] ]*;
988-
attr : "attr(" S* wqname [ S+ type-keyword ]? S* [ "," [ unit | calc ] S* ]? ")";
988+
attr : "attr(" S* qname [ S+ type-keyword ]? S* [ "," [ unit | calc ] S* ]? ")";
989989
unit : [ NUMBER | DIMENSION | PERCENTAGE | "(" S* sum S* ")" | calc | attr ];</pre>
990990

991991
<p class='note'>Note that the grammar requires spaces around binary ''+''
@@ -1241,7 +1241,7 @@ <h3 id="attr-notation">
12411241

12421242
<p>
12431243
where &lt;attr-name> is a <a href="http://dev.w3.org/csswg/css3-namespace/#css-qnames">CSS qualified name</a>
1244-
(the wqname production in [[!CSS3NAMESPACE]])
1244+
(the qname production in [[!CSS3NAMESPACE]])
12451245
that represents an attribute name.
12461246
(In the absence of namespacing, this will just be a CSS identifier.)
12471247

@@ -1738,19 +1738,11 @@ <h3 class="no-num" id="cr-exit-criteria">
17381738

17391739
<h2 class="no-num" id="changes">Changes</h2>
17401740

1741-
<p>Changes since the <a href="http://www.w3.org/TR/2012/WD-css3-values-20120308/">8 March 2012 Last Call Working Draft</a> include
1742-
many clarifications as well as the following:
1741+
<p>Changes since the <a href="http://www.w3.org/TR/2012/CR-css3-values-20120828/">28 August Candidate Recommendation</a> are:
17431742

17441743
<ul>
1745-
<li>Renamed ''cycle()'' to ''toggle()''.
1746-
<li>''calc()'' can now accept and return <var>&lt;integer></var> types.
1747-
<li>''calc()'' may now be nested (to simplify handling of macros and variables).
1748-
<li>Tightened up the handling of fallback values in ''attr()''.
1749-
<li>Clarified parsing rules used in ''attr()''.
1750-
<li>Added ''vmax'' unit.
1744+
<li>Corrected <code>wqname</code> in the ''attr()'' syntax to <code>qname</code>
17511745
</ul>
1752-
1753-
<p>A <a href="http://dev.w3.org/csswg/css3-values/issues-lc-2012">disposition of last-call comments</a> is available.
17541746

17551747
<h2 class="no-num" id="references">References</h2>
17561748

0 commit comments

Comments
 (0)