Skip to content

Commit 45981f7

Browse files
committed
[css-color-5][css-color-hdr] Properly export the term required conversion
1 parent 3c2e987 commit 45981f7

File tree

2 files changed

+28
-25
lines changed

2 files changed

+28
-25
lines changed

css-color-5/Overview.bs

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,7 @@ or taken from the origin color
846846

847847
The origin color and the relative color need not use the same color function.
848848

849+
<dfn export>Required conversion</dfn>:
849850
All operations take part in the
850851
[=color space=] of the [=relative color=] function;
851852
<span id="required-conversion">if the
@@ -1182,7 +1183,7 @@ the allowed [=component keywords=] are:
11821183
* <dfn value for="rgb()">r</dfn>, <dfn value for="rgb()">g</dfn>, and <dfn value for="rgb()">b</dfn>
11831184
are all <<number>>s
11841185
that correspond to the [=origin color's=] red, green, and blue components
1185-
after <a href="#required-conversion">conversion, if required</a> to sRGB.
1186+
after [=required conversion|conversion, if required=] to sRGB.
11861187
255.0 is equivalent to 100%.
11871188
* <dfn value for="rgb()">alpha</dfn> is a <<number>> that corresponds to the
11881189
[=origin color's=] alpha transparency. 1.0 is equivalent to 100%.
@@ -1251,12 +1252,12 @@ the allowed [=component keywords=] are:
12511252

12521253
* <dfn value for="hsl()">h</dfn> is a <<number>>
12531254
that corresponds to the [=origin color's=] HSL hue, in degrees,
1254-
after <a href="#required-conversion">conversion, if required</a> to sRGB,
1255+
after [=required conversion|conversion, if required=] to sRGB,
12551256
normalized to a [0, 360] range. 90 is equivalent to 90deg.
12561257
* <dfn value for="hsl()">s</dfn> and <dfn value for="hsl()">l</dfn>
12571258
are <<number>>s that correspond to the [=origin color's=]
12581259
HSL saturation and lightness,
1259-
after <a href="#required-conversion">conversion, if required</a> to sRGB.
1260+
after [=required conversion|conversion, if required=] to sRGB.
12601261
100 is equivalent to 100%.
12611262
* <dfn value for="hsl()">alpha</dfn> is a <<number>> that corresponds to the
12621263
[=origin color's=] alpha transparency 1.0 is equivalent to 100%.
@@ -1295,11 +1296,11 @@ the allowed [=component keywords=] are:
12951296

12961297
* <dfn value for="hwb()">h</dfn> is a <<number>>
12971298
that corresponds to the [=origin color's=] HWB hue, in degrees,
1298-
after <a href="#required-conversion">conversion, if required</a> to sRGB,
1299+
after [=required conversion|conversion, if required=] to sRGB,
12991300
normalized to a [0, 360] range. 90 is equivalent to 90deg.
13001301
* <dfn value for="hwb()">w</dfn> and <dfn value for="hwb()">b</dfn>
13011302
are <<number>>s that correspond to the [=origin color's=] HWB whiteness and blackness
1302-
after <a href="#required-conversion">conversion, if required</a> to sRGB.
1303+
after [=required conversion|conversion, if required=] to sRGB.
13031304
100 is equivalent to 100%.
13041305
* <dfn value for="hwb()">alpha</dfn> is a <<number>> that corresponds to the
13051306
[=origin color's=] alpha transparency. 1.0 is equivalent to 100%.
@@ -1326,11 +1327,11 @@ the allowed [=component keywords=] are:
13261327

13271328
* <dfn value for="lab()">l</dfn> is a <<number>>
13281329
that corresponds to the [=origin color's=] CIE Lightness
1329-
after <a href="#required-conversion">conversion, if required</a>, to CIE Lab.
1330+
after [=required conversion|conversion, if required=], to CIE Lab.
13301331
100 is equivalent to 100%.
13311332
* <dfn value for="lab()">a</dfn> and <dfn value for="lab()">b</dfn> are <<number>>s
13321333
that correspond to the [=origin color's=] CIE Lab a and b axes
1333-
after <a href="#required-conversion">conversion, if required</a>, to CIE Lab.
1334+
after [=required conversion|conversion, if required=], to CIE Lab.
13341335
125 is equivalent to 100%, while -125 is equivalent to -100%.
13351336
* <dfn value for="lab()">alpha</dfn> is a <<number>> that corresponds to the
13361337
[=origin color's=] alpha transparency. 1.0 is equivalent to 100%.
@@ -1382,11 +1383,11 @@ the allowed [=component keywords=] are:
13821383

13831384
* <dfn value for="oklab()">l</dfn> is a <<number>>
13841385
that corresponds to the [=origin color's=] Oklab Lightness
1385-
after <a href="#required-conversion">conversion, if required</a>, to Oklab.
1386+
after [=required conversion|conversion, if required=], to Oklab.
13861387
1.0 is equivalent to 100%.
13871388
* <dfn value for="oklab()">a</dfn> and <dfn value for="oklab()">b</dfn> are <<number>>s
13881389
that correspond to the [=origin color's=] Oklab a and b axes
1389-
after <a href="#required-conversion">conversion, if required</a>, to Oklab.
1390+
after [=required conversion|conversion, if required=], to Oklab.
13901391
0.4 is equivalent to 100%, while -0.4 is equivalent to -100%.
13911392
* <dfn value for="oklab()">alpha</dfn> is a <<number>> that corresponds to the
13921393
[=origin color's=] alpha transparency. 1.0 is equivalent to 100%.
@@ -1413,15 +1414,15 @@ the allowed [=component keywords=] are:
14131414

14141415
* <dfn value for="lch()">l</dfn> is a <<number>>
14151416
that corresponds to the [=origin color's=] CIE Lightness
1416-
after <a href="#required-conversion">conversion, if required</a>, to CIE LCH.
1417+
after [=required conversion|conversion, if required=], to CIE LCH.
14171418
100 is equivalent to 100%.
14181419
* <dfn value for="lch()">c</dfn> is a <<number>>
14191420
that corresponds to the [=origin color's=] LCH chroma
1420-
after <a href="#required-conversion">conversion, if required</a>, to CIE LCH.
1421+
after [=required conversion|conversion, if required=], to CIE LCH.
14211422
150 is equivalent to 100%.
14221423
* <dfn value for="lch()">h</dfn> is a <<number>>
14231424
that corresponds to the [=origin color's=] LCH hue, in degrees,
1424-
after <a href="#required-conversion">conversion, if required</a>, to CIE LCH,
1425+
after [=required conversion|conversion, if required=], to CIE LCH,
14251426
normalized to a [0, 360] range. 90 is equivalent to 90deg.
14261427
* <dfn value for="lch()">alpha</dfn> is a <<number>> that corresponds to the
14271428
[=origin color's=] alpha transparency. 1.0 is equivalent to 100%.
@@ -1552,15 +1553,15 @@ the allowed [=component keywords=] are:
15521553

15531554
* <dfn value for="oklch()">l</dfn> is a <<number>>
15541555
that corresponds to the [=origin color's=] Oklab Lightness
1555-
after <a href="#required-conversion">conversion, if required</a>, to OKLCh.
1556+
after [=required conversion|conversion, if required=], to OKLCh.
15561557
1.0 is equivalent to 100%.
15571558
* <dfn value for="oklch()">c</dfn> is a <<number>>
15581559
that corresponds to the [=origin color's=] OKLCh chroma
1559-
after <a href="#required-conversion">conversion, if required</a>, to OKLCh.
1560+
after [=required conversion|conversion, if required=], to OKLCh.
15601561
0.4 is equivalent to 100%.
15611562
* <dfn value for="oklch()">h</dfn> is a <<number>>
15621563
that corresponds to the [=origin color's=] OKLCh hue, in degrees,
1563-
after <a href="#required-conversion">conversion, if required</a>, to OKLCh,
1564+
after [=required conversion|conversion, if required=], to OKLCh,
15641565
normalized to a [0, 360] range. 90 is equivalent to 90deg.
15651566
* <dfn value for="oklch()">alpha</dfn> is a <<number>> that corresponds to the
15661567
[=origin color's=] alpha transparency. 1.0 is equivalent to 100%.
@@ -1670,23 +1671,23 @@ the number and name of the allowed [=component keywords=] are:
16701671
* defined by the '@color-profile/components' descriptor on the corresponding ''@color-profile'',
16711672
if present;
16721673
otherwise, no relative color manipulation is valid. They are <<number>>s that correspond to the [=origin color's=] components
1673-
after <a href="#required-conversion">conversion, if required</a> to the color space of the color profile. The value 1.0 corresponds to 100%.
1674+
after [=required conversion|conversion, if required=] to the color space of the color profile. The value 1.0 corresponds to 100%.
16741675

16751676
Within a [=relative color=] syntax ''color()'' function using <<predefined-rgb-params>>,
16761677
the allowed [=component keywords=] are:
16771678

16781679
* <dfn value for="color()">r</dfn>, <dfn value for="color()">g</dfn>, and <dfn value for="color()">b</dfn>
16791680
are all <<number>>s
16801681
that correspond to the [=origin color's=] red, green, and blue components
1681-
after <a href="#required-conversion">conversion, if required</a> to the predefined RGB color space.
1682+
after [=required conversion|conversion, if required=] to the predefined RGB color space.
16821683
The value 1.0 corresponds to 100%.
16831684

16841685
Within a [=relative color=] syntax ''color()'' function using <<xyz-params>>,
16851686
the allowed [=component keywords=] are:
16861687

16871688
* <dfn value for="color()">x</dfn>, <dfn value for="color()">y</dfn>, <dfn value for="color()">z</dfn> are all <<number>>s
16881689
that correspond to the [=origin color's=] X, Y and Z components
1689-
after <a href="#required-conversion">conversion, if required</a> to relative CIE XYZ color space
1690+
after [=required conversion|conversion, if required=] to relative CIE XYZ color space
16901691
adapted to the relevant white point.
16911692
The value 1.0 corresponds to 100%.
16921693

css-color-hdr-1/Overview.bs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ WPT Display: open
2626
spec:css-color-4; type:dfn; text:modern color syntax
2727
spec:css-color-4; type:value; text:alpha-value
2828
spec:css-color-5; type:type; text:<color>
29+
spec:css-color-5; type:dfn; text:component keywords
30+
spec:css-color-5; type:dfn; text:origin color
2931
spec:css-color-adjust-1; type:value; text:light
3032
spec:css-color-adjust-1; type:value; text:dark
3133
spec:css-color-4; type:value; text:rec2020
@@ -787,11 +789,11 @@ Mixing Dynamic Range Limits: the ''dynamic-range-limit-mix()'' function {#dynami
787789

788790
* <dfn value for="ictcp()">i</dfn> is a <<number>>
789791
that corresponds to the [=origin color's=] ictcp Lightness
790-
after <a href="#required-conversion">conversion, if required</a>, to ictcp.
792+
after [=required conversion|conversion, if required=], to ictcp.
791793
1.0 is equivalent to 100%.
792794
* <dfn value for="ictcp()">ct</dfn> and <dfn value for="ictcp()">cp</dfn> are <<number>>s
793795
that correspond to the [=origin color's=] ictcp ct and cp axes
794-
after <a href="#required-conversion">conversion, if required</a>, to ictcp.
796+
after [=required conversion|conversion, if required=], to ictcp.
795797
0.5 is equivalent to 100%, while -0.5 is equivalent to -100%.
796798
* <dfn value for="ictcp()">alpha</dfn> is a <<number>> that corresponds to the
797799
[=origin color's=] alpha transparency. 1.0 is equivalent to 100%.
@@ -856,11 +858,11 @@ Mixing Dynamic Range Limits: the ''dynamic-range-limit-mix()'' function {#dynami
856858

857859
* <dfn value for="jzazbz()">j</dfn> is a <<number>>
858860
that corresponds to the [=origin color's=] jzazbz Jz Lightness
859-
after <a href="#required-conversion">conversion, if required</a>, to jzazbz.
861+
after [=required conversion|conversion, if required=], to jzazbz.
860862
1.0 is equivalent to 100%.
861863
* <dfn value for="jzazbz()">a</dfn> and <dfn value for="jzazbz()">b</dfn> are <<number>>s
862864
that correspond to the [=origin color's=] jzazbz az and bz axes
863-
after <a href="#required-conversion">conversion, if required</a>, to jzazbz.
865+
after [=required conversion|conversion, if required=], to jzazbz.
864866
0.21 is equivalent to 100%, while -0.21 is equivalent to -100%.
865867
* <dfn value for="jzazbz()">alpha</dfn> is a <<number>> that corresponds to the
866868
[=origin color's=] alpha transparency. 1.0 is equivalent to 100%.
@@ -913,15 +915,15 @@ Mixing Dynamic Range Limits: the ''dynamic-range-limit-mix()'' function {#dynami
913915

914916
* <dfn value for="jzczhz()">j</dfn> is a <<number>>
915917
that corresponds to the [=origin color's=] Jz (Lightness)
916-
after <a href="#required-conversion">conversion, if required</a>, to CIE jzczhz.
918+
after [=required conversion|conversion, if required=], to CIE jzczhz.
917919
100 is equivalent to 100%.
918920
* <dfn value for="jzczhz()">c</dfn> is a <<number>>
919921
that corresponds to the [=origin color's=] Cz (chroma)
920-
after <a href="#required-conversion">conversion, if required</a>, to CIE jzczhz.
922+
after [=required conversion|conversion, if required=], to CIE jzczhz.
921923
0.26 is equivalent to 100%.
922924
* <dfn value for="jzczhz()">h</dfn> is a <<number>>
923925
that corresponds to the [=origin color's=] hz (hue), in degrees,
924-
after <a href="#required-conversion">conversion, if required</a>, to CIE jzczhz,
926+
after [=required conversion|conversion, if required=], to CIE jzczhz,
925927
normalized to a [0, 360] range. 90 is equivalent to 90deg.
926928
* <dfn value for="jzczhz()">alpha</dfn> is a <<number>> that corresponds to the
927929
[=origin color's=] alpha transparency. 1.0 is equivalent to 100%.

0 commit comments

Comments
 (0)