From 60f9cb9a64dae5a273d321b5b87216bfaf209b0e Mon Sep 17 00:00:00 2001
From: Frank Tang <ftang@chromium.org>
Date: Sat, 12 Sep 2020 09:39:43 -0700
Subject: [PATCH 01/17] Normative: Adding Intl.DisplayNames specification.

Fixes https://github.com/tc39/ecma402/issues/31.

Based on https://github.com/tc39/proposal-intl-displaynames which is ready for Stage 4.
---
 spec/annexes.html      |   8 ++
 spec/conventions.html  |   5 +
 spec/displaynames.html | 263 +++++++++++++++++++++++++++++++++++++++++
 spec/index.html        |   1 +
 spec/overview.html     |   4 +-
 5 files changed, 279 insertions(+), 2 deletions(-)
 create mode 100644 spec/displaynames.html

diff --git a/spec/annexes.html b/spec/annexes.html
index 01747aee..7347cd02 100644
--- a/spec/annexes.html
+++ b/spec/annexes.html
@@ -123,6 +123,14 @@ <h1>Implementation Dependent Behaviour</h1>
         </li>
       </ul>
     </li>
+    <li>
+      In DisplayNames:
+      <ul>
+        <li>
+          The localized names (<emu-xref href="#sec-Intl.DisplayNames-internal-slots"></emu-xref>)
+        </li>
+      </ul>
+    </li>
     <li>
       In RelativeTimeFormat:
       <ul>
diff --git a/spec/conventions.html b/spec/conventions.html
index 4fd33491..b3b46849 100644
--- a/spec/conventions.html
+++ b/spec/conventions.html
@@ -66,6 +66,11 @@ <h1>Well-Known Intrinsic Objects</h1>
           <td>`Intl.DateTimeFormat.prototype`</td>
           <td>The initial value of the *"prototype"* data property of the intrinsic %DateTimeFormat% (<emu-xref href="#sec-intl.datetimeformat.prototype"></emu-xref>).</td>
         </tr>
+        <tr>
+          <td>%DisplayNamesPrototype%</td>
+          <td>`Intl.DisplayNames.prototype`</td>
+          <td>The `Intl.DisplayNames` constructor (<emu-xref href="#sec-intl-displaynames-constructor"></emu-xref>).</td>
+        </tr>
         <tr>
           <td>%Intl%</td>
           <td>`Intl`</td>
