[tz] Several minor patches

Paul Eggert eggert at cs.ucla.edu
Sun Aug 10 00:56:16 UTC 2014


Thanks, those all looked good, and I pushed them into the experimental 
version, with one very minor exception: the third patch introduced a 
space before a tab.  I fixed that, plus all the other similar instances 
I found in the code and data, and added a Makefile rule to check for 
this in the future, by pushing the attached additional patch to the 
experimental version.
-------------- next part --------------
From f2fd32be74da146605fbf5d3e9e61300b99e9016 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert at cs.ucla.edu>
Date: Sat, 9 Aug 2014 17:52:45 -0700
Subject: [PATCH] Don't put spaces before tabs.

* Makefile (check_tabs): New rule.
(check): Use it.
Also, fix all other files to not have spaces before tabs.
---
 Makefile     |   5 +-
 antarctica   |   2 +-
 europe       | 164 +++++++++++++++++++++++++++++------------------------------
 northamerica |  30 +++++------
 southamerica |   2 +-
 zdump.c      |   2 +-
 zic.c        |   6 +--
 7 files changed, 107 insertions(+), 104 deletions(-)

diff --git a/Makefile b/Makefile
index 03ee556..e7f24c1 100644
--- a/Makefile
+++ b/Makefile
@@ -449,7 +449,7 @@ tzselect:	tzselect.ksh
 			<$? >$@
 		chmod +x $@
 
-check:		check_character_set check_tables check_web
+check:		check_character_set check_tabs check_tables check_web
 
 check_character_set: $(ENCHILADA)
 		LC_ALL=en_US.utf8 && export LC_ALL && \
@@ -463,6 +463,9 @@ check_character_set: $(ENCHILADA)
 			zone1970.tab && \
 		! grep -Env $(VALID_LINE) $(ENCHILADA)
 
+check_tabs: $(ENCHILADA)
+		! grep -n ' '$(TAB_CHAR) $(ENCHILADA)
+
 check_tables:	checktab.awk $(PRIMARY_YDATA) $(ZONETABLES)
 		for tab in $(ZONETABLES); do \
 		  $(AWK) -f checktab.awk -v zone_table=$$tab $(PRIMARY_YDATA) \
diff --git a/antarctica b/antarctica
index 9062747..4d24ceb 100644
--- a/antarctica
+++ b/antarctica
@@ -264,7 +264,7 @@ Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	CEST
 Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	UTC
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Antarctica/Troll	0	-	zzz	2005 Feb 12
-     			0:00	Troll	%s
+			0:00	Troll	%s
 
 # Poland - year-round base
 # Arctowski, King George Island, -620945-0582745, since 1977
diff --git a/europe b/europe
index e77cd24..010fa2e 100644
--- a/europe
+++ b/europe
@@ -2222,7 +2222,7 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 
 # From Tim Parenti (2014-07-03):
 # Europe/Kaliningrad covers...
-# 39	RU-KGD 	Kaliningrad Oblast
+# 39	RU-KGD	Kaliningrad Oblast
 
 Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
 			 1:00	C-Eur	CE%sT	1945
