From b55803d11d37fb18db0768dee344ac790a19c9ef Mon Sep 17 00:00:00 2001
From: Eemeli Aro <eemeli@gmail.com>
Date: Sun, 17 Dec 2023 12:32:47 +0200
Subject: [PATCH 1/4] Add :date and :time aliases

---
 spec/registry.dtd |  9 ++++++++-
 spec/registry.md  |  3 +++
 spec/registry.xml | 11 +++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/spec/registry.dtd b/spec/registry.dtd
index 8abbbc6e6e..1fe3c90bc3 100644
--- a/spec/registry.dtd
+++ b/spec/registry.dtd
@@ -55,12 +55,19 @@
     locales        NMTOKENS  #REQUIRED
 >
 
-<!ELEMENT alias (description,setOption*,override*)>
+<!ELEMENT alias (description,(mapOption|setOption)*,override*)>
 <!ATTLIST alias
     name           NMTOKEN  #REQUIRED
     supports       (format|match|all)  "all"
 >
 
+<!ELEMENT mapOption EMPTY>
+<!ATTLIST mapOption
+    alias          NMTOKEN #REQUIRED
+    name           NMTOKEN #REQUIRED
+    default        CDATA #IMPLIED
+>
+
 <!ELEMENT setOption EMPTY>
 <!ATTLIST setOption
     name           NMTOKEN #REQUIRED
diff --git a/spec/registry.md b/spec/registry.md
index bcf00ff8f1..8f7220fed3 100644
--- a/spec/registry.md
+++ b/spec/registry.md
@@ -72,7 +72,10 @@ to define the keys against which they can match when used as selectors.
 Functions may also include `<alias>` definitions,
 which provide shorthands for commonly used option baskets.
 An _alias name_ may be used equivalently to a _function name_ in messages.
+Its `<mapOption>` values map option names from those used in the `alias` to the `name` used in the _function_,
+and can include a `default`` value.
 Its `<setOption>` values are always set, and may not be overridden in message annotations.
+If the `<setOption>` `value` is an empty string, the option is not used in the alias.
 
 If a `<function>`, `<input>` or `<option>` includes multiple `<description>` elements,
 each SHOULD have a different `xml:lang` attribute value.
diff --git a/spec/registry.xml b/spec/registry.xml
index 25fff3695a..def7990b79 100644
--- a/spec/registry.xml
+++ b/spec/registry.xml
@@ -136,6 +136,17 @@
       </option>
     </formatSignature>
 
+    <alias name="date">
+      <description>Date formatting</description>
+      <mapOption alias="style" name="dateStyle" default="short" />
+      <setOption name="timeStyle" value="" />
+    </alias>
+
+    <alias name="time">
+      <description>Time formatting</description>
+      <mapOption alias="style" name="timeStyle" default="short" />
+      <setOption name="dateStyle" value="" />
+    </alias>
   </function>
 
   <function name="number">

From c9c8cf18c02becc9384a6fb54e5148828d9a807a Mon Sep 17 00:00:00 2001
From: Eemeli Aro <eemeli@gmail.com>
Date: Mon, 15 Jan 2024 13:23:00 +0200
Subject: [PATCH 2/4] Define as standalone functions instead

---
 spec/registry.dtd |  9 +-----
 spec/registry.md  |  3 --
 spec/registry.xml | 76 ++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/spec/registry.dtd b/spec/registry.dtd
index 1fe3c90bc3..8abbbc6e6e 100644
--- a/spec/registry.dtd
+++ b/spec/registry.dtd
@@ -55,19 +55,12 @@
     locales        NMTOKENS  #REQUIRED
 >
 
-<!ELEMENT alias (description,(mapOption|setOption)*,override*)>
+<!ELEMENT alias (description,setOption*,override*)>
 <!ATTLIST alias
     name           NMTOKEN  #REQUIRED
     supports       (format|match|all)  "all"
 >
 
-<!ELEMENT mapOption EMPTY>
-<!ATTLIST mapOption
-    alias          NMTOKEN #REQUIRED
-    name           NMTOKEN #REQUIRED
-    default        CDATA #IMPLIED
->
-
 <!ELEMENT setOption EMPTY>
 <!ATTLIST setOption
     name           NMTOKEN #REQUIRED
diff --git a/spec/registry.md b/spec/registry.md
index 8f7220fed3..bcf00ff8f1 100644
--- a/spec/registry.md
+++ b/spec/registry.md
@@ -72,10 +72,7 @@ to define the keys against which they can match when used as selectors.
 Functions may also include `<alias>` definitions,
 which provide shorthands for commonly used option baskets.
 An _alias name_ may be used equivalently to a _function name_ in messages.
-Its `<mapOption>` values map option names from those used in the `alias` to the `name` used in the _function_,
-and can include a `default`` value.
 Its `<setOption>` values are always set, and may not be overridden in message annotations.
