Skip to content

Commit 771e114

Browse files
committed
[css-images] More preprocessor tweaks.
1 parent fba5eb5 commit 771e114

File tree

2 files changed

+30
-22
lines changed

2 files changed

+30
-22
lines changed

autolinker-config.md

+8
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ css-break-3
5656
* break-before
5757
* orphans
5858

59+
css-color-3
60+
-----------
61+
* <color>
62+
63+
css-content-3
64+
-------------
65+
* content
66+
5967
css-fonts-3
6068
-----------
6169
* font

css-images/Overview.html

+22-22
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ <h3 data-level=1.2 id=values><span class=secno>1.2 </span><span class=content>
169169
Other CSS modules may expand the definitions of these value types:
170170
for example <a data-biblio-type=informative data-link-type=biblio href=#css3color title=CSS3COLOR>[CSS3COLOR]</a>,
171171
when combined with this module,
172-
expands the definition of the <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-color><var>&lt;color&gt;</var></a> value type as used in this specification.
172+
expands the definition of the <a class=production data-link-type=type href=http://dev.w3.org/fxtf/filters/#ltcolorgt><var>&lt;color&gt;</var></a> value type as used in this specification.
173173

174174
<p> In addition to the property-specific values listed in their definitions,
175175
all properties defined in this specification also accept the <a href=http://www.w3.org/TR/css3-values/>global keywords</a> as their property value.
@@ -293,7 +293,7 @@ <h3 data-level=3.2 id=image-notation><span class=secno>3.2 </span><span class=co
293293

294294
<p> The <a class=css data-link-type=maybe href=#funcdef-image>image()</a> notation is defined as:
295295

