add in font-stretch to font matching

Author: John Daggett

css3-fonts/Fonts.html

@@ -183,20 +183,23 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
       class=property>font-stretch</span>&rsquo;</span> </a>
 
      <li><a href="#font-family0"><span class=secno>3.2 </span>Font family:
-      the &lsquo;<span class=property>font-family</span>&rsquo; property</a>
+      the &lsquo;<span class=property>font-family</span>&rsquo;
+      descriptor</a>
 
      <li><a href="#font-style0"><span class=secno>3.3 </span>Font style: the
-      &lsquo;<span class=property>font-style</span>&rsquo; property</a>
+      &lsquo;<span class=property>font-style</span>&rsquo; descriptor</a>
 
      <li><a href="#font-weight0"><span class=secno>3.4 </span>Font weight:
-      the &lsquo;<span class=property>font-weight</span>&rsquo; property</a>
+      the &lsquo;<span class=property>font-weight</span>&rsquo;
+      descriptor</a>
 
      <li><a href="#font-stretch"><span class=secno>3.5 </span>Font stretch:
-      the &lsquo;<span class=property>font-stretch</span>&rsquo; property</a>
+      the &lsquo;<span class=property>font-stretch</span>&rsquo;
+      descriptor</a>
 
      <li><a href="#character"><span class=secno>3.6 </span>Character range:
       the &lsquo;<span class=property>unicode-range</span>&rsquo;
-      property</a>
+      descriptor</a>
 
      <li><a href="#font-reference"><span class=secno>3.7 </span>Font
       reference: the &lsquo;<span class=property>src</span>&rsquo;
@@ -1815,7 +1818,7 @@ <h3 id=descriptors><span class=secno>3.1 </span><a name=select>Descriptors
    initial value for the descriptor is used.
 
   <h3 id=font-family0><span class=secno>3.2 </span>Font family: the &lsquo;<a
-   class=property href="#font-family2">font-family</a>&rsquo; property</h3>
+   class=property href="#font-family2">font-family</a>&rsquo; descriptor</h3>
 
   <table class=descdef>
    <tbody>
@@ -1847,7 +1850,7 @@ <h3 id=font-family0><span class=secno>3.2 </span>Font family: the &lsquo;<a
    href="#font-family2">font-family</a>&rsquo;</span> property.
 
   <h3 id=font-style0><span class=secno>3.3 </span>Font style: the &lsquo;<a
-   class=property href="#font-style2">font-style</a>&rsquo; property</h3>
+   class=property href="#font-style2">font-style</a>&rsquo; descriptor</h3>
 
   <table class=descdef>
    <tbody>
@@ -1879,7 +1882,7 @@ <h3 id=font-style0><span class=secno>3.3 </span>Font style: the &lsquo;<a
    comma-separated list is permitted.
 
   <h3 id=font-weight0><span class=secno>3.4 </span>Font weight: the &lsquo;<a
-   class=property href="#font-weight2">font-weight</a>&rsquo; property</h3>
+   class=property href="#font-weight2">font-weight</a>&rsquo; descriptor</h3>
 
   <table class=descdef>
    <tbody>
@@ -1926,7 +1929,7 @@ <h3 id=font-weight0><span class=secno>3.4 </span>Font weight: the &lsquo;<a
 
   <h3 id=font-stretch><span class=secno>3.5 </span>Font stretch: the
    &lsquo;<a class=property href="#font-stretch1">font-stretch</a>&rsquo;
-   property</h3>
+   descriptor</h3>
 
   <table class=descdef>
    <tbody>
@@ -1970,7 +1973,7 @@ <h3 id=font-stretch><span class=secno>3.5 </span>Font stretch: the
 
   <h3 id=character><span class=secno>3.6 </span>Character range: the
    &lsquo;<a class=property href="#unicode-range">unicode-range</a>&rsquo;
-   property</h3>
+   descriptor</h3>
 
   <table class=descdef>
    <tbody>
@@ -1995,21 +1998,19 @@ <h3 id=character><span class=secno>3.6 </span>Character range: the
      <td>visual
   </table>
 
