From a2d41cdfe82343bdbae407c945e66bd5a3df1631 Mon Sep 17 00:00:00 2001
From: yumaoka <y.umaoka@gmail.com>
Date: Wed, 19 Jul 2023 18:55:31 +0300
Subject: [PATCH] CLDR-14453 [WIP] Adding IANA zone.tab mapping in timezone.xml

---
 common/bcp47/timezone.xml | 72 +++++++++++++++++++--------------------
 common/dtd/ldmlBCP47.dtd  |  3 ++
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/common/bcp47/timezone.xml b/common/bcp47/timezone.xml
index 20ec0c1f9da..c8cf8a7572b 100644
--- a/common/bcp47/timezone.xml
+++ b/common/bcp47/timezone.xml
@@ -30,13 +30,13 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="aqsyw" description="Syowa Station, East Ongul Island" alias="Antarctica/Syowa"/>
             <type name="aqtrl" description="Troll Station, Queen Maud Land" alias="Antarctica/Troll" since="26"/>
             <type name="aqvos" description="Vostok Station, Lake Vostok" alias="Antarctica/Vostok"/>
-            <type name="arbue" description="Buenos Aires, Argentina" alias="America/Buenos_Aires America/Argentina/Buenos_Aires"/>
-            <type name="arcor" description="Córdoba, Argentina" alias="America/Cordoba America/Argentina/Cordoba America/Rosario"/>
-            <type name="arctc" description="Catamarca, Argentina" alias="America/Catamarca America/Argentina/Catamarca America/Argentina/ComodRivadavia"/>
+            <type name="arbue" description="Buenos Aires, Argentina" alias="America/Buenos_Aires America/Argentina/Buenos_Aires" iana="America/Argentina/Buenos_Aires"/>
+            <type name="arcor" description="Córdoba, Argentina" alias="America/Cordoba America/Argentina/Cordoba America/Rosario" iana="America/Argentina/Cordoba"/>
+            <type name="arctc" description="Catamarca, Argentina" alias="America/Catamarca America/Argentina/Catamarca America/Argentina/ComodRivadavia" iana="America/Argentina/Catamarca"/>
             <type name="arirj" description="La Rioja, Argentina" alias="America/Argentina/La_Rioja"/>
-            <type name="arjuj" description="Jujuy, Argentina" alias="America/Jujuy America/Argentina/Jujuy"/>
+            <type name="arjuj" description="Jujuy, Argentina" alias="America/Jujuy America/Argentina/Jujuy" iana="America/Argentina/Jujuy"/>
             <type name="arluq" description="San Luis, Argentina" alias="America/Argentina/San_Luis"/>
-            <type name="armdz" description="Mendoza, Argentina" alias="America/Mendoza America/Argentina/Mendoza"/>
+            <type name="armdz" description="Mendoza, Argentina" alias="America/Mendoza America/Argentina/Mendoza" iana="America/Argentina/Mendoza"/>
             <type name="arrgl" description="Río Gallegos, Argentina" alias="America/Argentina/Rio_Gallegos"/>
             <type name="arsla" description="Salta, Argentina" alias="America/Argentina/Salta"/>
             <type name="artuc" description="Tucumán, Argentina" alias="America/Argentina/Tucuman"/>
@@ -49,8 +49,8 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="aubne" description="Brisbane, Australia" alias="Australia/Brisbane Australia/Queensland"/>
             <type name="audrw" description="Darwin, Australia" alias="Australia/Darwin Australia/North"/>
             <type name="aueuc" description="Eucla, Australia" alias="Australia/Eucla"/>
-            <type name="auhba" description="Hobart, Australia" alias="Australia/Hobart Australia/Tasmania"/>
-            <type name="aukns" description="Currie, Australia" alias="Australia/Currie"/>
+            <type name="auhba" description="Hobart, Australia" alias="Australia/Hobart Australia/Tasmania Australia/Currie"/>
+            <type name="aukns" description="Currie, Australia" deprecated="true" preferred="auhba"/>
             <type name="auldc" description="Lindeman Island, Australia" alias="Australia/Lindeman"/>
             <type name="auldh" description="Lord Howe Island, Australia" alias="Australia/Lord_Howe Australia/LHI"/>
             <type name="aumel" description="Melbourne, Australia" alias="Australia/Melbourne Australia/Victoria"/>
@@ -94,24 +94,24 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="bymsq" description="Minsk, Belarus" alias="Europe/Minsk"/>
             <type name="bzbze" description="Belize" alias="America/Belize"/>
             <type name="cacfq" description="Creston, Canada" alias="America/Creston" since="21.0.1"/>
