merge

Author: Peter Linss

css-fonts-4/Overview.bs

@@ -553,11 +553,12 @@ Values have the following meanings:
 
 	<dt><dfn>italic</dfn>
 	<dd>
-		Matches against a font that is labeled as an oblique face, or an italic face if one is not.
+		Matches against a font that is labeled as an italic face, or an oblique face if one is not.
 
 	<dt><dfn>oblique <<angle>>?</dfn>
 	<dd>
-		Controls matching against an oblique face. The lack of a number represents an angle of "20deg". Values less than -90deg or values greater than 90deg are invalid and are treated as parse errors. (Note that a font might internally provide its own mapping for "oblique", but that mapping within the font is disregarded)
+		Controls matching against an oblique face. The lack of a number represents an angle of "20deg". Values less than -90deg or values greater than 90deg are invalid and are treated as parse errors. (Note that a font might internally provide its own mapping for "oblique", but that mapping within the font is disregarded).
+		Matches against a font that is labeled as an oblique face, or an italic face if one is not.
 </dl>
 
 Some font families might contain only zero or one italic or oblique face, while yet other
@@ -2013,8 +2014,8 @@ non-conformant behavior.  Authors are advised to use fallback fonts in
 their font lists that closely match the metrics of the
 downloadable fonts to avoid large page reflows where possible.
 
-<a id="same-origin-restriction">
-<a id="allowing-cross-origin-font-loading">
+<a id="same-origin-restriction"> </a>
+<a id="allowing-cross-origin-font-loading"> </a>
 <h4 id="font-fetching-requirements">Font fetching requirements</h4>
 
 For font loads, user agents must use the
@@ -2679,8 +2680,8 @@ required for specific scripts, or recommended as enabled by default or
 they might be stylistic features meant to be used under author
 control.
 
-For a good visual overview of these features, see the
-[[OPENTYPE-FONT-GUIDE]].  For a detailed description of glyph processing for
+For a good visual overview of these features, see
+the [[OPENTYPE-FONT-GUIDE]].  For a detailed description of glyph processing for
 OpenType fonts, see [[WINDOWS-GLYPH-PROC]].
 
 Stylistic font features can be classified into two broad
@@ -2725,6 +2726,53 @@ Numerical formatting: the 'font-variant-numeric' property</h3>
 <h3 id="font-variant-alternates-prop">
 Alternates and swashes: the 'font-variant-alternates' property</h3>
 
+<pre class="propdef">
+Name: font-variant-alternates
+Value: normal | [ <<stylistic>> || <<historical-forms>> || <<styleset>> || <<character-variant>> || <<swash>> || <<ornaments>> || <<annotation>> ]
+Initial: normal
+Applies to: all elements
+Inherited: yes
+Percentages: n/a
+Computed value: as specified
+Media: visual
+Animatable: no
+</pre>
+
+For any given character, fonts can provide a variety of alternate
+glyphs in addition to the default glyph for that character.  This
+property provides control over the selection of these alternate
+glyphs.
+
+For many of the property values listed below, several different
+alternate glyphs are available.  How many alternates are available
+and what they represent is font-specific, so these are each marked
+<dfn>font specific</dfn> in the value definitions below.  Because the nature
+of these alternates is font-specific, the
+''@font-feature-values'' rule is used to define values for a
+specific font family or set of families that associate a font-specific
+numeric <feature-index> with a custom
+<feature-value-name>, which is then used in this
+property to select specific alternates:
+
+<pre>@font-feature-values Noble Script { @swash { swishy: 1; flowing: 2; } }
+
+p {
+  font-family: Noble Script;
+  font-variant-alternates: swash(flowing); /* use swash alternate #2 */
+}</pre>
+
+When a particular <feature-value-name> has not
+been defined for a given family or for a particular feature type, the
+computed value must be the same as if it had been defined.  However,
+property values that contain these undefined <feature-value-name>
+identifiers must be ignored when choosing glyphs.
+
+<pre>/* these two style rules are effectively the same */
+
+p { font-variant-alternates: swash(unknown-value); } /* not a defined value, ignored */
+p { font-variant-alternates: normal; }
+</pre>
+
 Issue: Moved to Level 4; port the text for this from Fonts 3 .src to Fonts 4 .bs
 
 <h3 id="font-feature-values">
@@ -3275,6 +3323,7 @@ Font family: the 'font-family' descriptor</h3>
 Name: font-family
 Value: <<'font-family'>>
 For: @font-palette-values
+Initial: N/A
 </pre>
 
 This descriptor defines the font family name that this palette applies to.
@@ -3293,6 +3342,7 @@ Specifying the base palette: the 'base-palette' descriptor</h3>
 Name: base-palette
 Value: <<integer>>
 For: @font-palette-values
+Initial: N/A
 </pre>
 
 This descriptor specifies a palette in the font
@@ -3331,6 +3381,7 @@ Overriding a color in the palette: The <<integer>> descriptor</h3>
 Name: <<integer>>
 Value: <<color>>
 For: @font-palette-values
+Initial: N/A
 </pre>
 
 This descriptor overrides or adds a color