8000 correct various mistakes, reorganize references · simonwuelker/csswg-drafts@2eb4ddf · GitHub
Skip to content

Commit 2eb4ddf

Browse files
author
John Daggett
committed
correct various mistakes, reorganize references
1 parent e8792b4 commit 2eb4ddf

1 file changed

Lines changed: 45 additions & 43 deletions

File tree

‎css3-fonts/Fonts.html‎

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@
111111

112112
<h1>CSS Fonts Module Level 3</h1>
113113

114-
<h2 class="no-num no-toc" id=editors>Editor's Draft 28 April 2011</h2>
114+
<h2 class="no-num no-toc" id=editors>Editor's Draft 21 June 2011</h2>
115115

116116
<dl id=authors>
117117
<dt>This version:
118118

119119
<dd><a
120120
href="http://dev.w3.org/csswg/css3-fonts/">http://dev.w3.org/csswg/css3-fonts/</a>
121-
<!-- <dd><a href="http://www.w3.org/TR/2011/ED-css3-fonts-20110428">http://www.w3.org/TR/2011/ED-css3-fonts-20110428</a> -->
121+
<!-- <dd><a href="http://www.w3.org/TR/2011/ED-css3-fonts-20110621">http://www.w3.org/TR/2011/ED-css3-fonts-20110621</a> -->
122122

123123

124124
<dt>Latest version:
@@ -719,10 +719,10 @@ <h5 class="no-num no-toc"> <span class=index-def id=serif0 title="serif,
719719
href="#sans-serif">sans-serif</a></code>’ generic font family. CSS uses
720720
the term ‘<code class=property><a href="#serif">serif</a></code>’ to
721721
apply to a font for any script, although other names may be more familiar
722-
for particular scripts, such as Mincho (Japanese), Sung or Song (Chinese),
723-
Batang (Korean). Any font that is so described may be used to represent
724-
the generic ‘<code class=property><a href="#serif">serif</a></code>’
725-
family.
722+
for particular scripts, such as Mincho (Japanese), Sung, Song or Kai
723+
(Chinese), Batang (Korean). Any font that is so described may be used to
724+
represent the generic ‘<code class=property><a
725+
href="#serif">serif</a></code>’ family.
726726

727727
<div class=figure><img alt="sample serif fonts" src=serifexamples.png>
728728
<p class=caption>Sample serif fonts
@@ -740,11 +740,10 @@ <h5 class="no-num no-toc"> <span class=index-def id=sans-serif0
740740
href="#serif">serif</a></code>’ family. CSS uses the term ‘<code
741741
class=property><a href="#sans-serif">sans-serif</a></code>’ to apply to
742742
a font for any script, although other names may be more familiar for
743-
particular scripts, such as Gothic (Japanese), Kai (Chinese), or Gulim
743+
particular scripts, such as Gothic (Japanese), Hei (Chinese), or Gulim
744744
(Korean). Any font that is so described may be used to represent the
745745
generic ‘<code class=property><a
746746
href="#sans-serif">sans-serif</a></code>’ family.
747-
<!-- Kai for Chinese looks wrong, looks to be a serif-like face. -->
748747

749748
<div class=figure><img alt="sample sans-serif fonts"
750749
src=sansserifexamples.png>
@@ -3738,7 +3737,7 @@ <h3 id=font-variant-alternates-prop><span class=secno>6.8 </span>Alternates
37383737
styleset(&lt;feature-value-name&gt; [, &lt;feature-value-name&gt;]*) ||
37393738
character-variant(&lt;feature-value-name&gt;
37403739
[,&lt;feature-value-name&gt;]*) || swash(&lt;feature-value-name&gt;) ||
3741-
ornament(&lt;feature-value-name&gt;) ||
3740+
ornaments(&lt;feature-value-name&gt;) ||
37423741
annotation(&lt;feature-value-name&gt;) || ruby ]
37433742

37443743
<tr>
@@ -3898,19 +3897,6 @@ <h3 id=font-variant-alternates-prop><span class=secno>6.8 </span>Alternates
38983897
font scaling.
38993898
</dl>
39003899

