tzinfo 0.2.2 → 0.3.0

data/lib/tzinfo/definitions/Africa/Dar_es_Salaam.rb

@@ -1,15 +1,21 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module Africa #:nodoc:
-class Dar_es_Salaam < Timezone #:nodoc:
-setup
-set_identifier('Africa/Dar_es_Salaam')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(52408995643,21600),0,Date::ITALY),9428,0,:LMT)}
-add_period(1930,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(52408995643,21600),0,Date::ITALY),DateTime.new0(Rational.new!(19460411,8),0,Date::ITALY),10800,0,:EAT)}
-add_period(1947,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(19460411,8),0,Date::ITALY),DateTime.new0(Rational.new!(14038850221,5760),0,Date::ITALY),9885,0,:BEAUT)}
-add_period(1960,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(14038850221,5760),0,Date::ITALY),nil,10800,0,:EAT)}
-end
-end
-end
+  module Definitions
+    module Africa
+      module Dar_es_Salaam
+        include TimezoneDefinition
+        
+        timezone 'Africa/Dar_es_Salaam' do |tz|
+          tz.offset :o0, 9428, 0, :LMT
+          tz.offset :o1, 10800, 0, :EAT
+          tz.offset :o2, 9885, 0, :BEAUT
+          
+          tz.transition 1930, 12, :o1, 52408995643, 21600
+          tz.transition 1947, 12, :o2, 19460411, 8
+          tz.transition 1960, 12, :o1, 14038850221, 5760
+        end
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/Africa/Djibouti.rb

@@ -1,13 +1,18 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module Africa #:nodoc:
-class Djibouti < Timezone #:nodoc:
-setup
-set_identifier('Africa/Djibouti')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(17418372337,7200),0,Date::ITALY),10356,0,:LMT)}
-add_period(1911,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(17418372337,7200),0,Date::ITALY),nil,10800,0,:EAT)}
-end
-end
-end
+  module Definitions
+    module Africa
+      module Djibouti
+        include TimezoneDefinition
+        
+        timezone 'Africa/Djibouti' do |tz|
+          tz.offset :o0, 10356, 0, :LMT
+          tz.offset :o1, 10800, 0, :EAT
+          
+          tz.transition 1911, 6, :o1, 17418372337, 7200
+        end
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/Africa/Douala.rb

@@ -1,13 +1,18 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module Africa #:nodoc:
-class Douala < Timezone #:nodoc:
-setup
-set_identifier('Africa/Douala')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(8709848903,3600),0,Date::ITALY),2328,0,:LMT)}
-add_period(1911,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(8709848903,3600),0,Date::ITALY),nil,3600,0,:WAT)}
-end
-end
-end
+  module Definitions
+    module Africa
+      module Douala
+        include TimezoneDefinition
+        
+        timezone 'Africa/Douala' do |tz|
+          tz.offset :o0, 2328, 0, :LMT
+          tz.offset :o1, 3600, 0, :WAT
+          
+          tz.transition 1911, 12, :o1, 8709848903, 3600
+        end
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/Africa/El_Aaiun.rb

@@ -1,14 +1,20 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module Africa #:nodoc:
-class El_Aaiun < Timezone #:nodoc:
-setup
-set_identifier('Africa/El_Aaiun')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(728231561,300),0,Date::ITALY),-3168,0,:LMT)}
-add_period(1934,1) {TimezonePeriod.new(DateTime.new0(Rational.new!(728231561,300),0,Date::ITALY),198291600,-3600,0,:WAT)}
-add_period(1976,4) {TimezonePeriod.new(198291600,nil,0,0,:WET)}
-end
-end
-end
+  module Definitions
+    module Africa
+      module El_Aaiun
+        include TimezoneDefinition
+        
+        timezone 'Africa/El_Aaiun' do |tz|
+          tz.offset :o0, -3168, 0, :LMT
+          tz.offset :o1, -3600, 0, :WAT
+          tz.offset :o2, 0, 0, :WET
+          
+          tz.transition 1934, 1, :o1, 728231561, 300
+          tz.transition 1976, 4, :o2, 198291600
+        end
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/Africa/Freetown.rb