-            <type name="caedm" description="Edmonton, Canada" alias="America/Edmonton Canada/Mountain"/>
-            <type name="caffs" description="Rainy River, Canada" alias="America/Rainy_River"/>
+            <type name="caedm" description="Edmonton, Canada" alias="America/Edmonton Canada/Mountain America/Yellowknife"/>
+            <type name="caffs" description="Rainy River, Canada" deprecated="true" preferred="cawnp"/>
             <type name="cafne" description="Fort Nelson, Canada" alias="America/Fort_Nelson" since="29"/>
             <type name="caglb" description="Glace Bay, Canada" alias="America/Glace_Bay"/>
             <type name="cagoo" description="Goose Bay, Canada" alias="America/Goose_Bay"/>
             <type name="cahal" description="Halifax, Canada" alias="America/Halifax Canada/Atlantic"/>
-            <type name="caiql" description="Iqaluit, Canada" alias="America/Iqaluit"/>
+            <type name="caiql" description="Iqaluit, Canada" alias="America/Iqaluit America/Pangnirtung"/>
             <type name="camon" description="Moncton, Canada" alias="America/Moncton"/>
             <type name="camtr" description="Montreal, Canada" deprecated="true" preferred="cator"/>
-            <type name="capnt" description="Pangnirtung, Canada" alias="America/Pangnirtung"/>
+            <type name="capnt" description="Pangnirtung, Canada" deprecated="true" preferred="caiql"/>
             <type name="careb" description="Resolute, Canada" alias="America/Resolute"/>
             <type name="careg" description="Regina, Canada" alias="America/Regina Canada/East-Saskatchewan Canada/Saskatchewan"/>
             <type name="casjf" description="St. John's, Canada" alias="America/St_Johns Canada/Newfoundland"/>
-            <type name="canpg" description="Nipigon, Canada" alias="America/Nipigon"/>
-            <type name="cathu" description="Thunder Bay, Canada" alias="America/Thunder_Bay"/>
-            <type name="cator" description="Toronto, Canada" alias="America/Toronto America/Montreal Canada/Eastern"/>
+            <type name="canpg" description="Nipigon, Canada" deprecated="true" preferred="cator"/>
+            <type name="cathu" description="Thunder Bay, Canada" deprecated="true" preferred="cator"/>
+            <type name="cator" description="Toronto, Canada" alias="America/Toronto America/Montreal Canada/Eastern America/Nipigon America/Thunder_Bay"/>
             <type name="cavan" description="Vancouver, Canada" alias="America/Vancouver Canada/Pacific"/>
-            <type name="cawnp" description="Winnipeg, Canada" alias="America/Winnipeg Canada/Central"/>
+            <type name="cawnp" description="Winnipeg, Canada" alias="America/Winnipeg Canada/Central America/Rainy_River"/>
             <type name="caybx" description="Blanc-Sablon, Canada" alias="America/Blanc-Sablon"/>
             <type name="caycb" description="Cambridge Bay, Canada" alias="America/Cambridge_Bay"/>
             <type name="cayda" description="Dawson, Canada" alias="America/Dawson"/>
@@ -120,8 +120,8 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="cayev" description="Inuvik, Canada" alias="America/Inuvik"/>
             <type name="cayxy" description="Whitehorse, Canada" alias="America/Whitehorse Canada/Yukon"/>
             <type name="cayyn" description="Swift Current, Canada" alias="America/Swift_Current"/>
-            <type name="cayzf" description="Yellowknife, Canada" alias="America/Yellowknife"/>
-            <type name="cayzs" description="Atikokan, Canada" alias="America/Coral_Harbour America/Atikokan"/>
+            <type name="cayzf" description="Yellowknife, Canada" deprecated="true" preferred="caedm"/>
+            <type name="cayzs" description="Atikokan, Canada" alias="America/Coral_Harbour America/Atikokan" iana="America/Atikokan"/>
             <type name="cccck" description="Cocos (Keeling) Islands" alias="Indian/Cocos"/>
             <type name="cdfbm" description="Lubumbashi, Democratic Republic of the Congo" alias="Africa/Lubumbashi"/>
             <type name="cdfih" description="Kinshasa, Democratic Republic of the Congo" alias="Africa/Kinshasa"/>
@@ -160,7 +160,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="eetll" description="Tallinn, Estonia" alias="Europe/Tallinn"/>
             <type name="egcai" description="Cairo, Egypt" alias="Africa/Cairo Egypt"/>
             <type name="eheai" description="El Aaiún, Western Sahara" alias="Africa/El_Aaiun"/>
