[css-font-loading] Fold the 'exception to Set methods' section into the method definitions.

Author: tabatkins

css-font-loading/Overview.bs

@@ -442,16 +442,24 @@ The <code>FontFaceSet</code> Interface</h2>
 		<dt><dfn title=add()>add</dfn>(<a idl>FontFace</a> font)
 		<dt><dfn title=has()>has</dfn>(<a idl>FontFace</a> font)
 		<dt><dfn title=delete()>delete</dfn>(<a idl>FontFace</a> font)
-		<dt><dfn title=clear()>clear</dfn>()
 		<dt><dfn title=entries()>entries</dfn>()
 		<dt><dfn title=keys()>keys</dfn>()
 		<dt><dfn title=values()>values</dfn>()
 		<dt><dfn title=forEach()>forEach</dfn>(<a idl>ForEachCallback</a> cb, optional any thisArg)
 		<dd>
+			If <a method>add()</a> or <a method>delete()</a> are called
+			with an argument that is a <a>CSS-connected</a> <a interface>FontFace</a> object,
+			they must throw an InvalidModificationError exception.
+
 			All of these methods call the corresponding method of the <a idl>FontFaceSet</a>'s <a idl>[<!---->[ContainedFonts]]</a> slot
 			with the same arguments as were passed to them,
 			and return the value returned by the called method.
 
+		<dt><dfn title=clear()>clear</dfn>()
+		<dd>
+			This must remove all non-<a>CSS-connected</a> <a idl>FontFace</a> objects
+			from the <a idl>FontFaceSet</a>'s <a idl>[<!---->[ContainedFonts]]</a> slot.
+
 		<dt><dfn iterator title="iterator">iterator behavior</dfn>
 		<dd>
 			The <a spec=webidl>iterator behavior</a> is the iterator behavior of the <a idl>FontFaceSet</a>'s <a idl>[<!---->[ContainedFonts]]</a> slot.
@@ -498,17 +506,6 @@ The <code>FontFaceSet</code> Interface</h2>
 	The <a idl for=FontFaceSet>status</a> promise needs to pay attention to what <a idl>FontFaceSet</a> it's attached to.
 	I guess only the <a>font source's</a> <a idl for=FontFaceSet>status</a> promise should care about pending layout operations.
 
-<h3 id='set-modifications'>
-Modifications of normal Set methods</h3>
-
-	The <a interface>FontFaceSet</a> methods <code>add()</code> and <code>delete()</code>
-	must throw an InvalidModificationError exception
-	if their argument is a <a>CSS-connected</a> <a interface>FontFace</a> object.
-
-	The <a interface>FontFaceSet</a> method <code>clear()</code>
-	must only remove the manually-added <a interface>FontFace</a> objects;
-	the <a>CSS-connected</a> <a interface>FontFace</a> objects are unaffected.
-
 <!--
 ████████ ██     ██ ████████ ██    ██ ████████  ██████
 ██       ██     ██ ██       ███   ██    ██    ██    ██

css-font-loading/Overview.html

@@ -128,12 +128,11 @@ <h2 class="no-num no-toc no-ref heading settled heading" id=contents><span class
 		<li><a href=#font-face-css-connection><span class=secno>2.3</span>  Interaction with CSS’s <span>@font-face</span> Rule</a></ul>
 	<li><a href=#FontFaceSet-interface><span class=secno>3</span>  The <code>FontFaceSet</code> Interface</a>
 		<ul class=toc>
