[css-values-5] Be consistent about brackets w3c#10457

Author: fantasai

css-values-5/Overview.bs

@@ -81,11 +81,11 @@ Value Definition Syntax</h2>
 
 	<ol>
 		<li value=5>Boolean combinations of a conditional notation.
-			These are written using the <<boolean [ &lt;test&gt; ]>> notation,
+			These are written using the <<boolean[]>> notation,
 			and represent recursive expressions of boolean logic
 			using keywords and parentheses,
-			applied to the type specified in brackets,
-			e.g. <<boolean [ ( &lt;media-feature&gt; ) ]>> to express [=media queries=].
+			applied to the grammar specified in brackets,
+			e.g. <<boolean[ ( &lt;media-feature&gt; ) ]>> to express [=media queries=].
 	</ol>
 
 <h3 id=component-functions>
@@ -213,34 +213,34 @@ Commas in Function Arguments</h4>
 	but it <em>should</em> be avoided unless necessary.
 
 <h3 id=boolean>
-Boolean Expression Multiplier <<boolean>></h3>
+Boolean Expression Multiplier <<boolean[]>></h3>
 
 	Several contexts
 	(such as ''@media'', ''@supports'', ''if()'', ...)
 	specify conditions,
 	and allow combining those conditions with boolean logic (and/or/not/grouping).
 	Because they use the same non-trivial recursive syntax structure,
-	the special <dfn><<boolean>></dfn> production represents this pattern generically.
+	the special <dfn><<boolean[]>></dfn> production represents this pattern generically.
 
-	The <<boolean>> notation wraps another value type in the square brackets within it,
-	e.g. &lt;boolean [ &lt;test&gt; ]&gt;,
+	The <<boolean[]>> notation wraps another value type in the square brackets within it,
+	e.g. &lt;boolean[ &lt;test&gt; ]&gt;,
 	and represents that value alone as well as
 	boolean combinations of those values
 	using the ''not'', ''and'', and ''or'' keywords
 	and grouping parenthesis.
 	It is formally equivalent to:
 
 	<xmp class=prod>
-		<boolean [ <test> ]> = not <boolean-group> | <boolean-group>
-		                                             [ [ and <boolean-group> ]*
-		                                             | [ or <boolean-group> ]* ]
+		<boolean[ <test> ]> = not <boolean-group> | <boolean-group>
+		                                            [ [ and <boolean-group> ]*
+		                                            | [ or <boolean-group> ]* ]
 
 		<boolean-group> = <test> | ( <boolean> ) | <general-enclosed>
 	</xmp>
 
-	The <<boolean>> production represents a true, false, or unknown value,
+	The <<boolean[]>> production represents a true, false, or unknown value,
 	with top-level unknown values
-	(those not directly nested inside the grammar of another <<boolean>>)
+	(those not directly nested inside the grammar of another <<boolean[]>>)
 	resolving to false unless otherwise specified.
 	Its value is resolved using 3-value Kleene logic;
 	see [[#boolean-logic]] for details.
@@ -249,14 +249,14 @@ Boolean Expression Multiplier <<boolean>></h3>
 		For example, the ''@container'' rule allows a wide variety of tests:
 		including size queries, style queries, and scroll-state queries.
 		All of these are arbitrarily combinable with boolean logic.
-		Using <<boolean>>, the grammar for an ''@container'' query is:
+		Using <<boolean[]>>, the grammar for an ''@container'' query is:
 
 		<xmp class=prod>
-			<container-query> = <boolean [ <cq-test> ]>
+			<container-query> = <boolean[ <cq-test> ]>
 			<cq-test> = (<size-query>) | style( <style-query> ) | scroll-state( <scroll-state-query> )
-			<size-query> = <boolean [ ( <size-feature> ) ]> | <size-feature>
-			<style-query> = <boolean [ ( <style-feature> ) ]> | <style-feature>
-			<scroll-state-query> = <boolean [ ( <scroll-state-feature> ) ]> | <scroll-state-feature>
+			<size-query> = <boolean[ ( <size-feature> ) ]> | <size-feature>
+			<style-query> = <boolean[ ( <style-feature> ) ]> | <style-feature>
+			<scroll-state-query> = <boolean[ ( <scroll-state-feature> ) ]> | <scroll-state-feature>
 		</xmp>
 	</div>
 
@@ -265,7 +265,7 @@ Boolean Expression Multiplier <<boolean>></h3>
 	will be parsed and considered “unknown”,
 	rather than invalidating the production.
 	For consistency with that allowance,
-	the <css>&lt;test></css> term in a <<boolean>>
+	the <css>&lt;test></css> term in a <<boolean[]>>
 	should be defined to match <<general-enclosed>>.
 
 <h3 id=css-syntax>
@@ -1332,18 +1332,16 @@ Conditional Value Selection: the ''if()'' notation</h3>
 	<pre class=prod>
 	<dfn><<if()>></dfn> = if( [ <<if-condition>> : <<declaration-value>>? ; ]*
 	             <<if-condition>> : <<declaration-value>>? ;? )
-	<dfn><<if-condition>></dfn> =
+	<dfn><<if-condition>></dfn> = <<boolean[ <<if-test>> ]>> | else
+	<dfn><<if-test>></dfn> =
 	  supports( [ <<supports-condition>> | <<ident>> : <<declaration-value>> ] ) |
 	  media( <<media-query>> ) |
-	  style( <<style-query>> ) |
-	  else
+	  style( <<style-query>> )
 	</pre>
 
 	The <dfn value for="if()">else</dfn> keyword represents
 	a condition that is always true.
 
-	ISSUE: Incorporate boolean syntax for combining these queries.
-
 <!-- Big Text: toggle()
 
 █████▌  ███▌   ███▌   ███▌  █▌    █████▌   ██ ██
@@ -3141,7 +3139,7 @@ Safely Handling Overly-Long Substitution</h3>
 Appendix B: Boolean Logic</h2>
 
 	In order to accommodate future extensions of CSS,
-	<<boolean>> productions generally interpret their <<general-enclosed>> grammar branch as unknown,
+	<<boolean[]>> productions generally interpret their <<general-enclosed>> grammar branch as unknown,
 	and their boolean logic is resolved using 3-value Kleene logic.
 	In some cases (such as ''@supports''),
 	<<general-enclosed>> is instead defined as false;
@@ -3169,7 +3167,7 @@ Appendix B: Boolean Logic</h2>
 		false if <em>all</em> of them are false,
 		and unknown otherwise (i.e. at least one unknown, but no true).
 
-	If a “top-level” <<boolean>> is unknown,
+	If a “top-level” <<boolean[]>> is unknown,
 	and the containing context doesn't otherwise define
 	how to handle unknown conditions,
 	it evaluates to false.