csswg/css3-fonts Fonts.html,1.56,1.57

Update of /sources/public/csswg/css3-fonts
In directory hutz:/tmp/cvs-serv8526

Modified Files:
	Fonts.html 
Log Message:
tweaking bits here and there

Index: Fonts.html
===================================================================
RCS file: /sources/public/csswg/css3-fonts/Fonts.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- Fonts.html	21 Jun 2011 05:12:43 -0000	1.56
+++ Fonts.html	16 Sep 2011 08:28:47 -0000	1.57
@@ -111,14 +111,14 @@
 
    <h1>CSS Fonts Module Level 3</h1>
 
-   <h2 class="no-num no-toc" id=editors>Editor's Draft 21 June 2011</h2>
+   <h2 class="no-num no-toc" id=editors>Editor's Draft 16 September 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-20110621">http://www.w3.org/TR/2011/ED-css3-fonts-20110621</a> -->
+     <!-- <dd><a href="http://www.w3.org/TR/2011/ED-css3-fonts-20110916">http://www.w3.org/TR/2011/ED-css3-fonts-20110916</a> -->
      
 
     <dt>Latest version:
@@ -324,9 +324,9 @@
      <li><a href="#font-kerning-prop"><span class=secno>6.3 </span>Kerning:
       the font-kerning property</a>
 
-     <li><a href="#vertical-position-prop"><span class=secno>6.4
-      </span>Subscript, superscript and ordinal forms: the vertical-position
-      property</a>
+     <li><a href="#font-variant-position-prop"><span class=secno>6.4
+      </span>Subscript, superscript and ordinal forms: the
+      font-variant-position property</a>
 
      <li><a href="#font-variant-ligatures-prop"><span class=secno>6.5
       </span>Ligatures: the font-variant-ligatures property</a>
@@ -1574,6 +1574,7 @@
   </div>
   <!-- Hmm, so what should happen for scripts with no upper/lowercase distinction (e.g. CJK, Arabic, Hebrew)? -->
   <!-- prop: font -->
+  <!-- jtdfix, crap, preprocessor is inserting links to descriptors rather than properties.  bert, make it stop... -->
 
   <h3 id=font-prop><span class=secno>3.7 </span>Shorthand font property: the
    <a href="#propdef-font">font</a> property</h3>
@@ -1651,7 +1652,7 @@
    href="#propdef-font">font</a></code>’</span> shorthand:
 
   <pre
-   class=prod><dfn id=ltfont-variant-css21gt><var>&lt;font-variant-css21&gt;</var></dfn> = [normal | small-caps | inherit]</pre>
+   class=prod><dfn id=ltfont-variant-css21gt><var>&lt;font-variant-css21&gt;</var></dfn> = [normal | small-caps]</pre>
 
   <p>The syntax of this property is based on a traditional typographical
    shorthand notation to set multiple properties related to fonts.
@@ -2589,9 +2590,18 @@
     <tr>
      <td>Value:
 
-     <td>normal | [&lt;ligature-values&gt; | &lt;alternates-values&gt; |
-      &lt;caps-value&gt; | &lt;numeric-values&gt; |
-      &lt;east-asian-variations&gt;]+
+     <td>normal | [ &lt;common-lig-values&gt; ||
+      &lt;discretionary-lig-values&gt; || &lt;historical-lig-values&gt; ||
+      &lt;contextual-alt-values&gt; || stylistic(&lt;feature-value-name&gt;)
+      || historical-forms || styleset(&lt;feature-value-name&gt; [,
+      &lt;feature-value-name&gt;]*) ||
+      character-variant(&lt;feature-value-name&gt;
+      [,&lt;feature-value-name&gt;]*) || swash(&lt;feature-value-name&gt;) ||
+      ornaments(&lt;feature-value-name&gt;) ||
+      annotation(&lt;feature-value-name&gt;) || ruby || &lt;caps-value&gt; ||
+      &lt;numeric-figure-values&gt; || &lt;numeric-spacing-values&gt; ||
+      &lt;numeric-fraction-values&gt; || slashed-zero ||
+      &lt;east-asian-variant-values&gt; || &lt;east-asian-width-values&gt; ]
 
     <tr>
      <td><em>Initial:</em>