-If the `<setOption>` `value` is an empty string, the option is not used in the alias.
 
 If a `<function>`, `<input>` or `<option>` includes multiple `<description>` elements,
 each SHOULD have a different `xml:lang` attribute value.
diff --git a/spec/registry.xml b/spec/registry.xml
index def7990b79..9cf534e8c5 100644
--- a/spec/registry.xml
+++ b/spec/registry.xml
@@ -135,18 +135,74 @@
         </description>
       </option>
     </formatSignature>
+  </function>
 
-    <alias name="date">
-      <description>Date formatting</description>
-      <mapOption alias="style" name="dateStyle" default="short" />
-      <setOption name="timeStyle" value="" />
-    </alias>
+  <function name="date">
+    <description>
+      Date formatting
+    </description>
 
-    <alias name="time">
-      <description>Time formatting</description>
-      <mapOption alias="style" name="timeStyle" default="short" />
-      <setOption name="dateStyle" value="" />
-    </alias>
+    <formatSignature>
+      <input validationRule="iso8601"/>
+      <option name="style" values="full long medium short">
+        <description>
+          The predefined date formatting style to use.
+        </description>
+      </option>
+      <option name="calendar" values="buddhist chinese coptic dangi ethioaa ethiopic gregory hebrew indian islamic islamic-umalqura islamic-tbla islamic-civil islamic-rgsa iso8601 japanese persian roc">
+        <description>
+          Calendar to use.
+        </description>
+      </option>
+      <option name="numberingSystem" values="arab arabext bali beng deva fullwide gujr guru hanidec khmr knda laoo latn limb mlym mong mymr orya tamldec telu thai tibt">
+        <description>
+          Numbering system to use.
+        </description>
+      </option>
+      <option name="timeZone" validationRule="timeZoneId">
+        <description>
+          The time zone to use.
+          The only value implementations must recognize is "UTC";
+          the default is the runtime's default time zone.
+          Implementations may also recognize the time zone names of the IANA time zone database,
+          such as "Asia/Shanghai", "Asia/Kolkata", "America/New_York".
+        </description>
+      </option>
+    </formatSignature>
+  </function>
+
+  <function name="time">
+    <description>
+      Time formatting
+    </description>
+
+    <formatSignature>
+      <input validationRule="iso8601"/>
+      <option name="style" values="full long medium short">
+        <description>
+          The predefined time formatting style to use.
+        </description>
+      </option>
+      <option name="calendar" values="buddhist chinese coptic dangi ethioaa ethiopic gregory hebrew indian islamic islamic-umalqura islamic-tbla islamic-civil islamic-rgsa iso8601 japanese persian roc">
+        <description>
+          Calendar to use.
+        </description>
+      </option>
+      <option name="numberingSystem" values="arab arabext bali beng deva fullwide gujr guru hanidec khmr knda laoo latn limb mlym mong mymr orya tamldec telu thai tibt">
+        <description>
+          Numbering system to use.
+        </description>
+      </option>
+      <option name="timeZone" validationRule="timeZoneId">
+        <description>
+          The time zone to use.
+          The only value implementations must recognize is "UTC";
+          the default is the runtime's default time zone.
+          Implementations may also recognize the time zone names of the IANA time zone database,
+          such as "Asia/Shanghai", "Asia/Kolkata", "America/New_York".
+        </description>
+      </option>
+    </formatSignature>
   </function>
 
   <function name="number">

From de99bfd44b5e52e147a9496c16cb3a61f24d2c5d Mon Sep 17 00:00:00 2001
From: Eemeli Aro <eemeli@gmail.com>
Date: Mon, 15 Jan 2024 18:28:28 +0200
Subject: [PATCH 3/4] Add hourCycle option to :time

---
 spec/registry.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spec/registry.xml b/spec/registry.xml
