[css-cascade] Squash gratuitous editorial / markup differences between L3 & L4.

Author: fantasai

css-cascade-3/Overview.bs

@@ -18,6 +18,7 @@ Previous Version: https://www.w3.org/TR/2005/WD-css3-cascade-20051215/
 Issue Tracking: Disposition of Comments https://drafts.csswg.org/css-cascade/issues
 Abstract: This CSS module describes how to collate style rules and assign values to all properties on all elements. By way of cascading and inheritance, values are propagated for all properties on all elements.
 Ignored Terms: auto, flex items
+Include Can I Use Panels: yes
 </pre>
 
 <pre class=link-defaults>
@@ -115,17 +116,15 @@ Importing Style Sheets: the ''@import'' rule</h2>
 		</pre>
 	</div>
 
+<h3 id=conditional-import>
+Conditional ''@import'' Rules</h3>
+
 	The <a>import conditions</a> allow the import to be media-dependent.
 	In the absence of any <a>import conditions</a>, the import is unconditional.
 	(Specifying ''@media/all'' for the <<media-query-list>> has the same effect.)
-
-	The evaluation and full syntax of the expressions after the URL
-	is defined by the <a href="https://www.w3.org/TR/css3-mediaqueries/">Media Queries</a> specification [[!MEDIAQ]].
-	If the media query does not match,
+	If the <a>import conditions</a> do not match,
 	the rules in the imported stylesheet do not apply,
 	exactly as if the imported stylesheet were wrapped in an ''@media'' block with the given media query.
-	User agents may therefore avoid fetching a media-dependent import
-	as long as the media query does not match.
 
 	<div class=example>
 		The following rules illustrate how ''@import'' rules can be made media-dependent:
@@ -137,6 +136,12 @@ Importing Style Sheets: the ''@import'' rule</h2>
 		</pre>
 	</div>
 
+	User agents may therefore avoid fetching a media-dependent import
+	as long as the media query does not match.
+
+	The evaluation and full syntax of the <a>import conditions</a>
+	is defined by the <a href="https://www.w3.org/TR/css3-mediaqueries/">Media Queries</a> specification [[!MEDIAQ]].
+
 	When the same style sheet is imported or linked to a document in multiple places,
 	user agents must process (or act as though they do) each link
 	as though the link were to an independent style sheet.
@@ -246,7 +251,7 @@ Shorthand Properties</h2>
 	is equivalent to declaring all of its <a>sub-properties</a> to be ''!important''.
 
 
-<h3 id="all-shorthand">
+<h3 id="all-shorthand" caniuse="css-all">
 Resetting All Properties: the 'all' property</h3>
 
 	<pre class="propdef shorthand">
@@ -702,7 +707,7 @@ Cascading</h2>
 <h3 id='cascading-origins'>
 Cascading Origins</h3>
 
-	Each style rule has a <dfn id=origin local-lt=origin export>cascade origin</dfn>,
+	Each style rule has a <dfn id=origin export local-lt=origin>cascade origin</dfn>,
 	which determines where it enters the cascade.
 	CSS defines three core <a>origins</a>:
 
@@ -900,18 +905,19 @@ Explicit Defaulting</h3>
 <h4 id="initial">
 Resetting a Property: the ''initial'' keyword</h4>
 
-	If the <a>cascaded value</a> is the <dfn for=all>''initial''</dfn> keyword,
+	If the <a>cascaded value</a> of a property is the <dfn for=all caniuse="css-initial-value">''initial''</dfn> keyword,
 	the property's <a>specified value</a> is its <a>initial value</a>.
 
 <h4 id="inherit">
 Explicit Inheritance: the ''inherit'' keyword</h4>
 
 	If the <a>cascaded value</a> of a property is the <dfn for=all>''inherit''</dfn> keyword,
 	the property's <a lt="specified value">specified</a> and <a>computed values</a> are the <a>inherited value</a>.
+
 <h4 id="inherit-initial">
 Erasing All Declarations: the ''unset'' keyword</h4>
 
-	If the <a>cascaded value</a> of a property is the <dfn for=all>''unset''</dfn> keyword,
+	If the <a>cascaded value</a> of a property is the <dfn for=all caniuse="css-unset-value">''unset''</dfn> keyword,
 	then if it is an inherited property, this is treated as ''inherit'',
 	and if it is not, this is treated as ''initial''.
 	This keyword effectively erases all <a>declared values</a> occurring earlier in the <a>cascade</a>,
@@ -1033,7 +1039,7 @@ Additions Since Level 2</h3>
 		<li>Incorporation of animations and transitions into the <a>cascade</a>.
 	</ul>
 
-<h2 class="no-num" id="acknowledgments">Acknowledgments</h2>
+<h2 class=no-num id="acknowledgments">Acknowledgments</h2>
 
 	David Baron, Simon Sapin, and Boris Zbarsky contributed to this specification.
 

css-cascade-4/Overview.bs

@@ -27,7 +27,6 @@ Include Can I Use Panels: yes
 spec:css-values; type:value; text:ex
 </pre>
 
-
 <h2 id="intro">
 Introduction</h2>
 
@@ -65,6 +64,16 @@ Module Interactions</h3>
 	since they cannot be targetted by selectors
 	all of their computed values are assigned by <a href="#defaulting">defaulting</a>.
 
+<!--
+ ███████  ████ ██     ██ ████████   ███████  ████████  ████████
+██     ██  ██  ███   ███ ██     ██ ██     ██ ██     ██    ██
+██ ███ ██  ██  ████ ████ ██     ██ ██     ██ ██     ██    ██
+██ ███ ██  ██  ██ ███ ██ ████████  ██     ██ ████████     ██
+██ █████   ██  ██     ██ ██        ██     ██ ██   ██      ██
+██         ██  ██     ██ ██        ██     ██ ██    ██     ██
+ ███████  ████ ██     ██ ██         ███████  ██     ██    ██
+-->
+
 <h2 id="at-import">
 Importing Style Sheets: the ''@import'' rule</h2>
 