-		<li><a href=#set-modifications><span class=secno>3.1</span>  Modifications of normal Set methods</a>
-		<li><a href=#FontFaceSet-events><span class=secno>3.2</span>  Events</a>
-		<li><a href=#font-face-set-load><span class=secno>3.3</span>  The <code>load()</code> method</a>
-		<li><a href=#font-face-set-check><span class=secno>3.4</span>  The <code>check()</code> method</a>
-		<li><a href=#font-face-set-ready><span class=secno>3.5</span>  The <code>ready</code> attribute</a>
-		<li><a href=#font-face-set-css><span class=secno>3.6</span>  Interaction with CSS Font Loading and Matching</a></ul>
+		<li><a href=#FontFaceSet-events><span class=secno>3.1</span>  Events</a>
+		<li><a href=#font-face-set-load><span class=secno>3.2</span>  The <code>load()</code> method</a>
+		<li><a href=#font-face-set-check><span class=secno>3.3</span>  The <code>check()</code> method</a>
+		<li><a href=#font-face-set-ready><span class=secno>3.4</span>  The <code>ready</code> attribute</a>
+		<li><a href=#font-face-set-css><span class=secno>3.5</span>  Interaction with CSS Font Loading and Matching</a></ul>
 	<li><a href=#font-face-source><span class=secno>4</span>  The <code>FontFaceSource</code> interface</a>
 		<ul class=toc>
 		<li><a href=#fontfacesource-workers><span class=secno>4.1</span>  Worker FontFaceSources</a>
@@ -528,7 +527,7 @@ <h2 class="heading settled heading" data-level=3 id=FontFaceSet-interface><span
 		<dd>
 			This attribute reflects the <a data-link-type=idl href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a>’s <a data-link-type=idl href=#dom-fontfaceset-readypromise title=[[readypromise]]>[[ReadyPromise]]</a> slot.
 
-<p>See <a data-section="" href=#font-face-set-ready>§3.5 
+<p>See <a data-section="" href=#font-face-set-ready>§3.4 
 The ready attribute</a> for more details on this <a data-link-type=idl href=#dom-promise title=promise>Promise</a> and its use.</p>
 
 		<dt><dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=attribute data-export="" id=dom-fontfaceset-size>size<a class=self-link href=#dom-fontfaceset-size></a></dfn> <span data-attribute-info="" for=FontFaceSet/size> of type <a data-link-type=idl-name title="unsigned long">unsigned long</a>, readonly</span>
@@ -554,15 +553,23 @@ <h2 class="heading settled heading" data-level=3 id=FontFaceSet-interface><span
 		<dt><dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-add title=add()>add<a class=self-link href=#dom-fontfaceset-add></a></dfn>(<a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a> font)
 		<dt><dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-has title=has()>has<a class=self-link href=#dom-fontfaceset-has></a></dfn>(<a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a> font)
 		<dt><dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-delete title=delete()>delete<a class=self-link href=#dom-fontfaceset-delete></a></dfn>(<a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a> font)
-		<dt><dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-clear title=clear()>clear<a class=self-link href=#dom-fontfaceset-clear></a></dfn>()
 		<dt><dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-entries title=entries()>entries<a class=self-link href=#dom-fontfaceset-entries></a></dfn>()
 		<dt><dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-keys title=keys()>keys<a class=self-link href=#dom-fontfaceset-keys></a></dfn>()
 		<dt><dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-values title=values()>values<a class=self-link href=#dom-fontfaceset-values></a></dfn>()
 		<dt><dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-foreach title=forEach()>forEach<a class=self-link href=#dom-fontfaceset-foreach></a></dfn>(<a data-link-type=idl href=#callbackdef-foreachcallback title=foreachcallback>ForEachCallback</a> cb, optional any thisArg)
 		<dd>
-			All of these methods call the corresponding method of the <a data-link-type=idl href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a>’s <a data-link-type=idl href=#dom-fontfaceset-containedfonts title=[[containedfonts]]>[[ContainedFonts]]</a> slot
+			If <a class=idl-code data-link-type=method href=#dom-fontfaceset-add title=add()>add()</a> or <a class=idl-code data-link-type=method href=#dom-fontfaceset-delete title=delete()>delete()</a> are called
+			with an argument that is a <a data-link-type=dfn href=#css-connected title=css-connected>CSS-connected</a> <a class=idl-code data-link-type=interface href=#dom-fontface title=fontface>FontFace</a> object,
+			they must throw an InvalidModificationError exception.
+
+<p>All of these methods call the corresponding method of the <a data-link-type=idl href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a>’s <a data-link-type=idl href=#dom-fontfaceset-containedfonts title=[[containedfonts]]>[[ContainedFonts]]</a> slot
 			with the same arguments as were passed to them,
