Skip to content

Commit 46c51c4

Browse files
committed
update preprocessor ouptput for today's edits
1 parent 97bb310 commit 46c51c4

2 files changed

Lines changed: 104 additions & 64 deletions

File tree

css-fonts-3/Fonts.html

Lines changed: 52 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@
66
<meta content="text/html;charset=utf-8" http-equiv=Content-Type>
77
<title>CSS Fonts Module Level 3</title>
88

9-
<link href="https://dev.w3.org/csswg/css-fonts-3/" rel=canonical>
9+
<link href="https://www.w3.org/TR/2018/CR-css-fonts-3-20180126/"
10+
rel=canonical>
1011
<meta content="width=device-width" name=viewport>
1112
<link href="http://purl.org/dc/terms/" rel=schema.dcterms>
1213
<link href="https://www.w3.org/Consortium/Legal/ipr-notice#Copyright"
1314
rel=dcterms.rights>
1415
<meta content="CSS Fonts Module Level 3" name=dcterms.title>
1516
<meta content=text name=dcterms.type>
16-
<meta content=2018-01-25 name=dcterms.date>
17+
<meta content=2018-01-26 name=dcterms.date>
1718
<meta content="John Daggett" name=dcterms.creator>
1819
<meta content="Myles C. Maxfield" name=dcterms.creator>
1920
<meta content=W3C name=dcterms.publisher>
20-
<meta content="https://dev.w3.org/csswg/css-fonts-3/"
21+
<meta content="https://www.w3.org/TR/2018/CR-css-fonts-3-20180126/"
2122
name=dcterms.identifier><!--
2223
FIXME when publishing: copy the current default.css and link to
2324
"default.css" rather than "../default.css"
@@ -110,7 +111,7 @@
110111
#fonts ul.indexlist ul, #fonts ul.indexlist dl { font-size: inherit; }
111112

112113
</style>
113-
<link href="https://www.w3.org/StyleSheets/TR/W3C-ED.css" rel=stylesheet
114+
<link href="https://www.w3.org/StyleSheets/TR/W3C-CR.css" rel=stylesheet
114115
type="text/css">
115116
<script defer=defer
116117
src="https://test.csswg.org/harness/annotate.js#CSS3-FONTS_DEV"
@@ -124,14 +125,14 @@
124125

125126
<h1>CSS Fonts Module Level 3</h1>
126127

127-
<h2 class="no-num no-toc">Editor's Draft 25 January 2018</h2>
128+
<h2 class="no-num no-toc">W3C Candidate Recommendation 26 January 2018</h2>
128129

129130
<dl id=authors>
130131
<dt>This version:
131132

132133
<dd><a
133134
href="https://drafts.csswg.org/css-fonts/">https://drafts.csswg.org/css-fonts/</a>
134-
<!-- <dd><a href="https://www.w3.org/TR/2018/ED-css-fonts-3-20180125/">https://www.w3.org/TR/2018/ED-css-fonts-3-20180125/</a> -->
135+
<!-- <dd><a href="https://www.w3.org/TR/2018/CR-css-fonts-3-20180126/">https://www.w3.org/TR/2018/CR-css-fonts-3-20180126/</a> -->
135136

136137
<dt>Latest version:
137138

@@ -221,24 +222,32 @@ <h2 class="no-num no-toc" id=abstract>Abstract</h2>
221222
<h2 class="no-num no-toc" id=status>Status of this document</h2>
222223
<!--begin-status-->
223224

224-
<p>This is a public copy of the editors' draft. It is provided for
225-
discussion only and may change at any moment. Its publication here does
226-
not imply endorsement of its contents by W3C. Don't cite this document
227-
other than as work in progress.
225+
<p><em>This section describes the status of this document at the time of
226+
its publication. Other documents may supersede this document. A list of
227+
current W3C publications and the latest revision of this technical report
228+
can be found in the <a href="http://www.w3.org/TR/">W3C technical reports
229+
index at http://www.w3.org/TR/.</a></em>
228230

229-
<p>The (<a
230-
href="http://lists.w3.org/Archives/Public/www-style/">archived</a>) public
231-
mailing list <a
232-
href="mailto:www-style@w3.org?Subject=%5Bcss-fonts-3%5D%20PUT%20SUBJECT%20HERE">
233-
www-style@w3.org</a> (see <a
234-
href="http://www.w3.org/Mail/Request">instructions</a>) is preferred for
235-
discussion of this specification. When sending e-mail, please put the text
236-
“css-fonts-3” in the subject, preferably like this:
237-
“[<!---->css-fonts-3<!---->] <em>…summary of comment…</em>
231+
<p>Publication as a Candidate Recommendation does not imply endorsement by
232+
the W3C Membership. This is a draft document and may be updated, replaced
233+
or obsoleted by other documents at any time. It is inappropriate to cite
234+
this document as other than work in progress.
238235

