Mercurial > drafts / changeset

     1.1 --- a/css-fonts/Fonts.html	Sun May 19 20:09:59 2013 -0700
     1.2 +++ b/css-fonts/Fonts.html	Mon May 20 16:31:55 2013 +0800
     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-17-may-2013>Editor's Draft 17
     1.8 +   <h2 class="no-num no-toc" id=editors-draft-20-may-2013>Editor's Draft 20
     1.9      May 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-20130517/">http://www.w3.org/TR/2013/ED-css3-fonts-20130517/</a> -->
    1.17 +     <!-- <dd><a href="http://www.w3.org/TR/2013/ED-css3-fonts-20130520/">http://www.w3.org/TR/2013/ED-css3-fonts-20130520/</a> -->
    1.18       
    1.19  
    1.20      <dt>Latest version:
    1.21 @@ -1175,14 +1175,12 @@
    1.22     <li><code>ultra-expanded</code>
    1.23    </ul>
    1.24  
    1.25 -  <p>The scale is relative, so a face with a font-stretch value higher in the
    1.26 -   list above should never appear wider. When a face does not exist for a
    1.27 -   given width, normal or condensed values map to a narrower face, otherwise
    1.28 -   a wider face. Conversely, expanded values map to a wider face, otherwise a
    1.29 -   narrower face. The figure below shows how the nine font-stretch property
    1.30 -   settings affect font selection for font family containing a variety of
    1.31 -   widths, grey indicates a width for which no face exists and a different
    1.32 -   width is substituted:
    1.33 +  <p>When a face does not exist for a given width, normal or condensed values
    1.34 +   map to a narrower face, otherwise a wider face. Conversely, expanded
    1.35 +   values map to a wider face, otherwise a narrower face. The figure below
    1.36 +   shows how the nine font-stretch property settings affect font selection
    1.37 +   for font family containing a variety of widths, grey indicates a width for
    1.38 +   which no face exists and a different width is substituted:
    1.39  
    1.40    <div class=figure><img alt="width mappings for a family with condensed,
    1.41     normal and expanded faces" src=universwidths.png>
    1.42 @@ -1798,14 +1796,19 @@
    1.43    <p>The syntax of this property is based on a traditional typographical
    1.44     shorthand notation to set multiple properties related to fonts.
    1.45  
    1.46 -  <p>All font-related properties are first reset to their initial values,
    1.47 -   including those listed in the preceding paragraph plus <span
    1.48 +  <p>All subproperties of the ‘<a href="#propdef-font"><code
    1.49 +   class=property>font</code></a>’ property are first reset to their
    1.50 +   initial values, including those listed above plus <span
    1.51     class=property>‘<a href="#propdef-font-size-adjust"><code
    1.52     class=property>font-size-adjust</code></a>’</span>, <span
    1.53     class=property>‘<a href="#propdef-font-kerning"><code
    1.54 -   class=property>font-kerning</code></a>’</span> and all font feature
    1.55 -   properties. Then, those properties that are given explicit values in the
    1.56 -   <span class=property>‘<a href="#propdef-font"><code
    1.57 +   class=property>font-kerning</code></a>’</span>, subproperties of <span
    1.58 +   class=property>‘<a href="#propdef-font-variant"><code
    1.59 +   class=property>font-variant</code></a>’</span> and and <span
    1.60 +   class=property>‘<a href="#propdef-font-language-override"><code
    1.61 +   class=property>font-language-override</code></a>’</span>. Then, those
    1.62 +   properties that are given explicit values in the <span
    1.63 +   class=property>‘<a href="#propdef-font"><code
    1.64     class=property>font</code></a>’</span> shorthand are set to those
    1.65     values. For a definition of allowed and initial values, see the previously
    1.66     defined properties. For reasons of backwards compatibility, it is not
    1.67 @@ -2798,10 +2801,10 @@
    1.68       <td>normal
    1.69    </table>
    1.70  
    1.71 -  <p>These descriptors define settings that apply when the font defined by an
    1.72 -   <code>@font-face</code> rule is rendered. They do not affect font
    1.73 -   selection. Values are identical to those defined for the corresponding
    1.74 -   ‘<a href="#propdef-font-variant"><code
    1.75 +  <p>These descriptors define default settings that apply when the font
    1.76 +   defined by an <code>@font-face</code> rule is rendered. They do not affect
    1.77 +   font selection. Values are identical to those defined for the
    1.78 +   corresponding ‘<a href="#propdef-font-variant"><code
    1.79     class=property>font-variant</code></a>’ and ‘<a
    1.80     href="#propdef-font-feature-settings"><code
    1.81     class=property>font-feature-settings</code></a>’ properties defined