- tz - lists.iana.org

a patch for zic.c to allow 'follow rules'
by Alois Treindl Sept. 10, 2013

Sept. 10, 2013

Dear Arthur, I have been preparing a small modification for zic.c which will allow it to understand a 'follow rule' in zone files, like this: # experimental table for Geneva, to test the 'follow' mechanism Zone Europe/Geneva 0:24:37 - LMT 1848 Sep 12 0:24:37 - GET 1894 Jun # Geneva MTime 0 follow Europe/Zurich For test purposes, one can simply insert this zone in the europe file. The feature is helpful in the extension of tzdata to cover complete timezone history. For this purpose, about 1000 additional zone files need to be written, and to be maintained. The process to do so has started in the astrological community, as it needs a complete pre-1970 timezone history. I will not bother you with details. I intend to help creating and maintaining a set of files like 'europe_hist', 'asia_hist' etc which contain the additional zones. The 'follow rule' will allow to keep these extra zone files very small, as usually the additional zones will all have a cross-over moment into a regular tzdata zone. I have for the moment called the modified zic source file zicx.c and prepared a patch file for zic.c to implement the 'follow rule' feature. I have tried to keep the modification very small. Please have a look at the patch, and check for the errors I have probably made. Description of the code: ------------------------ The follow rule must be the last line in a zone, and recursion is not allowed. It is parsed in inzsub() which reacts on GMTOFF = 0 and the word 'follow' in the RULE field. The zone line is stored in zones[] with a special value z_gmtoff = FOLLOW_MARK and the zone_name to follow in field z_rule (which is abused for this purpose). Before the call to outzone() the two sets of zone lines are patched together in a temporary array, so that outzone() and all functions deeper down() need not be modified. Patch ----- --- zic.c 2011-03-09 20:41:27.000000000 +0100 +++ zicx.c 2011-08-25 16:09:04.000000000 +0200 @@ -262,6 +262,17 @@ static int typecnt; #define YR_MAXIMUM 1 #define YR_ONLY 2 +/* +** follow rules, added by Alois Treindl August 2011 +** Zones may end with a line: 0 follow zone_name +** which the parser will represent with FOLLOW_MARK in z_gmtoff, +** and the zone name in z_rule. +** Before the call to outzone() the zone and its follow zone will be +** patched together, so that outzone() sees a regular zone array. +** To keep zone files readable, follow rules cannot be used recursively. +*/ +#define FOLLOW_MARK 999999 + static struct rule * rules; static int nrules; /* number of rules */ @@ -589,7 +600,48 @@ _("%s: More than one -L option specified */ for (j = i + 1; j < nzones && zones[j].z_name == NULL; ++j) continue; - outzone(&zones[i], j - i); + if (zones[j -1].z_gmtoff == FOLLOW_MARK) { + /* copy zone and follow zone into one new array */ + int k,n,m, nrows; + struct zone *xzones, *zp; + nrows = j - i - 1; + zp = &zones[j - 1]; /* line with the follow rule */ + xzones = (struct zone *) (void *) emalloc((int) (nrows * sizeof *xzones)); + for (k = 0; k < nrows; k++) + xzones[k] = zones[i + k]; + /* now find the follow zone in array zones[] */ + for (m = 0; m < nzones; m++) { + if (zones[m].z_name != NULL && strcmp(zp->z_rule, zones[m].z_name) == 0) break; + } + if (m == nzones) { /* error, follow zone not found */ + char *cp; + cp = emalloc(80 + strlen(zp->z_rule) + strlen(zones[i].z_name));; + sprintf(cp, "For zone %s follow zone %s not found, no zonefile created.", zones[i].z_name, zp->z_rule); + eat(zp->z_filename, zp->z_linenum); + error(cp); + ifree(cp); + ifree((void *)xzones); + } + /* now find the next date in the follow zone */ + for (n = m + 1; n < nzones; n++) { + if (zp->z_untiltime < zones[n].z_untiltime) break; + } + /* missing errorcode for case n == nzones, + * assume we are still in same follow zone. + * The follow zone part we need starts at zones[n]. + * Now find where follow zone ends, will be m. + */ + for (m = n; m < nzones && zones[m].z_name == NULL; ++m) + continue; + xzones = (struct zone *) (void *) erealloc((char *) xzones, (int) ((nrows + m - n) * sizeof *xzones)); + for (k = 0; k < m - n; k++) + xzones[nrows + k] = zones[n + k]; + nrows += m - n; + outzone(&xzones[0], nrows); + ifree((void *) xzones); + } else { + outzone(&zones[i], j - i); + } } /* ** Make links. @@ -784,7 +836,7 @@ associate(void) } for (i = 0; i < nzones; ++i) { zp = &zones[i]; - if (zp->z_nrules == 0) { + if (zp->z_nrules == 0 && zp->z_gmtoff != FOLLOW_MARK) { /* ** Maybe we have a local standard time offset. */ @@ -1079,11 +1131,23 @@ const int iscont; return FALSE; } } - z.z_rule = ecpyalloc(fields[i_rule]); - z.z_format = ecpyalloc(fields[i_format]); - if (max_format_len < strlen(z.z_format)) - max_format_len = strlen(z.z_format); - hasuntil = nfields > i_untilyear; + /* check for 0 follow zonename + ** zonename must contain at least one /, and follow must be + * 'follow' or an abbreviation thereof. + */ + if (z.z_gmtoff == 0 && strchr(fields[i_format], '/') != NULL + && itsabbr(fields[i_rule], "follow")) { + z.z_gmtoff = FOLLOW_MARK; + z.z_rule = ecpyalloc(fields[i_format]); + z.z_format = ""; + hasuntil = FALSE; /* no continue of zone now */ + } else { + z.z_rule = ecpyalloc(fields[i_rule]); + z.z_format = ecpyalloc(fields[i_format]); + if (max_format_len < strlen(z.z_format)) + max_format_len = strlen(z.z_format); + hasuntil = nfields > i_untilyear; + } if (hasuntil) { z.z_untilrule.r_filename = filename; z.z_untilrule.r_linenum = linenum;

1 1

DESTDIR patch
by Dr. Volker Zell Sept. 10, 2013

Sept. 10, 2013

Hi Attached a patch which adds DESTDIR support to the Makefile. Ciao Volker

2 1

Fiji daylight savings
by David Wheeler Sept. 9, 2013

Sept. 9, 2013

Hi all, we've just received notice that Fiji will start daylight savings shortly, but this doesn't seem to be represented in tzdata. See link below for details. http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-O… Cheers, -- David _____________________________ David Wheeler - Lead Engineer david(a)inomial.com p +61 3 9663 3554 WINNER 2013 ACOMMS Awards for Services to Industry - Professional services Telecommunications and Utility Billing, Rating, Policy and Session Management

3 2

Rules for TZ+ database
by Lester Caine Sept. 9, 2013

Sept. 9, 2013

First I'd like to thank Kevin Lyda for taking the time to construct the original tz repository. It is a quite remarkable piece of work. I'm currently looking at a beautifully documented history of the Theory file from the moment Authur created it on 16/2/1987 ... 1987-02-16 in modern money ... The first rule is +* In SVR2, time display in a process is controlled by the environment + variable TZ, which "must be a three-letter time zone name, followed + by a munber representing the difference between local time and + Greenwich Mean Time in hours, followed by an optional three-letter + name for a daylight time zone;" when the optional daylight time zone is + present, "standard U.S.A. Daylight Savings Time conversion is applied." + This means that SVR2 can't deal with other (for example, Australian) + daylight savings time rules, or situations where more than two + time zone abbreviations are used in an area. So it was very much conceived as an 'American' system. Handling other daylight saving offsets or more complex rules was to difficult at that time so ignored. I'll fast forward over the changes which introduced long names to replace the three letter codes, and set up rules about size of population being used to select them. Politics is nothing new and the entire database is an archive of POLITICAL decisions. Until 2001 when a commit was added from a certain Paul Eggert ... +This naming convention is not intended for use by inexperienced users +to select TZ values by themselves (though they can of course examine +and reuse existing settings). Distributors should provide +documentation and/or a simple selection interface that explains the +names; see the 'tzselect' program supplied with this distribution for +one example. And the new rule of + * Uniquely identify every national region where clocks have all + agreed since 1970. This is essential for the intended use: static + clocks keeping local civil time. Does not SPECIFICALLY rule out the gathering of pre 1970 data? It just sets the ground rules for ONE view of the data to be limited. This is about making the data more accessible and was probably the wrong approach even back then. I'll skip the 'frivolity' of adding Mars time in 2004, but it does have relevance to the next step forward. All documented data is valid! http://lsces.org.uk/hg/tz/rev/8a52c38a5f56 is the change that pulls support for specifically 32 bit systems, that note had only JUST been added but is the first reference on scope that I've found? Then finally there is a formal definition of the SCOPE of the database in http://lsces.org.uk/hg/tz/rev/7c18a2e16943 so up until that time data HAS been gathered for the whole of time not just post 1970. I'm more than happy to accept this as the rules for 'TZ' but things have moved on considerably since 1987 and substantially more material is now available and easily accessed to provide insight into all of the documented changes to time standards. So if the 'TZ' distribution is going to ignore that material then we need to set up a 'TZ+' distribution that actively includes all available material. It's not a question it's a statement. Reviewing the Theory file of cause we fall at the first hurdle since the POSIX time format has difficulty coping with some of the intricacies of time management. While encoding a daylight saving change in the time is to be commended, it is only right for a specific period of time. The more accurate approach is purely to identify a 'set of rules' that can be used. This also then automatically covers the provision of leap seconds. What I am saying here is that POSIX is just an implementation detail and while mapping the data to it does require defining, it's not fundamental to the real data. So lets use a standard that is better at handling the modern systems. Obviously I fundamentally disagree with the current scope and that should probably have been disputed in 2011. If one accepts that POSIX is incapable of handling the material, then applying one of it's limitations is also wrong? Since the Calendrical issues section already includes the whole of history, we do have a good base to build on, and are already discussing what 'Universal Time' was prior to 1970. If we can agree that while the validity of some legacy data may be questionably, it is a fact of life that many of these events happened, me just have some uncertainty as to when they happened? I think we can also agree that there is substantial new material which is currently only recorded in notes and which can only enhance the historic record? I'm under no illusion that the problems of manipulating this data into a more usable format is substantial, but it is not impossible. NAMING 'timezones' is the fundamental problem here, and the "This naming convention is not intended for use by inexperienced users" is of fundamental importance here. Mapping rules to usable names is all that is required, so internally in the data we have something suitable for managing the complexity of the problem, while outside a naive user punches in an ISO3166 and gets a timezone suitable for the time frame he is working in. There is a substantial amount of additional history here that could potentially be exposed, such as, for example, ISO3166 codes which have been superseded, or even 'old' TZ names which are now recorded for posterity in archives! The 'backward' file is missing key information on when a particular 'match' was changed, and while dates are not particularly critical, there may be fundamental data provided if one of the legacy names is being reviewed and the CURRENT rule set no longer matches what was being supplied at that time. With hg (or git) I can call up an historic view of backward, and then select a view of the data at that time. Something that one time would have been a substantial amount of work happens in the click of a mouse. DVCS provides a view of the information in a format that relates to how it was entered. That data can be viewed in many other ways if we provide the right tools, that is the key here. 'winnowing' is just one way of manipulating the data, and another would be 'time slicing', providing a snapshot of all the rules active at a particular date. Currently there are a much smaller number of rules active than there were pre-1970, and pre standard time there were an infinite number due to all the different methods of tracking time. During the transition from then until now we have some complex information to map, such as French stations being 5 minutes drift, and UK trains using a different time to the legal system. But if we are looking at times when those rules apply then we need to know that there were differences. There was recorded desention to many summertime changes and this happened in a time where those facts were recorded so that material needs to be made available once it is established. This cuases no end of problems in identifying each area affected, but that's why I brought up the OHM historic mapping. Linking up with that, simple things like historic changes of country names can link us to the appropriate data. This may well require the provision of more than one rule, so that is something that needs handling - with notes if necessary. I've not got as far as I would like and I need to get on, but there is more than enough here already. OK 'TZ' only provides data from 1970 but 'TZ+' would provide all the historic data including the 'TZ' filtered set and additional data within the TZ timeframe. -- Lester Caine - G8HFL ----------------------------- Contact - http://lsces.co.uk/wiki/?page=contact L.S.Caine Electronic Services - http://lsces.co.uk EnquirySolve - http://enquirysolve.com/ Model Engineers Digital Workshop - http://medw.co.uk Rainbow Digital Media - http://rainbowdigitalmedia.co.uk

