From 469545307f7b688d0b7a15a5cfd33bcecb775123 Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Thu, 31 Oct 2019 11:29:37 -0700
Subject: [PATCH] [ruby/date] Add more timezone abbreviations

This gets the time zone abbreviations from
https://www.timeanddate.com/time/zones/, and adds unambiguous time
zones not already present in zonetab.list.  See bin/update-abbr
for the program used.

This regenerates zonetab.h using prereq.mk (requires gperf).

Only one test line is added, just to make sure a new time zone
abbreviation is picked up.

Fixes Ruby Bug 16286

https://github.com/ruby/date/commit/702e8b3033
---
 bin/update-abbr              |   35 +
 ext/date/zonetab.h           | 2117 ++++++++++++++++++++++------------
 ext/date/zonetab.list        |  146 +++
 test/date/test_date_parse.rb |    1 +
 4 files changed, 1553 insertions(+), 746 deletions(-)
 create mode 100644 bin/update-abbr

diff --git a/bin/update-abbr b/bin/update-abbr
new file mode 100644
index 0000000000..33dbda1fe5
--- /dev/null
+++ b/bin/update-abbr
@@ -0,0 +1,35 @@
+require 'nokogiri'
+require 'open-uri'
+
+doc = Nokogiri::HTML(URI.open('https://www.timeanddate.com/time/zones/'))
+
+h = {}
+
+doc.css('#tz-abb tbody tr').each do |tr|
+  tds = tr.css('td')
+  abbr = tds[0].text.strip.downcase
+  offset = tds[3].text.strip.gsub(/UTC\s*/, '')
+  next if offset.include?('/') # skip ambiguous timezones
+  next if offset.empty?
+
+
+  hour, min = offset.split(':', 2)
+  offset = (Integer(hour) * 60 + (Integer(min || 0)))*60
+  if h.has_key?(abbr)
+    h[abbr] = false
+  else
+    h[abbr] = offset
+  end
+end
+
+h.delete_if{|_,v| !v}
+
+lines = File.readlines('ext/date/zonetab.list')
+lines.select{|l| l.include?(',')}.
+  map{|l| l.split(',', 2)[0]}.
+  each{|a| h.delete(a)}
+
+h.sort.map{|k,v| "#{k},#{v}"}
+lines.insert(-2, h.sort.map{|k,v| "#{k},#{v}\n"})
+lines.flatten!
+File.write('ext/date/zonetab.list', lines.join)
diff --git a/ext/date/zonetab.h b/ext/date/zonetab.h
index 37df5b9e69..379f78e1b8 100644
--- a/ext/date/zonetab.h
+++ b/ext/date/zonetab.h
@@ -1,6 +1,6 @@
 /* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: gperf --ignore-case -C -c -P -p -j1 -i 1 -g -o -t -N zonetab zonetab.list  */
-/* Computed positions: -k'1-4,$' */
+/* Computed positions: -k'1-4,9' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -40,12 +40,12 @@ static const struct zone *zonetab();
 #line 9 "zonetab.list"
 struct zone;
 
-#define TOTAL_KEYWORDS 170
+#define TOTAL_KEYWORDS 316
 #define MIN_WORD_LENGTH 1
 #define MAX_WORD_LENGTH 17
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 438
-/* maximum key range = 434, duplicates = 0 */
+#define MIN_HASH_VALUE 2
+#define MAX_HASH_VALUE 619
+/* maximum key range = 618, duplicates = 0 */
 
 #ifndef GPERF_DOWNCASE
 #define GPERF_DOWNCASE 1
