Skip to content

Commit 102da5a

Browse files
svgeesussvgeesus
committed
[css-fonts][css-conditional-4] Technology is now tech, fix w3c#6791 
1 parent dd16bd1 commit 102da5a

File tree

3 files changed

+43
-40
lines changed

3 files changed

+43
-40
lines changed

‎css-conditional-4/Overview.bs‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Abstract: This module contains the features of CSS for conditional processing of
2020
The main extensions compared to level 3 are
2121
the Generalized Conditional ''@when''
2222
and Chained Conditional ''@else'' rules, and
23-
the addition of selector and font technology queries to the the ''@supports'' rule.
23+
the addition of selector and font tech queries to the the ''@supports'' rule.
2424
Default Highlight: css
2525
</pre>
2626

@@ -67,11 +67,11 @@ Issue: In the future, copy the contents of [[css-conditional-3]] into this docum
6767
This level of the specification extends the <<supports-feature>> syntax as follows:
6868

6969
<pre class="prod def" nohighlight>
70-
<dfn>&lt;supports-feature></dfn> = <<supports-selector-fn>> | <<supports-font-technology-fn>>
70+
<dfn>&lt;supports-feature></dfn> = <<supports-selector-fn>> | <<supports-font-tech-fn>>
7171
| <<supports-font-format-fn>> | <<supports-decl>>
7272
<dfn>&lt;supports-selector-fn></dfn> = selector( <<complex-selector>> )
73-
<dfn>&lt;supports-font-technology-fn></dfn> = font-technology ( <<font-technology>> )
74-
<dfn>&lt;font-technology></dfn> = [ features-opentype | features-aat | features-graphite
73+
<dfn>&lt;supports-font-tech-fn></dfn> = font-tech ( <<font-tech>> )
74+
<dfn>&lt;font-tech></dfn> = [ features-opentype | features-aat | features-graphite
7575
| color-colrv0 | color-colrv1 | color-svg | color-sbix | color-cbdt
7676
| variations | palettes | incremental ]
7777
<dfn>&lt;supports-font-format-fn></dfn> = font-format ( <<font-format>> )
@@ -86,10 +86,10 @@ This level of the specification extends the <<supports-feature>> syntax as follo
8686
<a href="#dfn-support-selector">supports the selector</a>
8787
provided as an argument to the function.
8888

89-
: <<supports-font-technology-fn>>
89+
: <<supports-font-tech-fn>>
9090
::
9191
The result is true if the UA
92-
<a href="#dfn-support-font-technology">supports the font technology</a>
92+
<a href="#dfn-support-font-tech">supports the font tech</a>
9393
provided as an argument to the function.
9494

9595
: <<supports-font-format-fn>>
@@ -107,13 +107,13 @@ parse error), and that selector doesn't contain
107107
<a>unknown -webkit- pseudo-elements</a>.
108108