13 56

US osm timezone
by Lester Caine Sept. 9, 2013

Sept. 9, 2013

http://overpass-turbo.eu/s/Zf Will take a couple of minutes then ask about large data set. OK US timezone areas need a bit of a tidyup which was why this was taking so long :( I'd certainly be looking to clean up all the little areas back to the bigger boundaries if that is possible, and adding the missing zones ... But THAT is the whole point, we can simply edit this data ourselves. -- Lester Caine - G8HFL ----------------------------- Contact - http://lsces.co.uk/wiki/?page=contact L.S.Caine Electronic Services - http://lsces.co.uk EnquirySolve - http://enquirysolve.com/ Model Engineers Digital Workshop - http://medw.co.uk Rainbow Digital Media - http://rainbowdigitalmedia.co.uk

3 5

tz dependency lat & lng
by kokosani kokosani Sept. 8, 2013

Sept. 8, 2013

7 27

[PATCH] New file 'pre1970' for zones that differ only in pre-1970 time stamps.
by Paul Eggert Sept. 7, 2013

Sept. 7, 2013

This lets us preserve information about pre-1970 time stamps when we change a Zone to a Link to another zone whose time stamps agree after 1970. This should address concerns about some recent changes that removed this information. This implementation is a stripped-down version of a suggestion by Andrew Main (Zefram) in <http://mm.icann.org/pipermail/tz/2013-August/019615.html> and <http://mm.icann.org/pipermail/tz/2013-August/019639.html> to allow filtering tz data by date range. Unlike Zefram's suggestion, this implementation supports only two date ranges, namely 1970 on, using 'make BACKWARD=backward'; and all dates, using 'make BACKWARD="pre1970 back-pre1970"'. At some point I'd like to improve it to support arbitrary date ranges, but at least we've now restored the data whose loss was of some concern. * .gitignore: Add back-pre1970. * Makefile (BACKWARD): New macro. (YDATA): Use it instead of 'backward'. (AWK_SCRIPTS): New macro, with additional script back-pre1970.awk. (MISC): Use it. (back-pre1970): New rule. (clean_misc): Clean back-pre1970. Also clean time.tab, while we're at it. (check_public): Don't require pre1970 to stand alone. * pre1970, back-pre1970.awk: New files. --- .gitignore | 1 + Makefile | 32 +++++- back-pre1970.awk | 18 ++++ pre1970 | 291 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 337 insertions(+), 5 deletions(-) create mode 100644 back-pre1970.awk create mode 100644 pre1970 diff --git a/.gitignore b/.gitignore index 18dbbcc..28b1bc9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.txt *~ ChangeLog +back-pre1970 date leapseconds time.tab diff --git a/Makefile b/Makefile index a74d1a7..ffddb08 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,22 @@ POSIXRULES= America/New_York ZONETABTYPE= zone +# How to support obsolescent time zones in a backward-compatible way. +# This variable affects only pre-1970 time stamps, on hosts that support them. +# It has two possible values, 'backward' and 'pre1970 back-pre1970'. +# +# 'backward' is the traditional approach, and is simpler and more efficient; +# it is designed to generate one zone for each region where clocks have agreed +# since 1970. +# +# 'pre1970 back-pre1970' can generate more than one zone in that situation, +# which means it can preserve a bit of pre-1970 data that 'backward' does not; +# almost all pre-1970 data is missing, though, so don't get your hopes up. +# +# Sometimes 'backward' is more-compatible with earlier versions of this database, +# and sometimes 'pre1970 back-pre1970' is; it depends on the situation. +BACKWARD= backward + # Also see TZDEFRULESTRING below, which takes effect only # if the time zone files cannot be accessed. @@ -322,7 +338,7 @@ COMMON= Makefile DOCS= README Theory $(MANS) date.1 PRIMARY_YDATA= africa antarctica asia australasia \ europe northamerica southamerica -YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward +YDATA= $(PRIMARY_YDATA) pacificnew etcetera $(BACKWARD) NDATA= systemv factory SDATA= solar87 solar88 solar89 TDATA= $(YDATA) $(NDATA) $(SDATA) @@ -330,9 +346,10 @@ TABDATA= iso3166.tab time.tab zone.tab DATA= $(YDATA) $(NDATA) $(SDATA) $(TABDATA) \ leap-seconds.list yearistype.sh WEB_PAGES= tz-art.htm tz-link.htm +AWK_SCRIPTS= back-pre1970.awk checktab.awk leapseconds.awk zone-time.awk MISC= usno1988 usno1989 usno1989a usno1995 usno1997 usno1998 \ - $(WEB_PAGES) checktab.awk leapseconds.awk workman.sh \ - zoneinfo2tdf.pl + $(WEB_PAGES) $(AWK_SCRIPTS) \ + workman.sh zoneinfo2tdf.pl ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) # And for the benefit of csh users on systems that assume the user @@ -423,6 +440,9 @@ zones: $(REDO) time.tab: $(YDATA) zone.tab zone-time.awk $(AWK) -f zone-time.awk $(YDATA) >$@ +back-pre1970: pre1970 backward + $(AWK) -v pre1970=pre1970 -f $@.awk backward >$@ + $(TZLIB): $(LIBOBJS) -mkdir $(TOPDIR) $(LIBDIR) ar ru $@ $(LIBOBJS) @@ -457,6 +477,7 @@ check_web: $(WEB_PAGES) clean_misc: rm -f core *.o *.out \ + back-pre1970 time.tab \ date leapseconds tzselect version.h zdump zic yearistype clean: clean_misc rm -f -r tzpublic @@ -488,7 +509,7 @@ set-timestamps: $$cmd || exit; \ done -# The zics below ensure that each data file can stand on its own. +# The zics below ensure that each non-pre1970 data file can stand on its own. # We also do an all-files run to catch links to links. check_public: $(ENCHILADA) @@ -496,7 +517,8 @@ check_public: $(ENCHILADA) make "CFLAGS=$(GCC_DEBUG_FLAGS)" mkdir tzpublic for i in $(TDATA) ; do \ - $(zic) -v -d tzpublic $$i 2>&1 || exit; \ + test $$i = pre1970 || $(zic) -v -d tzpublic $$i 2>&1 \ + || exit; \ done $(zic) -v -d tzpublic $(TDATA) rm -f -r tzpublic diff --git a/back-pre1970.awk b/back-pre1970.awk new file mode 100644 index 0000000..f7c54fc --- /dev/null +++ b/back-pre1970.awk @@ -0,0 +1,18 @@ +# Generate 'back-pre1970' from the two input files 'pre1970' and 'backward'. +# The output consists of all lines in 'backward' that are not links to +# files mentioned in 'pre1970'. Think of it as 'backward' minus 'pre1970'. + +# The 'backward' file is the input. +# The awk variable 'pre1970' contains the name of the pre1970 file. + +# This file is in the public domain. + +# Contributed by Paul Eggert. + +BEGIN { + while ((getline <pre1970) == 1) + if ($1 == "Zone") + pre1970_zone[$2] = 1 +} + +! (/^Link/ && pre1970_zone[$3]) { print } diff --git a/pre1970 b/pre1970 new file mode 100644 index 0000000..d8b8f34 --- /dev/null +++ b/pre1970 @@ -0,0 +1,291 @@ +# Pre-1970 data + +# This file is in the public domain. + +# This file contains zones that were formerly in other source files, +# but were later removed or replaced by backward-compatibility links +# as they differ from other zones only in pre-1970 time stamps. + +# Although the tz database focuses on post-1970 time stamps, these +# entries are retained here as they may be of some use to people +# interested in pre-1970 time stamps, even though they cover only a +# tiny sliver of pre-1970 data and are unreliable for that data. +# Also, these entries can help with backward compatibility with some +# old versions of the tz database. They are incompatible with other +# old versions of the database, though; it depends on which old +# version you're interested in. + +# Entries are sorted by Zone name. Each entry is preceded by the name +# of the country that the entry is in, along with any other commentary +# and rules associated with the entry. Some rules, e.g., 'Canada', +# are defined by other source files; this file is not intended to be +# used without those other files. + +# Zone NAME GMTOFF RULES FORMAT [UNTIL] + +# Mali +# no longer different from Bamako, but too famous to omit +Zone Africa/Timbuktu -0:12:04 - LMT 1912 + 0:00 - GMT + +# Anguilla +Zone America/Anguilla -4:12:16 - LMT 1912 Mar 2 + -4:00 - AST + +# Antigua and Barbuda +Zone America/Antigua -4:07:12 - LMT 1912 Mar 2 + -5:00 - EST 1951 + -4:00 - AST + +# Argentina +# Chubut (CH) +# The name "Comodoro Rivadavia" exceeds the 14-byte POSIX limit. +Zone America/Argentina/ComodRivadavia -4:30:00 - LMT 1894 Oct 31 + -4:16:48 - CMT 1920 May + -4:00 - ART 1930 Dec + -4:00 Arg AR%sT 1969 Oct 5 + -3:00 Arg AR%sT 1991 Mar 3 + -4:00 - WART 1991 Oct 20 + -3:00 Arg AR%sT 1999 Oct 3 + -4:00 Arg AR%sT 2000 Mar 3 + -3:00 - ART 2004 Jun 1 + -4:00 - WART 2004 Jun 20 + -3:00 - ART + +# Aruba +Zone America/Aruba -4:40:24 - LMT 1912 Feb 12 # Oranjestad + -4:30 - ANT 1965 # Netherlands Antilles Time + -4:00 - AST + +# Canada + +Zone America/Atikokan -6:06:28 - LMT 1895 + -6:00 Canada C%sT 1940 Sep 29 + -6:00 1:00 CDT 1942 Feb 9 2:00s + -6:00 Canada C%sT 1945 Sep 30 2:00 + -5:00 - EST + +Zone America/Blanc-Sablon -3:48:28 - LMT 1884 + -4:00 Canada A%sT 1970 + -4:00 - AST + +# Cayman Is +Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown + -5:07:12 - KMT 1912 Feb # Kingston Mean Time + -5:00 - EST + +# Canada +Zone America/Coral_Harbour -5:32:40 - LMT 1884 + -5:00 NT_YK E%sT 1946 + -5:00 - EST + +# Curacao +Zone America/Curacao -4:35:47 - LMT 1912 Feb 12 # Willemstad + -4:30 - ANT 1965 # Netherlands Antilles Time + -4:00 - AST + +# Dominica +Zone America/Dominica -4:05:36 - LMT 1911 Jul 1 0:01 # Roseau + -4:00 - AST + +# Mexico +Zone America/Ensenada -7:46:28 - LMT 1922 Jan 1 0:13:32 + -8:00 - PST 1927 Jun 10 23:00 + -7:00 - MST 1930 Nov 16 + -8:00 - PST 1942 Apr + -7:00 - MST 1949 Jan 14 + -8:00 - PST 1996 + -8:00 Mexico P%sT + +# US +Zone America/Fort_Wayne -5:00 US E%sT 1946 + -5:00 - EST # Always EST as of 1986 + +# Grenada +Zone America/Grenada -4:07:00 - LMT 1911 Jul # St George's + -4:00 - AST + +# Guadeloupe +Zone America/Guadeloupe -4:06:08 - LMT 1911 Jun 8 # Pointe a Pitre + -4:00 - AST + +# Canada +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule Mont 1917 only - Mar 25 2:00 1:00 D +Rule Mont 1917 only - Apr 24 0:00 0 S +Rule Mont 1919 only - Mar 31 2:30 1:00 D +Rule Mont 1919 only - Oct 25 2:30 0 S +Rule Mont 1920 only - May 2 2:30 1:00 D +Rule Mont 1920 1922 - Oct Sun>=1 2:30 0 S +Rule Mont 1921 only - May 1 2:00 1:00 D +Rule Mont 1922 only - Apr 30 2:00 1:00 D +Rule Mont 1924 only - May 17 2:00 1:00 D +Rule Mont 1924 1926 - Sep lastSun 2:30 0 S +Rule Mont 1925 1926 - May Sun>=1 2:00 1:00 D +# The 1927-to-1937 rules can be expressed more simply as +# Rule Mont 1927 1937 - Apr lastSat 24:00 1:00 D +# Rule Mont 1927 1937 - Sep lastSat 24:00 0 S +# The rules below avoid use of 24:00 +# (which pre-1998 versions of zic cannot handle). +Rule Mont 1927 only - May 1 0:00 1:00 D +Rule Mont 1927 1932 - Sep lastSun 0:00 0 S +Rule Mont 1928 1931 - Apr lastSun 0:00 1:00 D +Rule Mont 1932 only - May 1 0:00 1:00 D +Rule Mont 1933 1940 - Apr lastSun 0:00 1:00 D +Rule Mont 1933 only - Oct 1 0:00 0 S +Rule Mont 1934 1939 - Sep lastSun 0:00 0 S +Rule Mont 1946 1973 - Apr lastSun 2:00 1:00 D +Rule Mont 1945 1948 - Sep lastSun 2:00 0 S +Rule Mont 1949 1950 - Oct lastSun 2:00 0 S +Rule Mont 1951 1956 - Sep lastSun 2:00 0 S +Rule Mont 1957 1973 - Oct lastSun 2:00 0 S +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Montreal -4:54:16 - LMT 1884 + -5:00 Mont E%sT 1918 + -5:00 Canada E%sT 1919 + -5:00 Mont E%sT 1942 Feb 9 2:00s + -5:00 Canada E%sT 1946 + -5:00 Mont E%sT 1974 + -5:00 Canada E%sT + +# Montserrat +Zone America/Montserrat -4:08:52 - LMT 1911 Jul 1 0:01 # Cork Hill + -4:00 - AST + +# Bahamas +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S +Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Nassau -5:09:30 - LMT 1912 Mar 2 + -5:00 Bahamas E%sT 1976 + -5:00 US E%sT + +# Trinidad and Tobago +Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2 + -4:00 - AST + +# Brazil +# Rio_Branco is too ambiguous, since there's a Rio Branco in Uruguay too. +Zone America/Porto_Acre -4:31:12 - LMT 1914 + -5:00 Brazil AC%sT 1988 Sep 12 + -5:00 - ACT + +# Argentina +# Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC), +# Formosa (FM), La Pampa (LP), Chubut (CH) +Zone America/Rosario -4:02:40 - LMT 1894 Nov + -4:16:44 - CMT 1920 May + -4:00 - ART 1930 Dec + -4:00 Arg AR%sT 1969 Oct 5 + -3:00 Arg AR%sT 1991 Jul + -3:00 - ART 1999 Oct 3 0:00 + -4:00 Arg AR%sT 2000 Mar 3 0:00 + -3:00 - ART + +# St Kitts-Nevis +Zone America/St_Kitts -4:10:52 - LMT 1912 Mar 2 # Basseterre + -4:00 - AST + +# St Lucia +Zone America/St_Lucia -4:04:00 - LMT 1890 # Castries + -4:04:00 - CMT 1912 # Castries Mean Time + -4:00 - AST + +# Virgin Is +Zone America/St_Thomas -4:19:44 - LMT 1911 Jul # Charlotte Amalie + -4:00 - AST + +# St Vincent and the Grenadines +Zone America/St_Vincent -4:04:56 - LMT 1890 # Kingstown + -4:04:56 - KMT 1912 # Kingstown Mean Time + -4:00 - AST + +# British Virgin Is +Zone America/Tortola -4:18:28 - LMT 1911 Jul # Road Town + -4:00 - AST + +# McMurdo, Ross Island, since 1955-12 +Zone Antarctica/McMurdo 0 - zzz 1956 + 12:00 NZAQ NZ%sT + +# Japan +Zone Asia/Ishigaki 8:16:36 - LMT 1896 + 8:00 - CST + +# Israel +Zone Asia/Tel_Aviv 2:19:04 - LMT 1880 + 2:21 - JMT 1918 + 2:00 Zion I%sT + +# Russia +Zone Asia/Tomsk 5:39:52 - LMT 1924 May 2 + 6:00 - TSK 1957 Mar + 7:00 Russia TS%s 1991 Mar 31 2:00s + 6:00 1:00 TSD 1991 Sep 29 2:00s + 6:00 - TSK 1992 Jan 19 2:00s + 7:00 Russia TS%s + +# Svalbard & Jan Mayen +Zone Atlantic/Jan_Mayen -1:00 - EGT + +# Australia +Zone Australia/Canberra 9:56:32 - LMT 1895 Feb + 10:00 - EST 1917 Jan 1 0:01 + 10:00 Aus EST 1971 Oct 31 2:00 + 10:00 AN EST 1981 Oct 25 2:00 + 10:00 1:00 EST 1982 Apr 4 3:00 + 10:00 AN EST + +# UK +Zone Europe/Belfast -0:23:40 - LMT 1880 Aug 2 + -0:25:21 - DMT 1916 May 21 2:00 # Dublin/Dunsink MT + -0:25:21 1:00 IST 1916 Oct 1 2:00s # Irish Summer Time + 0:00 GB-Eire %s 1968 Oct 27 + 1:00 - BST 1971 Oct 31 2:00u + 0:00 GB-Eire %s 1996 + 0:00 EU GMT/BST + +# Slovenia +Zone Europe/Ljubljana 0:58:04 - LMT 1884 + 1:00 - CET 1941 Apr 18 23:00 + 1:00 C-Eur CE%sT 1945 May 8 2:00s + 1:00 1:00 CEST 1945 Sep 16 2:00s + 1:00 - CET 1982 Nov 27 + 1:00 EU CE%sT + +# Bosnia and Herzegovina +Zone Europe/Sarajevo 1:13:40 - LMT 1884 + 1:00 - CET 1941 Apr 18 23:00 + 1:00 C-Eur CE%sT 1945 May 8 2:00s + 1:00 1:00 CEST 1945 Sep 16 2:00s + 1:00 - CET 1982 Nov 27 + 1:00 EU CE%sT + +# Macedonia +Zone Europe/Skopje 1:25:44 - LMT 1884 + 1:00 - CET 1941 Apr 18 23:00 + 1:00 C-Eur CE%sT 1945 May 8 2:00s + 1:00 1:00 CEST 1945 Sep 16 2:00s + 1:00 - CET 1982 Nov 27 + 1:00 EU CE%sT + +# Moldova +Zone Europe/Tiraspol 1:58:32 - LMT 1880 + 1:55 - CMT 1918 Feb 15 # Chisinau MT + 1:44:24 - BMT 1931 Jul 24 # Bucharest MT + 2:00 Romania EE%sT 1940 Aug 15 + 2:00 1:00 EEST 1941 Jul 17 + 1:00 C-Eur CE%sT 1944 Aug 24 + 3:00 Russia MSK/MSD 1991 Mar 31 2:00 + 2:00 Russia EE%sT 1992 Jan 19 2:00 + 3:00 Russia MSK/MSD + +# Croatia +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Europe/Zagreb 1:03:52 - LMT 1884 + 1:00 - CET 1941 Apr 18 23:00 + 1:00 C-Eur CE%sT 1945 May 8 2:00s + 1:00 1:00 CEST 1945 Sep 16 2:00s + 1:00 - CET 1982 Nov 27 + 1:00 EU CE%sT -- 1.8.1.2