@@ -2235,52 +2235,52 @@ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Europe/Moscow covers...
-# 01	RU-AD 	Adygea, Republic of
-# 05	RU-DA 	Dagestan, Republic of
-# 06	RU-IN 	Ingushetia, Republic of
-# 07	RU-KB 	Kabardino-Balkar Republic
-# 08	RU-KL 	Kalmykia, Republic of
-# 09	RU-KC 	Karachay-Cherkess Republic
-# 10	RU-KR 	Karelia, Republic of
-# 11	RU-KO 	Komi Republic
-# 12	RU-ME 	Mari El Republic
-# 13	RU-MO 	Mordovia, Republic of
-# 15	RU-SE 	North Ossetia-Alania, Republic of
-# 16	RU-TA 	Tatarstan, Republic of
-# 20	RU-CE 	Chechen Republic
-# 21	RU-CU 	Chuvash Republic
-# 23	RU-KDA 	Krasnodar Krai
-# 26 	RU-STA 	Stavropol Krai
-# 29	RU-ARK 	Arkhangelsk Oblast
-# 31	RU-BEL 	Belgorod Oblast
-# 32	RU-BRY 	Bryansk Oblast
-# 33	RU-VLA 	Vladimir Oblast
-# 35	RU-VLG 	Vologda Oblast
-# 36	RU-VOR 	Voronezh Oblast
-# 37	RU-IVA 	Ivanovo Oblast
-# 40	RU-KLU 	Kaluga Oblast
-# 44	RU-KOS 	Kostroma Oblast
-# 46	RU-KRS 	Kursk Oblast
-# 47	RU-LEN 	Leningrad Oblast
-# 48	RU-LIP 	Lipetsk Oblast
-# 50	RU-MOS 	Moscow Oblast
-# 51	RU-MUR 	Murmansk Oblast
-# 52	RU-NIZ 	Nizhny Novgorod Oblast
-# 53	RU-NGR 	Novgorod Oblast
-# 57	RU-ORL 	Oryol Oblast
-# 58	RU-PNZ 	Penza Oblast
-# 60	RU-PSK 	Pskov Oblast
-# 61	RU-ROS 	Rostov Oblast
-# 62	RU-RYA 	Ryazan Oblast
-# 67	RU-SMO 	Smolensk Oblast
-# 68	RU-TAM 	Tambov Oblast
-# 69	RU-TVE 	Tver Oblast
-# 71	RU-TUL 	Tula Oblast
-# 73	RU-ULY 	Ulyanovsk Oblast
-# 76	RU-YAR 	Yaroslavl Oblast
-# 77	RU-MOW 	Moscow
-# 78	RU-SPE 	Saint Petersburg
-# 83	RU-NEN 	Nenets Autonomous Okrug
+# 01	RU-AD	Adygea, Republic of
+# 05	RU-DA	Dagestan, Republic of
+# 06	RU-IN	Ingushetia, Republic of
+# 07	RU-KB	Kabardino-Balkar Republic
+# 08	RU-KL	Kalmykia, Republic of
+# 09	RU-KC	Karachay-Cherkess Republic
+# 10	RU-KR	Karelia, Republic of
+# 11	RU-KO	Komi Republic
+# 12	RU-ME	Mari El Republic
+# 13	RU-MO	Mordovia, Republic of
+# 15	RU-SE	North Ossetia-Alania, Republic of
+# 16	RU-TA	Tatarstan, Republic of
+# 20	RU-CE	Chechen Republic
+# 21	RU-CU	Chuvash Republic
+# 23	RU-KDA	Krasnodar Krai
+# 26	RU-STA	Stavropol Krai
+# 29	RU-ARK	Arkhangelsk Oblast
+# 31	RU-BEL	Belgorod Oblast
+# 32	RU-BRY	Bryansk Oblast
+# 33	RU-VLA	Vladimir Oblast
+# 35	RU-VLG	Vologda Oblast
+# 36	RU-VOR	Voronezh Oblast
+# 37	RU-IVA	Ivanovo Oblast
+# 40	RU-KLU	Kaluga Oblast
+# 44	RU-KOS	Kostroma Oblast
+# 46	RU-KRS	Kursk Oblast
+# 47	RU-LEN	Leningrad Oblast
+# 48	RU-LIP	Lipetsk Oblast
+# 50	RU-MOS	Moscow Oblast
+# 51	RU-MUR	Murmansk Oblast
+# 52	RU-NIZ	Nizhny Novgorod Oblast
+# 53	RU-NGR	Novgorod Oblast
+# 57	RU-ORL	Oryol Oblast
+# 58	RU-PNZ	Penza Oblast
+# 60	RU-PSK	Pskov Oblast
+# 61	RU-ROS	Rostov Oblast
+# 62	RU-RYA	Ryazan Oblast
+# 67	RU-SMO	Smolensk Oblast
+# 68	RU-TAM	Tambov Oblast
+# 69	RU-TVE	Tver Oblast
+# 71	RU-TUL	Tula Oblast
+# 73	RU-ULY	Ulyanovsk Oblast
+# 76	RU-YAR	Yaroslavl Oblast
+# 77	RU-MOW	Moscow
+# 78	RU-SPE	Saint Petersburg
+# 83	RU-NEN	Nenets Autonomous Okrug
 
 # From Vladimir Karpinsky (2014-07-08):
 # LMT in Moscow (before Jul 3, 1916) is 2:30:17, that was defined by Moscow