239236
<p>This document was produced by the <a
240-
href="http://www.w3.org/Style/CSS/members">CSS Working Group</a> (part of
241-
the <a href="http://www.w3.org/Style/">Style Activity</a>).
237+
href="http://www.w3.org/Style/CSS/members">CSS Working Group</a> as a <a
238+
href="http://www.w3.org/Consortium/Process/tr#RecsCR">Candidate
239+
Recommendation.</a>
240+
241+
<p>A Candidate Recommendation is a document that has been widely reviewed
242+
and is ready for implementation. W3C encourages everybody to implement
243+
this specification and return comments to the (<a
244+
href="http://lists.w3.org/Archives/Public/www-style/">archived</a>) public
245+
mailing list <a
246+
href="mailto:www-style@w3.org?Subject=%5Bcss-fonts-3%5D%20PUT%20SUBJECT%20HERE">www-style@w3.org</a>
247+
(see <a href="http://www.w3.org/Mail/Request">instructions</a>). When
248+
sending e-mail, please put the text “css-fonts-3” in the subject,
249+
preferably like this: “[<!---->css-fonts-3<!---->] <em>…summary of
250+
comment…</em>
242251

243252
<p>This document was produced by a group operating under the <a
244253
href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February
@@ -251,7 +260,11 @@ <h2 class="no-num no-toc" id=status>Status of this document</h2>
251260
href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential
252261
Claim(s)</a> must disclose the information in accordance with <a
253262
href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section
254-
6 of the W3C Patent Policy</a>.</p>
263+
6 of the W3C Patent Policy</a>.
264+
265+
<p>This document is governed by the <a
266+
href="http://www.w3.org/2015/Process-20150901/"
267+
id="w3c_process_revision">1 September 2015 W3C Process Document</a>.</p>
255268
<!--end-status-->
256269

257270
<p>See the section <a href="#cr-exit-criteria">CR Exit Criteria</a> for
@@ -842,13 +855,18 @@ <h3 id=font-family-prop><span class=secno>3.1. </span>Font family: the <a
842855
<h4 id=generic-font-families><span class=secno>3.1.1. </span>Generic font
843856
families</h4>
844857

845-
<p>All five generic font families are defined to exist in all CSS
846-
implementations (they need not necessarily map to five distinct actual
847-
fonts). User agents should provide reasonable default choices for the
848-
generic font families, which express the characteristics of each family as
849-
well as possible within the limits allowed by the underlying technology.
850-
User agents are encouraged to allow users to select alternative choices
851-
for the generic fonts.
858+
<p>All five generic font families must always result in at least one
859+
matched font face, for all CSS implementations. However, the generics may
860+
be composite faces (with different typefaces based on such things as the
861+
Unicode range of the character, the language of the containing element,
862+
user preferences and system settings, among others). They are also not
863+
guaranteed to always be different from each other.
864+
865+
<p>User agents should provide reasonable default choices for the generic
866+
font families, which express the characteristics of each family as well as
867+
possible, within the limits allowed by the underlying technology. User
868+
agents are encouraged to allow users to select alternative choices for the
869+
generic fonts.
852870

853871
<h5 class="no-num no-toc"> <span class=index-def id=serif0
854872
title="serif, definition of"><a name=serif-def><dfn
@@ -5613,6 +5631,9 @@ <h3 id=font-feature-settings-prop><span class=secno>6.12. </span>Low-level
56135631
class=property>off</code>’ is synonymous with 0. If the value is
56145632
omitted, a value of 1 is assumed.
56155633

5634+
<p id=ffs-map>The computed value of font-feature-settings is a map, so any
5635+
duplicates in the specified value must not be preserved.
5636+
56165637
<pre>
56175638
font-feature-settings: "dlig" 1; /* dlig=1 enable discretionary ligatures */
56185639
font-feature-settings: "smcp" on; /* smcp=1 enable small caps */
@@ -6489,9 +6510,8 @@ <h3 class=no-num id=normative-references>Normative References</h3>
64896510
<!---->
64906511

64916512
<dt id="ref-rfc8081">[RFC8081]
6492-
</dt><dd>C. Lilley. <a href="https://tools.ietf.org/html/rfc8081">The "font" Top-Level Media Type</a>. February 2017. Proposed Standard. URL: <a href="https://tools.ietf.org/html/rfc8081">https://tools.ietf.org/html/rfc8081</a>
6493-
</dd>
6494-
6513+
</dt><dd>C. Lilley. <a href="https://tools.ietf.org/html/rfc8081">The "font" Top-Level Media Type</a>. February 2017. Proposed Standard. URL: <a href="https://tools.ietf.org/html/rfc8081">https://tools.ietf.org/html/rfc8081</a>
6514+
</dd>
64956515