@@ -104,398 +104,702 @@ hash (register const char *str, register size_t len)
 {
   static const unsigned short asso_values[] =
     {
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439,  19, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439,   2,   4, 439, 439, 439,
-      439, 439,   8,   6,   3, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439,   7,  63,  53,   2,   4,
-       32, 110,  88,  78,  90,  68,  47, 108,  10,  73,
-       81, 124,   3,   1,   4,  77, 116,  88,  15,  96,
-       45,   5, 439, 439, 439, 439, 439,   7,  63,  53,
-        2,   4,  32, 110,  88,  78,  90,  68,  47, 108,
-       10,  73,  81, 124,   3,   1,   4,  77, 116,  88,
-       15,  96,  45,   5, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620,  17, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620,   3,   2, 620, 620, 620,
+      620, 620,  70,   8,   3, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620,  39, 176, 207,  70, 168,
+        1,   5,  18,  74, 218,   2, 117, 130,  48,  88,
+      125, 225,  92,   1,   1,  12,  54,  30,  36,  13,
+       48, 168, 263,  59, 114, 166, 109,  39, 176, 207,
+       70, 168,   1,   5,  18,  74, 218,   2, 117, 130,
+       48,  88, 125, 225,  92,   1,   1,  12,  54,  30,
+       36,  13,  48, 168, 263,  59, 114, 166, 109,  27,
+      104,   1,   9,   4, 309, 190, 188, 177, 255, 108,
+        2, 341,   3, 620, 620, 620, 620, 620, 620,  12,
+       54,  30,  36,  13,  48, 168, 263,  59, 114, 166,
+      109,  27, 104,   1,   9,   4, 309, 190, 188, 177,
+      255, 108,   2, 341,   3, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620
     };
   register unsigned int hval = (unsigned int)len;
 
   switch (hval)
     {
       default:
+        hval += asso_values[(unsigned char)str[8]];
+      /*FALLTHROUGH*/
+      case 8:
+      case 7:
+      case 6:
+      case 5:
+      case 4:
         hval += asso_values[(unsigned char)str[3]];
       /*FALLTHROUGH*/
       case 3:
         hval += asso_values[(unsigned char)str[2]];
       /*FALLTHROUGH*/
       case 2:
-        hval += asso_values[(unsigned char)str[1]];
+        hval += asso_values[(unsigned char)str[1]+6];
       /*FALLTHROUGH*/
       case 1:
-        hval += asso_values[(unsigned char)str[0]+1];
+        hval += asso_values[(unsigned char)str[0]+52];
         break;
     }
-  return (unsigned int)hval + asso_values[(unsigned char)str[len - 1]];
+  return (unsigned int)hval;
 }
 
 struct stringpool_t
   {
-    char stringpool_str5[sizeof("r")];
-    char stringpool_str6[sizeof("s")];
-    char stringpool_str7[sizeof("d")];
-    char stringpool_str14[sizeof("cst")];
-    char stringpool_str15[sizeof("cdt")];
-    char stringpool_str16[sizeof("sst")];
-    char stringpool_str17[sizeof("cet")];
-    char stringpool_str18[sizeof("msd")];
-    char stringpool_str19[sizeof("cest")];
-    char stringpool_str20[sizeof("cat")];
-    char stringpool_str22[sizeof("mst")];
-    char stringpool_str23[sizeof("mdt")];
-    char stringpool_str24[sizeof("sast")];
-    char stringpool_str25[sizeof("met")];
-    char stringpool_str27[sizeof("mest")];
-    char stringpool_str30[sizeof("wet")];
-    char stringpool_str31[sizeof("dateline")];
-    char stringpool_str32[sizeof("west")];
-    char stringpool_str33[sizeof("wat")];
-    char stringpool_str35[sizeof("wast")];
-    char stringpool_str36[sizeof("wadt")];
-    char stringpool_str37[sizeof("e")];
-    char stringpool_str38[sizeof("central europe")];
-    char stringpool_str39[sizeof("central asia")];
-    char stringpool_str40[sizeof("west asia")];
-    char stringpool_str41[sizeof("cen. australia")];
-    char stringpool_str42[sizeof("central america")];
-    char stringpool_str44[sizeof("est")];
-    char stringpool_str45[sizeof("edt")];
-    char stringpool_str46[sizeof("central european")];
-    char stringpool_str47[sizeof("eet")];
-    char stringpool_str48[sizeof("se asia")];
-    char stringpool_str49[sizeof("eest")];
-    char stringpool_str50[sizeof("eat")];
-    char stringpool_str51[sizeof("z")];
-    char stringpool_str52[sizeof("east")];
-    char stringpool_str53[sizeof("eadt")];
-    char stringpool_str54[sizeof("sa eastern")];
-    char stringpool_str55[sizeof("w. europe")];
-    char stringpool_str56[sizeof("c")];
-    char stringpool_str57[sizeof("yst")];
-    char stringpool_str58[sizeof("ydt")];
-    char stringpool_str59[sizeof("kst")];
-    char stringpool_str60[sizeof("clt")];
-    char stringpool_str61[sizeof("eastern")];
-    char stringpool_str62[sizeof("clst")];
-    char stringpool_str63[sizeof("bt")];
-    char stringpool_str64[sizeof("w. australia")];
-    char stringpool_str65[sizeof("bst")];
-    char stringpool_str66[sizeof("cct")];
-    char stringpool_str67[sizeof("brt")];
-    char stringpool_str69[sizeof("brst")];
-    char stringpool_str71[sizeof("a")];
-    char stringpool_str72[sizeof("e. europe")];
-    char stringpool_str73[sizeof("at")];
-    char stringpool_str74[sizeof("central")];
-    char stringpool_str75[sizeof("ast")];
-    char stringpool_str76[sizeof("adt")];
-    char stringpool_str77[sizeof("art")];
-    char stringpool_str78[sizeof("e. africa")];
-    char stringpool_str79[sizeof("e. south america")];
-    char stringpool_str80[sizeof("jst")];
-    char stringpool_str81[sizeof("e. australia")];
-    char stringpool_str82[sizeof("t")];
-    char stringpool_str83[sizeof("nt")];
-    char stringpool_str84[sizeof("n")];
-    char stringpool_str85[sizeof("nst")];
-    char stringpool_str86[sizeof("ndt")];
-    char stringpool_str87[sizeof("canada central")];
-    char stringpool_str88[sizeof("central pacific")];
-    char stringpool_str89[sizeof("west pacific")];
-    char stringpool_str90[sizeof("hst")];
-    char stringpool_str91[sizeof("hdt")];
-    char stringpool_str93[sizeof("malay peninsula")];
-    char stringpool_str95[sizeof("zp6")];
-    char stringpool_str97[sizeof("russian")];
-    char stringpool_str98[sizeof("hast")];
-    char stringpool_str99[sizeof("hadt")];
-    char stringpool_str100[sizeof("gst")];
-    char stringpool_str101[sizeof("zp5")];
-    char stringpool_str102[sizeof("ist")];
-    char stringpool_str103[sizeof("swt")];
-    char stringpool_str104[sizeof("w")];
-    char stringpool_str105[sizeof("zp4")];
-    char stringpool_str107[sizeof("mez")];
-    char stringpool_str108[sizeof("cape verde")];
-    char stringpool_str109[sizeof("mesz")];
-    char stringpool_str110[sizeof("greenland")];
-    char stringpool_str112[sizeof("x")];
-    char stringpool_str114[sizeof("mewt")];
-    char stringpool_str115[sizeof("w. central africa")];
-    char stringpool_str116[sizeof("k")];
-    char stringpool_str117[sizeof("b")];
-    char stringpool_str119[sizeof("m")];
-    char stringpool_str120[sizeof("sri lanka")];
-    char stringpool_str122[sizeof("fst")];
-    char stringpool_str124[sizeof("iran")];
-    char stringpool_str125[sizeof("sgt")];
-    char stringpool_str126[sizeof("ut")];
-    char stringpool_str128[sizeof("q")];
-    char stringpool_str129[sizeof("nzt")];
-    char stringpool_str131[sizeof("nzst")];
-    char stringpool_str132[sizeof("nzdt")];
-    char stringpool_str133[sizeof("myanmar")];
-    char stringpool_str135[sizeof("alaskan")];
-    char stringpool_str136[sizeof("pst")];
-    char stringpool_str137[sizeof("pdt")];
-    char stringpool_str138[sizeof("sa western")];
-    char stringpool_str139[sizeof("korea")];
-    char stringpool_str142[sizeof("y")];
-    char stringpool_str143[sizeof("f")];
-    char stringpool_str144[sizeof("akst")];
-    char stringpool_str145[sizeof("akdt")];
-    char stringpool_str148[sizeof("caucasus")];
-    char stringpool_str150[sizeof("msk")];
-    char stringpool_str151[sizeof("idle")];
-    char stringpool_str153[sizeof("arabian")];
-    char stringpool_str155[sizeof("o")];
-    char stringpool_str156[sizeof("l")];
-    char stringpool_str157[sizeof("mid-atlantic")];
-    char stringpool_str160[sizeof("us eastern")];
-    char stringpool_str164[sizeof("ahst")];
-    char stringpool_str167[sizeof("h")];
-    char stringpool_str168[sizeof("fle")];
-    char stringpool_str169[sizeof("i")];
-    char stringpool_str170[sizeof("north asia")];
-    char stringpool_str171[sizeof("n. central asia")];
-    char stringpool_str172[sizeof("north asia east")];
-    char stringpool_str174[sizeof("sa pacific")];
-    char stringpool_str177[sizeof("south africa")];
-    char stringpool_str181[sizeof("aus eastern")];
-    char stringpool_str182[sizeof("atlantic")];
-    char stringpool_str186[sizeof("mexico")];
-    char stringpool_str188[sizeof("mountain")];
-    char stringpool_str190[sizeof("china")];
-    char stringpool_str191[sizeof("azores")];
-    char stringpool_str192[sizeof("india")];
-    char stringpool_str194[sizeof("u")];
-    char stringpool_str195[sizeof("arabic")];
-    char stringpool_str196[sizeof("greenwich")];
-    char stringpool_str197[sizeof("new zealand")];
-    char stringpool_str198[sizeof("hawaiian")];
-    char stringpool_str199[sizeof("g")];
-    char stringpool_str200[sizeof("romance")];
-    char stringpool_str203[sizeof("arab")];
-    char stringpool_str204[sizeof("samoa")];
-    char stringpool_str205[sizeof("v")];
-    char stringpool_str206[sizeof("p")];
-    char stringpool_str207[sizeof("gmt")];
-    char stringpool_str208[sizeof("tasmania")];
-    char stringpool_str209[sizeof("fwt")];
-    char stringpool_str211[sizeof("newfoundland")];
-    char stringpool_str217[sizeof("nepal")];
-    char stringpool_str218[sizeof("aus central")];
-    char stringpool_str221[sizeof("gtb")];
-    char stringpool_str223[sizeof("vladivostok")];
-    char stringpool_str229[sizeof("utc")];
-    char stringpool_str233[sizeof("ekaterinburg")];
-    char stringpool_str265[sizeof("us mountain")];
-    char stringpool_str269[sizeof("jerusalem")];
-    char stringpool_str272[sizeof("yakutsk")];
-    char stringpool_str279[sizeof("pacific sa")];
-    char stringpool_str282[sizeof("tonga")];
-    char stringpool_str314[sizeof("afghanistan")];
-    char stringpool_str319[sizeof("idlw")];
-    char stringpool_str322[sizeof("pacific")];
-    char stringpool_str327[sizeof("taipei")];
-    char stringpool_str328[sizeof("egypt")];
-    char stringpool_str392[sizeof("tokyo")];
-    char stringpool_str438[sizeof("fiji")];
+    char stringpool_str2[sizeof("o")];
+    char stringpool_str3[sizeof("x")];
+    char stringpool_str4[sizeof("z")];
+    char stringpool_str5[sizeof("q")];
+    char stringpool_str8[sizeof("omst")];
+    char stringpool_str9[sizeof("omsst")];
+    char stringpool_str10[sizeof("p")];
+    char stringpool_str13[sizeof("a")];
+    char stringpool_str14[sizeof("e")];
+    char stringpool_str15[sizeof("pet")];
+    char stringpool_str16[sizeof("pmst")];
+    char stringpool_str17[sizeof("pett")];
+    char stringpool_str18[sizeof("petst")];
+    char stringpool_str19[sizeof("eet")];
+    char stringpool_str20[sizeof("aest")];
+    char stringpool_str21[sizeof("eest")];
+    char stringpool_str22[sizeof("eat")];
+    char stringpool_str24[sizeof("east")];
+    char stringpool_str25[sizeof("easst")];
+    char stringpool_str26[sizeof("pst")];
+    char stringpool_str27[sizeof("eastern")];
+    char stringpool_str28[sizeof("m")];
+    char stringpool_str29[sizeof("ast")];
+    char stringpool_str30[sizeof("est")];
+    char stringpool_str31[sizeof("c")];
+    char stringpool_str32[sizeof("mmt")];
+    char stringpool_str33[sizeof("met")];
+    char stringpool_str35[sizeof("mest")];
+    char stringpool_str36[sizeof("cet")];
+    char stringpool_str37[sizeof("d")];
+    char stringpool_str38[sizeof("cest")];
+    char stringpool_str39[sizeof("cat")];
+    char stringpool_str41[sizeof("cast")];
+    char stringpool_str42[sizeof("magt")];
+    char stringpool_str43[sizeof("magst")];
+    char stringpool_str44[sizeof("mst")];
+    char stringpool_str45[sizeof("msk")];
+    char stringpool_str46[sizeof("cot")];
+    char stringpool_str47[sizeof("cst")];
+    char stringpool_str48[sizeof("aqtt")];
+    char stringpool_str49[sizeof("f")];
+    char stringpool_str52[sizeof("art")];
+    char stringpool_str53[sizeof("fnt")];
+    char stringpool_str54[sizeof("fet")];
+    char stringpool_str55[sizeof("b")];
+    char stringpool_str57[sizeof("anat")];
+    char stringpool_str58[sizeof("anast")];
+    char stringpool_str59[sizeof("bnt")];
+    char stringpool_str60[sizeof("i")];
+    char stringpool_str61[sizeof("pht")];
+    char stringpool_str62[sizeof("at")];
+    char stringpool_str63[sizeof("zp6")];
+    char stringpool_str64[sizeof("mewt")];
+    char stringpool_str65[sizeof("fst")];
+    char stringpool_str66[sizeof("ahst")];
+    char stringpool_str67[sizeof("mawt")];
+    char stringpool_str68[sizeof("zp5")];
+    char stringpool_str70[sizeof("bot")];
+    char stringpool_str71[sizeof("bst")];
+    char stringpool_str72[sizeof("pwt")];
+    char stringpool_str74[sizeof("pont")];
+    char stringpool_str75[sizeof("iot")];
+    char stringpool_str76[sizeof("ist")];
+    char stringpool_str77[sizeof("awst")];
+    char stringpool_str79[sizeof("mht")];
+    char stringpool_str80[sizeof("mez")];
+    char stringpool_str81[sizeof("orat")];
+    char stringpool_str82[sizeof("mesz")];
+    char stringpool_str84[sizeof("chst")];
+    char stringpool_str85[sizeof("pmdt")];
+    char stringpool_str88[sizeof("central")];
+    char stringpool_str89[sizeof("aedt")];
+    char stringpool_str90[sizeof("act")];
+    char stringpool_str91[sizeof("ect")];
+    char stringpool_str92[sizeof("acst")];
+    char stringpool_str93[sizeof("eadt")];
+    char stringpool_str94[sizeof("brt")];
+    char stringpool_str95[sizeof("chut")];
+    char stringpool_str96[sizeof("brst")];
+    char stringpool_str97[sizeof("cen. australia")];
+    char stringpool_str100[sizeof("davt")];
+    char stringpool_str101[sizeof("irst")];
+    char stringpool_str102[sizeof("irkt")];
+    char stringpool_str103[sizeof("irkst")];
+    char stringpool_str104[sizeof("bt")];
+    char stringpool_str105[sizeof("n")];
+    char stringpool_str106[sizeof("btt")];
+    char stringpool_str107[sizeof("mountain")];
+    char stringpool_str108[sizeof("cct")];
+    char stringpool_str109[sizeof("w")];
+    char stringpool_str110[sizeof("l")];
+    char stringpool_str111[sizeof("fwt")];
+    char stringpool_str113[sizeof("msd")];
+    char stringpool_str114[sizeof("wet")];
+    char stringpool_str116[sizeof("west")];
+    char stringpool_str117[sizeof("wat")];
+    char stringpool_str119[sizeof("wast")];
+    char stringpool_str120[sizeof("wakt")];
+    char stringpool_str121[sizeof("nst")];
+    char stringpool_str122[sizeof("acwst")];
+    char stringpool_str123[sizeof("chast")];
+    char stringpool_str124[sizeof("cist")];
+    char stringpool_str125[sizeof("azt")];
+    char stringpool_str126[sizeof("clt")];
+    char stringpool_str127[sizeof("azst")];
+    char stringpool_str128[sizeof("clst")];
+    char stringpool_str129[sizeof("mart")];
+    char stringpool_str130[sizeof("zp4")];
+    char stringpool_str131[sizeof("jst")];
+    char stringpool_str132[sizeof("central asia")];
+    char stringpool_str133[sizeof("aft")];
+    char stringpool_str134[sizeof("e. south america")];
+    char stringpool_str135[sizeof("central america")];
+    char stringpool_str137[sizeof("ict")];
+    char stringpool_str143[sizeof("pgt")];
+    char stringpool_str144[sizeof("nrt")];
+    char stringpool_str145[sizeof("mexico")];
+    char stringpool_str146[sizeof("awdt")];
+    char stringpool_str147[sizeof("egt")];
+    char stringpool_str148[sizeof("cxt")];
+    char stringpool_str149[sizeof("egst")];
+    char stringpool_str150[sizeof("phot")];
+    char stringpool_str151[sizeof("alaskan")];
+    char stringpool_str154[sizeof("nt")];
+    char stringpool_str158[sizeof("wt")];
+    char stringpool_str160[sizeof("west asia")];
+    char stringpool_str161[sizeof("acdt")];
+    char stringpool_str162[sizeof("npt")];
+    char stringpool_str163[sizeof("lhst")];
+    char stringpool_str164[sizeof("afghanistan")];
+    char stringpool_str167[sizeof("k")];
+    char stringpool_str169[sizeof("g")];
+    char stringpool_str170[sizeof("irdt")];
+    char stringpool_str171[sizeof("chot")];
+    char stringpool_str172[sizeof("chost")];
+    char stringpool_str173[sizeof("gmt")];
+    char stringpool_str174[sizeof("get")];
+    char stringpool_str175[sizeof("novt")];
+    char stringpool_str176[sizeof("novst")];
+    char stringpool_str177[sizeof("fjt")];
+    char stringpool_str178[sizeof("u")];
+    char stringpool_str179[sizeof("fjst")];
+    char stringpool_str181[sizeof("pyst")];
+    char stringpool_str182[sizeof("nct")];
+    char stringpool_str183[sizeof("kst")];
+    char stringpool_str184[sizeof("kost")];
+    char stringpool_str185[sizeof("gst")];
+    char stringpool_str186[sizeof("iran")];
+    char stringpool_str187[sizeof("e. africa")];
+    char stringpool_str188[sizeof("wadt")];
+    char stringpool_str189[sizeof("t")];
+    char stringpool_str190[sizeof("e. australia")];
+    char stringpool_str191[sizeof("s")];
+    char stringpool_str192[sizeof("chadt")];
+    char stringpool_str193[sizeof("tmt")];
+    char stringpool_str194[sizeof("cidst")];
+    char stringpool_str195[sizeof("aoe")];
+    char stringpool_str197[sizeof("myt")];
+    char stringpool_str198[sizeof("west pacific")];
+    char stringpool_str199[sizeof("mut")];
+    char stringpool_str200[sizeof("wit")];
+    char stringpool_str201[sizeof("sast")];
+    char stringpool_str202[sizeof("sakt")];
+    char stringpool_str203[sizeof("new zealand")];
+    char stringpool_str204[sizeof("tot")];
+    char stringpool_str205[sizeof("china")];
+    char stringpool_str206[sizeof("tost")];
+    char stringpool_str207[sizeof("sst")];
+    char stringpool_str209[sizeof("india")];
+    char stringpool_str211[sizeof("warst")];
+    char stringpool_str212[sizeof("sbt")];
+    char stringpool_str214[sizeof("azot")];
+    char stringpool_str215[sizeof("azost")];
+    char stringpool_str216[sizeof("taht")];
+    char stringpool_str217[sizeof("nzt")];
+    char stringpool_str218[sizeof("dateline")];
+    char stringpool_str219[sizeof("nzst")];
+    char stringpool_str220[sizeof("tokyo")];
+    char stringpool_str221[sizeof("central pacific")];
+    char stringpool_str223[sizeof("qyzt")];
+    char stringpool_str224[sizeof("atlantic")];
+    char stringpool_str225[sizeof("nft")];
+    char stringpool_str227[sizeof("ut")];
+    char stringpool_str228[sizeof("trt")];
+    char stringpool_str229[sizeof("wft")];
+    char stringpool_str230[sizeof("srt")];
+    char stringpool_str231[sizeof("pdt")];
+    char stringpool_str232[sizeof("lhdt")];
+    char stringpool_str234[sizeof("adt")];
+    char stringpool_str235[sizeof("edt")];
+    char stringpool_str238[sizeof("pkt")];
+    char stringpool_str239[sizeof("almt")];
+    char stringpool_str240[sizeof("wita")];
+    char stringpool_str242[sizeof("wgt")];
+    char stringpool_str243[sizeof("akst")];
+    char stringpool_str244[sizeof("wgst")];
+    char stringpool_str246[sizeof("krat")];
+    char stringpool_str247[sizeof("krast")];
+    char stringpool_str248[sizeof("mid-atlantic")];
+    char stringpool_str249[sizeof("mdt")];
+    char stringpool_str250[sizeof("lint")];
+    char stringpool_str251[sizeof("malay peninsula")];
+    char stringpool_str252[sizeof("cdt")];
+    char stringpool_str253[sizeof("swt")];
+    char stringpool_str255[sizeof("se asia")];
+    char stringpool_str256[sizeof("v")];
+    char stringpool_str258[sizeof("tonga")];
+    char stringpool_str259[sizeof("ckt")];
+    char stringpool_str261[sizeof("vet")];
+    char stringpool_str262[sizeof("caucasus")];
+    char stringpool_str263[sizeof("central europe")];
+    char stringpool_str264[sizeof("h")];
+    char stringpool_str265[sizeof("central european")];
+    char stringpool_str266[sizeof("newfoundland")];
+    char stringpool_str267[sizeof("arab")];
+    char stringpool_str268[sizeof("sct")];
+    char stringpool_str269[sizeof("arabic")];
+    char stringpool_str270[sizeof("arabian")];
+    char stringpool_str271[sizeof("ddut")];
+    char stringpool_str273[sizeof("vost")];
+    char stringpool_str274[sizeof("hast")];
+    char stringpool_str275[sizeof("nepal")];
+    char stringpool_str276[sizeof("nut")];
+    char stringpool_str277[sizeof("fkt")];
+    char stringpool_str279[sizeof("fkst")];
+    char stringpool_str280[sizeof("hst")];
+    char stringpool_str281[sizeof("idt")];
+    char stringpool_str284[sizeof("tlt")];
+    char stringpool_str285[sizeof("w. australia")];
+    char stringpool_str286[sizeof("egypt")];
+    char stringpool_str287[sizeof("myanmar")];
+    char stringpool_str288[sizeof("nzdt")];
+    char stringpool_str289[sizeof("gft")];
+    char stringpool_str290[sizeof("uzt")];
+    char stringpool_str293[sizeof("north asia")];
+    char stringpool_str294[sizeof("mvt")];
+    char stringpool_str295[sizeof("galt")];
+    char stringpool_str296[sizeof("nfdt")];
+    char stringpool_str297[sizeof("cvt")];
+    char stringpool_str298[sizeof("north asia east")];
+    char stringpool_str300[sizeof("kgt")];
+    char stringpool_str301[sizeof("aus central")];
+    char stringpool_str302[sizeof("pacific")];
+    char stringpool_str304[sizeof("canada central")];
+    char stringpool_str306[sizeof("pacific sa")];
+    char stringpool_str307[sizeof("azores")];
+    char stringpool_str308[sizeof("gamt")];
+    char stringpool_str309[sizeof("tft")];
+    char stringpool_str310[sizeof("r")];
+    char stringpool_str311[sizeof("fle")];
+    char stringpool_str312[sizeof("akdt")];
+    char stringpool_str313[sizeof("ulat")];
+    char stringpool_str314[sizeof("ulast")];
+    char stringpool_str315[sizeof("ret")];
+    char stringpool_str317[sizeof("tjt")];
+    char stringpool_str319[sizeof("south africa")];
+    char stringpool_str324[sizeof("sgt")];
+    char stringpool_str326[sizeof("ndt")];
+    char stringpool_str327[sizeof("rott")];
+    char stringpool_str330[sizeof("samt")];
+    char stringpool_str332[sizeof("tasmania")];
+    char stringpool_str334[sizeof("hovt")];
+    char stringpool_str335[sizeof("hovst")];
+    char stringpool_str338[sizeof("gyt")];
+    char stringpool_str342[sizeof("y")];
+    char stringpool_str343[sizeof("hadt")];
+    char stringpool_str344[sizeof("sa western")];
+    char stringpool_str345[sizeof("hawaiian")];
+    char stringpool_str347[sizeof("uyt")];
+    char stringpool_str349[sizeof("uyst")];
+    char stringpool_str350[sizeof("yekt")];
+    char stringpool_str351[sizeof("yekst")];
+    char stringpool_str352[sizeof("kuyt")];
+    char stringpool_str353[sizeof("yakt")];
+    char stringpool_str354[sizeof("yakst")];
+    char stringpool_str358[sizeof("yst")];
+    char stringpool_str359[sizeof("jerusalem")];
+    char stringpool_str365[sizeof("sri lanka")];
+    char stringpool_str367[sizeof("yakutsk")];
+    char stringpool_str375[sizeof("wib")];
+    char stringpool_str377[sizeof("aus eastern")];
+    char stringpool_str378[sizeof("gilt")];
+    char stringpool_str387[sizeof("us mountain")];
+    char stringpool_str391[sizeof("vlat")];
+    char stringpool_str392[sizeof("vlast")];
+    char stringpool_str395[sizeof("gtb")];
+    char stringpool_str398[sizeof("taipei")];
+    char stringpool_str399[sizeof("sret")];
+    char stringpool_str408[sizeof("cape verde")];
+    char stringpool_str417[sizeof("tkt")];
+    char stringpool_str418[sizeof("samoa")];
+    char stringpool_str421[sizeof("sa pacific")];
+    char stringpool_str427[sizeof("vut")];
+    char stringpool_str428[sizeof("idlw")];
+    char stringpool_str432[sizeof("fiji")];
+    char stringpool_str435[sizeof("utc")];
+    char stringpool_str443[sizeof("korea")];
+    char stringpool_str445[sizeof("e. europe")];
+    char stringpool_str449[sizeof("syot")];
+    char stringpool_str452[sizeof("n. central asia")];
+    char stringpool_str455[sizeof("tvt")];
+    char stringpool_str458[sizeof("w. central africa")];
+    char stringpool_str466[sizeof("ekaterinburg")];
+    char stringpool_str468[sizeof("vladivostok")];
+    char stringpool_str476[sizeof("yapt")];
+    char stringpool_str477[sizeof("us eastern")];
+    char stringpool_str482[sizeof("sa eastern")];
+    char stringpool_str485[sizeof("hdt")];
+    char stringpool_str486[sizeof("russian")];
+    char stringpool_str492[sizeof("hkt")];
+    char stringpool_str497[sizeof("romance")];
+    char stringpool_str540[sizeof("w. europe")];
+    char stringpool_str563[sizeof("ydt")];
+    char stringpool_str566[sizeof("idle")];
+    char stringpool_str567[sizeof("greenwich")];
+    char stringpool_str619[sizeof("greenland")];
   };
 static const struct stringpool_t stringpool_contents =
   {
-    "r",
-    "s",
-    "d",
-    "cst",
-    "cdt",
-    "sst",
-    "cet",
-    "msd",
-    "cest",
-    "cat",
-    "mst",
-    "mdt",
-    "sast",
+    "o",
+    "x",
+    "z",
+    "q",
+    "omst",
+    "omsst",
+    "p",
+    "a",
+    "e",
+    "pet",
+    "pmst",
+    "pett",
+    "petst",
+    "eet",
+    "aest",
+    "eest",
+    "eat",
+    "east",
+    "easst",
+    "pst",
+    "eastern",
+    "m",
+    "ast",
+    "est",
+    "c",
+    "mmt",
     "met",
     "mest",
+    "cet",
+    "d",
+    "cest",
+    "cat",
+    "cast",
+    "magt",
+    "magst",
+    "mst",
+    "msk",
+    "cot",
+    "cst",
+    "aqtt",
+    "f",
+    "art",
+    "fnt",
+    "fet",
+    "b",
+    "anat",
+    "anast",
+    "bnt",
+    "i",
+    "pht",
+    "at",
+    "zp6",
+    "mewt",
+    "fst",
+    "ahst",
+    "mawt",
+    "zp5",
+    "bot",
+    "bst",
+    "pwt",
+    "pont",
+    "iot",
+    "ist",
+    "awst",
+    "mht",
+    "mez",
+    "orat",
+    "mesz",
+    "chst",
+    "pmdt",
+    "central",
+    "aedt",
+    "act",
+    "ect",
+    "acst",
+    "eadt",
+    "brt",
+    "chut",
+    "brst",
+    "cen. australia",
+    "davt",
+    "irst",
+    "irkt",
+    "irkst",
+    "bt",
+    "n",
+    "btt",
+    "mountain",
+    "cct",
+    "w",
+    "l",
+    "fwt",
+    "msd",
     "wet",
-    "dateline",
     "west",
     "wat",
     "wast",
-    "wadt",
-    "e",
-    "central europe",
-    "central asia",
-    "west asia",
-    "cen. australia",
-    "central america",
-    "est",
-    "edt",
-    "central european",
-    "eet",
-    "se asia",
-    "eest",
-    "eat",
-    "z",
-    "east",
-    "eadt",
-    "sa eastern",
-    "w. europe",
-    "c",
-    "yst",
-    "ydt",
-    "kst",
-    "clt",
-    "eastern",
-    "clst",
-    "bt",
-    "w. australia",
-    "bst",
-    "cct",
-    "brt",
-    "brst",
-    "a",
-    "e. europe",
-    "at",
-    "central",
-    "ast",
-    "adt",
-    "art",
-    "e. africa",
-    "e. south america",
-    "jst",
-    "e. australia",
-    "t",
-    "nt",
-    "n",
+    "wakt",
     "nst",
-    "ndt",
-    "canada central",
-    "central pacific",
-    "west pacific",
-    "hst",
-    "hdt",
-    "malay peninsula",
-    "zp6",
-    "russian",
-    "hast",
-    "hadt",
-    "gst",
-    "zp5",
-    "ist",
-    "swt",
-    "w",
+    "acwst",
+    "chast",
+    "cist",
+    "azt",
+    "clt",
+    "azst",
+    "clst",
+    "mart",
     "zp4",
-    "mez",
-    "cape verde",
-    "mesz",
-    "greenland",
-    "x",
-    "mewt",
-    "w. central africa",
-    "k",
-    "b",
-    "m",
-    "sri lanka",
-    "fst",
-    "iran",
-    "sgt",
-    "ut",
-    "q",
-    "nzt",
-    "nzst",
-    "nzdt",
-    "myanmar",
-    "alaskan",
-    "pst",
-    "pdt",
-    "sa western",
-    "korea",
-    "y",
-    "f",
-    "akst",
-    "akdt",
-    "caucasus",
-    "msk",
-    "idle",
-    "arabian",
-    "o",
-    "l",
-    "mid-atlantic",
-    "us eastern",
-    "ahst",
-    "h",
-    "fle",
-    "i",
-    "north asia",
-    "n. central asia",
-    "north asia east",
-    "sa pacific",
-    "south africa",
-    "aus eastern",
-    "atlantic",
+    "jst",
+    "central asia",
+    "aft",
+    "e. south america",
+    "central america",
+    "ict",
+    "pgt",
+    "nrt",
     "mexico",
-    "mountain",
-    "china",
-    "azores",
-    "india",
-    "u",
-    "arabic",
-    "greenwich",
-    "new zealand",
-    "hawaiian",
-    "g",
-    "romance",
-    "arab",
-    "samoa",
-    "v",
-    "p",
-    "gmt",
-    "tasmania",
-    "fwt",
-    "newfoundland",
-    "nepal",
-    "aus central",
-    "gtb",
-    "vladivostok",
-    "utc",
-    "ekaterinburg",
-    "us mountain",
-    "jerusalem",
-    "yakutsk",
-    "pacific sa",
-    "tonga",
+    "awdt",
+    "egt",
+    "cxt",
+    "egst",
+    "phot",
+    "alaskan",
+    "nt",
+    "wt",
+    "west asia",
+    "acdt",
+    "npt",
+    "lhst",
     "afghanistan",
-    "idlw",
-    "pacific",
-    "taipei",
-    "egypt",
+    "k",
+    "g",
+    "irdt",
+    "chot",
+    "chost",
+    "gmt",
+    "get",
+    "novt",
+    "novst",
+    "fjt",
+    "u",
+    "fjst",
+    "pyst",
+    "nct",
+    "kst",
+    "kost",
+    "gst",
+    "iran",
+    "e. africa",
+    "wadt",
+    "t",
+    "e. australia",
+    "s",
+    "chadt",
+    "tmt",
+    "cidst",
+    "aoe",
+    "myt",
+    "west pacific",
+    "mut",
+    "wit",
+    "sast",
+    "sakt",
+    "new zealand",
+    "tot",
+    "china",
+    "tost",
+    "sst",
+    "india",
+    "warst",
+    "sbt",
+    "azot",
+    "azost",
+    "taht",
+    "nzt",
+    "dateline",
+    "nzst",
     "tokyo",
-    "fiji"
+    "central pacific",
+    "qyzt",
+    "atlantic",
+    "nft",
+    "ut",
+    "trt",
+    "wft",
+    "srt",
+    "pdt",
+    "lhdt",
+    "adt",
+    "edt",
+    "pkt",
+    "almt",
+    "wita",
+    "wgt",
+    "akst",
+    "wgst",
+    "krat",
+    "krast",
+    "mid-atlantic",
+    "mdt",
+    "lint",
+    "malay peninsula",
+    "cdt",
+    "swt",
+    "se asia",
+    "v",
+    "tonga",
+    "ckt",
+    "vet",
+    "caucasus",
+    "central europe",
+    "h",
+    "central european",
+    "newfoundland",
+    "arab",
+    "sct",
+    "arabic",
+    "arabian",
+    "ddut",
+    "vost",
+    "hast",
+    "nepal",
+    "nut",
+    "fkt",
+    "fkst",
+    "hst",
+    "idt",
+    "tlt",
+    "w. australia",
+    "egypt",
+    "myanmar",
+    "nzdt",
+    "gft",
+    "uzt",
+    "north asia",
+    "mvt",
+    "galt",
+    "nfdt",
+    "cvt",
+    "north asia east",
+    "kgt",
+    "aus central",
+    "pacific",
+    "canada central",
+    "pacific sa",
+    "azores",
+    "gamt",
+    "tft",
+    "r",
+    "fle",
+    "akdt",
+    "ulat",
+    "ulast",
+    "ret",
+    "tjt",
+    "south africa",
+    "sgt",
+    "ndt",
+    "rott",
+    "samt",
+    "tasmania",
+    "hovt",
+    "hovst",
+    "gyt",
+    "y",
+    "hadt",
+    "sa western",
+    "hawaiian",
+    "uyt",
+    "uyst",
+    "yekt",
+    "yekst",
+    "kuyt",
+    "yakt",
+    "yakst",
+    "yst",
+    "jerusalem",
+    "sri lanka",
+    "yakutsk",
+    "wib",
+    "aus eastern",
+    "gilt",
+    "us mountain",
+    "vlat",
+    "vlast",
+    "gtb",
+    "taipei",
+    "sret",
+    "cape verde",
+    "tkt",
+    "samoa",
+    "sa pacific",
+    "vut",
+    "idlw",
+    "fiji",
+    "utc",
+    "korea",
+    "e. europe",
+    "syot",
+    "n. central asia",
+    "tvt",
+    "w. central africa",
+    "ekaterinburg",
+    "vladivostok",
+    "yapt",
+    "us eastern",
+    "sa eastern",
+    "hdt",
+    "russian",
+    "hkt",
+    "romance",
+    "w. europe",
+    "ydt",
+    "idle",
+    "greenwich",
+    "greenland"
   };
 #define stringpool ((const char *) &stringpool_contents)
 const struct zone *