@@ -1,43 +1,53 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module Africa #:nodoc:
-class Freetown < Timezone #:nodoc:
-setup
-set_identifier('Africa/Freetown')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(3468163013,1440),0,Date::ITALY),-3180,0,:LMT)}
-add_period(1882,1) {TimezonePeriod.new(DateTime.new0(Rational.new!(3468163013,1440),0,Date::ITALY),DateTime.new0(Rational.new!(3484684133,1440),0,Date::ITALY),-3180,0,:FMT)}
-add_period(1913,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(3484684133,1440),0,Date::ITALY),DateTime.new0(Rational.new!(58270909,24),0,Date::ITALY),-3600,0,:WAT)}
-add_period(1935,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(58270909,24),0,Date::ITALY),DateTime.new0(Rational.new!(174821509,72),0,Date::ITALY),-3600,2400,:SLST)}
-add_period(1935,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(174821509,72),0,Date::ITALY),DateTime.new0(Rational.new!(58279693,24),0,Date::ITALY),-3600,0,:WAT)}
-add_period(1936,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(58279693,24),0,Date::ITALY),DateTime.new0(Rational.new!(174847861,72),0,Date::ITALY),-3600,2400,:SLST)}
-add_period(1936,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(174847861,72),0,Date::ITALY),DateTime.new0(Rational.new!(58288453,24),0,Date::ITALY),-3600,0,:WAT)}
-add_period(1937,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(58288453,24),0,Date::ITALY),DateTime.new0(Rational.new!(174874141,72),0,Date::ITALY),-3600,2400,:SLST)}
-add_period(1937,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(174874141,72),0,Date::ITALY),DateTime.new0(Rational.new!(58297213,24),0,Date::ITALY),-3600,0,:WAT)}
-add_period(1938,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(58297213,24),0,Date::ITALY),DateTime.new0(Rational.new!(174900421,72),0,Date::ITALY),-3600,2400,:SLST)}
-add_period(1938,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(174900421,72),0,Date::ITALY),DateTime.new0(Rational.new!(58305973,24),0,Date::ITALY),-3600,0,:WAT)}
-add_period(1939,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(58305973,24),0,Date::ITALY),DateTime.new0(Rational.new!(174926701,72),0,Date::ITALY),-3600,2400,:SLST)}
-add_period(1939,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(174926701,72),0,Date::ITALY),DateTime.new0(Rational.new!(58314757,24),0,Date::ITALY),-3600,0,:WAT)}
-add_period(1940,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(58314757,24),0,Date::ITALY),DateTime.new0(Rational.new!(174953053,72),0,Date::ITALY),-3600,2400,:SLST)}
-add_period(1940,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(174953053,72),0,Date::ITALY),DateTime.new0(Rational.new!(58323517,24),0,Date::ITALY),-3600,0,:WAT)}
-add_period(1941,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(58323517,24),0,Date::ITALY),DateTime.new0(Rational.new!(174979333,72),0,Date::ITALY),-3600,2400,:SLST)}
-add_period(1941,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(174979333,72),0,Date::ITALY),DateTime.new0(Rational.new!(58332277,24),0,Date::ITALY),-3600,0,:WAT)}
-add_period(1942,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(58332277,24),0,Date::ITALY),DateTime.new0(Rational.new!(175005613,72),0,Date::ITALY),-3600,2400,:SLST)}
-add_period(1942,10) {TimezonePeriod.new(DateTime.new0(Rational.new!(175005613,72),0,Date::ITALY),DateTime.new0(Rational.new!(58460149,24),0,Date::ITALY),-3600,0,:WAT)}
-add_period(1957,1) {TimezonePeriod.new(DateTime.new0(Rational.new!(58460149,24),0,Date::ITALY),DateTime.new0(Rational.new!(4871981,2),0,Date::ITALY),0,0,:WAT)}
-add_period(1957,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(4871981,2),0,Date::ITALY),DateTime.new0(Rational.new!(58465979,24),0,Date::ITALY),0,3600,:SLST)}
-add_period(1957,8) {TimezonePeriod.new(DateTime.new0(Rational.new!(58465979,24),0,Date::ITALY),DateTime.new0(Rational.new!(4872711,2),0,Date::ITALY),0,0,:GMT)}
-add_period(1958,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(4872711,2),0,Date::ITALY),DateTime.new0(Rational.new!(58474739,24),0,Date::ITALY),0,3600,:SLST)}
-add_period(1958,8) {TimezonePeriod.new(DateTime.new0(Rational.new!(58474739,24),0,Date::ITALY),DateTime.new0(Rational.new!(4873441,2),0,Date::ITALY),0,0,:GMT)}
-add_period(1959,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(4873441,2),0,Date::ITALY),DateTime.new0(Rational.new!(58483499,24),0,Date::ITALY),0,3600,:SLST)}
-add_period(1959,8) {TimezonePeriod.new(DateTime.new0(Rational.new!(58483499,24),0,Date::ITALY),DateTime.new0(Rational.new!(4874173,2),0,Date::ITALY),0,0,:GMT)}
-add_period(1960,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(4874173,2),0,Date::ITALY),DateTime.new0(Rational.new!(58492283,24),0,Date::ITALY),0,3600,:SLST)}
-add_period(1960,8) {TimezonePeriod.new(DateTime.new0(Rational.new!(58492283,24),0,Date::ITALY),DateTime.new0(Rational.new!(4874903,2),0,Date::ITALY),0,0,:GMT)}
-add_period(1961,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(4874903,2),0,Date::ITALY),DateTime.new0(Rational.new!(58501043,24),0,Date::ITALY),0,3600,:SLST)}
-add_period(1961,8) {TimezonePeriod.new(DateTime.new0(Rational.new!(58501043,24),0,Date::ITALY),DateTime.new0(Rational.new!(4875633,2),0,Date::ITALY),0,0,:GMT)}
-add_period(1962,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(4875633,2),0,Date::ITALY),DateTime.new0(Rational.new!(58509803,24),0,Date::ITALY),0,3600,:SLST)}
-add_period(1962,8) {TimezonePeriod.new(DateTime.new0(Rational.new!(58509803,24),0,Date::ITALY),nil,0,0,:GMT)}
-end
-end
-end
+  module Definitions
+    module Africa
+      module Freetown
+        include TimezoneDefinition
+        
+        timezone 'Africa/Freetown' do |tz|
+          tz.offset :o0, -3180, 0, :LMT
+          tz.offset :o1, -3180, 0, :FMT
+          tz.offset :o2, -3600, 0, :WAT
+          tz.offset :o3, -3600, 2400, :SLST
+          tz.offset :o4, 0, 0, :WAT
+          tz.offset :o5, 0, 3600, :SLST
+          tz.offset :o6, 0, 0, :GMT
+          
+          tz.transition 1882, 1, :o1, 3468163013, 1440
+          tz.transition 1913, 6, :o2, 3484684133, 1440
+          tz.transition 1935, 6, :o3, 58270909, 24
+          tz.transition 1935, 10, :o2, 174821509, 72
+          tz.transition 1936, 6, :o3, 58279693, 24
+          tz.transition 1936, 10, :o2, 174847861, 72
+          tz.transition 1937, 6, :o3, 58288453, 24
+          tz.transition 1937, 10, :o2, 174874141, 72
+          tz.transition 1938, 6, :o3, 58297213, 24
+          tz.transition 1938, 10, :o2, 174900421, 72
+          tz.transition 1939, 6, :o3, 58305973, 24
+          tz.transition 1939, 10, :o2, 174926701, 72
+          tz.transition 1940, 6, :o3, 58314757, 24
+          tz.transition 1940, 10, :o2, 174953053, 72
+          tz.transition 1941, 6, :o3, 58323517, 24
+          tz.transition 1941, 10, :o2, 174979333, 72
+          tz.transition 1942, 6, :o3, 58332277, 24
+          tz.transition 1942, 10, :o2, 175005613, 72
+          tz.transition 1957, 1, :o4, 58460149, 24
+          tz.transition 1957, 6, :o5, 4871981, 2
+          tz.transition 1957, 8, :o6, 58465979, 24
+          tz.transition 1958, 6, :o5, 4872711, 2
+          tz.transition 1958, 8, :o6, 58474739, 24
+          tz.transition 1959, 6, :o5, 4873441, 2
+          tz.transition 1959, 8, :o6, 58483499, 24
+          tz.transition 1960, 6, :o5, 4874173, 2
+          tz.transition 1960, 8, :o6, 58492283, 24
+          tz.transition 1961, 6, :o5, 4874903, 2
+          tz.transition 1961, 8, :o6, 58501043, 24
+          tz.transition 1962, 6, :o5, 4875633, 2
+          tz.transition 1962, 8, :o6, 58509803, 24
+        end
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/Africa/Gaborone.rb