13 23

Re: [tz] [tzdb] Re: Proposed patch - Theory change to reinstate reference to ISO-3166
by random832＠fastmail.us Sept. 6, 2013

Sept. 6, 2013

On Fri, Sep 6, 2013, at 7:26, Tobias Conradi wrote: > > They are three _versions of_ one > > standard > Now we have > 1) edition (Wikipedia) > 2) revision (Clive) > 3) version (random832) http://dictionary.reference.com/browse/synonym If you are honestly claiming your grasp of the English language is really so weak as to fail to understand that these mean the same thing, then I'm sorry for calling you pedantic. > > - the later version supersedes the earlier ones. > The ISO website uses the verb "revise". See above. > I vote for disallowing such comments on the tz mailing list. This is not a democracy. You're free to ignore me. Or even remove me from your "tzdb(a)yahoogroups.com" list, though that will mainly have the effect of preventing _me_ from seeing _your_ emails if you find yourself banned from the tz list again. (For the record, I did not agree with your being banned, but it does say something about the relative thickness of the ice we are each standing on)

2 1

Re: [tz] [tzdb] Re: Proposed patch - Theory change to reinstate reference to ISO-3166
by Clive D.W. Feather Sept. 6, 2013

Sept. 6, 2013

Tobias Conradi said: >> They are three _versions of_ one >> standard > Now we have > 1) edition (Wikipedia) > 2) revision (Clive) > 3) version (random832) > >> - the later version supersedes the earlier ones. > The ISO website uses the verb "revise". When you revise the document, you get a new version. If the revision is printed as a single impression, that is a new edition. See sections 9.5 to 9.9 of ISO/IEC Guide 2. >> This is >> entirely obvious from the names, and needs no further source. > I vote for disallowing such comments on the tz mailing list. I could vote for your comments to be disallowed. Thankfully this isn't subject to a vote. -- Clive D.W. Feather | If you lie to the compiler, Email: clive(a)davros.org | it will get its revenge. Web: http://www.davros.org | - Henry Spencer Mobile: +44 7973 377646

1 0

Re: [tz] Proposed patch - Theory change to reinstate reference to ISO-3166
by Clive D.W. Feather Sept. 6, 2013

Sept. 6, 2013

Tobias Conradi said: > >> There are two standards containing the string ISO 3166-1, the one > >> published the latest is > >> ISO 3166-1:2006 > >> http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumbe… > >> > >> The other is > >> ISO 3166-1:1997 > >> http://www.iso.org/iso/home/store/catalogue_tc/catalogue_detail.htm?csnumbe… > >> > >> The ISO website also shows > >> ISO 3166:1981 > >> ISO 3166:1988 > >> ISO 3166:1993 > > > > Those are all the same standard. > Your sources? Mine are pages of the ISO website, among them the two I > provided a link for. (1) Those pages - the latter says "revised by". (2) The ISO Directives http://isotc.iso.org/livelink/livelink?func=ll&objId=4230452&objAction=brow… which make it clear that you can only use the same number for revisions which don't significantly alter the scope of the standard. (3) Too many years taking part in ISO/IEC/JTC1/SC22/WG14, including being the UK's official representative. There is one standard (3166) divided into three parts (-1 to -3) and revised and republished on various dates (:2006). >> The standards don't include a normative table of codes. > Your sources? That was an error on my part, I accept. >> That is, the tables >> in those standards are *snapshots*. > Even "snapshots" can be normative. True. >> The standard itself defines rules for maintaining the official list of >> codes, what the codes should look like, and so on. The official list, >> however, is maintained by the "maintenance agency" (who, IIRC, is DIN). >> They can update the list whenever they want. > Hopefully they stick to the published rules. But the rules don't say *when* they can change it. Actually, they say: "Changes to this part of ISO 3166 are decided by the ISO 3166/MA and become effective immediately. They are announced in ISO 3166 Newsletters and are authoritative amendments to Clauses 1 to 13 and the annexes of this part of ISO 3166." In other words, each time 3166/MA decides to add, remove, or change a code, ISO 3166 *is revised*. >> Thus, for example, the list was changed on: >> 1989-12-05 (removed BU, added MM) > Your source, so a reader could verify this and other claims? Well, I could be cheeky and point at: http://www.davros.org/misc/iso3166.html The changes tagged 'c' to 'thorn' inclusive were added to the file contemporaneously with the publication of the MS newsletters. I haven't kept copies of the newsletters, but they may be online somewhere. > E.g. >> 1992-08-28 (removed DD, changed DD from 280 to 276) > Is a false claim, assuming the rule followed is, that there is one > numeric code for each alpha-2 code at any point in time since the > first publication of numeric codes. Typo: that should be "changed DE". There is no such rule as the one you hypothesize. On the contrary, the number was changed to show that the geographic area covered by 276 was significantly different to that covered by 280, even though they have the same Alpha-2 code. Conversely, when HV changed to BF they covered the same geographic area and so both were/are 854. >>> There are at least two pairs, namely DD/DE and YD/YE where there is >>> not "at least one name per ISO-3166 code" but only one per pair. >> When DD and DE were both in the list, they had separate names. DD is no >> longer in the 3166-1 list, though it is in 3166-3 (removed codes). > That's of no relevance for my claim. Then I'm not clear what your claim is. >>> When looking at the locations or location names, it follows that >>> "There should typically be at least one name per ISO-3166 code." was >>> never applied. >> I don't believe you've demonstrated that. > It didn't claim I have demonstrated it. Then what does "it follows that" mean? > As of today, the page > http://www.iso.org/iso/country_codes/iso_3166_code_lists/country_names_and_… > marked "Last updated: 2013-02-06" provides 249 country names. Nitpick: country and territory codes. > That results in 249*3=747 codes for ISO 3166-1:2006. That is, ISO 3166-1:2006 as revised by ISO 3166/MA. But that's 249 code triplets. > 548<747+31. What's the significance of 747? That should read: 548 > 249+31 -- Clive D.W. Feather | If you lie to the compiler, Email: clive(a)davros.org | it will get its revenge. Web: http://www.davros.org | - Henry Spencer Mobile: +44 7973 377646