@@ -3190,23 +3200,23 @@
    the ‘<code class=property>letter-spacing</code>’ property is defined,
    kerning adjustments are considered part of the default spacing, letter
    spacing adjustments are made after kerning has been applied.</p>
-  <!-- prop: vertical-position -->
+  <!-- prop: font-variant-position -->
 
-  <h3 id=vertical-position-prop><span class=secno>6.4 </span>Subscript,
+  <h3 id=font-variant-position-prop><span class=secno>6.4 </span>Subscript,
    superscript and ordinal forms: the <a
-   href="#propdef-vertical-position">vertical-position</a> property</h3>
+   href="#propdef-font-variant-position">font-variant-position</a> property</h3>
 
-  <table class=propdef id=namevertical-position>
+  <table class=propdef id=namefont-variant-position>
    <tbody>
     <tr>
      <td>Name:
 
-     <td><dfn id=propdef-vertical-position>vertical-position</dfn>
+     <td><dfn id=propdef-font-variant-position>font-variant-position</dfn>
 
     <tr>
      <td>Value:
 
-     <td>normal | subscript | superscript | ordinal
+     <td>normal | sub | super | ordinal
 
     <tr>
      <td>Initial:
@@ -3239,34 +3249,50 @@
      <td>as specified
   </table>
 
-  <p class=issue>The name for this feature has been a point of contention.
-   The name used here is taken from the AAT feature name but the eventual
-   name may change.
+  <p class=issue>The name for this feature has been a point of contention,
+   this name is a placeholder until the final name is resolved.
 
-  <p>The values ‘<code class=property>subscript</code>’, ‘<code
-   class=property>superscript</code>’, and ‘<code
+  <p>This property controls the selection of alternate glyphs for use as
+   subscripts, superscripts and ordinals. These alternate glyphs of reduced
+   size are positioned within the same em-box as the default glyph and
+   explicitly designed to match the surrounding text and make the them more
+   readable.</p>
+  <!-- example of real superscript vs. faked one -->
+
+  <p>The values ‘<code class=property>sub</code>’, ‘<code
+   class=property>super</code>’, and ‘<code
    class=property>ordinal</code>’ imply the appropriate variant glyph is
    displayed when available in the font (OpenType features: <code>subs, supr,
    ordn</code>). Because of the semantic nature of subscripts and
    superscripts, when the value is either ‘<code
-   class=property>subscript</code>’ or ‘<code
-   class=property>superscript</code>’ and a variant glyph is not available,
-   a simulated glyph is synthesized using a reduced form of the default
-   glyph. If the value is ‘<code class=property>ordinal</code>’ and a
-   variant glyph is not available, the normal glyph is used, no attempt is
-   made to synthesize one. A value of ‘<code
-   class=property>normal</code>’ implies use of the default glyph at normal
-   size.
+   class=property>sub</code>’ or ‘<code class=property>super</code>’
+   and a variant glyph is not available, a simulated glyph is synthesized
+   using a reduced form of the default glyph. If the value is ‘<code
+   class=property>ordinal</code>’ and a variant glyph is not available, the
+   normal glyph is used, no attempt is made to synthesize one. A value of
+   ‘<code class=property>normal</code>’ implies use of the default glyph
+   at normal size.
+
+  <p>In the case of OpenType fonts that lack subscript or superscript glyphs
+   for a given character, to calculate the size and offset of the synthesized
+   substitutes user agents must use the appropriate subscript and superscript
+   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>In the past, user agents have used font-size and vertical-align to
    simulate subscripts and superscripts for the <code>sub</code> and