-			and return the value returned by the called method.
+			and return the value returned by the called method.</p>
+
+		<dt><dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-clear title=clear()>clear<a class=self-link href=#dom-fontfaceset-clear></a></dfn>()
+		<dd>
+			This must remove all non-<a data-link-type=dfn href=#css-connected title=css-connected>CSS-connected</a> <a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a> objects
+			from the <a data-link-type=idl href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a>’s <a data-link-type=idl href=#dom-fontfaceset-containedfonts title=[[containedfonts]]>[[ContainedFonts]]</a> slot.
 
 		<dt><dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=iterator data-export="" id=dom-fontfaceset-iterator title=iterator>iterator behavior<a class=self-link href=#dom-fontfaceset-iterator></a></dfn>
 		<dd>
@@ -611,20 +618,9 @@ <h2 class="heading settled heading" data-level=3 id=FontFaceSet-interface><span
 	The <a data-link-for=FontFaceSet data-link-type=idl href=#dom-fontfaceset-status title=status>status</a> promise needs to pay attention to what <a data-link-type=idl href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> it’s attached to.
 	I guess only the <a data-link-type=dfn href=#font-source title="font source’s">font source’s</a> <a data-link-for=FontFaceSet data-link-type=idl href=#dom-fontfaceset-status title=status>status</a> promise should care about pending layout operations.</p>
 
-<h3 class="heading settled heading" data-level=3.1 id=set-modifications><span class=secno>3.1 </span><span class=content>
-Modifications of normal Set methods</span><a class=self-link href=#set-modifications></a></h3>
-
-<p>The <a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> methods <code>add()</code> and <code>delete()</code>
-	must throw an InvalidModificationError exception
-	if their argument is a <a data-link-type=dfn href=#css-connected title=css-connected>CSS-connected</a> <a class=idl-code data-link-type=interface href=#dom-fontface title=fontface>FontFace</a> object.</p>
-
-<p>The <a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> method <code>clear()</code>
-	must only remove the manually-added <a class=idl-code data-link-type=interface href=#dom-fontface title=fontface>FontFace</a> objects;
-	the <a data-link-type=dfn href=#css-connected title=css-connected>CSS-connected</a> <a class=idl-code data-link-type=interface href=#dom-fontface title=fontface>FontFace</a> objects are unaffected.</p>
-
 
 
-<h3 class="heading settled heading" data-level=3.2 id=FontFaceSet-events><span class=secno>3.2 </span><span class=content>
+<h3 class="heading settled heading" data-level=3.1 id=FontFaceSet-events><span class=secno>3.1 </span><span class=content>
 Events</span><a class=self-link href=#FontFaceSet-events></a></h3>
 
 <p>Font load events make it easy to respond to the font-loading behavior of the entire document,
@@ -785,7 +781,7 @@ <h3 class="heading settled heading" data-level=3.2 id=FontFaceSet-events><span c
 
 
 
-<h3 class="heading settled heading" data-level=3.3 id=font-face-set-load><span class=secno>3.3 </span><span class=content>
+<h3 class="heading settled heading" data-level=3.2 id=font-face-set-load><span class=secno>3.2 </span><span class=content>
 The <code>load()</code> method</span><a class=self-link href=#font-face-set-load></a></h3>
 
 <p>The <a data-link-for=FontFaceSet data-link-type=functionish href=#dom-fontfaceset-load title=load()>load()</a> method of <a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> will determine whether all fonts in the given font list
@@ -832,7 +828,7 @@ <h3 class="heading settled heading" data-level=3.3 id=font-face-set-load><span c
 
 
 