-  <p> The following descriptor is optional within a font definition, but is
+  <p>The following descriptor is optional within a font definition, but is
    used to avoid checking or downloading a font that does not have sufficient
    glyphs to render a particular character.
 
-  <p>This is the descriptor for the <a href="#ucode">range of ISO 10646
-   characters</a> covered by the font.
-
-  <p>The values of <span class=index-def id=lturangegt
+  <p>This is the descriptor for the Unicode characters covered by the font.
+   The values of <span class=index-def id=lturangegt
    title="&lt;urange&gt;::definition of"><a
    name=value-def-urange>&lt;urange&gt;</a></span> are expressed using
-   hexadecimal numbers prefixed by "U+", corresponding to character code
-   positions in ISO 10646 (<a href="#ISO10646"
-   rel=biblioentry>[ISO10646]<!--{{ISO10646}}--></a>).
+   hexadecimal numbers prefixed by "U+", corresponding to Unicode character
+   code positions (<a href="#UNICODE5"
+   rel=biblioentry>[UNICODE5]<!--{{!UNICODE5}}--></a>).
 
-  <p>For example, <tt>U+05D1</tt> is the ISO 10646 character &lsquo;<code
+  <p>For example, <tt>U+05D1</tt> is the Unicode character &lsquo;<code
    class=css>Hebrew letter bet</code>&rsquo;. For values outside the Basic
    Multilingual Plane (BMP), additional leading digits corresponding to the
    plane number are added, also in hexadecimal, like this: <tt>U+A1234</tt>
@@ -2019,9 +2020,9 @@ <h3 id=character><span class=secno>3.6 </span>Character range: the
 
   <p>The <a href="cascade.html#initial-value">initial value</a> of this
    descriptor covers not only the entire Basic Multilingual Plane (BMP),
-   which would be expressed as U+0-FFFF, but also the whole repertoire of ISO
-   10646. Thus, the initial value says that the font may have glyphs for
-   characters anywhere in ISO 10646. Specifying a value for <span
+   which would be expressed as U+0-FFFF, but also the whole repertoire of
+   Unicode. Thus, the initial value says that the font may have glyphs for
+   characters anywhere in Unicode. Specifying a value for <span
    class=descinst-unicode-range>&lsquo;<a class=property
    href="#unicode-range">unicode-range</a>&rsquo;</span> provides information
    to make searching efficient, by declaring a constrained range in which the
@@ -2079,7 +2080,7 @@ <h3 id=character><span class=secno>3.6 </span>Character range: the
 
    <dd>Something of a worst case in terms of verbosity, this very precisely
     indicates that this (extremely large) font contains only Chinese
-    characters from ISO 10646, without including any characters that are
+    characters from Unicode, without including any characters that are
     uniquely Japanese or Korean. The range is 3000 to 303F (CJK symbols and
     punctuation) plus 3100 to 312F (Bopomofo) plus 3200 to 32FF (enclosed CJK
     letters and months) plus 3300 to 33FF (CJK compatibility zone) plus 4E00
@@ -2257,7 +2258,7 @@ <h3 id=font-reference><span class=secno>3.7 </span>Font reference: the
    independent, but at the moment it is the best way to identify locally
    installed font data. The use of the font face name can be made more
    accurate by providing an indication of the glyph complement required. This
-   may be done by indicating the range of ISO 10646 character positions for
+   may be done by indicating the range of Unicode character positions for
    which the font provides some glyphs (see <span
    class=descinst-unicode-range>&lsquo;<a class=property
    href="#unicode-range">unicode-range</a>&rsquo;</span>).
@@ -2271,10 +2272,10 @@ <h2 id=font-matching><span class=secno>4. </span>Font matching algorithm</h2>
 
      <li>choose the face based on the set of faces associated with that name
       <ol>
-       <li>font-style
-
        <li>font-stretch
 
+       <li>font-style
+
        <li>font-weight
 
        <li>font-size
@@ -2296,29 +2297,6 @@ <h2 id=font-matching><span class=secno>4. </span>Font matching algorithm</h2>
 
    <li>note that this means a single element can end up using multiple
     fonts/faces!
