move ruby and ordinal to different subproperties

Author: John Daggett

css3-fonts/Fonts.html

@@ -111,14 +111,14 @@
 
    <h1>CSS Fonts Module Level 3</h1>
 
-   <h2 class="no-num no-toc" id=editors>Editor's Draft 12 October 2011</h2>
+   <h2 class="no-num no-toc" id=editors>Editor's Draft 14 October 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-20111012/">http://www.w3.org/TR/2011/ED-css3-fonts-20111012/</a> -->
+     <!-- <dd><a href="http://www.w3.org/TR/2011/ED-css3-fonts-20111014/">http://www.w3.org/TR/2011/ED-css3-fonts-20111014/</a> -->
 
 
     <dt>Latest version:
@@ -325,8 +325,8 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
       the font-kerning 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>
+      </span>Subscript and superscript 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>
@@ -2601,10 +2601,11 @@ <h3 id=font-rend-desc><span class=secno>4.6 </span>Font features: the <a
       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; ||
+      annotation(&lt;feature-value-name&gt;) || &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; ]
+      &lt;numeric-fraction-values&gt; || ordinal || slashed-zero ||
+      &lt;east-asian-variant-values&gt; || &lt;east-asian-width-values&gt; ||
+      ruby ]
 
     <tr>
      <td><em>Initial:</em>
@@ -3205,8 +3206,8 @@ <h3 id=font-kerning-prop><span class=secno>6.3 </span>Kerning: the <a
    spacing adjustments are made after kerning has been applied.</p>
   <!-- prop: font-variant-position -->
 
-  <h3 id=font-variant-position-prop><span class=secno>6.4 </span>Subscript,
-   superscript and ordinal forms: the <a
+  <h3 id=font-variant-position-prop><span class=secno>6.4 </span>Subscript
+   and superscript forms: the <a
    href="#propdef-font-variant-position">font-variant-position</a> property</h3>
 
   <table class=propdef id=namefont-variant-position>
@@ -3219,7 +3220,7 @@ <h3 id=font-variant-position-prop><span class=secno>6.4 </span>Subscript,
     <tr>
      <td>Value:
 
-     <td>normal | sub | super | ordinal
+     <td>normal | sub | super
 
     <tr>
      <td>Initial:
@@ -3256,30 +3257,27 @@ <h3 id=font-variant-position-prop><span class=secno>6.4 </span>Subscript,
    this name is a placeholder until the final name is resolved.
 
   <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 without affecting the linebox.
+   subscripts and superscripts. 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
+   without affecting the linebox.
 
   <div class=figure><img alt="comparison between real subscript glyphs and
    synthesized ones" src=realsubscripts.png>
    <p class=caption>Subscript glyphs (top) vs. typical synthesized subscripts
     (bottom)
   </div>
 
-  <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
+  <p>The values ‘<code class=property>sub</code>’ and ‘<code
+   class=property>super</code>’ imply the appropriate variant glyph is
+   displayed when available in the font (OpenType features: <code>subs,
+   supr</code>). Because of the semantic nature of subscripts and
    superscripts, when the value is either ‘<code
    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.
+   using a reduced form of the default glyph. 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
@@ -3619,7 +3617,7 @@ <h3 id=font-variant-numeric-prop><span class=secno>6.7 </span>Numerical
 
      <td>normal | inherit | [ &lt;numeric-figure-values&gt; ||
       &lt;numeric-spacing-values&gt; || &lt;numeric-fraction-values&gt; ||
-      slashed-zero ]
+      ordinal || slashed-zero ]
 
     <tr>
      <td>Initial:
@@ -3717,6 +3715,11 @@ <h3 id=font-variant-numeric-prop><span class=secno>6.7 </span>Numerical
   <div class=featex><img alt="stacked fraction example" src=afrc.png></div>
 
   <dl>
+   <dt><dfn id=ordinal>ordinal</dfn>
+
+   <dd>Enables display of forms used with ordinal numbers (OpenType feature:
+    <code>ordn</code>).
+
    <dt><dfn id=slashed-zero>slashed-zero</dfn>
 
    <dd>Enables display of slashed zeros (OpenType feature:
@@ -3768,7 +3771,7 @@ <h3 id=font-variant-alternates-prop><span class=secno>6.8 </span>Alternates
       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 ]
+      annotation(&lt;feature-value-name&gt;) ]
 
     <tr>
      <td>Initial:
@@ -3919,18 +3922,6 @@ <h3 id=font-variant-alternates-prop><span class=secno>6.8 </span>Alternates
   <div class=featex><img alt="alternate annotation form example"
    src=nalt.png></div>
 
-  <dl>
-   <dt><dfn id=ruby>ruby</dfn>
-
-   <dd>Enables display of ruby variant glyphs (OpenType feature:
-    <code>ruby</code>). This value only selects a glyph for use in ruby text,
-    it does not affect font scaling. The red ruby text below is shown with
-    default glyphs (top) and with ruby variant glyphs (bottom). Note the
-    slight difference in stroke thickness.
-  </dl>
-
-  <div class=featex><img alt="ruby variant example" src=rubyshinkansen.png></div>
-
   <h3 id=font-feature-values><span class=secno>6.9 </span>Defining font
    specific alternates: the @font-feature-values rule</h3>
 