diff --git a/spec/displaynames.html b/spec/displaynames.html
new file mode 100644
index 00000000..704f85f8
--- /dev/null
+++ b/spec/displaynames.html
@@ -0,0 +1,263 @@
+<emu-biblio href="./biblio.json"></emu-biblio>
+<emu-clause id="intl-displaynames-objects">
+  <h1>DisplayNames Objects</h1>
+
+  <emu-clause id="sec-intl-displaynames-abstracts">
+    <h1>Abstract Operations for DisplayNames Objects</h1>
+
+    <emu-clause id="sec-canonicalcodefordisplaynames" aoid="CanonicalCodeForDisplayNames">
+      <h1>CanonicalCodeForDisplayNames ( _type_, _code_ )</h1>
+      <p>
+        The CanonicalCodeForDisplayNames abstract operation is called with arguments _type_, and _code_. It verifies that the _code_ argument represents a well-formed code according to the _type_ argument and returns the case-regularized form of the _code_. The algorithm refers to <a href="https://www.unicode.org/reports/tr35/#Identifiers">UTS 35's Unicode Language and Locale Identifiers grammar</a>. The following steps are taken:
+      </p>
+      <emu-alg>
+        1. If _type_ is `"language"`, then
+          1. If _code_ does not matches the `unicode_language_id` production, throw a *RangeError* exceptipon.
+          1. If IsStructurallyValidLanguageTag(_code_) is *false*, throw a *RangeError* exception.
+          1. Set _code_ to CanonicalizeUnicodeLocaleId(_code_).
+          1. Return _code_.
+        1. If _type_ is `"region"`, then
+          1. If _code_ does not matches the `unicode_region_subtag` production, throw a *RangeError* exceptipon.
+          1. Let _code_ be the result of mapping _code_ to upper case as described in <emu-xref href="#sec-case-sensitivity-and-case-mapping"></emu-xref>.
+          1. Return _code_.
+        1. If _type_ is `"script"`, then
+          1. If _code_ does not matches the `unicode_script_subtag` production, throw a *RangeError* exceptipon.
+          1. Let _code_ be the result of mapping the first character in _code_ to upper case, and mapping the second, third and fourth character in _code_ to lower case, as described in <emu-xref href="#sec-case-sensitivity-and-case-mapping"></emu-xref>.
+          1. Return _code_.
+        1. Assert: _type_ is `"currency"`.
+        1. If ! IsWellFormedCurrencyCode(_code_) is *false*, throw a *RangeError* exceptipon.
+        1. Let _code_ be the result of mapping _code_ to upper case as described in <emu-xref href="#sec-case-sensitivity-and-case-mapping"></emu-xref>.
+        1. Return _code_.
+      </emu-alg>
+    </emu-clause>
+  </emu-clause>
+
+  <emu-clause id="sec-intl-displaynames-constructor">
+    <h1>The Intl.DisplayNames Constructor</h1>
+
+    <p>
+      The DisplayNames constructor is a standard built-in property of the Intl object.</p>
+
+    <emu-clause id="sec-Intl.DisplayNames">
+      <h1>Intl.DisplayNames ( _locales_, _options_ )</h1>
+
+      <p>
+        When the *Intl.DisplayNames* function is called with arguments _locales_ and _options_, the following steps are taken:
+      </p>
+
+      <emu-alg>
+        1. If NewTarget is *undefined*, throw a *TypeError* exception.
+        1. Let _displayNames_ be ? OrdinaryCreateFromConstructor(NewTarget, `"%DisplayNamesPrototype%"`, « [[InitializedDisplayNames]], [[Locale]], [[Style]], [[Type]], [[Fallback]], [[Fields]] »).
+        1. Let _requestedLocales_ be ? CanonicalizeLocaleList(_locales_).
+        1. Let _options_ be ? ToObject(_options_).
+        1. Let _opt_ be a new Record.
+        1. Let _localeData_ be %DisplayNames%.[[LocaleData]].
+        1. Let _matcher_ be ? GetOption(_options_, `"localeMatcher"`, `"string"`, &laquo; `"lookup"`, `"best fit"` &raquo;, `"best fit"`).
+        1. Set _opt_.[[localeMatcher]] to _matcher_.
+        1. Let _r_ be ResolveLocale(%DisplayNames%.[[AvailableLocales]], _requestedLocales_, _opt_, %DisplayNames%.[[RelevantExtensionKeys]]).
+        1. Let _style_ be ? GetOption(_options_, `"style"`, `"string"`, &laquo; `"narrow"`, `"short"`, `"long"` &raquo;, `"long"`).
+        1. Set _displayNames_.[[Style]] to _style_.
+        1. Let _type_ be ? GetOption(_options_, `"type"`, `"string"`, &laquo; `"language"`, `"region"`, `"script"`, `"currency"` &raquo;, *undefined*).
+        1. If _type_ is *undefined*, throw a *TypeError* exception.
+        1. Set _displayNames_.[[Type]] to _type_.
+        1. Let _fallback_ be ? GetOption(_options_, `"fallback"`, `"string"`, &laquo; `"code"`, `"none"` &raquo;, `"code"`).
+        1. Set _displayNames_.[[Fallback]] to _fallback_.
+        1. Set _displayNames_.[[Locale]] to the value of _r_.[[Locale]].
+        1. Let _dataLocale_ be _r_.[[dataLocale]].
+        1. Let _dataLocaleData_ be _localeData_.[[&lt;_dataLocale_&gt;]].
+        1. Let _types_ be _dataLocaleData_.[[types]].
+        1. Assert: _types_ is a Record (see <emu-xref href="#sec-Intl.DisplayNames-internal-slots"></emu-xref>).
+        1. Let _typeFields_ be _types_.[[&lt;_type_&gt;]].
+        1. Assert: _typeFields_ is a Record (see <emu-xref href="#sec-Intl.DisplayNames-internal-slots"></emu-xref>).
+        1. Let _styleFields_ be _typeFields_.[[&lt;_style_&gt;]].
+        1. Assert: _styleFields_ is a Record (see <emu-xref href="#sec-Intl.DisplayNames-internal-slots"></emu-xref>).
+        1. Set _displayNames_.[[Fields]] to _styleFields_.
+        1. Return _displayNames_.
+      </emu-alg>
+    </emu-clause>
+  </emu-clause>
+
+  <emu-clause id="sec-properties-of-intl-displaynames-constructor">
+    <h1>Properties of the Intl.DisplayNames Constructor</h1>
+
+    <p>
+      The Intl.DisplayNames constructor has the following properties:
+    </p>
+
+    <emu-clause id="sec-Intl.DisplayNames.prototype">
+      <h1>Intl.DisplayNames.prototype</h1>
+
+      <p>
+        The value of *Intl.DisplayNames.prototype* is *%DisplayNamesPrototype%*.
+      </p>
+      <p>
+        This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *false* }.
+      </p>
+    </emu-clause>
+
+    <emu-clause id="sec-Intl.DisplayNames.supportedLocalesOf">
+      <h1>Intl.DisplayNames.supportedLocalesOf ( _locales_ [ , _options_ ] )</h1>
+
+      <p>
+        When the *supportedLocalesOf* method of *%DisplayNames%* is called, the following steps are taken:
+      </p>
+
+      <emu-alg>
+        1. Let _availableLocales_ be *%DisplayNames%*.[[AvailableLocales]].
+        1. Let _requestedLocales_ be ? CanonicalizeLocaleList(_locales_).
+        1. Return ? SupportedLocales(_availableLocales_, _requestedLocales_, _options_).
+      </emu-alg>
+    </emu-clause>
+
+    <emu-clause id="sec-Intl.DisplayNames-internal-slots">
+      <h1>Internal slots</h1>
+
+      <p>
+        The value of the [[AvailableLocales]] internal slot is implementation defined within the constraints described in <emu-xref href="#sec-internal-slots"></emu-xref>.
+      </p>
+
+      <p>
+        The value of the [[RelevantExtensionKeys]] internal slot is &laquo; &raquo;.
+      </p>
+
+      <p>
+        The value of the [[LocaleData]] internal slot is implementation defined within the constraints described in <emu-xref href="#sec-internal-slots"></emu-xref> and the following additional constraints:
+      </p>
+
+      <ul>
+        <li>[[LocaleData]].[[&lt;_locale_&gt;]] must have a [[types]] field for all locale values _locale_. The value of this field must be a Record, which must have fields with the names of one of the valid display name types: `"language"`, `"region"`, `"script"`, and `"currency"`.</li>
+        <li>The value of fields `"language"`, `"region"`, `"script"`, and `"currency"` must be a Records which must have fields with the names of one of the valid display name styles: `"narrow"`, `"short"`, and `"long"`.</li>
+        <li>The display name styles fields under display name type `"language"` should contain Records, with keys corresponding to language codes according to `unicode_language_id` production. The value of these fields must be string values.</li>
+        <li>The display name styles fields under display name type `"region"` should contain Records, with keys corresponding to region codes. The value of these fields must be string values.</li>
+        <li>The display name styles fields under display name type `"script"` should contain Records, with keys corresponding to script codes. The value of these fields must be string values.</li>
+        <li>The display name styles fields under display name type `"currency"` should contain Records, with keys corresponding to currency codes. The value of these fields must be string values.</li>
+      </ul>
+
+      <emu-note>
+        It is recommended that implementations use the locale data provided by the Common Locale Data Repository (available at <a href="http://cldr.unicode.org/">http://cldr.unicode.org/</a>).
+      </emu-note>
+    </emu-clause>
+  </emu-clause>
+
+  <emu-clause id="sec-properties-of-intl-displaynames-prototype-object">
+    <h1>Properties of the Intl.DisplayNames Prototype Object</h1>
+
+    <p>
+      The Intl.DisplayNames prototype object, referred to as *%DisplayNamesPrototype%*, is itself an ordinary object. It is not a Intl.DisplayNames instance, does not have an [[InitializedDisplayNames]] internal slot or any of the other internal slots of Intl.DisplayNames instance objects.
+    </p>
+
+    <emu-clause id="sec-Intl.DisplayNames.prototype.constructor">
+      <h1>Intl.DisplayNames.prototype.constructor</h1>
+
+      <p>
+        The initial value of *Intl.DisplayNames.prototype.constructor* is the intrinsic object *%DisplayNames%*.
+      </p>
+    </emu-clause>
+
+    <emu-clause id="sec-Intl.DisplayNames.prototype-@@tostringtag">
+      <h1>Intl.DisplayNames.prototype[ @@toStringTag ]</h1>
+
+      <p>
+        The initial value of the @@toStringTag property is the string value `"Intl.DisplayNames"`.
+      </p>
+      <p>
+        This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *true* }.
+      </p>
+    </emu-clause>
+
+    <emu-clause id="sec-Intl.DisplayNames.prototype.of" aoid="Intl.DisplayNames.prototype.of">
+      <h1>Intl.DisplayNames.prototype.of ( _code_ )</h1>
+
+      <p>
+        When the *Intl.DisplayNames.prototype.of* is called with an argument _code_, the following steps are taken:
+      </p>
+
+      <emu-alg>
+        1. Let _displayNames_ be *this* value.
+        1. If Type(_displayNames_) is not Object, throw a *TypeError* exception.
+        1. If _displayNames_ does not have an [[InitializedDisplayNames]] internal slot, throw a *TypeError* exception.
+        1. Let _code_ be ? ToString(_code_).
+        1. Let _code_ be ? CanonicalCodeForDisplayNames(_displayNames_.[[Type]], _code_).
+        1. Let _fields_ be _displayNames_.[[Fields]].
+        1. Let _name_ be _fields_[[&lt;_code_&gt;]].
+        1. If _name_ is not *undefined*, return _name_.
+        1. If _displayNames_.[[Fallback]] is `"code"`, return _code_.
+        1. Return *undefined*.
+      </emu-alg>
+    </emu-clause>
+
+    <emu-clause id="sec-Intl.DisplayNames.prototype.resolvedOptions">
+      <h1>Intl.DisplayNames.prototype.resolvedOptions ( )</h1>
+
+      <p>
+        This function provides access to the locale and options computed during initialization of the object.
+      </p>
+
+      <emu-alg>
+        1. Let _displayNames_ be *this* value.
+        1. If Type(_displayNames_) is not Object, throw a *TypeError* exception.
+        1. If _displayNames_ does not have an [[InitializedDisplayNames]] internal slot, throw a *TypeError* exception.
+        1. Let _options_ be ! ObjectCreate(%ObjectPrototype%).
+        1. For each row of <emu-xref href="#table-displaynames-resolvedoptions-properties"></emu-xref>, except the header row, in table order, do
+          1. Let _p_ be the Property value of the current row.
+          1. Let _v_ be the value of _displayNames_'s internal slot whose name is the Internal Slot value of the current row.
+          1. If _v_ is not *undefined*, then
+            1. Perform ! CreateDataPropertyOrThrow(_options_, _p_, _v_).
+        1. Return _options_.
+      </emu-alg>
+
+      <emu-table id="table-displaynames-resolvedoptions-properties">
+        <emu-caption>Resolved Options of DisplayNames Instances</emu-caption>
+        <table class="real-table">
+          <thead>
+            <tr>
+              <th>Internal Slot</th>
+              <th>Property</th>
+            </tr>
+          </thead>
+          <tr>
+            <td>[[Locale]]</td>
+            <td>`"locale"`</td>
+          </tr>
+          <tr>
+            <td>[[Style]]</td>
+            <td>`"style"`</td>
+          </tr>
+          <tr>
+            <td>[[Type]]</td>
+            <td>`"type"`</td>
+          </tr>
+          <tr>
+            <td>[[Fallback]]</td>
+            <td>`"fallback"`</td>
+          </tr>
+        </table>
+      </emu-table>
+    </emu-clause>
+  </emu-clause>
+
+  <emu-clause id="sec-properties-of-intl-displaynames-instances">
+    <h1>Properties of Intl.DisplayNames Instances</h1>
+
+    <p>
+      Intl.DisplayNames instances are ordinary objects that inherit properties from %DisplayNamesPrototype%.
+    </p>
+
+    <p>
+      Intl.DisplayNames instances have an [[InitializedDisplayNames]] internal slot.
+    </p>
+
+    <p>
+      Intl.DisplayNames instances also have several internal slots that are computed by the constructor:
+    </p>
+
+    <ul>
+      <li>[[Locale]] is a String value with the language tag of the locale whose localization is used for formatting.</li>
+      <li>[[Style]] is one of the String values `"narrow"`, `"short"`, or `"long"`, identifying the display names style used.</li>
+      <li>[[Type]] is one of the String values `"language"`, `"region"`, `"script"`, or `"currency"`, identifying the type of the display names requested.</li>
+      <li>[[Fallback]] is one of the String values `"code"`, or `"none"`, identifying the fallback return when the system does not have the requested display name.</li>
+      <li>[[Fields]] is a Record (see <emu-xref href="#sec-Intl.DisplayNames-internal-slots"></emu-xref>) which
+        must have fields with keys corresponding to codes according to [[Style]] and [[Type]].</li>
+    </ul>
+  </emu-clause>
+</emu-clause>
diff --git a/spec/index.html b/spec/index.html
index 5a6d94d2..095a226e 100644
--- a/spec/index.html
+++ b/spec/index.html
@@ -86,6 +86,7 @@
 <emu-import href="./collator.html"></emu-import>
 <emu-import href="./numberformat.html"></emu-import>
 <emu-import href="./datetimeformat.html"></emu-import>