-
-   <li>simple to complex examples
-    <ul>
-     <li>bold italic
-
-     <li>italic (synthesized)
-
-     <li>specific weights
-
-     <li>bolder/lighter
-
-     <li>bolder (synthesized)
-
-     <li>condensed
-
-     <li>run of text containing diacritics
-
-     <li>run of text containing mixture of Japanese/English
-
-     <li>simple downloaded font
-
-     <li>font-face with local/url combination
-    </ul>
   </ul>
 
   <p>This specification extends the algorithm given in the CSS1
@@ -2398,21 +2376,8 @@ <h2 id=font-matching><span class=secno>4. </span>Font matching algorithm</h2>
     for whatever reason, or where the downloaded font cannot be used for
     whatever reason, are considered to fail at this step.
 
-   <li>If there is no matching font face within the <span
+   <li>If all of steps 3 and 4 fail, and if there is a next alternative <span
     class=descinst-font-family>&lsquo;<a class=property
-    href="#font-family2">font-family</a>&rsquo;</span> being processed by
-    step 3, <em>UAs that implement font synthesis</em> may proceed to examine
-    other descriptors such as <span class=descinst-x-height>&lsquo;<span
-    class=property>x-height</span>&rsquo;</span>, glyph widths, and <span
-    class=descinst-panose-1>&lsquo;<code
-    class=css>panose-1</code>&rsquo;</span> to identify a different tentative
-    font family for synthesis. If there are matches for all the remaining
-    descriptors, then that is the matching font face for the given element
-    and synthesis of the faux font may begin. UAs that do not implement font
-    synthesis are considered to fail at this step.
-
-   <li>If all of steps 3, 4 and 5 fail, and if there is a next alternative
-    <span class=descinst-font-family>&lsquo;<a class=property
     href="#font-family2">font-family</a>&rsquo;</span> in the font set, then
     repeat from step 2 with the next alternative <span
     class=descinst-font-family>&lsquo;<a class=property
@@ -2457,12 +2422,6 @@ <h2 id=font-matching><span class=secno>4. </span>Font matching algorithm</h2>
     <!-- [this text isn't perfect either, but it's important to get it in
       before going to PR, HWL] -->
 
-
-   <li>UAs that implement progressive rendering and have pending font
-    downloads may, once download is successful, use the downloaded font as a
-    font family. If the downloaded font is missing some glyphs that the
-    temporary progressive font did contain, the downloaded font is not used
-    for that character and the temporary font continues to be used.
   </ol>
 
   <div class=note>
@@ -2474,7 +2433,13 @@ <h2 id=font-matching><span class=secno>4. </span>Font matching algorithm</h2>
 
   <ol>
    <li> <span class=descinst-font-style>&lsquo;<a class=property
-    href="#font-style2">font-style</a>&rsquo;</span> is tried first.
+    href="#font-stretch1">font-stretch</a>&rsquo;</span> is tried first.
+    &lsquo;<span class=property>normal</span>&rsquo; matches a font not
+    labeled as &lsquo;<span class=property>condensed</span>&rsquo; or
+    &lsquo;<span class=property>expanded</span>&rsquo;.
+
+   <li> <span class=descinst-font-style>&lsquo;<a class=property
+    href="#font-style2">font-style</a>&rsquo;</span> is tried next.
     &lsquo;<span class=property>italic</span>&rsquo; will be satisfied if
     there is either a face in the UA's font database labeled with the CSS
     keyword &lsquo;<span class=property>italic</span>&rsquo; (preferred) or
@@ -2511,8 +2476,7 @@ <h2 id=font-matching><span class=secno>4. </span>Font matching algorithm</h2>
   <h3 id=mapping><span class=secno>4.1 </span>Mapping font weight values to
    font names</h3>
 
