Skip to content

Commit d7db6ea

Browse files
tabatkinstabatkins
committed
[css-font-loading] Fix dl ordering.
--HG-- extra : rebase_source : 0227f85df3d58d420b9b362550b5b36710445bac
1 parent d8ede94 commit d7db6ea

2 files changed

Lines changed: 20 additions & 9 deletions

File tree

‎css-font-loading/Overview.bs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ The <code>FontFaceSet</code> Interface</h2>
379379
Iterator keys();
380380
Iterator values();
381381
void forEach(ForEachCallback cb, optional any thisArg);
382+
FontFace iterator;
382383

383384
// -- events for when loading state changes
384385
attribute EventHandler onloading;
@@ -432,6 +433,10 @@ The <code>FontFaceSet</code> Interface</h2>
432433
All of these methods call the corresponding method of the <a idl>FontFaceSet</a>'s <a idl>[<!---->[ContainedFonts]]</a> slot
433434
with the same arguments as were passed to them,
434435
and return the value returned by the called method.
436+
437+
<dt><dfn iterator title="iterator">iterator behavior</dfn>
438+
<dd>
439+
The <a spec=webidl>iterator behavior</a> is the iterator behavior of the <a idl>FontFaceSet</a>'s <a idl>[<!---->[ContainedFonts]]</a> slot.
435440
</dl>
436441

437442
<a interface>FontFaceSet</a> objects also have internal