3901-
<div class=example>
3902-
<p>The example below uses stylistic sets and swashes for section titles
3903-
but not for the main title.</p>
3904-
3905-
<pre>h2 { font-variant-alternates: styleset(3,5); }
3906-
h2:first-letter { font-variant-alternates: swash(2); }
3907-
3908-
&lt;h1>Main title&lt;/h1>
3909-
3910-
&lt;h2>Section title&lt;/h2>
3911-
</pre>
3912-
</div>
3913-
39143900
<h3 id=font-feature-values><span class=secno>6.9 </span>Defining font
39153901
specific alternates: the @font-feature-values rule</h3>
39163902

@@ -4258,11 +4244,13 @@ <h3 id=font-variant-prop><span class=secno>6.11 </span>Overall shorthand
42584244

42594245
<td>normal | inherit | [ &lt;common-lig-values&gt; ||
42604246
&lt;additional-lig-values&gt; || &lt;historical-lig-values&gt; ||
4261-
&lt;contextual-alt-values&gt; || stylistic[(&lt;integer&gt;)]? ||
4262-
historical-forms || styleset(&lt;integer&gt; [,&lt;integer&gt;]*) ||
4263-
character-variant(&lt;integer&gt; [,&lt;integer&gt;]*) ||
4264-
swash[(&lt;integer&gt;)]? || ornament[(&lt;integer&gt;)]? ||
4265-
annotation[(&lt;integer&gt;)]? || ruby || &lt;caps-value&gt; ||
4247+
&lt;contextual-alt-values&gt; || stylistic(&lt;feature-value-name&gt;)
4248+
|| historical-forms || styleset(&lt;feature-value-name&gt; [,
4249+
&lt;feature-value-name&gt;]*) ||
4250+
character-variant(&lt;feature-value-name&gt;
4251+
[,&lt;feature-value-name&gt;]*) || swash(&lt;feature-value-name&gt;) ||
4252+
ornaments(&lt;feature-value-name&gt;) ||
4253+
annotation(&lt;feature-value-name&gt;) || ruby || &lt;caps-value&gt; ||
42664254
&lt;numeric-figure-values&gt; || &lt;numeric-spacing-values&gt; ||
42674255
&lt;numeric-fraction-values&gt; || slashed-zero ||
42684256
&lt;east-asian-variant-values&gt; || &lt;east-asian-width-values&gt; ]
@@ -4874,12 +4862,22 @@ <h3 class=no-num id=normative-references>Normative References</h3>
48744862
</dd>
48754863
<!---->
48764864

4865+
<dt id=CSS21>[CSS21]
4866+
4867+
<dd>Bert Bos; et al. <a
4868+
href="http://www.w3.org/TR/2011/REC-CSS2-20110607"><cite>Cascading Style
4869+
Sheets Level 2 Revision 1 (CSS 2.1) Specification.</cite></a> 7 June
4870+
2011. W3C Recommendation. URL: <a
4871+
href="http://www.w3.org/TR/2011/REC-CSS2-20110607">http://www.w3.org/TR/2011/REC-CSS2-20110607</a>
4872+
</dd>
4873+
<!---->
4874+
48774875
<dt id=HTML5>[HTML5]
48784876

48794877
<dd>Ian Hickson. <a
4880-
href="http://www.w3.org/TR/2011/WD-html5-20110113"><cite>HTML5.</cite></a>
4881-
13 January 2011. W3C Working Draft. (Work in progress.) URL: <a
4882-
href="http://www.w3.org/TR/2011/WD-html5-20110113">http://www.w3.org/TR/2011/WD-html5-20110113</a>
4878+
href="http://www.w3.org/TR/2011/WD-html5-20110525/"><cite>HTML5.</cite></a>
4879+
25 May 2011. W3C Working Draft. (Work in progress.) URL: <a
4880+
href="http://www.w3.org/TR/2011/WD-html5-20110525/">http://www.w3.org/TR/2011/WD-html5-20110525/</a>
48834881
</dd>
48844882
<!---->
48854883

@@ -4932,28 +4930,29 @@ <h3 class=no-num id=normative-references>Normative References</h3>
49324930
</dd>
49334931
<!---->
49344932

4935-
<dt id=UNICODE5>[UNICODE5]
4933+
<dt id=UNICODE6>[UNICODE6]
49364934