@@ -2357,10 +2357,10 @@ Zone Europe/Simferopol	 2:16:24 -	LMT	1880
 
 # From Tim Parenti (2014-07-03):
 # Europe/Volgograd covers...
-# 30	RU-AST 	Astrakhan Oblast
-# 34	RU-VGG 	Volgograd Oblast
-# 43	RU-KIR 	Kirov Oblast
-# 64	RU-SAR 	Saratov Oblast
+# 30	RU-AST	Astrakhan Oblast
+# 34	RU-VGG	Volgograd Oblast
+# 43	RU-KIR	Kirov Oblast
+# 64	RU-SAR	Saratov Oblast
 
 # From Paul Eggert (2006-05-09):
 # Shanks & Pottenger say Kirov is still at +0400 but Wikipedia says +0300.
@@ -2380,8 +2380,8 @@ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Europe/Samara covers...
-# 18	RU-UD 	Udmurt Republic
-# 63	RU-SAM 	Samara Oblast
+# 18	RU-UD	Udmurt Republic
+# 63	RU-SAM	Samara Oblast
 
 # Byalokoz 1919 says Samara was 3:20:20.
 
@@ -2399,15 +2399,15 @@ Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  2:00
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Asia/Yekaterinburg covers...
-# 02	RU-BA 	Bashkortostan, Republic of
-# 90	RU-PER 	Perm Krai
-# 45	RU-KGN 	Kurgan Oblast
-# 56	RU-ORE 	Orenburg Oblast
-# 66	RU-SVE 	Sverdlovsk Oblast
-# 72	RU-TYU 	Tyumen Oblast
-# 74	RU-CHE 	Chelyabinsk Oblast
-# 86	RU-KHM 	Khanty-Mansi Autonomous Okrug - Yugra
-# 89	RU-YAN 	Yamalo-Nenets Autonomous Okrug
+# 02	RU-BA	Bashkortostan, Republic of
+# 90	RU-PER	Perm Krai
+# 45	RU-KGN	Kurgan Oblast
+# 56	RU-ORE	Orenburg Oblast
+# 66	RU-SVE	Sverdlovsk Oblast
+# 72	RU-TYU	Tyumen Oblast
+# 74	RU-CHE	Chelyabinsk Oblast
+# 86	RU-KHM	Khanty-Mansi Autonomous Okrug - Yugra
+# 89	RU-YAN	Yamalo-Nenets Autonomous Okrug
 #
 # Note: Effective 2005-12-01, (59) Perm Oblast and (81) Komi-Permyak
 # Autonomous Okrug merged to form (90, RU-PER) Perm Krai.
@@ -2429,9 +2429,9 @@ Zone Asia/Yekaterinburg	 4:02:33 -	LMT	1916 Jul  3
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Asia/Omsk covers...
-# 04	RU-AL 	Altai Republic
-# 22	RU-ALT 	Altai Krai
-# 55	RU-OMS 	Omsk Oblast
+# 04	RU-AL	Altai Republic
+# 22	RU-ALT	Altai Krai
+# 55	RU-OMS	Omsk Oblast
 
 # Byalokoz 1919 says Omsk was 4:53:30.
 
@@ -2446,8 +2446,8 @@ Zone Asia/Omsk		 4:53:30 -	LMT	1919 Nov 14
 
 # From Tim Parenti (2014-07-03):
 # Asia/Novosibirsk covers...
-# 54	RU-NVS 	Novosibirsk Oblast
-# 70	RU-TOM 	Tomsk Oblast
+# 54	RU-NVS	Novosibirsk Oblast
+# 70	RU-TOM	Tomsk Oblast
 
 # From Paul Eggert (2006-08-19): I'm guessing about Tomsk here; it's
 # not clear when it switched from +7 to +6.
@@ -2464,7 +2464,7 @@ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
 
 # From Tim Parenti (2014-07-03):
 # Asia/Novokuznetsk covers...
-# 42	RU-KEM 	Kemerovo Oblast
+# 42	RU-KEM	Kemerovo Oblast
 
 # From Alexander Krivenyshev (2009-10-13):
 # Kemerovo oblast' (Kemerovo region) in Russia will change current time zone on