‎css-font-loading/Overview.html‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,18 @@ <h1 class="p-name no-ref" id=title>CSS Font Loading Module Level 3</h1>
5656
<h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
5757
<span class=dt-updated><span class=value-title title=20140626>26 June 2014</span></span></span></h2>
5858
<div data-fill-with=spec-metadata><dl>
59+
<dt>This version:
60+
<dd><a class=u-url href=http://dev.w3.org/csswg/css-font-loading/>http://dev.w3.org/csswg/css-font-loading/</a>
61+
<dt>Latest version:
62+
<dd><a href=http://w3.org/TR/css-font-loading/>http://w3.org/TR/css-font-loading/</a>
63+
<dt>Previous Versions:
64+
<dd><dd><a href=http://www.w3.org/TR/2014/WD-css-font-loading-3-20140522/ rel=previous>http://www.w3.org/TR/2014/WD-css-font-loading-3-20140522/</a>
5965
<dt>Feedback:
6066
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-font-loading%5D%20feedback">www-style@w3.org</a>
6167
with subject line
6268
“<kbd>[css-font-loading] <var>… message topic …</var></kbd>”(<a href=http://lists.w3.org/Archives/Public/www-style/ rel=discussion>archives</a>)
63-
<dt>Previous Versions:
64-
<dd><dd><a href=http://www.w3.org/TR/2014/WD-css-font-loading-3-20140522/ rel=previous>http://www.w3.org/TR/2014/WD-css-font-loading-3-20140522/</a>
6569
<dt>Editor:
6670
<dd><dd class="p-author h-card vcard"><a class="p-name fn u-url url" href=http://xanthir.com/contact/>Tab Atkins Jr.</a> (<span class="p-org org">Google</span>)
67-
<dt>Latest version:
68-
<dd><a href=http://w3.org/TR/css-font-loading/>http://w3.org/TR/css-font-loading/</a>
69-
<dt>This version:
70-
<dd><a class=u-url href=http://dev.w3.org/csswg/css-font-loading/>http://dev.w3.org/csswg/css-font-loading/</a>
7171
<dt>Former Editor:
7272
<dd><dd class="p-author h-card vcard"><a class="p-name fn u-email email" href=mailto:jdaggett@mozilla.com>John Daggett</a> (<span class="p-org org">Mozilla</span>)
7373
</dl>
@@ -486,10 +486,11 @@ <h2 class="heading settled heading" data-level=3 id=FontFaceSet-interface><span
486486
boolean <a class=idl-code data-global-name="FontFaceSet<interface>/has()<method>" data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-has title=has()>has</a>(<a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a> <dfn class=idl-code data-dfn-for=FontFaceSet/has() data-dfn-type=argument data-export="" data-global-name="FontFaceSet<interface>/has()<method>/font<argument>" id=dom-fontfacesethas-font>font<a class=self-link href=#dom-fontfacesethas-font></a></dfn>);
487487
boolean <a class=idl-code data-global-name="FontFaceSet<interface>/delete()<method>" data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-delete title=delete()>delete</a>(<a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a> <dfn class=idl-code data-dfn-for=FontFaceSet/delete() data-dfn-type=argument data-export="" data-global-name="FontFaceSet<interface>/delete()<method>/font<argument>" id=dom-fontfacesetdelete-font>font<a class=self-link href=#dom-fontfacesetdelete-font></a></dfn>);
488488
void <a class=idl-code data-global-name="FontFaceSet<interface>/clear()<method>" data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-clear title=clear()>clear</a>();
489-
<a data-link-type=idl title=iterator>Iterator</a> <a class=idl-code data-global-name="FontFaceSet<interface>/entries()<method>" data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-entries title=entries()>entries</a>();
490-
<a data-link-type=idl title=iterator>Iterator</a> <a class=idl-code data-global-name="FontFaceSet<interface>/keys()<method>" data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-keys title=keys()>keys</a>();
491-
<a data-link-type=idl title=iterator>Iterator</a> <a class=idl-code data-global-name="FontFaceSet<interface>/values()<method>" data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-values title=values()>values</a>();
489+
<a data-link-type=idl href=#dom-fontfaceset-iterator title=iterator>Iterator</a> <a class=idl-code data-global-name="FontFaceSet<interface>/entries()<method>" data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-entries title=entries()>entries</a>();
490+
<a data-link-type=idl href=#dom-fontfaceset-iterator title=iterator>Iterator</a> <a class=idl-code data-global-name="FontFaceSet<interface>/keys()<method>" data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-keys title=keys()>keys</a>();
491+
<a data-link-type=idl href=#dom-fontfaceset-iterator title=iterator>Iterator</a> <a class=idl-code data-global-name="FontFaceSet<interface>/values()<method>" data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-values title=values()>values</a>();
492492
void <a class=idl-code data-global-name="FontFaceSet<interface>/foreach()<method>" data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-foreach title=foreach()>forEach</a>(<a data-link-type=idl href=#callbackdef-foreachcallback title=foreachcallback>ForEachCallback</a> <dfn class=idl-code data-dfn-for=FontFaceSet/forEach() data-dfn-type=argument data-export="" data-global-name="FontFaceSet<interface>/forEach()<method>/cb<argument>" id=dom-fontfacesetforeach-cb>cb<a class=self-link href=#dom-fontfacesetforeach-cb></a></dfn>, optional any <dfn class=idl-code data-dfn-for=FontFaceSet/forEach() data-dfn-type=argument data-export="" data-global-name="FontFaceSet<interface>/forEach()<method>/thisarg<argument>" id=dom-fontfacesetforeach-thisarg>thisArg<a class=self-link href=#dom-fontfacesetforeach-thisarg></a></dfn>);
493+
<a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a> iterator;
493494

494495
// -- events for when loading state changes
495496
attribute <a data-link-type=idl href=http://www.w3.org/html/wg/drafts/html/CR/webappapis.html#eventhandler title=eventhandler>EventHandler</a> <dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=attribute data-export="" data-global-name="FontFaceSet<interface>/onloading<attribute>" data-type="EventHandler " id=dom-fontfaceset-onloading>onloading<a class=self-link href=#dom-fontfaceset-onloading></a></dfn>;
@@ -544,6 +545,10 @@ <h2 class="heading settled heading" data-level=3 id=FontFaceSet-interface><span
544545
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
545546
with the same arguments as were passed to them,
546547
and return the value returned by the called method.
548+
549+
<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>
550+
<dd>
551+
The <a data-link-spec=webidl data-link-type=dfn href=http://dev.w3.org/2006/webapi/WebIDL/#dfn-iterator-behavior title="iterator behavior">iterator behavior</a> is the iterator behavior 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.
547552
</dl>
548553

549554
<p><a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> objects also have internal
@@ -1275,6 +1280,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
12751280
<li>ForEachCallback, <a href=#callbackdef-foreachcallback title="section 3">3</a>
12761281
<li>has(), <a href=#dom-fontfaceset-has title="section 3">3</a>
12771282
<li>index, <a href=#dom-foreachcallback-index title="section 3">3</a>
1283+
<li>iterator, <a href=#dom-fontfaceset-iterator title="section 3">3</a>
12781284
<li>keys(), <a href=#dom-fontfaceset-keys title="section 3">3</a>
12791285
<li>load()<ul><li>method for FontFace, <a href=#dom-fontface-load title="section 2.2">2.2</a>
12801286
<li>method for FontFaceSet, <a href=#dom-fontfaceset-load title="section 3.3">3.3</a>

0 commit comments

Comments
 (0)