From dc7014fda6d6f08b3ddf468bddd62548c8c6263f Mon Sep 17 00:00:00 2001 From: yumaoka Date: Mon, 8 Jan 2024 12:45:18 -0500 Subject: [PATCH] ICU-22620 tz2023d updates --- icu4c/source/data/misc/metaZones.txt | 128 ++++++------------ icu4c/source/data/misc/windowsZones.txt | 22 +-- icu4c/source/data/misc/zoneinfo64.txt | 58 ++++---- icu4c/source/test/intltest/tzfmttst.cpp | 8 ++ icu4c/source/test/intltest/tztest.cpp | 1 - icu4c/source/tools/tzcode/Makefile.in | 2 +- icu4c/source/tools/tzcode/icuzones | 23 +++- icu4c/source/tools/tzcode/zdump.c | 1 + .../dev/test/format/TimeZoneFormatTest.java | 7 + .../ibm/icu/impl/data/icudt75b/metaZones.res | Bin 43264 -> 43088 bytes .../icu/impl/data/icudt75b/windowsZones.res | Bin 22624 -> 22160 bytes .../ibm/icu/impl/data/icudt75b/zoneinfo64.res | Bin 151344 -> 151536 bytes .../icu/dev/test/timezone/TimeZoneTest.java | 1 - tools/cldr/cldr-to-icu/pom.xml | 2 +- 14 files changed, 110 insertions(+), 143 deletions(-) diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt index 7e648a7358dc..e41c576c1b79 100644 --- a/icu4c/source/data/misc/metaZones.txt +++ b/icu4c/source/data/misc/metaZones.txt @@ -361,6 +361,9 @@ metaZones:table(nofallback){ Goose_Bay{ 001{"America/Goose_Bay"} } + Greenland{ + 001{"America/Godthab"} + } Greenland_Central{ 001{"America/Scoresbysund"} } @@ -500,9 +503,6 @@ metaZones:table(nofallback){ Mawson{ 001{"Antarctica/Mawson"} } - Mexico_Northwest{ - 001{"America/Santa_Isabel"} - } Mexico_Pacific{ 001{"America/Mazatlan"} } @@ -773,6 +773,7 @@ metaZones:table(nofallback){ geor{"Georgia"} giis{"Gilbert_Islands"} grea{"Greenland_Eastern"} + gree{"Greenland"} grwe{"Greenland_Western"} guam{"Guam"} gulf{"Gulf"} @@ -809,7 +810,6 @@ metaZones:table(nofallback){ marq{"Marquesas"} maur{"Mauritius"} maws{"Mawson"} - meno{"Mexico_Northwest"} mepa{"Mexico_Pacific"} mgmt{"GMT"} mong{"Mongolia"} @@ -1823,6 +1823,13 @@ metaZones:table(nofallback){ "America:Godthab"{ { "Greenland_Western", + "1970-01-01 00:00", + "2024-03-26 01:00", + } + { + "Greenland", + "2024-03-26 01:00", + "9999-12-31 23:59", } } "America:Goose_Bay"{ @@ -2324,11 +2331,6 @@ metaZones:table(nofallback){ "America_Eastern", } } - "America:Nipigon"{ - { - "America_Eastern", - } - } "America:Nome"{ { "Bering", @@ -2404,23 +2406,6 @@ metaZones:table(nofallback){ "America_Eastern", } } - "America:Pangnirtung"{ - { - "America_Eastern", - "1970-01-01 00:00", - "1999-10-31 06:00", - } - { - "America_Central", - "1999-10-31 06:00", - "2000-10-29 07:00", - } - { - "America_Eastern", - "2000-10-29 07:00", - "9999-12-31 23:59", - } - } "America:Paramaribo"{ { "Dutch_Guiana", @@ -2465,11 +2450,6 @@ metaZones:table(nofallback){ "2016-12-03 23:00", } } - "America:Rainy_River"{ - { - "America_Central", - } - } "America:Rankin_Inlet"{ { "America_Central", @@ -2541,11 +2521,6 @@ metaZones:table(nofallback){ "9999-12-31 23:59", } } - "America:Santa_Isabel"{ - { - "Mexico_Northwest", - } - } "America:Santarem"{ { "Amazon", @@ -2599,6 +2574,11 @@ metaZones:table(nofallback){ { "Greenland_Eastern", "1981-03-29 02:00", + "2024-03-31 01:00", + } + { + "Greenland", + "2024-03-31 01:00", "9999-12-31 23:59", } } @@ -2666,11 +2646,6 @@ metaZones:table(nofallback){ "Atlantic", } } - "America:Thunder_Bay"{ - { - "America_Eastern", - } - } "America:Tijuana"{ { "America_Pacific", @@ -2715,11 +2690,6 @@ metaZones:table(nofallback){ "9999-12-31 23:59", } } - "America:Yellowknife"{ - { - "America_Mountain", - } - } "Antarctica:Casey"{ { "Australia_Western", @@ -2779,6 +2749,31 @@ metaZones:table(nofallback){ { "Casey", "2020-10-03 16:01", + "2021-03-13 13:00", + } + { + "Australia_Western", + "2021-03-13 13:00", + "2021-10-02 16:01", + } + { + "Casey", + "2021-10-02 16:01", + "2022-03-12 13:00", + } + { + "Australia_Western", + "2022-03-12 13:00", + "2022-10-01 16:01", + } + { + "Casey", + "2022-10-01 16:01", + "2023-03-08 16:00", + } + { + "Australia_Western", + "2023-03-08 16:00", "9999-12-31 23:59", } } @@ -3658,11 +3653,6 @@ metaZones:table(nofallback){ "Australia_Central", } } - "Australia:Currie"{ - { - "Australia_Eastern", - } - } "Australia:Darwin"{ { "Australia_Central", @@ -4158,18 +4148,6 @@ metaZones:table(nofallback){ "2016-03-26 23:00", } } - "Europe:Uzhgorod"{ - { - "Moscow", - "1970-01-01 00:00", - "1990-06-30 22:00", - } - { - "Europe_Eastern", - "1990-06-30 22:00", - "9999-12-31 23:59", - } - } "Europe:Vaduz"{ { "Europe_Central", @@ -4222,18 +4200,6 @@ metaZones:table(nofallback){ "Europe_Central", } } - "Europe:Zaporozhye"{ - { - "Moscow", - "1970-01-01 00:00", - "1990-06-30 22:00", - } - { - "Europe_Eastern", - "1990-06-30 22:00", - "9999-12-31 23:59", - } - } "Europe:Zurich"{ { "Europe_Central", @@ -4402,18 +4368,6 @@ metaZones:table(nofallback){ "9999-12-31 23:59", } } - "Pacific:Johnston"{ - { - "Alaska_Hawaii", - "1970-01-01 00:00", - "1983-10-30 11:00", - } - { - "Hawaii_Aleutian", - "1983-10-30 11:00", - "9999-12-31 23:59", - } - } "Pacific:Kiritimati"{ { "Line_Islands", diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt index 092e700f71e6..1ad085388e79 100644 --- a/icu4c/source/data/misc/windowsZones.txt +++ b/icu4c/source/data/misc/windowsZones.txt @@ -173,10 +173,7 @@ windowsZones:table(nofallback){ } "Central Standard Time"{ 001{"America/Chicago"} - CA{ - "America/Winnipeg America/Rainy_River America/Rankin_Inlet America/Re" - "solute" - } + CA{"America/Winnipeg America/Rankin_Inlet America/Resolute"} MX{"America/Matamoros America/Ojinaga"} US{ "America/Chicago America/Indiana/Knox America/Indiana/Tell_City Ameri" @@ -241,10 +238,7 @@ windowsZones:table(nofallback){ "Eastern Standard Time"{ 001{"America/New_York"} BS{"America/Nassau"} - CA{ - "America/Toronto America/Iqaluit America/Montreal America/Nipigon Ame" - "rica/Pangnirtung America/Thunder_Bay" - } + CA{"America/Toronto America/Iqaluit"} US{ "America/New_York America/Detroit America/Indiana/Petersburg America/" "Indiana/Vincennes America/Indiana/Winamac America/Kentucky/Monticell" @@ -268,7 +262,7 @@ windowsZones:table(nofallback){ FI{"Europe/Helsinki"} LT{"Europe/Vilnius"} LV{"Europe/Riga"} - UA{"Europe/Kiev Europe/Uzhgorod Europe/Zaporozhye"} + UA{"Europe/Kiev"} } "Fiji Standard Time"{ 001{"Pacific/Fiji"} @@ -325,7 +319,6 @@ windowsZones:table(nofallback){ 001{"Pacific/Honolulu"} CK{"Pacific/Rarotonga"} PF{"Pacific/Tahiti"} - UM{"Pacific/Johnston"} US{"Pacific/Honolulu"} ZZ{"Etc/GMT+10"} } @@ -403,10 +396,7 @@ windowsZones:table(nofallback){ } "Mountain Standard Time"{ 001{"America/Denver"} - CA{ - "America/Edmonton America/Cambridge_Bay America/Inuvik America/Yellow" - "knife" - } + CA{"America/Edmonton America/Cambridge_Bay America/Inuvik"} MX{"America/Ciudad_Juarez"} US{"America/Denver America/Boise"} ZZ{"MST7MDT"} @@ -463,7 +453,7 @@ windowsZones:table(nofallback){ } "Pacific Standard Time (Mexico)"{ 001{"America/Tijuana"} - MX{"America/Tijuana America/Santa_Isabel"} + MX{"America/Tijuana"} } "Pacific Standard Time"{ 001{"America/Los_Angeles"} @@ -638,7 +628,7 @@ windowsZones:table(nofallback){ } "Tasmania Standard Time"{ 001{"Australia/Hobart"} - AU{"Australia/Hobart Australia/Currie Antarctica/Macquarie"} + AU{"Australia/Hobart Antarctica/Macquarie"} } "Tocantins Standard Time"{ 001{"America/Araguaina"} diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index 4d4961257706..c252f0bcde19 100644 --- a/icu4c/source/data/misc/zoneinfo64.txt +++ b/icu4c/source/data/misc/zoneinfo64.txt @@ -3,17 +3,17 @@ // License & terms of use: http://www.unicode.org/copyright.html //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Tue Mar 28 17:28:32 2023 +// Build date: Mon Jan 8 11:53:03 2024 // tz database: ftp://ftp.iana.org/tz/ -// tz version: 2023c -// ICU version: 73.1 +// tz version: 2023d +// ICU version: 75.0.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << // >> !!! >>> DO NOT EDIT <<< !!! << //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2023c" } + TZVersion { "2023d" } Zones:array { /* ACT */ :int { 357 } //Z#0 /* AET */ :int { 369 } //Z#1 @@ -842,9 +842,9 @@ zoneinfo64:table(nofallback) { finalYear:int { 2008 } } //Z#180 /* America/Nuuk */ :table { - trans:intvector { -1686083584, 323845200, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000, 859683600, 877827600, 891133200, 909277200, 922582800, 941331600, 954032400, 972781200, 985482000, 1004230800, 1017536400, 1035680400, 1048986000, 1067130000, 1080435600, 1099184400, 1111885200, 1130634000, 1143334800, 1162083600, 1174784400, 1193533200, 1206838800, 1224982800, 1238288400, 1256432400, 1269738000, 1288486800, 1301187600, 1319936400, 1332637200, 1351386000, 1364691600, 1382835600, 1396141200, 1414285200, 1427590800, 1445734800, 1459040400, 1477789200, 1490490000, 1509238800, 1521939600, 1540688400, 1553994000, 1572138000, 1585443600, 1603587600, 1616893200, 1635642000, 1648342800, 1667091600, 1679792400, 1698541200, 1711846800, 1729990800 } + trans:intvector { -1686083584, 323845200, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000, 859683600, 877827600, 891133200, 909277200, 922582800, 941331600, 954032400, 972781200, 985482000, 1004230800, 1017536400, 1035680400, 1048986000, 1067130000, 1080435600, 1099184400, 1111885200, 1130634000, 1143334800, 1162083600, 1174784400, 1193533200, 1206838800, 1224982800, 1238288400, 1256432400, 1269738000, 1288486800, 1301187600, 1319936400, 1332637200, 1351386000, 1364691600, 1382835600, 1396141200, 1414285200, 1427590800, 1445734800, 1459040400, 1477789200, 1490490000, 1509238800, 1521939600, 1540688400, 1553994000, 1572138000, 1585443600, 1603587600, 1616893200, 1635642000, 1648342800, 1667091600, 1679792400, 1711846800, 1729990800 } typeOffsets:intvector { -12416, 0, -10800, 0, -10800, 3600, -7200, 0, -7200, 3600 } - typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102030403" } + typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201030403" } finalRule { "EU" } finalRaw:int { -7200 } finalYear:int { 2025 } @@ -970,12 +970,12 @@ zoneinfo64:table(nofallback) { links:intvector { 204, 374, 378 } } //Z#204 /* America/Scoresbysund */ :table { - trans:intvector { -1686090728, 323841600, 338961600, 354679200, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } + trans:intvector { -1686090728, 323841600, 338961600, 354679200, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000, 859683600, 877827600, 891133200, 909277200, 922582800, 941331600, 954032400, 972781200, 985482000, 1004230800, 1017536400, 1035680400, 1048986000, 1067130000, 1080435600, 1099184400, 1111885200, 1130634000, 1143334800, 1162083600, 1174784400, 1193533200, 1206838800, 1224982800, 1238288400, 1256432400, 1269738000, 1288486800, 1301187600, 1319936400, 1332637200, 1351386000, 1364691600, 1382835600, 1396141200, 1414285200, 1427590800, 1445734800, 1459040400, 1477789200, 1490490000, 1509238800, 1521939600, 1540688400, 1553994000, 1572138000, 1585443600, 1603587600, 1616893200, 1635642000, 1648342800, 1667091600, 1679792400, 1698541200, 1711846800, 1729990800 } typeOffsets:intvector { -5272, 0, -7200, 0, -7200, 3600, -3600, 0, -3600, 3600 } - typeMap:bin { "0102010403040304030403040304030403040304030403040304030403040304030403" } + typeMap:bin { "01020104030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030201" } finalRule { "EU" } - finalRaw:int { -3600 } - finalYear:int { 1997 } + finalRaw:int { -7200 } + finalYear:int { 2025 } } //Z#205 /* America/Shiprock */ :int { 110 } //Z#206 /* America/Sitka */ :table { @@ -1079,9 +1079,9 @@ zoneinfo64:table(nofallback) { } //Z#225 /* America/Yellowknife */ :int { 113 } //Z#226 /* Antarctica/Casey */ :table { - trans:intvector { -31536000, 1255802400, 1267714800, 1319738400, 1329843600, 1477065600, 1520701200, 1538856000, 1552752000, 1570129200, 1583596800, 1601740860 } + trans:intvector { -31536000, 1255802400, 1267714800, 1319738400, 1329843600, 1477065600, 1520701200, 1538856000, 1552752000, 1570129200, 1583596800, 1601740860, 1615640400, 1633190460, 1647090000, 1664640060, 1678291200 } typeOffsets:intvector { 0, 0, 28800, 0, 39600, 0 } - typeMap:bin { "010201020102010201020102" } + typeMap:bin { "0102010201020102010201020102010201" } } //Z#227 /* Antarctica/Davis */ :table { trans:intvector { -409190400, -163062000, -28857600, 1255806000, 1268251200, 1319742000, 1329854400 } @@ -1124,7 +1124,11 @@ zoneinfo64:table(nofallback) { finalRaw:int { 0 } finalYear:int { 2006 } } //Z#237 - /* Antarctica/Vostok */ :int { 331 } //Z#238 + /* Antarctica/Vostok */ :table { + trans:intvector { -380073600, 760035600, 783648000, 1702839600 } + typeOffsets:intvector { 0, 0, 18000, 0, 25200, 0 } + typeMap:bin { "02000201" } + } //Z#238 /* Arctic/Longyearbyen */ :int { 447 } //Z#239 /* Asia/Aden */ :int { 311 } //Z#240 /* Asia/Almaty */ :table { @@ -1261,9 +1265,9 @@ zoneinfo64:table(nofallback) { /* Asia/Gaza */ :table { transPre32:intvector { -1, 2109557424 } trans:intvector { -933638400, -923097600, -919036800, -857347200, -844300800, -825811200, -812678400, -794188800, -779846400, -762652800, -748310400, -731116800, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 334101600, 337730400, 452642400, 462319200, 482277600, 494370000, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1219957200, 1238104800, 1252015200, 1269640860, 1281474000, 1301608860, 1312146000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400, 1616796000, 1635458400, 1648332000, 1666998000, 1682726400, 1698447600, 1712966400, 1729897200, 1743811200, 1761346800, 1774656000, 1792796400, 1806105600, 1824850800, 1837555200, 1856300400, 1869004800, 1887750000, 1901059200, 1919199600, 1932508800, 1950649200, 1963958400, 1982703600, 1995408000, 2014153200, 2026857600, 2045602800, 2058307200, 2077052400, 2090361600, 2107897200, 2121811200, 2138742000 } - transPost32:intvector { 0, -2141706496, 0, -2125985296, 0, -2110256896, 0, -2095140496, 0, -2092112896, 0, -2091511696, 0, -2078807296, 0, -2064900496, 0, -2061268096, 0, -2060062096, 0, -2046752896, 0, -2034055696, 0, -2031028096, 0, -2028612496, 0, -2015303296, 0, -2003210896, 0, -2000183296, 0, -1997162896, 0, -1983853696, 0, -1972970896, 0, -1969338496, 0, -1965713296, 0, -1952404096, 0, -1942126096, 0, -1939098496, 0, -1933658896, 0, -1920954496, 0, -1911281296, 0, -1908253696, 0, -1902209296, 0, -1889504896, 0, -1881041296, 0, -1877408896, 0, -1870759696, 0, -1857450496, 0, -1850196496, 0, -1847168896, 0, -1839310096, 0, -1826000896, 0, -1819956496, 0, -1816324096, 0, -1807860496, 0, -1794551296, 0, -1789111696, 0, -1786084096, 0, -1775806096, 0, -1763101696, 0, -1758266896, 0, -1755239296, 0, -1744356496, 0, -1731652096, 0, -1728026896, 0, -1724394496, 0, -1712906896, 0, -1699597696, 0, -1697182096, 0, -1694154496, 0, -1681457296, 0, -1668148096, 0, -1666942096, 0, -1663309696, 0, -1650007696, 0, -1636698496, 0, -1636097296, 0, -1632464896, 0, -1618558096, 0, -1602224896, 0, -1586503696, 0, -1571380096, 0, -1555054096, 0, -1541140096, 0, -1523604496, 0, -1510295296, 0, -1492154896, 0, -1478845696, 0, -1460705296, 0, -1447396096, 0, -1428650896, 0, -1415946496, 0, -1397201296, 0, -1384496896, 0, -1365751696, 0, -1353047296, 0, -1334302096, 0, -1320992896, 0, -1302852496, 0, -1289543296, 0, -1271402896, 0, -1258093696, 0, -1239348496, 0, -1226644096, 0, -1207898896, 0, -1195194496, 0, -1177054096, 0, -1163140096, 0, -1146209296, 0, -1131690496, 0, -1115364496, 0, -1100240896, 0, -1085124496, 0, -1068791296, 0, -1054279696, 0, -1051252096, 0, -1023434896, 0, -1020407296, 0, -993194896, 0, -989562496, 0, -962350096, 0, -959322496, 0, -955697296, 0, -942388096, 0, -932110096, 0, -928477696, 0, -924247696, 0, -910938496, 0, -901265296, 0, -897632896, 0, -892193296, 0, -879488896, 0, -870420496, 0, -867392896, 0, -860743696, 0, -848039296, 0, -840180496, 0, -836548096, 0, -829294096, 0, -815984896, 0, -809335696, 0, -806308096, 0, -797844496, 0, -784535296, 0, -778490896, 0, -775463296, 0, -766394896, 0, -753085696, 0, -748250896, 0, -744618496, 0, -734945296, 0, -721636096, 0, -717406096, 0, -714378496, 0, -702890896, 0, -690186496, 0, -687166096, 0, -683533696, 0, -671441296, 0, -658736896, 0, -656321296, 0, -652688896, 0, -639991696, 0, -626682496, 0, -625476496, 0, -622448896, 0, -608542096, 0, -595232896, 0, -577092496 } + transPost32:intvector { 0, -2141706496, 0, -2125985296, 0, -2110256896, 0, -2095140496, 0, -2092112896, 0, -2091511696, 0, -2078807296, 0, -2064900496, 0, -2061268096, 0, -2060062096, 0, -2046752896, 0, -2034055696, 0, -2031028096, 0, -2028612496, 0, -2015303296, 0, -2003210896, 0, -2000183296, 0, -1997162896, 0, -1983853696, 0, -1972970896, 0, -1969338496, 0, -1965713296, 0, -1952404096, 0, -1942126096, 0, -1939098496, 0, -1933658896, 0, -1920954496, 0, -1911281296, 0, -1908253696, 0, -1902209296, 0, -1889504896, 0, -1881041296, 0, -1877408896, 0, -1870759696, 0, -1857450496, 0, -1850196496, 0, -1847168896, 0, -1839310096, 0, -1826000896, 0, -1819956496, 0, -1816324096, 0, -1807860496, 0, -1794551296, 0, -1789111696, 0, -1786084096, 0, -1775806096, 0, -1763101696, 0, -1758266896, 0, -1755239296, 0, -1744356496, 0, -1731652096, 0, -1728026896, 0, -1724394496, 0, -1712906896, 0, -1699597696, 0, -1697182096, 0, -1694154496, 0, -1681457296, 0, -1668148096, 0, -1666942096, 0, -1663309696, 0, -1650007696, 0, -1636698496, 0, -1636097296, 0, -1632464896, 0, -1618558096, 0, -1602224896, 0, -1586503696, 0, -1571380096, 0, -1555054096, 0, -1541140096, 0, -1523604496, 0, -1510295296, 0, -1492154896, 0, -1478845696, 0, -1460705296, 0, -1447396096, 0, -1428650896, 0, -1415946496, 0, -1397201296, 0, -1384496896, 0, -1365751696, 0, -1353047296, 0, -1334302096, 0, -1320992896, 0, -1302852496, 0, -1289543296, 0, -1271402896, 0, -1258093696, 0, -1239348496, 0, -1226644096, 0, -1207898896, 0, -1195194496, 0, -1177054096, 0, -1163140096, 0, -1146209296, 0, -1131690496, 0, -1115364496, 0, -1100240896, 0, -1085124496, 0, -1068791296, 0, -1054279696, 0, -1051252096, 0, -1050046096, 0, -1037341696, 0, -1023434896, 0, -1020407296, 0, -1018596496, 0, -1005892096, 0, -993194896, 0, -989562496, 0, -987146896, 0, -973837696, 0, -962350096, 0, -959322496, 0, -955697296, 0, -942388096, 0, -932110096, 0, -928477696, 0, -924247696, 0, -910938496, 0, -901265296, 0, -897632896, 0, -892193296, 0, -879488896, 0, -870420496, 0, -867392896, 0, -860743696, 0, -848039296, 0, -840180496, 0, -836548096, 0, -829294096, 0, -815984896, 0, -809335696, 0, -806308096, 0, -797844496, 0, -784535296, 0, -778490896, 0, -775463296, 0, -766394896, 0, -753085696, 0, -748250896, 0, -744618496, 0, -734945296, 0, -721636096, 0, -717406096, 0, -714378496, 0, -702890896, 0, -690186496, 0, -687166096, 0, -683533696, 0, -671441296, 0, -658736896, 0, -656321296, 0, -652688896, 0, -639991696, 0, -626682496, 0, -625476496, 0, -622448896, 0, -608542096, 0, -595232896, 0, -577092496 } typeOffsets:intvector { 8272, 0, 7200, 0, 7200, 3600 } - typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } + typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } finalRule { "Palestine" } finalRaw:int { 7200 } finalYear:int { 2088 } @@ -1272,9 +1276,9 @@ zoneinfo64:table(nofallback) { /* Asia/Hebron */ :table { transPre32:intvector { -1, 2109557273 } trans:intvector { -933638400, -923097600, -919036800, -857347200, -844300800, -825811200, -812678400, -794188800, -779846400, -762652800, -748310400, -731116800, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 334101600, 337730400, 452642400, 462319200, 482277600, 494370000, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1220216400, 1238104800, 1252015200, 1269554400, 1281474000, 1301608860, 1312146000, 1314655200, 1317330000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400, 1616796000, 1635458400, 1648332000, 1666998000, 1682726400, 1698447600, 1712966400, 1729897200, 1743811200, 1761346800, 1774656000, 1792796400, 1806105600, 1824850800, 1837555200, 1856300400, 1869004800, 1887750000, 1901059200, 1919199600, 1932508800, 1950649200, 1963958400, 1982703600, 1995408000, 2014153200, 2026857600, 2045602800, 2058307200, 2077052400, 2090361600, 2107897200, 2121811200, 2138742000 } - transPost32:intvector { 0, -2141706496, 0, -2125985296, 0, -2110256896, 0, -2095140496, 0, -2092112896, 0, -2091511696, 0, -2078807296, 0, -2064900496, 0, -2061268096, 0, -2060062096, 0, -2046752896, 0, -2034055696, 0, -2031028096, 0, -2028612496, 0, -2015303296, 0, -2003210896, 0, -2000183296, 0, -1997162896, 0, -1983853696, 0, -1972970896, 0, -1969338496, 0, -1965713296, 0, -1952404096, 0, -1942126096, 0, -1939098496, 0, -1933658896, 0, -1920954496, 0, -1911281296, 0, -1908253696, 0, -1902209296, 0, -1889504896, 0, -1881041296, 0, -1877408896, 0, -1870759696, 0, -1857450496, 0, -1850196496, 0, -1847168896, 0, -1839310096, 0, -1826000896, 0, -1819956496, 0, -1816324096, 0, -1807860496, 0, -1794551296, 0, -1789111696, 0, -1786084096, 0, -1775806096, 0, -1763101696, 0, -1758266896, 0, -1755239296, 0, -1744356496, 0, -1731652096, 0, -1728026896, 0, -1724394496, 0, -1712906896, 0, -1699597696, 0, -1697182096, 0, -1694154496, 0, -1681457296, 0, -1668148096, 0, -1666942096, 0, -1663309696, 0, -1650007696, 0, -1636698496, 0, -1636097296, 0, -1632464896, 0, -1618558096, 0, -1602224896, 0, -1586503696, 0, -1571380096, 0, -1555054096, 0, -1541140096, 0, -1523604496, 0, -1510295296, 0, -1492154896, 0, -1478845696, 0, -1460705296, 0, -1447396096, 0, -1428650896, 0, -1415946496, 0, -1397201296, 0, -1384496896, 0, -1365751696, 0, -1353047296, 0, -1334302096, 0, -1320992896, 0, -1302852496, 0, -1289543296, 0, -1271402896, 0, -1258093696, 0, -1239348496, 0, -1226644096, 0, -1207898896, 0, -1195194496, 0, -1177054096, 0, -1163140096, 0, -1146209296, 0, -1131690496, 0, -1115364496, 0, -1100240896, 0, -1085124496, 0, -1068791296, 0, -1054279696, 0, -1051252096, 0, -1023434896, 0, -1020407296, 0, -993194896, 0, -989562496, 0, -962350096, 0, -959322496, 0, -955697296, 0, -942388096, 0, -932110096, 0, -928477696, 0, -924247696, 0, -910938496, 0, -901265296, 0, -897632896, 0, -892193296, 0, -879488896, 0, -870420496, 0, -867392896, 0, -860743696, 0, -848039296, 0, -840180496, 0, -836548096, 0, -829294096, 0, -815984896, 0, -809335696, 0, -806308096, 0, -797844496, 0, -784535296, 0, -778490896, 0, -775463296, 0, -766394896, 0, -753085696, 0, -748250896, 0, -744618496, 0, -734945296, 0, -721636096, 0, -717406096, 0, -714378496, 0, -702890896, 0, -690186496, 0, -687166096, 0, -683533696, 0, -671441296, 0, -658736896, 0, -656321296, 0, -652688896, 0, -639991696, 0, -626682496, 0, -625476496, 0, -622448896, 0, -608542096, 0, -595232896, 0, -577092496 } + transPost32:intvector { 0, -2141706496, 0, -2125985296, 0, -2110256896, 0, -2095140496, 0, -2092112896, 0, -2091511696, 0, -2078807296, 0, -2064900496, 0, -2061268096, 0, -2060062096, 0, -2046752896, 0, -2034055696, 0, -2031028096, 0, -2028612496, 0, -2015303296, 0, -2003210896, 0, -2000183296, 0, -1997162896, 0, -1983853696, 0, -1972970896, 0, -1969338496, 0, -1965713296, 0, -1952404096, 0, -1942126096, 0, -1939098496, 0, -1933658896, 0, -1920954496, 0, -1911281296, 0, -1908253696, 0, -1902209296, 0, -1889504896, 0, -1881041296, 0, -1877408896, 0, -1870759696, 0, -1857450496, 0, -1850196496, 0, -1847168896, 0, -1839310096, 0, -1826000896, 0, -1819956496, 0, -1816324096, 0, -1807860496, 0, -1794551296, 0, -1789111696, 0, -1786084096, 0, -1775806096, 0, -1763101696, 0, -1758266896, 0, -1755239296, 0, -1744356496, 0, -1731652096, 0, -1728026896, 0, -1724394496, 0, -1712906896, 0, -1699597696, 0, -1697182096, 0, -1694154496, 0, -1681457296, 0, -1668148096, 0, -1666942096, 0, -1663309696, 0, -1650007696, 0, -1636698496, 0, -1636097296, 0, -1632464896, 0, -1618558096, 0, -1602224896, 0, -1586503696, 0, -1571380096, 0, -1555054096, 0, -1541140096, 0, -1523604496, 0, -1510295296, 0, -1492154896, 0, -1478845696, 0, -1460705296, 0, -1447396096, 0, -1428650896, 0, -1415946496, 0, -1397201296, 0, -1384496896, 0, -1365751696, 0, -1353047296, 0, -1334302096, 0, -1320992896, 0, -1302852496, 0, -1289543296, 0, -1271402896, 0, -1258093696, 0, -1239348496, 0, -1226644096, 0, -1207898896, 0, -1195194496, 0, -1177054096, 0, -1163140096, 0, -1146209296, 0, -1131690496, 0, -1115364496, 0, -1100240896, 0, -1085124496, 0, -1068791296, 0, -1054279696, 0, -1051252096, 0, -1050046096, 0, -1037341696, 0, -1023434896, 0, -1020407296, 0, -1018596496, 0, -1005892096, 0, -993194896, 0, -989562496, 0, -987146896, 0, -973837696, 0, -962350096, 0, -959322496, 0, -955697296, 0, -942388096, 0, -932110096, 0, -928477696, 0, -924247696, 0, -910938496, 0, -901265296, 0, -897632896, 0, -892193296, 0, -879488896, 0, -870420496, 0, -867392896, 0, -860743696, 0, -848039296, 0, -840180496, 0, -836548096, 0, -829294096, 0, -815984896, 0, -809335696, 0, -806308096, 0, -797844496, 0, -784535296, 0, -778490896, 0, -775463296, 0, -766394896, 0, -753085696, 0, -748250896, 0, -744618496, 0, -734945296, 0, -721636096, 0, -717406096, 0, -714378496, 0, -702890896, 0, -690186496, 0, -687166096, 0, -683533696, 0, -671441296, 0, -658736896, 0, -656321296, 0, -652688896, 0, -639991696, 0, -626682496, 0, -625476496, 0, -622448896, 0, -608542096, 0, -595232896, 0, -577092496 } typeOffsets:intvector { 8423, 0, 7200, 0, 7200, 3600 } - typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } + typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } finalRule { "Palestine" } finalRaw:int { 7200 } finalYear:int { 2088 } @@ -1550,7 +1554,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1325483420 } typeOffsets:intvector { 21020, 0, 21600, 0 } typeMap:bin { "01" } - links:intvector { 238, 284, 331 } + links:intvector { 284, 331 } } //Z#331 /* Asia/Ust-Nera */ :table { trans:intvector { -1579426374, -1247558400, 354898800, 370699200, 386427600, 402235200, 417963600, 433771200, 449586000, 465318000, 481042800, 496767600, 512492400, 528217200, 543942000, 559666800, 575391600, 591116400, 606841200, 622566000, 638290800, 654620400, 670345200, 686073600, 695750400, 701794800, 717519600, 733244400, 748969200, 764694000, 780418800, 796143600, 811868400, 828198000, 846342000, 859647600, 877791600, 891097200, 909241200, 922546800, 941295600, 953996400, 972745200, 985446000, 1004194800, 1017500400, 1035644400, 1048950000, 1067094000, 1080399600, 1099148400, 1111849200, 1130598000, 1143298800, 1162047600, 1174748400, 1193497200, 1206802800, 1224946800, 1238252400, 1256396400, 1269702000, 1288450800, 1301151600, 1315828800, 1414249200 } @@ -2542,10 +2546,9 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -14400, 0 } } //Z#604 /* SystemV/AST4ADT */ :table { - transPre32:intvector { -1, 2096195296, -1, 2111916496, -1, 2127644896, -1, 2143366096 } trans:intvector { -2135872800, -2120151600, -2104423200, -2088702000, -2072973600, -2056647600, -2040919200, -2025198000, -2009469600, -1993748400, -1978020000, -1962298800, -1946570400, -1930849200, -1915120800, -1898794800, -1883671200, -1867345200, -1851616800, -1835895600, -1820167200, -1804446000, -1788717600, -1772996400, -1757268000, -1741546800, -1725818400, -1709492400, -1693764000, -1678042800, -1662314400, -1646593200, -1630864800, -1615143600, -1599415200, -1583694000, -1567965600, -1551639600, -1536516000, -1520190000, -1504461600, -1488740400, -1473012000, -1457290800, -1441562400, -1425841200, -1410112800, -1394391600, -1378663200, -1362337200, -1347213600, -1330887600, -1315159200, -1299438000, -1283709600, -1267988400, -1252260000, -1236538800, -1220810400, -1205089200, -1189360800, -1173034800, -1157306400, -1141585200, -1125856800, -1110135600, -1094407200, -1078686000, -1062957600, -1047236400, -1031508000, -1015182000, -1000058400, -983732400, -968004000, -952282800, -936554400, -920833200, -905104800, -889383600, -873655200, -857934000, -842205600, -825879600, -810151200, -794430000, -778701600, -762980400, -747252000, -731530800, -715802400, -700081200, -684352800, -668026800, -652903200, -636577200, -620848800, -605127600, -589399200, -573678000, -557949600, -542228400, -526500000, -510778800, -495050400, -478724400, -463600800, -447274800, -431546400, -415825200, -400096800, -384375600, -368647200, -352926000, -337197600, -321476400, -305748000, -289422000, -273693600, -257972400, -242244000, -226522800, -210794400, -195073200, -179344800, -163623600, -147895200, -131569200, -116445600, -100119600, -84391200, -68670000, -52941600, -37220400, -21492000, -5770800, 9957600, 25678800, 41407200, 57733200, 73461600, 89182800, 104911200, 120632400, 126684000, 154501200, 162367200, 183531600, 199260000, 215586000 } typeOffsets:intvector { -14400, 0, -14400, 3600 } - typeMap:bin { "01000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } + typeMap:bin { "010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } finalRule { "SystemV" } finalRaw:int { -14400 } finalYear:int { 1977 } @@ -2554,10 +2557,9 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -21600, 0 } } //Z#606 /* SystemV/CST6CDT */ :table { - transPre32:intvector { -1, 2096202496, -1, 2111923696, -1, 2127652096, -1, 2143373296 } trans:intvector { -2135865600, -2120144400, -2104416000, -2088694800, -2072966400, -2056640400, -2040912000, -2025190800, -2009462400, -1993741200, -1978012800, -1962291600, -1946563200, -1930842000, -1915113600, -1898787600, -1883664000, -1867338000, -1851609600, -1835888400, -1820160000, -1804438800, -1788710400, -1772989200, -1757260800, -1741539600, -1725811200, -1709485200, -1693756800, -1678035600, -1662307200, -1646586000, -1630857600, -1615136400, -1599408000, -1583686800, -1567958400, -1551632400, -1536508800, -1520182800, -1504454400, -1488733200, -1473004800, -1457283600, -1441555200, -1425834000, -1410105600, -1394384400, -1378656000, -1362330000, -1347206400, -1330880400, -1315152000, -1299430800, -1283702400, -1267981200, -1252252800, -1236531600, -1220803200, -1205082000, -1189353600, -1173027600, -1157299200, -1141578000, -1125849600, -1110128400, -1094400000, -1078678800, -1062950400, -1047229200, -1031500800, -1015174800, -1000051200, -983725200, -967996800, -952275600, -936547200, -920826000, -905097600, -889376400, -873648000, -857926800, -842198400, -825872400, -810144000, -794422800, -778694400, -762973200, -747244800, -731523600, -715795200, -700074000, -684345600, -668019600, -652896000, -636570000, -620841600, -605120400, -589392000, -573670800, -557942400, -542221200, -526492800, -510771600, -495043200, -478717200, -463593600, -447267600, -431539200, -415818000, -400089600, -384368400, -368640000, -352918800, -337190400, -321469200, -305740800, -289414800, -273686400, -257965200, -242236800, -226515600, -210787200, -195066000, -179337600, -163616400, -147888000, -131562000, -116438400, -100112400, -84384000, -68662800, -52934400, -37213200, -21484800, -5763600, 9964800, 25686000, 41414400, 57740400, 73468800, 89190000, 104918400, 120639600, 126691200, 154508400, 162374400, 183538800, 199267200, 215593200 } typeOffsets:intvector { -21600, 0, -21600, 3600 } - typeMap:bin { "01000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } + typeMap:bin { "010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } finalRule { "SystemV" } finalRaw:int { -21600 } finalYear:int { 1977 } @@ -2566,10 +2568,9 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -18000, 0 } } //Z#608 /* SystemV/EST5EDT */ :table { - transPre32:intvector { -1, 2096198896, -1, 2111920096, -1, 2127648496, -1, 2143369696 } trans:intvector { -2135869200, -2120148000, -2104419600, -2088698400, -2072970000, -2056644000, -2040915600, -2025194400, -2009466000, -1993744800, -1978016400, -1962295200, -1946566800, -1930845600, -1915117200, -1898791200, -1883667600, -1867341600, -1851613200, -1835892000, -1820163600, -1804442400, -1788714000, -1772992800, -1757264400, -1741543200, -1725814800, -1709488800, -1693760400, -1678039200, -1662310800, -1646589600, -1630861200, -1615140000, -1599411600, -1583690400, -1567962000, -1551636000, -1536512400, -1520186400, -1504458000, -1488736800, -1473008400, -1457287200, -1441558800, -1425837600, -1410109200, -1394388000, -1378659600, -1362333600, -1347210000, -1330884000, -1315155600, -1299434400, -1283706000, -1267984800, -1252256400, -1236535200, -1220806800, -1205085600, -1189357200, -1173031200, -1157302800, -1141581600, -1125853200, -1110132000, -1094403600, -1078682400, -1062954000, -1047232800, -1031504400, -1015178400, -1000054800, -983728800, -968000400, -952279200, -936550800, -920829600, -905101200, -889380000, -873651600, -857930400, -842202000, -825876000, -810147600, -794426400, -778698000, -762976800, -747248400, -731527200, -715798800, -700077600, -684349200, -668023200, -652899600, -636573600, -620845200, -605124000, -589395600, -573674400, -557946000, -542224800, -526496400, -510775200, -495046800, -478720800, -463597200, -447271200, -431542800, -415821600, -400093200, -384372000, -368643600, -352922400, -337194000, -321472800, -305744400, -289418400, -273690000, -257968800, -242240400, -226519200, -210790800, -195069600, -179341200, -163620000, -147891600, -131565600, -116442000, -100116000, -84387600, -68666400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 126687600, 154504800, 162370800, 183535200, 199263600, 215589600 } typeOffsets:intvector { -18000, 0, -18000, 3600 } - typeMap:bin { "01000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } + typeMap:bin { "010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } finalRule { "SystemV" } finalRaw:int { -18000 } finalYear:int { 1977 } @@ -2581,10 +2582,9 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -25200, 0 } } //Z#611 /* SystemV/MST7MDT */ :table { - transPre32:intvector { -1, 2096206096, -1, 2111927296, -1, 2127655696, -1, 2143376896 } trans:intvector { -2135862000, -2120140800, -2104412400, -2088691200, -2072962800, -2056636800, -2040908400, -2025187200, -2009458800, -1993737600, -1978009200, -1962288000, -1946559600, -1930838400, -1915110000, -1898784000, -1883660400, -1867334400, -1851606000, -1835884800, -1820156400, -1804435200, -1788706800, -1772985600, -1757257200, -1741536000, -1725807600, -1709481600, -1693753200, -1678032000, -1662303600, -1646582400, -1630854000, -1615132800, -1599404400, -1583683200, -1567954800, -1551628800, -1536505200, -1520179200, -1504450800, -1488729600, -1473001200, -1457280000, -1441551600, -1425830400, -1410102000, -1394380800, -1378652400, -1362326400, -1347202800, -1330876800, -1315148400, -1299427200, -1283698800, -1267977600, -1252249200, -1236528000, -1220799600, -1205078400, -1189350000, -1173024000, -1157295600, -1141574400, -1125846000, -1110124800, -1094396400, -1078675200, -1062946800, -1047225600, -1031497200, -1015171200, -1000047600, -983721600, -967993200, -952272000, -936543600, -920822400, -905094000, -889372800, -873644400, -857923200, -842194800, -825868800, -810140400, -794419200, -778690800, -762969600, -747241200, -731520000, -715791600, -700070400, -684342000, -668016000, -652892400, -636566400, -620838000, -605116800, -589388400, -573667200, -557938800, -542217600, -526489200, -510768000, -495039600, -478713600, -463590000, -447264000, -431535600, -415814400, -400086000, -384364800, -368636400, -352915200, -337186800, -321465600, -305737200, -289411200, -273682800, -257961600, -242233200, -226512000, -210783600, -195062400, -179334000, -163612800, -147884400, -131558400, -116434800, -100108800, -84380400, -68659200, -52930800, -37209600, -21481200, -5760000, 9968400, 25689600, 41418000, 57744000, 73472400, 89193600, 104922000, 120643200, 126694800, 154512000, 162378000, 183542400, 199270800, 215596800 } typeOffsets:intvector { -25200, 0, -25200, 3600 } - typeMap:bin { "01000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } + typeMap:bin { "010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } finalRule { "SystemV" } finalRaw:int { -25200 } finalYear:int { 1977 } @@ -2593,10 +2593,9 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -28800, 0 } } //Z#613 /* SystemV/PST8PDT */ :table { - transPre32:intvector { -1, 2096209696, -1, 2111930896, -1, 2127659296, -1, 2143380496 } trans:intvector { -2135858400, -2120137200, -2104408800, -2088687600, -2072959200, -2056633200, -2040904800, -2025183600, -2009455200, -1993734000, -1978005600, -1962284400, -1946556000, -1930834800, -1915106400, -1898780400, -1883656800, -1867330800, -1851602400, -1835881200, -1820152800, -1804431600, -1788703200, -1772982000, -1757253600, -1741532400, -1725804000, -1709478000, -1693749600, -1678028400, -1662300000, -1646578800, -1630850400, -1615129200, -1599400800, -1583679600, -1567951200, -1551625200, -1536501600, -1520175600, -1504447200, -1488726000, -1472997600, -1457276400, -1441548000, -1425826800, -1410098400, -1394377200, -1378648800, -1362322800, -1347199200, -1330873200, -1315144800, -1299423600, -1283695200, -1267974000, -1252245600, -1236524400, -1220796000, -1205074800, -1189346400, -1173020400, -1157292000, -1141570800, -1125842400, -1110121200, -1094392800, -1078671600, -1062943200, -1047222000, -1031493600, -1015167600, -1000044000, -983718000, -967989600, -952268400, -936540000, -920818800, -905090400, -889369200, -873640800, -857919600, -842191200, -825865200, -810136800, -794415600, -778687200, -762966000, -747237600, -731516400, -715788000, -700066800, -684338400, -668012400, -652888800, -636562800, -620834400, -605113200, -589384800, -573663600, -557935200, -542214000, -526485600, -510764400, -495036000, -478710000, -463586400, -447260400, -431532000, -415810800, -400082400, -384361200, -368632800, -352911600, -337183200, -321462000, -305733600, -289407600, -273679200, -257958000, -242229600, -226508400, -210780000, -195058800, -179330400, -163609200, -147880800, -131554800, -116431200, -100105200, -84376800, -68655600, -52927200, -37206000, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 126698400, 154515600, 162381600, 183546000, 199274400, 215600400 } typeOffsets:intvector { -28800, 0, -28800, 3600 } - typeMap:bin { "01000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } + typeMap:bin { "010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } finalRule { "SystemV" } finalRaw:int { -28800 } finalYear:int { 1977 } @@ -2605,10 +2604,9 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -32400, 0 } } //Z#615 /* SystemV/YST9YDT */ :table { - transPre32:intvector { -1, 2096213296, -1, 2111934496, -1, 2127662896, -1, 2143384096 } trans:intvector { -2135854800, -2120133600, -2104405200, -2088684000, -2072955600, -2056629600, -2040901200, -2025180000, -2009451600, -1993730400, -1978002000, -1962280800, -1946552400, -1930831200, -1915102800, -1898776800, -1883653200, -1867327200, -1851598800, -1835877600, -1820149200, -1804428000, -1788699600, -1772978400, -1757250000, -1741528800, -1725800400, -1709474400, -1693746000, -1678024800, -1662296400, -1646575200, -1630846800, -1615125600, -1599397200, -1583676000, -1567947600, -1551621600, -1536498000, -1520172000, -1504443600, -1488722400, -1472994000, -1457272800, -1441544400, -1425823200, -1410094800, -1394373600, -1378645200, -1362319200, -1347195600, -1330869600, -1315141200, -1299420000, -1283691600, -1267970400, -1252242000, -1236520800, -1220792400, -1205071200, -1189342800, -1173016800, -1157288400, -1141567200, -1125838800, -1110117600, -1094389200, -1078668000, -1062939600, -1047218400, -1031490000, -1015164000, -1000040400, -983714400, -967986000, -952264800, -936536400, -920815200, -905086800, -889365600, -873637200, -857916000, -842187600, -825861600, -810133200, -794412000, -778683600, -762962400, -747234000, -731512800, -715784400, -700063200, -684334800, -668008800, -652885200, -636559200, -620830800, -605109600, -589381200, -573660000, -557931600, -542210400, -526482000, -510760800, -495032400, -478706400, -463582800, -447256800, -431528400, -415807200, -400078800, -384357600, -368629200, -352908000, -337179600, -321458400, -305730000, -289404000, -273675600, -257954400, -242226000, -226504800, -210776400, -195055200, -179326800, -163605600, -147877200, -131551200, -116427600, -100101600, -84373200, -68652000, -52923600, -37202400, -21474000, -5752800, 9975600, 25696800, 41425200, 57751200, 73479600, 89200800, 104929200, 120650400, 126702000, 154519200, 162385200, 183549600, 199278000, 215604000 } typeOffsets:intvector { -32400, 0, -32400, 3600 } - typeMap:bin { "01000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } + typeMap:bin { "010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" } finalRule { "SystemV" } finalRaw:int { -32400 } finalYear:int { 1977 } diff --git a/icu4c/source/test/intltest/tzfmttst.cpp b/icu4c/source/test/intltest/tzfmttst.cpp index 487a5328e4bc..ddb499462346 100644 --- a/icu4c/source/test/intltest/tzfmttst.cpp +++ b/icu4c/source/test/intltest/tzfmttst.cpp @@ -616,6 +616,14 @@ void TimeZoneFormatTest::RunTimeRoundTripTests(int32_t threadNumber) { continue; } + if ((*tzid == "America/Miquelon" || *tzid == "America/Hermosillo" || *tzid == "America/Mazatlan") + && uprv_strncmp(gLocaleData->locales[locidx].getName(),"ku",2) == 0 + && uprv_strcmp(PATTERNS[patidx], "v") == 0 + && logKnownIssue("CLDR-17024", "TestTimeRoundTrip fail with tz=America/Miquelon, pattern=v, locale=ku")) { + continue; + } + + BasicTimeZone *tz = dynamic_cast(TimeZone::createTimeZone(*tzid)); sdf->setTimeZone(*tz); diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index fc9793a8e669..53e02a9e2288 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -2143,7 +2143,6 @@ void TimeZoneTest::TestCanonicalID() { {"Asia/Muscat", "Asia/Dubai"}, {"Asia/Phnom_Penh", "Asia/Bangkok"}, {"Asia/Qatar", "Asia/Bahrain"}, - {"Asia/Urumqi", "Antarctica/Vostok"}, {"Asia/Vientiane", "Asia/Bangkok"}, {"Atlantic/Jan_Mayen", "Europe/Berlin"}, {"Atlantic/Reykjavik", "Africa/Abidjan"}, diff --git a/icu4c/source/tools/tzcode/Makefile.in b/icu4c/source/tools/tzcode/Makefile.in index 4ba969f42eff..d1008426136c 100644 --- a/icu4c/source/tools/tzcode/Makefile.in +++ b/icu4c/source/tools/tzcode/Makefile.in @@ -101,7 +101,7 @@ tzorig: $(TZCODE) $(TZDATA) sed -e '/if (line ~ \/^R SystemV \/) return/s/^/#/' $(TZORIG)/zishrink.awk.orig > $(TZORIG)/zishrink.awk # -mv $(TZORIG)/Makefile $(TZORIG)/Makefile.orig # sed -e "s/^BACKWARD=.*/BACKWARD= backward pacificnew/" $(TZORIG)/Makefile.orig > $(TZORIG)/Makefile - $(MAKE) -C $@ $(TZORIG_OPTS) zdump zones + $(MAKE) -C $@ $(TZORIG_OPTS) tzdir.h zdump zones $(ZDUMPOUT): tzorig ( cd $(TZORIG) ; ./zdump$(EXEEXT) $(ZDUMP_OPTS) ) diff --git a/icu4c/source/tools/tzcode/icuzones b/icu4c/source/tools/tzcode/icuzones index 52f5698cd7b4..940b0557acc3 100644 --- a/icu4c/source/tools/tzcode/icuzones +++ b/icu4c/source/tools/tzcode/icuzones @@ -31,13 +31,24 @@ Rule SystemV 1975 only - Oct lastSun 2:00 0 S Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D Rule SystemV 1976 max - Oct lastSun 2:00 0 S +# Note: 1901 Dec 13 20:45:52u is the minimum value of int32 seconds. +# A zone with infinite "min" year rule cannot be supported by 64 bit TZif, +# so adding explicit transition to zones with SystemV rule at the minimum +# int32 seconds. + # Zone NAME GMTOFF RULES/SAVE FORMAT [UNTIL] -Zone SystemV/AST4ADT -4:00 SystemV A%sT -Zone SystemV/EST5EDT -5:00 SystemV E%sT -Zone SystemV/CST6CDT -6:00 SystemV C%sT -Zone SystemV/MST7MDT -7:00 SystemV M%sT -Zone SystemV/PST8PDT -8:00 SystemV P%sT -Zone SystemV/YST9YDT -9:00 SystemV Y%sT +Zone SystemV/AST4ADT -4:00 - AST 1901 Dec 13 20:45:52u + -4:00 SystemV A%sT +Zone SystemV/EST5EDT -5:00 - EST 1901 Dec 13 20:45:52u + -5:00 SystemV E%sT +Zone SystemV/CST6CDT -6:00 - CST 1901 Dec 13 20:45:52u + -6:00 SystemV C%sT +Zone SystemV/MST7MDT -7:00 - MST 1901 Dec 13 20:45:52u + -7:00 SystemV M%sT +Zone SystemV/PST8PDT -8:00 - PST 1901 Dec 13 20:45:52u + -8:00 SystemV P%sT +Zone SystemV/YST9YDT -9:00 - YST 1901 Dec 13 20:45:52u + -9:00 SystemV Y%sT Zone SystemV/AST4 -4:00 - AST Zone SystemV/EST5 -5:00 - EST Zone SystemV/CST6 -6:00 - CST diff --git a/icu4c/source/tools/tzcode/zdump.c b/icu4c/source/tools/tzcode/zdump.c index ebd7a5ce3245..b9cab22c021f 100644 --- a/icu4c/source/tools/tzcode/zdump.c +++ b/icu4c/source/tools/tzcode/zdump.c @@ -32,6 +32,7 @@ #define ICU #ifdef ICU +#include "tzdir.h" #include "dirent.h" #include "sys/stat.h" #endif diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java index be823588a3f3..ae42fce19f46 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java @@ -426,6 +426,13 @@ && logKnownIssue("11052", "Ambiguous zone name - Samoa Time")) { continue; } + if ((id.equals("America/Miquelon") || id.equals("America/Hermosillo") || id.equals("America/Mazatlan")) + && PATTERNS[patidx].equals("v") + && LOCALES[locidx].getName().startsWith("ku") + && logKnownIssue("CLDR-17024", "TestTimeRoundTrip fail with tz=America/Miquelon, pattern=v, locale=ku")) { + continue; + } + BasicTimeZone btz = (BasicTimeZone)TimeZone.getTimeZone(id, TimeZone.TIMEZONE_ICU); TimeZone tz = TimeZone.getTimeZone(id); sdf.setTimeZone(tz); diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/metaZones.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/metaZones.res index 910694356d23ee72d69c86dc189d213c16f75ec9..5ef9f9260465062056469200a31119a69b0d7c55 100644 GIT binary patch delta 15036 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 DOs4^E delta 15121 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 QsscYwOcQ>0e(>1me;Xr>i2wiq delta 3137 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 SZ!Hc6@nDJ*9>Lt3X8aG^4=bkt delta 7353 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 diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneTest.java index f7f87c65019d..2c6a164d2b31 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneTest.java @@ -1575,7 +1575,6 @@ public void TestCanonicalID() { {"Asia/Muscat", "Asia/Dubai"}, {"Asia/Phnom_Penh", "Asia/Bangkok"}, {"Asia/Qatar", "Asia/Bahrain"}, - {"Asia/Urumqi", "Antarctica/Vostok"}, {"Asia/Vientiane", "Asia/Bangkok"}, {"Atlantic/Jan_Mayen", "Europe/Berlin"}, {"Atlantic/Reykjavik", "Africa/Abidjan"}, diff --git a/tools/cldr/cldr-to-icu/pom.xml b/tools/cldr/cldr-to-icu/pom.xml index 1e3b959dcf14..98a4176845b6 100644 --- a/tools/cldr/cldr-to-icu/pom.xml +++ b/tools/cldr/cldr-to-icu/pom.xml @@ -83,7 +83,7 @@ com.ibm.icu icu4j - 74.1-SNAPSHOT + 75.0.1-SNAPSHOT