Changes from w3c#2531

Author: svgeesus

css-fonts-3/Fonts.src.html

@@ -118,13 +118,11 @@ <h2 class="no-num no-toc">[LONGSTATUS] [DATE]</h2>
   <dt>Latest version:</dt>
     <dd><a href="https://www.w3.org/TR/css-fonts-3/">https://www.w3.org/TR/css-fonts-3/</a></dd>
   <dt>Latest editor's draft:</dt>
-    <dd><a href="https://drafts.csswg.org/css-fonts/">https://drafts.csswg.org/css-fonts/</a>
-    (<a href="https://hg.csswg.org/drafts/log/tip/css-fonts/Fonts.html">change log</a>)</dd>
-  <dt>Previous version:</dt>
+    <dd><a href="https://drafts.csswg.org/css-fonts/">https://drafts.csswg.org/css-fonts/</a></dd>
+  <dt>Previous versions:</dt>
+  <dd><a href="https://www.w3.org/TR/2018/CR-css-fonts-3-20180315/">https://www.w3.org/TR/2018/CR-css-fonts-3-20180315/</a></dd>
     <dd><a href="https://www.w3.org/TR/2013/CR-css-fonts-3-20131003/">https://www.w3.org/TR/2013/CR-css-fonts-3-20131003/</a></dd>
   <dt>Issues List:</dt>
-    <dd><a href="https://www.w3.org/Style/CSS/Tracker/products/18">CSS3 Fonts issues in Tracker</a>
-    <dd><a href="https://www.w3.org/Bugs/Public/buglist.cgi?query_format=advanced&amp;product=CSS&amp;component=Fonts&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED">CSS3 Fonts issues in Bugzilla</a>
     <dd><a href="https://github.com/w3c/csswg-drafts/labels/css-fonts-3">css-fonts-3 issues in github</a>
   <dt>Discussion:</dt>
     <dd>
@@ -2188,33 +2186,7 @@ <h3 id="composite-fonts">Using character ranges to define composite fonts</h3>
 
 </div>
 