+<emu-import href="./displaynames.html"></emu-import>
 <emu-import href="./relativetimeformat.html"></emu-import>
 <emu-import href="./pluralrules.html"></emu-import>
 <emu-import href="./locale-sensitive-functions.html"></emu-import>
diff --git a/spec/overview.html b/spec/overview.html
index 733a81b4..eaf562a3 100644
--- a/spec/overview.html
+++ b/spec/overview.html
@@ -23,14 +23,14 @@ <h1>API Overview</h1>
       The ECMAScript 2021 Internationalization API Specification is designed to complement the ECMAScript 2021 Language Specification by providing key language-sensitive functionality. The API can be added to an implementation of the ECMAScript 2021 Language Specification (ECMA-262 12<sup>th</sup> Edition, or successor).
     </p>
     <p>
-      The ECMAScript 2021 Internationalization API Specification provides several key pieces of language-sensitive functionality that are required in most applications: String comparison (collation), number formatting, date and time formatting, pluralization rules, and case conversion. While the ECMAScript 2021 Language Specification provides functions for this basic functionality (on Array.prototype: toLocaleString; on String.prototype: localeCompare, toLocaleLowerCase, toLocaleUpperCase; on Number.prototype: toLocaleString; on Date.prototype: toLocaleString, toLocaleDateString, and toLocaleTimeString), it leaves the actual behaviour of these functions largely up to implementations to define. The ECMAScript 2021 Internationalization API Specification provides additional functionality, control over the language and over details of the behaviour to be used, and a more complete specification of required functionality.
+      The ECMAScript 2021 Internationalization API Specification provides several key pieces of language-sensitive functionality that are required in most applications: String comparison (collation), number formatting, date and time formatting, display names, pluralization rules, and case conversion. While the ECMAScript 2021 Language Specification provides functions for this basic functionality (on Array.prototype: toLocaleString; on String.prototype: localeCompare, toLocaleLowerCase, toLocaleUpperCase; on Number.prototype: toLocaleString; on Date.prototype: toLocaleString, toLocaleDateString, and toLocaleTimeString), it leaves the actual behaviour of these functions largely up to implementations to define. The ECMAScript 2021 Internationalization API Specification provides additional functionality, control over the language and over details of the behaviour to be used, and a more complete specification of required functionality.
     </p>
 
     <p>
       Applications can use the API in two ways:
       <ol>
         <li>
