Skip to content

Commit e506986

Browse files
authored
Merge pull request #2170 from w3c/krit-css-transform-1-editorial
[css-transforms-1] Editorial changes and inlining issue.
2 parents 07cdd89 + 5d5d1ba commit e506986

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

css-transforms-1/Overview.bs

+15-16
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ spec:css-display-3; type:value; for:display
4747
text: table-cell
4848
text: table-caption
4949

50-
spec:css-overflow-4; type:property;
51-
text:overflow
52-
5350
spec:css-backgrounds-3; type:property
5451
text: background-attachment
5552
</pre>
@@ -231,7 +228,7 @@ For elements whose layout is governed by the CSS box model, any value other than
231228

232229
For elements whose layout is governed by the CSS box model, any value other than ''transform/none'' for the transform also causes the element to become a containing block, and the object acts as a containing block for fixed positioned descendants.
233230

234-
Issue: Is this effect on ''position: fixed'' necessary? If so, need to go into more detail here about why fixed positioned objects should do this, i.e., that it's much harder to implement otherwise. See <a href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=16328">Bug 16328</a>.
231+
Issue(913): Is this effect on ''position: fixed'' necessary? If so, need to go into more detail here about why fixed positioned objects should do this, i.e., that it's much harder to implement otherwise.
235232

236233
<a href="https://www.w3.org/TR/css3-background/#fixed0">Fixed backgrounds</a> on the root element are affected by any transform specified for that element. For all other elements that are effected by a transform (i.e. have a transform applied to them, or to any of their ancestor elements), a value of ''fixed'' for the 'background-attachment' property is treated as if it had a value of ''background-attachment/scroll''. The computed value of 'background-attachment' is not affected.
237234

@@ -268,17 +265,17 @@ To serialize the <<transform-function>>s, serialize as per their individual gram
268265
Serialization of the computed value of <<transform-list>> {#serialization-of-the-computed-value}
269266
----------------------------------------------------------------
270267

271-
A <<transform-list>> for the computed value is serialized to one ''matrix()'' function by the following algorithm:
268+
A <<transform-list>> for the computed value is serialized to one <<matrix()>> function by the following algorithm:
272269

273270
Issue: keep 4x4 matrix here and below?
274271

275272
<ol class="algorithm">
276273
1. Let <var>transform</var> be a 4x4 matrix initialized to the identity matrix. The elements <var ignore> m11</var>, <var ignore>m22</var>, <var ignore>m33</var> and <var ignore>m44</var> of <var>transform</var> must be set to ''1'' all other elements of <var>transform</var> must be set to ''0''.
277274
2. Post-multiply all <<transform-function>>s in <<transform-list>> to <var>transform</var>.
278-
3. Chose between ''matrix()'' or <<matrix3d()>> serialization:
275+
3. Chose between <<matrix()>> or <<matrix3d()>> serialization:
279276
<dl class="switch">
280277
<dt>If <var>transform</var> is a [=2D matrix=]
281-
<dd>Serialize <var>transform</var> to a ''matrix()'' function.
278+
<dd>Serialize <var>transform</var> to a <<matrix()>> function.
282279
<dt>Otherwise
283280
<dd>Serialize <var>transform</var> to a <<matrix3d()>> function.
284281
</dl>
@@ -565,7 +562,7 @@ Neutral element for addition {#neutral-element}
565562

566563
Some animations require a neutral element for addition. For transform functions this is a scalar or a list of scalars of 0. Examples of neutral elements for transform functions are ''translate(0)'', ''translateX(0)'', ''translateY(0)'', ''scale(0)'', ''scaleX(0)'', ''scaleY(0)'', ''rotate(0)'', ''skew(0, 0)'', ''skewX(0)'', ''skewY(0)'' and ''matrix(0, 0, 0, 0, 0, 0)''.
567564

568-
Note: Animations to or from the neutral element of additions ''matrix()'' fall back to discrete animations (See [[#matrix-interpolation]]).
565+
Note: Animations to or from the neutral element of additions <<matrix()>> fall back to discrete animations (See [[#matrix-interpolation]]).
569566

570567
<div class="example">
571568

@@ -616,7 +613,7 @@ A percentage for vertical translations is relative to the height of the [=refere
616613
2D Transform Functions {#two-d-transform-functions}
617614
----------------------
618615

619-
<dl dfn-for=transform dfn-type=value>
616+
<dl dfn-for=transform>
620617
: <span class='prod'><dfn>matrix()</dfn> = matrix( <<number>> [, <<number>> ]{5,5} )</span>
621618
:: specifies a 2D transformation in the form of a <a href="#MatrixDefined">transformation matrix</a> of the six values a, b, c, d, e, f.
622619

@@ -746,27 +743,29 @@ Two-dimensional primitives with derived transform functions are:
746743

747744
<dl>
748745
<dt id="translate-primitive">''translate()''
749-
<dd>for ''translateX()'', ''translateY()'' and ''translate()''.
746+
<dd>for <<translateX()>>, <<translateY()>> and <<translate()>>.
750747

751748
<dt id="rotate-three-primitive">''rotate()'' with three arguments
752-
<dd>for ''rotate()'' with one or three arguments if <a href="#svg-transform-functions">rotate with three arguments</a> is supported.
749+
<dd>for <<rotate()>> with one or three arguments if <a href="#svg-transform-functions">rotate with three arguments</a> is supported.
753750

754751
<dt id="scale-primitive">''scale()''
755-
<dd>for ''scaleX()'', ''scaleY()'' and ''scale()''.
752+
<dd>for <<scaleX()>>, <<scaleY()>> and <<scale()>>.
756753

757754
</dl>
758755

756+
Issue: Move the following lines to CSS-Transforms-2.
757+
759758
Three-dimensional primitives with derived transform functions are:
760759

761760
<dl>
762761
<dt id="translate3d-primitive">''translate3d()''
763-
<dd>for ''translateX()'', ''translateY()'', ''translateZ()'' and ''translate()''.
762+
<dd>for <<translateX()>>, <<translateY()>>, ''translateZ()'' and <<translate()>>.
764763

765764
<dt id="scale3d-primitive">''scale3d()''
766-
<dd>for ''scaleX()'', ''scaleY()'', ''scaleZ()'' and ''scale()''.
765+
<dd>for <<scaleX()>>, <<scaleY()>>, ''scaleZ()'' and <<scale()>>.
767766

768767
<dt id="rotate3d-primitive">''rotate3d()''
769-
<dd>for ''rotate()'', ''rotateX()'', ''rotateY()'' and ''rotateZ()''.
768+
<dd>for <<rotate()>>, ''rotateX()'', ''rotateY()'' and ''rotateZ()''.
770769
</dl>
771770

772771
<p id="interpolation-two-three-dimensional-function">
@@ -776,7 +775,7 @@ Three-dimensional primitives with derived transform functions are:
776775
Interpolation of primitives and derived transform functions {#interpolation-of-transform-functions}
777776
===================================================================================================
778777

779-
Two transform functions with the same name and the same number of arguments are interpolated numerically without a former conversion. The calculated value will be of the same transform function type with the same number of arguments. Special rules apply to ''matrix()''.
778+
Two transform functions with the same name and the same number of arguments are interpolated numerically without a former conversion. The calculated value will be of the same transform function type with the same number of arguments. Special rules apply to <<matrix()>>.
780779

781780
<div class="example">
782781

0 commit comments

Comments
 (0)