when_exe 0.3.2 → 0.3.3

data/test/test/region/chinese.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 Takashi SUGA
+  Copyright (C) 2011-2014 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -11,7 +11,7 @@ module Test
   class Chinese < Test::Unit::TestCase
     def test_chinese_date
 
-      emd = When.Resource('_c:EphemerisBasedSolar')
+      emd = When.Resource('_c:EphemerisBasedSolar?time_basis=+09:00')
       date = When.when?('2009-01-01', {:frame=>emd})
       [
         ["2009-01-01", 2454867],
@@ -31,7 +31,7 @@ module Test
         date += When.Duration('P1M')
       end
 
-      cc   = When::CalendarTypes::ChineseLuniSolar.new({'timezone'=>9})
+      cc   = When::CalendarTypes::ChineseLuniSolar.new({'time_basis'=>'+09:00'})
       date = When.when?('2009-01-01', {:frame=>cc})
       [
         ["2009-01-01", 2454858],
@@ -91,7 +91,7 @@ module Test
         date += When.Duration('P1M')
       end
 
-      cc   = When::CalendarTypes::ChineseLuniSolar.new({'timezone'=>9, 'intercalary_span'=>3})
+      cc   = When::CalendarTypes::ChineseLuniSolar.new({'time_basis'=>'+09:00', 'intercalary_span'=>3})
       date = When.when?('2728-11-01', {:frame=>cc})
       [
         ["2728-11-01", 2717768],

data/test/test/region/civil.rb

@@ -0,0 +1,124 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2012-2014 Takashi SUGA
+
+  You may use and/or modify this file according to the license
+  described in the LICENSE.txt file included in this archive.
+=end
+
+module Test
+
+  class Civil < Test::Unit::TestCase
+    def test__border
+      frame = When.Calendar('Civil?reform=1752-9-14&border=0-3-25(1753)0-1-1')
+      assert_equal("1641=03-24", (frame ^ When.when?('1642-4-3')  ).to_s)
+      assert_equal("1642-03-25", (frame ^ When.when?('1642-4-4')  ).to_s)
+      assert_equal("1752-12-31", (frame ^ When.when?('1752-12-31')).to_s)
+      assert_equal("1753-01-01", (frame ^ When.when?('1753-1-1')  ).to_s)
+      assert_equal("1753-03-24", (frame ^ When.when?('1753-3-24') ).to_s)
+      assert_equal("1753-03-25", (frame ^ When.when?('1753-3-25') ).to_s)
+    end
+
+    def test__reform_inc
+      sample = %w(
+        1582-09-30 1582-10-01 1582-10-02 1582-10-03 1582-10-04 1582-10-15 1582-10-16 1582-10-17
+        1582-10-18 1582-10-19 1582-10-20 1582-10-21 1582-10-22 1582-10-23 1582-10-24 1582-10-25
+        1582-10-26 1582-10-27 1582-10-28 1582-10-29 1582-10-30 1582-10-31 1582-11-01 1582-11-02
+        1582-11-03)
+      date = When.when?('1582-9-30', :frame=>'Civil?reform=1582-10-15')
+      25.times do
+        assert_equal(sample.shift, date.to_s)
+        date = date + When::DurationP1D
+      end
+    end
+
+    def test__reform_dec
+      sample = %w(
+        1582-11-01 1582-10-31 1582-10-30 1582-10-29 1582-10-28 1582-10-27 1582-10-26 1582-10-25
+        1582-10-24 1582-10-23 1582-10-22 1582-10-21 1582-10-20 1582-10-19 1582-10-18 1582-10-17
+        1582-10-16 1582-10-15 1582-10-04 1582-10-03 1582-10-02 1582-10-01 1582-09-30 1582-09-29
+        1582-09-28)
+      date = When.when?('1582-11-01', :frame=>'Civil?reform=1582-10-15')
+      25.times do
+        assert_equal(sample.shift, date.to_s)
+        date = date - When::DurationP1D
+      end
+    end
+
+    def test__reform_year
+      date = When.when?('1752^^Civil?reform=1752-9-14&border=(1000)0-3-25(1753)0-1-1')
+      assert_equal(
+        [[1752,
+         [[3,
+          ["*", 1, 2, 3, 4, 5, 6, 7],
+          ["*", 8, 9, 10, 11, 12, 13, 14],
+          ["*", 15, 16, 17, 18, 19, 20, 21],
+          ["*", 22, 23, 24, 25, 26, 27, 28],
+          ["*", 29, 30, 31, "*", "*", "*", "*"]]],
+         [[4,
+          ["*", "*", "*", "*", 1, 2, 3, 4],
+          ["*", 5, 6, 7, 8, 9, 10, 11],
+          ["*", 12, 13, 14, 15, 16, 17, 18],
+          ["*", 19, 20, 21, 22, 23, 24, 25],
+          ["*", 26, 27, 28, 29, 30, "*", "*"]]],
+         [[5,
+          ["*", "*", "*", "*", "*", "*", 1, 2],
+          ["*", 3, 4, 5, 6, 7, 8, 9],
+          ["*", 10, 11, 12, 13, 14, 15, 16],
+          ["*", 17, 18, 19, 20, 21, 22, 23],
+          ["*", 24, 25, 26, 27, 28, 29, 30],
+          ["*", 31, "*", "*", "*", "*", "*", "*"]]],
+         [[6,
+          ["*", "*", 1, 2, 3, 4, 5, 6],
+          ["*", 7, 8, 9, 10, 11, 12, 13],
+          ["*", 14, 15, 16, 17, 18, 19, 20],
+          ["*", 21, 22, 23, 24, 25, 26, 27],
+          ["*", 28, 29, 30, "*", "*", "*", "*"]]],
+         [[7,
+          ["*", "*", "*", "*", 1, 2, 3, 4],
+          ["*", 5, 6, 7, 8, 9, 10, 11],
+          ["*", 12, 13, 14, 15, 16, 17, 18],
+          ["*", 19, 20, 21, 22, 23, 24, 25],
+          ["*", 26, 27, 28, 29, 30, 31, "*"]]],
+         [[8,
+          ["*", "*", "*", "*", "*", "*", "*", 1],
+          ["*", 2, 3, 4, 5, 6, 7, 8],
+          ["*", 9, 10, 11, 12, 13, 14, 15],
+          ["*", 16, 17, 18, 19, 20, 21, 22],
+          ["*", 23, 24, 25, 26, 27, 28, 29],
+          ["*", 30, 31, "*", "*", "*", "*", "*"]]],
+         [[9,
+          ["*", "*", "*", 1, 2, 14, 15, 16],
+          ["*", 17, 18, 19, 20, 21, 22, 23],
+          ["*", 24, 25, 26, 27, 28, 29, 30]]],
+         [[10,
+          ["*", 1, 2, 3, 4, 5, 6, 7],
+          ["*", 8, 9, 10, 11, 12, 13, 14],
+          ["*", 15, 16, 17, 18, 19, 20, 21],
+          ["*", 22, 23, 24, 25, 26, 27, 28],
+          ["*", 29, 30, 31, "*", "*", "*", "*"]]],
+         [[11,
+          ["*", "*", "*", "*", 1, 2, 3, 4],
+          ["*", 5, 6, 7, 8, 9, 10, 11],
+          ["*", 12, 13, 14, 15, 16, 17, 18],
+          ["*", 19, 20, 21, 22, 23, 24, 25],
+          ["*", 26, 27, 28, 29, 30, "*", "*"]]],
+         [[12,
+          ["*", "*", "*", "*", "*", "*", 1, 2],
+          ["*", 3, 4, 5, 6, 7, 8, 9],
+          ["*", 10, 11, 12, 13, 14, 15, 16],
+          ["*", 17, 18, 19, 20, 21, 22, 23],
+          ["*", 24, 25, 26, 27, 28, 29, 30],
+          ["*", 31, "*", "*", "*", "*", "*", "*"]]]]],
+        date.year_included('Sunday') {|d,b|
+          case b
+          when When::YEAR  ; d[When::YEAR]
+          when When::MONTH ; d[When::MONTH]
+          when When::DAY   ; d[When::DAY]
+          else       ; '*'
+         end
+        }
+      )
+    end
+  end
+end

data/test/test/region/geologicalage.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011 Takashi SUGA
+  Copyright (C) 2011-2013 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -8,7 +8,10 @@
 
 module Test::TM
   class GeologicalAge < Test::Unit::TestCase
-    def test_nothing
+    def test__geological_age
+      age = When.Resource('_tm:OrdinalReferenceSystem/GeologicalAge')
+      assert_equal("-2500000000", age['始生代::新始生代'].end.to_s)
+      assert_equal("-09700", age['顕生代::新生代::第四紀::完新世'].begin.to_s)
     end
   end
 end

data/test/test/region/indian.rb

@@ -50,6 +50,8 @@ module Test
       cc     = When.Calendar('HinduSolar?type=SBS')
       date   = When.when?('1913-01-01', {:frame=>cc})
       assert_equal([2448361, "1913-01-01", "1991-04-14"], [date.to_i, date.to_s, date.to_date.to_s])
+      date   = When::CalendarTypes::CalendarNote::HinduNote::Dates.new(date)
+      assert_equal(2448361, date.to_i)
     end
   end
 end

data/test/test/region/japanese.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2012 Takashi SUGA
+  Copyright (C) 2011-2014 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -42,6 +42,161 @@ module Test
       end
     end
 
+    def test__solar_terms
+      sample = [
+        [ # 修正後
+          ["貞観12(0870).07.17T+00", []],
+          ["貞観12(0870).07.18T+00", ["処暑(150)", "鷹乃祭鳥", "公損", "没"]],
+          ["貞観12(0870).07.19T+00", []],
+
+          ["天喜05(1057).03.10T+00", []],
+          ["天喜05(1057).03.11T+00", ["穀雨(30)", "萍始生", "公革", "没"]],
+          ["天喜05(1057).03.12T+00", []],
+
+          ["建仁02(1202).10=29T+00", ["没"]],
+          ["建仁02(1202).11.01T+00", ["冬至(270)", "蚯蚓結", "公中孚"]],
+          ["建仁02(1202).11.02T+00", []],
+          ["建仁02(1202).11.03T+00", []],
+
+          ["寛元01(1243).11.03T+00", []],
+          ["寛元01(1243).11.04T+00", ["冬至(270)", "蚯蚓結", "公中孚", "没"]],
+          ["寛元01(1243).11.05T+00", []],
+
+          ["弘安04(1281).07=30T+00", ["没"]],
+          ["弘安04(1281).08.01T+00", ["秋分(180)", "雷乃收聲", "公賁"]],
+          ["弘安04(1281).08.02T+00", []],
+
+          ["永享02(1430).07.11T+00", ["没"]],
+          ["永享02(1430).07.12T+00", []],
+          ["永享02(1430).07.13T+00", []],
+          ["永享02(1430).07.14T+00", ["大夫節"]],
+          ["永享02(1430).07.15T+00", []],
+          ["永享02(1430).07.16T+00", ["白露降"]],
+          ["永享02(1430).07.17T+00", []],
+          ["永享02(1430).07.18T+00", []],
+          ["永享02(1430).07.19T+00", ["往亡"]],
+          ["永享02(1430).07.20T+00", ["卿同人"]],
+          ["永享02(1430).07.21T+00", ["寒蟬鳴"]],
+          ["永享02(1430).07.22T+00", []],
+          ["永享02(1430).07.23T+00", []],
+          ["永享02(1430).07.24T+00", []],
+          ["永享02(1430).07.25T+00", []],
+
+          ["元和03(1617).03.18T+00", []],
+          ["元和03(1617).03.19T+00", ["穀雨(30)", "萍始生", "公革", "没"]],
+          ["元和03(1617).03.20T+00", []],
+
+          ["平成06(1994).06.21T+09:00", ["夏至(90)", "乃東枯"]],
+          ["平成06(1994).06.22T+09:00", []]
+        ],
+
+        [ # 修正前
+          ["貞観12(0870).07.17T+00", ["没"]],
+          ["貞観12(0870).07.18T+00", ["処暑(150)", "鷹乃祭鳥", "公損"]],
+          ["貞観12(0870).07.19T+00", []],
+
+          ["天喜05(1057).03.10T+00", ["没"]],
+          ["天喜05(1057).03.11T+00", ["穀雨(30)", "萍始生", "公革"]],
+          ["天喜05(1057).03.12T+00", []],
+
+          ["建仁02(1202).10=29T+00", ["冬至(270)", "蚯蚓結", "公中孚"]],
+          ["建仁02(1202).11.01T+00", []],
+          ["建仁02(1202).11.02T+00", []],
+          ["建仁02(1202).11.03T+00", ["没"]],
+
+          ["寛元01(1243).11.03T+00", ["没"]],
+          ["寛元01(1243).11.04T+00", ["冬至(270)", "蚯蚓結", "公中孚"]],
+          ["寛元01(1243).11.05T+00", []],
+
+          ["弘安04(1281).07=30T+00", ["秋分(180)", "雷乃收聲", "公賁"]],
+          ["弘安04(1281).08.01T+00", []],
+          ["弘安04(1281).08.02T+00", ["没"]],
+
+          ["永享02(1430).07.11T+00", []],
+          ["永享02(1430).07.12T+00", []],
+          ["永享02(1430).07.13T+00", ["大夫節"]],
+          ["永享02(1430).07.14T+00", []],
+          ["永享02(1430).07.15T+00", ["白露降"]],
+          ["永享02(1430).07.16T+00", []],
+          ["永享02(1430).07.17T+00", []],
+          ["永享02(1430).07.18T+00", ["往亡"]],
+          ["永享02(1430).07.19T+00", ["卿同人"]],
+          ["永享02(1430).07.20T+00", ["寒蟬鳴"]],
+          ["永享02(1430).07.21T+00", []],
+          ["永享02(1430).07.22T+00", []],
+          ["永享02(1430).07.23T+00", []],
+          ["永享02(1430).07.24T+00", []],
+          ["永享02(1430).07.25T+00", ["没"]],
+
+          ["元和03(1617).03.18T+00", ["没"]],
+          ["元和03(1617).03.19T+00", ["穀雨(30)", "萍始生", "公革"]],
+          ["元和03(1617).03.20T+00", []],
+
+          ["平成06(1994).06.21T+09:00", ["夏至(90)", "乃東枯"]],
+          ["平成06(1994).06.22T+09:00", []]
+        ]
+      ]
+
+      2.times do
+        result = []
+        [2039054..2039056,
+         2107233..2107235,
+         2160437..2160440,
+         2175412..2175414,
+         2189200..2189202,
+         2243577..2243591,
+         2311770..2311772,
+         2449525..2449526].each do |range|
+          range.each do |jdn|
+            (When.when?(jdn) ^ When.CalendarEra('Japanese')).each do |date|
+              dates = When.CalendarNote('JapaneseNote').send(:_to_date_for_note, date)
+              date  = When.when?(dates.o_date.to_cal_date.to_s,
+                               {:clock=>dates.s_date.frame.time_basis})
+              long  = dates.cal4note.s_terms.position(date)
+              notes = date.notes(:indices => When::DAY,
+                                 :notes   => (13<<9|1<<48|1<<71),
+                                 :locale  => 'ja').map {|n| n[:value]}
+              result << [date.to_m17n/'ja', notes]
+            end
+          end
+        end
+        assert_equal(sample.shift, result)
+        When::CalendarTypes::CalendarNote::JapaneseNote::SolarTerms.send(:patch=, {})
+      end
+      When::CalendarTypes::CalendarNote::JapaneseNote::SolarTerms.send(:patch=, nil)
+    end
+
+    def test__lunar_phases
+      [%w(康和3.01.09 康和3.01.16 康和3.01.23),
+       %w(康和3.02.08 康和3.02.16 康和3.02.23),
+       %w(康和3.03.08 康和3.03.15 康和3.03.22),
+       %w(康和3.04.09 康和3.04.16 康和3.04.23),
+       %w(康和3.05.08 康和3.05.15 康和3.05.22),
+       %w(康和3.06.08 康和3.06.15 康和3.06.23),
+       %w(康和3.07.08 康和3.07.15 康和3.07.22),
+       %w(康和3.08.07 康和3.08.14 康和3.08.22),
+       %w(康和3.09.07 康和3.09.15 康和3.09.23),
+       %w(康和3.10.08 康和3.10.15 康和3.10.23),
+       %w(康和3.11.07 康和3.11.15 康和3.11.23),
+       %w(康和3.12.08 康和3.12.16 康和3.12.23),
+
+       %w(平成26.01.01 平成26.01.08 平成26.01.16 平成26.01.24),
+       %w(平成26.01.31 平成26.02.07 平成26.02.15 平成26.02.23),
+       %w(平成26.03.01 平成26.03.08 平成26.03.17 平成26.03.24),
+       %w(平成26.03.31 平成26.04.07 平成26.04.15 平成26.04.22),
+       %w(平成26.04.29 平成26.05.07 平成26.05.15 平成26.05.21),
+       %w(平成26.05.29 平成26.06.06 平成26.06.13 平成26.06.20),
+       %w(平成26.06.27 平成26.07.05 平成26.07.12 平成26.07.19),
+       %w(平成26.07.27 平成26.08.04 平成26.08.11 平成26.08.17),
+       %w(平成26.08.25 平成26.09.02 平成26.09.09 平成26.09.16),
+       %w(平成26.09.24 平成26.10.02 平成26.10.08 平成26.10.16),
+       %w(平成26.10.24 平成26.10.31 平成26.11.07 平成26.11.15),
+       %w(平成26.11.22 平成26.11.29 平成26.12.06 平成26.12.14),
+       %w(平成26.12.22 平成26.12.29)
+      ].each do |month|
+        assert_equal([true], month.map {|date| When.when?(date).notes('月相').kind_of?(Hash)}.uniq)
+      end
+    end
 =begin
     def test_japanese_date
       jc   = When.Resource('_c:Japanese')

data/test/test/region/jewish.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 Takashi SUGA
+  Copyright (C) 2011-2014 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -53,8 +53,8 @@ module Test
         date += When.Duration('P1Y')
       end
 
-      assert_equal("BCE3761(-3760).10.07",
-                   (When.era('BCE')[0] ^ When.Calendar('Jewish').domain.first).to_s)
+      assert_equal("Common::BCE3761(-3760).10.07",
+                   (When.era('BCE')[0] ^ When.Calendar('Jewish').domain[''].first).to_s)
 
     end
   end

data/test/test/region/m17n.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 Takashi SUGA
+  Copyright (C) 2011-2014 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -121,10 +121,10 @@ module Test
       end
     end
 
-    def test__to_hash
+    def test__to_h
       [
        ['HLC0.0.0.0.0',
-         {:calendar=>["_e:Mayan::PHLC",-13], :sdn=>584283, :cal_date=>[13, 0, 0, 0, 0],
+         {:calendar=>["_e:LongCount::PHLC",-13], :sdn=>584283, :cal_date=>[13, 0, 0, 0, 0],
           :notes=>[[{:note=>"Trecena", :value=>"Trecena(4/13)"},
                     {:note=>"Tzolk'in", :value=>"Ajaw(19/20)"},
                     {:note=>"Lords_of_the_Night", :value=>"G9(0/9)"},
@@ -137,9 +137,9 @@ module Test
        ['明治7.5.7',
          {:calendar=>["_e:Japanese::明治",1867], :sdn=>2405651, :cal_date=>[7, 5, 7],
           :notes=>[[{:note=>"干支",  :value=>"甲戌(10)", :position=>"共通"}],
-                   [{:note=>"月名",  :value=>"May",     :position=>"月建"}],
-                   [{:note=>"干支",  :value=>"甲子(0)", :position=>"共通"},
-                    {:note=>"六曜",  :value=>"赤口",    :position=>"民間"}]]}],
+                   [{:note=>"月名",  :value=>"May",      :position=>"月建"}],
+                   [{:note=>"干支",  :value=>"甲子(00)", :position=>"共通"},
+                    {:note=>"六曜",  :value=>"赤口",     :position=>"民間"}]]}],
 
        ['明治17.5.7',
          {:calendar=>["_e:Japanese::明治",1867], :sdn=>2409304, :cal_date=>[17, 5, 7],
@@ -156,17 +156,17 @@ module Test
        [11,
          {:calendar=>["_tm:JulianDate"], :sdn=>11,
           :notes=>[[{:note=>"Week",  :value=>"Friday(4)"},
-                    {:note=>"干支",  :value=>"甲子(0)"}]]}],
+                    {:note=>"干支",  :value=>"甲子(00)"}]]}],
 
        [11.0,
          {:calendar=>["_tm:JulianDate"], :sdn=>11,
           :notes=>[[{:note=>"Week",  :value=>"Friday(4)"},
-                    {:note=>"干支",  :value=>"甲子(0)"}]],
+                    {:note=>"干支",  :value=>"甲子(00)"}]],
           :clk_time=>[11, 12, 0, 0]}]
 
       ].each do |sample|
         date, verify = sample
-        list = When.when?(date).to_hash({:simple=>true})
+        list = When.when?(date).to_h({:simple=>true})
         [:calendar, :cal_date, :sdn, :clk_time].each do |key|
           assert_equal(verify[key], list[key])
         end

data/test/test/region/mayan.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2012 Takashi SUGA
+  Copyright (C) 2011-2014 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -10,10 +10,29 @@ module Test
 
   class Mayan < Test::Unit::TestCase
     def test__mayan_epoch
-      [['PHLC13.0.0.0.0', 'PHLC13(0000).00.00.00.00',   584283],
-       ['HLC0.0.0.0.1',   'HLC00.00.00.00.01',       584284],
-       ['HLC13.0.0.0.0',  'HLC13.00.00.00.00',      2456283],
-       ['HLC13.0.0.0.1',  'NLC00(0013).00.00.00.01',  2456284]].each do |sample|
+      # No offset
+      [['PHLC13.0.0.0.0', 'PHLC13(0000).00.00.00.00', 584283],
+       ['HLC0.0.0.0.1',   'HLC00.00.00.00.01',        584284],
+       ['HLC13.0.0.0.0',  'HLC13.00.00.00.00',       2456283],
+       ['HLC13.0.0.0.1',  'NLC00(0013).00.00.00.01', 2456284]].each do |sample|
+        date = When.when?(sample.shift)
+        assert_equal(sample, [date.to_s, date.to_i])
+      end
+
+      # offset 0B
+      [['LongCount?Epoch=0D::PHLC13.0.0.0.0', 'LongCount?Epoch=0D::PHLC13(0000).00.00.00.00', 584283],
+       ['LongCount?Epoch=0D::HLC0.0.0.0.1',   'LongCount?Epoch=0D::HLC00.00.00.00.01',        584284],
+       ['LongCount?Epoch=0D::HLC13.0.0.0.0',  'LongCount?Epoch=0D::HLC13.00.00.00.00',       2456283],
+       ['LongCount?Epoch=0D::HLC13.0.0.0.1',  'LongCount?Epoch=0D::NLC00(0013).00.00.00.01', 2456284]].each do |sample|
+        date = When.when?(sample.shift)
+        assert_equal(sample, [date.to_s, date.to_i])
+      end
+
+      # offset 2B
+      [['LongCount?Epoch=2D::PHLC13.0.0.0.0', 'LongCount?Epoch=2D::PHLC13(0000).00.00.00.00', 584285],
+       ['LongCount?Epoch=2D::HLC0.0.0.0.1',   'LongCount?Epoch=2D::HLC00.00.00.00.01',        584286],
+       ['LongCount?Epoch=2D::HLC13.0.0.0.0',  'LongCount?Epoch=2D::HLC13.00.00.00.00',       2456285],
+       ['LongCount?Epoch=2D::HLC13.0.0.0.1',  'LongCount?Epoch=2D::NLC00(0013).00.00.00.01', 2456286]].each do |sample|
         date = When.when?(sample.shift)
         assert_equal(sample, [date.to_s, date.to_i])
       end
@@ -26,6 +45,7 @@ module Test
     end
 
     def test__haab
+      # No offset
       haab = When.Resource("_co:Mayan::Haab'")
       assert_equal("ハアブ", haab.label.translate('ja'))
       assert_equal("http://en.wikipedia.org/wiki/Haab'", haab.label.reference)
@@ -44,9 +64,50 @@ module Test
       assert_equal(42, When.when?('2011-05-15') % haab)
       h = haab % When.when?('2011-05-15')
       assert_equal(["Sip", 2], [h.label.to_s, h.difference])
+
+      # offset 0B
+      haab = When.Resource("_co:Mayan?Epoch=0D::Haab'")
+      assert_equal("ハアブ", haab.label.translate('ja'))
+      assert_equal("http://en.wikipedia.org/wiki/Haab'", haab.label.reference)
+      pop = When.Resource("_co:Mayan?Epoch=0D::Haab'::Pop")
+      assert_equal("Pop", pop.label.translate('en'))
+      assert_equal("http://en.wikipedia.org/wiki/File:Maya-Pop.jpg", pop.label.reference)
+      date0 = When.when?('2011-05-16T12:34:56Z')
+      sample = [
+        "2012-04-12T12:34:56Z",
+        "2012-04-13T12:34:56Z",
+        "2012-04-14T12:34:56Z"
+      ]
+      [10,11,12].each do |i|
+        assert_equal(sample.shift, (date0 & pop[i]).to_s)
+      end
+      assert_equal(42, When.when?('2011-05-15') % haab)
+      h = haab % When.when?('2011-05-15')
+      assert_equal(["Sip", 2], [h.label.to_s, h.difference])
+
+      # offset 2B
+      haab = When.Resource("_co:Mayan?Epoch=2D::Haab'")
+      assert_equal("ハアブ", haab.label.translate('ja'))
+      assert_equal("http://en.wikipedia.org/wiki/Haab'", haab.label.reference)
+      pop = When.Resource("_co:Mayan?Epoch=2D::Haab'::Pop")
+      assert_equal("Pop", pop.label.translate('en'))
+      assert_equal("http://en.wikipedia.org/wiki/File:Maya-Pop.jpg", pop.label.reference)
+      date0 = When.when?('2011-05-16T12:34:56Z')
+      sample = [
+        "2012-04-14T12:34:56Z",
+        "2012-04-15T12:34:56Z",
+        "2012-04-16T12:34:56Z"
+      ]
+      [10,11,12].each do |i|
+        assert_equal(sample.shift, (date0 & pop[i]).to_s)
+      end
+      assert_equal(42, When.when?('2011-05-17') % haab)
+      h = haab % When.when?('2011-05-17')
+      assert_equal(["Sip", 2], [h.label.to_s, h.difference])
     end
 
     def test__tzolkin
+      # No offset
       trecena = When.Resource("_co:Mayan::Trecena")
       assert_equal("トレセナ", trecena.label.translate('ja'))
       assert_equal("http://en.wikipedia.org/wiki/Trecena", trecena.label.reference)
@@ -73,6 +134,62 @@ module Test
       if ::Object.const_defined?(:Date) && Date.respond_to?(:civil)
         assert_equal('Ix', (tzolkin % Date.new(2011,5,15)).label.to_s)
       end
+
+      # offset 0B
+      trecena = When.Resource("_co:Mayan?Epoch=0D::Trecena")
+      assert_equal("トレセナ", trecena.label.translate('ja'))
+      assert_equal("http://en.wikipedia.org/wiki/Trecena", trecena.label.reference)
+      assert_equal(2, When.when?('2011-05-15') % trecena)
+
+
+      tzolkin = When.Resource("_co:Mayan?Epoch=0D::Tzolk'in")
+      assert_equal("ツォルキン", tzolkin.label.translate('ja'))
+      assert_equal("http://en.wikipedia.org/wiki/Tzolk'in", tzolkin.label.reference)
+      ajaw = When.Resource("_co:Mayan?Epoch=0D::Tzolk'in::Ajaw")
+      assert_equal("Ajaw", ajaw.label.translate('en'))
+      assert_equal("http://en.wikipedia.org/wiki/File:MAYA-g-log-cal-D20-Ajaw-cdxW.png", ajaw.label.reference('alias'))
+      date0 = When.when?('2011-05-16T12:34:56Z')
+      sample = [
+        "2011-05-21T12:34:56Z",
+        "2011-05-21T12:34:56Z",
+        "2011-05-21T12:34:56Z"
+      ]
+      [10,11,12].each do |i|
+        assert_equal(sample.shift, (date0 & ajaw).to_s)
+      end
+      assert_equal(13, When.when?('2011-05-15') % tzolkin)
+      assert_equal('Ix', (tzolkin % When.when?('2011-05-15')).label.to_s)
+      if ::Object.const_defined?(:Date) && Date.respond_to?(:civil)
+        assert_equal('Ix', (tzolkin % Date.new(2011,5,15)).label.to_s)
+      end
+
+      # offset 2B
+      trecena = When.Resource("_co:Mayan?Epoch=2D::Trecena")
+      assert_equal("トレセナ", trecena.label.translate('ja'))
+      assert_equal("http://en.wikipedia.org/wiki/Trecena", trecena.label.reference)
+      assert_equal(2, When.when?('2011-05-17') % trecena)
+
+
+      tzolkin = When.Resource("_co:Mayan?Epoch=2D::Tzolk'in")
+      assert_equal("ツォルキン", tzolkin.label.translate('ja'))
+      assert_equal("http://en.wikipedia.org/wiki/Tzolk'in", tzolkin.label.reference)
+      ajaw = When.Resource("_co:Mayan?Epoch=2D::Tzolk'in::Ajaw")
+      assert_equal("Ajaw", ajaw.label.translate('en'))
+      assert_equal("http://en.wikipedia.org/wiki/File:MAYA-g-log-cal-D20-Ajaw-cdxW.png", ajaw.label.reference('alias'))
+      date0 = When.when?('2011-05-16T12:34:56Z')
+      sample = [
+        "2011-05-23T12:34:56Z",
+        "2011-05-23T12:34:56Z",
+        "2011-05-23T12:34:56Z"
+      ]
+      [10,11,12].each do |i|
+        assert_equal(sample.shift, (date0 & ajaw).to_s)
+      end
+      assert_equal(13, When.when?('2011-05-17') % tzolkin)
+      assert_equal('Ix', (tzolkin % When.when?('2011-05-17')).label.to_s)
+      if ::Object.const_defined?(:Date) && Date.respond_to?(:civil)
+        assert_equal('Ix', (tzolkin % Date.new(2011,5,17)).label.to_s)
+      end
     end
   end
 end