@@ -1,15 +1,21 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module Africa #:nodoc:
-class Gaborone < Timezone #:nodoc:
-setup
-set_identifier('Africa/Gaborone')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(10409223289,4320),0,Date::ITALY),6220,0,:LMT)}
-add_period(1884,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(10409223289,4320),0,Date::ITALY),DateTime.new0(Rational.new!(4861973,2),0,Date::ITALY),7200,0,:CAT)}
-add_period(1943,9) {TimezonePeriod.new(DateTime.new0(Rational.new!(4861973,2),0,Date::ITALY),DateTime.new0(Rational.new!(58348043,24),0,Date::ITALY),7200,3600,:CAST)}
-add_period(1944,3) {TimezonePeriod.new(DateTime.new0(Rational.new!(58348043,24),0,Date::ITALY),nil,7200,0,:CAT)}
-end
-end
-end
+  module Definitions
+    module Africa
+      module Gaborone
+        include TimezoneDefinition
+        
+        timezone 'Africa/Gaborone' do |tz|
+          tz.offset :o0, 6220, 0, :LMT
+          tz.offset :o1, 7200, 0, :CAT
+          tz.offset :o2, 7200, 3600, :CAST
+          
+          tz.transition 1884, 12, :o1, 10409223289, 4320
+          tz.transition 1943, 9, :o2, 4861973, 2
+          tz.transition 1944, 3, :o1, 58348043, 24
+        end
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/Africa/Harare.rb

