1.1 --- a/css-fonts/Fonts.html Thu Jun 06 13:44:09 2013 +0900
1.2 +++ b/css-fonts/Fonts.html Thu Jun 06 16:14:13 2013 +0900
1.3 @@ -112,7 +112,7 @@
1.4
1.5 <h1>CSS Fonts Module Level 3</h1>
1.6
1.7 - <h2 class="no-num no-toc" id=editors-draft-5-june-2013>Editor's Draft 5
1.8 + <h2 class="no-num no-toc" id=editors-draft-6-june-2013>Editor's Draft 6
1.9 June 2013</h2>
1.10
1.11 <dl id=authors>
1.12 @@ -120,7 +120,7 @@
1.13
1.14 <dd><a
1.15 href="http://dev.w3.org/csswg/css-fonts/">http://dev.w3.org/csswg/css-fonts/</a>
1.16 - <!-- <dd><a href="http://www.w3.org/TR/2013/ED-css3-fonts-20130605/">http://www.w3.org/TR/2013/ED-css3-fonts-20130605/</a> -->
1.17 + <!-- <dd><a href="http://www.w3.org/TR/2013/ED-css3-fonts-20130606/">http://www.w3.org/TR/2013/ED-css3-fonts-20130606/</a> -->
1.18
1.19
1.20 <dt>Latest version:
1.21 @@ -2665,9 +2665,8 @@
1.22 correspond to <a href="http://www.unicode.org/charts/">Unicode character
1.23 codepoints</a>. Valid Unicode codepoint values vary between 0 and 10FFFF
1.24 inclusive. Digit values of codepoints are ASCII case-insensitive. For
1.25 - interval ranges, the start and end codepoints must be valid Unicode values
1.26 - and the end codepoint must be greater than or equal to the start
1.27 - codepoint.
1.28 + interval ranges, the start and end codepoints are valid Unicode values and
1.29 + the end codepoint is greater than or equal to the start codepoint.
1.30
1.31 <p>Wildcard ranges specified with ‘?’ that lack an initial digit (e.g.
1.32 "U+???") are valid and equivalent to a wildcard range with an initial zero
1.33 @@ -2971,8 +2970,10 @@
1.34 <a href="#at-font-face-rule"><code>@font-face</code></a> rules without
1.35 considering whether those fonts are in fact used within a page are
1.36 considered non-conformant. In cases where a font might be downloaded in
1.37 - character fallback cases, user agents may download a font if it's listed
1.38 - in a font list but is not actually used for a given text run.
1.39 + character fallback cases, user agents may download a font if it's
1.40 + contained within the computed value of <a href="#propdef-font-family"
1.41 + title="font-family!!property">‘<code
1.42 + class=property>font-family</code>’</a> for a given text run.
1.43
1.44 <pre>
1.45 @font-face {
1.46 @@ -5468,7 +5469,7 @@
1.47
1.48 <p>General and <a href="#font-specific"><em>font specific</em></a> font
1.49 feature property settings are resolved in the order below, in ascending
1.50 - precedence order. This ordering is used to construct a combined list of
1.51 + order of precedence. This ordering is used to construct a combined list of
1.52 font features that affect a given text run.
1.53
1.54 <ol>
1.55 @@ -5492,14 +5493,15 @@
1.56 title="font-feature-settings!!property">‘<code
1.57 class=property>font-feature-settings</code>’</a>. For example, setting
1.58 a non-default value for the ‘<code
1.59 - class=property>letter-spacing</code>’ property disables ligatures.
1.60 + class=property>letter-spacing</code>’ property disables common
1.61 + ligatures.
1.62
1.63 <li>Font features implied by the value of the <a
1.64 href="#propdef-font-variant" title="font-variant!!property">‘<code
1.65 class=property>font-variant</code>’</a> property, the related <a
1.66 href="#propdef-font-variant" title="font-variant!!property">‘<code
1.67 class=property>font-variant</code>’</a> subproperties and any other CSS
1.68 - property that may use OpenType features (e.g. the ‘<a
1.69 + property that uses OpenType features (e.g. the ‘<a
1.70 href="#propdef-font-kerning"><code
1.71 class=property>font-kerning</code></a>’ property).
1.72
1.73 @@ -5524,7 +5526,7 @@
1.74 font lacks support for a given underlying font feature, text is simply
1.75 rendered as if that font feature was not enabled; font fallback does not
1.76 occur and no attempt is made to synthesize the feature except where
1.77 - explicitly noted for specific properties.
1.78 + explicitly defined for specific properties.
1.79
1.80 <h3 id=feature-precedence-examples><span class=secno>7.3 </span>Feature
1.81 precedence examples</h3>
1.82 @@ -5544,9 +5546,10 @@
1.83 </div>
1.84
1.85 <div class=example>
1.86 - <p>When the font-variant descriptor is used within an <a
1.87 - href="#at-font-face-rule"><code>@font-face</code></a> rule, it only
1.88 - applies to the font defined by that rule.</p>
1.89 + <p>When the <a href="#descdef-font-variant"
1.90 + title="font-variant!!descriptor">font-variant</a> descriptor is used
1.91 + within an <a href="#at-font-face-rule"><code>@font-face</code></a> rule,
1.92 + it only applies to the font defined by that rule.</p>
1.93
1.94 <pre>@font-face {
1.95 font-family: MainText;
1.96 @@ -5610,16 +5613,17 @@
1.97 span.special { font-variant-ligatures: no-discretionary-ligatures; }
1.98 </pre>
1.99
1.100 - <p>Adding an discretionary style rule with the <a
1.101 - href="#at-font-face-rule"><code>@font-face</code></a> above:</p>
1.102 + <p>Suppose one adds a rule using ‘<code
1.103 + class=property>font-feature-settings</code>’ to enable discretionary
1.104 + ligatures:</p>
1.105
1.106 <pre>body { font-family: main, Helvetica; }
1.107 span { font-feature-settings: "dlig"; }
1.108 span.special { font-variant-ligatures: no-discretionary-ligatures; }
1.109 </pre>
1.110
1.111 - <p>Within spans of class "special", discretionary ligatures <em>will</em>
1.112 - be rendered. This is because both the <a
1.113 + <p>In this case, discretionary ligatures <em>will</em> be rendered within
1.114 + spans of class "special". This is because both the <a
1.115 href="#propdef-font-feature-settings"
1.116 title="font-feature-settings!!property">‘<code
1.117 class=property>font-feature-settings</code>’</a> and ‘<a