-   <code>sup</code> elements. To allow a backwards combatible way of defining
-   subscripts and superscripts, when the value is either ‘<code
-   class=property>subscript</code>’ or ‘<code
-   class=property>superscript</code>’, the property acts as a shorthand and
-   resets the value of font-size to ‘<code class=property>inherit</code>’
-   and vertical-align to its initial value. Other than this, the property
-   does not affect the height of the line box.
+   <code>sup</code> elements. To allow a backwards compatible way of defining
+   subscripts and superscripts, it is recommended that authors use
+   conditional rules <a href="#CSS3-CONDITIONAL"
+   rel=biblioentry>[CSS3-CONDITIONAL]<!--{{CSS3-CONDITIONAL}}--></a> so that
+   older user agents will still render these correctly.
+
+  <p>Note that because this property is not cumulative, it's not suitable for
+   nested subscripts or superscripts. Due to this limitation,
+   font-variant-position is not recommended for use in user agent
+   stylesheets.
 
   <p class=issue>It would be nice to define this in a way such that it would
    work with nested subscripts or superscripts which would allow it to be
@@ -3279,9 +3305,6 @@
    may not display correctly, effectively the baseline would bounce between
    the two types of glyphs.
 
-  <p class=issue>Steve Z is concerned about the fact that this property
-   effectively breaks inheritance by resetting font-size and vertical-align.
-
   <div class=example>
    <p>A typical user agent default style for the <code>sub</code> element:</p>
 
@@ -3292,36 +3315,29 @@
 }
 </pre>
 
-   <p>Using vertical-position to specify typographic subscripts in a way that
-    will still show subscripts in older user agents:</p>
+   <p>Using font-variant-position to specify typographic subscripts in a way
+    that will still show subscripts in older user agents:</p>
+
+   <pre>@supports ( font-variant-position: sub ) {
+
+  sub {
+    vertical-align: inherit;
+    font-size: 100%;
+    line-height: inherit;
+    font-variant-position: sub;
+  }
 
-   <pre>sub {
-  vertical-align: sub;
-  font-size: smaller;
-  line-height: normal;
-  vertical-position: subscript;
 }
 </pre>
 
    <p>User agents that support the ‘<code class=property><a
-    href="#propdef-vertical-position">vertical-position</a></code>’
-    property will select a subscript variant glyph and reset vertical-align
-    and font-size to ‘<code class=property>inherit</code>’. Older user
-    agents will ignore the vertical-position property definition and use the
-    standard defaults for subscripts.</p>
+    href="#propdef-font-variant-position">font-variant-position</a></code>’
+    property will select a subscript variant glyph and render this without
+    adjusting the baseline or font-size. Older user agents will ignore the
+    ‘<code class=property><a
+    href="#propdef-font-variant-position">font-variant-position</a></code>’
+    property definition and use the standard defaults for subscripts.</p>
   </div>
-
-  <p>Note that because this property is not cumulative, it's not suitable for
-   nested subscripts or superscripts. Due to this limitation,
-   vertical-position is not recommended for use in user agent stylesheets.
-
-  <p>In the case of OpenType fonts that lack subscript or superscript glyphs
-   for a given character, to calculate the size and offset of the synthesized
-   substitutes user agents must use the appropriate subscript and superscript
-   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>
   <!-- prop: font-variant-ligatures -->
 
   <h3 id=font-variant-ligatures-prop><span class=secno>6.5 </span>Ligatures:
@@ -3339,7 +3355,7 @@
      <td>Value:
 
      <td>normal | inherit | [ &lt;common-lig-values> ||
-      &lt;additional-lig-values> || &lt;historical-lig-values> ]
+      &lt;discretionary-lig-values> || &lt;historical-lig-values> ]
 
     <tr>
      <td>Initial:
@@ -3380,7 +3396,7 @@
    class=prod><dfn id=ltcommon-lig-values><var>&lt;common-lig-values></var></dfn>     = [ common-ligatures | no-common-ligatures ]</pre>
 
   <pre