-            <type name="erasm" description="Asmara, Eritrea" alias="Africa/Asmera Africa/Asmara"/>
+            <type name="erasm" description="Asmara, Eritrea" alias="Africa/Asmera Africa/Asmara" iana="Africa/Asmara"/>
             <type name="esceu" description="Ceuta, Spain" alias="Africa/Ceuta"/>
             <type name="eslpa" description="Canary Islands, Spain" alias="Atlantic/Canary"/>
             <type name="esmad" description="Madrid, Spain" alias="Europe/Madrid"/>
@@ -171,9 +171,9 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="fjsuv" description="Fiji" alias="Pacific/Fiji"/>
             <type name="fkpsy" description="Stanley, Falkland Islands" alias="Atlantic/Stanley"/>
             <type name="fmksa" description="Kosrae, Micronesia" alias="Pacific/Kosrae"/>
-            <type name="fmpni" description="Pohnpei, Micronesia" alias="Pacific/Ponape Pacific/Pohnpei"/>
-            <type name="fmtkk" description="Chuuk, Micronesia" alias="Pacific/Truk Pacific/Chuuk Pacific/Yap"/>
-            <type name="fotho" description="Faroe Islands" alias="Atlantic/Faeroe Atlantic/Faroe"/>
+            <type name="fmpni" description="Pohnpei, Micronesia" alias="Pacific/Ponape Pacific/Pohnpei" iana="Pacific/Pohnpei"/>
+            <type name="fmtkk" description="Chuuk, Micronesia" alias="Pacific/Truk Pacific/Chuuk Pacific/Yap" iana="Pacific/Chuuk"/>
+            <type name="fotho" description="Faroe Islands" alias="Atlantic/Faeroe Atlantic/Faroe" iana="Atlantic/Faroe"/>
             <type name="frpar" description="Paris, France" alias="Europe/Paris"/>
             <type name="galbv" description="Libreville, Gabon" alias="Africa/Libreville"/>
             <type name="gaza" description="Gaza Strip, Palestinian Territories" deprecated="true" preferred="gazastrp"/>
@@ -186,7 +186,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="ghacc" description="Accra, Ghana" alias="Africa/Accra"/>
             <type name="gigib" description="Gibraltar" alias="Europe/Gibraltar"/>
             <type name="gldkshvn" description="Danmarkshavn, Greenland" alias="America/Danmarkshavn"/>
-            <type name="glgoh" description="Nuuk (Godthåb), Greenland" alias="America/Godthab America/Nuuk"/>
+            <type name="glgoh" description="Nuuk (Godthåb), Greenland" alias="America/Godthab America/Nuuk" iana="America/Nuuk"/>
             <type name="globy" description="Ittoqqortoormiit (Scoresbysund), Greenland" alias="America/Scoresbysund"/>
             <type name="glthu" description="Qaanaaq (Thule), Greenland" alias="America/Thule"/>
             <type name="gmbjl" description="Banjul, Gambia" alias="Africa/Banjul"/>
@@ -214,7 +214,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="idpnk" description="Pontianak, Indonesia" alias="Asia/Pontianak"/>
             <type name="iedub" description="Dublin, Ireland" alias="Europe/Dublin Eire"/>
             <type name="imdgs" description="Isle of Man" alias="Europe/Isle_of_Man"/>
-            <type name="inccu" description="Kolkata, India" alias="Asia/Calcutta Asia/Kolkata"/>
+            <type name="inccu" description="Kolkata, India" alias="Asia/Calcutta Asia/Kolkata" iana="Asia/Kolkata"/>
             <type name="iodga" description="Chagos Archipelago" alias="Indian/Chagos"/>
             <type name="iqbgw" description="Baghdad, Iraq" alias="Asia/Baghdad"/>
             <type name="irthr" description="Tehran, Iran" alias="Asia/Tehran Iran"/>
@@ -229,7 +229,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="kgfru" description="Bishkek, Kyrgyzstan" alias="Asia/Bishkek"/>
             <type name="khpnh" description="Phnom Penh, Cambodia" alias="Asia/Phnom_Penh"/>
             <type name="kicxi" description="Kiritimati, Kiribati" alias="Pacific/Kiritimati"/>
-            <type name="kipho" description="Enderbury Island, Kiribati" alias="Pacific/Enderbury Pacific/Kanton"/>
+            <type name="kipho" description="Enderbury Island, Kiribati" alias="Pacific/Enderbury Pacific/Kanton" iana="Pacific/Kanton"/>
             <type name="kitrw" description="Tarawa, Kiribati" alias="Pacific/Tarawa"/>
             <type name="kmyva" description="Comoros" alias="Indian/Comoro"/>
             <type name="knbas" description="Saint Kitts" alias="America/St_Kitts"/>
