[css-syntax] Preprocessor fixes.

Author: tabatkins

css-syntax/Overview.html

@@ -12,7 +12,7 @@
 </a></p>
   <h1 class="p-name no-ref" id=title>CSS Syntax Module Level 3</h1>
   <h2 class="no-num no-toc no-ref" id=subtitle><span class=content>Editor's Draft,
-    <span class=dt-updated><span class=value-title title=20130812>12 August 2013</span></span></span></h2>
+    <span class=dt-updated><span class=value-title title=20130813>13 August 2013</span></span></span></h2>
   <div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/css-syntax>http://dev.w3.org/csswg/css-syntax</a><dt>Editor's Draft:<dd><a href=http://dev.w3.org/csswg/css-syntax>http://dev.w3.org/csswg/css-syntax</a>
 <dt>Feedback:</dt>
     <dd><a href="mailto:www-style@w3.org?subject=%5Bcss-syntax%5D%20feedback">www-style@w3.org</a>
@@ -116,7 +116,7 @@ <h2 class="no-num no-toc no-ref" id=contents><span class=content>Table of conten
 Informal Syntax Description</a><li><a href=#the-anb-type><span class=secno>6.2</span>
 The <code>&lt;an+b&gt;</code> type</a></ul><li><a href=#rule-defs><span class=secno>7</span>
 Defining Grammars for Rules and Other Values</a><ul class=toc><li><a href=#declaration-rule-list><span class=secno>7.1</span>
-Defining Block Contents: the <span class=production data-link-type=type><var>&lt;declaration-list&gt;</var></span>, <span class=production data-link-type=type><var>&lt;rule-list&gt;</var></span>, and <span class=production data-link-type=type><var>&lt;stylesheet&gt;</var></span> productions</a></ul><li><a href=#css-stylesheets><span class=secno>8</span>
+Defining Block Contents: the <span class=production data-link-type=type>&lt;declaration-list&gt;</span>, <span class=production data-link-type=type>&lt;rule-list&gt;</span>, and <span class=production data-link-type=type>&lt;stylesheet&gt;</span> productions</a></ul><li><a href=#css-stylesheets><span class=secno>8</span>
 CSS stylesheets</a><ul class=toc><li><a href=#style-rules><span class=secno>8.1</span>
 Style rules</a><li><a href=#the-charset-rule><span class=secno>8.2</span>
 The <span class=css data-link-type=maybe>@charset</span> Rule</a></ul><li><a href=#serialization><span class=secno>9</span>
@@ -193,8 +193,8 @@ <h2 data-level=2 id=syntax-description><span class=secno>2 </span><span class=co
 
 <p>		"<code>color: blue;</code>" is a declaration specifying that,
 		for the elements that match the selector,
-		their <a class=property data-link-type=propdesc href=http://www.w3.org/TR/CSS21/colors.html#propdef-color title=color>color</a> property should have the value <span class=css data-link-type=maybe>blue</span>.
-		Similiarly, their <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-text-4/#text-decoration0 title=text-decoration>text-decoration</a> property should have the value <span class=css data-link-type=maybe>underline</span>.
+		their <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-color-3/#color0 title=color>color</a> property should have the value <span class=css data-link-type=maybe>blue</span>.
+		Similiarly, their <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-text-decor-3/#text-decoration title=text-decoration>text-decoration</a> property should have the value <span class=css data-link-type=maybe>underline</span>.
 	</div>
 
 <p>	At-rules are all different, but they have a basic structure in common.
@@ -1914,7 +1914,7 @@ <h3 data-level=5.3 id=parser-entry-points><span class=secno>5.3 </span><span cla
 
 			<li>
 				"<a href=#parse-a-component-value0>Parse a component value</a>" is for things that need to consume a single value,
-				like the parsing rules for <span class=css data-link-type=maybe>attr()</span>.
+				like the parsing rules for <a class=css data-link-type=maybe href=http://dev.w3.org/csswg/css-values-3/#attr>attr()</a>.
 
 			<li>
 				"<a href=#parse-a-list-of-component-values0>Parse a list of component values</a>" is for the contents of presentational attributes,