-   class=prod><dfn id=ltadditional-lig-values><var>&lt;additional-lig-values></var></dfn> = [ additional-ligatures | no-additional-ligatures ]</pre>
+   class=prod><dfn id=ltdiscretionary-lig-values><var>&lt;discretionary-lig-values></var></dfn> = [ discretionary-ligatures | no-discretionary-ligatures ]</pre>
 
   <pre
    class=prod><dfn id=lthistorical-lig-values><var>&lt;historical-lig-values></var></dfn> = [ historical-ligatures | no-historical-ligatures ]</pre>
@@ -3403,18 +3419,21 @@
    <dd>Disables display of common ligatures (OpenType feature:
     <code>liga</code>).
 
-   <dt><dfn id=additional-ligatures>additional-ligatures</dfn>
+   <dt><dfn id=discretionary-ligatures>discretionary-ligatures</dfn>
 
-   <dd>Enables display of additional ligatures (OpenType feature:
-    <code>dlig</code>).
+   <dd>Enables display of discretionary ligatures (OpenType feature:
+    <code>dlig</code>). Which ligatures are discretionary, or optional, is
+    decided by the type designer so authors will need to refer to the
+    documentation of a given font to understand which ligatures are
+    considered discretionary.
   </dl>
 
-  <div class=featex><img alt="additional ligature example" src=dlig.png></div>
+  <div class=featex><img alt="discretionary ligature example" src=dlig.png></div>
 
   <dl>
-   <dt><dfn id=no-additional-ligatures>no-additional-ligatures</dfn>
+   <dt><dfn id=no-discretionary-ligatures>no-discretionary-ligatures</dfn>
 