49374935
<dd>The Unicode Consortium. <a
4938-
href="http://www.unicode.org/versions/Unicode5.1.0/"><cite>The Unicode
4939-
Standard, Version 5.1.0.</cite></a> Addison-Wesley. 2007. ISBN
4940-
0-321-48091-0. URL: <a
4941-
href="http://www.unicode.org/versions/Unicode5.1.0/">http://www.unicode.org/versions/Unicode5.1.0/</a>
4936+
href="http://www.unicode.org/versions/Unicode6.0.0/"><cite>The Unicode
4937+
Standard, Version 6.0.0.</cite></a> Defined by: The Unicode Standard,
4938+
Version 6.0.0 (Mountain View, CA: The Unicode Consortium, 2011. ISBN
4939+
978-1-936213-01-6) URL: <a
4940+
href="http://www.unicode.org/versions/Unicode6.0.0/">http://www.unicode.org/versions/Unicode6.0.0/</a>
49424941
</dd>
49434942
<!---->
49444943
</dl>
49454944
<!--end-normative-->
4945+
<!--{{!CSS21}}-->
49464946
<!--{{!OPENTYPE}}-->
49474947
<!--{{!OPENTYPE-FEATURES}}-->
49484948
<!--{{!AAT-FEATURES}}-->
49494949
<!--{{!OPEN-FONT-FORMAT}}-->
4950-
<!--{{!UNICODE5}}-->
4950+
<!--{{!UNICODE6}}-->
49514951
<!--{{!UAX15}}-->
49524952
<!--{{!UAX29}}-->
49534953
<!--{{!CORS}}-->
49544954
<!--{{!HTML5}}-->
49554955
<!--{{!CHARMOD}}-->
4956-
<!--{{!CHARMOD-NORM}}-->
49574956

49584957
<h3 class=no-num id=other-references>Other References</h3>
49594958
<!--begin-informative-->
@@ -5028,6 +5027,7 @@ <h3 class=no-num id=other-references>Other References</h3>
50285027
<!--{{OPENTYPE-FONT-GUIDE}}-->
50295028
<!--{{RASTER-TRAGEDY}}-->
50305029
<!--{{WINDOWS-GLYPH-PROC}}-->
5030+
<!--{{!CHARMOD-NORM}}-->
50315031

50325032
<h2 class=no-num id=index>Index</h2>
50335033
<!--begin-index-->
@@ -5535,11 +5535,13 @@ <h2 class=no-num id=property-index>Property index</h2>
55355535

55365536
<td>normal | inherit | [ &lt;common-lig-values&gt; ||
55375537
&lt;additional-lig-values&gt; || &lt;historical-lig-values&gt; ||
5538-
&lt;contextual-alt-values&gt; || stylistic[(&lt;integer&gt;)]? ||
5539-
historical-forms || styleset(&lt;integer&gt; [,&lt;integer&gt;]*) ||
5540-
character-variant(&lt;integer&gt; [,&lt;integer&gt;]*) ||
5541-
swash[(&lt;integer&gt;)]? || ornament[(&lt;integer&gt;)]? ||
5542-
annotation[(&lt;integer&gt;)]? || ruby || &lt;caps-value&gt; ||
5538+
&lt;contextual-alt-values&gt; || stylistic(&lt;feature-value-name&gt;)
5539+
|| historical-forms || styleset(&lt;feature-value-name&gt; [,
5540+
&lt;feature-value-name&gt;]*) ||
5541+
character-variant(&lt;feature-value-name&gt;
5542+
[,&lt;feature-value-name&gt;]*) || swash(&lt;feature-value-name&gt;) ||
5543+
ornaments(&lt;feature-value-name&gt;) ||
5544+
annotation(&lt;feature-value-name&gt;) || ruby || &lt;caps-value&gt; ||
55435545
&lt;numeric-figure-values&gt; || &lt;numeric-spacing-values&gt; ||
55445546
&lt;numeric-fraction-values&gt; || slashed-zero ||
55455547
&lt;east-asian-variant-values&gt; || &lt;east-asian-width-values&gt; ]
@@ -5563,7 +5565,7 @@ <h2 class=no-num id=property-index>Property index</h2>
55635565
styleset(&lt;feature-value-name&gt; [, &lt;feature-value-name&gt;]*) ||
55645566
character-variant(&lt;feature-value-name&gt;
55655567
[,&lt;feature-value-name&gt;]*) || swash(&lt;feature-value-name&gt;) ||
5566-
ornament(&lt;feature-value-name&gt;) ||
5568+
ornaments(&lt;feature-value-name&gt;) ||
55675569
annotation(&lt;feature-value-name&gt;) || ruby ]
55685570

55695571
<td>normal

0 commit comments

Comments
 (0)
<