w3c
diff --git a/‎css-fonts/Fonts.html‎
Lines changed: 93 additions & 51 deletions b/‎css-fonts/Fonts.html‎
Lines changed: 93 additions & 51 deletions
@@ -2702,7 +2702,7 @@ <h3 id=unicode-range-desc><span class=secno>4.5 </span>Character range: the
   <p>The associated font might not contain glyphs for the entire set of
    codepoints defined by the ‘<a href="#descdef-unicode-range"><code
    class=property>unicode-range</code></a>’ descriptor. When the font is
-   used the effective <a href="#character-map"><em>character map</em></a> is
+   used, the <dfn id=effective-character-map>effective character map</dfn> is
    the intersection of the codepoints defined by ‘<a
    href="#descdef-unicode-range"><code
    class=property>unicode-range</code></a>’ with the font's <a
@@ -3103,24 +3103,18 @@ <h3 id=font-family-casing><span class=secno>5.1 </span>Case sensitivity of
 
   <p>As part of the font matching algorithm outlined below, user agents must
    match font family names used in style rules with actual font family names
-   contained in fonts available in a given environment or defined via <a
-   href="#at-font-face-rule"><code>@font-face</code></a> rules. User agents
-   must match these names case insensitively, using the "Default Caseless
-   Matching" algorithm outlined in the Unicode specification <a
-   href="#UNICODE6" rel=biblioentry>[UNICODE6]<!--{{!UNICODE6}}--></a>. This
-   algorithm is detailed in section 3.13 entitled "Default Case Algorithms".
-   Specifically, the algorithm must be applied without normalizing the
-   strings involved and without applying any language-specific tailorings.
-   The case folding method specified by this algorithm uses the case mappings
-   with status field ‘<code class=property>C</code>’ or ‘<code
-   class=property>F</code>’ in the CaseFolding.txt file of the Unicode
-   Character Database.
-
-  <p class=note> Implementors should take care to verify that a given
-   caseless string comparison implementation uses this precise algorithm and
-   not assume that a given platform string matching routine follows it, as
-   many of these have locale-specific behavior or use some level of string
-   normalization.
+   contained in fonts available in a given environment or with font family
+   names defined in <a href="#at-font-face-rule"><code>@font-face</code></a>
+   rules. User agents must match these names case insensitively, using the
+   "Default Caseless Matching" algorithm outlined in the Unicode
+   specification <a href="#UNICODE6"
+   rel=biblioentry>[UNICODE6]<!--{{!UNICODE6}}--></a>. This algorithm is
+   detailed in section 3.13 entitled "Default Case Algorithms". Specifically,
+   the algorithm must be applied without normalizing the strings involved and
+   without applying any language-specific tailorings. The case folding method
+   specified by this algorithm uses the case mappings with status field
+   ‘<code class=property>C</code>’ or ‘<code class=property>F</code>’
+   in the CaseFolding.txt file of the Unicode Character Database.
 
   <p class=note> For authors this means that font family names are matched
    case insensitively, whether those names exist in a platform font or in the
@@ -3133,13 +3127,21 @@ <h3 id=font-family-casing><span class=secno>5.1 </span>Case sensitivity of
    looks identical but which uses the precomposed lowercase a-ring character
    (U+00E5) instead of the combining sequence.
 
+  <p class=note> Implementors should take care to verify that a given
+   caseless string comparison implementation uses this precise algorithm and
+   not assume that a given platform string matching routine follows it, as
+   many of these have locale-specific behavior or use some level of string
+   normalization.
+
   <h3 id=font-style-matching><span class=secno>5.2 </span>Matching font
    styles</h3>
 
-  <p>The procedure for choosing fonts consists of iterating over the font
-   families determined by the font-family property, selecting a font face
+  <p>The procedure for choosing a font for a given character in a run of text
+   consists of iterating over the font families named by the <a
+   href="#propdef-font-family" title="font-family!!property">‘<code
+   class=property>font-family</code>’</a> property, selecting a font face
    with the appropriate style based on other font properties and then
-   determining whether a glyph exists for a given character. This is done
+   determining whether a glyph exists for the given character. This is done
    using the <dfn id=character-map>character map</dfn> of the font, data
    which maps characters to the default glyph for that character. Codepoint
    sequences consisting of a base character followed by a sequence of