1 0

Shortz circuit? (Spoiler)
by Arthur David Olson Sept. 6, 2013

Sept. 6, 2013

(Spoiler ahead.) (Yes, really.) Today's "New York Times" crossword gives "Prime meridian std." as the clue for the three-letter entry at 44 down; the solution, according to... http://www.xwordinfo.com/Crossword?date=9/6/2013 ...is "GST." Rather than GMT or BST. @dashdashado

2 1

[PATCH] Support time stamps past 2038 in zones like America/Santiago.
by Paul Eggert Sept. 6, 2013

Sept. 6, 2013

This implements a suggestion by Arthur David Olson. Without this change, zic -v diagnoses problems with several zones where it cannot compute a POSIX-equivalent TZ setting for time stamps past 2038, which means these time stamps may be mishandled. This entails a minor change to the binary tz file format, to allow a minor extension to the POSIX TZ setting in the binary file, instead of requiring a pure POSIX TZ setting. The zones fixed by this change are America/Godthab, America/Santiago, Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem, Pacific/Easter, and Pacific/Fiji. The only zone that remains unfixed is Asia/Tehran, which schedules clock transitions via the Iranian calendar, something that even the extended TZ setting cannot represent. * localtime.c (getrule): Allow transition times to be signed. * newtzset.3: Describe the extensions to POSIX TZ strings. Some of these extensions (e.g., hours == 26) were already implemented but were not documented. Give examples. * tzfile.5: Document the relaxed restriction on the stored TZ string; its hours component can be in the range -167..167 rather than the POSIX-required 0..24. Refer to newtzset(5). * zic.c (stringoffset): Allow hours to go up to 167. (stringrule): Be willing to generate hours in the range -167 through 167. --- localtime.c | 2 +- newtzset.3 | 37 ++++++++++++++++++++++++++++++++++--- tzfile.5 | 6 +++++- zic.c | 27 ++++++++++++++------------- 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/localtime.c b/localtime.c index 619a656..91a3171 100644 --- a/localtime.c +++ b/localtime.c @@ -835,7 +835,7 @@ getrule(const char *strp, register struct rule *const rulep) ** Time specified. */ ++strp; - strp = getsecs(strp, &rulep->r_time); + strp = getoffset(strp, &rulep->r_time); } else rulep->r_time = 2 * SECSPERHOUR; /* default = 2:00:00 */ return strp; } diff --git a/newtzset.3 b/newtzset.3 index 3689e50..bb40c01 100644 --- a/newtzset.3 +++ b/newtzset.3 @@ -177,16 +177,47 @@ The .I time has the same format as .I offset -except that no leading sign +except that POSIX does not allow a leading sign .RB (`` \(mi '' or -.RB `` \(pl '') -is allowed. The default, if +.RB `` \(pl ''). +As an extension to POSIX, the hours part of +.I time +can range from \(mi167 to 167; this allows for unusual rules such +as "the Saturday before the first Sunday of March". The default, if .I time is not given, is .BR 02:00:00 . .RE .LP +Here are some examples of +.B TZ +values that directly specify the time zone rules; they use some of the +extensions to POSIX. +.TP +.B EST5 +stands for US eastern +time (EST), 5 hours behind UTC, without daylight saving. +.TP +.B FJT\(mi12FJST,M10.3.4/74,M1.3.4/75 +stands for Fiji Time (FJT) and Fiji Summer Time (FJST), 12 hours ahead +of UTC, where clocks spring forward at 74:00 on the third Thursday in +October (i.e., 02:00 on the first Sunday on or after October 18), and +fall back at 75:00 on the third Thursday in January (i.e., 03:00 on +the first Sunday on or after January 18). +.TP +.B IST\(mi2IDT,M3.4.4/26,M10.5.0 +stands for Israel standard time (IST) and Israel daylight time (IDT), +2 hours ahead of UTC, where clocks spring forward at 26:00 on the +fourth Thursday in March (i.e., 02:00 on the first Friday on or after +March 23), and fall back at 02:00 on the last Sunday in October. +.TP +.B WGT3WGST,M3.5.0/\(mi2,M10.5.0/\(mi1 +stands for Western Greenland Time (WGT) and Western Greenland Summer +Time (WGST), 3 hours behind UTC, where clocks follow the EU rules of +springing forward the last Sunday in March at \(mi02:00 (i.e., 01:00 UTC) +and falling back the last Sunday in October at \(mi01:00 (i.e., 01:00 UTC). +.PP If no .I rule is present in diff --git a/tzfile.5 b/tzfile.5 index e92eaed..c7bd40e 100644 --- a/tzfile.5 +++ b/tzfile.5 @@ -145,7 +145,11 @@ POSIX-TZ-environment-variable-style string for use in handling instants after the last transition time stored in the file (with nothing between the newlines if there is no POSIX representation for such instants). +This string may use a minor extension to the POSIX TZ format: the +hours part of its transition times may be signed and range from +\(mi167 through 167 instead of the POSIX-required unsigned values +from 0 through 24. .SH SEE ALSO -newctime(3) +newctime(3), newtzset(3) .\" This file is in the public domain, so clarified as of .\" 1996-06-05 by Arthur David Olson. diff --git a/zic.c b/zic.c index 97786ae..260dc2e 100644 --- a/zic.c +++ b/zic.c @@ -1776,7 +1776,7 @@ stringoffset(char *result, zic_t offset) minutes = offset % MINSPERHOUR; offset /= MINSPERHOUR; hours = offset; - if (hours > HOURSPERDAY) { + if (hours >= HOURSPERDAY * DAYSPERWEEK) { result[0] = '\0'; return -1; } @@ -1793,7 +1793,7 @@ static int stringrule(char *result, const struct rule *const rp, const zic_t dstoff, const zic_t gmtoff) { - register zic_t tod; + register zic_t tod = rp->r_tod; result = end(result); if (rp->r_dycode == DC_DOM) { @@ -1807,32 +1807,33 @@ stringrule(char *result, const struct rule *const rp, const zic_t dstoff, (void) sprintf(result, "J%d", total + rp->r_dayofmonth); } else { register int week; + register int wday = rp->r_wday; + register int wdayoff; if (rp->r_dycode == DC_DOWGEQ) { - if ((rp->r_dayofmonth % DAYSPERWEEK) != 1) - return -1; - week = 1 + rp->r_dayofmonth / DAYSPERWEEK; + wdayoff = (rp->r_dayofmonth - 1) % DAYSPERWEEK; + wday -= wdayoff; + tod += wdayoff * SECSPERDAY; + week = 1 + (rp->r_dayofmonth - 1) / DAYSPERWEEK; } else if (rp->r_dycode == DC_DOWLEQ) { if (rp->r_dayofmonth == len_months[1][rp->r_month]) week = 5; else { - if ((rp->r_dayofmonth % DAYSPERWEEK) != 0) - return -1; + wdayoff = rp->r_dayofmonth % DAYSPERWEEK; + wday -= wdayoff; + tod += wdayoff * SECSPERDAY; week = rp->r_dayofmonth / DAYSPERWEEK; } } else return -1; /* "cannot happen" */ + if (wday < 0) + wday += DAYSPERWEEK; (void) sprintf(result, "M%d.%d.%d", - rp->r_month + 1, week, rp->r_wday); + rp->r_month + 1, week, wday); } - tod = rp->r_tod; if (rp->r_todisgmt) tod += gmtoff; if (rp->r_todisstd && rp->r_stdoff == 0) tod += dstoff; - if (tod < 0) { - result[0] = '\0'; - return -1; - } if (tod != 2 * SECSPERMIN * MINSPERHOUR) { (void) strcat(result, "/"); if (stringoffset(end(result), tod) != 0) -- 1.8.1.2

2 1

Re: [tz] [tzdb] Re: Proposed patch - Theory change to reinstate reference to ISO-3166
by random832＠fastmail.us Sept. 6, 2013

Sept. 6, 2013

On Fri, Sep 6, 2013, at 4:29, Tobias Conradi wrote: > >> The ISO website also shows > >> ISO 3166:1981 > >> ISO 3166:1988 > >> ISO 3166:1993 > > > > Those are all the same standard. > Your sources? Mine are pages of the ISO website, among them the two I > provided a link for. You're being absurdly pedantic. They are three _versions of_ one standard - the later version supersedes the earlier ones. This is entirely obvious from the names, and needs no further source.

1 0

[PATCH] Record that San Luis is at UTC-3, not UTC-4 with perpetual DST.
by Paul Eggert Sept. 5, 2013

Sept. 5, 2013

* southamerica (SanLuis): Move October 2009 transition from here ... (America/Argentina/San_Luis): ... to here. This causes San Luis to not appear to be on perpetual DST. --- southamerica | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/southamerica b/southamerica index f2e8f12..aab2e1a 100644 --- a/southamerica +++ b/southamerica @@ -451,6 +451,17 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S # rules...San Luis is still using "Western ARgentina Time" and it got # stuck on Summer daylight savings time even though the summer is over. +# From Paul Eggert (2013-09-05): +# Perhaps San Luis operates on the legal fiction that it is at UTC-4 +# with perpetual summer time, but ordinary usage typically seems to +# just say it's at UTC-3; see, for example, +# <http://es.wikipedia.org/wiki/Hora_oficial_argentina>. +# We've documented similar situations as being plain changes to +# standard time, so let's do that here too. This does not change UTC +# offsets, only tm_isdst and the time zone abbreviations. One minor +# plus is that this silences a zic complaint that there's no POSIX TZ +# setting for time stamps past 2038. + # From Paul Eggert (2013-02-21): # Milne says Cordoba time was -4:16:48.2. Round to the nearest second. @@ -588,7 +599,7 @@ Zone America/Argentina/Mendoza -4:35:16 - LMT 1894 Oct 31 # San Luis (SL) Rule SanLuis 2008 2009 - Mar Sun>=8 0:00 0 - -Rule SanLuis 2007 2009 - Oct Sun>=8 0:00 1:00 S +Rule SanLuis 2007 2008 - Oct Sun>=8 0:00 1:00 S Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31 -4:16:48 - CMT 1920 May @@ -604,7 +615,8 @@ Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31 -3:00 - ART 2004 May 31 -4:00 - WART 2004 Jul 25 -3:00 Arg AR%sT 2008 Jan 21 - -4:00 SanLuis WAR%sT + -4:00 SanLuis WAR%sT 2009 Oct 11 + -3:00 - ART # # Santa Cruz (SC) Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31 -- 1.8.1.2

1 0

[PATCH 1/4] northamerica: move America/Shiprock to 'backward'
by Paul Eggert Sept. 5, 2013

Sept. 5, 2013

This fixes the 2013-08-15 change so that 'make check' works again. * backward (America/Shiprock): Move this link here.... * northamerica (America/Shiprock): ... to here. --- backward | 1 + northamerica | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backward b/backward index c8c184e..561e2ff 100644 --- a/backward +++ b/backward @@ -25,6 +25,7 @@ Link America/Guadeloupe America/Marigot Link America/Argentina/Mendoza America/Mendoza Link America/Rio_Branco America/Porto_Acre Link America/Argentina/Cordoba America/Rosario +Link America/Denver America/Shiprock Link America/Guadeloupe America/St_Barthelemy Link America/St_Thomas America/Virgin Link Pacific/Auckland Antarctica/McMurdo diff --git a/northamerica b/northamerica index 13278d2..7676c77 100644 --- a/northamerica +++ b/northamerica @@ -636,8 +636,9 @@ Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 11:31:42 # Navajo Nation participates in the Daylight Saving Time policy, due to its # large size and location in three states." (The "only" means that other # tribal nations don't use DST.) - -Link America/Denver America/Shiprock +# +# From Paul Eggert (2013-08-26): +# See America/Denver for a zone appropriate for the Navajo Nation. # Southern Idaho (Ada, Adams, Bannock, Bear Lake, Bingham, Blaine, # Boise, Bonneville, Butte, Camas, Canyon, Caribou, Cassia, Clark, -- 1.8.1.2

10 19

Adding verified historic details
by Lester Caine Sept. 5, 2013

Sept. 5, 2013

Paul I sat down and worked my way through the UK details to see what is documented and what not. I'm normally using the results rather than the raw data, but I think I understand how this works now. I'm still using my own code in parallel with the version of TZ that Derick has built into the PHP clock tools so the main thing here is now comparing results. I've even got the original emails still archived. I've been using the 1880 'legal' date for the adoption of GMT and calling 'the other time' Railway time, but I can accept combining them. However the documents are all legal ones so using 'legal' time so midnight for a change was legal midnight not GMT until 1880 - that's politics for you :) As far as I am concerned, the Isle of Man was using LMT until 1883 and we now have a date of 30th March to go with that. I've always worked with 18 minutes offset, although Tynwald which is always quoted as the reference is 4.4814degW - 17m55.5s and that goes back 1000 years, but I think we can skip earlier solar times. So looking at the Europe data file ... # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00s 0:00 GB-Eire %s 1968 Oct 27 1:00 - BST 1971 Oct 31 2:00u 0:00 GB-Eire %s 1996 0:00 EU GMT/BST Link Europe/London Europe/Jersey Link Europe/London Europe/Guernsey Link Europe/London Europe/Isle_of_Man I think I need to add ... # AT4 of 1883 - The Statutory Time et cetera Act 1883 - Zone Europe/Isle_of_Man 0:17:55 - LMT 1883 March 30 0:00s Then the London Rules apply from then so in my simple way of thinking Link To Europe/London ( date is optional as on line above? ) Fills the picture. Europe/Isle_of_Man exists in it's own right up to 1883, and then it follows Europe/London. I'm fairly sure from the IOM documents that Jersey and Guernsey followed the same date, but their archives have not got that far back yet. So do we have to duplicate the whole zone record each timezone to add this one item of data? - - Lester Caine - G8HFL ----------------------------- Contact - http://lsces.co.uk/wiki/?page=contact L.S.Caine Electronic Services - http://lsces.co.uk EnquirySolve - http://enquirysolve.com/ Model Engineers Digital Workshop - http://medw.co.uk Rainbow Digital Media - http://rainbowdigitalmedia.co.uk

10 30

[PATCH] * newctime.3: Fix typos reported by Paul Goyette.
by Paul Eggert Sept. 5, 2013

Sept. 5, 2013

--- newctime.3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/newctime.3 b/newctime.3 index ece8507..61cd9e4 100644 --- a/newctime.3 +++ b/newctime.3 @@ -62,9 +62,9 @@ The time stamp represents the time in seconds since 1970-01-01 00:00:00 Coordinated Universal Time (UTC). The POSIX standard says that time stamps must be nonnegative -must ignore leap seconds. +and must ignore leap seconds. Many implementations extend POSIX by allowing negative time stamps, -and can therefore represent time stamps that that predate the +and can therefore represent time stamps that predate the introduction of UTC and are some other flavor of Universal Time (UT). Some implementations support leap seconds, in contradiction to POSIX. .PP -- 1.8.1.2

1 0

Proposed patch - Theory notes for backward file
by Stephen Colebourne Sept. 5, 2013

Sept. 5, 2013

Theory notes for backward file Note that the file exists for compatibility and canonicalization Explicitly note IDs in that file are deprecated Explicitly note that data set should make sense without backward ---------------- https://github.com/jodastephen/tz/commit/709e51dc7aeea8c2286b8a50c0d91d475b… The aim of this patch is simple - to document what the backward file is for in more detail. Stephen ---------------- @@ -362,12 +362,19 @@ constraints. Although a 'zone.tab' location's longitude corresponds to its LMT offset with one hour for every 15 degrees east longitude, this relationship is not exact and is not true for 'time.tab'. +The file 'backward' consists of Link entries mapping deprecated names +to their replacements. Usage of a deprecated name is discouraged. +As such, the file permits canonicalization, where the use of a +deprecated name can be automatically replaced with the replacement. +If the data set is used with the 'backward' file file excluded, then +it must remain logical and complete. For example, there must be no +references to any deprecated name from any other file. + Older versions of this package used a different naming scheme, -and these older names are still supported. -See the file 'backward' for most of these older names +and these older names are still supported using 'backward'. (e.g. 'US/Eastern' instead of 'America/New_York'). -The other old-fashioned names still supported are -'WET', 'CET', 'MET', and 'EET' (see the file 'europe'). +Some other old-fashioned names are not deprecated, such as +'WET', 'CET', 'MET', and 'EET', see the 'europe' file.

5 11

Proposed patch - Theory change to reinstate reference to ISO-3166
by Stephen Colebourne Sept. 5, 2013

Sept. 5, 2013

Theory change to reinstate reference to ISO-3166 Use ISO-3166 as a guide for when a name should exist Countries are not specified and nothing is mandated -------------------------- https://github.com/jodastephen/tz/commit/e6199cc2616e938efb9422b263bd09da70… This patch reinstates the link to ISO-3166 in a softer way. In my opinion, the original removal (of something present for 16 years) did not have consensus and should have been reverted. However, I offer this patch as a possible middle ground. Stephen -------------------------- @@ -316,6 +316,8 @@ in decreasing order of importance: 'America/New_York' precludes 'America/New_York/Bronx'. Uninhabited regions like the North Pole and Bouvet Island do not need locations, since local time is not defined there. + Use ISO-3166 as a guide to ensuring time zone name coverage. + There should typically be at least one name per ISO-3166 code. If all the clocks in a region have agreed since 1970, don't bother to include more than one location even if subregions' clocks disagreed before 1970.

5 7

State of the tzdb
by Stephen Colebourne Sept. 4, 2013

Sept. 4, 2013

We're a lot further forward now to regaining stability, but there are a few points still outstanding. 1) Should there be one zone ID in the main files (not "backward") for each inhabited ISO-3166 code? I've argued for this as a reinstatement of a rule of 16 years standing which is no more than common sense. Paul has argued against. 2) Zone ID for America/Shiprock Reinstate Yes/No? 3) Zone ID for Antarctica/South_Pole Reinstate Yes/No? At a minimum, the "backward" link needs to point to McMurdo 4) Recognise correct usage of "backward" file As per ECMAscript: http://norbertlindenberg.com/ecmascript/intl.html#sec-6.4.2 the "backward" is, and will continue to be, used for canonicalization - ie. identifying which IDs can be normalized away. As such, the tzdb needs to be very careful about cross-ISO-3166 links placed in the "backward" file (IMO there should be none to avoid political offence via canonicalization). The use of "backward" should be further documented in Theory to indicate its usage as a canonicalization file, and to indicate that the entire tzdb data set must make sense if the "backward" file is not processed (thus no lines in zone.tab should point to an ID in "backward") 5) Pre-1970 data Some of this seems uncontroversial at this point (don't remove data, don't create new IDs just for pre-1970). Some of it is still under discussion. Only enhancement of existing IDs is necessary to the applications I work with. As noted in the other thread, removing IDs that only differ in LMT is harder than initially thought, as the start of fixed offsets and the name of fixed offsets are pieces of data covered under the no deletion rule. As such, it is unlikely that there are many possibilities for merging zones. 6) ... anything I've forgotten? Finally, I'm sorry I've had to spend so must list time discussing this. Unfortunately, this data is just too important to me and the applications/langauages downstream of me to allow me to not object loudly. thanks Stephen

6 13

[PATCH] Document some longstanding unwritten guidelines.
by Paul Eggert Sept. 3, 2013

Sept. 3, 2013

These come from POSIX or similar platforms, or from the standard 'zic' implementation, but never got written down anywhere. * Theory: Document other POSIX-inspired restrictions on names. * zic.8 (DESCRIPTION): Document that zic's behavior is unspecified if some names are duplicates. Sometimes it complains, sometimes not. --- Theory | 10 ++++++++-- zic.8 | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Theory b/Theory index bd62c5c..b11cbc8 100644 --- a/Theory +++ b/Theory @@ -299,15 +299,21 @@ Here are the general rules used for choosing location names, in decreasing order of importance: Use only valid POSIX file name components (i.e., the parts of - names other than '/'). Within a file name component, + names other than '/'). Do not use the file name + components '.' and '..'. Within a file name component, use only ASCII letters, '.', '-' and '_'. Do not use digits, as that might create an ambiguity with POSIX TZ strings. A file name component must not exceed 14 characters or start with '-'. E.g., prefer 'Brunei' to 'Bandar_Seri_Begawan'. + A name must not be empty, or contain '//', or start or end with '/'. Do not use names that differ only in case. Although the reference - implementation is case-sensitive, some other implementations + implementation is case-sensitive, some other implementations are not, and they would mishandle names differing only in case. + If one name A is an initial prefix of another name AB (ignoring case), + then B must not start with '/', as a regular file cannot have + the same name as a directory in POSIX. For example, + 'America/New_York' precludes 'America/New_York/Bronx'. Uninhabited regions like the North Pole and Bouvet Island do not need locations, since local time is not defined there. If all the clocks in a region have agreed since 1970, diff --git a/zic.8 b/zic.8 index d61555e..d0d34ce 100644 --- a/zic.8 +++ b/zic.8 @@ -362,6 +362,9 @@ field is used as an alternate name for that zone. .PP Except for continuation lines, lines may appear in any order in the input. +However, the behavior is unspecified if multiple zone or link lines +define the same name, or if the source of one link line is the target +of another. .PP Lines in the file that describes leap seconds have the following form: .nf -- 1.8.1.2

1 0

[PATCH 2/3] Replace some zones with links when that doesn't lose non-LMT info.
by Meno Hochschild Sept. 3, 2013

Sept. 3, 2013

*Paul Eggert* eggert at cs.ucla.edu <mailto:tz%40iana.org?Subject=Re:%20Re%3A%20%5Btz%5D%20%5BPATCH%202/3%5D%20Replace%20some%20zones%20with%20links%20when%20that%0A%20doesn%27t%20lose%20non-LMT%20info.&In-Reply-To=%3C522616ED.6060902%40cs.ucla.edu%3E> /Tue Sep 3 17:05:49 UTC 2013/ Lester Caine wrote: >/can we at least agree that the quality of the material is heading in the right direction? / Yes, that's the idea. While I personally have no problem with tidy-up of obviously wrong data and also agree that correction of mistakes is more important than stability (which has never been absolutely pretended), I think end-users of tzdb should get a better opportunity to estimate how reliable the data are and how much trust they can put in their time zone calculations. Offsets in LMT-lines can easily be qualified as UNKNOWN. For the proposed date of 1970 as general separation point between UNSAFE and (apparently) RELIABLE I am not so sure. Would it not be helpful for end-users if there is an additional year-type attribute per zone which tells the users since when the data can be confirmed with high probability of correctness? Would require about 400+ attributes (ok, 1970 as default). I am sure for example in UK or in Germany the data are correct even a pretty while before 1970. Flexibility would be a good thing, isn't it? External APIs could support the users with this extra quality information per offset and make them better aware that historical tz data are not set in stone. Just giving a thought...

3 2

Dealing with Pre-1970 Data
by David Patte ₯ Sept. 3, 2013

Sept. 3, 2013

Though it has been handy to have some pre-1970 data within the tz database, I don't see that it is the best solution for historical tz data in the long run. It is clear that that going back far enough in time there is a different LMT for every 15 seconds of latitude. My own preference would be that historical (and perhaps all tz data) be given a numberic identifier, not a 'America/Someplace' name, for the populated areas in question. A good source of geographic identifiers already available is the geonames database. The tz data for Montreal could be identified by the geonames number for Montreal, and the tz data for Toronto associated with the geoname number for Toronto. Then, to build regions, since all geonames records already have a field for the tz region, these could reflect the numeric identifier of the tz recommended region for each location. For example, Ottawa, in the geonames database would refer to the numeric identifier of Toronto instead of 'America/Toronto', until sometime decides to add historical data for Ottawa's own tz history, at which point it would adopt the identifier for Ottawa.

10 69

Value of data ...
by Lester Caine Sept. 3, 2013

Sept. 3, 2013

Norbert supplied a link to a ecma document which makes interesting reading ... From the section on 'Time Zone Names' > All registered Zone and Link names are allowed. Implementations must recognize all such names, and use > best available current and historical information about their offsets from UTC and their daylight saving time > rules in calculations. Note the use of 'and historical information' here. One has to bare in mind the target data set when deciding what data is useful and what can be thrown away, and for much day to day work a TZ database that only provides future 'estimated' data is probably more than adequate. Banks may be able to get away with 'it's ten years old so we can throw it away' and take control of dormant funds, but for some of us the history is as important as the present day. In fifty years time a large proportion of the data we are creating today will still be available. I dug out material going back 200+ years last night which has now been scanned and archived ... material on 'time' in the Isle of Man for the record ... which helps to clarify calculations for UTC time offsets for material in the early 1900's, which if now stored as UTC normalised data need to be 'corrected' using an historic version of the TZ data. If someone tries to use that data with a 'winnowed' data set, then the wrong times will be returned? Who is to say what an end user is going to be doing with their machine? All right you can reduce 440 zones down to 300 or so, but all of the original 440 names still need to be available, and in these days does saving a few bytes really matter? 'Simplification' of access is more to do with showing the appropriate subset of options by the application and historical ones may actually be the correct answer. So the data should be as complete a record of the 'best available current and historical information' that we have! Providing a version of the data that will be WRONG for some users is not an option? -- Lester Caine - G8HFL ----------------------------- Contact - http://lsces.co.uk/wiki/?page=contact L.S.Caine Electronic Services - http://lsces.co.uk EnquirySolve - http://enquirysolve.com/ Model Engineers Digital Workshop - http://medw.co.uk Rainbow Digital Media - http://rainbowdigitalmedia.co.uk

2 2

[PATCH] Revert recent pre-1970 changes.
by Paul Eggert Sept. 3, 2013

Sept. 3, 2013

Other tz file readers had problems with the new pre1970 file, so remove it and related changes. To recover the pre-1970 data, instead change pre-1970 Zone entries in other files back to what they were. Perhaps we'll try to find a better way someday. * .gitignore: Remove back-pre1970. * Makefile (BACKWARD): Remove. All uses changed back to 'backward'. (AWK_SCRIPTS): Remove back-pre1970.awk. (back-pre1970): Remove. (clean_misc): Don't rm back-pre1970. (check_public): Remove special case for pre1970. * back-pre1970.awk, pre1970: Remove. * backward (America/Anguilla, America/Antigua, America/Aruba) (America/Atikokan, America/Blanc-Sablon, America/Cayman) (America/Creston, America/Curacao, America/Dominica, America/Grenada) (America/Guadeloupe, America/Montreal, America/Montserrat) (America/Nassau, America/Port_of_Spain, America/St_Kitts) (America/St_Lucia, America/St_Thomas, America/St_Vincent) (America/Tortola): Remove, as these are zones again. (America/Coral_Harbour, America/Kralendijk, America/Lower_Princes) (America/Marigot, America/St_Barthelemy, America/Virgin): Revert to previous links. * northamerica (Mont, America/Blanc-Sablon, America/Montreal) (America/Atikokan, America/Creston, America/Anguilla, America/Antigua) (Bahamas, America/Nassau, America/Cayman, America/Dominica) (America/Grenada, America/Guadeloupe, America/Montserrat) (America/St_Kitts, America/St_Lucia, America/St_Vincent) (America/Tortola, America/St_Thomas): * southamerica (America/Aruba, America/Curacao, America/Port_of_Spain): Restore these rules and zones. * .gitignore: Add back-pre1970. --- .gitignore | 1 - Makefile | 34 ++----- back-pre1970.awk | 18 ---- backward | 32 ++---- northamerica | 140 ++++++++++++++++++++------ pre1970 | 291 ------------------------------------------------------- southamerica | 20 +++- 7 files changed, 140 insertions(+), 396 deletions(-) delete mode 100644 back-pre1970.awk delete mode 100644 pre1970 diff --git a/.gitignore b/.gitignore index 28b1bc9..18dbbcc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ *.txt *~ ChangeLog -back-pre1970 date leapseconds time.tab diff --git a/Makefile b/Makefile index ffddb08..e439055 100644 --- a/Makefile +++ b/Makefile @@ -49,22 +49,6 @@ POSIXRULES= America/New_York ZONETABTYPE= zone -# How to support obsolescent time zones in a backward-compatible way. -# This variable affects only pre-1970 time stamps, on hosts that support them. -# It has two possible values, 'backward' and 'pre1970 back-pre1970'. -# -# 'backward' is the traditional approach, and is simpler and more efficient; -# it is designed to generate one zone for each region where clocks have agreed -# since 1970. -# -# 'pre1970 back-pre1970' can generate more than one zone in that situation, -# which means it can preserve a bit of pre-1970 data that 'backward' does not; -# almost all pre-1970 data is missing, though, so don't get your hopes up. -# -# Sometimes 'backward' is more-compatible with earlier versions of this database, -# and sometimes 'pre1970 back-pre1970' is; it depends on the situation. -BACKWARD= backward - # Also see TZDEFRULESTRING below, which takes effect only # if the time zone files cannot be accessed. @@ -338,7 +322,7 @@ COMMON= Makefile DOCS= README Theory $(MANS) date.1 PRIMARY_YDATA= africa antarctica asia australasia \ europe northamerica southamerica -YDATA= $(PRIMARY_YDATA) pacificnew etcetera $(BACKWARD) +YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward NDATA= systemv factory SDATA= solar87 solar88 solar89 TDATA= $(YDATA) $(NDATA) $(SDATA) @@ -346,10 +330,10 @@ TABDATA= iso3166.tab time.tab zone.tab DATA= $(YDATA) $(NDATA) $(SDATA) $(TABDATA) \ leap-seconds.list yearistype.sh WEB_PAGES= tz-art.htm tz-link.htm -AWK_SCRIPTS= back-pre1970.awk checktab.awk leapseconds.awk zone-time.awk +AWK_SCRIPTS= checktab.awk leapseconds.awk zone-time.awk MISC= usno1988 usno1989 usno1989a usno1995 usno1997 usno1998 \ - $(WEB_PAGES) $(AWK_SCRIPTS) \ - workman.sh zoneinfo2tdf.pl + $(WEB_PAGES) $(AWK_SCRIPTS) workman.sh \ + zoneinfo2tdf.pl ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) # And for the benefit of csh users on systems that assume the user @@ -440,9 +424,6 @@ zones: $(REDO) time.tab: $(YDATA) zone.tab zone-time.awk $(AWK) -f zone-time.awk $(YDATA) >$@ -back-pre1970: pre1970 backward - $(AWK) -v pre1970=pre1970 -f $@.awk backward >$@ - $(TZLIB): $(LIBOBJS) -mkdir $(TOPDIR) $(LIBDIR) ar ru $@ $(LIBOBJS) @@ -477,7 +458,7 @@ check_web: $(WEB_PAGES) clean_misc: rm -f core *.o *.out \ - back-pre1970 time.tab \ + time.tab \ date leapseconds tzselect version.h zdump zic yearistype clean: clean_misc rm -f -r tzpublic @@ -509,7 +490,7 @@ set-timestamps: $$cmd || exit; \ done -# The zics below ensure that each non-pre1970 data file can stand on its own. +# The zics below ensure that each data file can stand on its own. # We also do an all-files run to catch links to links. check_public: $(ENCHILADA) @@ -517,8 +498,7 @@ check_public: $(ENCHILADA) make "CFLAGS=$(GCC_DEBUG_FLAGS)" mkdir tzpublic for i in $(TDATA) ; do \ - test $$i = pre1970 || $(zic) -v -d tzpublic $$i 2>&1 \ - || exit; \ + $(zic) -v -d tzpublic $$i 2>&1 || exit; \ done $(zic) -v -d tzpublic $(TDATA) rm -f -r tzpublic diff --git a/back-pre1970.awk b/back-pre1970.awk deleted file mode 100644 index f7c54fc..0000000 --- a/back-pre1970.awk +++ /dev/null @@ -1,18 +0,0 @@ -# Generate 'back-pre1970' from the two input files 'pre1970' and 'backward'. -# The output consists of all lines in 'backward' that are not links to -# files mentioned in 'pre1970'. Think of it as 'backward' minus 'pre1970'. - -# The 'backward' file is the input. -# The awk variable 'pre1970' contains the name of the pre1970 file. - -# This file is in the public domain. - -# Contributed by Paul Eggert. - -BEGIN { - while ((getline <pre1970) == 1) - if ($1 == "Zone") - pre1970_zone[$2] = 1 -} - -! (/^Link/ && pre1970_zone[$3]) { print } diff --git a/backward b/backward index efb5353..561e2ff 100644 --- a/backward +++ b/backward @@ -7,47 +7,27 @@ Link Africa/Asmara Africa/Asmera Link Africa/Bamako Africa/Timbuktu -Link America/Puerto_Rico America/Anguilla -Link America/Puerto_Rico America/Antigua Link America/Argentina/Catamarca America/Argentina/ComodRivadavia -Link America/Puerto_Rico America/Aruba -Link America/Panama America/Atikokan Link America/Adak America/Atka -Link America/Puerto_Rico America/Blanc-Sablon Link America/Argentina/Buenos_Aires America/Buenos_Aires Link America/Argentina/Catamarca America/Catamarca -Link America/Panama America/Cayman -Link America/Panama America/Coral_Harbour +Link America/Atikokan America/Coral_Harbour Link America/Argentina/Cordoba America/Cordoba -Link America/Phoenix America/Creston -Link America/Puerto_Rico America/Curacao -Link America/Puerto_Rico America/Dominica Link America/Tijuana America/Ensenada Link America/Indiana/Indianapolis America/Fort_Wayne -Link America/Puerto_Rico America/Grenada -Link America/Puerto_Rico America/Guadeloupe Link America/Indiana/Indianapolis America/Indianapolis Link America/Argentina/Jujuy America/Jujuy Link America/Indiana/Knox America/Knox_IN -Link America/Puerto_Rico America/Kralendijk +Link America/Curacao America/Kralendijk Link America/Kentucky/Louisville America/Louisville -Link America/Puerto_Rico America/Lower_Princes -Link America/Puerto_Rico America/Marigot +Link America/Curacao America/Lower_Princes +Link America/Guadeloupe America/Marigot Link America/Argentina/Mendoza America/Mendoza -Link America/Toronto America/Montreal -Link America/Puerto_Rico America/Montserrat -Link America/Toronto America/Nassau -Link America/Puerto_Rico America/Port_of_Spain Link America/Rio_Branco America/Porto_Acre Link America/Argentina/Cordoba America/Rosario Link America/Denver America/Shiprock -Link America/Puerto_Rico America/St_Barthelemy -Link America/Puerto_Rico America/St_Kitts -Link America/Puerto_Rico America/St_Lucia -Link America/Puerto_Rico America/St_Thomas -Link America/Puerto_Rico America/St_Vincent -Link America/Puerto_Rico America/Tortola -Link America/Puerto_Rico America/Virgin +Link America/Guadeloupe America/St_Barthelemy +Link America/St_Thomas America/Virgin Link Pacific/Auckland Antarctica/McMurdo Link Pacific/Auckland Antarctica/South_Pole Link Europe/Oslo Arctic/Longyearbyen diff --git a/northamerica b/northamerica index 6210318..418261f 100644 --- a/northamerica +++ b/northamerica @@ -1341,9 +1341,13 @@ Zone America/Moncton -4:19:08 - LMT 1883 Dec 9 # Quebec -# From Paul Eggert (2013-08-26): +# From Paul Eggert (2013-08-30): # Since 1970 most of Quebec has been like Toronto. -# See America/Toronto. +# However, because earlier versions of the tz database mistakenly relied on data +# from Shanks & Pottenger saying that Quebec differed from Ontario after 1970, +# a separate entry was created for most of Quebec. We're loath to lose +# its pre-1970 info, even though the tz database is normally limited to +# zones that differ after 1970, so keep this otherwise out-of-scope entry. # Matthews and Vincent (1998) also write that Quebec east of the -63 # meridian is supposed to observe AST, but residents as far east as @@ -1357,7 +1361,50 @@ Zone America/Moncton -4:19:08 - LMT 1883 Dec 9 # says this common practice was codified into law as of 2007. # For lack of better info, guess this practice began around 1970, contra to # Shanks & Pottenger who have this region observing AST/ADT. -# See America/Puerto_Rico. +# for post-1970 data America/Puerto_Rico. + +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule Mont 1917 only - Mar 25 2:00 1:00 D +Rule Mont 1917 only - Apr 24 0:00 0 S +Rule Mont 1919 only - Mar 31 2:30 1:00 D +Rule Mont 1919 only - Oct 25 2:30 0 S +Rule Mont 1920 only - May 2 2:30 1:00 D +Rule Mont 1920 1922 - Oct Sun>=1 2:30 0 S +Rule Mont 1921 only - May 1 2:00 1:00 D +Rule Mont 1922 only - Apr 30 2:00 1:00 D +Rule Mont 1924 only - May 17 2:00 1:00 D +Rule Mont 1924 1926 - Sep lastSun 2:30 0 S +Rule Mont 1925 1926 - May Sun>=1 2:00 1:00 D +# The 1927-to-1937 rules can be expressed more simply as +# Rule Mont 1927 1937 - Apr lastSat 24:00 1:00 D +# Rule Mont 1927 1937 - Sep lastSat 24:00 0 S +# The rules below avoid use of 24:00 +# (which pre-1998 versions of zic cannot handle). +Rule Mont 1927 only - May 1 0:00 1:00 D +Rule Mont 1927 1932 - Sep lastSun 0:00 0 S +Rule Mont 1928 1931 - Apr lastSun 0:00 1:00 D +Rule Mont 1932 only - May 1 0:00 1:00 D +Rule Mont 1933 1940 - Apr lastSun 0:00 1:00 D +Rule Mont 1933 only - Oct 1 0:00 0 S +Rule Mont 1934 1939 - Sep lastSun 0:00 0 S +Rule Mont 1946 1973 - Apr lastSun 2:00 1:00 D +Rule Mont 1945 1948 - Sep lastSun 2:00 0 S +Rule Mont 1949 1950 - Oct lastSun 2:00 0 S +Rule Mont 1951 1956 - Sep lastSun 2:00 0 S +Rule Mont 1957 1973 - Oct lastSun 2:00 0 S + +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Blanc-Sablon -3:48:28 - LMT 1884 + -4:00 Canada A%sT 1970 + -4:00 - AST +Zone America/Montreal -4:54:16 - LMT 1884 + -5:00 Mont E%sT 1918 + -5:00 Canada E%sT 1919 + -5:00 Mont E%sT 1942 Feb 9 2:00s + -5:00 Canada E%sT 1946 + -5:00 Mont E%sT 1974 + -5:00 Canada E%sT + # Ontario @@ -1423,16 +1470,14 @@ Zone America/Moncton -4:19:08 - LMT 1883 Dec 9 # can say for certain that Atikokan has been practicing the current # time keeping since 1952, at least. -# From Paul Eggert (2013-08-26): +# From Paul Eggert (2006-07-17): # Shanks & Pottenger say that Atikokan has agreed with Rainy River # ever since standard time was introduced, but the information from # McKinnon sounds more authoritative. For now, assume that Atikokan # switched to EST immediately after WWII era daylight saving time # ended. This matches the old (less-populous) America/Coral_Harbour # entry since our cutoff date of 1970, so we can move -# America/Coral_Harbour to the 'backward' file. And Atikokan itself -# is the same as America/Panama since 1970, so we can move -# America/Atikokan to the 'backward' file as well. +# America/Coral_Harbour to the 'backward' file. # From Mark Brader (2010-03-06): # @@ -1590,6 +1635,11 @@ Zone America/Rainy_River -6:18:16 - LMT 1895 -6:00 Canada C%sT 1940 Sep 29 -6:00 1:00 CDT 1942 Feb 9 2:00s -6:00 Canada C%sT +Zone America/Atikokan -6:06:28 - LMT 1895 + -6:00 Canada C%sT 1940 Sep 29 + -6:00 1:00 CDT 1942 Feb 9 2:00s + -6:00 Canada C%sT 1945 Sep 30 2:00 + -5:00 - EST # Manitoba @@ -1824,8 +1874,7 @@ Zone America/Edmonton -7:33:52 - LMT 1906 Sep # period should be PDT rather than MST, but that doesn't seem important enough # (to anyone) to further complicate the rules. -# From Paul Eggert (2013-08-26): -# See America/Phoenix, since Creston has agreed with Phoenix since 1970. +# The transition dates (and times) are guesses. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Vanc 1918 only - Apr 14 2:00 1:00 D @@ -1845,6 +1894,10 @@ Zone America/Dawson_Creek -8:00:56 - LMT 1884 -8:00 Canada P%sT 1947 -8:00 Vanc P%sT 1972 Aug 30 2:00 -7:00 - MST +Zone America/Creston -7:46:04 - LMT 1884 + -7:00 - MST 1916 Oct 1 + -8:00 - PST 1918 Jun 2 + -7:00 - MST # Northwest Territories, Nunavut, Yukon @@ -2495,10 +2548,15 @@ Zone America/Santa_Isabel -7:39:28 - LMT 1922 Jan 1 0:20:32 ############################################################################### # Anguilla -# See America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Anguilla -4:12:16 - LMT 1912 Mar 2 + -4:00 - AST # Antigua and Barbuda -# See America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Antigua -4:07:12 - LMT 1912 Mar 2 + -5:00 - EST 1951 + -4:00 - AST # Bahamas # @@ -2508,8 +2566,14 @@ Zone America/Santa_Isabel -7:39:28 - LMT 1922 Jan 1 0:20:32 # The Bahamas announced about a month ago that they plan to change their DST # rules to sync with the U.S. starting in 2007.... # http://www.jonesbahamas.com/?c=45&a=10412 -# -# See America/Toronto. + +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S +Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Nassau -5:09:30 - LMT 1912 Mar 2 + -5:00 Bahamas E%sT 1976 + -5:00 US E%sT # Barbados @@ -2559,7 +2623,10 @@ Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton -4:00 US A%sT # Cayman Is -# See America/Panama. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown + -5:07:12 - KMT 1912 Feb # Kingston Mean Time + -5:00 - EST # Costa Rica @@ -2805,7 +2872,9 @@ Zone America/Havana -5:29:28 - LMT 1890 -5:00 Cuba C%sT # Dominica -# See America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Dominica -4:05:36 - LMT 1911 Jul 1 0:01 # Roseau + -4:00 - AST # Dominican Republic @@ -2854,10 +2923,15 @@ Zone America/El_Salvador -5:56:48 - LMT 1921 # San Salvador -6:00 Salv C%sT # Grenada -# See America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Grenada -4:07:00 - LMT 1911 Jul # St George's + -4:00 - AST # Guadeloupe -# See America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Guadeloupe -4:06:08 - LMT 1911 Jun 8 # Pointe a Pitre + -4:00 - AST +# Use America/Guadeloupe also for St Barthelemy and for St Martin (French part). # Guatemala # @@ -3027,7 +3101,9 @@ Zone America/Martinique -4:04:20 - LMT 1890 # Fort-de-France # From Paul Eggert (2006-03-22): # In 1995 volcanic eruptions forced evacuation of Plymouth, the capital. # world.gazetteer.com says Cork Hill is the most populous location now. -# See America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Montserrat -4:08:52 - LMT 1911 Jul 1 0:01 # Cork Hill + -4:00 - AST # Nicaragua # @@ -3108,17 +3184,16 @@ Zone America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12:00 # San Juan -4:00 US A%sT 1946 -4:00 - AST -# St Barthelemy -# See America/Puerto_Rico. - # St Kitts-Nevis -# See America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/St_Kitts -4:10:52 - LMT 1912 Mar 2 # Basseterre + -4:00 - AST # St Lucia -# See America/Puerto_Rico. - -# St Martin (French part) -# See America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/St_Lucia -4:04:00 - LMT 1890 # Castries + -4:04:00 - CMT 1912 # Castries Mean Time + -4:00 - AST # St Pierre and Miquelon # There are too many St Pierres elsewhere, so we'll use `Miquelon'. @@ -3129,7 +3204,10 @@ Zone America/Miquelon -3:44:40 - LMT 1911 May 15 # St Pierre -3:00 Canada PM%sT # St Vincent and the Grenadines -# See America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/St_Vincent -4:04:56 - LMT 1890 # Kingstown + -4:04:56 - KMT 1912 # Kingstown Mean Time + -4:00 - AST # Turks and Caicos # @@ -3163,7 +3241,11 @@ Zone America/Grand_Turk -4:44:32 - LMT 1890 -5:00 TC E%sT # British Virgin Is -# See America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Tortola -4:18:28 - LMT 1911 Jul # Road Town + -4:00 - AST # Virgin Is -# See America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/St_Thomas -4:19:44 - LMT 1911 Jul # Charlotte Amalie + -4:00 - AST diff --git a/pre1970 b/pre1970 deleted file mode 100644 index d8b8f34..0000000 --- a/pre1970 +++ /dev/null @@ -1,291 +0,0 @@ -# Pre-1970 data - -# This file is in the public domain. - -# This file contains zones that were formerly in other source files, -# but were later removed or replaced by backward-compatibility links -# as they differ from other zones only in pre-1970 time stamps. - -# Although the tz database focuses on post-1970 time stamps, these -# entries are retained here as they may be of some use to people -# interested in pre-1970 time stamps, even though they cover only a -# tiny sliver of pre-1970 data and are unreliable for that data. -# Also, these entries can help with backward compatibility with some -# old versions of the tz database. They are incompatible with other -# old versions of the database, though; it depends on which old -# version you're interested in. - -# Entries are sorted by Zone name. Each entry is preceded by the name -# of the country that the entry is in, along with any other commentary -# and rules associated with the entry. Some rules, e.g., 'Canada', -# are defined by other source files; this file is not intended to be -# used without those other files. - -# Zone NAME GMTOFF RULES FORMAT [UNTIL] - -# Mali -# no longer different from Bamako, but too famous to omit -Zone Africa/Timbuktu -0:12:04 - LMT 1912 - 0:00 - GMT - -# Anguilla -Zone America/Anguilla -4:12:16 - LMT 1912 Mar 2 - -4:00 - AST - -# Antigua and Barbuda -Zone America/Antigua -4:07:12 - LMT 1912 Mar 2 - -5:00 - EST 1951 - -4:00 - AST - -# Argentina -# Chubut (CH) -# The name "Comodoro Rivadavia" exceeds the 14-byte POSIX limit. -Zone America/Argentina/ComodRivadavia -4:30:00 - LMT 1894 Oct 31 - -4:16:48 - CMT 1920 May - -4:00 - ART 1930 Dec - -4:00 Arg AR%sT 1969 Oct 5 - -3:00 Arg AR%sT 1991 Mar 3 - -4:00 - WART 1991 Oct 20 - -3:00 Arg AR%sT 1999 Oct 3 - -4:00 Arg AR%sT 2000 Mar 3 - -3:00 - ART 2004 Jun 1 - -4:00 - WART 2004 Jun 20 - -3:00 - ART - -# Aruba -Zone America/Aruba -4:40:24 - LMT 1912 Feb 12 # Oranjestad - -4:30 - ANT 1965 # Netherlands Antilles Time - -4:00 - AST - -# Canada - -Zone America/Atikokan -6:06:28 - LMT 1895 - -6:00 Canada C%sT 1940 Sep 29 - -6:00 1:00 CDT 1942 Feb 9 2:00s - -6:00 Canada C%sT 1945 Sep 30 2:00 - -5:00 - EST - -Zone America/Blanc-Sablon -3:48:28 - LMT 1884 - -4:00 Canada A%sT 1970 - -4:00 - AST - -# Cayman Is -Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown - -5:07:12 - KMT 1912 Feb # Kingston Mean Time - -5:00 - EST - -# Canada -Zone America/Coral_Harbour -5:32:40 - LMT 1884 - -5:00 NT_YK E%sT 1946 - -5:00 - EST - -# Curacao -Zone America/Curacao -4:35:47 - LMT 1912 Feb 12 # Willemstad - -4:30 - ANT 1965 # Netherlands Antilles Time - -4:00 - AST - -# Dominica -Zone America/Dominica -4:05:36 - LMT 1911 Jul 1 0:01 # Roseau - -4:00 - AST - -# Mexico -Zone America/Ensenada -7:46:28 - LMT 1922 Jan 1 0:13:32 - -8:00 - PST 1927 Jun 10 23:00 - -7:00 - MST 1930 Nov 16 - -8:00 - PST 1942 Apr - -7:00 - MST 1949 Jan 14 - -8:00 - PST 1996 - -8:00 Mexico P%sT - -# US -Zone America/Fort_Wayne -5:00 US E%sT 1946 - -5:00 - EST # Always EST as of 1986 - -# Grenada -Zone America/Grenada -4:07:00 - LMT 1911 Jul # St George's - -4:00 - AST - -# Guadeloupe -Zone America/Guadeloupe -4:06:08 - LMT 1911 Jun 8 # Pointe a Pitre - -4:00 - AST - -# Canada -# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Mont 1917 only - Mar 25 2:00 1:00 D -Rule Mont 1917 only - Apr 24 0:00 0 S -Rule Mont 1919 only - Mar 31 2:30 1:00 D -Rule Mont 1919 only - Oct 25 2:30 0 S -Rule Mont 1920 only - May 2 2:30 1:00 D -Rule Mont 1920 1922 - Oct Sun>=1 2:30 0 S -Rule Mont 1921 only - May 1 2:00 1:00 D -Rule Mont 1922 only - Apr 30 2:00 1:00 D -Rule Mont 1924 only - May 17 2:00 1:00 D -Rule Mont 1924 1926 - Sep lastSun 2:30 0 S -Rule Mont 1925 1926 - May Sun>=1 2:00 1:00 D -# The 1927-to-1937 rules can be expressed more simply as -# Rule Mont 1927 1937 - Apr lastSat 24:00 1:00 D -# Rule Mont 1927 1937 - Sep lastSat 24:00 0 S -# The rules below avoid use of 24:00 -# (which pre-1998 versions of zic cannot handle). -Rule Mont 1927 only - May 1 0:00 1:00 D -Rule Mont 1927 1932 - Sep lastSun 0:00 0 S -Rule Mont 1928 1931 - Apr lastSun 0:00 1:00 D -Rule Mont 1932 only - May 1 0:00 1:00 D -Rule Mont 1933 1940 - Apr lastSun 0:00 1:00 D -Rule Mont 1933 only - Oct 1 0:00 0 S -Rule Mont 1934 1939 - Sep lastSun 0:00 0 S -Rule Mont 1946 1973 - Apr lastSun 2:00 1:00 D -Rule Mont 1945 1948 - Sep lastSun 2:00 0 S -Rule Mont 1949 1950 - Oct lastSun 2:00 0 S -Rule Mont 1951 1956 - Sep lastSun 2:00 0 S -Rule Mont 1957 1973 - Oct lastSun 2:00 0 S -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone America/Montreal -4:54:16 - LMT 1884 - -5:00 Mont E%sT 1918 - -5:00 Canada E%sT 1919 - -5:00 Mont E%sT 1942 Feb 9 2:00s - -5:00 Canada E%sT 1946 - -5:00 Mont E%sT 1974 - -5:00 Canada E%sT - -# Montserrat -Zone America/Montserrat -4:08:52 - LMT 1911 Jul 1 0:01 # Cork Hill - -4:00 - AST - -# Bahamas -# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S -Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone America/Nassau -5:09:30 - LMT 1912 Mar 2 - -5:00 Bahamas E%sT 1976 - -5:00 US E%sT - -# Trinidad and Tobago -Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2 - -4:00 - AST - -# Brazil -# Rio_Branco is too ambiguous, since there's a Rio Branco in Uruguay too. -Zone America/Porto_Acre -4:31:12 - LMT 1914 - -5:00 Brazil AC%sT 1988 Sep 12 - -5:00 - ACT - -# Argentina -# Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC), -# Formosa (FM), La Pampa (LP), Chubut (CH) -Zone America/Rosario -4:02:40 - LMT 1894 Nov - -4:16:44 - CMT 1920 May - -4:00 - ART 1930 Dec - -4:00 Arg AR%sT 1969 Oct 5 - -3:00 Arg AR%sT 1991 Jul - -3:00 - ART 1999 Oct 3 0:00 - -4:00 Arg AR%sT 2000 Mar 3 0:00 - -3:00 - ART - -# St Kitts-Nevis -Zone America/St_Kitts -4:10:52 - LMT 1912 Mar 2 # Basseterre - -4:00 - AST - -# St Lucia -Zone America/St_Lucia -4:04:00 - LMT 1890 # Castries - -4:04:00 - CMT 1912 # Castries Mean Time - -4:00 - AST - -# Virgin Is -Zone America/St_Thomas -4:19:44 - LMT 1911 Jul # Charlotte Amalie - -4:00 - AST - -# St Vincent and the Grenadines -Zone America/St_Vincent -4:04:56 - LMT 1890 # Kingstown - -4:04:56 - KMT 1912 # Kingstown Mean Time - -4:00 - AST - -# British Virgin Is -Zone America/Tortola -4:18:28 - LMT 1911 Jul # Road Town - -4:00 - AST - -# McMurdo, Ross Island, since 1955-12 -Zone Antarctica/McMurdo 0 - zzz 1956 - 12:00 NZAQ NZ%sT - -# Japan -Zone Asia/Ishigaki 8:16:36 - LMT 1896 - 8:00 - CST - -# Israel -Zone Asia/Tel_Aviv 2:19:04 - LMT 1880 - 2:21 - JMT 1918 - 2:00 Zion I%sT - -# Russia -Zone Asia/Tomsk 5:39:52 - LMT 1924 May 2 - 6:00 - TSK 1957 Mar - 7:00 Russia TS%s 1991 Mar 31 2:00s - 6:00 1:00 TSD 1991 Sep 29 2:00s - 6:00 - TSK 1992 Jan 19 2:00s - 7:00 Russia TS%s - -# Svalbard & Jan Mayen -Zone Atlantic/Jan_Mayen -1:00 - EGT - -# Australia -Zone Australia/Canberra 9:56:32 - LMT 1895 Feb - 10:00 - EST 1917 Jan 1 0:01 - 10:00 Aus EST 1971 Oct 31 2:00 - 10:00 AN EST 1981 Oct 25 2:00 - 10:00 1:00 EST 1982 Apr 4 3:00 - 10:00 AN EST - -# UK -Zone Europe/Belfast -0:23:40 - LMT 1880 Aug 2 - -0:25:21 - DMT 1916 May 21 2:00 # Dublin/Dunsink MT - -0:25:21 1:00 IST 1916 Oct 1 2:00s # Irish Summer Time - 0:00 GB-Eire %s 1968 Oct 27 - 1:00 - BST 1971 Oct 31 2:00u - 0:00 GB-Eire %s 1996 - 0:00 EU GMT/BST - -# Slovenia -Zone Europe/Ljubljana 0:58:04 - LMT 1884 - 1:00 - CET 1941 Apr 18 23:00 - 1:00 C-Eur CE%sT 1945 May 8 2:00s - 1:00 1:00 CEST 1945 Sep 16 2:00s - 1:00 - CET 1982 Nov 27 - 1:00 EU CE%sT - -# Bosnia and Herzegovina -Zone Europe/Sarajevo 1:13:40 - LMT 1884 - 1:00 - CET 1941 Apr 18 23:00 - 1:00 C-Eur CE%sT 1945 May 8 2:00s - 1:00 1:00 CEST 1945 Sep 16 2:00s - 1:00 - CET 1982 Nov 27 - 1:00 EU CE%sT - -# Macedonia -Zone Europe/Skopje 1:25:44 - LMT 1884 - 1:00 - CET 1941 Apr 18 23:00 - 1:00 C-Eur CE%sT 1945 May 8 2:00s - 1:00 1:00 CEST 1945 Sep 16 2:00s - 1:00 - CET 1982 Nov 27 - 1:00 EU CE%sT - -# Moldova -Zone Europe/Tiraspol 1:58:32 - LMT 1880 - 1:55 - CMT 1918 Feb 15 # Chisinau MT - 1:44:24 - BMT 1931 Jul 24 # Bucharest MT - 2:00 Romania EE%sT 1940 Aug 15 - 2:00 1:00 EEST 1941 Jul 17 - 1:00 C-Eur CE%sT 1944 Aug 24 - 3:00 Russia MSK/MSD 1991 Mar 31 2:00 - 2:00 Russia EE%sT 1992 Jan 19 2:00 - 3:00 Russia MSK/MSD - -# Croatia -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Europe/Zagreb 1:03:52 - LMT 1884 - 1:00 - CET 1941 Apr 18 23:00 - 1:00 C-Eur CE%sT 1945 May 8 2:00s - 1:00 1:00 CEST 1945 Sep 16 2:00s - 1:00 - CET 1982 Nov 27 - 1:00 EU CE%sT diff --git a/southamerica b/southamerica index 59f5fe7..ff47cef 100644 --- a/southamerica +++ b/southamerica @@ -631,7 +631,10 @@ Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31 -3:00 - ART # Aruba -# See America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Aruba -4:40:24 - LMT 1912 Feb 12 # Oranjestad + -4:30 - ANT 1965 # Netherlands Antilles Time + -4:00 - AST # Bolivia # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1325,7 +1328,7 @@ Zone America/Bogota -4:56:16 - LMT 1884 Mar 13 # Curacao -# Milne gives 4:35:46.9 for Curacao mean time. +# Milne gives 4:35:46.9 for Curacao mean time; round to nearest. # # From Paul Eggert (2006-03-22): # Shanks & Pottenger say that The Bottom and Philipsburg have been at @@ -1341,7 +1344,14 @@ Zone America/Bogota -4:56:16 - LMT 1884 Mar 13 # Netherlands as Kingdom Islands. This won't affect their time zones # though, as far as we know. # -# For all these regions, see America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Curacao -4:35:47 - LMT 1912 Feb 12 # Willemstad + -4:30 - ANT 1965 # Netherlands Antilles Time + -4:00 - AST + +# Sint Maarten +# Caribbean Netherlands +# Use America/Curacao. # Ecuador # @@ -1615,7 +1625,9 @@ Zone America/Paramaribo -3:40:40 - LMT 1911 -3:00 - SRT # Trinidad and Tobago -# See America/Puerto_Rico. +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2 + -4:00 - AST # Uruguay # From Paul Eggert (1993-11-18): -- 1.8.1.2

7 38