@@ -4174,7 +4165,7 @@ <h3 id=font-variant-east-asian-prop><span class=secno>6.10 </span>East
      <td>Value:
 
      <td>normal | inherit | [ &lt;east-asian-variant-values&gt; ||
-      &lt;east-asian-width-values&gt; ]
+      &lt;east-asian-width-values&gt; || ruby ]
 
     <tr>
      <td>Initial:
@@ -4273,6 +4264,21 @@ <h3 id=font-variant-east-asian-prop><span class=secno>6.10 </span>East
   <div class=featex><img alt="proportionally spaced Japanese example"
    src=pwid.png></div>
 
+  <dl>
+   <dt><dfn id=ruby>ruby</dfn>
+
+   <dd>Enables display of ruby variant glyphs (OpenType feature:
+    <code>ruby</code>). Since ruby text is generally smaller than the
+    associated body text, font designers can design special glyphs for use
+    with ruby that are more readable than scaled down versions of the default
+    glyphs. Only glyph selection is affected, there is no associated font
+    scaling or other change that affects line layout. The red ruby text below
+    is shown with default glyphs (top) and with ruby variant glyphs (bottom).
+    Note the slight difference in stroke thickness.
+  </dl>
+
+  <div class=featex><img alt="ruby variant example" src=rubyshinkansen.png></div>
+
   <h3 id=font-variant-prop><span class=secno>6.11 </span>Overall shorthand
    for font rendering: the <a href="#propdef-font-variant">font-variant</a>
    property</h3>
@@ -4295,10 +4301,11 @@ <h3 id=font-variant-prop><span class=secno>6.11 </span>Overall shorthand
       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; ||
+      annotation(&lt;feature-value-name&gt;) || &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; ]
+      &lt;numeric-fraction-values&gt; || ordinal || slashed-zero ||
+      &lt;east-asian-variant-values&gt; || &lt;east-asian-width-values&gt; ||
+      ruby ]
 
     <tr>
      <td>Initial:
@@ -5403,6 +5410,8 @@ <h2 class=no-num id=index>Index</h2>
    <li>oldstyle-nums, <a href="#oldstyle-nums"
     title=oldstyle-nums><strong>6.7</strong></a>
 
+   <li>ordinal, <a href="#ordinal" title=ordinal><strong>6.7</strong></a>
+
    <li>ornaments(&lt;feature-value-name&gt;), <a
     href="#ornamentsltfeature-value-namegt"
     title="ornaments(&lt;feature-value-name&gt;)"><strong>6.8</strong></a>
@@ -5425,7 +5434,7 @@ <h2 class=no-num id=index>Index</h2>
       title="&lt;relative-size&gt; definition of"><strong>3.5</strong></a>
     </ul>
 
-   <li>ruby, <a href="#ruby" title=ruby><strong>6.8</strong></a>
+   <li>ruby, <a href="#ruby" title=ruby><strong>6.10</strong></a>
 
    <li>sans-serif, definition of, <a href="#sans-serif0" title="sans-serif,
     definition of"><strong>#</strong></a>
@@ -5674,10 +5683,11 @@ <h2 class=no-num id=property-index>Property index</h2>
       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; ||
+      annotation(&lt;feature-value-name&gt;) || &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; ]
+      &lt;numeric-fraction-values&gt; || ordinal || slashed-zero ||
+      &lt;east-asian-variant-values&gt; || &lt;east-asian-width-values&gt; ||
+      ruby ]
 
      <td>normal
 
@@ -5697,9 +5707,9 @@ <h2 class=no-num id=property-index>Property index</h2>
       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;feature-value-name&gt;]*) || swash(&lt;feature-value-name&gt;) ||
+      ornaments(&lt;feature-value-name&gt;) ||
+      annotation(&lt;feature-value-name&gt;) ]
 
      <td>normal
 
@@ -5732,7 +5742,7 @@ <h2 class=no-num id=property-index>Property index</h2>
       href="#propdef-font-variant-east-asian">font-variant-east-asian</a>
 
      <td>normal | inherit | [ &lt;east-asian-variant-values&gt; ||
-      &lt;east-asian-width-values&gt; ]
+      &lt;east-asian-width-values&gt; || ruby ]
 
      <td>normal
 
@@ -5767,7 +5777,7 @@ <h2 class=no-num id=property-index>Property index</h2>
 
      <td>normal | inherit | [ &lt;numeric-figure-values&gt; ||
       &lt;numeric-spacing-values&gt; || &lt;numeric-fraction-values&gt; ||
-      slashed-zero ]
+      ordinal || slashed-zero ]
 
      <td>normal
 
@@ -5783,7 +5793,7 @@ <h2 class=no-num id=property-index>Property index</h2>
      <th><a class=property
       href="#propdef-font-variant-position">font-variant-position</a>
 
-     <td>normal | sub | super | ordinal
+     <td>normal | sub | super
 
      <td>normal