w3c
diff --git a/‎css3-fonts/Fonts.html‎
Lines changed: 52 additions & 53 deletions b/‎css3-fonts/Fonts.html‎
Lines changed: 52 additions & 53 deletions
@@ -10,8 +10,6 @@
       "default.css" rather than "../default.css"
    -->
   <link href="../default.css" rel=stylesheet type="text/css">
-  <link href="http://www.w3.org/StyleSheets/TR/W3C-ED.css" rel=stylesheet
-  type="text/css">
 
   <style type="text/css">
 
@@ -103,6 +101,8 @@
   }
 
   </style>
+  <link href="http://www.w3.org/StyleSheets/TR/W3C-ED.css" rel=stylesheet
+  type="text/css">
 
  <body>
   <div class=head> <!--begin-logo-->
@@ -111,15 +111,15 @@
 
    <h1>CSS Fonts Module Level 3</h1>
 
-   <h2 class="no-num no-toc" id=editors-draft-21-march-2011>Editor's Draft 21
+   <h2 class="no-num no-toc" id=editors-draft-24-march-2011>Editor's Draft 24
     March 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-20110321">http://www.w3.org/TR/2011/ED-css3-fonts-20110321</a> -->
+     <!-- <dd><a href="http://www.w3.org/TR/2011/ED-css3-fonts-20110324">http://www.w3.org/TR/2011/ED-css3-fonts-20110324</a> -->
 
 
     <dt>Latest version:
@@ -134,6 +134,9 @@ <h2 class="no-num no-toc" id=editors-draft-21-march-2011>Editor's Draft 21
 
     <dt>Previous version (CSS3 Fonts):
 
+    <dd><a
+     href="http://www.w3.org/TR/2009/WD-css3-fonts-20110324">http://www.w3.org/TR/2011/WD-css3-fonts-20110324</a>
+
     <dd><a
      href="http://www.w3.org/TR/2009/WD-css3-fonts-20090618">http://www.w3.org/TR/2009/WD-css3-fonts-20090618</a>
 
@@ -828,9 +831,10 @@ <h3 id=font-weight-prop><span class=secno>3.2 </span>Font weight: the <a
      <td>see description
   </table>
 
-  <p>The <a class=noxref href="#font-weight"><span class=property>‘<code
-   class=property>font-weight</code>’</span></a> property specifies weight
-   of glyphs in the font, their degree of blackness or stroke thickness.
+  <p>The <a class=noxref href="#font-weight-prop"><span
+   class=property>‘<code class=property>font-weight</code>’</span></a>
+   property specifies weight of glyphs in the font, their degree of blackness
+   or stroke thickness.
 
   <p>Values have the following meanings:
 
@@ -1051,10 +1055,11 @@ <h3 id=font-stretch-prop><span class=secno>3.3 </span>Font width: the <a
      <td>as specified
   </table>
 
-  <p>The <a class=noxref href="#font-stretch"><span class=property>‘<code
-   class=property>font-stretch</code>’</span></a> property selects a
-   normal, condensed, or expanded face from a font family. Absolute keyword
-   values have the following ordering, from narrowest to widest:
+  <p>The <a class=noxref href="#font-stretch-prop"><span
+   class=property>‘<code class=property>font-stretch</code>’</span></a>
+   property selects a normal, condensed, or expanded face from a font family.
+   Absolute keyword values have the following ordering, from narrowest to
+   widest:
 
   <ul>
    <li>Ultra Condensed
@@ -1138,13 +1143,14 @@ <h3 id=font-style-prop><span class=secno>3.4 </span>Font style: the <a
      <td>as specified
   </table>
 
-  <p>The <a class=noxref href="#font-style"><span class=property>‘<code
-   class=property>font-style</code>’</span></a> property allows italic or
-   oblique faces to be selected. Italic forms are generally cursive in nature
-   while oblique faces are typically sloped versions of the regular face.
-   Oblique faces can be simulated by artificially sloping the glyphs of the
-   regular face. Compare the artificially sloped renderings of Palatino
-   ‘<code class=property>a</code>’ and Baskerville ‘<code
+  <p>The <a class=noxref href="#font-style-prop"><span
+   class=property>‘<code class=property>font-style</code>’</span></a>
+   property allows italic or oblique faces to be selected. Italic forms are
+   generally cursive in nature while oblique faces are typically sloped
+   versions of the regular face. Oblique faces can be simulated by
+   artificially sloping the glyphs of the regular face. Compare the
+   artificially sloped renderings of Palatino ‘<code
+   class=property>a</code>’ and Baskerville ‘<code
    class=property>N</code>’ in grey with the actual italic versions:
 
   <div class=figure><img alt="artificial sloping vs. real italics"