@@ -1,13 +1,18 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module Africa #:nodoc:
-class Harare < Timezone #:nodoc:
-setup
-set_identifier('Africa/Harare')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(1932939531,800),0,Date::ITALY),7452,0,:LMT)}
-add_period(1903,2) {TimezonePeriod.new(DateTime.new0(Rational.new!(1932939531,800),0,Date::ITALY),nil,7200,0,:CAT)}
-end
-end
-end
+  module Definitions
+    module Africa
+      module Harare
+        include TimezoneDefinition
+        
+        timezone 'Africa/Harare' do |tz|
+          tz.offset :o0, 7452, 0, :LMT
+          tz.offset :o1, 7200, 0, :CAT
+          
+          tz.transition 1903, 2, :o1, 1932939531, 800
+        end
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/Africa/Johannesburg.rb

@@ -1,18 +1,25 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module Africa #:nodoc:
-class Johannesburg < Timezone #:nodoc:
-setup
-set_identifier('Africa/Johannesburg')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(108546139,45),0,Date::ITALY),6720,0,:LMT)}
-add_period(1892,2) {TimezonePeriod.new(DateTime.new0(Rational.new!(108546139,45),0,Date::ITALY),DateTime.new0(Rational.new!(38658791,16),0,Date::ITALY),5400,0,:SAST)}
-add_period(1903,2) {TimezonePeriod.new(DateTime.new0(Rational.new!(38658791,16),0,Date::ITALY),DateTime.new0(Rational.new!(4861245,2),0,Date::ITALY),7200,0,:SAST)}
-add_period(1942,9) {TimezonePeriod.new(DateTime.new0(Rational.new!(4861245,2),0,Date::ITALY),DateTime.new0(Rational.new!(58339307,24),0,Date::ITALY),7200,3600,:SAST)}
-add_period(1943,3) {TimezonePeriod.new(DateTime.new0(Rational.new!(58339307,24),0,Date::ITALY),DateTime.new0(Rational.new!(4861973,2),0,Date::ITALY),7200,0,:SAST)}
-add_period(1943,9) {TimezonePeriod.new(DateTime.new0(Rational.new!(4861973,2),0,Date::ITALY),DateTime.new0(Rational.new!(58348043,24),0,Date::ITALY),7200,3600,:SAST)}
-add_period(1944,3) {TimezonePeriod.new(DateTime.new0(Rational.new!(58348043,24),0,Date::ITALY),nil,7200,0,:SAST)}
-end
-end
-end
+  module Definitions
+    module Africa
+      module Johannesburg
+        include TimezoneDefinition
+        
+        timezone 'Africa/Johannesburg' do |tz|
+          tz.offset :o0, 6720, 0, :LMT
+          tz.offset :o1, 5400, 0, :SAST
+          tz.offset :o2, 7200, 0, :SAST
+          tz.offset :o3, 7200, 3600, :SAST
+          
+          tz.transition 1892, 2, :o1, 108546139, 45
+          tz.transition 1903, 2, :o2, 38658791, 16
+          tz.transition 1942, 9, :o3, 4861245, 2
+          tz.transition 1943, 3, :o2, 58339307, 24
+          tz.transition 1943, 9, :o3, 4861973, 2
+          tz.transition 1944, 3, :o2, 58348043, 24
+        end
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/Africa/Kampala.rb