@@ -3152,24 +3154,24 @@ <h3 id=font-style-matching><span class=secno>5.2 </span>Matching font
 
   <ol id=fontmatchingalg>
    <li>Using the computed font property values for a given element, the user
-    agent starts with the first family name in the fontlist specified by the
-    <a href="#propdef-font-family" title="font-family!!property">‘<code
+    agent starts with the first family name specified by the <a
+    href="#propdef-font-family" title="font-family!!property">‘<code
     class=property>font-family</code>’</a> property.
 
-   <li>If the family name is unquoted and is a generic family name, the user
-    agent looks up the appropriate font family name to be used. User agents
-    may choose the generic font family to use based on the language of the
-    containing element or the Unicode range of the character.
+   <li>If the family name is a generic family keyword, the user agent looks
+    up the appropriate font family name to be used. User agents may choose
+    the generic font family to use based on the language of the containing
+    element or the Unicode range of the character.
 
    <li>For other family names, the user agent attempts to find the family
     name among fonts defined via <a
     href="#at-font-face-rule"><code>@font-face</code></a> rules and then
-    among available system fonts, matching names with a case-insensitive
-    comparison as outlined <a href="#font-family-casing">in the section
-    above</a>. On systems containing fonts with multiple localized font
-    family names, user agents must match any of these names independent of
-    the underlying system locale or platform API used. If the font resources
-    defined for a given face in an <a
+    among available system fonts, matching names with a <a
+    href="#font-family-casing">case-insensitive comparison</a> as outlined in
+    the section above. On systems containing fonts with multiple localized
+    font family names, user agents must match any of these names independent
+    of the underlying system locale or platform API used. If the font
+    resources defined for a given face in an <a
     href="#at-font-face-rule"><code>@font-face</code></a> rule are either not
     available or contain invalid font data, then the face should be treated
     as not present in the family. If no faces are present for a family
@@ -3179,7 +3181,12 @@ <h3 id=font-style-matching><span class=secno>5.2 </span>Matching font
 
    <li>If a font family match occurs, the user agent assembles the set of
     font faces in that family and then narrows the set to a single face using
-    other font properties in the order given below:
+    other font properties in the order given below. A group of faces defined
+    via <a href="#at-font-face-rule"><code>@font-face</code></a> rules with
+    identical font descriptor values but differing ‘<a
+    href="#descdef-unicode-range"><code
+    class=property>unicode-range</code></a>’ values are considered to be a
+    single <dfn id=composite-face>composite face</dfn> for this step:
     <ol id=fontstylematchingalg>
      <li><a href="#propdef-font-stretch"
       title="font-stretch!!property">‘<code
@@ -3216,16 +3223,20 @@ <h3 id=font-style-matching><span class=secno>5.2 </span>Matching font
       then oblique faces, then italic faces. Faces with other style values
       are excluded from the matching set. User agents are permitted to
       distinguish between italic and oblique faces within platform font
-      families but this is not required, they may treat all italic or oblique
-      faces as italic faces. Howe
1808
ver, within font families defined via <a
-      href="#at-font-face-rule"><code>@font-face</code></a> rules, italic and
-      oblique faces must be distinguished using the value of the <a
+      families but this is not required, so all italic or oblique faces may
+      be treated as italic faces. However, within font families defined via
+      <a href="#at-font-face-rule"><code>@font-face</code></a> rules, italic
+      and oblique faces must be distinguished using the value of the <a
       href="#descdef-font-style" title="font-style!!descriptor">‘<code
-      class=property>font-style</code>’</a> descriptor.
+      class=property>font-style</code>’</a> descriptor. For families that
+      lack any italic or oblique faces, users agents may create artificial
+      oblique faces, if this is permitted by the value of the ‘<a
+      href="#propdef-font-synthesis"><code
+      class=property>font-synthesis</code></a>’ property.
 
      <li><a href="#propdef-font-weight"
       title="font-weight!!property">‘<code