-          Directly, by using the constructors Intl.Collator, Intl.NumberFormat, Intl.DateTimeFormat, or Intl.PluralRules to construct an object, specifying a list of preferred languages and options to configure the behaviour of the resulting object. The object then provides a main function (compare, select, or format), which can be called repeatedly. It also provides a resolvedOptions function, which the application can use to find out the exact configuration of the object.
+          Directly, by using the constructors Intl.Collator, Intl.NumberFormat, Intl.DateTimeFormat, Intl.DisplayNames, or Intl.PluralRules to construct an object, specifying a list of preferred languages and options to configure the behaviour of the resulting object. The object then provides a main function (compare, select, or format), which can be called repeatedly. It also provides a resolvedOptions function, which the application can use to find out the exact configuration of the object.
         </li>
         <li>
           Indirectly, by using the functions of the ECMAScript 2021 Language Specification mentioned above. The collation and formatting functions are respecified in this specification to accept the same arguments as the Collator, NumberFormat, and DateTimeFormat constructors and produce the same results as their compare or format methods. The case conversion functions are respecified to accept a list of preferred languages.

From e8383d50a00387193fd93523afc68d0811123c8b Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:02:36 -0800
Subject: [PATCH 02/17] Update spec/conventions.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/conventions.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/conventions.html b/spec/conventions.html
index b3b46849..59e33d74 100644
--- a/spec/conventions.html
+++ b/spec/conventions.html
@@ -67,8 +67,8 @@ <h1>Well-Known Intrinsic Objects</h1>
           <td>The initial value of the *"prototype"* data property of the intrinsic %DateTimeFormat% (<emu-xref href="#sec-intl.datetimeformat.prototype"></emu-xref>).</td>
         </tr>
         <tr>