@@ -1,16 +1,23 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module Africa #:nodoc:
-class Kampala < Timezone #:nodoc:
-setup
-set_identifier('Africa/Kampala')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(10477850731,4320),0,Date::ITALY),7780,0,:LMT)}
-add_period(1928,6) {TimezonePeriod.new(DateTime.new0(Rational.new!(10477850731,4320),0,Date::ITALY),DateTime.new0(Rational.new!(19407819,8),0,Date::ITALY),10800,0,:EAT)}
-add_period(1929,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(19407819,8),0,Date::ITALY),DateTime.new0(Rational.new!(116762467,48),0,Date::ITALY),9000,0,:BEAT)}
-add_period(1947,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(116762467,48),0,Date::ITALY),DateTime.new0(Rational.new!(14030434861,5760),0,Date::ITALY),9885,0,:BEAUT)}
-add_period(1956,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(14030434861,5760),0,Date::ITALY),nil,10800,0,:EAT)}
-end
-end
-end
+  module Definitions
+    module Africa
+      module Kampala
+        include TimezoneDefinition
+        
+        timezone 'Africa/Kampala' do |tz|
+          tz.offset :o0, 7780, 0, :LMT
+          tz.offset :o1, 10800, 0, :EAT
+          tz.offset :o2, 9000, 0, :BEAT
+          tz.offset :o3, 9885, 0, :BEAUT
+          
+          tz.transition 1928, 6, :o1, 10477850731, 4320
+          tz.transition 1929, 12, :o2, 19407819, 8
+          tz.transition 1947, 12, :o3, 116762467, 48
+          tz.transition 1956, 12, :o1, 14030434861, 5760
+        end
+      end
+    end
+  end
 end

data/lib/tzinfo/definitions/Africa/Khartoum.rb

@@ -1,46 +1,53 @@
-require 'tzinfo/timezone'
+require 'tzinfo/timezone_definition'
+
 module TZInfo
