From a457c170da6b772fa1c12fcff342668b75472726 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 31 Jul 2014 21:28:12 -0700 Subject: [PATCH 2/2] Revert almost all the zone-to-link changes, keeping only west Africa. This should better address concerns about large-scale changes. We can do the rest of these changes later, as they're not urgent. * backward (Africa/Asmera, Asia/Saigon): Restore old links. * checktab.awk (tztab): Handle zones that should probably be turned into links some day. * africa (Africa/Luanda, Africa/Porto-Novo, Africa/Gaborone) (Africa/Bujumbura, Africa/Douala, Africa/Bangui, Indian/Comoro) (Africa/Kinshasa, Africa/Lubumbashi, Africa/Brazzaville) (Africa/Djibouti, Africa/Malabo, Africa/Asmara, Africa/Addis_Ababa) (Africa/Libreville, Africa/Maseru, Indian/Antananarivo) (Africa/Blantyre, Indian/Mayotte, Africa/Niamey, Africa/Kigali) (Africa/Mogadishu, Africa/Mbabane, Africa/Dar_es_Salaam) (Africa/Kampala, Africa/Lusaka, Africa/Harare): * asia (Asia/Bahrain, Asia/Phnom_Penh, Asia/Kuwait) (Asia/Vientiane, Asia/Muscat, Asia/Ho_Chi_Minh, Asia/Aden): * australasia (Pacific/Saipan, Pacific/Midway): * northamerica, southamerica (America/Antigua, America/Cayman): New zones, restoring 2014e data. Corresponding links removed. * NEWS: Document the above. --- NEWS | 21 +++----- africa | 170 +++++++++++++++++++++++++++++++++++++++-------------------- asia | 67 ++++++++++++++++------- australasia | 16 ++++-- backward | 4 +- checktab.awk | 43 +++++++++++++++ northamerica | 12 ++++- southamerica | 1 - 8 files changed, 234 insertions(+), 100 deletions(-) diff --git a/NEWS b/NEWS index 3c0c374..4997cf7 100644 --- a/NEWS +++ b/NEWS @@ -67,21 +67,12 @@ Unreleased, experimental changes Some zones have been turned into links, when they differed from existing zones only for older UTC offsets where the data were likely invented. These changes affect UTC offsets in pre-1970 time stamps only. This is - similar to the change in release 2013e, except this time for Africa, Asia, - and a few other locations. The affected zones are: Africa/Addis_Ababa, - Africa/Asmara, Africa/Bamako, Africa/Bangui, Africa/Banjul, - Africa/Blantyre, Africa/Brazzaville, Africa/Bujumbura, Africa/Conakry, - Africa/Dakar, Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Douala, - Africa/Freetown, Africa/Gaborone, Africa/Harare, Africa/Kampala, - Africa/Kigali, Africa/Kinshasa, Africa/Libreville, Africa/Lome, - Africa/Luanda, Africa/Lubumbashi, Africa/Lusaka, Africa/Malabo, - Africa/Maseru, Africa/Mbabane, Africa/Mogadishu, Africa/Niamey, - Africa/Nouakchott, Africa/Ouagadougou, Africa/Porto-Novo, Africa/Sao_Tome, - America/Antigua, America/Cayman, Asia/Aden, Asia/Bahrain, - Asia/Ho_Chi_Minh, Asia/Kuwait, Asia/Muscat, Asia/Phnom_Penh, - Asia/Vientiane, Atlantic/St_Helena, Indian/Antananarivo, Indian/Comoro, - Indian/Mayotte, Pacific/Midway, and Pacific/Saipan. (Thanks to Alan - Barrett, Tim Parenti, and David Patte for reporting bugs in earlier + similar to the change in release 2013e, except this time for western + Africa. The affected zones are: Africa/Bamako, Africa/Banjul, + Africa/Conakry, Africa/Dakar, Africa/Freetown, Africa/Lome, + Africa/Nouakchott, Africa/Ouagadougou, Africa/Sao_Tome, and + Atlantic/St_Helena. (Thanks to Alan Barrett, Stephen Colebourne, + Tim Parenti, and David Patte for reporting problems in earlier versions of this change.) Asia/Shanghai's pre-standard-time UT offset has been changed from diff --git a/africa b/africa index d323cb3..4ace7e9 100644 --- a/africa +++ b/africa @@ -64,6 +64,7 @@ # 3:00 CAST Central Africa Summer Time (no longer used) # 3:00 SAST South Africa Summer Time (no longer used) # 3:00 EAT East Africa Time +# 4:00 EAST East Africa Summer Time (no longer used) # Algeria # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -104,21 +105,43 @@ Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01 1:00 - CET # Angola +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Luanda 0:52:56 - LMT 1892 + 0:52:04 - AOT 1911 May 26 # Angola Time + 1:00 - WAT + # Benin -# See Africa/Lagos. +# Whitman says they switched to 1:00 in 1946, not 1934; +# go with Shanks & Pottenger. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Porto-Novo 0:10:28 - LMT 1912 + 0:00 - GMT 1934 Feb 26 + 1:00 - WAT # Botswana -# Milne says they were regulated by the Cape Town Signal in 1899. -# See Africa/Maputo. +# From Paul Eggert (2013-02-21): +# Milne says they were regulated by the Cape Town Signal in 1899; +# assume they switched to 2:00 when Cape Town did. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Gaborone 1:43:40 - LMT 1885 + 1:30 - SAST 1903 Mar + 2:00 - CAT 1943 Sep 19 2:00 + 2:00 1:00 CAST 1944 Mar 19 2:00 + 2:00 - CAT # Burkina Faso # See Africa/Abidjan. # Burundi -# See Africa/Maputo. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Bujumbura 1:57:28 - LMT 1890 + 2:00 - CAT # Cameroon -# See Africa/Lagos. +# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Douala 0:38:48 - LMT 1912 + 1:00 - WAT # Cape Verde # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -129,7 +152,9 @@ Zone Atlantic/Cape_Verde -1:34:04 - LMT 1907 # Praia -1:00 - CVT # Central African Republic -# See Africa/Lagos. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Bangui 1:14:20 - LMT 1912 + 1:00 - WAT # Chad # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -139,14 +164,21 @@ Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena 1:00 - WAT # Comoros -# See Africa/Nairobi. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro + 3:00 - EAT # Democratic Republic of Congo -# See Africa/Lagos for the western part of the country. -# See Africa/Maputo for the eastern part of the country. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Kinshasa 1:01:12 - LMT 1897 Nov 9 + 1:00 - WAT +Zone Africa/Lubumbashi 1:49:52 - LMT 1897 Nov 9 + 2:00 - CAT # Republic of the Congo -# See Africa/Lagos. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Brazzaville 1:01:08 - LMT 1912 + 1:00 - WAT # Côte D'Ivoire / Ivory Coast # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -164,7 +196,9 @@ Link Africa/Abidjan Africa/Sao_Tome # São Tomé and Príncipe Link Africa/Abidjan Atlantic/St_Helena # St Helena # Djibouti -# See Africa/Nairobi. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul + 3:00 - EAT ############################################################################### @@ -374,13 +408,20 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct 2:00 Egypt EE%sT # Equatorial Guinea -# See Africa/Lagos. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Malabo 0:35:08 - LMT 1912 + 0:00 - GMT 1963 Dec 15 + 1:00 - WAT # Eritrea -# See Africa/Nairobi. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Asmara 2:35:32 - LMT 1870 + 2:35:32 - AMT 1890 # Asmara Mean Time + 2:35:20 - ADMT 1936 May 5 # Adis Dera MT + 3:00 - EAT # Ethiopia -# From Paul Eggert (2014-07-09): +# From Paul Eggert (2014-07-31): # Like the Swahili of Kenya and Tanzania, many Ethiopians keep a # 12-hour clock starting at our 06:00, so their "8 o'clock" is our # 02:00 or 14:00. Keep this in mind when you ask the time in Amharic. @@ -388,13 +429,16 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct # Shanks & Pottenger write that Ethiopia had six narrowly-spaced time # zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in # 1890, and that they switched to 3:00 on 1936-05-05. Perhaps 38E50 -# was for Adis Dera. Ignore this for now as it predates our 1970 -# cutoff, and it's quite likely wrong anyway. -# -# See Africa/Nairobi. +# was for Adis Dera. Quite likely the Shanks data are wrong anyway. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Addis_Ababa 2:34:48 - LMT 1870 + 2:35:20 - ADMT 1936 May 5 # Adis Dera MT + 3:00 - EAT # Gabon -# See Africa/Lagos. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Libreville 0:37:48 - LMT 1912 + 1:00 - WAT # Gambia # See Africa/Abidjan. @@ -429,18 +473,13 @@ Zone Africa/Nairobi 2:27:16 - LMT 1928 Jul 2:30 - BEAT 1940 2:45 - BEAUT 1960 3:00 - EAT -Link Africa/Nairobi Africa/Addis_Ababa # Ethiopia -Link Africa/Nairobi Africa/Asmara # Eritrea -Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania -Link Africa/Nairobi Africa/Djibouti -Link Africa/Nairobi Africa/Kampala # Uganda -Link Africa/Nairobi Africa/Mogadishu # Somalia -Link Africa/Nairobi Indian/Antananarivo # Madagascar -Link Africa/Nairobi Indian/Comoro -Link Africa/Nairobi Indian/Mayotte # Lesotho -# See Africa/Johannesburg. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Maseru 1:50:00 - LMT 1903 Mar + 2:00 - SAST 1943 Sep 19 2:00 + 2:00 1:00 SAST 1944 Mar 19 2:00 + 2:00 - SAST # Liberia # From Paul Eggert (2006-03-22): @@ -515,10 +554,16 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 2:00 - EET # Madagascar -# See Africa/Nairobi. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Indian/Antananarivo 3:10:04 - LMT 1911 Jul + 3:00 - EAT 1954 Feb 27 23:00s + 3:00 1:00 EAST 1954 May 29 23:00s + 3:00 - EAT # Malawi -# See Africa/Maputo. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Blantyre 2:20:00 - LMT 1903 Mar + 2:00 - CAT # Mali # Mauritania @@ -619,7 +664,8 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # Mayotte # Zone NAME GMTOFF RULES FORMAT [UNTIL] -# See Africa/Nairobi. +Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou + 3:00 - EAT # Morocco # See the 'europe' file for Spanish Morocco (Africa/Ceuta). @@ -920,13 +966,6 @@ Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Maputo 2:10:20 - LMT 1903 Mar 2:00 - CAT -Link Africa/Maputo Africa/Blantyre # Malawi -Link Africa/Maputo Africa/Bujumbura # Burundi -Link Africa/Maputo Africa/Gaborone # Botswana -Link Africa/Maputo Africa/Harare # Zimbabwe -Link Africa/Maputo Africa/Kigali # Rwanda -Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo -Link Africa/Maputo Africa/Lusaka # Zambia # Namibia # The 1994-04-03 transition is from Shanks & Pottenger. @@ -958,21 +997,16 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 1:00 Namibia WA%sT # Niger -# See Africa/Lagos. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Niamey 0:08:28 - LMT 1912 + -1:00 - WAT 1934 Feb 26 + 0:00 - GMT 1960 + 1:00 - WAT # Nigeria # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Lagos 0:13:36 - LMT 1919 Sep 1:00 - WAT -Link Africa/Lagos Africa/Bangui # Central African Republic -Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo -Link Africa/Lagos Africa/Douala # Cameroon -Link Africa/Lagos Africa/Kinshasa # W Dem. Rep. of the Congo -Link Africa/Lagos Africa/Libreville # Gabon -Link Africa/Lagos Africa/Luanda # Angola -Link Africa/Lagos Africa/Malabo # Equatorial Guinea -Link Africa/Lagos Africa/Niamey # Niger -Link Africa/Lagos Africa/Porto-Novo # Benin # Réunion # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -994,7 +1028,9 @@ Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis # Tromelin - inhabited until at least 1958 # Rwanda -# See Africa/Maputo. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Kigali 2:00:16 - LMT 1935 Jun + 2:00 - CAT # St Helena # See Africa/Abidjan. @@ -1024,7 +1060,11 @@ Zone Indian/Mahe 3:41:48 - LMT 1906 Jun # Victoria # See Africa/Abidjan. # Somalia -# See Africa/Nairobi. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Mogadishu 3:01:28 - LMT 1893 Nov + 3:00 - EAT 1931 + 2:30 - BEAT 1957 + 3:00 - EAT # South Africa # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -1034,9 +1074,6 @@ Rule SA 1943 1944 - Mar Sun>=15 2:00 0 - Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8 1:30 - SAST 1903 Mar 2:00 SA SAST -Link Africa/Johannesburg Africa/Maseru # Lesotho -Link Africa/Johannesburg Africa/Mbabane # Swaziland -# # Marion and Prince Edward Is # scientific station since 1947 # no information @@ -1064,10 +1101,16 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 Link Africa/Khartoum Africa/Juba # Swaziland -# See Africa/Johannesburg. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar + 2:00 - SAST # Tanzania -# See Africa/Nairobi. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Dar_es_Salaam 2:37:08 - LMT 1931 + 3:00 - EAT 1948 + 2:45 - BEAUT 1961 + 3:00 - EAT # Togo # See Africa/Abidjan. @@ -1173,8 +1216,19 @@ Zone Africa/Tunis 0:40:44 - LMT 1881 May 12 1:00 Tunisia CE%sT # Uganda -# See Africa/Nairobi. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Kampala 2:09:40 - LMT 1928 Jul + 3:00 - EAT 1930 + 2:30 - BEAT 1948 + 2:45 - BEAUT 1957 + 3:00 - EAT # Zambia +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Lusaka 1:53:08 - LMT 1903 Mar + 2:00 - CAT + # Zimbabwe -# See Africa/Maputo. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Africa/Harare 2:04:12 - LMT 1903 Mar + 2:00 - CAT diff --git a/asia b/asia index 5ee4522..0b858c9 100644 --- a/asia +++ b/asia @@ -140,7 +140,10 @@ Zone Asia/Baku 3:19:24 - LMT 1924 May 2 4:00 Azer AZ%sT # Bahrain -# See Asia/Qatar. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Asia/Bahrain 3:22:20 - LMT 1920 # Manamah + 4:00 - GST 1972 Jun + 3:00 - AST # Bangladesh # From Alexander Krivenyshev (2009-05-13): @@ -263,8 +266,12 @@ Zone Asia/Rangoon 6:24:40 - LMT 1880 # or Yangon 6:30 - MMT # Myanmar Time # Cambodia -# See Asia/Bangkok. - +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Asia/Phnom_Penh 6:59:40 - LMT 1906 Jun 9 + 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT? + 7:00 - ICT 1912 May + 8:00 - ICT 1931 May + 7:00 - ICT # China @@ -1690,10 +1697,17 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1890 ############################################################################### # Kuwait -# See Asia/Riyadh. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Asia/Kuwait 3:11:56 - LMT 1950 + 3:00 - AST # Laos -# See Asia/Bangkok. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Asia/Vientiane 6:50:24 - LMT 1906 Jun 9 # or Viangchan + 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT? + 7:00 - ICT 1912 May + 8:00 - ICT 1931 May + 7:00 - ICT # Lebanon # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -1910,7 +1924,12 @@ Zone Asia/Kathmandu 5:41:16 - LMT 1920 5:45 - NPT # Nepal Time # Oman -# See Asia/Dubai. + +# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory. + +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Asia/Muscat 3:54:24 - LMT 1920 + 4:00 - GST # Pakistan @@ -2410,7 +2429,6 @@ Zone Asia/Manila -15:56:00 - LMT 1844 Dec 31 Zone Asia/Qatar 3:26:08 - LMT 1920 # Al Dawhah / Doha 4:00 - GST 1972 Jun 3:00 - AST -Link Asia/Qatar Asia/Bahrain # Saudi Arabia # @@ -2437,8 +2455,6 @@ Link Asia/Qatar Asia/Bahrain # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Riyadh 3:06:52 - LMT 1947 Mar 14 3:00 - AST -Link Asia/Riyadh Asia/Aden # Yemen -Link Asia/Riyadh Asia/Kuwait # Singapore # The data here are taken from Mok Ly Yng (2003-10-30) @@ -2711,12 +2727,6 @@ Zone Asia/Dushanbe 4:35:12 - LMT 1924 May 2 Zone Asia/Bangkok 6:42:04 - LMT 1880 6:42:04 - BMT 1920 Apr # Bangkok Mean Time 7:00 - ICT -# From Arthur David Olson (2008-03-18): -# The English-language name of Vietnam's most populous city is "Ho Chi Minh -# City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters. -Link Asia/Bangkok Asia/Ho_Chi_Minh # Vietnam -Link Asia/Bangkok Asia/Phnom_Penh # Cambodia -Link Asia/Bangkok Asia/Vientiane # Laos # Turkmenistan # From Shanks & Pottenger. @@ -2732,7 +2742,6 @@ Zone Asia/Ashgabat 3:53:32 - LMT 1924 May 2 # or Ashkhabad # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Dubai 3:41:12 - LMT 1920 4:00 - GST -Link Asia/Dubai Asia/Muscat # Oman # Uzbekistan # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -2753,8 +2762,30 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 5:00 - UZT # Vietnam -# See Asia/Bangkok. +# From Paul Eggert (2013-02-21): +# Milne gives 7:16:56 for the meridian of Saigon in 1899, as being +# used in Lower Laos, Cambodia, and Annam. But this is quite a ways +# from Saigon's location. For now, ignore this and stick with Shanks +# and Pottenger. + +# From Arthur David Olson (2008-03-18): +# The English-language name of Vietnam's most populous city is "Ho Chi Minh +# City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters. + +# From Shanks & Pottenger: +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Asia/Ho_Chi_Minh 7:06:40 - LMT 1906 Jun 9 + 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT? + 7:00 - ICT 1912 May + 8:00 - ICT 1931 May + 7:00 - ICT # Yemen -# See Asia/Riyadh. + +# Milne says 2:59:54 was the meridian of the saluting battery at Aden, +# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia. + +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Asia/Aden 2:59:54 - LMT 1950 + 3:00 - AST diff --git a/australasia b/australasia index 72116ff..4911e8d 100644 --- a/australasia +++ b/australasia @@ -366,7 +366,6 @@ Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31 9:39:00 - LMT 1901 # Agana 10:00 - GST 2000 Dec 23 # Guam 10:00 - ChST # Chamorro Standard Time -Link Pacific/Guam Pacific/Saipan # N Mariana Is # Kiribati # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -382,7 +381,12 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901 14:00 - LINT # N Mariana Is -# See Pacific/Guam. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Pacific/Saipan -14:17:00 - LMT 1844 Dec 31 + 9:43:00 - LMT 1901 + 9:00 - MPT 1969 Oct # N Mariana Is Time + 10:00 - MPT 2000 Dec 23 + 10:00 - ChST # Chamorro Standard Time # Marshall Is # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -528,7 +532,6 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5 -11:00 - NST 1967 Apr # N=Nome -11:00 - BST 1983 Nov 30 # B=Bering -11:00 - SST # S=Samoa -Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands # Samoa (formerly and also known as Western Samoa) @@ -721,7 +724,12 @@ Zone Pacific/Funafuti 11:56:52 - LMT 1901 # Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I. H.L.T. Ar. 5:30P Sun. # " 3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A " # -# See Pacific/Pago_Pago. +Zone Pacific/Midway -11:49:28 - LMT 1901 + -11:00 - NST 1956 Jun 3 + -11:00 1:00 NDT 1956 Sep 2 + -11:00 - NST 1967 Apr # N=Nome + -11:00 - BST 1983 Nov 30 # B=Bering + -11:00 - SST # S=Samoa # Palmyra # uninhabited since World War II; was probably like Pacific/Kiritimati diff --git a/backward b/backward index 7d84bfb..36f6aba 100644 --- a/backward +++ b/backward @@ -4,7 +4,7 @@ # This file provides links between current names for time zones # and their old names. Many names changed in late 1993. -Link Africa/Nairobi Africa/Asmera +Link Africa/Asmara Africa/Asmera Link Africa/Abidjan Africa/Timbuktu Link America/Argentina/Catamarca America/Argentina/ComodRivadavia Link America/Adak America/Atka @@ -33,7 +33,7 @@ Link Asia/Shanghai Asia/Harbin Link Asia/Urumqi Asia/Kashgar Link Asia/Kathmandu Asia/Katmandu Link Asia/Macau Asia/Macao -Link Asia/Bangkok Asia/Saigon +Link Asia/Ho_Chi_Minh Asia/Saigon Link Asia/Jerusalem Asia/Tel_Aviv Link Asia/Thimphu Asia/Thimbu Link Asia/Makassar Asia/Ujung_Pandang diff --git a/checktab.awk b/checktab.awk index cf2c726..17f29bb 100644 --- a/checktab.awk +++ b/checktab.awk @@ -12,6 +12,49 @@ BEGIN { # A special (and we hope temporary) case. tztab["America/Montreal"] = 1 + # Some more special cases; these are zones that should probably + # be turned into links. + if (zone_table == "zone1970.tab") { + tztab["Africa/Addis_Ababa"] = 1 + tztab["Africa/Asmara"] = 1 + tztab["Africa/Bangui"] = 1 + tztab["Africa/Blantyre"] = 1 + tztab["Africa/Brazzaville"] = 1 + tztab["Africa/Bujumbura"] = 1 + tztab["Africa/Dar_es_Salaam"] = 1 + tztab["Africa/Djibouti"] = 1 + tztab["Africa/Douala"] = 1 + tztab["Africa/Gaborone"] = 1 + tztab["Africa/Harare"] = 1 + tztab["Africa/Kampala"] = 1 + tztab["Africa/Kigali"] = 1 + tztab["Africa/Kinshasa"] = 1 + tztab["Africa/Libreville"] = 1 + tztab["Africa/Luanda"] = 1 + tztab["Africa/Lubumbashi"] = 1 + tztab["Africa/Lusaka"] = 1 + tztab["Africa/Malabo"] = 1 + tztab["Africa/Maseru"] = 1 + tztab["Africa/Mbabane"] = 1 + tztab["Africa/Mogadishu"] = 1 + tztab["Africa/Niamey"] = 1 + tztab["Africa/Porto-Novo"] = 1 + tztab["America/Antigua"] = 1 + tztab["America/Cayman"] = 1 + tztab["Asia/Aden"] = 1 + tztab["Asia/Bahrain"] = 1 + tztab["Asia/Ho_Chi_Minh"] = 1 + tztab["Asia/Kuwait"] = 1 + tztab["Asia/Muscat"] = 1 + tztab["Asia/Phnom_Penh"] = 1 + tztab["Asia/Vientiane"] = 1 + tztab["Indian/Antananarivo"] = 1 + tztab["Indian/Comoro"] = 1 + tztab["Indian/Mayotte"] = 1 + tztab["Pacific/Midway"] = 1 + tztab["Pacific/Saipan"] = 1 + } + while (getline