-<h3 id="font-rend-desc">Font features: the <a href="#descdef-font-variant">font-variant</a> and <a href="#descdef-font-feature-settings">font-feature-settings</a> descriptors</h3>
-<table class="descdef">
-  <tbody>
-    <tr>
-      <td>Name:</td>
-      <td><dfn id="descdef-font-variant" title="font-variant!!descriptor">font-variant</dfn></td>
-    </tr>
-    <tr>
-      <td>Value:</td>
-      <td><span title="normal!!font-variant">normal</span> | <span title="none!!font-variant">none</span> |
-        [ <var>&lt;common-lig-values&gt;</var> || <var>&lt;discretionary-lig-values&gt;</var> || <var>&lt;historical-lig-values&gt;</var> ||
-        <var>&lt;contextual-alt-values&gt;</var> || <var title="stylistic">stylistic(&lt;feature-value-name&gt;)</var> || <var>historical-forms</var> ||
-        <var title="styleset">styleset(&lt;feature-value-name&gt; #)</var> ||
-        <var title="character-variant">character-variant(&lt;feature-value-name&gt; #)</var> ||
-        <var title="swash">swash(&lt;feature-value-name&gt;)</var> || <var title="ornaments">ornaments(&lt;feature-value-name&gt;)</var> ||
-        <var title="annotation">annotation(&lt;feature-value-name&gt;)</var> ||
-        [ <i>small-caps</i> | <i>all-small-caps</i> | <i>petite-caps</i> | <i>all-petite-caps</i> | <i>unicase</i> | <i>titling-caps</i> ] ||
-        <var>&lt;numeric-figure-values&gt;</var> || <var>&lt;numeric-spacing-values&gt;</var> || <var>&lt;numeric-fraction-values&gt;</var> || <i>ordinal</i> || <i>slashed-zero</i> ||
-        <var>&lt;east-asian-variant-values&gt;</var> || <var>&lt;east-asian-width-values&gt;</var> || <i>ruby</i> ||
-        [ <i>sub</i> | <i>super</i> ] ]</td>
-    </tr>
-    <tr>
-      <td><em>Initial:</em></td>
-      <td>normal</td>
-    </tr>
-  </tbody>
-</table>
+<h3 id="font-rend-desc">Font features: the <a href="#descdef-font-feature-settings">font-feature-settings</a> descriptor</h3>
 
 <table class="descdef">
   <tbody>
@@ -2233,18 +2205,14 @@ <h3 id="font-rend-desc">Font features: the <a href="#descdef-font-variant">font-
   </tbody>
 </table>
 
-<p>These descriptors define initial settings that apply when the font defined by
-an <code>@font-face</code> rule is rendered.  They do not affect font selection.
+<p>This descriptor defines initial settings that apply when the font defined by
+an <code>@font-face</code> rule is rendered.  It does not affect font selection.
 Values are identical to those defined for the corresponding
-<span title="font-variant!!property">'font-variant'</span> and <span title="font-feature-settings!!property">'font-feature-settings'</span> properties defined below
+<span title="font-feature-settings!!property">'font-feature-settings'</span> property defined below
 except that the value 'inherit' is omitted.  When multiple font
 feature descriptors or properties are used, the cumulative effect on
 text rendering is detailed in the section
 <a href="#font-feature-resolution">Font Feature Resolution</a> below.
-In cases where specific values define synthesized fallback for certain
-<span title="font-variant!!property">'font-variant'</span> subproperties, the same synthesized fallback
-applies when used within those values are used with the
-<span title="font-style!!descriptor">'font-variant'</span> descriptor.
 </p>
 
 <h3 id="font-face-loading">Font loading guidelines</h3>
@@ -4253,9 +4221,6 @@ <h3 id="feature-precedence">Feature precedence</h3>
 <ol>
   <li>Font features enabled by default, including features required for a given script.</li>
 
-  <li>If the font is defined via an <code>@font-face</code> rule, the font features
-  implied by the font-variant descriptor in the <code>@font-face</code> rule.</li>
-
   <li>If the font is defined via an <code>@font-face</code> rule, the font features
   implied by the font-feature-settings descriptor in the <code>@font-face</code> rule.</li>
 
@@ -4305,7 +4270,7 @@ <h3 id="feature-precedence-examples">Feature precedence examples</h3>
 </pre>
 </div>
 
-<div class="example">
+<!-- <div class="example">
 <p>When the <span title="font-variant!!descriptor">font-variant</span> descriptor
 is used within an <code>@font-face</code> rule, it only
 applies to the font defined by that rule.</p>
@@ -4331,8 +4296,9 @@ <h3 id="feature-precedence-examples">Feature precedence examples</h3>
 appears in a general style rule and its use is mutually exclusive with
 'proportional-nums'.  Stylistic alternate sets will only be used where
 MainText is used.</p> </div>
+-->
 
-<div class="example">
+<!-- <div class="example">
 <p>The <code>@font-face</code> rule can also be used to access font features in locally available
 fonts via the use of <code>local()</code> in the 'src' descriptor of the <code>@font-face</code> definition:</p>
 
@@ -4350,9 +4316,9 @@ <h3 id="feature-precedence-examples">Feature precedence examples</h3>
 rendering occurs, Japanese kana will be proportionally spaced and Latin text will
 be italicised.  Text rendered with the fallback serif font will use default
 rendering properties.</p>
-</div>
+</div> -->
 
-<div class="example">
+<!-- <div class="example">
 <p>In the example below, discretionary ligatures are enabled only for a downloadable font
 but are disabled within spans of class "special":</p>
 
@@ -4378,7 +4344,7 @@ <h3 id="feature-precedence-examples">Feature precedence examples</h3>
 apply to these spans.  Although the 'no-discretionary ligatures' setting of 'font-variant-ligatures'
 effectively disables the OpenType <span class="tag">dlig</span> feature, because the <span title="font-feature-settings!!property">'font-feature-settings'</span>
 is resolved after that, the 'dlig' value reenables discretionary ligatures.</p>
-</div>
+</div> -->
 
 <h2 id="object-model">Object Model</h2>