move clig to common-ligatures

Author: John Daggett

css3-fonts/Fonts.html

@@ -120,15 +120,15 @@
 
    <h1>CSS Fonts Module Level 3</h1>
 
-   <h2 class="no-num no-toc" id=editors-draft-24-may-2012>Editor's Draft 24
-    May 2012</h2>
+   <h2 class="no-num no-toc" id=editors-draft-4-june-2012>Editor's Draft 4
+    June 2012</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/2012/ED-css3-fonts-20120524/">http://www.w3.org/TR/2012/ED-css3-fonts-20120524/</a> -->
+     <!-- <dd><a href="http://www.w3.org/TR/2012/ED-css3-fonts-20120604/">http://www.w3.org/TR/2012/ED-css3-fonts-20120604/</a> -->
 
 
     <dt>Latest version:
@@ -2071,7 +2071,13 @@ <h3 id=src-desc><span class=secno>4.3 </span>Font reference: the <a
    class=index-inst id=font-face1 title="@font-face">@font-face</span> rule.
    In the case of SVG fonts, the URL points to an element within a document
    containing SVG font definitions. If the element reference is omitted, a
-   reference to the first defined font is implied.
+   reference to the first defined font is implied. Similarly, font container
+   formats that can contain more than one font must load one and only one of
+   the fonts for a given @font-face rule. Fragment identifiers are used to
+   indicate which font to load. If a container format lacks a defined
+   fragment identifier scheme, implementations should use a simple 1-based
+   indexing scheme (e.g. "font-collection#1" for the first font,
+   "font-collection#2" for the second font).
 
   <pre>
 src: url(fonts/simple.ttf);   /* load simple.ttf relative to stylesheet location */
@@ -3429,8 +3435,8 @@ <h3 id=font-variant-ligatures-prop><span class=secno>6.5 </span>Ligatures:
   <dl>
    <dt><dfn id=common-ligatures>common-ligatures</dfn>
 
-   <dd>Enables display of common ligatures (OpenType feature:
-    <code>liga</code>). For OpenType fonts, common ligatures are enabled by
+   <dd>Enables display of common ligatures (OpenType features: <code>liga,
+    clig</code>). For OpenType fonts, common ligatures are enabled by
     default.
   </dl>
 
@@ -3439,8 +3445,8 @@ <h3 id=font-variant-ligatures-prop><span class=secno>6.5 </span>Ligatures:
   <dl>
    <dt><dfn id=no-common-ligatures>no-common-ligatures</dfn>
 
-   <dd>Disables display of common ligatures (OpenType feature:
-    <code>liga</code>).
+   <dd>Disables display of common ligatures (OpenType features: <code>liga,
+    clig</code>).
 
    <dt><dfn id=discretionary-ligatures>discretionary-ligatures</dfn>
 
@@ -3869,7 +3875,7 @@ <h3 id=font-variant-alternates-prop><span class=secno>6.8 </span>Alternates
    <dt><dfn id=contextual>contextual</dfn>
 
    <dd>Enables display of contextual alternates (OpenType feature:
-    <code>calt, clig</code>).
+    <code>calt</code>).
   </dl>
 
   <div class=featex><img alt="contextual alternate example" src=calt.png></div>
@@ -3878,7 +3884,7 @@ <h3 id=font-variant-alternates-prop><span class=secno>6.8 </span>Alternates
    <dt><dfn id=no-contextual>no-contextual</dfn>
 
    <dd>Disables display of contextual alternates (OpenType feature:
-    <code>calt, clig</code>).
+    <code>calt</code>).
 
    <dt><dfn id=historical-forms>historical-forms</dfn>