- From: John Daggett via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 21 Jun 2011 04:25:52 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-fonts
In directory hutz:/tmp/cvs-serv12534
Modified Files:
Fonts.html
Log Message:
correct various mistakes, reorganize references
Index: Fonts.html
===================================================================
RCS file: /sources/public/csswg/css3-fonts/Fonts.html,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Fonts.html 28 Apr 2011 07:26:52 -0000 1.54
+++ Fonts.html 21 Jun 2011 04:25:50 -0000 1.55
@@ -111,14 +111,14 @@
<h1>CSS Fonts Module Level 3</h1>
- <h2 class="no-num no-toc" id=editors>Editor's Draft 28 April 2011</h2>
+ <h2 class="no-num no-toc" id=editors>Editor's Draft 21 June 2011</h2>
<dl id=authors>
<dt>This version:
<dd><a
href="http://dev.w3.org/csswg/css3-fonts/">http://dev.w3.org/csswg/css3-fonts/</a>
- <!-- <dd><a href="http://www.w3.org/TR/2011/ED-css3-fonts-20110428">http://www.w3.org/TR/2011/ED-css3-fonts-20110428</a> -->
+ <!-- <dd><a href="http://www.w3.org/TR/2011/ED-css3-fonts-20110621">http://www.w3.org/TR/2011/ED-css3-fonts-20110621</a> -->
<dt>Latest version:
@@ -719,10 +719,10 @@
href="#sans-serif">sans-serif</a></code>’ generic font family. CSS uses
the term ‘<code class=property><a href="#serif">serif</a></code>’ to
apply to a font for any script, although other names may be more familiar
- for particular scripts, such as Mincho (Japanese), Sung or Song (Chinese),
- Batang (Korean). Any font that is so described may be used to represent
- the generic ‘<code class=property><a href="#serif">serif</a></code>’
- family.
+ for particular scripts, such as Mincho (Japanese), Sung, Song or Kai
+ (Chinese), Batang (Korean). Any font that is so described may be used to
+ represent the generic ‘<code class=property><a
+ href="#serif">serif</a></code>’ family.
<div class=figure><img alt="sample serif fonts" src=serifexamples.png>
<p class=caption>Sample serif fonts
@@ -740,11 +740,10 @@
href="#serif">serif</a></code>’ family. CSS uses the term ‘<code
class=property><a href="#sans-serif">sans-serif</a></code>’ to apply to
a font for any script, although other names may be more familiar for
- particular scripts, such as Gothic (Japanese), Kai (Chinese), or Gulim
+ particular scripts, such as Gothic (Japanese), Hei (Chinese), or Gulim
(Korean). Any font that is so described may be used to represent the
generic ‘<code class=property><a
href="#sans-serif">sans-serif</a></code>’ family.
- <!-- Kai for Chinese looks wrong, looks to be a serif-like face. -->
<div class=figure><img alt="sample sans-serif fonts"
src=sansserifexamples.png>
@@ -3738,7 +3737,7 @@
styleset(<feature-value-name> [, <feature-value-name>]*) ||
character-variant(<feature-value-name>
[,<feature-value-name>]*) || swash(<feature-value-name>) ||
- ornament(<feature-value-name>) ||
+ ornaments(<feature-value-name>) ||
annotation(<feature-value-name>) || ruby ]
<tr>
@@ -3898,19 +3897,6 @@
font scaling.
</dl>
- <div class=example>
- <p>The example below uses stylistic sets and swashes for section titles
- but not for the main title.</p>
-
- <pre>h2 { font-variant-alternates: styleset(3,5); }
-h2:first-letter { font-variant-alternates: swash(2); }
-
-<h1>Main title</h1>
-
-<h2>Section title</h2>
-</pre>
- </div>
-
<h3 id=font-feature-values><span class=secno>6.9 </span>Defining font
specific alternates: the @font-feature-values rule</h3>
@@ -4258,11 +4244,13 @@
<td>normal | inherit | [ <common-lig-values> ||
<additional-lig-values> || <historical-lig-values> ||
- <contextual-alt-values> || stylistic[(<integer>)]? ||
- historical-forms || styleset(<integer> [,<integer>]*) ||
- character-variant(<integer> [,<integer>]*) ||
- swash[(<integer>)]? || ornament[(<integer>)]? ||
- annotation[(<integer>)]? || ruby || <caps-value> ||
+ <contextual-alt-values> || stylistic(<feature-value-name>)
+ || historical-forms || styleset(<feature-value-name> [,
+ <feature-value-name>]*) ||
+ character-variant(<feature-value-name>
+ [,<feature-value-name>]*) || swash(<feature-value-name>) ||
+ ornaments(<feature-value-name>) ||
+ annotation(<feature-value-name>) || ruby || <caps-value> ||
<numeric-figure-values> || <numeric-spacing-values> ||
<numeric-fraction-values> || slashed-zero ||
<east-asian-variant-values> || <east-asian-width-values> ]
@@ -4874,12 +4862,22 @@
</dd>
<!---->
+ <dt id=CSS21>[CSS21]
+
+ <dd>Bert Bos; et al. <a
+ href="http://www.w3.org/TR/2011/REC-CSS2-20110607"><cite>Cascading Style
+ Sheets Level 2 Revision 1 (CSS 2.1) Specification.</cite></a> 7 June
+ 2011. W3C Recommendation. URL: <a
+ href="http://www.w3.org/TR/2011/REC-CSS2-20110607">http://www.w3.org/TR/2011/REC-CSS2-20110607</a>
+ </dd>
+ <!---->
+
<dt id=HTML5>[HTML5]
<dd>Ian Hickson. <a
- href="http://www.w3.org/TR/2011/WD-html5-20110113"><cite>HTML5.</cite></a>
- 13 January 2011. W3C Working Draft. (Work in progress.) URL: <a
- href="http://www.w3.org/TR/2011/WD-html5-20110113">http://www.w3.org/TR/2011/WD-html5-20110113</a>
+ href="http://www.w3.org/TR/2011/WD-html5-20110525/"><cite>HTML5.</cite></a>
+ 25 May 2011. W3C Working Draft. (Work in progress.) URL: <a
+ href="http://www.w3.org/TR/2011/WD-html5-20110525/">http://www.w3.org/TR/2011/WD-html5-20110525/</a>
</dd>
<!---->
@@ -4932,28 +4930,29 @@
</dd>
<!---->
- <dt id=UNICODE5>[UNICODE5]
+ <dt id=UNICODE6>[UNICODE6]
<dd>The Unicode Consortium. <a
- href="http://www.unicode.org/versions/Unicode5.1.0/"><cite>The Unicode
- Standard, Version 5.1.0.</cite></a> Addison-Wesley. 2007. ISBN
- 0-321-48091-0. URL: <a
- href="http://www.unicode.org/versions/Unicode5.1.0/">http://www.unicode.org/versions/Unicode5.1.0/</a>
+ href="http://www.unicode.org/versions/Unicode6.0.0/"><cite>The Unicode
+ Standard, Version 6.0.0.</cite></a> Defined by: The Unicode Standard,
+ Version 6.0.0 (Mountain View, CA: The Unicode Consortium, 2011. ISBN
+ 978-1-936213-01-6) URL: <a
+ href="http://www.unicode.org/versions/Unicode6.0.0/">http://www.unicode.org/versions/Unicode6.0.0/</a>
</dd>
<!---->
</dl>
<!--end-normative-->
+ <!--{{!CSS21}}-->
<!--{{!OPENTYPE}}-->
<!--{{!OPENTYPE-FEATURES}}-->
<!--{{!AAT-FEATURES}}-->
<!--{{!OPEN-FONT-FORMAT}}-->
- <!--{{!UNICODE5}}-->
+ <!--{{!UNICODE6}}-->
<!--{{!UAX15}}-->
<!--{{!UAX29}}-->
<!--{{!CORS}}-->
<!--{{!HTML5}}-->
<!--{{!CHARMOD}}-->
- <!--{{!CHARMOD-NORM}}-->
<h3 class=no-num id=other-references>Other References</h3>
<!--begin-informative-->
@@ -5028,6 +5027,7 @@
<!--{{OPENTYPE-FONT-GUIDE}}-->
<!--{{RASTER-TRAGEDY}}-->
<!--{{WINDOWS-GLYPH-PROC}}-->
+ <!--{{!CHARMOD-NORM}}-->
<h2 class=no-num id=index>Index</h2>
<!--begin-index-->
@@ -5535,11 +5535,13 @@
<td>normal | inherit | [ <common-lig-values> ||
<additional-lig-values> || <historical-lig-values> ||
- <contextual-alt-values> || stylistic[(<integer>)]? ||
- historical-forms || styleset(<integer> [,<integer>]*) ||
- character-variant(<integer> [,<integer>]*) ||
- swash[(<integer>)]? || ornament[(<integer>)]? ||
- annotation[(<integer>)]? || ruby || <caps-value> ||
+ <contextual-alt-values> || stylistic(<feature-value-name>)
+ || historical-forms || styleset(<feature-value-name> [,
+ <feature-value-name>]*) ||
+ character-variant(<feature-value-name>
+ [,<feature-value-name>]*) || swash(<feature-value-name>) ||
+ ornaments(<feature-value-name>) ||
+ annotation(<feature-value-name>) || ruby || <caps-value> ||
<numeric-figure-values> || <numeric-spacing-values> ||
<numeric-fraction-values> || slashed-zero ||
<east-asian-variant-values> || <east-asian-width-values> ]
@@ -5563,7 +5565,7 @@
styleset(<feature-value-name> [, <feature-value-name>]*) ||
character-variant(<feature-value-name>
[,<feature-value-name>]*) || swash(<feature-value-name>) ||
- ornament(<feature-value-name>) ||
+ ornaments(<feature-value-name>) ||
annotation(<feature-value-name>) || ruby ]
<td>normal
Received on Tuesday, 21 June 2011 04:25:59 UTC