-module Definitions #:nodoc:
-module Africa #:nodoc:
-class Khartoum < Timezone #:nodoc:
-setup
-set_identifier('Africa/Khartoum')
-add_unbounded_start_period {TimezonePeriod.new(nil,DateTime.new0(Rational.new!(3275562253,1350),0,Date::ITALY),7808,0,:LMT)}
-add_period(1930,12) {TimezonePeriod.new(DateTime.new0(Rational.new!(3275562253,1350),0,Date::ITALY),10360800,7200,0,:CAT)}
-add_period(1970,4) {TimezonePeriod.new(10360800,24786000,7200,3600,:CAST)}
-add_period(1970,10) {TimezonePeriod.new(24786000,41810400,7200,0,:CAT)}
-add_period(1971,4) {TimezonePeriod.new(41810400,56322000,7200,3600,:CAST)}
-add_period(1971,10) {TimezonePeriod.new(56322000,73432800,7200,0,:CAT)}
-add_period(1972,4) {TimezonePeriod.new(73432800,87944400,7200,3600,:CAST)}
-add_period(1972,10) {TimezonePeriod.new(87944400,104882400,7200,0,:CAT)}
-add_period(1973,4) {TimezonePeriod.new(104882400,119480400,7200,3600,:CAST)}
-add_period(1973,10) {TimezonePeriod.new(119480400,136332000,7200,0,:CAT)}
-add_period(1974,4) {TimezonePeriod.new(136332000,151016400,7200,3600,:CAST)}
-add_period(1974,10) {TimezonePeriod.new(151016400,167781600,7200,0,:CAT)}
-add_period(1975,4) {TimezonePeriod.new(167781600,182552400,7200,3600,:CAST)}
-add_period(1975,10) {TimezonePeriod.new(182552400,199231200,7200,0,:CAT)}
-add_period(1976,4) {TimezonePeriod.new(199231200,214174800,7200,3600,:CAST)}
-add_period(1976,10) {TimezonePeriod.new(214174800,230680800,7200,0,:CAT)}
-add_period(1977,4) {TimezonePeriod.new(230680800,245710800,7200,3600,:CAST)}
-add_period(1977,10) {TimezonePeriod.new(245710800,262735200,7200,0,:CAT)}
-add_period(1978,4) {TimezonePeriod.new(262735200,277246800,7200,3600,:CAST)}
-add_period(1978,10) {TimezonePeriod.new(277246800,294184800,7200,0,:CAT)}
-add_period(1979,4) {TimezonePeriod.new(294184800,308782800,7200,3600,:CAST)}
-add_period(1979,10) {TimezonePeriod.new(308782800,325634400,7200,0,:CAT)}
-add_period(1980,4) {TimezonePeriod.new(325634400,340405200,7200,3600,:CAST)}
-add_period(1980,10) {TimezonePeriod.new(340405200,357084000,7200,0,:CAT)}
-add_period(1981,4) {TimezonePeriod.new(357084000,371941200,7200,3600,:CAST)}
-add_period(1981,10) {TimezonePeriod.new(371941200,388533600,7200,0,:CAT)}
-add_period(1982,4) {TimezonePeriod.new(388533600,403477200,7200,3600,:CAST)}
-add_period(1982,10) {TimezonePeriod.new(403477200,419983200,7200,0,:CAT)}
-add_period(1983,4) {TimezonePeriod.new(419983200,435013200,7200,3600,:CAST)}
-add_period(1983,10) {TimezonePeriod.new(435013200,452037600,7200,0,:CAT)}
-add_period(1984,4) {TimezonePeriod.new(452037600,466635600,7200,3600,:CAST)}
-add_period(1984,10) {TimezonePeriod.new(466635600,483487200,7200,0,:CAT)}
-add_period(1985,4) {TimezonePeriod.new(483487200,498171600,7200,3600,:CAST)}
-add_period(1985,10) {TimezonePeriod.new(498171600,947930400,7200,0,:CAT)}
-add_period(2000,1) {TimezonePeriod.new(947930400,nil,10800,0,:EAT)}
-end
-end
-end
+  module Definitions
+    module Africa
+      module Khartoum
+        include TimezoneDefinition
+        
+        timezone 'Africa/Khartoum' do |tz|
+          tz.offset :o0, 7808, 0, :LMT
+          tz.offset :o1, 7200, 0, :CAT
+          tz.offset :o2, 7200, 3600, :CAST
+          tz.offset :o3, 10800, 0, :EAT
+          
+          tz.transition 1930, 12, :o1, 3275562253, 1350
+          tz.transition 1970, 4, :o2, 10360800
+          tz.transition 1970, 10, :o1, 24786000
+          tz.transition 1971, 4, :o2, 41810400
+          tz.transition 1971, 10, :o1, 56322000
+          tz.transition 1972, 4, :o2, 73432800
+          tz.transition 1972, 10, :o1, 87944400
+          tz.transition 1973, 4, :o2, 104882400
+          tz.transition 1973, 10, :o1, 119480400
+          tz.transition 1974, 4, :o2, 136332000
+          tz.transition 1974, 10, :o1, 151016400
+          tz.transition 1975, 4, :o2, 167781600
+          tz.transition 1975, 10, :o1, 182552400
+          tz.transition 1976, 4, :o2, 199231200
+          tz.transition 1976, 10, :o1, 214174800
+          tz.transition 1977, 4, :o2, 230680800
+          tz.transition 1977, 10, :o1, 245710800
+          tz.transition 1978, 4, :o2, 262735200
+          tz.transition 1978, 10, :o1, 277246800
+          tz.transition 1979, 4, :o2, 294184800
+          tz.transition 1979, 10, :o1, 308782800
+          tz.transition 1980, 4, :o2, 325634400
+          tz.transition 1980, 10, :o1, 340405200
+          tz.transition 1981, 4, :o2, 357084000
+          tz.transition 1981, 10, :o1, 371941200
+          tz.transition 1982, 4, :o2, 388533600
+          tz.transition 1982, 10, :o1, 403477200
+          tz.transition 1983, 4, :o2, 419983200
+          tz.transition 1983, 10, :o1, 435013200
+          tz.transition 1984, 4, :o2, 452037600
+          tz.transition 1984, 10, :o1, 466635600
+          tz.transition 1985, 4, :o2, 483487200
+          tz.transition 1985, 10, :o1, 498171600
+          tz.transition 2000, 1, :o3, 947930400
+        end
+      end
+    end
+  end
 end