[tz] Simplification and unification of scheme:// anchors

Paul Eggert eggert at cs.ucla.edu
Tue Jun 17 20:16:35 UTC 2014


Steffen Nurpmeso wrote:
> the attached
> patch uses (my rebased topic branch of last year, brought in sync
> with) your style and should make all of TZ use it uniformly.

Thanks, some of that looks good, but I don't think we need to surround 
URLs with angle brackets if they are already surrounded by white space, 
as the white space is delimiter enough.  So I installed the attached 
patch into the experimental version.
-------------- next part --------------
From 1d41c06051fe1fcb254398d867e70ee12aa10c1b Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert at cs.ucla.edu>
Date: Tue, 17 Jun 2014 13:14:45 -0700
Subject: [PATCH] Be more consistent about bracketing URLs in commentary.

Use angle brackets unless the URL is already surrounded by white space.
(Thanks to a suggestion from Steffen Nurpmeso.)
---
 NEWS         |  4 +++-
 africa       | 22 ++++++++++------------
 asia         |  2 +-
 australasia  |  6 +++---
 europe       | 10 +++++-----
 northamerica |  8 ++++----
 strftime.c   |  2 +-
 usno1995     |  2 +-
 usno1997     |  2 +-
 usno1998     |  2 +-
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/NEWS b/NEWS
index 24c8562..3f16cae 100644
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,9 @@ Unreleased, experimental changes
     Code and data have not changed.
 
     Non-HTML documentation and commentary now use plain-text URLs instead of
-    HTML insertions.  (Thanks to a suggestion by Steffen "Daode" Nurpmeso.)
+    HTML insertions, and are more consistent about bracketing URLs when they
+    are not already surrounded by white space.  (Thanks to suggestions by
+    Steffen Nurpmeso.)
 
     In zone.tab, Pacific/Easter no longer mentions Salas y Gómez, as it
     is uninhabited.
diff --git a/africa b/africa
index b2070f7..2e75163 100644
--- a/africa
+++ b/africa
@@ -692,9 +692,7 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
 # From Patrice Scattolin (2008-05-09):
 # According to this article:
 # http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
-# (and republished here:
-# http://www.actu.ma/heure-dete-comment_i127896_0.html
-# )
+# (and republished here: <http://www.actu.ma/heure-dete-comment_i127896_0.html>)
 # the changes occurs at midnight:
 #
 # saturday night may 31st at midnight (which in french is to be
@@ -776,8 +774,7 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
 # They said that the decision was already taken.
 #
 # More articles in the press
-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev
-# e.html
+# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
 # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
 # http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
 
@@ -1019,8 +1016,8 @@ Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# Saint-Denis
 #
 # Scattered Islands (Îles Éparses) administered from Réunion are as follows.
 # The following information about them is taken from
-# Îles Éparses (www.outre-mer.gouv.fr/domtom/ile.htm, 1997-07-22, in French;
-# no longer available as of 1999-08-17).
+# Îles Éparses (<http://www.outre-mer.gouv.fr/domtom/ile.htm>, 1997-07-22,
+# in French; no longer available as of 1999-08-17).
 # We have no info about their time zone histories.
 #
 # Bassas da India - uninhabited
@@ -1184,11 +1181,12 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # (in Arabic)
 # http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
 
-# From Arthur David Olson (2009--3-18):
-# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact
-# that the fasting month of ramadan coincides with the period concerned by summer time.
-# Therefore, the standard time will be kept unchanged the whole year long."
-# So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
+# From Arthur David Olson (2009-03-18):
+# The Tunis Afrique Presse News Agency notice contains this: "This measure is
+# due to the fact that the fasting month of Ramadan coincides with the period
+# concerned by summer time.  Therefore, the standard time will be kept
+# unchanged the whole year long."  So foregoing DST seems to be an exception
+# (albeit one that may be repeated in the future).
 
 # From Alexander Krivenyshev (2010-03-27):
 # According to some news reports Tunis confirmed not to use DST in 2010
diff --git a/asia b/asia
index d7fa8c8..dfc7f1b 100644
--- a/asia
+++ b/asia
@@ -2305,7 +2305,7 @@ Zone	Asia/Singapore	6:55:25 -	LMT	1901 Jan  1
 
 # From Paul Eggert (1996-09-03):
 # "Sri Lanka advances clock by an hour to avoid blackout"