-          <td>%DisplayNamesPrototype%</td>
-          <td>`Intl.DisplayNames.prototype`</td>
+          <td>%DisplayNames%</td>
+          <td>`Intl.DisplayNames`</td>
           <td>The `Intl.DisplayNames` constructor (<emu-xref href="#sec-intl-displaynames-constructor"></emu-xref>).</td>
         </tr>
         <tr>

From 7b56417f212f9db2121a4e0e168e4e0639828d11 Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:02:48 -0800
Subject: [PATCH 03/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index 704f85f8..2d5e9012 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -11,8 +11,8 @@ <h1>CanonicalCodeForDisplayNames ( _type_, _code_ )</h1>
         The CanonicalCodeForDisplayNames abstract operation is called with arguments _type_, and _code_. It verifies that the _code_ argument represents a well-formed code according to the _type_ argument and returns the case-regularized form of the _code_. The algorithm refers to <a href="https://www.unicode.org/reports/tr35/#Identifiers">UTS 35's Unicode Language and Locale Identifiers grammar</a>. The following steps are taken:
       </p>
       <emu-alg>
-        1. If _type_ is `"language"`, then
-          1. If _code_ does not matches the `unicode_language_id` production, throw a *RangeError* exceptipon.
+        1. If _type_ is *"language"*, then
+          1. If _code_ does not match the `unicode_language_id` production, throw a *RangeError* exception.
           1. If IsStructurallyValidLanguageTag(_code_) is *false*, throw a *RangeError* exception.
           1. Set _code_ to CanonicalizeUnicodeLocaleId(_code_).
           1. Return _code_.

From b68c68ed3c565bf01ae9c2cdfede1d7d96fc4194 Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:02:57 -0800
Subject: [PATCH 04/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index 2d5e9012..91eef59c 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -16,8 +16,8 @@ <h1>CanonicalCodeForDisplayNames ( _type_, _code_ )</h1>
           1. If IsStructurallyValidLanguageTag(_code_) is *false*, throw a *RangeError* exception.
           1. Set _code_ to CanonicalizeUnicodeLocaleId(_code_).
           1. Return _code_.
-        1. If _type_ is `"region"`, then
-          1. If _code_ does not matches the `unicode_region_subtag` production, throw a *RangeError* exceptipon.
+        1. If _type_ is *"region"*, then
+          1. If _code_ does not match the `unicode_region_subtag` production, throw a *RangeError* exception.
           1. Let _code_ be the result of mapping _code_ to upper case as described in <emu-xref href="#sec-case-sensitivity-and-case-mapping"></emu-xref>.
           1. Return _code_.
         1. If _type_ is `"script"`, then

From 4e58fea126df3f4c3b37358d40e55aed170d7d8f Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:03:09 -0800
Subject: [PATCH 05/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index 91eef59c..16b96134 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -20,8 +20,8 @@ <h1>CanonicalCodeForDisplayNames ( _type_, _code_ )</h1>
           1. If _code_ does not match the `unicode_region_subtag` production, throw a *RangeError* exception.
           1. Let _code_ be the result of mapping _code_ to upper case as described in <emu-xref href="#sec-case-sensitivity-and-case-mapping"></emu-xref>.
           1. Return _code_.
-        1. If _type_ is `"script"`, then
-          1. If _code_ does not matches the `unicode_script_subtag` production, throw a *RangeError* exceptipon.
+        1. If _type_ is *"script"*, then
+          1. If _code_ does not match the `unicode_script_subtag` production, throw a *RangeError* exception.
           1. Let _code_ be the result of mapping the first character in _code_ to upper case, and mapping the second, third and fourth character in _code_ to lower case, as described in <emu-xref href="#sec-case-sensitivity-and-case-mapping"></emu-xref>.
           1. Return _code_.
         1. Assert: _type_ is `"currency"`.

From 53cd7133f87fca711cbeee669190065914d5a885 Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:03:20 -0800
Subject: [PATCH 06/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index 16b96134..4749d2b5 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -24,8 +24,8 @@ <h1>CanonicalCodeForDisplayNames ( _type_, _code_ )</h1>
           1. If _code_ does not match the `unicode_script_subtag` production, throw a *RangeError* exception.
           1. Let _code_ be the result of mapping the first character in _code_ to upper case, and mapping the second, third and fourth character in _code_ to lower case, as described in <emu-xref href="#sec-case-sensitivity-and-case-mapping"></emu-xref>.
           1. Return _code_.
-        1. Assert: _type_ is `"currency"`.
-        1. If ! IsWellFormedCurrencyCode(_code_) is *false*, throw a *RangeError* exceptipon.
+        1. Assert: _type_ is *"currency"*.
+        1. If ! IsWellFormedCurrencyCode(_code_) is *false*, throw a *RangeError* exception.
         1. Let _code_ be the result of mapping _code_ to upper case as described in <emu-xref href="#sec-case-sensitivity-and-case-mapping"></emu-xref>.
         1. Return _code_.
       </emu-alg>

From bb3a27bb890646aaec494499da422ef34617fcad Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:03:40 -0800
Subject: [PATCH 07/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index 4749d2b5..2e2c5c07 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -36,7 +36,8 @@ <h1>CanonicalCodeForDisplayNames ( _type_, _code_ )</h1>
     <h1>The Intl.DisplayNames Constructor</h1>
 
     <p>
-      The DisplayNames constructor is a standard built-in property of the Intl object.</p>
+      The DisplayNames constructor is a standard built-in property of the Intl object.
+    </p>
 
     <emu-clause id="sec-Intl.DisplayNames">
       <h1>Intl.DisplayNames ( _locales_, _options_ )</h1>

From 554b015ab0831f32801f02848cb8aad9ba12fe5e Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:04:26 -0800
Subject: [PATCH 08/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index 2e2c5c07..fb8606a9 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -48,20 +48,20 @@ <h1>Intl.DisplayNames ( _locales_, _options_ )</h1>
 
       <emu-alg>
         1. If NewTarget is *undefined*, throw a *TypeError* exception.
-        1. Let _displayNames_ be ? OrdinaryCreateFromConstructor(NewTarget, `"%DisplayNamesPrototype%"`, « [[InitializedDisplayNames]], [[Locale]], [[Style]], [[Type]], [[Fallback]], [[Fields]] »).
+        1. Let _displayNames_ be ? OrdinaryCreateFromConstructor(NewTarget, *"%DisplayNames.prototype%"*, &laquo; [[InitializedDisplayNames]], [[Locale]], [[Style]], [[Type]], [[Fallback]], [[Fields]] &raquo;).
         1. Let _requestedLocales_ be ? CanonicalizeLocaleList(_locales_).
         1. Let _options_ be ? ToObject(_options_).
         1. Let _opt_ be a new Record.
         1. Let _localeData_ be %DisplayNames%.[[LocaleData]].
-        1. Let _matcher_ be ? GetOption(_options_, `"localeMatcher"`, `"string"`, &laquo; `"lookup"`, `"best fit"` &raquo;, `"best fit"`).
+        1. Let _matcher_ be ? GetOption(_options_, *"localeMatcher"*, *"string"*, &laquo; *"lookup"*, *"best fit"* &raquo;, *"best fit"*).
         1. Set _opt_.[[localeMatcher]] to _matcher_.
         1. Let _r_ be ResolveLocale(%DisplayNames%.[[AvailableLocales]], _requestedLocales_, _opt_, %DisplayNames%.[[RelevantExtensionKeys]]).
-        1. Let _style_ be ? GetOption(_options_, `"style"`, `"string"`, &laquo; `"narrow"`, `"short"`, `"long"` &raquo;, `"long"`).
+        1. Let _style_ be ? GetOption(_options_, *"style"*, *"string"*, &laquo; *"narrow"*, *"short"*, *"long"* &raquo;, *"long"*).
         1. Set _displayNames_.[[Style]] to _style_.
-        1. Let _type_ be ? GetOption(_options_, `"type"`, `"string"`, &laquo; `"language"`, `"region"`, `"script"`, `"currency"` &raquo;, *undefined*).
+        1. Let _type_ be ? GetOption(_options_, *"type"*, *"string"*, &laquo; *"language"*, *"region"*, *"script"*, *"currency"* &raquo;, *undefined*).
         1. If _type_ is *undefined*, throw a *TypeError* exception.
         1. Set _displayNames_.[[Type]] to _type_.
-        1. Let _fallback_ be ? GetOption(_options_, `"fallback"`, `"string"`, &laquo; `"code"`, `"none"` &raquo;, `"code"`).
+        1. Let _fallback_ be ? GetOption(_options_, *"fallback"*, *"string"*, &laquo; *"code"*, *"none"* &raquo;, *"code"*).
         1. Set _displayNames_.[[Fallback]] to _fallback_.
         1. Set _displayNames_.[[Locale]] to the value of _r_.[[Locale]].
         1. Let _dataLocale_ be _r_.[[dataLocale]].

From 4980bcaadf640c7fccb0856f80a0c077fcf9700b Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:04:34 -0800
Subject: [PATCH 09/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index fb8606a9..ece8aa47 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -89,7 +89,7 @@ <h1>Properties of the Intl.DisplayNames Constructor</h1>
       <h1>Intl.DisplayNames.prototype</h1>
 
       <p>
-        The value of *Intl.DisplayNames.prototype* is *%DisplayNamesPrototype%*.
+        The value of `Intl.DisplayNames.prototype` is *%DisplayNames.prototype%*.
       </p>
       <p>
         This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *false* }.

From f7ded1803fe74123ddba30e4f86dbf2ac2b34f02 Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:04:49 -0800
Subject: [PATCH 10/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index ece8aa47..277281c6 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -126,12 +126,12 @@ <h1>Internal slots</h1>
       </p>
 
       <ul>
-        <li>[[LocaleData]].[[&lt;_locale_&gt;]] must have a [[types]] field for all locale values _locale_. The value of this field must be a Record, which must have fields with the names of one of the valid display name types: `"language"`, `"region"`, `"script"`, and `"currency"`.</li>
-        <li>The value of fields `"language"`, `"region"`, `"script"`, and `"currency"` must be a Records which must have fields with the names of one of the valid display name styles: `"narrow"`, `"short"`, and `"long"`.</li>
-        <li>The display name styles fields under display name type `"language"` should contain Records, with keys corresponding to language codes according to `unicode_language_id` production. The value of these fields must be string values.</li>
-        <li>The display name styles fields under display name type `"region"` should contain Records, with keys corresponding to region codes. The value of these fields must be string values.</li>
-        <li>The display name styles fields under display name type `"script"` should contain Records, with keys corresponding to script codes. The value of these fields must be string values.</li>
-        <li>The display name styles fields under display name type `"currency"` should contain Records, with keys corresponding to currency codes. The value of these fields must be string values.</li>
+        <li>[[LocaleData]].[[&lt;_locale_&gt;]] must have a [[types]] field for all locale values _locale_. The value of this field must be a Record, which must have fields with the names of one of the valid display name types: *"language"*, *"region"*, *"script"*, and *"currency"*.</li>
+        <li>The value of fields *"language"*, *"region"*, *"script"*, and *"currency"* must be a Records which must have fields with the names of one of the valid display name styles: *"narrow"*, *"short"*, and *"long"*.</li>
+        <li>The display name styles fields under display name type *"language"* should contain Records, with keys corresponding to language codes according to `unicode_language_id` production. The value of these fields must be string values.</li>
+        <li>The display name styles fields under display name type *"region"* should contain Records, with keys corresponding to region codes. The value of these fields must be string values.</li>
+        <li>The display name styles fields under display name type *"script"* should contain Records, with keys corresponding to script codes. The value of these fields must be string values.</li>
+        <li>The display name styles fields under display name type *"currency"* should contain Records, with keys corresponding to currency codes. The value of these fields must be string values.</li>
       </ul>
 
       <emu-note>

From d800d4fb36e2b985ce293bfa38b8026bceaa5829 Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:05:00 -0800
Subject: [PATCH 11/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index 277281c6..7af7c08e 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -159,7 +159,7 @@ <h1>Intl.DisplayNames.prototype.constructor</h1>
       <h1>Intl.DisplayNames.prototype[ @@toStringTag ]</h1>
 
       <p>
-        The initial value of the @@toStringTag property is the string value `"Intl.DisplayNames"`.
+        The initial value of the @@toStringTag property is the string value *"Intl.DisplayNames"*.
       </p>
       <p>
         This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *true* }.

From 12b49c8c2c5ca137b8a6650484dc2bb3a3d32b7d Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:05:08 -0800
Subject: [PATCH 12/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index 7af7c08e..0ade1da5 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -182,7 +182,7 @@ <h1>Intl.DisplayNames.prototype.of ( _code_ )</h1>
         1. Let _fields_ be _displayNames_.[[Fields]].
         1. Let _name_ be _fields_[[&lt;_code_&gt;]].
         1. If _name_ is not *undefined*, return _name_.
-        1. If _displayNames_.[[Fallback]] is `"code"`, return _code_.
+        1. If _displayNames_.[[Fallback]] is *"code"*, return _code_.
         1. Return *undefined*.
       </emu-alg>
     </emu-clause>

From 854e2db786af293d9de253fecbd61c84074810f3 Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:05:54 -0800
Subject: [PATCH 13/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index 0ade1da5..14c2d00e 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -144,7 +144,7 @@ <h1>Internal slots</h1>
     <h1>Properties of the Intl.DisplayNames Prototype Object</h1>
 
     <p>
-      The Intl.DisplayNames prototype object, referred to as *%DisplayNamesPrototype%*, is itself an ordinary object. It is not a Intl.DisplayNames instance, does not have an [[InitializedDisplayNames]] internal slot or any of the other internal slots of Intl.DisplayNames instance objects.
+      The Intl.DisplayNames prototype object is itself an ordinary object. <dfn>%DisplayNames.prototype%</dfn> is not an Intl.DisplayNames instance and does not have an [[InitializedDisplayNames]] internal slot or any of the other internal slots of Intl.DisplayNames instance objects.
     </p>
 
     <emu-clause id="sec-Intl.DisplayNames.prototype.constructor">

From 2bf6b527e5555c015ed02d5f889805ca1769b198 Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:06:07 -0800
Subject: [PATCH 14/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index 14c2d00e..4d7d4408 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -218,19 +218,19 @@ <h1>Intl.DisplayNames.prototype.resolvedOptions ( )</h1>
           </thead>
           <tr>
             <td>[[Locale]]</td>
-            <td>`"locale"`</td>
+            <td>*"locale"*</td>
           </tr>
           <tr>
             <td>[[Style]]</td>
-            <td>`"style"`</td>
+            <td>*"style"*</td>
           </tr>
           <tr>
             <td>[[Type]]</td>
-            <td>`"type"`</td>
+            <td>*"type"*</td>
           </tr>
           <tr>
             <td>[[Fallback]]</td>
-            <td>`"fallback"`</td>
+            <td>*"fallback"*</td>
           </tr>
         </table>
       </emu-table>

From a2d00cc46b4664488fcd5ec1016237623ac81ce3 Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:06:16 -0800
Subject: [PATCH 15/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index 4d7d4408..36909290 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -241,7 +241,7 @@ <h1>Intl.DisplayNames.prototype.resolvedOptions ( )</h1>
     <h1>Properties of Intl.DisplayNames Instances</h1>
 
     <p>
-      Intl.DisplayNames instances are ordinary objects that inherit properties from %DisplayNamesPrototype%.
+      Intl.DisplayNames instances are ordinary objects that inherit properties from %DisplayNames.prototype%.
     </p>
 
     <p>

From e08cd7f641a134fe010183f1b99127a1b6bd5bb2 Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:06:30 -0800
Subject: [PATCH 16/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index 36909290..572750e6 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -254,9 +254,9 @@ <h1>Properties of Intl.DisplayNames Instances</h1>
 
     <ul>
       <li>[[Locale]] is a String value with the language tag of the locale whose localization is used for formatting.</li>
-      <li>[[Style]] is one of the String values `"narrow"`, `"short"`, or `"long"`, identifying the display names style used.</li>
-      <li>[[Type]] is one of the String values `"language"`, `"region"`, `"script"`, or `"currency"`, identifying the type of the display names requested.</li>
-      <li>[[Fallback]] is one of the String values `"code"`, or `"none"`, identifying the fallback return when the system does not have the requested display name.</li>
+      <li>[[Style]] is one of the String values *"narrow"*, *"short"*, or *"long"*, identifying the display name style used.</li>
+      <li>[[Type]] is one of the String values *"language"*, *"region"*, *"script"*, or *"currency"*, identifying the type of the display names requested.</li>
+      <li>[[Fallback]] is one of the String values *"code"*, or *"none"*, identifying the fallback return when the system does not have the requested display name.</li>
       <li>[[Fields]] is a Record (see <emu-xref href="#sec-Intl.DisplayNames-internal-slots"></emu-xref>) which
         must have fields with keys corresponding to codes according to [[Style]] and [[Type]].</li>
     </ul>

From 5ea86a36944c77bbb2594d36a3a423b181bce00b Mon Sep 17 00:00:00 2001
From: Frank Yung-Fong Tang <ftang@google.com>
Date: Tue, 5 Jan 2021 13:06:44 -0800
Subject: [PATCH 17/17] Update spec/displaynames.html

Co-authored-by: Leo Balter <leonardo.balter@gmail.com>
---
 spec/displaynames.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/displaynames.html b/spec/displaynames.html
index 572750e6..1e5a0046 100644
--- a/spec/displaynames.html
+++ b/spec/displaynames.html
@@ -257,8 +257,7 @@ <h1>Properties of Intl.DisplayNames Instances</h1>
       <li>[[Style]] is one of the String values *"narrow"*, *"short"*, or *"long"*, identifying the display name style used.</li>
       <li>[[Type]] is one of the String values *"language"*, *"region"*, *"script"*, or *"currency"*, identifying the type of the display names requested.</li>
       <li>[[Fallback]] is one of the String values *"code"*, or *"none"*, identifying the fallback return when the system does not have the requested display name.</li>
-      <li>[[Fields]] is a Record (see <emu-xref href="#sec-Intl.DisplayNames-internal-slots"></emu-xref>) which
-        must have fields with keys corresponding to codes according to [[Style]] and [[Type]].</li>
+      <li>[[Fields]] is a Record (see <emu-xref href="#sec-Intl.DisplayNames-internal-slots"></emu-xref>) which must have fields with keys corresponding to codes according to [[Style]] and [[Type]].</li>
     </ul>
   </emu-clause>
 </emu-clause>