-  <p><!-- the above para might be moved around again --> The <span
-   class=propinst-font-weight>&lsquo;<a class=property
+  <p> The <span class=propinst-font-weight>&lsquo;<a class=property
    href="#font-weight2">font-weight</a>&rsquo;</span> property values are
    given on a numerical scale in which the value &lsquo;<code
    class=css>400</code>&rsquo; (or &lsquo;<span
@@ -2676,6 +2640,32 @@ <h3 id=mapping><span class=secno>4.1 </span>Mapping font weight values to
 
   <h3 id=examples><span class=secno>4.2 </span>Examples of font matching</h3>
 
+  <ul></ul>
+
+  <p>simple to complex examples
+
+  <ul>
+   <li>bold italic
+
+   <li>italic (synthesized)
+
+   <li>specific weights
+
+   <li>bolder/lighter
+
+   <li>bolder (synthesized)
+
+   <li>condensed
+
+   <li>run of text containing diacritics
+
+   <li>run of text containing mixture of Japanese/English
+
+   <li>simple downloaded font
+
+   <li>font-face with local/url combination
+  </ul>
+
   <div class=example>
    <p> The following example defines a specific font face, Alabama Italic. A
     panose font description and source URI for retrieving a truetype server
@@ -2978,11 +2968,22 @@ <h3 id=normative><span class=secno>6.1 </span>Normative</h3>
     href="http://www.w3.org/TR/2003/WD-css3-syntax-20030813">http://www.w3.org/TR/2003/WD-css3-syntax-20030813</a>
     </dd>
    <!---->
+
+   <dt id=UNICODE5>[UNICODE5]
+
+   <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>
+    </dd>
+   <!---->
   </dl>
   <!--end-normative-->
   <!-- 
-    [[UNICODE5]]
--->
+    <a href="#UNICODE5" rel="biblioentry">[UNICODE5]<!--{{UNICODE5}}-->
+
+  <p>-->
 
   <h3 id=informative><span class=secno>6.2 </span>Informative</h3>
   <!--begin-informative-->
@@ -2994,12 +2995,8 @@ <h3 id=informative><span class=secno>6.2 </span>Informative</h3>
 
    <dt id=ARABIC-TYPO>[ARABIC-TYPO]
 
-   <dd>Huda Smitshuijzen AbiFares. <a
-    href="http://www.saqibooks.com/saqi/display.asp?K=9780863563478"><cite>Arabic
-    Typography: A Comprehensive Sourcebook.</cite></a> 2001. ISBN
-    0-86356-347-3. URL: <a
-    href="http://www.saqibooks.com/saqi/display.asp?K=9780863563478">http://www.saqibooks.com/saqi/display.asp?K=9780863563478</a>
-    </dd>
+   <dd>Huda Smitshuijzen AbiFares. <cite>Arabic Typography: A Comprehensive
+    Sourcebook.</cite> 2001. ISBN 0-86356-347-3.</dd>
    <!---->
 
    <dt id=ELEMTYPO>[ELEMTYPO]
@@ -3018,23 +3015,19 @@ <h3 id=informative><span class=secno>6.2 </span>Informative</h3>
     </dd>
    <!---->
 
-   <dt id=ISO10646>[ISO10646]
+   <dt id=LANGCULTTYPE>[LANGCULTTYPE]
 
-   <dd><cite>Information Technology - Universal Multiple- Octet Coded
-    CharacterSet (UCS) - Part 1: Architecture and Basic Multilingual
-    Plane.</cite> ISO/IEC10646-1:1993. The current specification also takes
-    into consideration the first five amendments to ISO/IEC 10646-1:1993.
-    Useful &lt;a
-    href=&quot;http://www.egt.ie/standards/iso10646/ucs-roadmap.html&quot;&gt;roadmaps&lt;/a&gt;show
-    which scripts sit at which numeric ranges.</dd>
+   <dd>John D. Berry, Ed. <cite>Language Culture Type.</cite> 2001. ISBN
+    1-932026-01-0.</dd>
    <!---->
 
-   <dt id=LANGCULTTYPE>[LANGCULTTYPE]
+   <dt id=UNICODE5>[UNICODE5]
 
-   <dd>John D. Berry, Ed. <a
-    href="http://www.graphis.com/other_titles/design.php?view=book&amp;id=81"><cite>Language
-    Culture Type.</cite></a> 2001. ISBN 1-932026-01-0. URL: <a
-    href="http://www.graphis.com/other_titles/design.php?view=book&amp;id=81">http://www.graphis.com/other_titles/design.php?view=book&amp;id=81</a>
+   <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>
     </dd>
    <!---->
   </dl>