@@ -2642,7 +2642,7 @@ <h2 data-level=7 id=rule-defs><span class=secno>7 </span><span class=content>
 	<div class=example>
 		For example, the syntax of the <span class=css data-link-type=maybe>translateX()</span> function is:
 
-<pre>translateX( <a class=production data-link-type=type><var>&lt;translation-value&gt;</var></a> )</pre>
+<pre>translateX( <a class=production data-link-type=type>&lt;translation-value&gt;</a> )</pre>
 <p>		However, the stylesheet may end with the function unclosed, like:
 
 <pre>.foo { transform: translate(50px</pre>
@@ -2656,7 +2656,7 @@ <h2 data-level=7 id=rule-defs><span class=secno>7 </span><span class=content>
 	</div>
 
 <h3 data-level=7.1 id=declaration-rule-list><span class=secno>7.1 </span><span class=content>
-Defining Block Contents: the <a class=production data-link-type=type href=#typedef-declaration-list><var>&lt;declaration-list&gt;</var></a>, <a class=production data-link-type=type href=#typedef-rule-list><var>&lt;rule-list&gt;</var></a>, and <a class=production data-link-type=type href=#typedef-stylesheet><var>&lt;stylesheet&gt;</var></a> productions</span><a class=section-link href=#declaration-rule-list>§</a></h3>
+Defining Block Contents: the <a class=production data-link-type=type href=#typedef-declaration-list>&lt;declaration-list&gt;</a>, <a class=production data-link-type=type href=#typedef-rule-list>&lt;rule-list&gt;</a>, and <a class=production data-link-type=type href=#typedef-stylesheet>&lt;stylesheet&gt;</a> productions</span><a class=section-link href=#declaration-rule-list>§</a></h3>
 
 <p>	The CSS parser is agnostic as to the contents of blocks,
 	such as those that come at the end of some at-rules.
@@ -2672,7 +2672,7 @@ <h3 data-level=7.1 id=declaration-rule-list><span class=secno>7.1 </span><span c
 	It represents that the contents of the block must be parsed using the <a href=#consume-a-list-of-rules0>consume a list of rules</a> algorithm.
 
 <p>	Finally, the <dfn data-dfn-type=type id=typedef-stylesheet>&lt;stylesheet&gt;</dfn> production represents a list of rules.
-	It is identical to <a class=production data-link-type=type href=#typedef-rule-list><var>&lt;rule-list&gt;</var></a>,
+	It is identical to <a class=production data-link-type=type href=#typedef-rule-list>&lt;rule-list&gt;</a>,
 	except that blocks using it default to accepting all rules
 	that aren't otherwise limited to a particular context.
 
@@ -2681,24 +2681,24 @@ <h3 data-level=7.1 id=declaration-rule-list><span class=secno>7.1 </span><span c
 		and to contain a list of declarations.
 		This is expressed with the following grammar:
 
-<pre>@font-face { <a class=production data-link-type=type href=#typedef-declaration-list><var>&lt;declaration-list&gt;</var></a> }</pre>
+<pre>@font-face { <a class=production data-link-type=type href=#typedef-declaration-list>&lt;declaration-list&gt;</a> }</pre>
 <p>		This is a complete and sufficient definition of the rule's grammar.
 
 <p>		For another example,
 		<span class=css data-link-type=maybe>@keyframes</span> rules are more complex,
 		interpreting their prelude as a name and containing keyframes rules in their block
 		Their grammar is:
 
-<pre>@keyframes <a class=production data-link-type=type><var>&lt;keyframes-name&gt;</var></a> { <a class=production data-link-type=type href=#typedef-rule-list><var>&lt;rule-list&gt;</var></a> }</pre>	</div>
+<pre>@keyframes <a class=production data-link-type=type>&lt;keyframes-name&gt;</a> { <a class=production data-link-type=type href=#typedef-rule-list>&lt;rule-list&gt;</a> }</pre>	</div>
 
-<p>	For rules that use <a class=production data-link-type=type href=#typedef-declaration-list><var>&lt;declaration-list&gt;</var></a>,
+<p>	For rules that use <a class=production data-link-type=type href=#typedef-declaration-list>&lt;declaration-list&gt;</a>,
 	the spec for the rule must define which properties, descriptors, and/or at-rules are valid inside the rule;
 	this may be as simple as saying "The @foo rule accepts the properties/descriptors defined in this specification/section.",
 	and extension specs may simply say "The @foo rule additionally accepts the following properties/descriptors.".
 	Any declarations or at-rules found inside the block that are not defined as valid
 	must be removed from the rule's value.
 
-<p>	Within a <a class=production data-link-type=type href=#typedef-declaration-list><var>&lt;declaration-list&gt;</var></a>,
+<p>	Within a <a class=production data-link-type=type href=#typedef-declaration-list>&lt;declaration-list&gt;</a>,
 	<code>!important</code> is automatically invalid on any descriptors.
 	If the rule accepts properties,
 	the spec for the rule must define whether the properties interact with the cascade,
@@ -2713,25 +2713,25 @@ <h3 data-level=7.1 id=declaration-rule-list><span class=secno>7.1 </span><span c
 		define that the allowed declarations are the descriptors defined in the Fonts spec.
 	</div>
 
-<p>	For rules that use <a class=production data-link-type=type href=#typedef-rule-list><var>&lt;rule-list&gt;</var></a>,
+<p>	For rules that use <a class=production data-link-type=type href=#typedef-rule-list>&lt;rule-list&gt;</a>,
 	the spec for the rule must define what types of rules are valid inside the rule,
-	same as <a class=production data-link-type=type href=#typedef-declaration-list><var>&lt;declaration-list&gt;</var></a>,
+	same as <a class=production data-link-type=type href=#typedef-declaration-list>&lt;declaration-list&gt;</a>,
 	and unrecognized rules must similarly be removed from the rule's value.
 
 	<div class=example>
 		For example, the grammar for <span class=css data-link-type=maybe>@keyframes</span> in the previous example must,
 		in addition to what is written there,
-		define that the only allowed rules are <a class=production data-link-type=type><var>&lt;keyframe-rule&gt;</var></a>s,
+		define that the only allowed rules are <a class=production data-link-type=type>&lt;keyframe-rule&gt;</a>s,
 		which are defined as:
 
-<pre><a class=production data-link-type=type><var>&lt;keyframe-rule&gt;</var></a> = <a class=production data-link-type=type><var>&lt;keyframe-selector&gt;</var></a> { <a class=production data-link-type=type href=#typedef-declaration-list><var>&lt;declaration-list&gt;</var></a> }</pre>
+<pre><a class=production data-link-type=type>&lt;keyframe-rule&gt;</a> = <a class=production data-link-type=type>&lt;keyframe-selector&gt;</a> { <a class=production data-link-type=type href=#typedef-declaration-list>&lt;declaration-list&gt;</a> }</pre>
 <p>		Keyframe rules, then,
 		must further define that they accept as declarations all animatable CSS properties,
 		plus the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-animations-1/#animation-timing-function title=animation-timing-function>animation-timing-function</a> property,
 		but that they do not interact with the cascade.
 	</div>
 
-<p>	For rules that use <a class=production data-link-type=type href=#typedef-stylesheet><var>&lt;stylesheet&gt;</var></a>,
+<p>	For rules that use <a class=production data-link-type=type href=#typedef-stylesheet>&lt;stylesheet&gt;</a>,
 	all rules are allowed by default,
 	but the spec for the rule may define what types of rules are <em>invalid</em> inside the rule.
 
@@ -2740,8 +2740,8 @@ <h3 data-level=7.1 id=declaration-rule-list><span class=secno>7.1 </span><span c
 		except more <span class=css data-link-type=maybe>@media</span> rules.
 		As such, its grammar is:
 
-<pre>@media <a class=production data-link-type=type><var>&lt;media-query-list&gt;</var></a> { <a class=production data-link-type=type href=#typedef-stylesheet><var>&lt;stylesheet&gt;</var></a> }</pre>
-<p>		It additionally defines a restriction that the <a class=production data-link-type=type href=#typedef-stylesheet><var>&lt;stylesheet&gt;</var></a> can not contain <span class=css data-link-type=maybe>@media</span> rules,
+<pre>@media <a class=production data-link-type=type>&lt;media-query-list&gt;</a> { <a class=production data-link-type=type href=#typedef-stylesheet>&lt;stylesheet&gt;</a> }</pre>
+<p>		It additionally defines a restriction that the <a class=production data-link-type=type href=#typedef-stylesheet>&lt;stylesheet&gt;</a> can not contain <span class=css data-link-type=maybe>@media</span> rules,
 		which causes them to be dropped from the outer rule's value if they appear.
 	</div>
 
@@ -2784,9 +2784,6 @@ <h3 data-level=8.1 id=style-rules><span class=secno>8.1 </span><span class=conte
 	The validity of the style rule’s contents have no effect on the validity of the style rule itself.
 	Unless otherwise specified, property names are <a href=#ascii-case-insensitive>ASCII case-insensitive</a>.
 
-<p>	If a <a href=#style-rule>style rule</a> contains multiple declarations with the same name,
-	all but the last such declaration are discarded.
-
 <p class=note>	Note: The names of Custom Properties <a data-biblio-type=informative data-link-type=biblio href=#css-variables title=CSS-VARIABLES>[CSS-VARIABLES]</a> are case-sensitive.
 
 <p>	<a href=#qualified-rule>Qualified rules</a> at the top-level of a CSS stylesheet are style rules.
@@ -2803,12 +2800,12 @@ <h3 data-level=8.2 id=the-charset-rule><span class=secno>8.2 </span><span class=
 <p>	The <dfn data-dfn-type=at-rule id=at-ruledef-charset><a class=css data-link-type=maybe href=#at-ruledef-charset>@charset</a></dfn> rule is a very special <a href=#at-rule>at-rule</a> associated with determining the character encoding of the stylesheet.
 	In general, its grammar is:
 
-<pre class=prod><dfn data-dfn-type=type id=typedef-at-charset-rule>&lt;at-charset-rule&gt;</dfn> = @charset <a class=production data-link-type=type><var>&lt;string&gt;</var></a>;</pre>
+<pre class=prod><dfn data-dfn-type=type id=typedef-at-charset-rule>&lt;at-charset-rule&gt;</dfn> = @charset <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#string-value>&lt;string&gt;</a>;</pre>
 <p>	Additionally, an <a class=css data-link-type=maybe href=#at-ruledef-charset>@charset</a> rule is invalid if it is not at the top-level of a stylesheet,
 	or if it is not the very first rule of a stylesheet.
 
 <p>	<a class=css data-link-type=maybe href=#at-ruledef-charset>@charset</a> rules have an <dfn data-dfn-type=dfn id=encoding>encoding</dfn>,
-	given by the value of the <a class=production data-link-type=type><var>&lt;string&gt;</var></a>.
+	given by the value of the <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#string-value>&lt;string&gt;</a>.
 
 <p>	The <a class=css data-link-type=maybe href=#at-ruledef-charset>@charset</a> rule has <strong>no effect on a stylesheet</strong>.
 

css-syntax/Overview.src.html

@@ -9,7 +9,7 @@ <h1>CSS Syntax Module Level 3</h1>
 Editor: Simon Sapin, Mozilla, http://exyr.org/about/
 Abstract: This module describes, in general terms, the basic structure and syntax of CSS stylesheets. It defines, in detail, the syntax and parsing of CSS - how to turn a stream of bytes into a meaningful stylesheet.
 Ignored Properties: color, animation-timing-function, text-decoration
-Ignored Terms: <keyframes-name>, <keyframe-rule>, <keyframe-selector>, <translation-value>, <media-query-list>, <string>
+Ignored Terms: <keyframes-name>, <keyframe-rule>, <keyframe-selector>, <translation-value>, <media-query-list>
 </pre>
 
 <link href="railroad-diagrams.css" rel="stylesheet" type="text/css">
@@ -2671,9 +2671,6 @@ <h3>
 	The validity of the style rule’s contents have no effect on the validity of the style rule itself.
 	Unless otherwise specified, property names are <i>ASCII case-insensitive</i>.
 
-	If a <i>style rule</i> contains multiple declarations with the same name,
-	all but the last such declaration are discarded.
-
 	Note: The names of Custom Properties [[CSS-VARIABLES]] are case-sensitive.
 
 	<i>Qualified rules</i> at the top-level of a CSS stylesheet are style rules.