@@ -264,7 +264,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="mhmaj" description="Majuro, Marshall Islands" alias="Pacific/Majuro"/>
             <type name="mkskp" description="Skopje, Macedonia" alias="Europe/Skopje"/>
             <type name="mlbko" description="Bamako, Mali" alias="Africa/Bamako Africa/Timbuktu"/>
-            <type name="mmrgn" description="Yangon (Rangoon), Burma" alias="Asia/Rangoon Asia/Yangon"/>
+            <type name="mmrgn" description="Yangon (Rangoon), Burma" alias="Asia/Rangoon Asia/Yangon" iana="Asia/Yangon"/>
             <type name="mncoq" description="Choibalsan, Mongolia" alias="Asia/Choibalsan"/>
             <type name="mnhvd" description="Khovd (Hovd), Mongolia" alias="Asia/Hovd"/>
             <type name="mnuln" description="Ulaanbaatar (Ulan Bator), Mongolia" alias="Asia/Ulaanbaatar Asia/Ulan_Bator"/>
@@ -289,8 +289,8 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="mxmzt" description="Mazatlán, Mexico" alias="America/Mazatlan Mexico/BajaSur"/>
             <type name="mxoji" description="Ojinaga, Mexico" alias="America/Ojinaga"/>
             <type name="mxpvr" description="Bahía de Banderas, Mexico" alias="America/Bahia_Banderas" since="1.9"/>
-            <type name="mxstis" description="Santa Isabel (Baja California), Mexico" alias="America/Santa_Isabel"/>
-            <type name="mxtij" description="Tijuana, Mexico" alias="America/Tijuana America/Ensenada Mexico/BajaNorte"/>
+            <type name="mxstis" description="Santa Isabel (Baja California), Mexico" deprecated="true" preferred="mxtij"/>
+            <type name="mxtij" description="Tijuana, Mexico" alias="America/Tijuana America/Ensenada Mexico/BajaNorte America/Santa_Isabel"/>
             <type name="mykch" description="Kuching, Malaysia" alias="Asia/Kuching"/>
             <type name="mykul" description="Kuala Lumpur, Malaysia" alias="Asia/Kuala_Lumpur"/>
             <type name="mzmpm" description="Maputo, Mozambique" alias="Africa/Maputo"/>
@@ -302,7 +302,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="nimga" description="Managua, Nicaragua" alias="America/Managua"/>
             <type name="nlams" description="Amsterdam, Netherlands" alias="Europe/Amsterdam"/>
             <type name="noosl" description="Oslo, Norway" alias="Europe/Oslo"/>
-            <type name="npktm" description="Kathmandu, Nepal" alias="Asia/Katmandu Asia/Kathmandu"/>
+            <type name="npktm" description="Kathmandu, Nepal" alias="Asia/Katmandu Asia/Kathmandu" iana="Asia/Kathmandu"/>
             <type name="nrinu" description="Nauru" alias="Pacific/Nauru"/>
             <type name="nuiue" description="Niue" alias="Pacific/Niue"/>
             <type name="nzakl" description="Auckland, New Zealand" alias="Pacific/Auckland Antarctica/South_Pole NZ"/>
@@ -395,13 +395,13 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="tvfun" description="Funafuti, Tuvalu" alias="Pacific/Funafuti"/>
             <type name="twtpe" description="Taipei, Taiwan" alias="Asia/Taipei ROC"/>
             <type name="tzdar" description="Dar es Salaam, Tanzania" alias="Africa/Dar_es_Salaam"/>
-            <type name="uaiev" description="Kyiv, Ukraine" alias="Europe/Kiev Europe/Kyiv"/>
-            <type name="uaozh" description="Zaporizhia (Zaporozhye), Ukraine" alias="Europe/Zaporozhye"/>
+            <type name="uaiev" description="Kyiv, Ukraine" alias="Europe/Kiev Europe/Kyiv Europe/Zaporozhye Europe/Uzhgorod" iana="Europe/Kyiv"/>
+            <type name="uaozh" description="Zaporizhia (Zaporozhye), Ukraine" deprecated="true" preferred="uaiev"/>
             <type name="uasip" description="Simferopol, Ukraine" alias="Europe/Simferopol"/>
