Skip to content

Commit f47c1be

Browse files
author
reffy-bot
committed
Update of TR report from new reffy run
Using reffy commit 20.0.3.
1 parent 750237c commit f47c1be

16 files changed

+1043
-400
lines changed

tr/algorithms/css-color-hdr-1.json

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,43 @@
1515
"html": "<p>Let <var>p1</var>, ..., <var>pN</var> be the mixing percentages, normalized to sum to 100%.</p>"
1616
},
1717
{
18-
"html": "<p>Define the contributing percentages as:</p>\n <ul>\n <li data-md=\"\">\n <p>Let <var>p1_standard</var>,...,<var>pN_standard</var> be the percentages for <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-standard\" id=\"ref-for-valdef-dynamic-range-limit-standard①\">standard</a> in <var>v1</var>,...,<var>vN</var></p>\n </li><li data-md=\"\">\n <p>Let <var>p1_constrained_high</var>,...,<var>pN_constrained_high</var> be the percentages for <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-constrained-high\" id=\"ref-for-valdef-dynamic-range-limit-constrained-high①\">constrained-high</a> in <var>v1</var>,...,<var>vN</var></p>\n </li><li data-md=\"\">\n <p>Let <var>p1_high</var>,...,<var>pN_high</var> be the percentages for <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-high\" id=\"ref-for-valdef-dynamic-range-limit-high①\">high</a> in <var>v1</var>,...,<var>vN</var></p>\n </li></ul>"
18+
"html": "<p>Define the contributing percentages as:</p>\n <ul>\n <li data-md=\"\">\n <p>Let <var>p1_standard</var>,...,<var>pN_standard</var> be the percentages for <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-standard\" id=\"ref-for-valdef-dynamic-range-limit-standard①\">standard</a> in <var>v1</var>,...,<var>vN</var></p>\n </li><li data-md=\"\">\n <p>Let <var>p1_constrained_high</var>,...,<var>pN_constrained_high</var> be the percentages for <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-constrained\" id=\"ref-for-valdef-dynamic-range-limit-constrained①\">constrained</a> in <var>v1</var>,...,<var>vN</var></p>\n </li><li data-md=\"\">\n <p>Let <var>p1_no_limit</var>,...,<var>pN_no_limit</var> be the percentages for <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-no-limit\" id=\"ref-for-valdef-dynamic-range-limit-no-limit①\">no-limit</a> in <var>v1</var>,...,<var>vN</var></p>\n </li></ul>"
1919
},
2020
{
21-
"html": "<p>Compute the weighted sums as:</p>\n <ul>\n <li data-md=\"\">\n <p><var>p_standard</var>=(<var>p1_standard</var>*<var>p1</var>+...+<var>pN_standard</var>*<var>pN</var>)/100.</p>\n </li><li data-md=\"\">\n <p><var>p_constrained_high</var>=(<var>p1_constrained_high</var>*<var>p1</var>+...+<var>pN_constrained_high</var>*<var>pN</var>)/100.</p>\n </li><li data-md=\"\">\n <p><var>p_high</var>=(<var>p1_high</var>*<var>p1</var>+...+<var>pN_high</var>*<var>pN</var>)/100.</p>\n </li></ul>"
21+
"html": "<p>Compute the weighted sums as:</p>\n <ul>\n <li data-md=\"\">\n <p><var>p_standard</var>=(<var>p1_standard</var>*<var>p1</var>+...+<var>pN_standard</var>*<var>pN</var>)/100.</p>\n </li><li data-md=\"\">\n <p><var>p_constrained_high</var>=(<var>p1_constrained_high</var>*<var>p1</var>+...+<var>pN_constrained_high</var>*<var>pN</var>)/100.</p>\n </li><li data-md=\"\">\n <p><var>p_no_limit</var>=(<var>p1_no_limit</var>*<var>p1</var>+...+<var>pN_no_limit</var>*<var>pN</var>)/100.</p>\n </li></ul>"
2222
},
2323
{
24-
"html": "<p>If <var>p_standard</var>, <var>p_constrained_high</var>, or <var>p_high</var> equals 100%, then the computed value is <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-standard\" id=\"ref-for-valdef-dynamic-range-limit-standard②\">standard</a>, <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-constrained-high\" id=\"ref-for-valdef-dynamic-range-limit-constrained-high\">constrained-high</a>, or <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-high\" id=\"ref-for-valdef-dynamic-range-limit-high\">high</a>, respectively.</p>"
24+
"html": "<p>If <var>p_standard</var>, <var>p_constrained_high</var>, or <var>p_no_limit</var> equals 100%, then the computed value is <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-standard\" id=\"ref-for-valdef-dynamic-range-limit-standard②\">standard</a>, <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-constrained\" id=\"ref-for-valdef-dynamic-range-limit-constrained②\">constrained</a>, or <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-no-limit\" id=\"ref-for-valdef-dynamic-range-limit-no-limit\">no-limit</a>, respectively.</p>"
2525
},
2626
{
27-
"html": "<p>Otherwise, the computed value is <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#funcdef-dynamic-range-limit-mix\" id=\"ref-for-funcdef-dynamic-range-limit-mix④\">dynamic-range-limit-mix()</a>, with parameters <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-standard\" id=\"ref-for-valdef-dynamic-range-limit-standard③\">standard</a>, <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-constrained-high\" id=\"ref-for-valdef-dynamic-range-limit-constrained-high③\">constrained-high</a>, and <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-high\" id=\"ref-for-valdef-dynamic-range-limit-high③\">high</a>, in that order, and percentages <var>p_standard</var>, <var>p_constrained_high</var>, and <var>p_high</var>, omitting parameters with a percentage equal to 0%.</p>"
27+
"html": "<p>Otherwise, the computed value is <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#funcdef-dynamic-range-limit-mix\" id=\"ref-for-funcdef-dynamic-range-limit-mix④\">dynamic-range-limit-mix()</a>, with parameters <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-standard\" id=\"ref-for-valdef-dynamic-range-limit-standard③\">standard</a>, <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-constrained\" id=\"ref-for-valdef-dynamic-range-limit-constrained③\">constrained</a>, and <a class=\"css\" data-link-type=\"maybe\" href=\"https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-no-limit\" id=\"ref-for-valdef-dynamic-range-limit-no-limit③\">no-limit</a>, in that order, and percentages <var>p_standard</var>, <var>p_constrained_high</var>, and <var>p_no_limit</var>, omitting parameters with a percentage equal to 0%. If <em>all</em> parameters are thereby omitted, the computed value is the initial value.</p>"
28+
}
29+
]
30+
},
31+
{
32+
"html": "To interpolate between a color <var>c1</var> at headroom <var>H1</var> and a color <var>c2</var> at headroom <var>H2</var>,\n\tgiving result color <var>cxyz</var>,\n\twhen the target headroom is <var>H</var>:",
33+
"rationale": "let",
34+
"steps": [
35+
{
36+
"html": "<p>Let <var>c1xyz</var> be <var>c1</var> converted to <a data-link-type=\"dfn\" href=\"https://www.w3.org/TR/css-color-hdr-1/#absolute-d65-cie-xyz\" id=\"ref-for-absolute-d65-cie-xyz\">Absolute D65 CIE XYZ</a></p>"
37+
},
38+
{
39+
"html": "<p>Let <var>c2xyz</var> be <var>c2</var> converted to <a data-link-type=\"dfn\" href=\"https://www.w3.org/TR/css-color-hdr-1/#absolute-d65-cie-xyz\" id=\"ref-for-absolute-d65-cie-xyz①\">Absolute D65 CIE XYZ</a></p>"
40+
},
41+
{
42+
"html": "<p>Let <var> w1</var> = clamp((<var>H</var> - <var>H2</var>) / (<var>H1</var> - <var>H2</var>), 0, 1)</p>"
43+
},
44+
{
45+
"html": "<p>Let <var> w2</var> = clamp((<var>H</var> - <var>H1</var>) / (<var>H2</var> - <var>H1</var>), 0, 1)\nNote that <var> w2</var> = 1 - <var> w1</var></p>"
46+
},
47+
{
48+
"html": "<p>Let <var>eps</var> = 0.001</p>"
49+
},
50+
{
51+
"html": "<p>Let <var>cxyz</var> = Array(3)</p>"
52+
},
53+
{
54+
"html": "<p>For i from 0 to 2:\nLet <var>cxyz</var>[i] = pow(<var>c1xyz</var>[i] + <var>eps</var>, <var>w1</var> ) * pow(<var>c2xyz</var>[i] + <var>eps</var>, <var>w2</var> ) - <var>eps</var></p>"
2855
}
2956
]
3057
}

