Skip to content

Commit ec29d73

Browse files
Rik Cabaniersvgeesus
Rik Cabanier
authored and
svgeesus
committed
merge
1 parent a086949 commit ec29d73

3 files changed

Lines changed: 109 additions & 80 deletions

File tree

‎css-masking-1/ChangeLog‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2013-12-05 Dirk Schulze <dschulze@adobe.com>
2+
Clarification that the used value is ignored fro <mask-source>
3+
14
2013-11-02 Dirk Schulze <dschulze@adobe.com>
25
"Animatable" section of 'mask-size', 'mask-position' described
36
as repeatable list of lists. Changed to a single list.

‎css-masking-1/Overview.src.html‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ <h1>CSS Masking Module Level 1</h1>
77
Previous Version: http://www.w3.org/TR/2013/WD-css-masking-20130620/
88
Previous Version: http://www.w3.org/TR/2012/WD-css-masking-20121115/
99
Shortname: css-masking
10-
Link Defaults: css-shapes-1 (property) shape-outside, css-backgrounds-3 (type) <position>, svg (property) color-interpolation/fill-rule/fill/stroke/stroke-width, filters-1 (property) filter, css-display-3 (property) display, css-transforms-1 (property) transform
10+
Link Defaults: css-shapes-1 (property) shape-outside, css-backgrounds-3 (type) <position>, svg (property) color-interpolation/fill-rule/fill/stroke/stroke-width, filters-1 (property) filter, css-display-3 (property) display, css-transforms-1 (property) transform, css-backgrounds-3 (type) <box>
1111
Level: 1
1212
Group: fxtf
1313
Editor: Dirk Schulze, Adobe Systems Inc., dschulze@adobe.com
@@ -418,7 +418,7 @@ <h3 id="the-mask">The 'mask' property</h3>
418418

419419
If one <<box>> value is present then it sets both 'mask-origin' and 'mask-clip' to that value. If two <<box>> values are present, then the first sets 'mask-origin' and the second 'mask-clip'.
420420

421-
The properties 'mask-image', 'mask-repeat', 'mask-position', 'mask-clip', 'mask-origin' and 'mask-size' must have no effect if <<mask-reference>> references a <a>'mask element'</a> element. In this case the element defines position, sizing and clipping of the <i>mask source</i>.
421+
The <i>used value</i> of the properties 'mask-image', 'mask-repeat', 'mask-position', 'mask-clip', 'mask-origin' and 'mask-size' must have no effect if <<mask-reference>> references a <a>'mask element'</a> element. In this case the element defines position, sizing and clipping of the <i>mask source</i>.
422422

423423
The 'mask' shorthand also resets 'mask-box-image' to its initial value. It is therefore recommended that authors use the 'mask' shorthand, rather than other shorthands or the individual properties, to override any mask settings earlier in the cascade. This will ensure that 'mask-box-image' has also been reset to allow the new styles to take effect.
424424

@@ -491,9 +491,10 @@ <h3 id="MaskElement">The <a>'mask element'</a> element</h3>
491491