-            <type name="uauzh" description="Uzhhorod (Uzhgorod), Ukraine" alias="Europe/Uzhgorod"/>
+            <type name="uauzh" description="Uzhhorod (Uzhgorod), Ukraine" deprecated="true" preferred="uaiev"/>
             <type name="ugkla" description="Kampala, Uganda" alias="Africa/Kampala"/>
             <type name="umawk" description="Wake Island, U.S. Minor Outlying Islands" alias="Pacific/Wake"/>
-            <type name="umjon" description="Johnston Atoll, U.S. Minor Outlying Islands" alias="Pacific/Johnston"/>
+            <type name="umjon" description="Johnston Atoll, U.S. Minor Outlying Islands" deprecated="true" iana="ushnl"/>
             <type name="ummdy" description="Midway Islands, U.S. Minor Outlying Islands" alias="Pacific/Midway"/>
             <type name="unk" description="Unknown time zone" alias="Etc/Unknown"/>
             <type name="usadk" description="Adak (Alaska), United States" alias="America/Adak America/Atka US/Aleutian"/>
@@ -411,13 +411,13 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="uschi" description="Chicago, United States" alias="America/Chicago US/Central"/>
             <type name="usden" description="Denver, United States" alias="America/Denver America/Shiprock Navajo US/Mountain"/>
             <type name="usdet" description="Detroit, United States" alias="America/Detroit US/Michigan"/>
-            <type name="ushnl" description="Honolulu, United States" alias="Pacific/Honolulu US/Hawaii"/>
-            <type name="usind" description="Indianapolis, United States" alias="America/Indianapolis America/Fort_Wayne America/Indiana/Indianapolis US/East-Indiana"/>
+            <type name="ushnl" description="Honolulu, United States" alias="Pacific/Honolulu US/Hawaii Pacific/Johnston"/>
+            <type name="usind" description="Indianapolis, United States" alias="America/Indianapolis America/Fort_Wayne America/Indiana/Indianapolis US/East-Indiana" iana="America/Indiana/Indianapolis"/>
             <type name="usinvev" description="Vevay (Indiana), United States" alias="America/Indiana/Vevay"/>
             <type name="usjnu" description="Juneau (Alaska), United States" alias="America/Juneau"/>
             <type name="usknx" description="Knox (Indiana), United States" alias="America/Indiana/Knox America/Knox_IN US/Indiana-Starke"/>
             <type name="uslax" description="Los Angeles, United States" alias="America/Los_Angeles US/Pacific US/Pacific-New"/>
-            <type name="uslui" description="Louisville (Kentucky), United States" alias="America/Louisville America/Kentucky/Louisville"/>
+            <type name="uslui" description="Louisville (Kentucky), United States" alias="America/Louisville America/Kentucky/Louisville" iana="America/Kentucky/Louisville"/>
             <type name="usmnm" description="Menominee (Michigan), United States" alias="America/Menominee"/>
             <type name="usmtm" description="Metlakatla (Alaska), United States" alias="America/Metlakatla" since="1.9.1"/>
             <type name="usmoc" description="Monticello (Kentucky), United States" alias="America/Kentucky/Monticello"/>
@@ -469,7 +469,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="veccs" description="Caracas, Venezuela" alias="America/Caracas"/>
             <type name="vgtov" description="Tortola, British Virgin Islands" alias="America/Tortola"/>
             <type name="vistt" description="Saint Thomas, U.S. Virgin Islands" alias="America/St_Thomas America/Virgin"/>
-            <type name="vnsgn" description="Ho Chi Minh City, Vietnam" alias="Asia/Saigon Asia/Ho_Chi_Minh"/>
+            <type name="vnsgn" description="Ho Chi Minh City, Vietnam" alias="Asia/Saigon Asia/Ho_Chi_Minh" iana="Asia/Ho_Chi_Minh"/>
             <type name="vuvli" description="Efate, Vanuatu" alias="Pacific/Efate"/>
             <type name="wfmau" description="Wallis Islands, Wallis and Futuna" alias="Pacific/Wallis"/>
             <type name="wsapw" description="Apia, Samoa" alias="Pacific/Apia"/>
diff --git a/common/dtd/ldmlBCP47.dtd b/common/dtd/ldmlBCP47.dtd
index 4fa06757c2e..85a205ad81f 100644
--- a/common/dtd/ldmlBCP47.dtd
+++ b/common/dtd/ldmlBCP47.dtd
@@ -69,6 +69,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST type since CDATA #IMPLIED >
     <!--@MATCH:version-->
     <!--@METADATA-->
+<!ATTLIST type iana CDATA #IMPLIED >
+    <!--@MATCH:any-->
+    <!--@VALUE-->
 
 <!ELEMENT attribute EMPTY >
 <!ATTLIST attribute name NMTOKEN #REQUIRED >