@@ -2504,9 +2504,9 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	1920 Jan  6
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Asia/Krasnoyarsk covers...
-# 17	RU-TY 	Tuva Republic
-# 19	RU-KK 	Khakassia, Republic of
-# 24	RU-KYA 	Krasnoyarsk Krai
+# 17	RU-TY	Tuva Republic
+# 19	RU-KK	Khakassia, Republic of
+# 24	RU-KYA	Krasnoyarsk Krai
 #
 # Note: Effective 2007-01-01, (88) Evenk Autonomous Okrug and (84) Taymyr
 # Autonomous Okrug were merged into (24, RU-KYA) Krasnoyarsk Krai.
@@ -2524,8 +2524,8 @@ Zone Asia/Krasnoyarsk	 6:11:26 -	LMT	1920 Jan  6
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Asia/Irkutsk covers...
-# 03	RU-BU 	Buryatia, Republic of
-# 38	RU-IRK 	Irkutsk Oblast
+# 03	RU-BU	Buryatia, Republic of
+# 38	RU-IRK	Irkutsk Oblast
 #
 # Note: Effective 2008-01-01, (85) Ust-Orda Buryat Autonomous Okrug was
 # merged into (38, RU-IRK) Irkutsk Oblast.
@@ -2546,7 +2546,7 @@ Zone Asia/Irkutsk	 6:57:05 -	LMT	1880
 
 # From Tim Parenti (2014-07-06):
 # Asia/Chita covers...
-# 92	RU-ZAB 	Zabaykalsky Krai
+# 92	RU-ZAB	Zabaykalsky Krai
 #
 # Note: Effective 2008-03-01, (75) Chita Oblast and (80) Agin-Buryat
 # Autonomous Okrug merged to form (92, RU-ZAB) Zabaykalsky Krai.
@@ -2562,7 +2562,7 @@ Zone Asia/Chita	 7:33:52 -	LMT	1919 Dec 15
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
 # Asia/Yakutsk covers...
-# 28	RU-AMU 	Amur Oblast
+# 28	RU-AMU	Amur Oblast
 #
 # ...and parts of (14, RU-SA) Sakha (Yakutia) Republic:
 # 14-02	****	Aldansky District
@@ -2607,9 +2607,9 @@ Zone Asia/Yakutsk	 8:38:58 -	LMT	1919 Dec 15
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
 # Asia/Vladivostok covers...
-# 25	RU-PRI 	Primorsky Krai
-# 27	RU-KHA 	Khabarovsk Krai
-# 79	RU-YEV 	Jewish Autonomous Oblast
+# 25	RU-PRI	Primorsky Krai
+# 27	RU-KHA	Khabarovsk Krai
+# 79	RU-YEV	Jewish Autonomous Oblast
 #
 # ...and parts of (14, RU-SA) Sakha (Yakutia) Republic:
 # 14-09	****	Verkhoyansky District
@@ -2655,7 +2655,7 @@ Zone Asia/Khandyga	 9:02:13 -	LMT	1919 Dec 15
 
 # From Tim Parenti (2014-07-03):
 # Asia/Sakhalin covers...
-# 65	RU-SAK 	Sakhalin Oblast
+# 65	RU-SAK	Sakhalin Oblast
 # ...with the exception of:
 # 65-11	****	Severo-Kurilsky District (North Kuril Islands)
 
@@ -2673,7 +2673,7 @@ Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
 # Asia/Magadan covers...
-# 49	RU-MAG 	Magadan Oblast
+# 49	RU-MAG	Magadan Oblast
 
 # From Tim Parenti (2014-07-06), per Alexander Krivenyshev (2014-07-02):
 # Magadan Oblast is moving from UTC+12 to UTC+10 on 2014-10-26; however,
@@ -2771,7 +2771,7 @@ Zone Asia/Ust-Nera	 9:32:54 -	LMT	1919 Dec 15
 
 # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
 # Asia/Kamchatka covers...
-# 91	RU-KAM 	Kamchatka Krai
+# 91	RU-KAM	Kamchatka Krai
 #
 # Note: Effective 2007-07-01, (41) Kamchatka Oblast and (82) Koryak
 # Autonomous Okrug merged to form (91, RU-KAM) Kamchatka Krai.
@@ -2789,7 +2789,7 @@ Zone Asia/Kamchatka	10:34:36 -	LMT	1922 Nov 10
 
 # From Tim Parenti (2014-07-03):
 # Asia/Anadyr covers...