109109
A CSS processor is considered to
110-
<dfn export for=CSS id="dfn-support-font-technology">support a font technology</dfn>
110+
<dfn export for=CSS id="dfn-support-font-tech">support a font tech</dfn>
111111
when the text and layout processing engine ingesting
112-
this CSS text is capable of utilising the specified [[css-fonts-4#font-technology-definitions]]
112+
this CSS text is capable of utilising the specified [[css-fonts-4#font-tech-definitions]]
113113
in layout and rendering.
114114

115-
Note: the allowed values for the font-technology function
116-
are the same as those for the technology function
115+
Note: the allowed values for the font-tech function
116+
are the same as those for the tech function
117117
in the '@font-face' '@font-face/src' descriptor.
118118

119119
A CSS processor is considered to
@@ -274,13 +274,13 @@ An ''@else'' rule that is not part of a <a>conditional rule chain</a> is invalid
274274
so will always be chosen unless one of the earlier conditions succeeds.
275275

276276
<pre class="lang-css">
277-
@when font-technology(color-COLRv1) and font-technology(variations) {
277+
@when font-tech(color-COLRv1) and font-tech(variations) {
278278
@font-face { font-family: icons; src: url(icons-gradient-var.woff2); }
279279
}
280-
@else font-technology(color-SVG) {
280+
@else font-tech(color-SVG) {
281281
@font-face { font-family: icons; src: url(icons-gradient.woff2); }
282282
}
283-
@else font-technology(color-COLRv0) {
283+
@else font-tech(color-COLRv0) {
284284
@font-face { font-family: icons; src: url(icons-flat.woff2); }
285285
}
286286
@else {
@@ -311,7 +311,7 @@ An ''@else'' rule that is not part of a <a>conditional rule chain</a> is invalid
311311

312312
<pre class="lang-css">
313313
@font-face { font-family: icons; src: url(icons-fallback.woff2);
314-
@supports font-technology(color-COLRv1) {
314+
@supports font-tech(color-COLRv1) {
315315
@font-face { font-family: icons; src: url(icons-gradient-var.woff2); }
316316
}
317317
</pre>
@@ -339,6 +339,7 @@ The @when and @else rules are based on a proposal by Tab Atkins.
339339
</h3>
340340

341341
<ul>
342+
<li>Renamed font-technology to font-tech</li>
342343
<li>Added some examples</li>
343344
<li>Added @when and @else per CSSWG resolution</li>
344345
<li>Extended @supports feature to express font capabilities</li>

‎css-fonts-4/Overview.bs‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2047,36 +2047,36 @@ according to section [[css-syntax#parse-comma-separated-list-of-component-values
20472047
Then each component value is parsed according to this grammar:
20482048

20492049

2050-
<pre><<url>> [ format(<<font-format>>)]? [ technology( <<font-technology>>#)]? | local(<<font-face-name>>)</pre>
2050+
<pre><<url>> [ format(<<font-format>>)]? [ tech( <<font-tech>>#)]? | local(<<font-face-name>>)</pre>
20512051

20522052
<pre class="prod"><dfn id="font-format-values">&lt;font-format&gt;</dfn>
20532053
= [<<string>> | collection | embedded-opentype | opentype
20542054
| svg | truetype | woff | woff2 ]</pre>
20552055

2056-
<pre class="prod"><dfn id="font-technology-values">&lt;font-technology&gt;</dfn>
2057-
= [<<font-feature-technology>> | <<color-font-technology>>
2056+
<pre class="prod"><dfn id="font-tech-values">&lt;font-tech&gt;</dfn>
2057+
= [<<font-feature-tech>> | <<color-font-tech>>
20582058
| variations | palettes | incremental ]</pre>
20592059

2060-
<pre class="prod"><dfn id="font-feature-technology-values">&lt;font-feature-technology&gt;</dfn>
2060+
<pre class="prod"><dfn id="font-feature-tech-values">&lt;font-feature-tech&gt;</dfn>
20612061
= [feature-opentype | feature-aat | feature-graphite]</pre>
20622062

2063-
<pre class="prod"><dfn id="color-font-technology-values">&lt;color-font-technology&gt;</dfn>
2063+
<pre class="prod"><dfn id="color-font-tech-values">&lt;color-font-tech&gt;</dfn>
20642064
= [color-COLRv0 | color-COLRv1 | color-SVG | color-sbix | color-CBDT ]</pre>
20652065

20662066
If a component value is parsed correctly
20672067
and is of a <a href="#font-format-definitions">font format</a> or
2068-
<a href="#font-technology-definitions">font technology</a>
2068+
<a href="#font-tech-definitions">font tech</a>
20692069
that the UA supports,
20702070
add it to the list of supported sources.
20712071
If parsing a component value results in a parsing error
2072-
or its format or technology are unsupported,
2072+
or its format or tech are unsupported,
20732073
do not add it to the list of supported sources.
20742074

20752075
If there are no supported entries at the end of this process,
20762076
the value for the 'src!!descriptor' descriptor is a parse error.
20772077

20782078
These parsing rules allow for graceful fallback of fonts
2079-
for user agents which don't support a particular font technology
2079+
for user agents which don't support a particular font tech
20802080
or font format.
20812081

20822082
<div class="example" id="ex-incremental">
@@ -2096,7 +2096,7 @@ or font format.
20962096
@font-face {
20972097
font-family: "MyIncrementallyLoadedWebFont";
20982098
src: url("FallbackURLForBrowsersWhichDontSupportIncrementalLoading.woff2") format("woff2");
2099-
src: url("MyIncrementallyLoadedWebFont.otf") format(opentype) technology(incremental);
2099+
src: url("MyIncrementallyLoadedWebFont.otf") format(opentype) tech(incremental);
21002100
}
21012101
</pre>
21022102
</div>
@@ -3673,7 +3673,7 @@ Optimizations of this process are allowed
36733673
provided that an implementation behaves as if the algorithm had been followed exactly.
36743674
Matching occurs in a well-defined order
36753675
to ensure that the results are as consistent as possible across user agents,
3676-
given an identical set of available fonts and rendering technology.
3676+
given an identical set of available fonts and rendering tech.
36773677

36783678
The <dfn export>first available font</dfn>,
36793679
used for example in the definition of <a>font-relative lengths</a> such as ''ex''
@@ -6683,9 +6683,9 @@ The System Font is the font which is used by the ''system-ui'' <a href="#system-
66836683
Font Technologies and Formats
66846684
</h2>
66856685

6686-
<h3 id="font-technology-definitions">Font technologies</h3>
6686+
<h3 id="font-tech-definitions">Font tech</h3>
66876687

6688-
The 'features-opentype', 'features-aat' and 'features-graphite' technologies
6688+
The 'features-opentype', 'features-aat' and 'features-graphite' techs
66896689
refer to support for font features,
66906690
commonly implemented in [[!OPENTYPE]] with the
66916691
<code><a href="https://docs.microsoft.com/en-us/typography/opentype/spec/gsub">GSUB</a></code> and the
@@ -6703,7 +6703,7 @@ The System Font is the font which is used by the ''system-ui'' <a href="#system-
67036703
<a href="https://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=GraphiteBinaryFormat_3_0&filename=GraphiteBinaryFormat_3_0.pdf">Graphite Table Format</a>.
67046704
The section on [[#font-rend-props]] describes properties that interact with these facilities.
67056705

6706-
The 'variations' technology refers to the support of font variations,
6706+
The 'variations' tech refers to the support of font variations,
67076707
commonly implemented in [[!OPENTYPE]] with the
67086708
<code><a href="https://docs.microsoft.com/en-us/typography/opentype/spec/avar">avar</a></code>,
67096709
<code><a href="https://docs.microsoft.com/en-us/typography/opentype/spec/cvar">cvar</a></code>,
@@ -6731,17 +6731,17 @@ The System Font is the font which is used by the ''system-ui'' <a href="#system-
67316731
inside [[!OPENTYPE]] or [[!AAT-FEATURES]] fonts which must be supported
67326732
to satisfy this requirement.
67336733

6734-
The 'palettes' technology refers to support for font palettes,
6734+
The 'palettes' tech refers to support for font palettes,
67356735
commonly implemented in the [[!OPENTYPE]] and [[!AAT-FEATURES]]
67366736
with the
67376737
<code><a href="https://docs.microsoft.com/en-us/typography/opentype/spec/cpal">CPAL</a></code> table.
67386738
The section on [[#color-font-support]] describes properties that interact with these facilities.
67396739

6740-
The 'incremental' technology refers to client support for
6740+
The 'incremental' tech refers to client support for
67416741
incremental font loading,
67426742
using either the range-request or the patch-subset method [[PFE-report]].
67436743

6744-
Web authors can specify the 'technology' function
6744+
Web authors can specify the 'tech' function
67456745
inside an ''@font-face'' 'src' descriptor
67466746
to indicate that support is
67476747
required for correct rendering of a font.
@@ -6755,7 +6755,7 @@ The System Font is the font which is used by the ''system-ui'' <a href="#system-
67556755
<pre>
67566756
@font-face {
67576757
font-family: "Trickster";
6758-
src: url("trickster-COLRv1.otf") format(opentype) technology(color-COLRv1),
6758+
src: url("trickster-COLRv1.otf") format(opentype) tech(color-COLRv1),
67596759
url("trickster-outline.otf") format(opentype);
67606760
}
67616761
</pre>
@@ -7336,6 +7336,7 @@ Changes
73367336
<h3 id="changes-2021-07-29">Changes from the <a href="https://www.w3.org/TR/2021/WD-css-fonts-4-20210729/">29 July 2021 Working Draft</a> </h3>
73377337

73387338
<ul>
7339+
<li>Renamed technology to tech</li>
73397340
<!-- to 03 Dec 2021 -->
73407341
<li>New 'math' value added to 'font-size'</li>
73417342
<li>Security and Privacy are now separate sections</li>

‎css-fonts-5/Overview.bs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -356,35 +356,35 @@ according to section [[css-syntax#parse-comma-separated-list-of-component-values
356356
Then each component value is parsed according to this grammar:
357357

358358

359-
<pre><<url>> [ format(<<font-format>>)]? [ technology( <<font-technology>>#)]? | local(<<font-face-name>>)</pre>
359+
<pre><<url>> [ format(<<font-format>>)]? [ techn( <<font-tech>>#)]? | local(<<font-face-name>>)</pre>
360360

361361
<pre class="prod"><dfn id="font-format-values">&lt;font-format&gt;</dfn>
362362
= [<<string>> | collection | embedded-opentype | opentype
363363
| svg | truetype | woff | woff2 ]</pre>
364364

365-
<pre class="prod"><dfn id="font-technology-values">&lt;font-technology&gt;</dfn>
366-
= [<<font-feature-technology>> | <<color-font-technology>>
365+
<pre class="prod"><dfn id="font-tech-values">&lt;font-tech&gt;</dfn>
366+
= [<<font-feature-tech>> | <<color-font-tech>>
367367
| variations | palettes | incremental ]</pre>
368368

369-
<pre class="prod"><dfn id="font-feature-technology-values">&lt;font-feature-technology&gt;</dfn>
369+
<pre class="prod"><dfn id="font-feature-tech-values">&lt;font-feature-tech&gt;</dfn>
370370
= [feature-opentype | feature-aat | feature-graphite]</pre>
371371

372-
<pre class="prod"><dfn id="color-font-technology-values">&lt;color-font-technology&gt;</dfn>
372+
<pre class="prod"><dfn id="color-font-tech-values">&lt;color-font-tech&gt;</dfn>
373373
= [color-COLRv0 | color-COLRv1 | color-SVG | color-sbix | color-CBDT ]</pre>
374374

375375
If a component value is parsed correctly
376376
and is a supported [[css-fonts-4#font-format-definitions]] or
377-
[[css-fonts-4#font-technology-definitions]],
377+
[[css-fonts-4#font-tech-definitions]],
378378
add it to the list of supported sources.
379379
If parsing a component value results in a parsing error
380-
or its format or technology are unsupported,
380+
or its format or tech are unsupported,
381381
do not add it to the list of supported sources.
382382

383383
If there are no supported entries at the end of this process,
384384
the value for the 'src!!descriptor' descriptor is a parse error.
385385

386386
These parsing rules allow for graceful fallback of fonts
387-
for user agents which don't support a particular font technology
387+
for user agents which don't support a particular font tech
388388
or font format.
389389

390390
<div class="example" id="ex-incremental">
@@ -404,7 +404,7 @@ or font format.
404404
@font-face {
405405
font-family: "MyIncrementallyLoadedWebFont";
406406
src: url("FallbackURLForBrowsersWhichDontSupportIncrementalLoading.woff2") format("woff2");
407-
src: url("MyIncrementallyLoadedWebFont.otf") format(opentype) technology(incremental);
407+
src: url("MyIncrementallyLoadedWebFont.otf") format(opentype) tech(incremental);
408408
}
409409
</pre>
410410
</div>
@@ -713,6 +713,7 @@ Changes
713713
<h3 id="changes-20210729">Changes since the <a href="https://www.w3.org/TR/2021/WD-css-fonts-5-20210729/">WD of 2021-07-29</a></h3>
714714

715715
<ul>
716+
<li>Renamed technology to tech</li>
716717
<li>Security and Privacy are now separate sections</li>
717718
<li>Fixed font-technology grammar</li>
718719
<li>Copied section on parsing src descriptor from CSS Fonts 4</li>

0 commit comments

Comments
 (0)