Skip to content

Commit 7ee2ce0

Browse files
triple-underscoretriple-underscore
committed
[css-values-4][css-color-5][css-fonts-4][css-images-4][css-shapes-2] Clean up fetching w3c/csswg-drafts@034a433 
1 parent 960f374 commit 7ee2ce0

5 files changed

Lines changed: 238 additions & 106 deletions

File tree

‎css-color5-ja.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
●●options
175175

176176
spec_title:CSS Color Module Level 5
177-
spec_date:2025-05-26
177+
spec_date:2025-06-03
178178
trans_update:2025-06-05
179179
source_checked:250423
180180
page_state_key:CSS
@@ -468,7 +468,6 @@
468468
正準-単位:~CSSVAL#canonical-unit
469469

470470
解決d値:~CSSOM1#resolved-value
471-
親~stylesheet:~CSSOM1#concept-css-rule-parent-css-style-sheet
472471
外部の色~profileを~fetchする:#fetch-an-external-color-profile
473472

474473
使用~色~scheme:~CSSCOLORADJUST#used-color-scheme
@@ -4568,7 +4567,6 @@ <h3 title="Specifying a Color Profile: the @color-profile at-rule">5.3. 色~prof
45684567
( `color-profile$at 規則 %規則 )
45694568
に対し：
45704569
</p>
4571-
45724570
<ol>
45734571
<li class="algo">
45744572
%応答の処理n ~LET 所与の
@@ -4584,11 +4582,14 @@ <h3 title="Specifying a Color Profile: the @color-profile at-rule">5.3. 色~prof
45844582
%~stream から構文解析された色~profileを適用する
45854583
</li>
45864584
<li>
4587-
`~style資源を~fetchする$( %規則 の~URL, %規則 の`親~stylesheet$, `color-profile^l, `cors^l, %応答の処理n )
4585+
%~URL値 ~LET %規則 の `src$d にて指定された `url$t
4586+
</li>
4587+
<li>
4588+
`~style資源を~fetchする$( %~URL値, %規則, `color-profile^l, `cors^l, %応答の処理n )
45884589
</li>
45894590
</ol>
45904591
◎
4591-
To fetch an external color profile, given a @color-profile rule rule, fetch a style resource given rule’s URL, with stylesheet being rule’s parent CSS style sheet, destination "color-profile", CORS mode "cors", and processResponse being the following steps given response |/res| and null, failure or a byte stream byteStream: If byteStream is a byte stream, apply the color profile as parsed from |byteStream.
4592+
To fetch an external color profile, given a @color-profile rule rule, fetch a style resource given rule’s URL, with ruleOrDeclaration being rule, destination "color-profile", CORS mode "cors", and processResponse being the following steps given response |/res| and null, failure or a byte stream byteStream: If byteStream is a byte stream, apply the color profile as parsed from |byteStream.
45924593
</div>
45934594

45944595
<p class="note">注記：

‎css-fonts4-ja.html‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@
260260
●●options
261261

262262
spec_title:CSS Fonts Module Level 4
263-
spec_date:2025-04-23
264-
trans_update:2025-04-25
263+
spec_date:2025-06-03
264+
trans_update:2025-06-05
265265
source_checked:240927
266266
page_state_key:CSS
267267
original_url:https://drafts.csswg.org/css-fonts-4/
@@ -8464,14 +8464,17 @@ <h4 title="Font fetching requirements">4.8.2. ~font~fetchingに課される要
84648464

84658465
<div class="algo">
84668466
<p>
8467-
（`font-face^at 用に選定された `url$t から）
84688467
`~fontを~fetchする@
84698468
~algoは、
84708469
所与の
84718470
( `url$t %~URL, `font-face$at %規則 )
84728471
対し：
84738472
</p>
84748473
<ol>
8474+
<li>
8475+
~Assert：
8476+
%~URL は %規則 用に【その `src$d 記述子を介して】選定された~URLである。
8477+
</li>
84758478
<li class="algo">
84768479
<p>
84778480
%応答の処理n ~LET 所与の
@@ -8483,7 +8486,7 @@ <h4 title="Font fetching requirements">4.8.2. ~font~fetchingに課される要
84838486
<ol>
84848487
<li>
84858488
~IF［
8486-
%~stream ~EQ ~NULL
8489+
%~stream ~NEQ ~NULL
84878490
］
84888491
⇒
84898492
~RET
@@ -8494,12 +8497,18 @@ <h4 title="Font fetching requirements">4.8.2. ~font~fetchingに課される要
84948497
</ol>
84958498
</li>
84968499
<li>
8497-
`~style資源を~fetchする$( %~URL, %規則 の`親~stylesheet$, `font^l, `cors^l, %応答の処理n )
8500+
`~style資源を~fetchする$( ↓ )
8501+
⇒＃
8502+
%~URL,
8503+
%規則,
8504+
`font^l,
8505+
`cors^l,
8506+
%応答の処理n
84988507
</li>
84998508
</ol>
85008509

85018510
◎
8502-
To fetch a font given a selected &lt;url&gt; url for @font-face rule, fetch url, with stylesheet being rule’s parent CSS style sheet, destination "font", CORS mode "cors", and processResponse being the following steps given response res and null, failure or a byte stream stream:
8511+
To fetch a font given a selected &lt;url&gt; url for @font-face rule, fetch url, with ruleOrDeclaration being rule, destination "font", CORS mode "cors", and processResponse being the following steps given response res and null, failure or a byte stream stream:
85038512
• If stream is null, return.
85048513
• Load a font from stream according to its type.
85058514
</div>
@@ -8535,7 +8544,7 @@ <h4 title="Font fetching requirements">4.8.2. ~font~fetchingに課される要
85358544

85368545
<p>
85378546
下の［
8538-
各種 `src$d 記述子 の値
8547+
各種 `src$d 記述子の値
85398548
］により定義される~fontは、
85408549
読込まれることになる：
85418550
◎

‎css-images4-ja.html‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@
188188
●●options
189189

190190
spec_title:CSS Images Module Level 4
191-
spec_date:2025-03-18
192-
trans_update:2025-03-19
191+
spec_date:2025-06-03
192+
trans_update:2025-06-05
193193
source_checked:240719
194194
page_state_key:CSS
195195
original_url:https://drafts.csswg.org/css-images-4/
@@ -272,7 +272,6 @@
272272
SameObject:~WEBIDLjs#SameObject
273273
any:~WEBIDL#idl-any
274274
I.CSS:~CSSOM1#namespacedef-css
275-
I.CSSStyleSheet:~CSSOM1#cssstylesheet
276275

277276
m.elementSources:#dom-css-elementsources
278277

@@ -473,6 +472,8 @@
473472

474473
内在的~size:~SIZING#intrinsic-size
475474

475+
~CSS宣言:~CSSOM1#css-declaration
476+
476477
●用語（外部
477478

478479
~tuple:~INFRA#tuple
@@ -1174,11 +1175,11 @@
11741175
[CSS-CASCADE-5]
11751176
Elika Etemad; Miriam Suzanne; Tab Atkins Jr.. ＜CSS Cascading and Inheritance Level 5＞. 13 January 2022. CR. URL: https://www.w3.org/TR/css-cascade-5/
11761177
[CSS-COLOR-4]
1177-
Chris Lilley; Tab Atkins Jr.; Lea Verou. ＜CSS Color Module Level 4＞. 13 February 2024. CRD. URL: https://www.w3.org/TR/css-color-4/
1178+
Chris Lilley; Tab Atkins Jr.; Lea Verou. ＜CSS Color Module Level 4＞. 24 April 2025. CRD. URL: https://www.w3.org/TR/css-color-4/
11781179
[CSS-COLOR-5]
11791180
Chris Lilley; et al. ＜CSS Color Module Level 5＞. 18 March 2025. WD. URL: https://www.w3.org/TR/css-color-5/
11801181
[CSS-GRID-2]
1181-
Tab Atkins Jr.; Elika Etemad; Rossen Atanassov. ＜CSS Grid Layout Module Level 2＞. 18 December 2020. CRD. URL: https://www.w3.org/TR/css-grid-2/
1182+
Tab Atkins Jr.; et al. ＜CSS Grid Layout Module Level 2＞. 26 March 2025. CRD. URL: https://www.w3.org/TR/css-grid-2/
11821183
[CSS-IMAGES-3]
11831184
Tab Atkins Jr.; Elika Etemad; Lea Verou. ＜CSS Images Module Level 3＞. 18 December 2023. CRD. URL: https://www.w3.org/TR/css-images-3/
11841185
[CSS-IMAGES-4]
@@ -1216,7 +1217,7 @@
12161217
[MIMESNIFF]
12171218
Gordon P. Hemsley. ＜MIME Sniffing Standard＞. Living Standard. URL: https://mimesniff.spec.whatwg.org/
12181219
[PNG]
1219-
Chris Lilley; et al. ＜Portable Network Graphics (PNG) Specification (Third Edition)＞. 13 March 2025. CR. URL: https://www.w3.org/TR/png-3/
1220+
Chris Lilley; et al. ＜Portable Network Graphics (PNG) Specification (Third Edition)＞. 15 May 2025. PR. URL: https://www.w3.org/TR/png-3/
12201221
[RFC2119]
12211222
S. Bradner. ＜Key words for use in RFCs to Indicate Requirement Levels＞. March 1997. Best Current Practice. URL: https://datatracker.ietf.org/doc/html/rfc2119
12221223
[SELECT]
@@ -1580,7 +1581,7 @@ <h3 title="Fetching External Images">2.3. 外部~画像の~fetch法</h3>
15801581
`~stylesheet用に外部の画像を~fetchする@
15811582
~algoは、
15821583
所与の
1583-
( `url$t %~URL, `CSSStyleSheet$I %sheet )
1584+
( `url$t %~URL, `~CSS宣言$ %宣言 )
15841585
に対し：
15851586
</p>
15861587
<ol>
@@ -1598,11 +1599,11 @@ <h3 title="Fetching External Images">2.3. 外部~画像の~fetch法</h3>
15981599
%~stream から画像を読込む
15991600
</li>
16001601
<li>
1601-
`~style資源を~fetchする$( %~URL, %sheet, `image^l, `no-cors^l, %応答の処理n )
1602+
`~style資源を~fetchする$( %~URL, %宣言, `image^l, `no-cors^l, %応答の処理n )
16021603
</li>
16031604
</ol>
16041605
◎
1605-
To fetch an external image for a stylesheet, given a &lt;url&gt; url and CSSStyleSheet sheet, fetch a style resource given url, with stylesheet CSSStyleSheet, destination "image", CORS mode "no-cors", and processResponse being the following steps given response res and null, failure or a byte stream byteStream: If byteStream is a byte stream, load the image from the byte stream.
1606+
To fetch an external image for a stylesheet, given a &lt;url&gt; url and a CSS style declaration declaration, fetch a style resource given url, with ruleOrDeclaration being declaration, destination "image", CORS mode "no-cors", and processResponse being the following steps given response res and null, failure or a byte stream byteStream: If byteStream is a byte stream, load the image from the byte stream.
16061607
</div>
16071608

16081609
</section>

‎css-shapes2-ja.html‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@
111111
●●options
112112

113113
spec_title:CSS Shapes Module Level 2
114-
spec_date:2025-03-10
115-
trans_update:2025-04-25
114+
spec_date:2025-06-03
115+
trans_update:2025-06-05
116116
source_checked:220307
117117
page_state_key:CSS
118118
original_url:https://drafts.csswg.org/css-shapes-2/
@@ -142,7 +142,6 @@
142142
p:code
143143
t:var
144144
css:code
145-
I:code
146145
e:code
147146
a:code
148147
v:code
@@ -244,7 +243,6 @@
244243
u.px:~CSSVAL#px
245244
u.em:~CSSVAL#em
246245

247-
I.CSSStyleRule:~CSSOM1#cssstylerule
248246
e.path:~SVGpaths#elementdef-path
249247
e.path:https://svgwg.org/svg2-draft/paths.html#elementdef-path
250248

@@ -280,14 +278,14 @@
280278
排他体:~CSSEXCLUSION#exclusion-element
281279
回込み文脈:~CSSEXCLUSION#wrapping-context
282280

283-
親~stylesheet:~CSSOM1#concept-css-rule-parent-css-style-sheet
284-
285281
確定的~size:~SIZING#definite
286282
自動的~size:~SIZING#automatic-size
287283
最大~size:~SIZING#max-size
288284

289285
~custom~prop:~CSSVAR#custom-property
290286

287+
~CSS宣言:~CSSOM1#css-declaration
288+
291289
●用語（外部
292290
応答:~FETCH#concept-response
293291

@@ -523,8 +521,6 @@
523521
Bert Bos; et al. ＜Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification＞. URL: https://drafts.csswg.org/css2/
524522
[CSS3-EXCLUSIONS]
525523
Rossen Atanassov; Vincent Hardy; Alan Stearns. ＜CSS Exclusions Module Level 1＞. URL: https://drafts.csswg.org/css-exclusions/
526-
[CSSOM-1]
527-
Daniel Glazman; Emilio Cobos Álvarez. ＜CSS Object Model (CSSOM)＞. URL: https://drafts.csswg.org/cssom/
528524
[FETCH]
529525
Anne van Kesteren. ＜Fetch Standard＞. Living Standard. URL: https://fetch.spec.whatwg.org/
530526
[RFC2119]
@@ -1819,45 +1815,48 @@ <h2 title="Fetching external shapes">7. 外部~図形の~fetch法</h2>
18191815

18201816
<div class="algo">
18211817
<p>
1822-
［
1823-
~SVGまたは画像
1824-
］による
18251818
`図形~用の外部~資源を~fetchする@
18261819
~algoは、
18271820
所与の
1828-
( `CSSStyleRule$I %規則 )
1829-
に対し
1830-
⇒
1831-
`~style資源を~fetchする$( ↓ )
1832-
⇒＃
1833-
%規則 の~URL,
1834-
%規則 の`親~stylesheet$,
1835-
`image^l,
1836-
`cors^l,
1837-
下に与える `応答の処理^i
1838-
◎
1839-
To fetch an external resource for a shape, either an SVG or an image, given a CSSStyleRule rule, fetch a style resource given rule’s URL, with stylesheet being rule’s parent CSS style sheet, destination "image", CORS mode "cors", and processResponse being the following steps＼
1821+
( %宣言 )
1822+
に対し：
18401823
</p>
1841-
1842-
<div class="algo">
1843-
`応答の処理^i は、
1844-
所与の
1824+
<ol>
1825+
<li>
1826+
~Assert：
1827+
%宣言 は、［
1828+
~SVGまたは画像
1829+
］による図形を参照する`~CSS宣言$である
1830+
</li>
1831+
<li class="algo">
1832+
%応答の処理n ~LET 所与の
18451833
( `応答$ %応答, ［
1846-
~NULL ／`失敗^i／~byte~stream
1834+
~NULL／`失敗^i／~byte~stream
18471835
］ %~byte~stream )
1848-
に対し
1836+
に対し，次を走らす手続き
18491837
⇒
18501838
~IF［
18511839
%~byte~stream は~byte~streamである
1840+
【かつ %~byte~stream は妥当な図形を与えている】
18521841
］
18531842
⇒
1854-
図形を受容している適切な~propに【 %~byte~stream から得られた】［
1855-
~SVGまたは画像
1856-
］を適用する
1843+
当の図形を受容している適切な~propに %~byte~stream から得られた図形を適用する
1844+
</li>
1845+
<li>
1846+
`~style資源を~fetchする$( ↓ )
1847+
⇒＃
1848+
【 %宣言 内に指定された】 `url$t,
1849+
%宣言,
1850+
`image^l,
1851+
`cors^l,
1852+
%応答の処理n
1853+
</li>
1854+
</ol>
18571855
◎
1856+
To fetch an external resource for a shape, either an SVG or an image,＼
1857+
given a CSS style declaration declaration, fetch a style resource given a &lt;url&gt; value, with ruleOrDeclaration being declaration, destination "image", CORS mode "cors", and processResponse being the following steps＼
18581858
given response res and null, failure or a byte stream byteStream: If byteStream is a byte stream, apply the image or SVG to the appropriate shape-accepting property.
18591859
</div>
1860-
</div>
18611860

18621861
<p class="note">注記：
18631862
図形の効果は，当の文書により検出されるので、

0 commit comments

Comments
 (0)