index 9cf534e8c5..9178b60d5a 100644
--- a/spec/registry.xml
+++ b/spec/registry.xml
@@ -202,6 +202,11 @@
           such as "Asia/Shanghai", "Asia/Kolkata", "America/New_York".
         </description>
       </option>
+      <option name="hourCycle" values="h11 h12 h23 h24">
+        <description>
+          The hour cycle to use.
+        </description>
+      </option>
     </formatSignature>
   </function>
 

From b69aa86e4ba18a5c93302fcba4692bad59ac672d Mon Sep 17 00:00:00 2001
From: Eemeli Aro <eemeli@gmail.com>
Date: Fri, 16 Feb 2024 21:24:51 +0200
Subject: [PATCH 4/4] Drop non-style options, use XML time & date validation
 rules

---
 spec/registry.xml | 51 ++++++-----------------------------------------
 1 file changed, 6 insertions(+), 45 deletions(-)

diff --git a/spec/registry.xml b/spec/registry.xml
index 9178b60d5a..f5de984fc2 100644
--- a/spec/registry.xml
+++ b/spec/registry.xml
@@ -8,6 +8,10 @@
   <validationRule id="timeZoneId" regex="[a-zA-Z/]+"/>
   <validationRule id="anythingNotEmpty" regex=".+"/>
   <validationRule id="iso8601" regex="\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}"/>
+  <validationRule id="xmlDate"
+    regex="-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])(Z|[+-]((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?"/>
+  <validationRule id="xmlTime"
+    regex="(([01][0-9]|2[0-3])(:[0-5][0-9]){2}(\.[0-9]+)?|24:00:00(\.0+)?)(Z|[+-]((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?"/>
 
   <function name="datetime">
     <!-- https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat -->
@@ -143,31 +147,12 @@
     </description>
 
     <formatSignature>
-      <input validationRule="iso8601"/>
+      <input validationRule="xmlDate"/>
       <option name="style" values="full long medium short">
         <description>
           The predefined date formatting style to use.
         </description>
       </option>
-      <option name="calendar" values="buddhist chinese coptic dangi ethioaa ethiopic gregory hebrew indian islamic islamic-umalqura islamic-tbla islamic-civil islamic-rgsa iso8601 japanese persian roc">
-        <description>
-          Calendar to use.
-        </description>
-      </option>
-      <option name="numberingSystem" values="arab arabext bali beng deva fullwide gujr guru hanidec khmr knda laoo latn limb mlym mong mymr orya tamldec telu thai tibt">
-        <description>
-          Numbering system to use.
-        </description>
-      </option>
-      <option name="timeZone" validationRule="timeZoneId">
-        <description>
-          The time zone to use.
-          The only value implementations must recognize is "UTC";
-          the default is the runtime's default time zone.
-          Implementations may also recognize the time zone names of the IANA time zone database,
-          such as "Asia/Shanghai", "Asia/Kolkata", "America/New_York".
-        </description>
-      </option>
     </formatSignature>
   </function>
 
@@ -177,36 +162,12 @@
     </description>
 
     <formatSignature>
-      <input validationRule="iso8601"/>
+      <input validationRule="xmlTime"/>
       <option name="style" values="full long medium short">
         <description>
           The predefined time formatting style to use.
         </description>
       </option>
-      <option name="calendar" values="buddhist chinese coptic dangi ethioaa ethiopic gregory hebrew indian islamic islamic-umalqura islamic-tbla islamic-civil islamic-rgsa iso8601 japanese persian roc">
-        <description>
-          Calendar to use.
-        </description>
-      </option>
-      <option name="numberingSystem" values="arab arabext bali beng deva fullwide gujr guru hanidec khmr knda laoo latn limb mlym mong mymr orya tamldec telu thai tibt">
-        <description>
-          Numbering system to use.
-        </description>
-      </option>
-      <option name="timeZone" validationRule="timeZoneId">
-        <description>
-          The time zone to use.
-          The only value implementations must recognize is "UTC";
-          the default is the runtime's default time zone.
-          Implementations may also recognize the time zone names of the IANA time zone database,
-          such as "Asia/Shanghai", "Asia/Kolkata", "America/New_York".
-        </description>
-      </option>
-      <option name="hourCycle" values="h11 h12 h23 h24">
-        <description>
-          The hour cycle to use.
-        </description>
-      </option>
     </formatSignature>
   </function>