[css-scroll-snap] Mark merged/unmerged status of diffs

Author: fantasai

css-scroll-snap/diff-notes.html

@@ -12,6 +12,7 @@
 	margin: 2em 0 1em;
 }
 
+dt > strong,
 ins, del {
   color: inherit;
   border-radius: 0.5em;
@@ -25,6 +26,10 @@
 .down::after { content: "⇓"; }
 .block { display: block; }
 
+dt > strong {
+  background: yellow;
+}
+
 th {
 	text-align: right;
 }
@@ -99,7 +104,7 @@ <h2>Suggested Process</h2>
 <h2>Specific Changes</h2>
 
 <dl class="changes"l>
-	<dt id=change-title>Title Change
+	<dt id=change-title>Title Change <strong>Merged</strong>
 	<dd>
 		Robert O'Callahan requested a change to the name of the spec,
 		because (with his requested changes)
@@ -111,7 +116,7 @@ <h2>Specific Changes</h2>
 			<p>http://www.w3.org/TR/css-<del>snappoints</del><ins>scroll-snap</ins>-1/
 		</blockquote>
 
-	<dt id=change-margin-area>Terminology Change: Scroll Snap Area
+	<dt id=change-margin-area>Terminology Change: Scroll Snap Area <strong>Merged</strong>
 	<dd>
 		Tab and I introduced the term “scroll snap area”
 		to refer to the rectangle being aligned within the viewport.
@@ -124,6 +129,7 @@ <h2>Specific Changes</h2>
 		<pre>s/<del>scroll snap margin</del>/<ins>scroll snap area</ins>/g;</pre>
 
 	<dt id=change-margin-border-box>Error: border-box vs. margin-box
+	 <strong>Partially Merged</strong>
 	<dd>
 		Matt's spec parenthetically mentions that the scroll snap area defaults to the margin box. However, the spec actually defines that it defaults to the border box. This change corrects this error.
 
@@ -134,7 +140,11 @@ <h2>Specific Changes</h2>
 			within &hellip;
 		</blockquote>
 
+		(In the most recent changes, “margin box” has been replaced with “border box”,
+		but the resulting text is awkward.)
+
 	<dt id="change-physics">Move: Undefined Animations and Physics
+	 <strong>Merged</strong>
 	<dd>
 		There is a statement in the definition of <code>scroll-snap-type</code>
 		that, since  it applies generally to scroll-snapping,
@@ -147,6 +157,7 @@ <h2>Specific Changes</h2>
 		</blockquote>
 
 	<dt id=change-axes>Specifying Scroll-snap Axes
+	 <strong>Partially Merged</strong>
 	<dd>
 		The WG <a href="https://www.w3.org/mid/CADhPm3t9_fcrr8mZ9eYzkghmkJ0pnmOK5_c10w6RAv51T-28AQ@mail.gmail.com">resolved on 2 December 2015</a>
 		to specify, on a property applied to the scroll container, which axis(es) would be honored in scroll snapping.
@@ -203,6 +214,7 @@ <h2>Specific Changes</h2>
 		on whether there should be longhands for this and if so, what the shorthand/longhand names should be.
 
 	<dt id=change-trap>Trapping
+	 <strong>Merged</strong>
 	<dd>
 		In Sapporo, the WG <a href="https://www.w3.org/mid/CADhPm3t9Y_L3sUAfmGXbVE7LdgYUcsDXpaRMXfXxxdkpKAtzWw@mail.gmail.com">resolved (27 October 2015)</a>
 		to have non-<code>none</code> values of the <code>scroll-snap-type</code> property “trap” descendant scroll snap positions
@@ -270,6 +282,7 @@ <h2>Specific Changes</h2>
 		</blockquote>
 
 	<dt id=change-rfc2119>RFC2119 Terminology
+	 <strong>Merged</strong>
 	<dd>
 		As much as I like the word “guarantee” in the description of <code>mandatory</code>,
 		it seems more appropriate to use RFC2119’s “requirement”.
@@ -334,6 +347,7 @@ <h2>Specific Changes</h2>
 		</ul>
 
 	<dt id=change-relxy>Clarification: Corresponding Dimensions
+	<strong>Merged</strong>
 	<dd>
 		Clarify that percentages are calculated with respect to their corresponding dimensions.
 		<blockquote>
@@ -347,6 +361,7 @@ <h2>Specific Changes</h2>
 			</table>
 		</blockquote>
 	<dt id=change-animatable>Fix Animatable Lines
+	<strong>Merged</strong>
 	<dd>
 		Fix the Animatable lines
 		<blockquote>
@@ -372,6 +387,7 @@ <h2>Specific Changes</h2>
 
 
 	<dt id=change-length-14>Defining the Scroll Snap Area
+	<strong>Merged</strong>
 	<dd>
 		This wording explicitly hooks into the way <code>margin</code> and <code>border-image-outset</code> are defined,
 		which ensures that the assignment of values is fully defined (by reference).
@@ -387,7 +403,9 @@ <h2>Specific Changes</h2>
 				</dl>
 			</del>
 		</blockquote>
-	<dt id=change-alignment>Definition of <code>scroll-snap-align</code>.
+
+	<dt id=change-alignment>Definition of <code>scroll-snap-align</code>
+	<strong>Merged</strong>
 	<dd>
 		The following definition is more concise and more concrete,
 		because it hooks into the proper terminology.
@@ -426,6 +444,7 @@ <h2>Specific Changes</h2>
 -->
 
 	<dt id=change-subheads>Descriptive Subheadings
+	<strong>Merged</strong>
 	<dd>
 		Tab and I try to use the subheadings as a way of describing what happens,
 		preferably using words other than those that appear in the property name itself.
@@ -444,6 +463,7 @@ <h2>Specific Changes</h2>
 		</ul>
 
 	<dt id=change-terms>Inlining Definitions
+	<strong>Merged</strong>
 	<dd>
 		While having a glossary appendix is sometimes nice,
 		Tab and I tend to put the defining instance of terms inline in the prose:
@@ -512,13 +532,13 @@ <h2>Specific Changes</h2>
 	<dd>
 		The following rewordings are recommended, as they seem somewhat less awkward than the original wording:
 		<ul type=a>
-			<li>
+			<li><strong>Merged</strong>
 				This rewording is less grammatically complex, and maintains parallelism with the previous parenthetical.
 				<blockquote>
 					<p>Snap positions can be specified as a particular alignment (<code>scroll-snap-align</code>) of an element’s scroll snap area (its border bounding box, as modified by <code>scroll-snap-margin</code>) within the scroll container’s snapport
 					(<del>the rectangle obtained by reducing its visual viewport</del> <ins>its visual viewport, as reduced by its scroll-snap-padding</ins>).
 				</blockquote>
-			<li>
+			<li><strong>Merged</strong>
 				This one drops the (in CSS specs) unnecessary “must”,
 				and shifts the parenthetical to the end so it doesn't interrupt the connection between the adjective “nearest ancestor” and the noun it describes.
 				<blockquote>
@@ -540,14 +560,14 @@ <h2>Specific Changes</h2>
 				<blockquote>
 					<p><ins>(</ins>If <del>no reachable snap position</del> <ins>none</ins> exist<del>s</del>, then no snapping occurs.<ins>)</ins></p>
 				</blockquote>
-			<li>
+			<li><strong>Merged</strong>
 				This rewording is more concise, but conveys the same thing.
 				<blockquote>
 					<p>The <a class="property" href="#propdef-scroll-snap-padding">scroll-snap-padding</a> property defines the <dfn id="scroll-snapport">scroll snapport</dfn>—<!--
 					--><del>a region inset from the visual viewport of a <a href="#scroll-container">scroll container</a> used in calculating its <a href="#scroll-snap-position">snap positions</a>.  The snapport is used as the alignment container when calculating <a href="#scroll-snap-position">snap positions</a>.</del>
 					<ins>the area of the scrollport that is used as the <a href="https://drafts.csswg.org/css-align-3/#alignment-container">alignment container</a> of the <a href="#scroll-snap-area">scroll snap areas</a> when calculating their <a href="#scroll-snap-position">snap positions</a></ins>.
 				</blockquote>
-			<li>
+			<li><strong>Merged</strong>
 				The definition here is essentially redundant with the previous paragraph;
 				Tab and I think this bit of text therefore doesn't need to exist.
 				<blockquote>
@@ -556,15 +576,15 @@ <h2>Specific Changes</h2>
 						<dd><del>Specifies the region inset from the visual viewport.</del> Values are interpreted as for <a class="property" href="https://drafts.csswg.org/css2/box.html#propdef-padding">padding</a>, and specify inward offsets from each edge of the visual viewport.
 					</dl>
 				</blockquote>
-			<li>
+			<li><strong>Merged</strong>
 				This rewording is more concise, but conveys the same thing with as much precision.
 				<blockquote>
 					<p>The <a class="property" href="#propdef-scroll-snap-margin">scroll-snap-margin</a> property
 					defines the <dfn id="scroll-snap-area">scroll snap area</dfn>
 					<del>on elements within a <a href="#scroll-container">scroll container</a>, used in calculating <a href="#scroll-snap-position">snap positions</a> for that scroll container</del>
 					<ins>that is used for snapping this box to the <a href="#scroll-snapport">snapport</a></ins>.
 				</blockquote>
-			<li>
+			<li><strong>Merged</strong>
 				This rewording uses terminology previously defined in order to present more concise definitions with simpler sentence structure:
 				<blockquote>
 					<p><ins>Values are defined as follows:</ins>
@@ -592,14 +612,16 @@ <h2>Specific Changes</h2>
 			<blockquote>
 				<p>&hellip the scroll container must not snap<ins>: all scroll positions are equally valid</ins>.
 			</blockquote>
-			<li>This phrase provides something a little more concrete for the reader to relate to, making it less necessary for a casual reader to follow the definition link for “snap” to figure out what that means:
+			<li><strong>Merged</strong>
+			This phrase provides something a little more concrete for the reader to relate to, making it less necessary for a casual reader to follow the definition link for “snap” to figure out what that means:
 			<blockquote>
 				<p>&hellip; the scroll container may snap <ins>to a valid snap position</ins> at the termination of a scroll &hellip;
 			</blockquote>
 			<blockquote>
 				<p>&hellip; the scroll container is guaranteed to be snapped <ins>to a valid snap position</ins> when there are no active scrolling operations &hellip;
 			</blockquote>
-			<li>This comma breaks up a very long string of (4) prepositional phrases
+			<li><strong>Merged</strong>
+			This comma breaks up a very long string of (4) prepositional phrases
 			by splitting off the UA discretion part:
 			<blockquote>
 				the scroll container may snap to a valid snap position at the termination of a scroll<ins>,</ins> at the discretion of the UA given the parameters of the scroll.
@@ -608,6 +630,7 @@ <h2>Specific Changes</h2>
 	</dd>
 
 	<dt id=change-point>Point Snapping
+	<strong>Merged</strong>
 	<dd>
 		While Tab and I can accept for point-snapping to be deferred to the next level,
 		we would like for at least the next (fully complete) publication
@@ -653,6 +676,7 @@ <h3 class="heading settled" data-level="7.2" id="snap-dimensions"><span class="s
 		Again, we're happy to leave this to level 2, but do want the feature design published for future reference.)
 
 	<dt id="change-ack">Acknowledgements Update
+	<strong>Merged</strong>
 	<dd>
 		We've added a list of the people who have contributed the spec,
 		and noted that their proposals were mostly accepted rather than mostly ignored.