@@ -1374,9 +1380,10 @@ <h3 id=font-size-prop><span class=secno>3.5 </span>Font size: the <a
    certain font sizes.
 
   <p>Child elements inherit the computed <a class=noxref
-   href="#font-size"><span class=property>‘<code
+   href="#font-size-prop"><span class=property>‘<code
    class=property>font-size</code>’</span></a> value (otherwise, the effect
-   of <a class=noxref href="#font-size-adjust"><span class=property>‘<code
+   of <a class=noxref href="#font-size-adjust-prop"><span
+   class=property>‘<code
    class=property>font-size-adjust</code>’</span></a> would compound).
 
   <div class=example>
@@ -1935,7 +1942,7 @@ <h3 id=font-face-rule><span class=secno>4.1 </span>The @font-face rule</h3>
    <pre>
 @font-face {
   font-family: Gentium;
-  src: url(http://site/fonts/Gentium.ttf);
+  src: url(http://example.com/fonts/Gentium.ttf);
 }
 
 p { font-family: Gentium, serif; }
@@ -1954,7 +1961,7 @@ <h3 id=font-face-rule><span class=secno>4.1 </span>The @font-face rule</h3>
   <p>Downloaded fonts are only available to documents that reference them,
    the process of activating these fonts should not make them available to
    other applications or to documents that don't directly link to the same
-   font. User agent implementors might consider it convenient to use
+   font. User agent implementers might consider it convenient to use
    downloaded fonts when rendering characters in other documents for which no
    other available font exists as part of the system font fallback procedure.
    This would cause a security leak since the contents of one page would be
@@ -2121,7 +2128,7 @@ <h3 id=src-desc><span class=secno>4.3 </span>Font reference: the <a
    format hints "truetype" and "opentype" must be considered as synonymous; a
    format hint of "opentype" does not imply that the font contains Postscript
    CFF style glyph data or that it contains OpenType layout information (see
-   Appendix A for more background on this).
+   Appendix B for more background on this).
 
   <p>When authors would prefer to use a locally available copy of a given
    font and download it if it's not, local() can be used. The locally
@@ -2164,7 +2171,7 @@ <h3 id=src-desc><span class=secno>4.3 </span>Font reference: the <a
    the Postscript name is found in the font's <a
    href="http://www.microsoft.com/typography/otspec/name.htm">name table</a>,
    in the name record with nameID = 6 (see <a href="#OPENTYPE"
-   rel=biblioentry>[OPENTYPE]<!--{{OPENTYPE}}--></a> for more details). The
+   rel=biblioentry>[OPENTYPE]<!--{{!OPENTYPE}}--></a> for more details). The
    Postscript name is the commonly used key for all fonts on OSX and for
    Postscript CFF fonts under Windows. The full font name (nameID = 4) is
    used as a unique key for fonts with TrueType glyphs on Windows.
@@ -2810,8 +2817,6 @@ <h3 id=font-matching-changes><span class=secno>5.3 </span>Font matching
    These changes were made to better reflect actual font matching behavior
    across user agent implementations.
 
-  <ul></ul>
-
   <p>Differences compared to the font matching algorithm in CSS 2.1:
 
   <ul>
@@ -3215,7 +3220,7 @@ <h3 id=vertical-position-prop><span class=secno>6.4 </span>Subscript,
    metrics specified in the selected font's <a
    href="http://www.microsoft.com/typography/otspec/os2.htm#subxs">OS/2
    table</a> <a href="#OPENTYPE"
-   rel=biblioentry>[OPENTYPE]<!--{{OPENTYPE}}--></a>.</p>
+   rel=biblioentry>[OPENTYPE]<!--{{!OPENTYPE}}--></a>.</p>
   <!-- prop: font-variant-ligatures -->
 
   <h3 id=font-variant-ligatures-prop><span class=secno>6.5 </span>Ligatures:
@@ -3672,6 +3677,18 @@ <h3 id=font-variant-alternates-prop><span class=secno>6.8 </span>Alternates
    in addition to the default glyph for that character. This property
    provides control over the selection of these alternate glyphs.
 