492492
<div class="adef-list">
493493
<p><em>Attribute definitions:</em></p>
494-
<dl>
495-
<dt id="MaskElementMaskUnitsAttribute"><dfn>maskUnits</dfn> = "<em>userSpaceOnUse</em> |
496-
<em>objectBoundingBox</em>"</dt>
494+
<dl dfn-type="element-attr" dfn-for="mask">
495+
<dt id="MaskElementMaskUnitsAttribute">
496+
<dfn>maskUnits</dfn> = "<em>userSpaceOnUse</em> | <em>objectBoundingBox</em>"
497+
</dt>
497498
<dd>Defines the coordinate system for attributes
498499
<a>'mask/x'</a>, <a>'mask/y'</a>, <a>'mask/width'</a> and <a>'mask/height'</a>.<br>
499500
If <span
@@ -515,9 +516,9 @@ <h3 id="MaskElement">The <a>'mask element'</a> element</h3>
515516
specified.<br>
516517
<span class="anim-target">Animatable:
517518
yes.</span></dd>
518-
<dt id="MaskElementMaskContentUnitsAttribute"><span
519-
class="adef">maskContentUnits</span> =
520-
"<em>userSpaceOnUse</em> | <em>objectBoundingBox</em>"</dt>
519+
<dt id="MaskElementMaskContentUnitsAttribute">
520+
<dfn>maskContentUnits</dfn> = "<em>userSpaceOnUse</em> | <em>objectBoundingBox</em>"
521+
</dt>
521522
<dd>Defines the coordinate system for the contents of the
522523
<a>'mask element'</a>.<br>
523524
If <span
@@ -541,35 +542,39 @@ <h3 id="MaskElement">The <a>'mask element'</a> element</h3>
541542
specified.<br>
542543
<span class="anim-target">Animatable:
543544
yes.</span></dd>
544-
<dt id="MaskElementXAttribute"><span
545-
class="adef">x</span> = "<<length>> | <<percentage>>"</dt>
545+
<dt id="MaskElementXAttribute">
546+
<dfn>x</dfn> = "<<length>> | <<percentage>>"
547+
</dt>
546548
<dd>The x-axis coordinate of one corner of the rectangle
547549
for the largest possible offscreen buffer.
548550
If the attribute is not specified but at least one of the attributes <a>'mask/y'</a>,
549551
<a>'mask/width'</a> or <a>'mask/height'</a> are specified, the effect is as if a
550552
value of <span class='attr-value'>'-10%'</span> were specified.<br>
551553
<span class="anim-target">Animatable:
552554
yes.</span></dd>
553-
<dt id="MaskElementYAttribute"><span
554-
class="adef">y</span> = "<<length>> | <<percentage>>"</dt>
555+
<dt id="MaskElementYAttribute">
556+
<dfn>y</dfn> = "<<length>> | <<percentage>>"
557+
</dt>
555558
<dd>The y-axis coordinate of one corner of the rectangle
556559
for the largest possible offscreen buffer.<br>
557560
If the attribute is not specified but at least one of the attributes <a>'mask/x'</a>,
558561
<a>'mask/width'</a> or <a>'mask/height'</a> are specified, the effect is as if a
559562
value of <span class='attr-value'>'-10%'</span> were specified.<br>
560563
<span class="anim-target">Animatable:
561564
yes.</span></dd>
562-
<dt id="MaskElementWidthAttribute"><span
563-
class="adef">width</span> = "<<length>> | <<percentage>>"</dt>
565+
<dt id="MaskElementWidthAttribute">
566+
<dfn>width</dfn> = "<<length>> | <<percentage>>"
567+
</dt>
564568
<dd>The width of the largest possible offscreen buffer.
565569
A negative value or a value of zero disables rendering of the element.<br>
566570
If the attribute is not specified but at least one of the attributes <a>'mask/x'</a>,
567571
<a>'mask/y'</a> or <a>'mask/height'</a> are specified, the effect is as if a
568572
value of <span class='attr-value'>'120%'</span> were specified.<br>
569573
<span class="anim-target">Animatable:
570574
yes.</span></dd>
571-
<dt id="MaskElementHeightAttribute"><span
572-
class="adef">height</span> = "<<length>> | <<percentage>>"</dt>
575+
<dt id="MaskElementHeightAttribute">
576+
<dfn>height</dfn> = "<<length>> | <<percentage>>"
577+
</dt>
573578
<dd>The height of the largest possible offscreen
574579
buffer.<br>
575580
A negative value or a value of zero disables rendering of the element.<br>
@@ -935,10 +940,10 @@ <h3 id="ClipPathElement">The <a>'clipPath element'</a> element</h3>
935940

936941
<div class="adef-list">
937942
<p><em>Attribute definitions:</em></p>
938-
<dl>
939-
<dt id="ClipPathElementClipPathUnitsAttribute"><span
940-
class="adef">clipPathUnits</span> =
941-
"<em>userSpaceOnUse</em> | <em>objectBoundingBox</em>"</dt>
943+
<dl dfn-type="element-attr" dfn-for="clippath">
944+
<dt id="ClipPathElementClipPathUnitsAttribute">
945+
<dfn>clipPathUnits</dfn> = "<em>userSpaceOnUse</em> | <em>objectBoundingBox</em>"
946+
</dt>
942947
<dd>Defines the coordinate system for the contents of the
943948
<a>'clipPath'</a>.<br>
944949
If <span class="attr-value">clipPathUnits="userSpaceOnUse"</span>,
@@ -1129,6 +1134,7 @@ <h2 class="no-num" id="changes">Changes since last publication</h2>
11291134
The following changes were made since the <a href="http://www.w3.org/TR/2013/WD-css-masking-1-20131029/">29 October 2013 Last Call Working Draft</a>.
11301135

11311136
<ul>
1137+
<li>Make clear that the <i>used value</i> of the properties 'mask-image', 'mask-repeat', 'mask-position', 'mask-clip', 'mask-origin' and 'mask-size' must be ignored for <<mask-source>>, not the properties.</li>
11321138
<li>"Animatable" section of 'mask-size', 'mask-position' described as repeatable list of lists. Changed to a single list.</li>
11331139
<li>Computed value of 'mask-repeat' and 'mask-position' was described as list of items. Changed to have just one value.</li>
11341140
<li>Change link to ED from <a href='http://dev.w3.org/fxtf/masking/'>http://dev.w3.org/fxtf/masking/</a> to <a href='http://dev.w3.org/fxtf/css-masking-1/'>http://dev.w3.org/fxtf/css-masking-1/</a></li>

0 commit comments

Comments
 (0)