Distinguish hyphen from minus from dashes.

Most of this patch is to commentary, to distinguish better among
the similar characters hyphen '-', minus sign '−', en dash '–' (used
for ranges), and em dash '—'.  Render ordinary dashes in text as
spaced en dashes, as this gives better-looking results in monospaced
fonts.
* yearistype.sh, zic.c: Reword diagnostics so that they do not use
hyphens as if they were dashes.  Since we are sticking to ASCII in
programs, we can't use proper dashes in diagnostics.
This commit is contained in:
Paul Eggert
2014-06-17 18:46:31 -07:00
parent 1d41c06051
commit a577b388f3
21 changed files with 758 additions and 752 deletions
+59 -59
View File
@@ -29,7 +29,7 @@
# I suggest the use of _Summer time_ instead of the more cumbersome
# _daylight-saving time_. _Summer time_ seems to be in general use
# in Europe and South America.
# -- E O Cutler, _New York Times_ (1937-02-14), quoted in
# — E O Cutler, _New York Times_ (1937-02-14), quoted in
# H L Mencken, _The American Language: Supplement I_ (1960), p 466
#
# Earlier editions of these tables also used the North American style
@@ -37,18 +37,18 @@
# "summer time". Reinaldo Goulart, a São Paulo businessman active in
# the railroad sector, writes (1999-07-06):
# The subject of time zones is currently a matter of discussion/debate in
# Brazil. Let's say that "the Brasilia time" is considered the
# "official time" because Brasilia is the capital city.
# The other three time zones are called "Brasilia time "minus one" or
# Brazil. Let's say that "the Brasília time" is considered the
# "official time" because Brasília is the capital city.
# The other three time zones are called "Brasília time "minus one" or
# "plus one" or "plus two". As far as I know there is no such
# name/designation as "Eastern Time" or "Central Time".
# So I invented the following (English-language) abbreviations for now.
# Corrections are welcome!
# std dst
# -2:00 FNT FNST Fernando de Noronha
# -3:00 BRT BRST Brasilia
# -4:00 AMT AMST Amazon
# -5:00 ACT ACST Acre
# 2:00 FNT FNST Fernando de Noronha
# 3:00 BRT BRST Brasília
# 4:00 AMT AMST Amazon
# 5:00 ACT ACST Acre
###############################################################################
@@ -60,7 +60,7 @@
# Argentina: first Sunday in October to first Sunday in April since 1976.
# Double Summer time from 1969 to 1974. Switches at midnight.
# From U. S. Naval Observatory (1988-01-199):
# From U. S. Naval Observatory (1988-01-19):
# ARGENTINA 3 H BEHIND UTC
# From Hernan G. Otero (1995-06-26):
@@ -118,7 +118,7 @@ Rule Arg 2000 only - Mar 3 0:00 0 -
# From Peter Gradelski via Steffen Thorsen (2000-03-01):
# We just checked with our São Paulo office and they say the government of
# Argentina decided not to become one of the countries that go on or off DST.
# So Buenos Aires should be -3 hours from GMT at all times.
# So Buenos Aires should be 3 hours from GMT at all times.
#
# From Fabián L. Arce Jofré (2000-04-04):
# The law that claimed DST for Argentina was derogated by President Fernando
@@ -146,7 +146,7 @@ Rule Arg 2000 only - Mar 3 0:00 0 -
# http://www.clarin.com.ar/diario/2001-06-22/s-03601.htm
# It remains the vote of the Deputies..., but it will be the same....
# This kind of things had always been done this way in Argentina.
# We are still -03:00 all year round in all of the country.
# We are still 03:00 all year round in all of the country.
#
# From Steffen Thorsen (2007-12-21):
# A user (Leonardo Chaim) reported that Argentina will adopt DST....
@@ -229,7 +229,7 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
# Hora de verano para la Republica Argentina (2003-06-08)
# <http://www.spicasc.net/horvera.html>
# says that standard time in Argentina from 1894-10-31
# to 1920-05-01 was -4:16:48.25. Go with this more-precise value
# to 1920-05-01 was 4:16:48.25. Go with this more-precise value
# over Shanks & Pottenger.
#
# From Mariano Absatz (2004-06-05):
@@ -237,16 +237,16 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
# http://www.lanacion.com.ar/04/05/27/de_604825.asp
# http://www.lanacion.com.ar/04/05/28/de_605203.asp
#
# The following eight (8) provinces pulled clocks back to UTC-04:00 at
# The following eight (8) provinces pulled clocks back to UTC04:00 at
# midnight Monday May 31st. (that is, the night between 05/31 and 06/01).
# Apparently, all nine provinces would go back to UTC-03:00 at the same
# Apparently, all nine provinces would go back to UTC03:00 at the same
# time in October 17th.
#
# Catamarca, Chubut, La Rioja, San Juan, San Luis, Santa Cruz,
# Tierra del Fuego, Tucumán.
#
# From Mariano Absatz (2004-06-14):
# ... this weekend, the Province of Tucumán decided it'd go back to UTC-03:00
# ... this weekend, the Province of Tucumán decided it'd go back to UTC03:00
# yesterday midnight (that is, at 24:00 Saturday 12th), since the people's
# annoyance with the change is much higher than the power savings obtained....
#
@@ -270,8 +270,8 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
# http://www.gobernac.mendoza.gov.ar/boletin/pdf/20040924-27244-normas.pdf
#
# From Mariano Absatz (2004-10-05):
# San Juan changed from UTC-03:00 to UTC-04:00 at midnight between
# Sunday, May 30th and Monday, May 31st. It changed back to UTC-03:00
# San Juan changed from UTC03:00 to UTC04:00 at midnight between
# Sunday, May 30th and Monday, May 31st. It changed back to UTC03:00
# at midnight between Saturday, July 24th and Sunday, July 25th....
# http://www.sanjuan.gov.ar/prensa/archivo/000329.html
# http://www.sanjuan.gov.ar/prensa/archivo/000426.html
@@ -319,9 +319,9 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
# From Mariano Absatz (2008-01-28):
# I can confirm that the Province of San Luis (and so far only that
# province) decided to go back to UTC-3 effective midnight Jan 20th 2008
# province) decided to go back to UTC3 effective midnight Jan 20th 2008
# (that is, Monday 21st at 0:00 is the time the clocks were delayed back
# 1 hour), and they intend to keep UTC-3 as their timezone all year round
# 1 hour), and they intend to keep UTC3 as their timezone all year round
# (that is, unless they change their mind any minute now).
#
# So we'll have to add yet another city to 'southamerica' (I think San
@@ -329,7 +329,7 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
# America/Argentina/San_Luis... of course I can't remember if San Luis's
# history of particular changes goes along with Mendoza or San Juan :-(
# (I only remember not being able to collect hard facts about San Luis
# back in 2004, when these provinces changed to UTC-4 for a few days, I
# back in 2004, when these provinces changed to UTC4 for a few days, I
# mailed them personally and never got an answer).
# From Paul Eggert (2008-06-30):
@@ -342,8 +342,8 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
# From Mariano Absatz (2009-03-13):
# Yesterday (with our usual 2-day notice) the Province of San Luis
# decided that next Sunday instead of "staying" @utc-03:00 they will go
# to utc-04:00 until the second Saturday in October...
# decided that next Sunday instead of "staying" @utc03:00 they will go
# to utc04:00 until the second Saturday in October...
#
# The press release is at
# http://www.sanluis.gov.ar/SL/Paginas/NoticiaDetalle.asp?TemaId=1&InfoPrensaId=3102
@@ -380,7 +380,7 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
# change in 2007/2008, were made according to the Federal Law and Decrees
# that did so on the 3rd Sunday of October and March.
#
# In fact, San Luis actually switched from UTC-4 to UTC-3 last Sunday
# In fact, San Luis actually switched from UTC4 to UTC3 last Sunday
# (October 11th) at 0:00.
#
# So I guess a new set of rules, besides "Arg", must be made and the last
@@ -389,15 +389,15 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
# I'm enclosing a patch that does what I say... regretfully, the San Luis
# timezone must be called "WART/WARST" even when most of the time (like,
# right now) WARST == ART... that is, since last Sunday, all the country
# is using UTC-3, but in my patch, San Luis calls it "WARST" and the rest
# is using UTC3, but in my patch, San Luis calls it "WARST" and the rest
# of the country calls it "ART".
# ...
# From Alexander Krivenyshev (2010-04-09):
# According to news reports from El Diario de la Republica Province San
# Luis, Argentina (standard time UTC-04) will keep Daylight Saving Time
# after April 11, 2010--will continue to have same time as rest of
# Argentina (UTC-3) (no DST).
# Luis, Argentina (standard time UTC04) will keep Daylight Saving Time
# after April 11, 2010 will continue to have same time as rest of
# Argentina (UTC3) (no DST).
#
# Confirmaron la prórroga del huso horario de verano (Spanish)
# http://www.eldiariodelarepublica.com/index.php?option=com_content&task=view&id=29383&Itemid=9
@@ -406,14 +406,14 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
# From Mariano Absatz (2010-04-12):
# yes...I can confirm this...and given that San Luis keeps calling
# UTC-03:00 "summer time", we should't just let San Luis go back to "Arg"
# UTC03:00 "summer time", we should't just let San Luis go back to "Arg"
# 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
# Perhaps San Luis operates on the legal fiction that it is at UTC4
# with perpetual summer time, but ordinary usage typically seems to
# just say it's at UTC-3; see, for example,
# just say it's at UTC3; 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
@@ -422,7 +422,7 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
# setting for time stamps past 2038.
# From Paul Eggert (2013-02-21):
# Milne says Córdoba time was -4:16:48.2. Round to the nearest second.
# Milne says Córdoba time was 4:16:48.2. Round to the nearest second.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
#
@@ -439,11 +439,11 @@ Zone America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 Oct 31
# Chaco (CC), Formosa (FM), Santiago del Estero (SE)
#
# Shanks & Pottenger also make the following claims, which we haven't verified:
# - Formosa switched to -3:00 on 1991-01-07.
# - Misiones switched to -3:00 on 1990-12-29.
# - Chaco switched to -3:00 on 1991-01-04.
# - Santiago del Estero switched to -4:00 on 1991-04-01,
# then to -3:00 on 1991-04-26.
# Formosa switched to 3:00 on 1991-01-07.
# Misiones switched to 3:00 on 1990-12-29.
# Chaco switched to 3:00 on 1991-01-04.
# Santiago del Estero switched to 4:00 on 1991-04-01,
# then to 3:00 on 1991-04-26.
#
Zone America/Argentina/Cordoba -4:16:48 - LMT 1894 Oct 31
-4:16:48 - CMT 1920 May
@@ -634,9 +634,9 @@ Zone America/La_Paz -4:32:36 - LMT 1890
# The earliest issue of the SSIM I have is 2/91. Each issue from then until
# 9/95 says that DST is observed only in the ten states I quoted from 9/95,
# along with Mato Grosso (MT) and Mato Grosso do Sul (MS), which are in BR2
# (UTC-4).... The other two time zones given for Brazil are BR3, which is
# UTC-5, no DST, and applies only in the state of Acre (AC); and BR4, which is
# UTC-2, and applies to Fernando de Noronha (formerly FN, but I believe it's
# (UTC4).... The other two time zones given for Brazil are BR3, which is
# UTC5, no DST, and applies only in the state of Acre (AC); and BR4, which is
# UTC2, and applies to Fernando de Noronha (formerly FN, but I believe it's
# become part of the state of Pernambuco). The boundary between BR1 and BR2
# has never been clearly stated. They've simply been called East and West.
# However, some conclusions can be drawn from another IATA manual: the Airline
@@ -704,21 +704,21 @@ Zone America/La_Paz -4:32:36 - LMT 1890
# https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=do&secao=1&pagina=1&data=25/04/2008
#
# As a result of the above Decree I believe the America/Rio_Branco
# timezone shall be modified from UTC-5 to UTC-4 and a new timezone shall
# timezone shall be modified from UTC5 to UTC4 and a new timezone shall
# be created to represent the...west side of the Pará State. I
# suggest this new timezone be called Santarem as the most
# important/populated city in the affected area.
#
# This new timezone would be the same as the Rio_Branco timezone up to
# the 2008/06/24 change which would be to UTC-3 instead of UTC-4.
# the 2008/06/24 change which would be to UTC3 instead of UTC4.
# From Alex Krivenyshev (2008-06-24):
# This is a quick reference page for New and Old Brazil Time Zones map.
# http://www.worldtimezone.com/brazil-time-new-old.php
#
# - 4 time zones replaced by 3 time zones-eliminating time zone UTC- 05
# (state Acre and the part of the Amazonas will be UTC/GMT- 04) - western
# part of Par state is moving to one timezone UTC- 03 (from UTC -04).
# 4 time zones replaced by 3 time zones eliminating time zone UTC05
# (state Acre and the part of the Amazonas will be UTC/GMT04) western
# part of Par state is moving to one timezone UTC03 (from UTC04).
# From Paul Eggert (2002-10-10):
# The official decrees referenced below are mostly taken from
@@ -1112,8 +1112,8 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914
# From Jesper Norgaard Welen (2006-10-08):
# I think that there are some obvious mistakes in the suggested link
# from Oscar van Vlijmen,... for instance entry 66 says that GMT-4
# ended 1990-09-12 while entry 67 only begins GMT-3 at 1990-09-15
# from Oscar van Vlijmen,... for instance entry 66 says that GMT4
# ended 1990-09-12 while entry 67 only begins GMT3 at 1990-09-15
# (they should have been 1990-09-15 and 1990-09-16 respectively), but
# anyhow it clears up some doubts too.
@@ -1287,8 +1287,8 @@ Zone America/Bogota -4:56:16 - LMT 1884 Mar 13
#
# From Paul Eggert (2006-03-22):
# Shanks & Pottenger say that The Bottom and Philipsburg have been at
# -4:00 since standard time was introduced on 1912-03-02; and that
# Kralendijk and Rincon used Kralendijk Mean Time (-4:33:08) from
# 4:00 since standard time was introduced on 1912-03-02; and that
# Kralendijk and Rincon used Kralendijk Mean Time (4:33:08) from
# 1912-02-02 to 1965-01-01. The former is dubious, since S&P also say
# Saba Island has been like Curaçao.
# This all predates our 1970 cutoff, though.
@@ -1314,7 +1314,7 @@ Link America/Curacao America/Kralendijk # Caribbean Netherlands
# Ecuador
#
# Milne says the Sentral and South American Telegraph Company used -5:24:15.
# Milne says the Sentral and South American Telegraph Company used 5:24:15.
#
# From Paul Eggert (2007-03-04):
# Apparently Ecuador had a failed experiment with DST in 1992.
@@ -1353,7 +1353,7 @@ Zone Pacific/Galapagos -5:58:24 - LMT 1931 # Puerto Baquerizo Moreno
# "The general rule was that Stanley used daylight saving and the Camp
# did not. However for various reasons many people in the Camp have
# started to use daylight saving (known locally as 'Stanley Time')
# There is no rule as to who uses daylight saving - it is a matter of
# There is no rule as to who uses daylight saving it is a matter of
# personal choice and so it is impossible to draw a map showing who
# uses it and who does not. Any list would be out of date as soon as
# it was produced. This year daylight saving ended on April 18/19th
@@ -1389,13 +1389,13 @@ Zone Pacific/Galapagos -5:58:24 - LMT 1931 # Puerto Baquerizo Moreno
# http://www.falklandnews.com/public/story.cfm?get=5914&source=3
#
# We have gotten this confirmed by a clerk of the legislative assembly:
# Normally the clocks revert to Local Mean Time (UTC/GMT -4 hours) on the
# third Sunday of April at 0200hrs and advance to Summer Time (UTC/GMT -3
# Normally the clocks revert to Local Mean Time (UTC/GMT 4 hours) on the
# third Sunday of April at 0200hrs and advance to Summer Time (UTC/GMT 3
# hours) on the first Sunday of September at 0200hrs.
#
# IMPORTANT NOTE: During 2011, on a trial basis, the Falkland Islands
# will not revert to local mean time, but clocks will remain on Summer
# time (UTC/GMT - 3 hours) throughout the whole of 2011. Any long term
# time (UTC/GMT 3 hours) throughout the whole of 2011. Any long term
# change to local time following the trial period will be notified.
#
# From Andrew Newman (2012-02-24)
@@ -1445,14 +1445,14 @@ Zone America/Guyana -3:52:40 - LMT 1915 Mar # Georgetown
-3:45 - GBGT 1966 May 26 # Br Guiana Time
-3:45 - GYT 1975 Jul 31 # Guyana Time
-3:00 - GYT 1991
# IATA SSIM (1996-06) says -4:00. Assume a 1991 switch.
# IATA SSIM (1996-06) says 4:00. Assume a 1991 switch.
-4:00 - GYT
# Paraguay
#
# From Paul Eggert (2006-03-22):
# Shanks & Pottenger say that spring transitions are from 01:00 -> 02:00,
# and autumn transitions are from 00:00 -> 23:00. Go with pre-1999
# Shanks & Pottenger say that spring transitions are 01:00 02:00,
# and autumn transitions are 00:00 23:00. Go with pre-1999
# editions of Shanks, and with the IATA, who say transitions occur at 00:00.
#
# From Waldemar Villamayor-Venialbo (2013-09-20):
@@ -1546,7 +1546,7 @@ Zone America/Asuncion -3:50:40 - LMT 1890
#
# From Evelyn C. Leeper via Mark Brader (2003-10-26)
# <news:xrGmb.39935$gA1.13896113@news4.srv.hcvlny.cv.net>:
# When we were in Peru in 1985-1986, they apparently switched over
# When we were in Peru in 19851986, they apparently switched over
# sometime between December 29 and January 3 while we were on the Amazon.
#
# From Paul Eggert (2006-03-22):
@@ -1621,7 +1621,7 @@ Rule Uruguay 1936 only - Nov 1 0:00 0:30 HS
Rule Uruguay 1937 1941 - Mar lastSun 0:00 0 -
# Whitman gives 1937 Oct 3; go with Shanks & Pottenger.
Rule Uruguay 1937 1940 - Oct lastSun 0:00 0:30 HS
# Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
# Whitman gives 1941 Oct 24 1942 Mar 27, 1942 Dec 14 1943 Apr 13,
# and 1943 Apr 13 "to present time"; go with Shanks & Pottenger.
Rule Uruguay 1941 only - Aug 1 0:00 0:30 HS
Rule Uruguay 1942 only - Jan 1 0:00 0 -
@@ -1668,7 +1668,7 @@ Rule Uruguay 2005 only - Mar 27 2:00 0 -
# From Eduardo Cota (2005-09-27):
# http://www.presidencia.gub.uy/_Web/decretos/2005/09/CM%20119_09%2009%202005_00001.PDF
# This means that from 2005-10-09 at 02:00 local time, until 2006-03-12 at
# 02:00 local time, official time in Uruguay will be at GMT -2.
# 02:00 local time, official time in Uruguay will be at GMT 2.
Rule Uruguay 2005 only - Oct 9 2:00 1:00 S
Rule Uruguay 2006 only - Mar 12 2:00 0 -
# From Jesper Norgaard Welen (2006-09-06):