64966516
<dt id=ref-UAX15>[UAX15]
64976517

css-fonts-3/Overview.html

Lines changed: 52 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@
66
<meta content="text/html;charset=utf-8" http-equiv=Content-Type>
77
<title>CSS Fonts Module Level 3</title>
88

9-
<link href="https://dev.w3.org/csswg/css-fonts-3/" rel=canonical>
9+
<link href="https://www.w3.org/TR/2018/CR-css-fonts-3-20180126/"
10+
rel=canonical>
1011
<meta content="width=device-width" name=viewport>
1112
<link href="http://purl.org/dc/terms/" rel=schema.dcterms>
1213
<link href="https://www.w3.org/Consortium/Legal/ipr-notice#Copyright"
1314
rel=dcterms.rights>
1415
<meta content="CSS Fonts Module Level 3" name=dcterms.title>
1516
<meta content=text name=dcterms.type>
16-
<meta content=2018-01-25 name=dcterms.date>
17+
<meta content=2018-01-26 name=dcterms.date>
1718
<meta content="John Daggett" name=dcterms.creator>
1819
<meta content="Myles C. Maxfield" name=dcterms.creator>
1920
<meta content=W3C name=dcterms.publisher>
20-
<meta content="https://dev.w3.org/csswg/css-fonts-3/"
21+
<meta content="https://www.w3.org/TR/2018/CR-css-fonts-3-20180126/"
2122
name=dcterms.identifier><!--
2223
FIXME when publishing: copy the current default.css and link to
2324
"default.css" rather than "../default.css"
@@ -110,7 +111,7 @@
110111
#fonts ul.indexlist ul, #fonts ul.indexlist dl { font-size: inherit; }
111112

112113
</style>
113-
<link href="https://www.w3.org/StyleSheets/TR/W3C-ED.css" rel=stylesheet
114+
<link href="https://www.w3.org/StyleSheets/TR/W3C-CR.css" rel=stylesheet
114115
type="text/css">
115116
<script defer=defer
116117
src="https://test.csswg.org/harness/annotate.js#CSS3-FONTS_DEV"
@@ -124,14 +125,14 @@
124125

125126
<h1>CSS Fonts Module Level 3</h1>
126127

127-
<h2 class="no-num no-toc">Editor's Draft 25 January 2018</h2>
128+
<h2 class="no-num no-toc">W3C Candidate Recommendation 26 January 2018</h2>
128129

129130
<dl id=authors>
130131
<dt>This version:
131132

132133
<dd><a
133134
href="https://drafts.csswg.org/css-fonts/">https://drafts.csswg.org/css-fonts/</a>
134-
<!-- <dd><a href="https://www.w3.org/TR/2018/ED-css-fonts-3-20180125/">https://www.w3.org/TR/2018/ED-css-fonts-3-20180125/</a> -->
135+
<!-- <dd><a href="https://www.w3.org/TR/2018/CR-css-fonts-3-20180126/">https://www.w3.org/TR/2018/CR-css-fonts-3-20180126/</a> -->
135136

136137
<dt>Latest version:
137138

@@ -221,24 +222,32 @@ <h2 class="no-num no-toc" id=abstract>Abstract</h2>
221222
<h2 class="no-num no-toc" id=status>Status of this document</h2>
222223
<!--begin-status-->
223224

224-
<p>This is a public copy of the editors' draft. It is provided for
225-
discussion only and may change at any moment. Its publication here does
226-
not imply endorsement of its contents by W3C. Don't cite this document
227-
other than as work in progress.
225+
<p><em>This section describes the status of this document at the time of
226+
its publication. Other documents may supersede this document. A list of
227+
current W3C publications and the latest revision of this technical report
228+
can be found in the <a href="http://www.w3.org/TR/">W3C technical reports
229+
index at http://www.w3.org/TR/.</a></em>
228230

229-
<p>The (<a
230-
href="http://lists.w3.org/Archives/Public/www-style/">archived</a>) public
231-
mailing list <a
232-
href="mailto:www-style@w3.org?Subject=%5Bcss-fonts-3%5D%20PUT%20SUBJECT%20HERE">
233-
www-style@w3.org</a> (see <a
234-
href="http://www.w3.org/Mail/Request">instructions</a>) is preferred for
235-
discussion of this specification. When sending e-mail, please put the text
236-
“css-fonts-3” in the subject, preferably like this:
237-
“[<!---->css-fonts-3<!---->] <em>…summary of comment…</em>
231+
<p>Publication as a Candidate Recommendation does not imply endorsement by
232+
the W3C Membership. This is a draft document and may be updated, replaced
233+
or obsoleted by other documents at any time. It is inappropriate to cite
234+
this document as other than work in progress.
238235

