[css-fonts-4][editorial] Clear up bad merge commit

Author: svgeesus

css-fonts-4/Overview.bs

@@ -371,13 +371,6 @@ Syntax of <<font-family-name>>
 Syntax of <<generic-font-family>>
 </h4>
 
-	<!-- <pre class=prod>
-		<dfn><<generic-font-family>></dfn> = generic(<<generic-font-script-specific>>) | <<generic-font-complete>> | <<generic-font-incomplete>>
-		<dfn><<generic-font-script-specific>></dfn> = <a href="">kai</a> | fangsong | nastaliq 
-		<dfn><<generic-font-complete>></dfn> = serif | sans-serif | system-ui | cursive | fantasy | math | monospace
-		<dfn><<generic-font-incomplete>></dfn> = ui-serif | ui-sans-serif | ui-monospace | ui-rounded 
-</pre> -->
-
 <pre class=prod>
 	<dfn><<generic-font-family>></dfn> = <<generic-font-script-specific>>| <<generic-font-complete>> | <<generic-font-incomplete>>
 	<dfn><<generic-font-script-specific>></dfn> = <l>''generic(fangsong)''</l> | <l>''generic(kai)''</l> | <l>''generic(khmer-mul)''</l> |  <l>''generic(nastaliq)''</l>
@@ -2764,13 +2757,6 @@ The <dfn id="at-font-face-rule">''@font-face''</dfn> rule</h3>
 
 To parse a <dfn><<font-src-list>></dfn> production, [=parse a list=] of <<font-src>>s.
 
-<pre class="prod"><dfn>&lt;font-src></dfn> = <<url>> [ format(<<font-format>>)]? [ tech( <<font-tech>>#)]? | local(<<font-family-name>>)</pre>
-
-<pre class="prod"><dfn id="font-format-values">&lt;font-format&gt;</dfn>
-	 = [<<string>> | collection | embedded-opentype | opentype
-		| svg | truetype | woff | woff2 ]</pre>
-	To parse a <dfn><<font-src-list>></dfn> production, [=parse a list=] of <<font-src>>s.
-
 	<pre class="prod">
 		<dfn>&lt;font-src></dfn> = <<url>> [ <dfn value for="@font-face/src" id="format()">format( <<font-format>> )</dfn> ]? [ <dfn value for="@font-face/src" id="tech()">tech( <<font-tech>># )</dfn> ]?
 			| <dfn value for="@font-face/src" id="local()">local( <<family-name>> )</dfn>
@@ -2967,7 +2953,7 @@ To parse a <dfn><<font-src-list>></dfn> production, [=parse a list=] of <<font-s
 	within a larger family.
 	The name can optionally be enclosed in quotes.
 	If unquoted,
-	the <a href="#family-name-syntax">unquoted font family name processing conventions</a> apply;
+	the <a href="#font-family-name-syntax">unquoted font family name processing conventions</a> apply;
 	in other words,
 	the name must be a sequence of identifiers
 	separated by <a href="https://www.w3.org/TR/css3-syntax/#whitespace">whitespace</a>
@@ -6059,32 +6045,6 @@ Defining font specific alternates: the <dfn>@font-feature-values</dfn> rule</h3>
 
 <h4 id="font-feature-values-syntax">Basic syntax</h4>
 
-An ''@font-feature-values'' rule's prelude
-contains a list of font family names,
-followed by a block containing multiple ''feature-value-block''s,
-a special type of subsidiary at-rule.
-Each ''feature-value-block''' contains declarations
-mapping author-chosen human-friendly names
-(such as "flowing")
-to feature indexes for the associated feature.
-
-Each <<font-feature-value>> has the same meaning
-as the corresponding value of the 'font-variant-alternates' property.
-
-<pre class=prod export>
-@font-feature-values = @font-feature-values <<font-family-name>># { <<declaration-rule-list>> }
-
-<dfn for="@font-feature-values">font-feature-value-type</dfn> = <<@stylistic>> | <<@historical-forms>> | <<@styleset>> | <<@character-variant>>
-	| <<@swash>> | <<@ornaments>> | <<@annotation>>
-
-<dfn for="@font-feature-values">@stylistic</dfn> = @stylistic { <<declaration-list>> }
-<dfn for="@font-feature-values">@historical-forms</dfn> = @historical-forms { <<declaration-list>> }
-<dfn for="@font-feature-values">@styleset</dfn> = @styleset { <<declaration-list>> }
-<dfn for="@font-feature-values">@character-variant</dfn> = @character-variant { <<declaration-list>> }
-<dfn for="@font-feature-values">@swash</dfn> = @swash { <<declaration-list>> }
-<dfn for="@font-feature-values">@ornaments</dfn> = @ornaments { <<declaration-list>> }
-<dfn for="@font-feature-values">@annotation</dfn> = @annotation { <<declaration-list>> }
-</pre>
 	An ''@font-feature-values'' rule's prelude
 	contains a list of font family names,
 	followed by a block containing multiple <dfn export lt="font feature value block | feature value block">feature value blocks</dfn>,
@@ -6117,58 +6077,6 @@ as the corresponding value of the 'font-variant-alternates' property.
 		test_font_feature_values_parsing.html
 	</wpt>
 
-The ''@font-feature-values'' prelude
-is a comma-delimited list of font family names that match the definition of <<font-family-name>>
-for the 'font-family!!property' property.
-This means that only named font families are allowed;
-rules that include generic or system fonts in the list of font families are syntax errors.
-However, if a user agent defines a generic font to be a specific named font (e.g. Helvetica),
-the settings associated with that family name will be used.
-If syntax errors occur within the <<font-family-name>> list,
-the entire rule ''@font-feature-values'' rule is invalid
-and must be ignored.
-
-The ''@font-feature-values'' block accepts <<declaration-rule-list>> as its contents;
-these list items are either:
-
-- [=at-rules=] named by one of the <<font-feature-value-type>> at-keyword tokens
-
-or
-
-- the '@font-feature-values/font-display' descriptor.
-
-<!-- TODO: tab says "The OM needs to make sure it exposes both .style and .childRules or whatever." -->
-
-Specifying the same <<font-feature-value-type>> more than once is valid;
-their contents are cascaded together.
-Each <<feature-value-block>> accepts a list of [=declarations=],
-the <dfn lt="font feature value declaration">font feature value declarations</dfn>,
-where the declaration's name can be any [=identifier=],
-and the value must be a list of one or more non-negative <<integer>>s.
-
-The <<feature-value-block>>s accept any declaration name;
-these names must be identifiers,
-per standard CSS syntax rules,
-and are [=case-sensitive=]
-(so ''foo: 1;'' and ''FOO: 2'' define two different features).
-Each declaration's value must match the grammar ''<<integer [0,∞]>>+'',
-or else the declaration is invalid and must be ignored.
-
-Note: Each feature name is unique only within a single <<feature-value-block>>.
-Between different <<feature-value-block>>s,
-or the same type of <<feature-value-block>>s in separate ''@font-feature-values'' rules,
-names can be reused without colliding.
-
-For each <<font-family-name>> in the ''@font-feature-values'' prelude,
-each [=font feature value declaration=] defines a mapping between a
-(family name, feature block name, declaration name) [=tuple=]
-and the list of one or more integers from the declaration's value.
-If the same tuple appears more than once in a document
-(such as if a single block),
-the last-defined one is used.
-
-<div class=example id="ex-same-font-feature-values">
-	For example, the following all define the exact same set of font feature values:
 	The ''@font-feature-values'' prelude
 	is a comma-delimited list of font family names that match the definition of <<family-name>>
 	for the 'font-family!!property' property.