@@ -220,6 +229,16 @@ Content-Type of CSS Style Sheets</h3>
 	Otherwise, it must be interpreted as a network error.
 
 
+<!--
+ ██████  ██     ██  ███████  ████████  ████████ ██     ██    ███    ██    ██ ████████
+██    ██ ██     ██ ██     ██ ██     ██    ██    ██     ██   ██ ██   ███   ██ ██     ██
+██       ██     ██ ██     ██ ██     ██    ██    ██     ██  ██   ██  ████  ██ ██     ██
+ ██████  █████████ ██     ██ ████████     ██    █████████ ██     ██ ██ ██ ██ ██     ██
+      ██ ██     ██ ██     ██ ██   ██      ██    ██     ██ █████████ ██  ████ ██     ██
+██    ██ ██     ██ ██     ██ ██    ██     ██    ██     ██ ██     ██ ██   ███ ██     ██
+ ██████  ██     ██  ███████  ██     ██    ██    ██     ██ ██     ██ ██    ██ ████████
+-->
+
 <h2 id='shorthand'>
 Shorthand Properties</h2>
 
@@ -379,6 +398,17 @@ Resetting All Properties: the 'all' property</h3>
 		will also be blown away.
 	</div>
 
+
+<!--
+ ██████  ████████    ███     ██████   ████████  ██████
+██    ██    ██      ██ ██   ██    ██  ██       ██    ██
+██          ██     ██   ██  ██        ██       ██
+ ██████     ██    ██     ██ ██   ████ ██████    ██████
+      ██    ██    █████████ ██    ██  ██             ██
+██    ██    ██    ██     ██ ██    ██  ██       ██    ██
+ ██████     ██    ██     ██  ██████   ████████  ██████
+-->
+
 <h2 id="value-stages">
 Value Processing</h2>
 
@@ -672,6 +702,15 @@ Examples</h3>
 	</table>
 
 
+<!--
+████████ ████ ██       ████████ ████████ ████████  ████ ██    ██  ██████
+██        ██  ██          ██    ██       ██     ██  ██  ███   ██ ██    ██
+██        ██  ██          ██    ██       ██     ██  ██  ████  ██ ██
+██████    ██  ██          ██    ██████   ████████   ██  ██ ██ ██ ██   ████
+██        ██  ██          ██    ██       ██   ██    ██  ██  ████ ██    ██
+██        ██  ██          ██    ██       ██    ██   ██  ██   ███ ██    ██
+██       ████ ████████    ██    ████████ ██     ██ ████ ██    ██  ██████
+-->
 
 <h2 id='filtering'>
 Filtering</h2>
@@ -705,6 +744,16 @@ Filtering</h2>
 	prioritizes these lists.
 
 
+<!--
+ ██████     ███     ██████   ██████     ███    ████████  ████████
+██    ██   ██ ██   ██    ██ ██    ██   ██ ██   ██     ██ ██
+██        ██   ██  ██       ██        ██   ██  ██     ██ ██
+██       ██     ██  ██████  ██       ██     ██ ██     ██ ██████
+██       █████████       ██ ██       █████████ ██     ██ ██
+██    ██ ██     ██ ██    ██ ██    ██ ██     ██ ██     ██ ██
+ ██████  ██     ██  ██████   ██████  ██     ██ ████████  ████████
+-->
+
 <h2 id='cascading'>
 Cascading</h2>
 
@@ -799,7 +848,7 @@ Cascading</h2>
 <h3 id='cascading-origins'>
 Cascading Origins</h3>
 
-	Each style rule has a <dfn id="origin" export local-lt="origin">cascade origin</dfn>,
+	Each style rule has a <dfn id=origin export local-lt="origin">cascade origin</dfn>,
 	which determines where it enters the cascade.
 	CSS defines three core <a>origins</a>:
 
@@ -934,6 +983,16 @@ Precedence of Non-CSS Presentational Hints</h3>
 	Host languages should choose the appropriate level for presentational hints with these considerations in mind.
 
 
+<!--
+████████  ████████ ████████    ███    ██     ██ ██       ████████
+██     ██ ██       ██         ██ ██   ██     ██ ██          ██
+██     ██ ██       ██        ██   ██  ██     ██ ██          ██
+██     ██ ██████   ██████   ██     ██ ██     ██ ██          ██
+██     ██ ██       ██       █████████ ██     ██ ██          ██
+██     ██ ██       ██       ██     ██ ██     ██ ██          ██
+████████  ████████ ██       ██     ██  ███████  ████████    ██
+-->
+
 <h2 id="defaulting">
 Defaulting</h2>
 
@@ -1029,6 +1088,17 @@ Rolling Back The Cascade: the ''revert'' keyword</h4>
 			For the purpose of ''revert'', this origin includes the Animation <a>origin</a>.
 	</dl>
 
+
+<!--
+████████ ████████  ██████
+██          ██    ██    ██
+██          ██    ██
+██████      ██    ██
+██          ██    ██
+██          ██    ██    ██
+████████    ██     ██████
+-->
+
 <h2 id="changes">
 Changes</h2>
 
@@ -1151,7 +1221,7 @@ Additions Since Level 2</h3>
 
 	David Baron, Tantek Çelik, Simon Sapin, and Boris Zbarsky contributed to this specification.
 
-<h2 id=priv-sec>
+<h2 class=no-num id=priv-sec>
 Privacy and Security Considerations</h2>
 
 	* The cascade process does not distinguish between same-origin and cross-origin stylesheets,