-# (www.virtual-pc.com/lankaweb/news/items/240596-2.html, 1996-05-24,
+# (<http://www.virtual-pc.com/lankaweb/news/items/240596-2.html>, 1996-05-24,
 # no longer available as of 1999-08-17)
 # reported "the country's standard time will be put forward by one hour at
 # midnight Friday (1830 GMT) 'in the light of the present power crisis'."
diff --git a/australasia b/australasia
index d4fdf1c..f7ea418 100644
--- a/australasia
+++ b/australasia
@@ -298,7 +298,7 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # Now the dates have been confirmed, and at least our start date
 # assumption was correct (end date was one week wrong).
 #
-# www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155
+# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155
 # which says
 # Members of the public are reminded to change their time to one hour in
 # advance at 2am to 3am on October 23, 2011 and one hour back at 3am to
@@ -1026,7 +1026,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Victoria: I wasn't able to find anything separate, but the other articles
 # allude to it.
 # But not Queensland
-# http://www.news.com.au/story/0,10117,15564030-1248,00.html.
+# http://www.news.com.au/story/0,10117,15564030-1248,00.html
 
 # Northern Territory
 
@@ -1659,7 +1659,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # instead of the original reported date April 16. Unfortunately, the article
 # is no longer available on the site, and I did not make a copy of the
 # text, and I have forgotten to report it here.
-# (Original URL was: http://www.tongaonline.com/news/march162000.htm )
+# (Original URL was <http://www.tongaonline.com/news/march162000.htm>)
 
 # From Rives McDow (2000-12-01):
 # Tonga is observing DST as of 2000-11-04 and will stop on 2001-01-27.
diff --git a/europe b/europe
index 680c7a5..20f548f 100644
--- a/europe
+++ b/europe
@@ -263,8 +263,8 @@
 #   -- James Joyce, Ulysses
 
 # From Joseph S. Myers (2005-01-26):
-# Irish laws are available online at www.irishstatutebook.ie.  These include
-# various relating to legal time, for example:
+# Irish laws are available online at <http://www.irishstatutebook.ie>.
+# These include various relating to legal time, for example:
 #
 # ZZA13Y1923.html ZZA12Y1924.html ZZA8Y1925.html ZZSIV20PG1267.html
 #
@@ -1834,12 +1834,12 @@ Zone	Europe/Oslo	0:43:00 -	LMT	1895 Jan  1
 # time they were declared as parts of Norway.  Svalbard was declared
 # as a part of Norway by law of 1925-07-17 no 11, section 4 and Jan
 # Mayen by law of 1930-02-27 no 2, section 2. (From
-# http://www.lovdata.no/all/nl-19250717-011.html and
-# http://www.lovdata.no/all/nl-19300227-002.html).  The law/regulation
+# <http://www.lovdata.no/all/nl-19250717-011.html> and
+# <http://www.lovdata.no/all/nl-19300227-002.html>).  The law/regulation
 # for normal/standard time in Norway is from 1894-06-29 no 1 (came
 # into operation on 1895-01-01) and Svalbard/Jan Mayen seem to be a
 # part of this law since 1925/1930. (From
-# http://www.lovdata.no/all/nl-18940629-001.html ) I have not been
+# <http://www.lovdata.no/all/nl-18940629-001.html>) I have not been
 # able to find if Jan Mayen used a different time zone (e.g. -0100)
 # before 1930. Jan Mayen has only been "inhabitated" since 1921 by
 # Norwegian meteorologists and maybe used the same time as Norway ever
diff --git a/northamerica b/northamerica
index 3c2d434..0e87660 100644
--- a/northamerica
+++ b/northamerica
@@ -2243,7 +2243,7 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 # saving all year) will follow the original decree of president
 # Vicente Fox, starting daylight saving May 6, 2001 and ending
 # September 30, 2001.
-# References: "Diario de Monterrey" <www.diariodemonterrey.com/index.asp>
+# References: "Diario de Monterrey" <http://www.diariodemonterrey.com/index.asp>
 # Palabra <http://palabra.infosel.com/010331/primera/ppri3101.pdf> (2001-03-31)
 
 # From Reuters (2001-09-04):
@@ -2396,7 +2396,7 @@ Zone America/Hermosillo	-7:23:52 -	LMT	1921 Dec 31 23:36:08
 #
 # Bahía de Banderas homologa su horario con el del Centro del
 # País