-<h3 class="heading settled heading" data-level=3.4 id=font-face-set-check><span class=secno>3.4 </span><span class=content>
+<h3 class="heading settled heading" data-level=3.3 id=font-face-set-check><span class=secno>3.3 </span><span class=content>
 The <code>check()</code> method</span><a class=self-link href=#font-face-set-check></a></h3>
 
 <p>The <a data-link-type=functionish href=#dom-fontfaceset-check title=check()>check()</a> method of <a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> will determine whether all fonts in the given font list
@@ -870,7 +866,7 @@ <h3 class="heading settled heading" data-level=3.4 id=font-face-set-check><span
 
 
 
-<h3 class="heading settled heading" data-level=3.5 id=font-face-set-ready><span class=secno>3.5 </span><span class=content>
+<h3 class="heading settled heading" data-level=3.4 id=font-face-set-ready><span class=secno>3.4 </span><span class=content>
 The <code>ready</code> attribute</span><a class=self-link href=#font-face-set-ready></a></h3>
 
 <p>Because the number of fonts loaded depends on the how many fonts are used for a given piece of text,
@@ -899,7 +895,7 @@ <h3 class="heading settled heading" data-level=3.5 id=font-face-set-ready><span
 	never rejected,
 	unlike the Promise returned by the <a class=idl-code data-link-type=interface href=#dom-fontface title=fontface>FontFace</a> <a class=idl-code data-link-for=FontFace data-link-type=method href=#dom-fontface-load title=load()>load()</a> method.</p>
 
-<h3 class="heading settled heading" data-level=3.6 id=font-face-set-css><span class=secno>3.6 </span><span class=content>
+<h3 class="heading settled heading" data-level=3.5 id=font-face-set-css><span class=secno>3.5 </span><span class=content>
 Interaction with CSS Font Loading and Matching</span><a class=self-link href=#font-face-set-css></a></h3>
 
 <p>When the font matching algorithm in <a data-biblio-type=informative data-link-type=biblio href=#biblio-css3-fonts title=biblio-css3-fonts>[CSS3-FONTS]</a> is run automatically by the user-agent,
@@ -1259,7 +1255,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
 <li>available font faces, <a href=#available-font-faces title="section 4">4</a>
 <li>BinaryData, <a href=#typedefdef-binarydata title="section 2">2</a>
 <li>cb, <a href=#dom-fontfacesetforeach-cb title="section 3">3</a>
-<li>check(), <a href=#dom-fontfaceset-check title="section 3.4">3.4</a>
+<li>check(), <a href=#dom-fontfaceset-check title="section 3.3">3.3</a>
 <li>clear(), <a href=#dom-fontfaceset-clear title="section 3">3</a>
 <li>[[ContainedFonts]], <a href=#dom-fontfaceset-containedfonts title="section 3">3</a>
 <li>CSS-connected, <a href=#css-connected title="section 2.3">2.3</a>
@@ -1273,14 +1269,14 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
 <li>argument for FontFace/FontFace(), <a href=#dom-fontfacefontface-family title="section 2.1">2.1</a>
 </ul><li>featureSettings<ul><li>dict-member for FontFaceDescriptors, <a href=#dom-fontfacedescriptors-featuresettings title="section 2">2</a>
 <li>attribute for FontFace, <a href=#dom-fontface-featuresettings title="section 2">2</a>
-</ul><li>find the matching font faces, <a href=#find-the-matching-font-faces title="section 3.2">3.2</a>
-<li>fire a font load event, <a href=#fire-a-font-load-event title="section 3.2">3.2</a>
+</ul><li>find the matching font faces, <a href=#find-the-matching-font-faces title="section 3.1">3.1</a>
+<li>fire a font load event, <a href=#fire-a-font-load-event title="section 3.1">3.1</a>
 <li>font<ul><li>argument for ForEachCallback, <a href=#dom-foreachcallback-font title="section 3">3</a>
 <li>argument for FontFaceSet/add(), <a href=#dom-fontfacesetadd-font title="section 3">3</a>
 <li>argument for FontFaceSet/has(), <a href=#dom-fontfacesethas-font title="section 3">3</a>
 <li>argument for FontFaceSet/delete(), <a href=#dom-fontfacesetdelete-font title="section 3">3</a>
