[css-easing-2] Rewrite serialization for linear() to be simpler. Make the linear/linear() grouping the same as the other keywords+functions.

Author: tabatkins

css-easing-2/Overview.bs

@@ -124,7 +124,6 @@ follow.
 The syntax for specifying an [=easing function=] is as follows:
 
 <div class="prod"><dfn type>&lt;easing-function&gt;</dfn> =
-  ''linear'' |
   <<linear-easing-function>> |
   <<cubic-bezier-easing-function>> |
   <<step-easing-function>></div>
@@ -135,7 +134,7 @@ The syntax for specifying an [=easing function=] is as follows:
   timing-functions-syntax-valid.html
 </wpt>
 
-## The linear easing function: ''linear()'' ## {#the-linear-easing-function}
+## Linear Easing Functions: ''linear'', ''linear()'' ## {#the-linear-easing-function}
 
 A <dfn export>linear easing function</dfn>
 is an [=easing function=]
@@ -152,24 +151,32 @@ to an [=output progress value=].
 A [=linear easing function=] has the following syntax:
 
 <pre class="prod">
+  <dfn>&lt;linear-easing-function></dfn> = linear | <<linear()>>
   <dfn>linear()</dfn> = linear( [ <<number>> && <<percentage>>{0,2} ]# )
 </pre>
 
 <wpt>
   linear-timing-functions-syntax.html
 </wpt>
 
-Each comma-separated argument defines one or two [=control points=],
-with an [=input progress value=] equal to the specified <<percentage>>
-(converted to a <<number>> between 0 and 1),
-and an [=output progress value=] equal to the specified <<number>>.
-When the argument has two <<percentages>>,
-it defines two [=control points=] in the specified order,
-one per <<percentage>>.
+: ''linear''
+:: Equivalent to ''linear(0, 1)''
 
-If an argument lacks a <<percentage>>,
-its [=input progress value=] is initially empty,
-but that is immediately corrected by [=linear() canonicalization=] after parsing.
+: ''linear()''
+::
+  Specifies a [=linear easing function=].
+
+  Each comma-separated argument specifies one or two [=control points=],
+  with an [=input progress value=] equal to the specified <<percentage>>
+  (converted to a <<number>> between 0 and 1),
+  and an [=output progress value=] equal to the specified <<number>>.
+  When the argument has two <<percentage>>s,
+  it defines two [=control points=] in the specified order,
+  one per <<percentage>>.
+
+  If an argument lacks a <<percentage>>,
+  its [=input progress value=] is initially empty,
+  but that is immediately corrected by [=linear() canonicalization=] after parsing.
 
 <div algorithm>
   To <dfn export lt="linear() canonicalization|canonicalize a linear()">canonicalize a linear()</dfn> function's [=control points=],
@@ -197,50 +204,60 @@ but that is immediately corrected by [=linear() canonicalization=] after parsing
   every [=control point=] has an [=input progress value=],
   and the [=input progress values=] are monotonically non-decreasing
   along the list.
+
+  Note: Serialization relies on whether or not an [=input progress value=]
+  was originally supplied,
+  so that information should be retained
+  in the [=CSS/internal representation=].
+  It does not rely on whether a pair of [=control points=]
+  were specified as two percentages on a single argument
+  or as separate arguments.
 </div>
 
 
 ### Serializing ### {#linear-easing-function-serializing}
 
-<div class=note>
-  The serialization of ''linear()'' includes input values for each point,
-  and input values are never less than the input of the previous point.
-
-  For example:
-
-    - ''linear(0, 0.25, 1)'' serializes as ''linear(0 0%, 0.25 50%, 1 100%)''
-    - ''linear(0 20%, 0.5 10%, 1)'' serializes as ''linear(0 20%, 0.5 20%, 1 100%)''
-    - ''linear(0, 0.25 25% 75%, 1)'' serializes as ''linear(0 0%, 0.25 25%, 0.25 75%, 1 100%)''
+<div algorithm>
+  To <dfn export>serialize a linear() function</dfn>:
+
+  1. Let |s| be the string "linear(".
+  2. [=serialize a linear() control point|Serialize each control point=] of the function,
+    [=string/concatenate=] the results using the separator ", ",
+    and append the result to |s|.
+  3. Append ")" to |s|,
+    and return it.
 </div>
 
-<section algorithm="linear easing function">
-
-To get a [=linear easing function=]'s (|linearEasingFunction|) <dfn for="linear easing function" export>serialized computed value</dfn>,
-perform the following.
-It returns a [=string=].
-
-1.   Let |output| be "`linear(`".
-
-1.   [=list/For each=] |point| in |linearEasingFunction|'s [=linear easing function/points=]:
+<div algorithm>
+  To <dfn export>serialize a linear() control point</dfn>:
 
-     1.   If |point| is not the first [=list/item=] of |linearEasingFunction|'s [=linear easing function/points=],
-          append "<code>, </code>" to |output|.
+  1. Let |s| be the serialization,
+    as a <<number>>,
+    of the [=control point's=] [=output progress value=].
 
-     1.   Append the computed value of |point|'s [=linear easing point/output=],
-          as a <<number>>,
-          to |output|.
+  2. If the [=control point=] originally lacked an [=input progress value=],
+    return |s|.
 
-     1.   Append "<code> </code>" to |output|.
+  3. Otherwise, append " " (U+0020 SPACE) to |s|,
+    then serialize the [=control point's=] [=output progress value=]
+    as a <<percentage>>
+    and append it to |s|.
 
-     1.   Append the computed value of |point|'s [=linear easing point/input=],
-          as a <<percentage>>,
-          to |output|.
+  4. Return |s|.
+</div>
 
-1.   Append "`)`" to |output|.
+<div class=example>
+  When serialized,
+  [=control points=] originally specified with two [=input progress values=]
+  are turned into two separate [=control points=],
+  and the [=input progress values=] are in strictly ascending order.
+  For example:
 
-1.   Return |output|.
+    - ''linear(0, 0.25, 1)'' serializes as ''linear(0, 0.25, 1)''
+    - ''linear(0 20%, 0.5 10%, 1)'' serializes as ''linear(0 20%, 0.5 20%, 1)''
+    - ''linear(0, 0.25 25% 75%, 1)'' serializes as ''linear(0, 0.25 25%, 0.25 75%, 1)''
+</div>
 
-</section>
 
 ### Output of a linear easing function ### {#linear-easing-function-output}
 

css-grid-3/Overview.bs

@@ -14,9 +14,22 @@ Editor: Brandon Stewart, Apple, https://brandonstewart.net
 Abstract: This module introduces masonry layout as an additional layout mode for <a href="https://www.w3.org/TR/css-grid-2/">CSS Grid</a> containers.
 WPT Path Prefix: css/css-grid/masonry/tentative/
 Markup Shorthands: css yes
-Status Text: <strong>This specification represents two variations on the proposal for masonry layout. Feedback on the alternatives is welcome.
+Status Text: <strong>This specification represents two variations on the proposal for masonry layout. Feedback on the alternatives is welcome.</strong>
 </pre>
 
+<pre class=link-defaults>
+spec: css-align-3;
+	type: value; for: align-content;
+		text: center;
+		text: stretch;
+	type: dfn; text: alignment baseline;
+spec: css-grid-2; type: dfn;
+	text: auto-placement algorithm
+	text: computed track list
+	text: collapsed track
+</pre>
+
+
 <style>
 :is(section, p).option {
 	border-right: 1em double;
@@ -127,12 +140,12 @@ Alternative Syntax Proposals</h3>
 		to promote debate and discussion of these two alternatives.
 
 		<dl>
-			<dt><dfn><span class="option grid">Grid-integrated Option</span></dfn>
+			<dt><dfn noexport><span class="option grid">Grid-integrated Option</span></dfn>
 			<dd>
 				In this syntax model, [=masonry layout=] is integrated into the [=grid layout=] model,
 				re-using all of the 'grid-*' properties.
 
-			<dt><dfn><span class="option masonry">Grid-independent Option</span></dfn>
+			<dt><dfn noexport><span class="option masonry">Grid-independent Option</span></dfn>
 			<dd>
 				In this syntax model, [=masonry layout=] is its own 'display' type,
 			and has its own parallel set of 'masonry-*' properties.
@@ -168,9 +181,13 @@ Masonry Layout Model</h2>
 	[=Grid items=] are formed and [=blockified=]
 	exactly the same as in a regular [=grid container=].
 
+	(For clarity, [=grid items=] and [=grid tracks=] of a [=masonry container=]
+	can be referred to as <dfn export lt="masonry item">masonry items</dfn>
+	and <dfn export lt="masonry track">masonry tracks</dfn>.)
+
 	All CSS properties work the same as in a regular [=grid container=]
 	unless otherwise specified by this specification.
-	For example, ''order'' can be used to specify a different layout order for the items.
+	For example, 'order' can be used to specify a different layout order for the items.
 
 	Note: Subgrid items are supported,
 	but subgridding only occurs in the [=grid axis=];
@@ -362,7 +379,7 @@ Auto Flow Directions: the 'grid-auto-flow' property</h4>
 	<dfn value>column-reverse</dfn>,
 	and
 	<dfn value>wrap-reverse</dfn>,
-	which reverse the directions of the [=auto-placement algorithm=].
+	which reverse the directions of the [=grid item placement algorithm=].
 
 	In [=masonry layout=], the flow axis specified by ''grid-auto-flow'' is ignored:
 	items are always placed by filling across the [=grid axis=].
@@ -1306,4 +1323,18 @@ Acknowledgements</h2>
 	(from which I lifted the Background chapter) and presented it to the CSSWG.
 	Thanks also to everyone who provided feedback on the <a href="https://github.com/w3c/csswg-drafts/issues/4650">initial proposal</a> for this feature.
 
+<h2 id=security>
+Security Considerations</h2>
+
+	As a layout specification,
+	this spec introduces no new security considerations
+	beyond taht exposed by CSS layout in general.
+
+<h2 id=privacy>
+Privacy Considerations</h2>
+
+	As a layout specification,
+	this spec introduces no new privacy considerations
+	beyond that exposed by CSS layout in general.
+
 <wpt-rest></wpt-rest>