-# http://www.bahiadebanderas.gob.mx/principal/index.php?option=com_content&view=article&id=261:bahia-de-banderas-homologa-su-horario-con-el-del-centro-del-pais&catid=42:comunicacion-social&Itemid=50"
+# http://www.bahiadebanderas.gob.mx/principal/index.php?option=com_content&view=article&id=261:bahia-de-banderas-homologa-su-horario-con-el-del-centro-del-pais&catid=42:comunicacion-social&Itemid=50
 #
 # (English)
 # Puerto Vallarta and Bahía de Banderas: One Time Zone
@@ -2635,7 +2635,7 @@ Zone America/Costa_Rica	-5:36:13 -	LMT	1890		# San José
 # to the normal schedule....
 
 # From Paul Eggert (2007-03-02):
-# http://www.granma.cubaweb.cu/english/news/art89.html, dated yesterday,
+# <http://www.granma.cubaweb.cu/english/news/art89.html>, dated yesterday,
 # says Cuban clocks will advance at midnight on March 10.
 # For lack of better information, assume Cuba will use US rules,
 # except that it switches at midnight standard time as usual.
@@ -2852,7 +2852,7 @@ Zone America/El_Salvador -5:56:48 -	LMT	1921		# San Salvador
 #
 # From Gwillim Law (2006-04-22), after a heads-up from Oscar van Vlijmen:
 # Diario Co Latino, at
-# http://www.diariocolatino.com/internacionales/detalles.asp?NewsID=8079,
+# <http://www.diariocolatino.com/internacionales/detalles.asp?NewsID=8079>,
 # says in an article dated 2006-04-19 that the Guatemalan government had
 # decided on that date to advance official time by 60 minutes, to lessen the
 # impact of the elevated cost of oil....  Daylight saving time will last from
diff --git a/strftime.c b/strftime.c
index f29c9c2..e9b60e1 100644
--- a/strftime.c
+++ b/strftime.c
@@ -355,7 +355,7 @@ label:
 ** (01-53)."
 ** (ado, 1993-05-24)
 **
-** From "http://www.ft.uni-erlangen.de/~mskuhn/iso-time.html" by Markus Kuhn:
+** From <http://www.ft.uni-erlangen.de/~mskuhn/iso-time.html> by Markus Kuhn:
 ** "Week 01 of a year is per definition the first week which has the
 ** Thursday in this year, which is equivalent to the week which contains
 ** the fourth day of January. In other words, the first week of a new year
diff --git a/usno1995 b/usno1995
index a5ee0ae..5641754 100644
--- a/usno1995
+++ b/usno1995
@@ -1,7 +1,7 @@
 # From Arthur David Olson (1995-12-21):
 #
 # Here's time zone information from the United States Naval Observatory
-# via http://tycho.usno.navy.mil/tzones.html. See USNO's note at the end.
+# via <http://tycho.usno.navy.mil/tzones.html>. See USNO's note at the end.
 World Time Zones
 For selected countries, the local standard time offset from UTC is given,
 with daylight savings time where observed.
diff --git a/usno1997 b/usno1997
index b90be86..0fa4a73 100644
--- a/usno1997
+++ b/usno1997
@@ -1,7 +1,7 @@
 # From Arthur David Olson (1997-03-07):
 #
 # Here's time zone information from the United States Naval Observatory
-# via http://tycho.usno.navy.mil/tzones.html. See USNO's note at the end.
+# via <http://tycho.usno.navy.mil/tzones.html>. See USNO's note at the end.
 Unofficial Time Zone Information
 World Time Zones
 For selected countries, the local standard time offset from UTC is given, with  daylight savings time where observed.
diff --git a/usno1998 b/usno1998
index d77d255..862f252 100644
--- a/usno1998
+++ b/usno1998
@@ -1,7 +1,7 @@
 # From Arthur David Olson (1998-05-26):
 #
 # Here's time zone information from the United States Naval Observatory
-# via http://tycho.usno.navy.mil/tzones.html. See USNO's note at the end.
+# via <http://tycho.usno.navy.mil/tzones.html>. See USNO's note at the end.
 Unofficial Time Zone Information
 World Time Zones
 For selected countries, the local standard time offset from UTC is given, with  daylight savings time where observed.
-- 
1.9.1


More information about the tz mailing list