From 98566d759b3a87ce4a1c25631cc1ec8fdd4f4c65 Mon Sep 17 00:00:00 2001 From: Tim Parenti Date: Wed, 13 Aug 2014 13:38:47 -0400 Subject: Rename fields of Link lines for clarity. * zic.8, zoneinfo2tdf.pl: Change names of Link line fields to be more descriptive and more like the parameters of 'ln'. LINK-FROM becomes TARGET, and LINK-TO becomes LINK-NAME. * africa, asia, australasia, backward, backzone, etcetera, europe, northamerica, southamerica: Add '# Link' lines and a few '# Zone' lines where needed. * NEWS: Document this. --- NEWS | 4 ++++ africa | 3 +++ asia | 1 + australasia | 1 + backward | 1 + backzone | 8 ++++++++ etcetera | 2 ++ europe | 11 +++++++++++ northamerica | 4 +++- southamerica | 3 +++ zic.8 | 9 +++++---- zoneinfo2tdf.pl | 2 +- 12 files changed, 43 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 8cb840d..51ce694 100644 --- a/NEWS +++ b/NEWS @@ -55,6 +55,10 @@ Unreleased, experimental changes A new file CONTRIBUTING is distributed. (Thanks to Tim Parenti for suggesting a CONTRIBUTING file, and to Walter Harms for debugging it.) + The fields in Link lines have been renamed to be more descriptive + and more like the parameters of 'ln'. LINK-FROM has become TARGET, + and LINK-TO has become LINK-NAME. + tz-link.htm mentions Windows Runtime etc. (thanks to Matt Johnson) and HP-UX's tztab. diff --git a/africa b/africa index 6274125..21366ff 100644 --- a/africa +++ b/africa @@ -173,6 +173,7 @@ Zone Africa/Lubumbashi 1:49:52 - LMT 1897 Nov 9 # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Abidjan -0:16:08 - LMT 1912 0:00 - GMT +# Link TARGET LINK-NAME Link Africa/Abidjan Africa/Bamako # Mali Link Africa/Abidjan Africa/Banjul # Gambia Link Africa/Abidjan Africa/Conakry # Guinea @@ -1001,6 +1002,7 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Lagos 0:13:36 - LMT 1919 Sep 1:00 - WAT +# Link TARGET LINK-NAME Link Africa/Lagos Africa/Bangui # Central African Republic Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo Link Africa/Lagos Africa/Douala # Cameroon @@ -1101,6 +1103,7 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 3:00 - EAT # South Sudan +# Link TARGET LINK-NAME Link Africa/Khartoum Africa/Juba # Swaziland diff --git a/asia b/asia index e07e9d0..827afbc 100644 --- a/asia +++ b/asia @@ -795,6 +795,7 @@ Zone Asia/Nicosia 2:13:28 - LMT 1921 Nov 14 # Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72. # However, for various reasons many users expect to find it under Europe. +# Link TARGET LINK-NAME Link Asia/Nicosia Europe/Nicosia # Georgia diff --git a/australasia b/australasia index e41162d..1272d6c 100644 --- a/australasia +++ b/australasia @@ -470,6 +470,7 @@ Zone Pacific/Chatham 12:13:48 - LMT 1868 Nov 2 12:15 - CHAST 1946 Jan 1 12:45 Chatham CHA%sT +# Link TARGET LINK-NAME Link Pacific/Auckland Antarctica/McMurdo # Auckland Is diff --git a/backward b/backward index 36f6aba..d7d9e2e 100644 --- a/backward +++ b/backward @@ -4,6 +4,7 @@ # This file provides links between current names for time zones # and their old names. Many names changed in late 1993. +# Link TARGET LINK-NAME Link Africa/Asmara Africa/Asmera Link Africa/Abidjan Africa/Timbuktu Link America/Argentina/Catamarca America/Argentina/ComodRivadavia diff --git a/backzone b/backzone index bd6b48b..22cf4db 100644 --- a/backzone +++ b/backzone @@ -39,6 +39,7 @@ # commentary and rules associated with the entry. # Mali (southern) +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Bamako -0:32:00 - LMT 1912 0:00 - GMT 1934 Feb 26 -1:00 - WAT 1960 Jun 20 @@ -84,6 +85,7 @@ Rule SL 1935 1942 - Jun 1 0:00 0:40 SLST Rule SL 1935 1942 - Oct 1 0:00 0 WAT Rule SL 1957 1962 - Jun 1 0:00 1:00 SLST Rule SL 1957 1962 - Sep 1 0:00 0 GMT +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Freetown -0:53:00 - LMT 1882 -0:53:00 - FMT 1913 Jun # Freetown Mean Time -1:00 SL %s 1957 @@ -166,6 +168,7 @@ Zone America/Anguilla -4:12:16 - LMT 1912 Mar 2 # Chubut, Argentina # The name "Comodoro Rivadavia" exceeds the 14-byte POSIX limit. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Argentina/ComodRivadavia -4:30:00 - LMT 1894 Oct 31 -4:16:48 - CMT 1920 May -4:00 - ART 1930 Dec @@ -261,6 +264,7 @@ Link Antarctica/McMurdo Antarctica/South_Pole # China # Changbai Time ("Long-white Time", Long-white = Heilongjiang area) # Heilongjiang (except Mohe county), Jilin +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Harbin 8:26:44 - LMT 1928 # or Haerbin 8:30 - CHAT 1932 Mar # Changbai Time 8:00 - CST 1940 @@ -277,9 +281,11 @@ Zone Asia/Harbin 8:26:44 - LMT 1928 # or Haerbin Zone Asia/Chongqing 7:06:20 - LMT 1928 # or Chungking 7:00 - LONT 1980 May # Long-shu Time 8:00 PRC C%sT +# Link TARGET LINK-NAME Link Asia/Chongqing Asia/Chungking # far west China +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Kashgar 5:03:56 - LMT 1928 # or Kashi or Kaxgar 5:30 - KAST 1940 # Kashgar Time 5:00 - KAST 1980 May @@ -300,6 +306,7 @@ Zone Atlantic/St_Helena -0:22:48 - LMT 1890 # Jamestown 0:00 - GMT # Northern Ireland +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Belfast -0:23:40 - LMT 1880 Aug 2 -0:25:21 - DMT 1916 May 21 2:00 # DMT = Dublin/Dunsink MT @@ -406,4 +413,5 @@ Zone Europe/Zagreb 1:03:52 - LMT 1884 1:00 EU CE%sT # US minor outlying islands +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Johnston -10:00 - HST diff --git a/etcetera b/etcetera index c2e2532..00687a8 100644 --- a/etcetera +++ b/etcetera @@ -16,6 +16,8 @@ Zone Etc/UCT 0 - UCT # but it belongs here, not in the file 'backward', # as functions like gmtime load the "GMT" file to handle leap seconds properly. # We want this to work even on installations that omit the other older names. +# +# Link TARGET LINK-NAME Link Etc/GMT GMT Link Etc/UTC Etc/Universal diff --git a/europe b/europe index 248e304..2a6d3ba 100644 --- a/europe +++ b/europe @@ -455,9 +455,11 @@ Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00s 1:00 - BST 1971 Oct 31 2:00u 0:00 GB-Eire %s 1996 0:00 EU GMT/BST +# Link TARGET LINK-NAME Link Europe/London Europe/Jersey Link Europe/London Europe/Guernsey Link Europe/London Europe/Isle_of_Man +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Dublin -0:25:00 - LMT 1880 Aug 2 -0:25:21 - DMT 1916 May 21 2:00 -0:25:21 1:00 IST 1916 Oct 1 2:00s @@ -1120,6 +1122,7 @@ Zone Europe/Helsinki 1:39:49 - LMT 1878 May 31 2:00 EU EE%sT # Åland Is +# Link TARGET LINK-NAME Link Europe/Helsinki Europe/Mariehamn @@ -1271,6 +1274,7 @@ Zone Europe/Berlin 0:53:28 - LMT 1893 Apr # From Arthur David Olson (2012-03-03): # Büsingen and Zurich have shared clocks since 1970. +# Link TARGET LINK-NAME Link Europe/Zurich Europe/Busingen # Georgia @@ -1495,6 +1499,7 @@ Zone Europe/Rome 0:49:56 - LMT 1866 Sep 22 1:00 Italy CE%sT 1980 1:00 EU CE%sT +# Link TARGET LINK-NAME Link Europe/Rome Europe/Vatican Link Europe/Rome Europe/San_Marino @@ -1595,6 +1600,7 @@ Zone Europe/Riga 1:36:34 - LMT 1880 # From a report of the duke's government to the high council, # regarding the introduction of a time law, of 31 May 1977. +# Link TARGET LINK-NAME Link Europe/Zurich Europe/Vaduz @@ -1911,6 +1917,8 @@ Zone Europe/Oslo 0:43:00 - LMT 1895 Jan 1 # # All these events predate our cutoff date of 1970, so use Europe/Oslo # for these regions. + +# Link TARGET LINK-NAME Link Europe/Oslo Arctic/Longyearbyen # Poland @@ -2823,6 +2831,7 @@ Zone Europe/Belgrade 1:22:00 - LMT 1884 # Shanks & Pottenger don't give as much detail, so go with Koželj. 1:00 - CET 1982 Nov 27 1:00 EU CE%sT +# Link TARGET LINK-NAME Link Europe/Belgrade Europe/Ljubljana # Slovenia Link Europe/Belgrade Europe/Podgorica # Montenegro Link Europe/Belgrade Europe/Sarajevo # Bosnia and Herzegovina @@ -2830,6 +2839,7 @@ Link Europe/Belgrade Europe/Skopje # Macedonia Link Europe/Belgrade Europe/Zagreb # Croatia # Slovakia +# Link TARGET LINK-NAME Link Europe/Prague Europe/Bratislava # Slovenia @@ -3185,6 +3195,7 @@ Zone Europe/Istanbul 1:55:52 - LMT 1880 2:00 EU EE%sT 2014 Mar 30 1:00u 2:00 - EET 2014 Mar 31 1:00u 2:00 EU EE%sT +# Link TARGET LINK-NAME Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. # Ukraine diff --git a/northamerica b/northamerica index baa309d..9546989 100644 --- a/northamerica +++ b/northamerica @@ -589,6 +589,7 @@ Zone America/Adak 12:13:21 - LMT 1867 Oct 18 # Note that 1933-05-21 was a Sunday. # We're left to guess the time of day when Act 163 was approved; guess noon. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00 # Schmitt&Cox -10:30 - HST 1933 Apr 30 2:00 # Laws 1933 -10:30 1:00 HDT 1933 May 21 12:00 # Laws 1933+12 @@ -596,7 +597,7 @@ Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00 # Schmitt&Cox -10:30 1:00 HDT 1945 Sep 30 2:00 # Schmitt&Cox+2 -10:30 - HST 1947 Jun 8 2:00 # Schmitt&Cox+2 -10:00 - HST - +# Link TARGET LINK-NAME Link Pacific/Honolulu Pacific/Johnston # Now we turn to US areas that have diverged from the consensus since 1970. @@ -622,6 +623,7 @@ Link Pacific/Honolulu Pacific/Johnston # Shanks says the 1944 experiment came to an end on 1944-03-17. # Go with the Arizona State Library instead. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 11:31:42 -7:00 US M%sT 1944 Jan 1 0:01 -7:00 - MST 1944 Apr 1 0:01 diff --git a/southamerica b/southamerica index 53db706..4d53f8c 100644 --- a/southamerica +++ b/southamerica @@ -605,6 +605,7 @@ Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31 -3:00 - ART # Aruba +# Link TARGET LINK-NAME Link America/Curacao America/Aruba # Bolivia @@ -1312,6 +1313,7 @@ Zone America/Curacao -4:35:47 - LMT 1912 Feb 12 # Willemstad # The name "Lower Prince's Quarter" is both longer than fourteen characters # and contains an apostrophe; use "Lower_Princes" below. +# Link TARGET LINK-NAME Link America/Curacao America/Lower_Princes # Sint Maarten Link America/Curacao America/Kralendijk # Caribbean Netherlands @@ -1595,6 +1597,7 @@ Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2 -4:00 - AST # These all agree with Trinidad and Tobago since 1970. +# Link TARGET LINK-NAME Link America/Port_of_Spain America/Anguilla Link America/Port_of_Spain America/Dominica Link America/Port_of_Spain America/Grenada diff --git a/zic.8 b/zic.8 index 2e5318a..2bca284 100644 --- a/zic.8 +++ b/zic.8 @@ -398,7 +398,7 @@ A link line has the form .nf .ti +.5i .ta \w'Link\0\0'u +\w'Europe/Istanbul\0\0'u -Link LINK-FROM LINK-TO +Link TARGET LINK-NAME .sp For example: .sp @@ -407,12 +407,12 @@ Link Europe/Istanbul Asia/Istanbul .sp .fi The -.B LINK-FROM +.B TARGET field should appear as the .B NAME field in some zone line. The -.B LINK-TO +.B LINK-NAME field is used as an alternate name for that zone; it has the same syntax as a zone line's .B NAME @@ -503,12 +503,13 @@ Zone Europe/Zurich 0:34:08 \*- LMT 1853 Jul 16 1:00 Swiss CE%sT 1981 1:00 EU CE%sT .sp +.ta \w'# Link\0\0'u +\w'Europe/Zurich\0\0'u +\w'NAME\0\0'u +# Link TARGET LINK-NAME Link Europe/Zurich Switzerland .sp .in .fi In this example, the zone is named Europe/Zurich but it has an alias - as Switzerland. This example says that Zurich was 34 minutes and 8 seconds west of UT until 1853-07-16 at 00:00, when the legal offset was changed to 7\(de\|26\(fm\|22.50\(sd; although this works out to diff --git a/zoneinfo2tdf.pl b/zoneinfo2tdf.pl index c01d11a..e05ec01 100755 --- a/zoneinfo2tdf.pl +++ b/zoneinfo2tdf.pl @@ -40,7 +40,7 @@ while (<>) { # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @fields == 10 or warn "bad rule line"; } elsif ($type eq 'link') { - # Link LINK-FROM LINK-TO + # Link TARGET LINK-NAME @fields == 3 or warn "bad link line"; } elsif ($type eq 'leap') { # Leap YEAR MONTH DAY HH:MM:SS CORR R/S -- 1.7.9