-# 87	RU-CHU 	Chukotka Autonomous Okrug
+# 87	RU-CHU	Chukotka Autonomous Okrug
 
 Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
 			12:00	-	ANAT	1930 Jun 21 # Anadyr Time
diff --git a/northamerica b/northamerica
index 1af23a1..3055d26 100644
--- a/northamerica
+++ b/northamerica
@@ -1501,26 +1501,26 @@ Zone America/Montreal	-4:54:16 -	LMT	1884
 # ing in 1930. The information for the province of Quebec is definite,
 # for the other provinces only approximate:
 #
-# 	Province	Daylight saving time used
+#	Province	Daylight saving time used
 # Prince Edward Island	Not used.
 # Nova Scotia		In Halifax only.
 # New Brunswick		In St. John only.
 # Quebec		In the following places:
-# 			Montreal	Lachine
-# 			Quebec		Mont-Royal
-# 			Lévis		Iberville
-# 			St. Lambert	Cap de la Madelèine
-# 			Verdun		Loretteville
-# 			Westmount	Richmond
-# 			Outremont	St. Jérôme
-# 			Longueuil	Greenfield Park
-# 			Arvida		Waterloo
-# 			Chambly-Canton	Beaulieu
-# 			Melbourne	La Tuque
-# 			St. Théophile	Buckingham
+#			Montreal	Lachine
+#			Quebec		Mont-Royal
+#			Lévis		Iberville
+#			St. Lambert	Cap de la Madelèine
+#			Verdun		Loretteville
+#			Westmount	Richmond
+#			Outremont	St. Jérôme
+#			Longueuil	Greenfield Park
+#			Arvida		Waterloo
+#			Chambly-Canton	Beaulieu
+#			Melbourne	La Tuque
+#			St. Théophile	Buckingham
 # Ontario		Used generally in the cities and towns along
-# 			the southerly part of the province. Not
-# 			used in the northwesterly part.
+#			the southerly part of the province. Not
+#			used in the northwesterly part.
 # Manitoba		Not used.
 # Saskatchewan		In Regina only.
 # Alberta		Not used.
diff --git a/southamerica b/southamerica
index 712d8a8..4e00cb4 100644
--- a/southamerica
+++ b/southamerica
@@ -1252,7 +1252,7 @@ Rule	Chile	2012	max	-	Sep	Sun>=2	4:00u	1:00	S
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Santiago	-4:42:46 -	LMT	1890
-			-4:42:46 -	SMT	1910 	    # Santiago Mean Time
+			-4:42:46 -	SMT	1910	    # Santiago Mean Time
 			-5:00	-	CLT	1916 Jul  1 # Chile Time
 			-4:42:46 -	SMT	1918 Sep  1 # Santiago Mean Time
 			-4:00	-	CLT	1919 Jul  1 # Chile Time
diff --git a/zdump.c b/zdump.c
index 0a661d5..859a169 100644
--- a/zdump.c
+++ b/zdump.c
@@ -231,7 +231,7 @@ is_alpha(char a)
 	  case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n':
 	  case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
 	  case 'v': case 'w': case 'x': case 'y': case 'z':
-	  	return 1;
+		return 1;
 	}
 }
 
diff --git a/zic.c b/zic.c
index 4fe0d97..a700291 100644
--- a/zic.c
+++ b/zic.c
@@ -1668,7 +1668,7 @@ writezone(const char *const name, const char *const string, char version)
 		register int	thistypecnt;
 		char		thischars[TZ_MAX_CHARS];
 		char		thischarcnt;
-		int 		indmap[TZ_MAX_CHARS];
+		int		indmap[TZ_MAX_CHARS];
 
 		if (pass == 1) {
 			thistimei = timei32;
@@ -2606,7 +2606,7 @@ is_space(char a)
 	  default:
 		return 0;
 	  case ' ': case '\f': case '\n': case '\r': case '\t': case '\v':
-	  	return 1;
+		return 1;
 	}
 }
 
@@ -2625,7 +2625,7 @@ is_alpha(char a)
 	  case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n':
 	  case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
 	  case 'v': case 'w': case 'x': case 'y': case 'z':
-	  	return 1;
+		return 1;
 	}
 }
 
-- 
1.9.1


More information about the tz mailing list