tr/css/css-color-hdr.json

Lines changed: 122 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
{
88
"name": "dynamic-range-limit",
99
"href": "https://www.w3.org/TR/css-color-hdr-1/#propdef-dynamic-range-limit",
10-
"value": "standard | high | constrained-high | <dynamic-range-limit-mix()>",
11-
"initial": "high",
10+
"value": "standard | no-limit | constrained | <dynamic-range-limit-mix()>",
11+
"initial": "no-limit",
1212
"appliesTo": "all elements",
1313
"inherited": "yes",
1414
"percentages": "n/a",
@@ -18,24 +18,24 @@
1818
"values": [
1919
{
2020
"name": "standard",
21-
"prose": "The highest luminance color that is displayed is the same as media white, i.e. the CSS color white.",
21+
"prose": "The highest luminance color that is displayed is the same as HDR reference white, i.e. the CSS color white.",
2222
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-standard",
2323
"type": "value",
2424
"value": "standard"
2525
},
2626
{
27-
"name": "high",
28-
"prose": "The highest peak luminance that is displayed is much greater than media white, i.e. the CSS color white; the precise level is not specified.",
29-
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-high",
27+
"name": "no-limit",
28+
"prose": "The highest peak luminance that is displayed is much greater than HDR reference white, i.e. the CSS color white; the precise level is not specified.",
29+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-no-limit",
3030
"type": "value",
31-
"value": "high"
31+
"value": "no-limit"
3232
},
3333
{
34-
"name": "constrained-high",
35-
"prose": "The highest peak luminance that is displayed is somewhat greater than media white, i.e. the CSS color white, such that a mix of SDR and HDR content can be comfortably viewed together.",
36-
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-constrained-high",
34+
"name": "constrained",
35+
"prose": "The highest peak luminance that is displayed is somewhat greater than HDR reference white, i.e. the CSS color white, such that a mix of SDR and HDR content can be comfortably viewed together.",
36+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-dynamic-range-limit-constrained",
3737
"type": "value",
38-
"value": "constrained-high"
38+
"value": "constrained"
3939
}
4040
],
4141
"styleDeclaration": [
@@ -49,69 +49,135 @@
4949
"values": [
5050
{
5151
"name": "dynamic-range-limit-mix()",
52-
"value": "dynamic-range-limit-mix( [ <ident> && <percentage [0,100]> ]#)",
52+
"value": "dynamic-range-limit-mix( [ <'dynamic-range-limit'> && <percentage [0,100]> ]#{2,} )",
5353
"href": "https://www.w3.org/TR/css-color-hdr-1/#funcdef-dynamic-range-limit-mix",
5454
"type": "function"
5555
},
5656
{
57-
"name": "color()",
58-
"value": "color( [from <color>]? <colorspace-params> [ / [ <alpha-value> | none ] ]? )",
59-
"href": "https://www.w3.org/TR/css-color-hdr-1/#funcdef-color",
60-
"type": "function"
61-
},
62-
{
63-
"name": "<colorspace-params>",
64-
"href": "https://www.w3.org/TR/css-color-hdr-1/#typedef-colorspace-params",
57+
"name": "<color-function>",
58+
"href": "https://www.w3.org/TR/css-color-hdr-1/#typedef-color-function",
6559
"type": "type",
66-
"value": "[<custom-params> | <predefined-rgb-params> | <predefined-polar-params> | <predefined-rectangular-params> | <xyz-params>]"
60+
"value": "<rgb()> | <rgba()> | <hsl()> | <hsla()> | <hwb()> | <lab()> | <lch()> | <oklab()> | <oklch()> | <ictcp()> | <jzazbz()> | <jzczhz()> | <alpha()> | <color()>"
6761
},
6862
{
69-
"name": "<custom-params>",
70-
"href": "https://www.w3.org/TR/css-color-hdr-1/#typedef-custom-params",
71-
"type": "type",
72-
"value": "<dashed-ident> [ <number> | <percentage> | none ]+"
63+
"name": "ictcp()",
64+
"value": "ictcp([from <color>]? [<percentage> | <number> | none] [<percentage> | <number> | none] [<percentage> | <number> | none] [ / [<alpha-value> | none] ]? )",
65+
"href": "https://www.w3.org/TR/css-color-hdr-1/#funcdef-ictcp",
66+
"type": "function",
67+
"values": [
68+
{
69+
"name": "i",
70+
"prose": "i is a <number> that corresponds to the origin color’s I (Lightness) after conversion, if required, to ictcp. 1.0 is equivalent to 100%.",
71+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-ictcp-i",
72+
"type": "value",
73+
"value": "i"
74+
},
75+
{
76+
"name": "ct",
77+
"prose": "ct and cp are <number>s that correspond to the origin color’s ct and cp axes after conversion, if required, to ictcp. 0.5 is equivalent to 100%, while -0.5 is equivalent to -100%.",
78+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-ictcp-ct",
79+
"type": "value",
80+
"value": "ct"
81+
},
82+
{
83+
"name": "cp",
84+
"prose": "ct and cp are <number>s that correspond to the origin color’s ct and cp axes after conversion, if required, to ictcp. 0.5 is equivalent to 100%, while -0.5 is equivalent to -100%.",
85+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-ictcp-cp",
86+
"type": "value",
87+
"value": "cp"
88+
},
89+
{
90+
"name": "alpha",
91+
"prose": "alpha is a <number> that corresponds to the origin color’s alpha transparency. 1.0 is equivalent to 100%.",
92+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-ictcp-alpha",
93+
"type": "value",
94+
"value": "alpha"
95+
}
96+
]
7397
},
7498
{
75-
"name": "<predefined-rgb-params>",
76-
"href": "https://www.w3.org/TR/css-color-hdr-1/#typedef-predefined-rgb-params",
77-
"type": "type",
78-
"value": "<predefined-rgb> [ <number> | <percentage> | none ]{3}"
99+
"name": "jzazbz()",
100+
"value": "jzazbz([from <color>]? [<percentage> | <number> | none] [<percentage> | <number> | none] [<percentage> | <number> | none] [ / [<alpha-value> | none] ]? )",
101+
"href": "https://www.w3.org/TR/css-color-hdr-1/#funcdef-jzazbz",
102+
"type": "function",
103+
"values": [
104+
{
105+
"name": "j",
106+
"prose": "j is a <number> that corresponds to the origin color’s Jz (Lightness) after conversion, if required, to jzazbz. 1.0 is equivalent to 100%.",
107+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-jzazbz-j",
108+
"type": "value",
109+
"value": "j"
110+
},
111+
{
112+
"name": "a",
113+
"prose": "a and b are <number>s that correspond to the origin color’s az and bz axes after conversion, if required, to jzazbz. 0.21 is equivalent to 100%, while -0.21 is equivalent to -100%.",
114+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-jzazbz-a",
115+
"type": "value",
116+
"value": "a"
117+
},
118+
{
119+
"name": "b",
120+
"prose": "a and b are <number>s that correspond to the origin color’s az and bz axes after conversion, if required, to jzazbz. 0.21 is equivalent to 100%, while -0.21 is equivalent to -100%.",
121+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-jzazbz-b",
122+
"type": "value",
123+
"value": "b"
124+
},
125+
{
126+
"name": "alpha",
127+
"prose": "alpha is a <number> that corresponds to the origin color’s alpha transparency. 1.0 is equivalent to 100%.",
128+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-jzazbz-alpha",
129+
"type": "value",
130+
"value": "alpha"
131+
}
132+
]
79133
},
80134
{
81-
"name": "<predefined-polar-params>",
82-
"href": "https://www.w3.org/TR/css-color-hdr-1/#typedef-predefined-polar-params",
83-
"type": "type",
84-
"value": "jzczhz [ <number> | <percentage> | none ]{2} [ <hue> | none]"
135+
"name": "jzczhz()",
136+
"value": "jzczhz([from <color>]? [<percentage> | <number> | none] [<percentage> | <number> | none] [<hue> | none] [ / [<alpha-value> | none] ]? )",
137+
"href": "https://www.w3.org/TR/css-color-hdr-1/#funcdef-jzczhz",
138+
"type": "function",
139+
"values": [
140+
{
141+
"name": "j",
142+
"prose": "j is a <number> that corresponds to the origin color’s Jz (Lightness) after conversion, if required, to jzczhz. 100 is equivalent to 100%.",
143+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-jzczhz-j",
144+
"type": "value",
145+
"value": "j"
146+
},
147+
{
148+
"name": "c",
149+
"prose": "c is a <number> that corresponds to the origin color’s Cz (chroma) after conversion, if required, to jzczhz. 0.26 is equivalent to 100%.",
150+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-jzczhz-c",
151+
"type": "value",
152+
"value": "c"
153+
},
154+
{
155+
"name": "h",
156+
"prose": "h is a <number> that corresponds to the origin color’s hz (hue), in degrees, after conversion, if required, to jzczhz, normalized to a [0, 360] range. 90 is equivalent to 90deg.",
157+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-jzczhz-h",
158+
"type": "value",
159+
"value": "h"
160+
},
161+
{
162+
"name": "alpha",
163+
"prose": "alpha is a <number> that corresponds to the origin color’s alpha transparency. 1.0 is equivalent to 100%.",
164+
"href": "https://www.w3.org/TR/css-color-hdr-1/#valdef-jzczhz-alpha",
165+
"type": "value",
166+
"value": "alpha"
167+
}
168+
]
85169
},
86170
{
87-
"name": "<predefined-rectangular-params>",
88-
"href": "https://www.w3.org/TR/css-color-hdr-1/#typedef-predefined-rectangular-params",
89-
"type": "type",
90-
"value": "<predefined-rectangular> [ <number> | <percentage> | none ]{3}"
171+
"name": "hdr-color()",
172+
"value": "color-hdr([ <color> && <number [0,∞]>? ]#{2})",
173+
"href": "https://www.w3.org/TR/css-color-hdr-1/#funcdef-hdr-color",
174+
"type": "function"
91175
},
92176
{
93177
"name": "<predefined-rgb>",
94178
"href": "https://www.w3.org/TR/css-color-hdr-1/#typedef-predefined-rgb",
95179
"type": "type",
96-
"value": "srgb | srgb-linear | display-p3 | a98-rgb | prophoto-rgb | rec2020 | rec2100-pq | rec2100-hlg | rec2100-linear"
97-
},
98-
{
99-
"name": "<predefined-rectangular>",
100-
"href": "https://www.w3.org/TR/css-color-hdr-1/#typedef-predefined-rectangular",
101-
"type": "type",
102-
"value": "jzazbz | ictcp"
103-
},
104-
{
105-
"name": "<xyz-params>",
106-
"href": "https://www.w3.org/TR/css-color-hdr-1/#typedef-xyz-params",
107-
"type": "type",
108-
"value": "<xyz> [ <number> | <percentage> | none ]{3}"
109-
},
110-
{
111-
"name": "<xyz>",
112-
"href": "https://www.w3.org/TR/css-color-hdr-1/#typedef-xyz",
113-
"type": "type",
114-
"value": "xyz | xyz-d50 | xyz-d65"
180+
"value": "srgb | srgb-linear | display-p3 | display-p3-linear | a98-rgb | prophoto-rgb | rec2020 | rec2100-pq | rec2100-hlg | rec2100-linear"
115181
}
116182
]
117183
}

0 commit comments

Comments
 (0)