+  <p>In cases where multiple alternates are possible, authors define a <a
+   href="#ltfeature-value-namegt"><code>&lt;feature-value-name&gt;&
133E
lt;/code></a>
+   using the <code>@font-feature-values</code> rule described below to
+   indicate the specific alternate to be used. The nature of these alternates
+   is font specific, so the rule defines values for a specific font family or
+   set of families. When a particular value has not been defined for a given
+   family, the named value is treated as if the feature had omitted from the
+   style rule. If a given value is outside the range supported by a given
+   font, the value is ignored. These values never apply to generic font
+   families, nor to families selected as part of system font fallback. Values
+   that behave this way are marked as <em>font specific</em>.
+
   <p>Individual values have the following meanings:
 
   <dl>
@@ -3778,18 +3795,6 @@ <h3 id=font-variant-alternates-prop><span class=secno>6.8 </span>Alternates
     font scaling.
   </dl>
 
-  <p>In cases where multiple alternates are possible, authors define a <a
-   href="#ltfeature-value-namegt"><code>&lt;feature-value-name&gt;</code></a>
-   using the <code>@font-feature-values</code> rule described below to
-   indicate the specific alternate to be used. The nature of these alternates
-   is font specific, so the rule is defined per font family. When a
-   particular value has not been defined for a given family, the named value
-   is treated as if the feature had omitted from the style rule. If a given
-   value is outside the range supported by a given font, the value is
-   ignored. These values never apply to generic font families, nor to
-   families selected as part of system font fallback. Values that behave this
-   way are marked as <em>font specific</em>.
-
   <div class=example>
    <p>The example below uses stylistic sets and swashes for section titles
     but not for the main title.</p>
@@ -4476,7 +4481,7 @@ <h2 id=rendering-considerations><span class=secno>7 </span>Resolving font
 
    <pre>@font-face {
   font-family: MainText;
-  src: url(http://site/font.ttf);
+  src: url(http://example.com/font.ttf);
   font-variant: oldstyle-nums proportional-nums styleset(1,3);
 }
 
@@ -4585,10 +4590,10 @@ <h2 class=no-num id=same-origin-restriction>Appendix A: Same-origin
   <pre>
 /* same origin (i.e. domain, protocol, port match document) */
 src: url(fonts/simple.ttf);                     
-src: url(http://fonts/simple.ttf);                     
+src: url(//fonts/simple.ttf);                     
 
 /* cross origin, different protocol */
-src: url(https://fonts/simple.ttf);              
+src: url(https://example.com/fonts/simple.ttf);              
 
 /* cross origin, different domain */
 src: url(http://another.example.com/fonts/simple.ttf); 
@@ -4602,7 +4607,7 @@ <h2 class=no-num id=same-origin-restriction>Appendix A: Same-origin
    explicitly allow cross-site downloading of font data using the
    <code>Access-Control-Allow-Origin</code> HTTP header.
 
-  <p class=issue>Some implementors feel a same-origin restriction should be
+  <p class=issue>Some implementers feel a same-origin restriction should be
    the default for all new resource types while others feel strongly that an
    opt-in strategy usuable for all resource types would be a better mechanism
    and that the default should always be to allow cross-origin linking for
@@ -4621,7 +4626,7 @@ <h2 class=no-num id=platform-props-to-css>Appendix B: Mapping platform font
    font formats used; they can be used to specify bitmap fonts, Type1 fonts,
    SVG fonts in addition to the common TrueType and OpenType fonts. But there
    are facets of the TrueType and OpenType formats that often cause confusion
-   for authors and present challenges to implementors on different platforms.
+   for authors and present challenges to implementers on different platforms.
 
 
   <p>Originally developed at Apple, TrueType was designed as an outline font
@@ -4681,6 +4686,9 @@ <h2 class=no-num id=platform-props-to-css>Appendix B: Mapping platform font
    Mac OS X. Apple has indicated it intends to support complex script
    rendering using OpenType font features in the future.
 
+  <p class=issue>Need to define normatively how WWS names are handled across
+   platforms.
+
   <h2 class=no-num id=font-licensing>Appendix C: Font licensing issues</h2>
 
   <p><em>This appendix is informative only.</em>
@@ -4933,15 +4941,6 @@ <h3 class=no-num id=other-references>Other References</h3>
     ISBN 1-932026-01-0.</dd>
    <!---->
 
-   <dt id=OPENTYPE>[OPENTYPE]
-
-   <dd><a
-    href="http://www.microsoft.com/typography/otspec/default.htm"><cite>OpenType
-    specification.</cite></a> Microsoft. URL: <a
-    href="http://www.microsoft.com/typography/otspec/default.htm">http://www.microsoft.com/typography/otspec/default.htm</a>
-    </dd>
-   <!---->
-
    <dt id=OPENTYPE-FONT-GUIDE>[OPENTYPE-FONT-GUIDE]
 
    <dd><a