@@ -503,416 +807,737 @@ zonetab (register const char *str, register size_t len)
 {
   static const struct zone wordlist[] =
     {
-      {-1}, {-1}, {-1}, {-1}, {-1},
-#line 37 "zonetab.list"
-      {gperf_offsetof(stringpool, 5),   -5*3600},
-#line 38 "zonetab.list"
-      {gperf_offsetof(stringpool, 6),   -6*3600},
-#line 24 "zonetab.list"
-      {gperf_offsetof(stringpool, 7),    4*3600},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 15 "zonetab.list"
-      {gperf_offsetof(stringpool, 14), -6*3600},
-#line 16 "zonetab.list"
-      {gperf_offsetof(stringpool, 15), -5*3600},
-#line 85 "zonetab.list"
-      {gperf_offsetof(stringpool, 16),  2*3600},
-#line 71 "zonetab.list"
-      {gperf_offsetof(stringpool, 17),  1*3600},
-#line 90 "zonetab.list"
-      {gperf_offsetof(stringpool, 18),  4*3600},
-#line 79 "zonetab.list"
-      {gperf_offsetof(stringpool, 19), 2*3600},
-#line 65 "zonetab.list"
-      {gperf_offsetof(stringpool, 20),-10*3600},
-      {-1},
-#line 17 "zonetab.list"
-      {gperf_offsetof(stringpool, 22), -7*3600},
-#line 18 "zonetab.list"
-      {gperf_offsetof(stringpool, 23), -6*3600},
-#line 84 "zonetab.list"
-      {gperf_offsetof(stringpool, 24), 2*3600},
-#line 73 "zonetab.list"
-      {gperf_offsetof(stringpool, 25),  1*3600},
-      {-1},
-#line 82 "zonetab.list"
-      {gperf_offsetof(stringpool, 27), 2*3600},
       {-1}, {-1},
-#line 47 "zonetab.list"
-      {gperf_offsetof(stringpool, 30),  0*3600},
-#line 128 "zonetab.list"
-      {gperf_offsetof(stringpool, 31),               -43200},
-#line 78 "zonetab.list"
-      {gperf_offsetof(stringpool, 32), 1*3600},
-#line 77 "zonetab.list"
+#line 34 "zonetab.list"
+      {gperf_offsetof(stringpool, 2),   -2*3600},
+#line 43 "zonetab.list"
+      {gperf_offsetof(stringpool, 3),  -11*3600},
+#line 45 "zonetab.list"
+      {gperf_offsetof(stringpool, 4),    0*3600},
+#line 36 "zonetab.list"
+      {gperf_offsetof(stringpool, 5),   -4*3600},
+      {-1}, {-1},
+#line 269 "zonetab.list"
+      {gperf_offsetof(stringpool, 8),21600},
+#line 268 "zonetab.list"
+      {gperf_offsetof(stringpool, 9),25200},
+#line 35 "zonetab.list"
+      {gperf_offsetof(stringpool, 10),   -3*3600},
+      {-1}, {-1},
+#line 21 "zonetab.list"
+      {gperf_offsetof(stringpool, 13),    1*3600},
+#line 25 "zonetab.list"
+      {gperf_offsetof(stringpool, 14),    5*3600},
+#line 271 "zonetab.list"
+      {gperf_offsetof(stringpool, 15),-18000},
+#line 279 "zonetab.list"
+      {gperf_offsetof(stringpool, 16),-10800},
+#line 273 "zonetab.list"
+      {gperf_offsetof(stringpool, 17),43200},
+#line 272 "zonetab.list"
+      {gperf_offsetof(stringpool, 18),43200},
+#line 80 "zonetab.list"
+      {gperf_offsetof(stringpool, 19),  2*3600},
+#line 186 "zonetab.list"
+      {gperf_offsetof(stringpool, 20),36000},
+#line 88 "zonetab.list"
+      {gperf_offsetof(stringpool, 21), 3*3600},
+#line 87 "zonetab.list"
+      {gperf_offsetof(stringpool, 22),  3*3600},
+      {-1},
+#line 101 "zonetab.list"
+      {gperf_offsetof(stringpool, 24),10*3600},
+#line 217 "zonetab.list"
+      {gperf_offsetof(stringpool, 25),-18000},
+#line 19 "zonetab.list"
+      {gperf_offsetof(stringpool, 26), -8*3600},
+#line 133 "zonetab.list"
+      {gperf_offsetof(stringpool, 27),                -18000},
+#line 32 "zonetab.list"
+      {gperf_offsetof(stringpool, 28),   12*3600},
+#line 56 "zonetab.list"
+      {gperf_offsetof(stringpool, 29), -4*3600},
+#line 13 "zonetab.list"
+      {gperf_offsetof(stringpool, 30), -5*3600},
+#line 23 "zonetab.list"
+      {gperf_offsetof(stringpool, 31),    3*3600},
+#line 256 "zonetab.list"
+      {gperf_offsetof(stringpool, 32),23400},
+#line 73 "zonetab.list"
       {gperf_offsetof(stringpool, 33),  1*3600},
       {-1},
-#line 95 "zonetab.list"
-      {gperf_offsetof(stringpool, 35), 7*3600},
-#line 98 "zonetab.list"
-      {gperf_offsetof(stringpool, 36), 8*3600},
-#line 25 "zonetab.list"
-      {gperf_offsetof(stringpool, 37),    5*3600},
-#line 123 "zonetab.list"
-      {gperf_offsetof(stringpool, 38),           3600},
-#line 122 "zonetab.list"
-      {gperf_offsetof(stringpool, 39),            21600},
-#line 178 "zonetab.list"
-      {gperf_offsetof(stringpool, 40),               18000},
-#line 120 "zonetab.list"
-      {gperf_offsetof(stringpool, 41),          34200},
-#line 121 "zonetab.list"
-      {gperf_offsetof(stringpool, 42),        -21600},
-      {-1},
-#line 13 "zonetab.list"
-      {gperf_offsetof(stringpool, 44), -5*3600},
-#line 14 "zonetab.list"
-      {gperf_offsetof(stringpool, 45), -4*3600},
-#line 124 "zonetab.list"
-      {gperf_offsetof(stringpool, 46),         3600},
-#line 80 "zonetab.list"
-      {gperf_offsetof(stringpool, 47),  2*3600},
-#line 164 "zonetab.list"
-      {gperf_offsetof(stringpool, 48),                 25200},
-#line 88 "zonetab.list"
-      {gperf_offsetof(stringpool, 49), 3*3600},
-#line 87 "zonetab.list"
-      {gperf_offsetof(stringpool, 50),  3*3600},
-#line 45 "zonetab.list"
-      {gperf_offsetof(stringpool, 51),    0*3600},
-#line 101 "zonetab.list"
-      {gperf_offsetof(stringpool, 52),10*3600},
-#line 103 "zonetab.list"
-      {gperf_offsetof(stringpool, 53),11*3600},
-#line 160 "zonetab.list"
-      {gperf_offsetof(stringpool, 54),             -10800},
-#line 177 "zonetab.list"
-      {gperf_offsetof(stringpool, 55),                3600},
-#line 23 "zonetab.list"
-      {gperf_offsetof(stringpool, 56),    3*3600},
-#line 63 "zonetab.list"
-      {gperf_offsetof(stringpool, 57), -9*3600},
-#line 59 "zonetab.list"
-      {gperf_offsetof(stringpool, 58), -8*3600},
-#line 100 "zonetab.list"
-      {gperf_offsetof(stringpool, 59),  9*3600},
-#line 57 "zonetab.list"
-      {gperf_offsetof(stringpool, 60), -4*3600},
-#line 133 "zonetab.list"
-      {gperf_offsetof(stringpool, 61),                -18000},
-#line 54 "zonetab.list"
-      {gperf_offsetof(stringpool, 62),-3*3600},
-#line 86 "zonetab.list"
-      {gperf_offsetof(stringpool, 63),   3*3600},
-#line 175 "zonetab.list"
-      {gperf_offsetof(stringpool, 64),            28800},
-#line 70 "zonetab.list"
-      {gperf_offsetof(stringpool, 65),  1*3600},
-#line 96 "zonetab.list"
-      {gperf_offsetof(stringpool, 66),  8*3600},
-#line 53 "zonetab.list"
-      {gperf_offsetof(stringpool, 67), -3*3600},
-      {-1},
-#line 49 "zonetab.list"
-      {gperf_offsetof(stringpool, 69),-2*3600},
-      {-1},
-#line 21 "zonetab.list"
-      {gperf_offsetof(stringpool, 71),    1*3600},
-#line 131 "zonetab.list"
-      {gperf_offsetof(stringpool, 72),                7200},
-#line 48 "zonetab.list"
-      {gperf_offsetof(stringpool, 73),  -2*3600},
-#line 126 "zonetab.list"
-      {gperf_offsetof(stringpool, 74),                -21600},
-#line 56 "zonetab.list"
-      {gperf_offsetof(stringpool, 75), -4*3600},
-#line 52 "zonetab.list"
-      {gperf_offsetof(stringpool, 76), -3*3600},
-#line 51 "zonetab.list"
-      {gperf_offsetof(stringpool, 77), -3*3600},
-#line 129 "zonetab.list"
-      {gperf_offsetof(stringpool, 78),               10800},
-#line 132 "zonetab.list"
-      {gperf_offsetof(stringpool, 79),       -10800},
-#line 99 "zonetab.list"
-      {gperf_offsetof(stringpool, 80),  9*3600},
-#line 130 "zonetab.list"
-      {gperf_offsetof(stringpool, 81),            36000},
-#line 39 "zonetab.list"
-      {gperf_offsetof(stringpool, 82),   -7*3600},
-#line 68 "zonetab.list"
-      {gperf_offsetof(stringpool, 83),  -11*3600},
-#line 33 "zonetab.list"
-      {gperf_offsetof(stringpool, 84),   -1*3600},
-#line 55 "zonetab.list"
-      {gperf_offsetof(stringpool, 85), -(3*3600+1800)},
-#line 50 "zonetab.list"
-      {gperf_offsetof(stringpool, 86), -(2*3600+1800)},
-#line 117 "zonetab.list"
-      {gperf_offsetof(stringpool, 87),         -21600},
-#line 125 "zonetab.list"
-      {gperf_offsetof(stringpool, 88),         39600},
-#line 179 "zonetab.list"
-      {gperf_offsetof(stringpool, 89),            36000},
-#line 67 "zonetab.list"
-      {gperf_offsetof(stringpool, 90),-10*3600},
-#line 62 "zonetab.list"
-      {gperf_offsetof(stringpool, 91), -9*3600},
-      {-1},
-#line 165 "zonetab.list"
-      {gperf_offsetof(stringpool, 93),         28800},
-      {-1},
-#line 94 "zonetab.list"
-      {gperf_offsetof(stringpool, 95),  6*3600},
-      {-1},
-#line 159 "zonetab.list"
-      {gperf_offsetof(stringpool, 97),                 10800},
-#line 66 "zonetab.list"
-      {gperf_offsetof(stringpool, 98),-10*3600},
-#line 61 "zonetab.list"
-      {gperf_offsetof(stringpool, 99),-9*3600},
-#line 102 "zonetab.list"
-      {gperf_offsetof(stringpool, 100), 10*3600},
-#line 92 "zonetab.list"
-      {gperf_offsetof(stringpool, 101),  5*3600},
-#line 93 "zonetab.list"
-      {gperf_offsetof(stringpool, 102),  (5*3600+1800)},
-#line 76 "zonetab.list"
-      {gperf_offsetof(stringpool, 103),  1*3600},
-#line 42 "zonetab.list"
-      {gperf_offsetof(stringpool, 104),  -10*3600},
-#line 91 "zonetab.list"
-      {gperf_offsetof(stringpool, 105),  4*3600},
-      {-1},
-#line 75 "zonetab.list"
-      {gperf_offsetof(stringpool, 107),  1*3600},
-#line 118 "zonetab.list"
-      {gperf_offsetof(stringpool, 108),              -3600},
-#line 83 "zonetab.list"
-      {gperf_offsetof(stringpool, 109), 2*3600},
-#line 138 "zonetab.list"
-      {gperf_offsetof(stringpool, 110),              -10800},
-      {-1},
-#line 43 "zonetab.list"
-      {gperf_offsetof(stringpool, 112),  -11*3600},
-      {-1},
-#line 74 "zonetab.list"
-      {gperf_offsetof(stringpool, 114), 1*3600},
-#line 176 "zonetab.list"
-      {gperf_offsetof(stringpool, 115),        3600},
-#line 30 "zonetab.list"
-      {gperf_offsetof(stringpool, 116),   10*3600},
-#line 22 "zonetab.list"
-      {gperf_offsetof(stringpool, 117),    2*3600},
-      {-1},
-#line 32 "zonetab.list"
-      {gperf_offsetof(stringpool, 119),   12*3600},
-#line 167 "zonetab.list"
-      {gperf_offsetof(stringpool, 120),               21600},
-      {-1},
-#line 81 "zonetab.list"
-      {gperf_offsetof(stringpool, 122),  2*3600},
-      {-1},
-#line 143 "zonetab.list"
-      {gperf_offsetof(stringpool, 124),                    12600},
-#line 97 "zonetab.list"
-      {gperf_offsetof(stringpool, 125),  8*3600},
-#line 11 "zonetab.list"
-      {gperf_offsetof(stringpool, 126),   0*3600},
-      {-1},
-#line 36 "zonetab.list"
-      {gperf_offsetof(stringpool, 128),   -4*3600},
-#line 106 "zonetab.list"
-      {gperf_offsetof(stringpool, 129), 12*3600},
-      {-1},
-#line 105 "zonetab.list"
-      {gperf_offsetof(stringpool, 131),12*3600},
-#line 107 "zonetab.list"
-      {gperf_offsetof(stringpool, 132),13*3600},
-#line 149 "zonetab.list"
-      {gperf_offsetof(stringpool, 133),                 23400},
-      {-1},
-#line 109 "zonetab.list"
-      {gperf_offsetof(stringpool, 135),                -32400},
-#line 19 "zonetab.list"
-      {gperf_offsetof(stringpool, 136), -8*3600},
-#line 20 "zonetab.list"
-      {gperf_offsetof(stringpool, 137), -7*3600},
-#line 162 "zonetab.list"
-      {gperf_offsetof(stringpool, 138),             -14400},
-#line 145 "zonetab.list"
-      {gperf_offsetof(stringpool, 139),                   32400},
-      {-1}, {-1},
-#line 44 "zonetab.list"
-      {gperf_offsetof(stringpool, 142),  -12*3600},
-#line 26 "zonetab.list"
-      {gperf_offsetof(stringpool, 143),    6*3600},
-#line 60 "zonetab.list"
-      {gperf_offsetof(stringpool, 144),-9*3600},
-#line 58 "zonetab.list"
-      {gperf_offsetof(stringpool, 145),-8*3600},
-      {-1}, {-1},
-#line 119 "zonetab.list"
-      {gperf_offsetof(stringpool, 148),                14400},
+#line 82 "zonetab.list"
+      {gperf_offsetof(stringpool, 35), 2*3600},
+#line 71 "zonetab.list"
+      {gperf_offsetof(stringpool, 36),  1*3600},
+#line 24 "zonetab.list"
+      {gperf_offsetof(stringpool, 37),    4*3600},
+#line 79 "zonetab.list"
+      {gperf_offsetof(stringpool, 38), 2*3600},
+#line 65 "zonetab.list"
+      {gperf_offsetof(stringpool, 39),-10*3600},
       {-1},
+#line 202 "zonetab.list"
+      {gperf_offsetof(stringpool, 41),28800},
+#line 252 "zonetab.list"
+      {gperf_offsetof(stringpool, 42),39600},
+#line 251 "zonetab.list"
+      {gperf_offsetof(stringpool, 43),43200},
+#line 17 "zonetab.list"
+      {gperf_offsetof(stringpool, 44), -7*3600},
 #line 89 "zonetab.list"
-      {gperf_offsetof(stringpool, 150),  3*3600},
-#line 104 "zonetab.list"
-      {gperf_offsetof(stringpool, 151),12*3600},
-      {-1},
-#line 111 "zonetab.list"
-      {gperf_offsetof(stringpool, 153),                 14400},
-      {-1},
-#line 34 "zonetab.list"
-      {gperf_offsetof(stringpool, 155),   -2*3600},
-#line 31 "zonetab.list"
-      {gperf_offsetof(stringpool, 156),   11*3600},
-#line 147 "zonetab.list"
-      {gperf_offsetof(stringpool, 157),            -7200},
+      {gperf_offsetof(stringpool, 45),  3*3600},
+#line 212 "zonetab.list"
+      {gperf_offsetof(stringpool, 46),-18000},
+#line 15 "zonetab.list"
+      {gperf_offsetof(stringpool, 47), -6*3600},
+#line 192 "zonetab.list"
+      {gperf_offsetof(stringpool, 48),18000},
+#line 26 "zonetab.list"
+      {gperf_offsetof(stringpool, 49),    6*3600},
       {-1}, {-1},
-#line 172 "zonetab.list"
-      {gperf_offsetof(stringpool, 160),             -18000},
-      {-1}, {-1}, {-1},
-#line 64 "zonetab.list"
-      {gperf_offsetof(stringpool, 164),-10*3600},
-      {-1}, {-1},
-#line 28 "zonetab.list"
-      {gperf_offsetof(stringpool, 167),    8*3600},
-#line 137 "zonetab.list"
-      {gperf_offsetof(stringpool, 168),                      7200},
+#line 51 "zonetab.list"
+      {gperf_offsetof(stringpool, 52), -3*3600},
+#line 226 "zonetab.list"
+      {gperf_offsetof(stringpool, 53),-7200},
+#line 221 "zonetab.list"
+      {gperf_offsetof(stringpool, 54),10800},
+#line 22 "zonetab.list"
+      {gperf_offsetof(stringpool, 55),    2*3600},
+      {-1},
+#line 190 "zonetab.list"
+      {gperf_offsetof(stringpool, 57),43200},
+#line 189 "zonetab.list"
+      {gperf_offsetof(stringpool, 58),43200},
+#line 199 "zonetab.list"
+      {gperf_offsetof(stringpool, 59),28800},
 #line 29 "zonetab.list"
-      {gperf_offsetof(stringpool, 169),    9*3600},
-#line 155 "zonetab.list"
-      {gperf_offsetof(stringpool, 170),              25200},
-#line 150 "zonetab.list"
-      {gperf_offsetof(stringpool, 171),         21600},
-#line 154 "zonetab.list"
-      {gperf_offsetof(stringpool, 172),         28800},
+      {gperf_offsetof(stringpool, 60),    9*3600},
+#line 276 "zonetab.list"
+      {gperf_offsetof(stringpool, 61),28800},
+#line 48 "zonetab.list"
+      {gperf_offsetof(stringpool, 62),  -2*3600},
+#line 94 "zonetab.list"
+      {gperf_offsetof(stringpool, 63),  6*3600},
+#line 74 "zonetab.list"
+      {gperf_offsetof(stringpool, 64), 1*3600},
+#line 81 "zonetab.list"
+      {gperf_offsetof(stringpool, 65),  2*3600},
+#line 64 "zonetab.list"
+      {gperf_offsetof(stringpool, 66),-10*3600},
+#line 254 "zonetab.list"
+      {gperf_offsetof(stringpool, 67),18000},
+#line 92 "zonetab.list"
+      {gperf_offsetof(stringpool, 68),  5*3600},
       {-1},
-#line 161 "zonetab.list"
-      {gperf_offsetof(stringpool, 174),             -18000},
+#line 200 "zonetab.list"
+      {gperf_offsetof(stringpool, 70),-14400},
+#line 70 "zonetab.list"
+      {gperf_offsetof(stringpool, 71),  1*3600},
+#line 281 "zonetab.list"
+      {gperf_offsetof(stringpool, 72),32400},
+      {-1},
+#line 280 "zonetab.list"
+      {gperf_offsetof(stringpool, 74),39600},
+#line 238 "zonetab.list"
+      {gperf_offsetof(stringpool, 75),21600},
+#line 93 "zonetab.list"
+      {gperf_offsetof(stringpool, 76),  (5*3600+1800)},
+#line 194 "zonetab.list"
+      {gperf_offsetof(stringpool, 77),28800},
+      {-1},
+#line 255 "zonetab.list"
+      {gperf_offsetof(stringpool, 79),43200},
+#line 75 "zonetab.list"
+      {gperf_offsetof(stringpool, 80),  1*3600},
+#line 270 "zonetab.list"
+      {gperf_offsetof(stringpool, 81),18000},
+#line 83 "zonetab.list"
+      {gperf_offsetof(stringpool, 82), 2*3600},
+      {-1},
+#line 207 "zonetab.list"
+      {gperf_offsetof(stringpool, 84),36000},
+#line 278 "zonetab.list"
+      {gperf_offsetof(stringpool, 85),-7200},
       {-1}, {-1},
-#line 166 "zonetab.list"
-      {gperf_offsetof(stringpool, 177),             7200},
-      {-1}, {-1}, {-1},
-#line 115 "zonetab.list"
-      {gperf_offsetof(stringpool, 181),             36000},
-#line 113 "zonetab.list"
-      {gperf_offsetof(stringpool, 182),               -14400},
-      {-1}, {-1}, {-1},
-#line 146 "zonetab.list"
-      {gperf_offsetof(stringpool, 186),                 -21600},
-      {-1},
+#line 126 "zonetab.list"
+      {gperf_offsetof(stringpool, 88),                -21600},
+#line 185 "zonetab.list"
+      {gperf_offsetof(stringpool, 89),39600},
+#line 183 "zonetab.list"
+      {gperf_offsetof(stringpool, 90),-18000},
+#line 218 "zonetab.list"
+      {gperf_offsetof(stringpool, 91),-18000},
+#line 182 "zonetab.list"
+      {gperf_offsetof(stringpool, 92),34200},
+#line 103 "zonetab.list"
+      {gperf_offsetof(stringpool, 93),11*3600},
+#line 53 "zonetab.list"
+      {gperf_offsetof(stringpool, 94), -3*3600},
+#line 208 "zonetab.list"
+      {gperf_offsetof(stringpool, 95),36000},
+#line 49 "zonetab.list"
+      {gperf_offsetof(stringpool, 96),-2*3600},
+#line 120 "zonetab.list"
+      {gperf_offsetof(stringpool, 97),          34200},
+      {-1}, {-1},
+#line 215 "zonetab.list"
+      {gperf_offsetof(stringpool, 100),25200},
+#line 242 "zonetab.list"
+      {gperf_offsetof(stringpool, 101),12600},
+#line 241 "zonetab.list"
+      {gperf_offsetof(stringpool, 102),28800},
+#line 240 "zonetab.list"
+      {gperf_offsetof(stringpool, 103),32400},
+#line 86 "zonetab.list"
+      {gperf_offsetof(stringpool, 104),   3*3600},
+#line 33 "zonetab.list"
+      {gperf_offsetof(stringpool, 105),   -1*3600},
+#line 201 "zonetab.list"
+      {gperf_offsetof(stringpool, 106),21600},
 #line 148 "zonetab.list"
-      {gperf_offsetof(stringpool, 188),               -25200},
-      {-1},
-#line 127 "zonetab.list"
-      {gperf_offsetof(stringpool, 190),                   28800},
-#line 116 "zonetab.list"
-      {gperf_offsetof(stringpool, 191),                  -3600},
-#line 142 "zonetab.list"
-      {gperf_offsetof(stringpool, 192),                   19800},
-      {-1},
-#line 40 "zonetab.list"
-      {gperf_offsetof(stringpool, 194),   -8*3600},
-#line 112 "zonetab.list"
-      {gperf_offsetof(stringpool, 195),                  10800},
-#line 139 "zonetab.list"
-      {gperf_offsetof(stringpool, 196),                   0},
-#line 152 "zonetab.list"
-      {gperf_offsetof(stringpool, 197),             43200},
-#line 141 "zonetab.list"
-      {gperf_offsetof(stringpool, 198),               -36000},
-#line 27 "zonetab.list"
-      {gperf_offsetof(stringpool, 199),    7*3600},
-#line 158 "zonetab.list"
-      {gperf_offsetof(stringpool, 200),                  3600},
-      {-1}, {-1},
-#line 110 "zonetab.list"
-      {gperf_offsetof(stringpool, 203),                    10800},
-#line 163 "zonetab.list"
-      {gperf_offsetof(stringpool, 204),                  -39600},
-#line 41 "zonetab.list"
-      {gperf_offsetof(stringpool, 205),   -9*3600},
-#line 35 "zonetab.list"
-      {gperf_offsetof(stringpool, 206),   -3*3600},
-#line 12 "zonetab.list"
-      {gperf_offsetof(stringpool, 207),  0*3600},
-#line 169 "zonetab.list"
-      {gperf_offsetof(stringpool, 208),                36000},
+      {gperf_offsetof(stringpool, 107),               -25200},
+#line 96 "zonetab.list"
+      {gperf_offsetof(stringpool, 108),  8*3600},
+#line 42 "zonetab.list"
+      {gperf_offsetof(stringpool, 109),  -10*3600},
+#line 31 "zonetab.list"
+      {gperf_offsetof(stringpool, 110),   11*3600},
 #line 72 "zonetab.list"
-      {gperf_offsetof(stringpool, 209),  1*3600},
+      {gperf_offsetof(stringpool, 111),  1*3600},
       {-1},
-#line 153 "zonetab.list"
-      {gperf_offsetof(stringpool, 211),           -12600},
+#line 90 "zonetab.list"
+      {gperf_offsetof(stringpool, 113),  4*3600},
+#line 47 "zonetab.list"
+      {gperf_offsetof(stringpool, 114),  0*3600},
+      {-1},
+#line 78 "zonetab.list"
+      {gperf_offsetof(stringpool, 116), 1*3600},
+#line 77 "zonetab.list"
+      {gperf_offsetof(stringpool, 117),  1*3600},
+      {-1},
+#line 95 "zonetab.list"
+      {gperf_offsetof(stringpool, 119), 7*3600},
+#line 313 "zonetab.list"
+      {gperf_offsetof(stringpool, 120),43200},
+#line 55 "zonetab.list"
+      {gperf_offsetof(stringpool, 121), -(3*3600+1800)},
+#line 184 "zonetab.list"
+      {gperf_offsetof(stringpool, 122),31500},
+#line 204 "zonetab.list"
+      {gperf_offsetof(stringpool, 123),45900},
+#line 210 "zonetab.list"
+      {gperf_offsetof(stringpool, 124),-18000},
+#line 198 "zonetab.list"
+      {gperf_offsetof(stringpool, 125),14400},
+#line 57 "zonetab.list"
+      {gperf_offsetof(stringpool, 126), -4*3600},
+#line 197 "zonetab.list"
+      {gperf_offsetof(stringpool, 127),18000},
+#line 54 "zonetab.list"
+      {gperf_offsetof(stringpool, 128),-3*3600},
+#line 253 "zonetab.list"
+      {gperf_offsetof(stringpool, 129),-30600},
+#line 91 "zonetab.list"
+      {gperf_offsetof(stringpool, 130),  4*3600},
+#line 99 "zonetab.list"
+      {gperf_offsetof(stringpool, 131),  9*3600},
+#line 122 "zonetab.list"
+      {gperf_offsetof(stringpool, 132),            21600},
+#line 187 "zonetab.list"
+      {gperf_offsetof(stringpool, 133),16200},
+#line 132 "zonetab.list"
+      {gperf_offsetof(stringpool, 134),       -10800},
+#line 121 "zonetab.list"
+      {gperf_offsetof(stringpool, 135),        -21600},
+      {-1},
+#line 236 "zonetab.list"
+      {gperf_offsetof(stringpool, 137),25200},
       {-1}, {-1}, {-1}, {-1}, {-1},
+#line 274 "zonetab.list"
+      {gperf_offsetof(stringpool, 143),36000},
+#line 266 "zonetab.list"
+      {gperf_offsetof(stringpool, 144),43200},
+#line 146 "zonetab.list"
+      {gperf_offsetof(stringpool, 145),                 -21600},
+#line 193 "zonetab.list"
+      {gperf_offsetof(stringpool, 146),32400},
+#line 220 "zonetab.list"
+      {gperf_offsetof(stringpool, 147),-3600},
+#line 214 "zonetab.list"
+      {gperf_offsetof(stringpool, 148),25200},
+#line 219 "zonetab.list"
+      {gperf_offsetof(stringpool, 149),0},
+#line 275 "zonetab.list"
+      {gperf_offsetof(stringpool, 150),46800},
+#line 109 "zonetab.list"
+      {gperf_offsetof(stringpool, 151),                -32400},
+      {-1}, {-1},
+#line 68 "zonetab.list"
+      {gperf_offsetof(stringpool, 154),  -11*3600},
+      {-1}, {-1}, {-1},
+#line 321 "zonetab.list"
+      {gperf_offsetof(stringpool, 158),0},
+      {-1},
+#line 178 "zonetab.list"
+      {gperf_offsetof(stringpool, 160),               18000},
+#line 181 "zonetab.list"
+      {gperf_offsetof(stringpool, 161),37800},
+#line 265 "zonetab.list"
+      {gperf_offsetof(stringpool, 162),20700},
+#line 249 "zonetab.list"
+      {gperf_offsetof(stringpool, 163),37800},
+#line 108 "zonetab.list"
+      {gperf_offsetof(stringpool, 164),             16200},
+      {-1}, {-1},
+#line 30 "zonetab.list"
+      {gperf_offsetof(stringpool, 167),   10*3600},
+      {-1},
+#line 27 "zonetab.list"
+      {gperf_offsetof(stringpool, 169),    7*3600},
+#line 239 "zonetab.list"
+      {gperf_offsetof(stringpool, 170),16200},
+#line 206 "zonetab.list"
+      {gperf_offsetof(stringpool, 171),28800},
+#line 205 "zonetab.list"
+      {gperf_offsetof(stringpool, 172),32400},
+#line 12 "zonetab.list"
+      {gperf_offsetof(stringpool, 173),  0*3600},
+#line 229 "zonetab.list"
+      {gperf_offsetof(stringpool, 174),14400},
+#line 264 "zonetab.list"
+      {gperf_offsetof(stringpool, 175),25200},
+#line 263 "zonetab.list"
+      {gperf_offsetof(stringpool, 176),25200},
+#line 223 "zonetab.list"
+      {gperf_offsetof(stringpool, 177),43200},
+#line 40 "zonetab.list"
+      {gperf_offsetof(stringpool, 178),   -8*3600},
+#line 222 "zonetab.list"
+      {gperf_offsetof(stringpool, 179),46800},
+      {-1},
+#line 282 "zonetab.list"
+      {gperf_offsetof(stringpool, 181),-10800},
+#line 260 "zonetab.list"
+      {gperf_offsetof(stringpool, 182),39600},
+#line 100 "zonetab.list"
+      {gperf_offsetof(stringpool, 183),  9*3600},
+#line 244 "zonetab.list"
+      {gperf_offsetof(stringpool, 184),39600},
+#line 102 "zonetab.list"
+      {gperf_offsetof(stringpool, 185), 10*3600},
+#line 143 "zonetab.list"
+      {gperf_offsetof(stringpool, 186),                    12600},
+#line 129 "zonetab.list"
+      {gperf_offsetof(stringpool, 187),               10800},
+#line 98 "zonetab.list"
+      {gperf_offsetof(stringpool, 188), 8*3600},
+#line 39 "zonetab.list"
+      {gperf_offsetof(stringpool, 189),   -7*3600},
+#line 130 "zonetab.list"
+      {gperf_offsetof(stringpool, 190),            36000},
+#line 38 "zonetab.list"
+      {gperf_offsetof(stringpool, 191),   -6*3600},
+#line 203 "zonetab.list"
+      {gperf_offsetof(stringpool, 192),49500},
+#line 298 "zonetab.list"
+      {gperf_offsetof(stringpool, 193),18000},
+#line 209 "zonetab.list"
+      {gperf_offsetof(stringpool, 194),-14400},
+#line 191 "zonetab.list"
+      {gperf_offsetof(stringpool, 195),-43200},
+      {-1},
+#line 259 "zonetab.list"
+      {gperf_offsetof(stringpool, 197),28800},
+#line 179 "zonetab.list"
+      {gperf_offsetof(stringpool, 198),            36000},
+#line 257 "zonetab.list"
+      {gperf_offsetof(stringpool, 199),14400},
+#line 319 "zonetab.list"
+      {gperf_offsetof(stringpool, 200),32400},
+#line 84 "zonetab.list"
+      {gperf_offsetof(stringpool, 201), 2*3600},
+#line 286 "zonetab.list"
+      {gperf_offsetof(stringpool, 202),39600},
+#line 152 "zonetab.list"
+      {gperf_offsetof(stringpool, 203),             43200},
+#line 300 "zonetab.list"
+      {gperf_offsetof(stringpool, 204),46800},
+#line 127 "zonetab.list"
+      {gperf_offsetof(stringpool, 205),                   28800},
+#line 299 "zonetab.list"
+      {gperf_offsetof(stringpool, 206),50400},
+#line 85 "zonetab.list"
+      {gperf_offsetof(stringpool, 207),  2*3600},
+      {-1},
+#line 142 "zonetab.list"
+      {gperf_offsetof(stringpool, 209),                   19800},
+      {-1},
+#line 314 "zonetab.list"
+      {gperf_offsetof(stringpool, 211),-10800},
+#line 288 "zonetab.list"
+      {gperf_offsetof(stringpool, 212),39600},
+      {-1},
+#line 196 "zonetab.list"
+      {gperf_offsetof(stringpool, 214),-3600},
+#line 195 "zonetab.list"
+      {gperf_offsetof(stringpool, 215),0},
+#line 293 "zonetab.list"
+      {gperf_offsetof(stringpool, 216),-36000},
+#line 106 "zonetab.list"
+      {gperf_offsetof(stringpool, 217), 12*3600},
+#line 128 "zonetab.list"
+      {gperf_offsetof(stringpool, 218),               -43200},
+#line 105 "zonetab.list"
+      {gperf_offsetof(stringpool, 219),12*3600},
+#line 170 "zonetab.list"
+      {gperf_offsetof(stringpool, 220),                   32400},
+#line 125 "zonetab.list"
+      {gperf_offsetof(stringpool, 221),         39600},
+      {-1},
+#line 283 "zonetab.list"
+      {gperf_offsetof(stringpool, 223),21600},
+#line 113 "zonetab.list"
+      {gperf_offsetof(stringpool, 224),               -14400},
+#line 262 "zonetab.list"
+      {gperf_offsetof(stringpool, 225),39600},
+      {-1},
+#line 11 "zonetab.list"
+      {gperf_offsetof(stringpool, 227),   0*3600},
+#line 301 "zonetab.list"
+      {gperf_offsetof(stringpool, 228),10800},
+#line 315 "zonetab.list"
+      {gperf_offsetof(stringpool, 229),43200},
+#line 291 "zonetab.list"
+      {gperf_offsetof(stringpool, 230),-10800},
+#line 20 "zonetab.list"
+      {gperf_offsetof(stringpool, 231), -7*3600},
+#line 248 "zonetab.list"
+      {gperf_offsetof(stringpool, 232),39600},
+      {-1},
+#line 52 "zonetab.list"
+      {gperf_offsetof(stringpool, 234), -3*3600},
+#line 14 "zonetab.list"
+      {gperf_offsetof(stringpool, 235), -4*3600},
+      {-1}, {-1},
+#line 277 "zonetab.list"
+      {gperf_offsetof(stringpool, 238),18000},
+#line 188 "zonetab.list"
+      {gperf_offsetof(stringpool, 239),21600},
+#line 320 "zonetab.list"
+      {gperf_offsetof(stringpool, 240),28800},
+      {-1},
+#line 317 "zonetab.list"
+      {gperf_offsetof(stringpool, 242),-10800},
+#line 60 "zonetab.list"
+      {gperf_offsetof(stringpool, 243),-9*3600},
+#line 316 "zonetab.list"
+      {gperf_offsetof(stringpool, 244),-7200},
+      {-1},
+#line 246 "zonetab.list"
+      {gperf_offsetof(stringpool, 246),25200},
+#line 245 "zonetab.list"
+      {gperf_offsetof(stringpool, 247),28800},
+#line 147 "zonetab.list"
+      {gperf_offsetof(stringpool, 248),            -7200},
+#line 18 "zonetab.list"
+      {gperf_offsetof(stringpool, 249), -6*3600},
+#line 250 "zonetab.list"
+      {gperf_offsetof(stringpool, 250),50400},
+#line 165 "zonetab.list"
+      {gperf_offsetof(stringpool, 251),         28800},
+#line 16 "zonetab.list"
+      {gperf_offsetof(stringpool, 252), -5*3600},
+#line 76 "zonetab.list"
+      {gperf_offsetof(stringpool, 253),  1*3600},
+      {-1},
+#line 164 "zonetab.list"
+      {gperf_offsetof(stringpool, 255),                 25200},
+#line 41 "zonetab.list"
+      {gperf_offsetof(stringpool, 256),   -9*3600},
+      {-1},
+#line 171 "zonetab.list"
+      {gperf_offsetof(stringpool, 258),                   46800},
+#line 211 "zonetab.list"
+      {gperf_offsetof(stringpool, 259),-36000},
+      {-1},
+#line 308 "zonetab.list"
+      {gperf_offsetof(stringpool, 261),-14400},
+#line 119 "zonetab.list"
+      {gperf_offsetof(stringpool, 262),                14400},
+#line 123 "zonetab.list"
+      {gperf_offsetof(stringpool, 263),           3600},
+#line 28 "zonetab.list"
+      {gperf_offsetof(stringpool, 264),    8*3600},
+#line 124 "zonetab.list"
+      {gperf_offsetof(stringpool, 265),         3600},
+#line 153 "zonetab.list"
+      {gperf_offsetof(stringpool, 266),           -12600},
+#line 110 "zonetab.list"
+      {gperf_offsetof(stringpool, 267),                    10800},
+#line 289 "zonetab.list"
+      {gperf_offsetof(stringpool, 268),14400},
+#line 112 "zonetab.list"
+      {gperf_offsetof(stringpool, 269),                  10800},
+#line 111 "zonetab.list"
+      {gperf_offsetof(stringpool, 270),                 14400},
+#line 216 "zonetab.list"
+      {gperf_offsetof(stringpool, 271),36000},
+      {-1},
+#line 311 "zonetab.list"
+      {gperf_offsetof(stringpool, 273),21600},
+#line 66 "zonetab.list"
+      {gperf_offsetof(stringpool, 274),-10*3600},
 #line 151 "zonetab.list"
-      {gperf_offsetof(stringpool, 217),                   20700},
+      {gperf_offsetof(stringpool, 275),                   20700},
+#line 267 "zonetab.list"
+      {gperf_offsetof(stringpool, 276),-39600},
+#line 225 "zonetab.list"
+      {gperf_offsetof(stringpool, 277),-14400},
+      {-1},
+#line 224 "zonetab.list"
+      {gperf_offsetof(stringpool, 279),-10800},
+#line 67 "zonetab.list"
+      {gperf_offsetof(stringpool, 280),-10*3600},
+#line 237 "zonetab.list"
+      {gperf_offsetof(stringpool, 281),10800},
+      {-1}, {-1},
+#line 297 "zonetab.list"
+      {gperf_offsetof(stringpool, 284),32400},
+#line 175 "zonetab.list"
+      {gperf_offsetof(stringpool, 285),            28800},
+#line 134 "zonetab.list"
+      {gperf_offsetof(stringpool, 286),                    7200},
+#line 149 "zonetab.list"
+      {gperf_offsetof(stringpool, 287),                 23400},
+#line 107 "zonetab.list"
+      {gperf_offsetof(stringpool, 288),13*3600},
+#line 230 "zonetab.list"
+      {gperf_offsetof(stringpool, 289),-10800},
+#line 307 "zonetab.list"
+      {gperf_offsetof(stringpool, 290),18000},
+      {-1}, {-1},
+#line 155 "zonetab.list"
+      {gperf_offsetof(stringpool, 293),              25200},
+#line 258 "zonetab.list"
+      {gperf_offsetof(stringpool, 294),18000},
+#line 227 "zonetab.list"
+      {gperf_offsetof(stringpool, 295),-21600},
+#line 261 "zonetab.list"
+      {gperf_offsetof(stringpool, 296),43200},
+#line 213 "zonetab.list"
+      {gperf_offsetof(stringpool, 297),-3600},
+#line 154 "zonetab.list"
+      {gperf_offsetof(stringpool, 298),         28800},
+      {-1},
+#line 243 "zonetab.list"
+      {gperf_offsetof(stringpool, 300),21600},
 #line 114 "zonetab.list"
-      {gperf_offsetof(stringpool, 218),             34200},
+      {gperf_offsetof(stringpool, 301),             34200},
+#line 157 "zonetab.list"
+      {gperf_offsetof(stringpool, 302),                -28800},
+      {-1},
+#line 117 "zonetab.list"
+      {gperf_offsetof(stringpool, 304),         -21600},
+      {-1},
+#line 156 "zonetab.list"
+      {gperf_offsetof(stringpool, 306),             -14400},
+#line 116 "zonetab.list"
+      {gperf_offsetof(stringpool, 307),                  -3600},
+#line 228 "zonetab.list"
+      {gperf_offsetof(stringpool, 308),-32400},
+#line 294 "zonetab.list"
+      {gperf_offsetof(stringpool, 309),18000},
+#line 37 "zonetab.list"
+      {gperf_offsetof(stringpool, 310),   -5*3600},
+#line 137 "zonetab.list"
+      {gperf_offsetof(stringpool, 311),                      7200},
+#line 58 "zonetab.list"
+      {gperf_offsetof(stringpool, 312),-8*3600},
+#line 304 "zonetab.list"
+      {gperf_offsetof(stringpool, 313),28800},
+#line 303 "zonetab.list"
+      {gperf_offsetof(stringpool, 314),32400},
+#line 284 "zonetab.list"
+      {gperf_offsetof(stringpool, 315),14400},
+      {-1},
+#line 295 "zonetab.list"
+      {gperf_offsetof(stringpool, 317),18000},
+      {-1},
+#line 166 "zonetab.list"
+      {gperf_offsetof(stringpool, 319),             7200},
+      {-1}, {-1}, {-1}, {-1},
+#line 97 "zonetab.list"
+      {gperf_offsetof(stringpool, 324),  8*3600},
+      {-1},
+#line 50 "zonetab.list"
+      {gperf_offsetof(stringpool, 326), -(2*3600+1800)},
+#line 285 "zonetab.list"
+      {gperf_offsetof(stringpool, 327),-10800},
+      {-1}, {-1},
+#line 287 "zonetab.list"
+      {gperf_offsetof(stringpool, 330),14400},
+      {-1},
+#line 169 "zonetab.list"
+      {gperf_offsetof(stringpool, 332),                36000},
+      {-1},
+#line 235 "zonetab.list"
+      {gperf_offsetof(stringpool, 334),25200},
+#line 234 "zonetab.list"
+      {gperf_offsetof(stringpool, 335),28800},
+      {-1}, {-1},
+#line 232 "zonetab.list"
+      {gperf_offsetof(stringpool, 338),-14400},
+      {-1}, {-1}, {-1},
+#line 44 "zonetab.list"
+      {gperf_offsetof(stringpool, 342),  -12*3600},
+#line 61 "zonetab.list"
+      {gperf_offsetof(stringpool, 343),-9*3600},
+#line 162 "zonetab.list"
+      {gperf_offsetof(stringpool, 344),             -14400},
+#line 141 "zonetab.list"
+      {gperf_offsetof(stringpool, 345),               -36000},
+      {-1},
+#line 306 "zonetab.list"
+      {gperf_offsetof(stringpool, 347),-10800},
+      {-1},
+#line 305 "zonetab.list"
+      {gperf_offsetof(stringpool, 349),-7200},
+#line 326 "zonetab.list"
+      {gperf_offsetof(stringpool, 350),18000},
+#line 325 "zonetab.list"
+      {gperf_offsetof(stringpool, 351),21600},
+#line 247 "zonetab.list"
+      {gperf_offsetof(stringpool, 352),14400},
+#line 323 "zonetab.list"
+      {gperf_offsetof(stringpool, 353),32400},
+#line 322 "zonetab.list"
+      {gperf_offsetof(stringpool, 354),36000},
+      {-1}, {-1}, {-1},
+#line 63 "zonetab.list"
+      {gperf_offsetof(stringpool, 358), -9*3600},
+#line 144 "zonetab.list"
+      {gperf_offsetof(stringpool, 359),                7200},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#line 167 "zonetab.list"
+      {gperf_offsetof(stringpool, 365),               21600},
+      {-1},
+#line 180 "zonetab.list"
+      {gperf_offsetof(stringpool, 367),                 32400},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 318 "zonetab.list"
+      {gperf_offsetof(stringpool, 375),25200},
+      {-1},
+#line 115 "zonetab.list"
+      {gperf_offsetof(stringpool, 377),             36000},
+#line 231 "zonetab.list"
+      {gperf_offsetof(stringpool, 378),43200},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 173 "zonetab.list"
+      {gperf_offsetof(stringpool, 387),            -25200},
+      {-1}, {-1}, {-1},
+#line 310 "zonetab.list"
+      {gperf_offsetof(stringpool, 391),36000},
+#line 309 "zonetab.list"
+      {gperf_offsetof(stringpool, 392),39600},
       {-1}, {-1},
 #line 140 "zonetab.list"
-      {gperf_offsetof(stringpool, 221),                      7200},
+      {gperf_offsetof(stringpool, 395),                      7200},
+      {-1}, {-1},
+#line 168 "zonetab.list"
+      {gperf_offsetof(stringpool, 398),                  28800},
+#line 290 "zonetab.list"
+      {gperf_offsetof(stringpool, 399),39600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 118 "zonetab.list"
+      {gperf_offsetof(stringpool, 408),              -3600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 296 "zonetab.list"
+      {gperf_offsetof(stringpool, 417),46800},
+#line 163 "zonetab.list"
+      {gperf_offsetof(stringpool, 418),                  -39600},
+      {-1}, {-1},
+#line 161 "zonetab.list"
+      {gperf_offsetof(stringpool, 421),             -18000},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#line 312 "zonetab.list"
+      {gperf_offsetof(stringpool, 427),39600},
+#line 69 "zonetab.list"
+      {gperf_offsetof(stringpool, 428),-12*3600},
+      {-1}, {-1}, {-1},
+#line 136 "zonetab.list"
+      {gperf_offsetof(stringpool, 432),                    43200},
+      {-1}, {-1},
+#line 46 "zonetab.list"
+      {gperf_offsetof(stringpool, 435),  0*3600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 145 "zonetab.list"
+      {gperf_offsetof(stringpool, 443),                   32400},
+      {-1},
+#line 131 "zonetab.list"
+      {gperf_offsetof(stringpool, 445),                7200},
+      {-1}, {-1}, {-1},
+#line 292 "zonetab.list"
+      {gperf_offsetof(stringpool, 449),10800},
+      {-1}, {-1},
+#line 150 "zonetab.list"
+      {gperf_offsetof(stringpool, 452),         21600},
+      {-1}, {-1},
+#line 302 "zonetab.list"
+      {gperf_offsetof(stringpool, 455),43200},
+      {-1}, {-1},
+#line 176 "zonetab.list"
+      {gperf_offsetof(stringpool, 458),        3600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 135 "zonetab.list"
+      {gperf_offsetof(stringpool, 466),            18000},
       {-1},
 #line 174 "zonetab.list"
-      {gperf_offsetof(stringpool, 223),             36000},
+      {gperf_offsetof(stringpool, 468),             36000},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 324 "zonetab.list"
+      {gperf_offsetof(stringpool, 476),36000},
+#line 172 "zonetab.list"
+      {gperf_offsetof(stringpool, 477),             -18000},
+      {-1}, {-1}, {-1}, {-1},
+#line 160 "zonetab.list"
+      {gperf_offsetof(stringpool, 482),             -10800},
+      {-1}, {-1},
+#line 62 "zonetab.list"
+      {gperf_offsetof(stringpool, 485), -9*3600},
+#line 159 "zonetab.list"
+      {gperf_offsetof(stringpool, 486),                 10800},
       {-1}, {-1}, {-1}, {-1}, {-1},
-#line 46 "zonetab.list"
-      {gperf_offsetof(stringpool, 229),  0*3600},
-      {-1}, {-1}, {-1},
-#line 135 "zonetab.list"
-      {gperf_offsetof(stringpool, 233),            18000},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 233 "zonetab.list"
+      {gperf_offsetof(stringpool, 492),28800},
       {-1}, {-1}, {-1}, {-1},
-#line 173 "zonetab.list"
-      {gperf_offsetof(stringpool, 265),            -25200},
-      {-1}, {-1}, {-1},
-#line 144 "zonetab.list"
-      {gperf_offsetof(stringpool, 269),                7200},
-      {-1}, {-1},
-#line 180 "zonetab.list"
-      {gperf_offsetof(stringpool, 272),                 32400},
+#line 158 "zonetab.list"
+      {gperf_offsetof(stringpool, 497),                  3600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 156 "zonetab.list"
-      {gperf_offsetof(stringpool, 279),             -14400},
+#line 177 "zonetab.list"
+      {gperf_offsetof(stringpool, 540),                3600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+#line 59 "zonetab.list"
+      {gperf_offsetof(stringpool, 563), -8*3600},
       {-1}, {-1},
-#line 171 "zonetab.list"
-      {gperf_offsetof(stringpool, 282),                   46800},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-#line 108 "zonetab.list"
-      {gperf_offsetof(stringpool, 314),             16200},
-      {-1}, {-1}, {-1}, {-1},
-#line 69 "zonetab.list"
-      {gperf_offsetof(stringpool, 319),-12*3600},
-      {-1}, {-1},
-#line 157 "zonetab.list"
-      {gperf_offsetof(stringpool, 322),                -28800},
-      {-1}, {-1}, {-1}, {-1},
-#line 168 "zonetab.list"
-      {gperf_offsetof(stringpool, 327),                  28800},
-#line 134 "zonetab.list"
-      {gperf_offsetof(stringpool, 328),                    7200},
+#line 104 "zonetab.list"
+      {gperf_offsetof(stringpool, 566),12*3600},
+#line 139 "zonetab.list"
+      {gperf_offsetof(stringpool, 567),                   0},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 170 "zonetab.list"
-      {gperf_offsetof(stringpool, 392),                   32400},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 136 "zonetab.list"
-      {gperf_offsetof(stringpool, 438),                    43200}
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 138 "zonetab.list"
+      {gperf_offsetof(stringpool, 619),              -10800}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -933,5 +1558,5 @@ zonetab (register const char *str, register size_t len)
     }
   return 0;
 }
-#line 181 "zonetab.list"
+#line 327 "zonetab.list"
 
diff --git a/ext/date/zonetab.list b/ext/date/zonetab.list
index 3a4d121d2e..0618546eb0 100644
--- a/ext/date/zonetab.list
+++ b/ext/date/zonetab.list
@@ -178,4 +178,150 @@ w. europe,                3600
 west asia,               18000
 west pacific,            36000
 yakutsk,                 32400
+acdt,37800
+acst,34200
+act,-18000
+acwst,31500
+aedt,39600
+aest,36000
+aft,16200
+almt,21600
+anast,43200
+anat,43200
+aoe,-43200
+aqtt,18000
+awdt,32400
+awst,28800
+azost,0
+azot,-3600
+azst,18000
+azt,14400
+bnt,28800
+bot,-14400
+btt,21600
+cast,28800
+chadt,49500
+chast,45900
+chost,32400
+chot,28800
+chst,36000
+chut,36000
+cidst,-14400
+cist,-18000
+ckt,-36000
+cot,-18000
+cvt,-3600
+cxt,25200
+davt,25200
+ddut,36000
+easst,-18000
+ect,-18000
+egst,0
+egt,-3600
+fet,10800
+fjst,46800
+fjt,43200
+fkst,-10800
+fkt,-14400
+fnt,-7200
+galt,-21600
+gamt,-32400
+get,14400
+gft,-10800
+gilt,43200
+gyt,-14400
+hkt,28800
+hovst,28800
+hovt,25200
+ict,25200
+idt,10800
+iot,21600
+irdt,16200
+irkst,32400
+irkt,28800
+irst,12600
+kgt,21600
+kost,39600
+krast,28800
+krat,25200
+kuyt,14400
+lhdt,39600
+lhst,37800
+lint,50400
+magst,43200
+magt,39600
+mart,-30600
+mawt,18000
+mht,43200
+mmt,23400
+mut,14400
+mvt,18000
+myt,28800
+nct,39600
+nfdt,43200
+nft,39600
+novst,25200
+novt,25200
+npt,20700
+nrt,43200
+nut,-39600
+omsst,25200
+omst,21600
+orat,18000
+pet,-18000
+petst,43200
+pett,43200
+pgt,36000
+phot,46800
+pht,28800
+pkt,18000
+pmdt,-7200
+pmst,-10800
+pont,39600
+pwt,32400
+pyst,-10800
+qyzt,21600
+ret,14400
+rott,-10800
+sakt,39600
+samt,14400
+sbt,39600
+sct,14400
+sret,39600
+srt,-10800
+syot,10800
+taht,-36000
+tft,18000
+tjt,18000
+tkt,46800
+tlt,32400
+tmt,18000
+tost,50400
+tot,46800
+trt,10800
+tvt,43200
+ulast,32400
+ulat,28800
+uyst,-7200
+uyt,-10800
+uzt,18000
+vet,-14400
+vlast,39600
+vlat,36000
+vost,21600
+vut,39600
+wakt,43200
+warst,-10800
+wft,43200
+wgst,-7200
+wgt,-10800
+wib,25200
+wit,32400
+wita,28800
+wt,0
+yakst,36000
+yakt,32400
+yapt,36000
+yekst,21600
+yekt,18000
 %%
diff --git a/test/date/test_date_parse.rb b/test/date/test_date_parse.rb
index e791b2d012..660d083799 100644
--- a/test/date/test_date_parse.rb
+++ b/test/date/test_date_parse.rb
@@ -24,6 +24,7 @@ class TestDateParse < Test::Unit::TestCase
      [['Sat Aug 28 02:29:34 JST 02',true],[2002,8,28,2,29,34,'JST',9*3600,6], __LINE__],
      [['Sat Aug 28 02:29:34 JST 0002',false],[2,8,28,2,29,34,'JST',9*3600,6], __LINE__],
      [['Sat Aug 28 02:29:34 JST 0002',true],[2,8,28,2,29,34,'JST',9*3600,6], __LINE__],
+     [['Sat Aug 28 02:29:34 AEST 0002',true],[2,8,28,2,29,34,'AEST',10*3600,6], __LINE__],
 
      [['Sat Aug 28 02:29:34 GMT+09 0002',false],[2,8,28,2,29,34,'GMT+09',9*3600,6], __LINE__],
      [['Sat Aug 28 02:29:34 GMT+0900 0002',false],[2,8,28,2,29,34,'GMT+0900',9*3600,6], __LINE__],