-   <dd>Disables display of additional ligatures (OpenType feature:
+   <dd>Disables display of discretionary ligatures (OpenType feature:
     <code>dlig</code>).
 
    <dt><dfn id=historical-ligatures>historical-ligatures</dfn>
@@ -4084,7 +4103,7 @@
 }
 
 p {
-  font-variant: additional-ligatures, character-variant(leo-B, leo-M, leo-N, leo-T, leo-U);
+  font-variant: discretionary-ligatures, character-variant(leo-B, leo-M, leo-N, leo-T, leo-U);
 }
 
 span.alt-N { 
@@ -4157,8 +4176,7 @@
    indicates the first alternate.
 
   <pre
-   class=prod><dfn id=lteast-asian-variant-valuesgt><var>&lt;east-asian-variant-values&gt;</var></dfn> = [ hojo-kanji | jis78 | jis83 | jis90 | jis04 | nlckanji 
-                                | simplified | traditional ]</pre>
+   class=prod><dfn id=lteast-asian-variant-valuesgt><var>&lt;east-asian-variant-values&gt;</var></dfn> = [ jis78 | jis83 | jis90 | jis04 | simplified | traditional ]</pre>
 
   <pre
    class=prod><dfn id=lteast-asian-width-valuesgt><var>&lt;east-asian-width-values&gt;</var></dfn>   = [ full-width | proportional-width ]</pre>
@@ -4166,11 +4184,6 @@
   <p>Individual values have the following meanings:
 
   <dl>
-   <dt><dfn id=hojo-kanji>hojo-kanji</dfn>
-
-   <dd>Enables rendering of Hojo Kanji forms (OpenType feature:
-    <code>hojo</code>).
-
    <dt><dfn id=jis78>jis78</dfn>
 
    <dd>Enables rendering of JIS78 forms (OpenType feature:
@@ -4195,11 +4208,6 @@
    <dd>Enables rendering of JIS2004 forms (OpenType feature:
     <code>jp04</code>).
 
-   <dt><dfn id=nlckanji>nlckanji</dfn>
-
-   <dd>Enables rendering of NLC Kanji forms (OpenType feature:
-    <code>nlck</code>).
-
    <dt><dfn id=simplified>simplified</dfn>
 
    <dd>Enables rendering of simplified forms (OpenType feature:
@@ -4243,7 +4251,7 @@
      <td>Value:
 
      <td>normal | inherit | [ &lt;common-lig-values&gt; ||
-      &lt;additional-lig-values&gt; || &lt;historical-lig-values&gt; ||
+      &lt;discretionary-lig-values&gt; || &lt;historical-lig-values&gt; ||
       &lt;contextual-alt-values&gt; || stylistic(&lt;feature-value-name&gt;)
       || historical-forms || styleset(&lt;feature-value-name&gt; [,
       &lt;feature-value-name&gt;]*) ||
@@ -4618,40 +4626,40 @@
   </div>
 
   <div class=example>
-   <p>In the example below, additional ligatures are enabled only for a
+   <p>In the example below, discretionary ligatures are enabled only for a
     downloadable font but are disabled within spans of class "special":</p>
 
    <pre>@font-face {
   font-family: main;
   src: url(fonts/ffmeta.woff) format("woff");
-  font-variant: additional-ligatures;
+  font-variant: discretionary-ligatures;
 }
 
 body         { font-family: main, Helvetica; }
-span.special { font-variant-ligatures: no-additional-ligatures; }
+span.special { font-variant-ligatures: no-discretionary-ligatures; }
 </pre>
 
-   <p>Adding an additional style rule with the @font-face above:</p>
+   <p>Adding an discretionary style rule with the @font-face above:</p>
 
    <pre>body         { font-family: main, Helvetica; }
 span         { font-feature-settings: "dlig"; }
-span.special { font-variant-ligatures: no-additional-ligatures; }
+span.special { font-variant-ligatures: no-discretionary-ligatures; }
 </pre>
 
-   <p>Within spans of class "special", additional ligatures <em>will</em> be
-    rendered. This is because both the ‘<code class=property><a
+   <p>Within spans of class "special", discretionary ligatures <em>will</em>
+    be rendered. This is because both the ‘<code class=property><a
     href="#propdef-font-feature-settings">font-feature-settings</a></code>’
     and ‘<code class=property><a
     href="#propdef-font-variant-ligatures">font-variant-ligatures</a></code>’
     properties apply to these spans. Although the ‘<code
-    class=css>no-additional ligatures</code>’ setting of ‘<code
+    class=css>no-discretionary ligatures</code>’ setting of ‘<code
     class=property><a
     href="#propdef-font-variant-ligatures">font-variant-ligatures</a></code>’
     effectively disables the OpenType <code>dlig</code> feature, because the
     ‘<code class=property><a
     href="#propdef-font-feature-settings">font-feature-settings</a></code>’
     is resolved after that, the ‘<code class=property>dlig</code>’ value
-    reenables additional ligatures.</p>
+    reenables discretionary ligatures.</p>
   </div>
   <!-- simple example of using both font-variant subproperty and descriptor value -->
   <!-- example showing conflicting values and how they are resolved -->
@@ -4854,6 +4862,17 @@
     </dd>
    <!---->
 
+   <dt id=CSS3FONT>[CSS3FONT]
+
+   <dd>❧ (please update this reference to CSS3-FONTS, thanks, bye) John
+    Daggett. <a
+    href="http://www.w3.org/TR/2011/WD-css3-fonts-20110324"><cite>CSS Fonts
+    Module Level 3.</cite></a> 24 March 2011. W3C Working Draft. (Work in
+    progress.) URL: <a
+    href="http://www.w3.org/TR/2011/WD-css3-fonts-20110324">http://www.w3.org/TR/2011/WD-css3-fonts-20110324</a>
+    </dd>
+   <!---->
+
    <dt id=HTML5>[HTML5]
 
    <dd>Ian Hickson. <a
@@ -4934,6 +4953,7 @@
   <!--{{!CORS}}-->
   <!--{{!HTML5}}-->
   <!--{{!CHARMOD}}-->
+  <!--{{!CSS3FONT}}-->
 
   <h3 class=no-num id=other-references>Other References</h3>
   <!--begin-informative-->
@@ -4973,6 +4993,16 @@
     O'Reilly Media, Inc. 2009. ISBN 0-596-51447-1.</dd>
    <!---->
 
+   <dt id=CSS3-CONDITIONAL>[CSS3-CONDITIONAL]
+
+   <dd>L. David Baron. <a
+    href="http://www.w3.org/TR/2011/WD-css3-conditional-20110901/"><cite>CSS
+    Conditional Rules Module Level 3.</cite></a> 1 September 2011. W3C
+    Working Draft. (Work in progress.) URL: <a
+    href="http://www.w3.org/TR/2011/WD-css3-conditional-20110901/">http://www.w3.org/TR/2011/WD-css3-conditional-20110901/</a>
+    </dd>
+   <!---->
+
    <dt id=DIGITAL-TYPOGRAPHY>[DIGITAL-TYPOGRAPHY]
 
    <dd>Richard Rubinstein. <cite>Digital Typography, An Introduction to Type
@@ -5028,6 +5058,7 @@
   <!--{{WINDOWS-GLYPH-PROC}}-->
   <!--{{CHARMOD-NORM}}-->
   <!--{{AAT-FEATURES}}-->
+  <!--{{CSS3-CONDITIONAL}}-->
 
   <h2 class=no-num id=index>Index</h2>
   <!--begin-index-->
@@ -5039,13 +5070,6 @@
       title="&lt;absolute-size&gt; definition of"><strong>3.5</strong></a>
     </ul>
 
-   <li>additional-ligatures, <a href="#additional-ligatures"
-    title=additional-ligatures><strong>6.5</strong></a>
-
-   <li><var>&lt;additional-lig-values></var>, <a
-    href="#ltadditional-lig-values"
-    title="&lt;additional-lig-values>"><strong>6.5</strong></a>
-
    <li>all-petite-caps, <a href="#all-petite-caps"
     title=all-petite-caps><strong>6.6</strong></a>
 
@@ -5089,6 +5113,13 @@
    <li>diagonal-fractions, <a href="#diagonal-fractions"
     title=diagonal-fractions><strong>6.7</strong></a>
 
+   <li>discretionary-ligatures, <a href="#discretionary-ligatures"
+    title=discretionary-ligatures><strong>6.5</strong></a>
+
+   <li><var>&lt;discretionary-lig-values></var>, <a
+    href="#ltdiscretionary-lig-values"
+    title="&lt;discretionary-lig-values>"><strong>6.5</strong></a>
+
    <li><var>&lt;east-asian-variant-values&gt;</var>, <a
     href="#lteast-asian-variant-valuesgt"
     title="&lt;east-asian-variant-values&gt;"><strong>6.10</strong></a>
@@ -5191,6 +5222,9 @@
    <li>font-variant-numeric, <a href="#propdef-font-variant-numeric"
     title=font-variant-numeric><strong>6.7</strong></a>
 
+   <li>font-variant-position, <a href="#propdef-font-variant-position"
+    title=font-variant-position><strong>6.4</strong></a>
+
    <li><var>&lt;font-variant-value&gt;</var>, <a
     href="#ltfont-variant-valuegt"
     title="&lt;font-variant-value&gt;"><strong>6.9</strong></a>
@@ -5216,9 +5250,6 @@
     href="#lthistorical-lig-values"
     title="&lt;historical-lig-values>"><strong>6.5</strong></a>
 
-   <li>hojo-kanji, <a href="#hojo-kanji"
-    title=hojo-kanji><strong>6.10</strong></a>
-
    <li>jis04, <a href="#jis04" title=jis04><strong>6.10</strong></a>
 
    <li>jis78, <a href="#jis78" title=jis78><strong>6.10</strong></a>
@@ -5235,18 +5266,15 @@
    <li>monospace, definition of, <a href="#monospace0" title="monospace,
     definition of"><strong>#</strong></a>
 
-   <li>nlckanji, <a href="#nlckanji" title=nlckanji><strong>6.10</strong></a>
-    
-
-   <li>no-additional-ligatures, <a href="#no-additional-ligatures"
-    title=no-additional-ligatures><strong>6.5</strong></a>
-
    <li>no-common-ligatures, <a href="#no-common-ligatures"
     title=no-common-ligatures><strong>6.5</strong></a>
 
    <li>no-contextual, <a href="#no-contextual"
     title=no-contextual><strong>6.8</strong></a>
 
+   <li>no-discretionary-ligatures, <a href="#no-discretionary-ligatures"
+    title=no-discretionary-ligatures><strong>6.5</strong></a>
+
    <li>no-historical-ligatures, <a href="#no-historical-ligatures"
     title=no-historical-ligatures><strong>6.5</strong></a>
 
@@ -5343,9 +5371,6 @@
      <li>definition of, <a href="#lturangegt" title="&lt;urange&gt;
       definition of"><strong>4.5</strong></a>
     </ul>
-
-   <li>vertical-position, <a href="#propdef-vertical-position"
-    title=vertical-position><strong>6.4</strong></a>
   </ul>
   <!--end-index-->
 
@@ -5370,8 +5395,8 @@
      <th>Media
 
    <tbody>
-    <tr valign=baseline>
-     <td><a class=property href="#propdef-font">font</a>
+    <tr>
+     <th><a class=property href="#propdef-font">font</a>
 
      <td>[ [ &lt;‘font-style’> || &lt;font-variant-css21> ||
       &lt;‘font-weight’> ]? &lt;‘font-size’> [ /
@@ -5388,8 +5413,8 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property href="#descdef-font-family">font-family</a>
+    <tr>
+     <th><a class=property href="#descdef-font-family">font-family</a>
 
      <td>[[ &lt;family-name> | &lt;generic-family> ] [, &lt;family-name> |
       &lt;generic-family>]* ] | inherit
@@ -5404,8 +5429,8 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property
+    <tr>
+     <th><a class=property
       href="#propdef-font-feature-settings">font-feature-settings</a>
 
      <td>normal | &lt;feature-tag-value&gt; [, &lt;feature-tag-value&gt;]*
@@ -5420,8 +5445,8 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property href="#propdef-font-kerning">font-kerning</a>
+    <tr>
+     <th><a class=property href="#propdef-font-kerning">font-kerning</a>
 
      <td>auto | normal | none
 
@@ -5435,8 +5460,8 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property
+    <tr>
+     <th><a class=property
       href="#propdef-font-language-override">font-language-override</a>
 
      <td>normal | inherit | &lt;string&gt;
@@ -5451,8 +5476,8 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property href="#propdef-font-size">font-size</a>
+    <tr>
+     <th><a class=property href="#propdef-font-size">font-size</a>
 
      <td>&lt;absolute-size> | &lt;relative-size> | &lt;length> |
       &lt;percentage> | inherit
@@ -5467,8 +5492,8 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property
+    <tr>
+     <th><a class=property
       href="#propdef-font-size-adjust">font-size-adjust</a>
 
      <td>&lt;number> | none | inherit
@@ -5483,8 +5508,8 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property href="#descdef-font-stretch">font-stretch</a>
+    <tr>
+     <th><a class=property href="#descdef-font-stretch">font-stretch</a>
 
      <td>normal | ultra-condensed | extra-condensed | condensed |
       semi-condensed | semi-expanded | expanded | extra-expanded |
@@ -5500,8 +5525,8 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property href="#descdef-font-style">font-style</a>
+    <tr>
+     <th><a class=property href="#descdef-font-style">font-style</a>
 
      <td>normal | italic | oblique | inherit
 
@@ -5515,8 +5540,8 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property href="#propdef-font-synthesis">font-synthesis</a>
+    <tr>
+     <th><a class=property href="#propdef-font-synthesis">font-synthesis</a>
 
      <td>none | [ weight || style ]
 
@@ -5530,11 +5555,11 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property href="#propdef-font-variant">font-variant</a>
+    <tr>
+     <th><a class=property href="#propdef-font-variant">font-variant</a>
 
      <td>normal | inherit | [ &lt;common-lig-values&gt; ||
-      &lt;additional-lig-values&gt; || &lt;historical-lig-values&gt; ||
+      &lt;discretionary-lig-values&gt; || &lt;historical-lig-values&gt; ||
       &lt;contextual-alt-values&gt; || stylistic(&lt;feature-value-name&gt;)
       || historical-forms || styleset(&lt;feature-value-name&gt; [,
       &lt;feature-value-name&gt;]*) ||
@@ -5556,16 +5581,16 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property
+    <tr>
+     <th><a class=property
       href="#propdef-font-variant-alternates">font-variant-alternates</a>
 
      <td>normal | inherit | [ &lt;contextual-alt-values&gt; ||
       stylistic(&lt;feature-value-name&gt;) || historical-forms ||
       styleset(&lt;feature-value-name&gt; [, &lt;feature-value-name&gt;]*) ||
       character-variant(&lt;feature-value-name&gt;
-      [,&lt;feature-value-name&gt;]*) || swash(&lt;feature-value-name&gt;) ||
-      ornaments(&lt;feature-value-name&gt;) ||
+      [,&lt;feature-value-name&gt;;]*) || swash(&lt;feature-value-name&gt;)
+      || ornaments(&lt;feature-value-name&gt;) ||
       annotation(&lt;feature-value-name&gt;) || ruby ]
 
      <td>normal
@@ -5578,8 +5603,8 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property
+    <tr>
+     <th><a class=property
       href="#propdef-font-variant-caps">font-variant-caps</a>
 
      <td>normal | inherit | &lt;caps-value&gt;
@@ -5594,8 +5619,8 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property
+    <tr>
+     <th><a class=property
       href="#propdef-font-variant-east-asian">font-variant-east-asian</a>
 
      <td>normal | inherit | [ &lt;east-asian-variant-values&gt; ||
@@ -5611,12 +5636,12 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property
+    <tr>
+     <th><a class=property
       href="#propdef-font-variant-ligatures">font-variant-ligatures</a>
 
      <td>normal | inherit | [ &lt;common-lig-values> ||
-      &lt;additional-lig-values> || &lt;historical-lig-values> ]
+      &lt;discretionary-lig-values> || &lt;historical-lig-values> ]
 
      <td>normal
 
@@ -5628,8 +5653,8 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property
+    <tr>
+     <th><a class=property
       href="#propdef-font-variant-numeric">font-variant-numeric</a>
 
      <td>normal | inherit | [ &lt;numeric-figure-values&gt; ||
@@ -5646,11 +5671,11 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property href="#descdef-font-weight">font-weight</a>
+    <tr>
+     <th><a class=property
+      href="#propdef-font-variant-position">font-variant-position</a>
 
-     <td>normal | bold | bolder | lighter | 100 | 200 | 300 | 400 | 500 | 600
-      | 700 | 800 | 900 | inherit
+     <td>normal | sub | super | ordinal
 
      <td>normal
 
@@ -5662,11 +5687,11 @@
 
      <td>visual
 
-    <tr valign=baseline>
-     <td><a class=property
-      href="#propdef-vertical-position">vertical-position</a>
+    <tr>
+     <th><a class=property href="#descdef-font-weight">font-weight</a>
 
-     <td>normal | subscript | superscript | ordinal
+     <td>normal | bold | bolder | lighter | 100 | 200 | 300 | 400 | 500 | 600
+      | 700 | 800 | 900 | inherit
 
      <td>normal
 

Received on Friday, 16 September 2011 08:28:55 UTC