239236
<p>This document was produced by the <a
240-
href="http://www.w3.org/Style/CSS/members">CSS Working Group</a> (part of
241-
the <a href="http://www.w3.org/Style/">Style Activity</a>).
237+
href="http://www.w3.org/Style/CSS/members">CSS Working Group</a> as a <a
238+
href="http://www.w3.org/Consortium/Process/tr#RecsCR">Candidate
239+
Recommendation.</a>
240+
241+
<p>A Candidate Recommendation is a document that has been widely reviewed
242+
and is ready for implementation. W3C encourages everybody to implement
243+
this specification and return comments to the (<a
244+
href="http://lists.w3.org/Archives/Public/www-style/">archived</a>) public
245+
mailing list <a
246+
href="mailto:www-style@w3.org?Subject=%5Bcss-fonts-3%5D%20PUT%20SUBJECT%20HERE">www-style@w3.org</a>
247+
(see <a href="http://www.w3.org/Mail/Request">instructions</a>). When
248+
sending e-mail, please put the text “css-fonts-3” in the subject,
249+
preferably like this: “[<!---->css-fonts-3<!---->] <em>…summary of
250+
comment…</em>
242251

243252
<p>This document was produced by a group operating under the <a
244253
href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February
@@ -251,7 +260,11 @@ <h2 class="no-num no-toc" id=status>Status of this document</h2>
251260
href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential
252261
Claim(s)</a> must disclose the information in accordance with <a
253262
href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section
254-
6 of the W3C Patent Policy</a>.</p>
263+
6 of the W3C Patent Policy</a>.
264+
265+
<p>This document is governed by the <a
266+
href="http://www.w3.org/2015/Process-20150901/"
267+
id="w3c_process_revision">1 September 2015 W3C Process Document</a>.</p>
255268
<!--end-status-->
256269

257270
<p>See the section <a href="#cr-exit-criteria">CR Exit Criteria</a> for
@@ -842,13 +855,18 @@ <h3 id=font-family-prop><span class=secno>3.1. </span>Font family: the <a
842855
<h4 id=generic-font-families><span class=secno>3.1.1. </span>Generic font
843856
families</h4>
844857

845-
<p>All five generic font families are defined to exist in all CSS
846-
implementations (they need not necessarily map to five distinct actual
847-
fonts). User agents should provide reasonable default choices for the
848-
generic font families, which express the characteristics of each family as
849-
well as possible within the limits allowed by the underlying technology.
850-
User agents are encouraged to allow users to select alternative choices
851-
for the generic fonts.
858+
<p>All five generic font families must always result in at least one
859+
matched font face, for all CSS implementations. However, the generics may
860+
be composite faces (with different typefaces based on such things as the
861+
Unicode range of the character, the language of the containing element,
862+
user preferences and system settings, among others). They are also not
863+
guaranteed to always be different from each other.
864+
865+
<p>User agents should provide reasonable default choices for the generic
866+
font families, which express the characteristics of each family as well as
867+
possible, within the limits allowed by the underlying technology. User
868+
agents are encouraged to allow users to select alternative choices for the
869+
generic fonts.
852870

853871
<h5 class="no-num no-toc"> <span class=index-def id=serif0
854872
title="serif, definition of"><a name=serif-def><dfn
@@ -5613,6 +5631,9 @@ <h3 id=font-feature-settings-prop><span class=secno>6.12. </span>Low-level
56135631
class=property>off</code>’ is synonymous with 0. If the value is
56145632
omitted, a value of 1 is assumed.
56155633

5634+
<p id=ffs-map>The computed value of font-feature-settings is a map, so any
5635+
duplicates in the specified value must not be preserved.
5636+
56165637
<pre>
56175638
font-feature-settings: "dlig" 1; /* dlig=1 enable discretionary ligatures */
56185639
font-feature-settings: "smcp" on; /* smcp=1 enable small caps */
@@ -6489,9 +6510,8 @@ <h3 class=no-num id=normative-references>Normative References</h3>
64896510
<!---->
64906511

64916512
<dt id="ref-rfc8081">[RFC8081]
6492-
</dt><dd>C. Lilley. <a href="https://tools.ietf.org/html/rfc8081">The "font" Top-Level Media Type</a>. February 2017. Proposed Standard. URL: <a href="https://tools.ietf.org/html/rfc8081">https://tools.ietf.org/html/rfc8081</a>
6493-
</dd>
6494-
6513+
</dt><dd>C. Lilley. <a href="https://tools.ietf.org/html/rfc8081">The "font" Top-Level Media Type</a>. February 2017. Proposed Standard. URL: <a href="https://tools.ietf.org/html/rfc8081">https://tools.ietf.org/html/rfc8081</a>
6514+
</dd>
64956515

64966516
<dt id=ref-UAX15>[UAX15]
64976517

0 commit comments

Comments
 (0)