-<li>argument for FontFaceSet/load(), <a href=#dom-fontfacesetload-font title="section 3.3">3.3</a>
-<li>argument for FontFaceSet/check(), <a href=#dom-fontfacesetcheck-font title="section 3.4">3.4</a>
+<li>argument for FontFaceSet/load(), <a href=#dom-fontfacesetload-font title="section 3.2">3.2</a>
+<li>argument for FontFaceSet/check(), <a href=#dom-fontfacesetcheck-font title="section 3.3">3.3</a>
 </ul><li>FontFace, <a href=#dom-fontface title="section 2">2</a>
 <li>FontFace(), <a href=#dom-fontface-fontface title="section 2.1">2.1</a>
 <li>FontFaceDescriptors, <a href=#dictdef-fontfacedescriptors title="section 2">2</a>
@@ -1304,12 +1300,12 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
 <li>iterator, <a href=#dom-fontfaceset-iterator title="section 3">3</a>
 <li>keys(), <a href=#dom-fontfaceset-keys title="section 3">3</a>
 <li>load()<ul><li>method for FontFace, <a href=#dom-fontface-load title="section 2.2">2.2</a>
-<li>method for FontFaceSet, <a href=#dom-fontfaceset-load title="section 3.3">3.3</a>
+<li>method for FontFaceSet, <a href=#dom-fontfaceset-load title="section 3.2">3.2</a>
 </ul><li>loaded, <a href=#dom-fontface-loaded title="section 2">2</a>
 <li>[[LoadedFonts]], <a href=#dom-fontfaceset-loadedfonts title="section 3">3</a>
-<li>loading, <a href=#dom-fontfaceset-loading title="section 3.2">3.2</a>
-<li>loadingdone, <a href=#dom-fontfaceset-loadingdone title="section 3.2">3.2</a>
-<li>loadingerror, <a href=#dom-fontfaceset-loadingerror title="section 3.2">3.2</a>
+<li>loading, <a href=#dom-fontfaceset-loading title="section 3.1">3.1</a>
+<li>loadingdone, <a href=#dom-fontfaceset-loadingdone title="section 3.1">3.1</a>
+<li>loadingerror, <a href=#dom-fontfaceset-loadingerror title="section 3.1">3.1</a>
 <li>[[LoadingFonts]], <a href=#dom-fontfaceset-loadingfonts title="section 3">3</a>
 <li>no pending font loads, <a href=#no-pending-font-loads title="section 3">3</a>
 <li>onloading, <a href=#dom-fontfaceset-onloading title="section 3">3</a>
@@ -1328,8 +1324,8 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
 <li>attribute for FontFace, <a href=#dom-fontface-stretch title="section 2">2</a>
 </ul><li>style<ul><li>dict-member for FontFaceDescriptors, <a href=#dom-fontfacedescriptors-style title="section 2">2</a>
 <li>attribute for FontFace, <a href=#dom-fontface-style title="section 2">2</a>
-</ul><li>text<ul><li>argument for FontFaceSet/load(), <a href=#dom-fontfacesetload-text title="section 3.3">3.3</a>
-<li>argument for FontFaceSet/check(), <a href=#dom-fontfacesetcheck-text title="section 3.4">3.4</a>
+</ul><li>text<ul><li>argument for FontFaceSet/load(), <a href=#dom-fontfacesetload-text title="section 3.2">3.2</a>
+<li>argument for FontFaceSet/check(), <a href=#dom-fontfacesetcheck-text title="section 3.3">3.3</a>
 </ul><li>thisArg, <a href=#dom-fontfacesetforeach-thisarg title="section 3">3</a>
 <li>type, <a href=#dom-fontfacesetloadeventfontfacesetloadevent-type title="section 3">3</a>
 <li>unicodeRange<ul><li>dict-member for FontFaceDescriptors, <a href=#dom-fontfacedescriptors-unicoderange title="section 2">2</a>