296-
<pre class=prod> <dfn data-dfn-type=function id=funcdef-image>image()</dfn> = image( <a class=production data-link-type=type href=#typedef-image-tags><var>&lt;image-tags&gt;</var></a>? [ <a class=production data-link-type=type href=#typedef-image-src><var>&lt;image-src&gt;</var></a> , ]* [ <a class=production data-link-type=type href=#typedef-image-src><var>&lt;image-src&gt;</var></a> | <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-color><var>&lt;color&gt;</var></a> ] )
296+
<pre class=prod> <dfn data-dfn-type=function id=funcdef-image>image()</dfn> = image( <a class=production data-link-type=type href=#typedef-image-tags><var>&lt;image-tags&gt;</var></a>? [ <a class=production data-link-type=type href=#typedef-image-src><var>&lt;image-src&gt;</var></a> , ]* [ <a class=production data-link-type=type href=#typedef-image-src><var>&lt;image-src&gt;</var></a> | <a class=production data-link-type=type href=http://dev.w3.org/fxtf/filters/#ltcolorgt><var>&lt;color&gt;</var></a> ] )
297297
<dfn data-dfn-type=type id=typedef-image-tags>&lt;image-tags&gt;</dfn> = [ ltr | rtl ]
298298
<dfn data-dfn-type=type id=typedef-image-src>&lt;image-src&gt;</dfn> = [ <a class=production data-link-type=type href=http://dev.w3.org/fxtf/masking/#lturlgt><var>&lt;url&gt;</var></a> | <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-fonts-3/#font-language-override-string-value><var>&lt;string&gt;</var></a> ]
299299
</pre>
@@ -347,10 +347,10 @@ <h4 data-level=3.2.2 id=image-fallbacks><span class=secno>3.2.2 </span><span cla
347347

348348
<p> Multiple <a class=production data-link-type=type href=#typedef-image-src><var>&lt;image-src&gt;</var></a>s can be given separated by commas,
349349
in which case the function represents the first image that's not an <a href=#invalid-image>invalid image</a>.
350-
The final argument can specify a <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-color><var>&lt;color&gt;</var></a> to serve as an ultimate fallback;
350+
The final argument can specify a <a class=production data-link-type=type href=http://dev.w3.org/fxtf/filters/#ltcolorgt><var>&lt;color&gt;</var></a> to serve as an ultimate fallback;
351351
this can be used, e.g. for <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-backgrounds-4/#background-image title=background-image>background-image</a>,
352352
to ensure adequate contrast if none of the preceding <a class=production data-link-type=type href=#typedef-image-src><var>&lt;image-src&gt;</var></a>s can be used.
353-
If the final argument is a <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-color><var>&lt;color&gt;</var></a>,
353+
If the final argument is a <a class=production data-link-type=type href=http://dev.w3.org/fxtf/filters/#ltcolorgt><var>&lt;color&gt;</var></a>,
354354
it represents a solid-color image of the given color with no <a href=#intrinsic-dimensions>intrinsic dimensions</a>.
355355
If all of the provided <a class=production data-link-type=type href=#typedef-image-src><var>&lt;image-src&gt;</var></a>s are <a href=#invalid-image>invalid images</a>
356356
and a fallback color was not provided as the last argument,
@@ -415,7 +415,7 @@ <h4 data-level=3.2.3 id=color-images><span class=secno>3.2.3 </span><span class=
415415

416416
<div class=example>
417417

418-
<p> At times, one may need a solid-color image for a property or function that does not accept the <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-color><var>&lt;color&gt;</var></a> type directly.
418+
<p> At times, one may need a solid-color image for a property or function that does not accept the <a class=production data-link-type=type href=http://dev.w3.org/fxtf/filters/#ltcolorgt><var>&lt;color&gt;</var></a> type directly.
419419
The <a class=css data-link-type=maybe href=#funcdef-image>image()</a> function can be used for this:
420420
by specifying <em>only</em> a color without any URLs,
421421
the function immediately falls back to representing a solid-color image of the chosen color.
@@ -516,7 +516,7 @@ <h3 data-level=3.3 id=image-set-notation><span class=secno>3.3 </span><span clas
516516

517517
<p> The syntax for <a class=css data-link-type=maybe href=#funcdef-image-set>image-set()</a> is:
518518

519-
<pre class=prod><dfn data-dfn-type=function id=funcdef-image-set>image-set()</dfn> = image-set( [ <a class=production data-link-type=type href=#typedef-image-set-decl><var>&lt;image-set-decl&gt;</var></a>, ]* [ <a class=production data-link-type=type href=#typedef-image-set-decl><var>&lt;image-set-decl&gt;</var></a> | <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-color><var>&lt;color&gt;</var></a>] )
519+
<pre class=prod><dfn data-dfn-type=function id=funcdef-image-set>image-set()</dfn> = image-set( [ <a class=production data-link-type=type href=#typedef-image-set-decl><var>&lt;image-set-decl&gt;</var></a>, ]* [ <a class=production data-link-type=type href=#typedef-image-set-decl><var>&lt;image-set-decl&gt;</var></a> | <a class=production data-link-type=type href=http://dev.w3.org/fxtf/filters/#ltcolorgt><var>&lt;color&gt;</var></a>] )
520520
<dfn data-dfn-type=type id=typedef-image-set-decl>&lt;image-set-decl&gt;</dfn> = [ <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-images-3/#image-type><var>&lt;image&gt;</var></a> | <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-fonts-3/#font-language-override-string-value><var>&lt;string&gt;</var></a> ] <a class=production data-link-type=type href=#typedef-resolution><var>&lt;resolution&gt;</var></a></pre>
521521
<p> The <a class=css data-link-type=maybe href=#funcdef-image-set>image-set()</a> function can not be nested inside of itself,
522522
either directly
@@ -941,18 +941,18 @@ <h3 data-level=3.5 id=cross-fade-function><span class=secno>3.5 </span><span cla
941941

942942
<p> The syntax for <a class=css data-link-type=maybe href=#funcdef-cross-fade>cross-fade()</a> is defined as:
943943

944-
<pre class=prod><dfn data-dfn-type=function id=funcdef-cross-fade>cross-fade()</dfn> = cross-fade( <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-percentage><var>&lt;percentage&gt;</var></a>? <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-images-3/#image-type><var>&lt;image&gt;</var></a> [, <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-images-3/#image-type><var>&lt;image&gt;</var></a> | <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-color><var>&lt;color&gt;</var></a> ]? )</pre>
944+
<pre class=prod><dfn data-dfn-type=function id=funcdef-cross-fade>cross-fade()</dfn> = cross-fade( <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-fonts-3/#percentage-size-value><var>&lt;percentage&gt;</var></a>? <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-images-3/#image-type><var>&lt;image&gt;</var></a> [, <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-images-3/#image-type><var>&lt;image&gt;</var></a> | <a class=production data-link-type=type href=http://dev.w3.org/fxtf/filters/#ltcolorgt><var>&lt;color&gt;</var></a> ]? )</pre>
945945
<p> The function represents an image generated by
946946
combining two images.
947947

948-
<p> The <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-percentage><var>&lt;percentage&gt;</var></a> represents how much of the first image is retained
948+
<p> The <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-fonts-3/#percentage-size-value><var>&lt;percentage&gt;</var></a> represents how much of the first image is retained
949949
when it is blended with the second image.
950-
The <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-percentage><var>&lt;percentage&gt;</var></a> must be between <span class=css data-link-type=maybe>0%</span> and <span class=css data-link-type=maybe>100%</span> inclusive;
950+
The <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-fonts-3/#percentage-size-value><var>&lt;percentage&gt;</var></a> must be between <span class=css data-link-type=maybe>0%</span> and <span class=css data-link-type=maybe>100%</span> inclusive;
951951
any other value is invalid.
952952
If omitted,
953953
it defaults to the value <span class=css data-link-type=maybe>50%</span>.
954954

955-
<p> If the last argument is a <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-color><var>&lt;color&gt;</var></a>,
955+
<p> If the last argument is a <a class=production data-link-type=type href=http://dev.w3.org/fxtf/filters/#ltcolorgt><var>&lt;color&gt;</var></a>,
956956
it represents a solid-color image with the same intrinsic dimensions as the first image.
957957
If omitted,
958958
it defaults to the color <span class=css data-link-type=maybe>transparent</span>.
@@ -1350,7 +1350,7 @@ <h4 class=no-toc data-level=4.2.1 id=radial-gradient-syntax><span class=secno>4.
13501350
<a class=production data-link-type=type href=#typedef-size><var>&lt;size&gt;</var></a> may instead be given explicitly as:
13511351

13521352
<dl>
1353-
<dt><dfn data-dfn-type=dfn id=-length--percentage-2>[ <a class=production data-link-type=type href=#typedef-length><var>&lt;length&gt;</var></a> | <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-percentage><var>&lt;percentage&gt;</var></a> ]{2}</dfn>
1353+
<dt><dfn data-dfn-type=dfn id=-length--percentage-2>[ <a class=production data-link-type=type href=#typedef-length><var>&lt;length&gt;</var></a> | <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-fonts-3/#percentage-size-value><var>&lt;percentage&gt;</var></a> ]{2}</dfn>
13541354
<dd>
13551355
Gives the size of the ellipse explicitly.
13561356
The first value represents the horizontal radius,
@@ -1366,7 +1366,7 @@ <h4 class=no-toc data-level=4.2.1 id=radial-gradient-syntax><span class=secno>4.
13661366

13671367
<pre> radial-gradient() = radial-gradient(
13681368
[ [ circle || <a class=production data-link-type=type href=#typedef-length><var>&lt;length&gt;</var></a> ] [ at <a class=production data-link-type=type href=#typedef-position><var>&lt;position&gt;</var></a> ]? , |
1369-
[ ellipse || [ <a class=production data-link-type=type href=#typedef-length><var>&lt;length&gt;</var></a> | <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-percentage><var>&lt;percentage&gt;</var></a> ]{2} ] [ at <a class=production data-link-type=type href=#typedef-position><var>&lt;position&gt;</var></a> ]? , |
1369+
[ ellipse || [ <a class=production data-link-type=type href=#typedef-length><var>&lt;length&gt;</var></a> | <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-fonts-3/#percentage-size-value><var>&lt;percentage&gt;</var></a> ]{2} ] [ at <a class=production data-link-type=type href=#typedef-position><var>&lt;position&gt;</var></a> ]? , |
13701370
[ [ circle | ellipse ] || <a class=production data-link-type=type href=#typedef-extent-keyword><var>&lt;extent-keyword&gt;</var></a> ] [ at <a class=production data-link-type=type href=#typedef-position><var>&lt;position&gt;</var></a> ]? , |
13711371
at <a class=production data-link-type=type href=#typedef-position><var>&lt;position&gt;</var></a> ,
13721372
]?
@@ -1729,15 +1729,15 @@ <h3 data-level=4.5 id=color-stop-syntax><span class=secno>4.5 </span><span class
17291729

17301730
<pre class=prod> <dfn data-dfn-type=type id=typedef-color-stop-list>&lt;color-stop-list&gt;</dfn> =
17311731
<a class=production data-link-type=type href=#typedef-cap-linear-color-stop><var>&lt;cap-linear-color-stop&gt;</var></a> , [ <a class=production data-link-type=type href=#typedef-linear-color-stop><var>&lt;linear-color-stop&gt;</var></a># , ]? <a class=production data-link-type=type href=#typedef-cap-linear-color-stop><var>&lt;cap-linear-color-stop&gt;</var></a>
1732-
<dfn data-dfn-type=type id=typedef-cap-linear-color-stop>&lt;cap-linear-color-stop&gt;</dfn> = <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-color><var>&lt;color&gt;</var></a> &amp;&amp; <a class=production data-link-type=type href=#typedef-color-stop-length><var>&lt;color-stop-length&gt;</var></a>?
1733-
<dfn data-dfn-type=type id=typedef-linear-color-stop>&lt;linear-color-stop&gt;</dfn> = <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-color><var>&lt;color&gt;</var></a> || <a class=production data-link-type=type href=#typedef-color-stop-length><var>&lt;color-stop-length&gt;</var></a>
1734-
<dfn data-dfn-type=type id=typedef-color-stop-length>&lt;color-stop-length&gt;</dfn> = [ <var title="">&lt;length&gt;&gt; | <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-percentage><var>&lt;percentage&gt;</var></a> ]{1,2}
1732+
<dfn data-dfn-type=type id=typedef-cap-linear-color-stop>&lt;cap-linear-color-stop&gt;</dfn> = <a class=production data-link-type=type href=http://dev.w3.org/fxtf/filters/#ltcolorgt><var>&lt;color&gt;</var></a> &amp;&amp; <a class=production data-link-type=type href=#typedef-color-stop-length><var>&lt;color-stop-length&gt;</var></a>?
1733+
<dfn data-dfn-type=type id=typedef-linear-color-stop>&lt;linear-color-stop&gt;</dfn> = <a class=production data-link-type=type href=http://dev.w3.org/fxtf/filters/#ltcolorgt><var>&lt;color&gt;</var></a> || <a class=production data-link-type=type href=#typedef-color-stop-length><var>&lt;color-stop-length&gt;</var></a>
1734+
<dfn data-dfn-type=type id=typedef-color-stop-length>&lt;color-stop-length&gt;</dfn> = [ <var title="">&lt;length&gt;&gt; | <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-fonts-3/#percentage-size-value><var>&lt;percentage&gt;</var></a> ]{1,2}
17351735

17361736
<dfn data-dfn-type=type id=typedef-angular-color-stop-list>&lt;angular-color-stop-list&gt;</dfn> =
17371737
<a class=production data-link-type=type href=#typedef-cap-angular-color-stop><var>&lt;cap-angular-color-stop&gt;</var></a> , [ <a class=production data-link-type=type href=#typedef-angular-color-stop><var>&lt;angular-color-stop&gt;</var></a># , ]? <a class=production data-link-type=type href=#typedef-cap-angular-color-stop><var>&lt;cap-angular-color-stop&gt;</var></a>
1738-
<dfn data-dfn-type=type id=typedef-cap-angular-color-stop>&lt;cap-angular-color-stop&gt;</dfn> = <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-color><var>&lt;color&gt;</var></a> &amp;&amp; <a class=production data-link-type=type href=#typedef-color-stop-angle><var>&lt;color-stop-angle&gt;</var></a>?
1739-
<dfn data-dfn-type=type id=typedef-angular-color-stop>&lt;angular-color-stop&gt;</dfn> = <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-color><var>&lt;color&gt;</var></a> || <a class=production data-link-type=type href=#typedef-color-stop-angle><var>&lt;color-stop-angle&gt;</var></a>
1740-
<dfn data-dfn-type=type id=typedef-color-stop-angle>&lt;color-stop-angle&gt;</dfn> = [ <a class=production data-link-type=type href=#typedef-angle><var>&lt;angle&gt;</var></a> | <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-percentage><var>&lt;percentage&gt;</var></a> ]{1,2}
1738+
<dfn data-dfn-type=type id=typedef-cap-angular-color-stop>&lt;cap-angular-color-stop&gt;</dfn> = <a class=production data-link-type=type href=http://dev.w3.org/fxtf/filters/#ltcolorgt><var>&lt;color&gt;</var></a> &amp;&amp; <a class=production data-link-type=type href=#typedef-color-stop-angle><var>&lt;color-stop-angle&gt;</var></a>?
1739+
<dfn data-dfn-type=type id=typedef-angular-color-stop>&lt;angular-color-stop&gt;</dfn> = <a class=production data-link-type=type href=http://dev.w3.org/fxtf/filters/#ltcolorgt><var>&lt;color&gt;</var></a> || <a class=production data-link-type=type href=#typedef-color-stop-angle><var>&lt;color-stop-angle&gt;</var></a>
1740+
<dfn data-dfn-type=type id=typedef-color-stop-angle>&lt;color-stop-angle&gt;</dfn> = [ <a class=production data-link-type=type href=#typedef-angle><var>&lt;angle&gt;</var></a> | <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-fonts-3/#percentage-size-value><var>&lt;percentage&gt;</var></a> ]{1,2}
17411741
</var></pre>
17421742
<p class=issue>
17431743
This is past the complexity point where it can be easily understood with just prose.
@@ -2719,8 +2719,8 @@ <h3 data-level=7.2 id=interpolating-image-combinations><span class=secno>7.2 </s
27192719
Interpolating cross-fade()</span><a class=section-link href=#interpolating-image-combinations>§</a></h3>
27202720

27212721
<p> If both the starting and ending images are <a href=#funcdef-cross-fade>cross-fade()</a>s
2722-
which differ only by by their <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-percentage><var>&lt;percentage&gt;</var></a>,
2723-
they must be interpolated by interpolating their <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-percentage><var>&lt;percentage&gt;</var></a>.
2722+
which differ only by by their <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-fonts-3/#percentage-size-value><var>&lt;percentage&gt;</var></a>,
2723+
they must be interpolated by interpolating their <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-fonts-3/#percentage-size-value><var>&lt;percentage&gt;</var></a>.
27242724
Otherwise, they must be interpolated as generic <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-images-3/#image-type><var>&lt;image&gt;</var></a>s.
27252725

27262726

@@ -2789,7 +2789,7 @@ <h3 data-level=7.3 id=interpolating-gradients><span class=secno>7.3 </span><span
27892789
<dd>
27902790
<ul>
27912791
<li>
2792-
If the size is specified as two <a class=production data-link-type=type href=#typedef-length><var>&lt;length&gt;</var></a>s or <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-percentage><var>&lt;percentage&gt;</var></a>s,
2792+
If the size is specified as two <a class=production data-link-type=type href=#typedef-length><var>&lt;length&gt;</var></a>s or <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-fonts-3/#percentage-size-value><var>&lt;percentage&gt;</var></a>s,
27932793
it is already in its explicit form.
27942794

27952795
<li>
@@ -2861,7 +2861,7 @@ <h2 data-level=8 id=serialization><span class=secno>8 </span><span class=content
28612861
and following each serialized comma with a single space.
28622862

28632863
<p> For <a class=css data-link-type=maybe href=#funcdef-cross-fade>cross-fade()</a>,
2864-
always serialize the <a class=production data-link-type=type href=http://www.w3.org/TR/CSS21/syndata.html#value-def-percentage><var>&lt;percentage&gt;</var></a>.
2864+
always serialize the <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-fonts-3/#percentage-size-value><var>&lt;percentage&gt;</var></a>.
28652865

28662866
<div class=example>
28672867

0 commit comments

Comments
 (0)