-      class=property>font-weight</code>’</a> is matched next, it will
+      class=property>font-weight</code>’</a> is matched next, so it will
       always reduce the matching set to a single font face. If bolder/lighter
       relative weights are used, the effective weight is calculated based on
       the inherited weight value, as described in the definition of the <a
@@ -3261,23 +3272,46 @@ <h3 id=font-style-matching><span class=secno>5.2 </span>Matching font
       the one that is specified.
     </ol>
 
+   <li>
+    <p>If the matched face is defined via <a
+     href="#at-font-face-rule"><code>@font-face</code></a> rules, user agents
+     must use the procedure below to select a single font:
+
+    <ol>
+     <li>If the font resource has not been loaded and the range of characters
+      defined by the ‘<a href="#descdef-unicode-range"><code
+      class=property>unicode-range</code></a>’ descriptor value includes
+      the character in question, load the font.
+
+     <li>After downloading, if the <a
+      href="#effective-character-map"><em>effective character map</em></a>
+      supports the character in question, select that font.
+    </ol>
+
+    <p>When the matched face is a <a href="#composite-face"><em>composite
+     face</em></a>, user agents must use the procedure above on each of the
+     faces in the <a href="#composite-face"><em>composite face</em></a> in
+     reverse order of <a
+     href="#at-font-face-rule"><code>@font-face</code></a> rule definition.</p>
+
+    <p>While the download occurs, user agents may either wait until the font
+     is downloaded or render once with substituted font metrics and render
+     again once the font is downloaded.</p>
+
    <li>
     <p>If no matching face exists or the matched face does not contain a
      glyph for the character to be rendered, the next family name is selected
-     and the previous two steps repeated. Glyphs from other faces in the
+     and the previous three steps repeated. Glyphs from other faces in the
      family are not considered. The only exception is that user agents may
-     optionally substitute a synthetic version of the <a
+     optionally substitute a synthetically obliqued version of the <a
      href="#default-face"><em>default face</em></a> if that face supports a
-     given glyph (e.g. a synthetic italic version of the regular face may be
-     used if the italic face doesn't support glyphs for Arabic).</p>
+     given glyph and synthesis of these faces is permitted by the value of
+     the ‘<a href="#propdef-font-synthesis"><code
+     class=property>font-synthesis</code></a>’ property. For example, a
+     synthetic italic version of the regular face may be used if the italic
+     face doesn't support glyphs for Arabic.</p>
     <!-- resolution on the above: http://lists.w3.org/Archives/Public/www-style/2012Nov/0292.html -->
 
-    <p>If the matched font is defined via an <a
-     href="#at-font-face-rule"><code>@font-face</code></a> rule and needs to
-     be downloaded, the font resource is downloaded. While the download
-     occurs, the user agent can either wait until the font is downloaded or
-     render once with substituted font metrics and render again once the font
-     is downloaded.</p>
 
    <li>If there are no more font families to be evaluated and no matching
     face has been found, then the user agent performs a <dfn
@@ -5841,6 +5875,8 @@ <h3 class=no-num id=recent-changes> Changes from the <a
 
    <li>Revised definition of ‘<a href="#descdef-unicode-range"><code
     class=property>unicode-range</code></a>’ descriptor
+
+   <li>Detailed font matching of composite faces
   </ul>
 
   <h2 class=no-num id=acknowledgments>Acknowledgments</h2>
@@ -6374,6 +6410,9 @@ <h2 class=no-num id=index>Index</h2>
    <li>common-ligatures, <a href="#common-ligatures"
     title=common-ligatures><strong>6.4</strong></a>
 
+   <li>composite face, <a href="#composite-face" title="composite
+    face"><strong>5.2</strong></a>
+
    <li>condensed, <a href="#condensed"
     title=condensed><strong>3.3</strong></a>
 
@@ -6401,6 +6440,9 @@ <h2 class=no-num id=index>Index</h2>
    <li>discretionary-ligatures, <a href="#discretionary-ligatures"
     title=discretionary-ligatures><strong>6.4</strong></a>
 
+   <li>effective character map, <a href="#effective-character-map"
+    title="effective character map"><strong>4.5</strong></a>
+
    <li>expanded, <a href="#expanded" title=expanded><strong>3.3</strong></a>
 
    <li>extra-condensed, <a href="#extra-condensed"