when_exe 0.3.7 → 0.3.8

data/lib/when_exe/region/chinese/twins.rb

@@ -13,63 +13,63 @@ module When
     ChineseLuniSolar = [self, [
       'locale:[=ja:, en=en:]',
       'area:[中国の暦月=, *ChineseLuniSolar=]',
-      ['[太初暦]1.01.01',      '@CR',   '1-01-01^ChineseTwin::太初暦',    '85-01-01'], # 西暦が正になるところから開始(実際は-103.01.01)
-      ['[四分暦]85.01.01',     '@CR',  '85-01-01^ChineseTwin::四分暦',    '265-01-01'],
-      ['[乾象暦]222.01.01',    '@CR', '222-01-01^ChineseTwin::乾象暦',    '281-01-01'],
-      ['[景初暦]237.01.01',    '@CR', '237-01-01^ChineseTwin::景初暦',    '452-01-01'],
-      ['[元嘉暦]445.01.01',    '@CR', '445-01-01^ChineseTwin::元嘉暦',    '510-01-01'],
-      ['[大明暦]510.01.01',    '@CR', '510-01-01^ChineseTwin::大明暦',    '590-01-01'],
-      ['[三紀暦=]384.01.01',   '@CR', '384-01-01^ChineseTwin::三紀暦',    '418-01-01'],
-      ['[玄始暦=]412.01.01',   '@CR', '412-01-01^ChineseTwin::玄始暦',    '440-01-01'],
-      ['[玄始暦=]452.01.01',   '@CR', '452-01-01^ChineseTwin::玄始暦',    '523-01-01'],
-      ['[正光暦=]523.01.01',   '@CR', '523-01-01^ChineseTwin::正光暦',    '566-01-01'],
-      ['[興和暦=]540.01.01',   '@CR', '540-01-01^ChineseTwin::興和暦',    '551-01-01'],
-      ['[天保暦=]551.01.01',   '@CR', '551-01-01^ChineseTwin::天保暦',    '578-01-01'],
-      ['[天和暦=]566.01.01',   '@CR', '566-01-01^ChineseTwin::天和暦',    '579-01-01'],
-      ['[大象暦=]579.01.01',   '@CR', '579-01-01^ChineseTwin::大象暦',    '584-01-01'],
-      ['[開皇暦=]584.01.01',   '@CR', '584-01-01^ChineseTwin::開皇暦',    '597-01-01'],
-      ['[大業暦=]597.01.01',   '@CR', '597-01-01^ChineseTwin::大業暦',    '619-01-01'],
-      ['[戊寅元暦]619.01.01',  '@CR', '619-01-01^ChineseTwin::戊寅元暦',  '645-01-01'],
-      ['[平朔戊寅暦=]645.01.01','@CR','645-01-01^ChineseTwin::平朔戊寅暦','665-01-01'],
-      ['[麟徳暦]665.01.01',    '@CR', '665-01-01^ChineseTwin::麟徳暦',    '729-01-01'],
-      ['[大衍暦]729.01.01',    '@CR', '729-01-01^ChineseTwin::大衍暦',    '762-01-01'],
-      ['[五紀暦]762.01.01',    '@CR', '762-01-01^ChineseTwin::五紀暦',    '784-01-01'],
-      ['[正元暦=]784.01.01',   '@CR', '784-01-01^ChineseTwin::正元暦',    '807-01-01'],
-      ['[宣明暦]822.01.01',    '@CR', '822-01-01^ChineseTwin::宣明暦',    '893-01-01'],
-      ['[崇玄暦=]893.01.01',   '@CR', '893-01-01^ChineseTwin::崇玄暦',    '956-01-01'],
-      ['[授時暦]1281.01.01',   '@CR','1281-01-01^ChineseTwin::授時暦',   '1368-01-01'],
-      ['[大統暦]1368.01.01',   '@CR','1368-01-01^ChineseTwin::大統暦',   '1645-01-01']
+      ['[太初暦]1.01.01',      '@CR',   '1-01-01^ChineseTwin::太初暦'], # 西暦が正になるところから開始(実際は-103.01.01)
+      ['[四分暦]85.01.01',     '@CR',  '85-01-01^ChineseTwin::四分暦'],
+      ['[乾象暦]222.01.01',    '@CR', '222-01-01^ChineseTwin::乾象暦'],
+      ['[景初暦]237.01.01',    '@CR', '237-01-01^ChineseTwin::景初暦'],
+      ['[元嘉暦]445.01.01',    '@CR', '445-01-01^ChineseTwin::元嘉暦'],
+      ['[大明暦]510.01.01',    '@CR', '510-01-01^ChineseTwin::大明暦'],
+      ['[三紀暦=]384.01.01',   '@CR', '384-01-01^ChineseTwin::三紀暦'],
+      ['[玄始暦=]412.01.01',   '@CR', '412-01-01^ChineseTwin::玄始暦'],
+      ['[玄始暦=]452.01.01',   '@CR', '452-01-01^ChineseTwin::玄始暦'],
+      ['[正光暦=]523.01.01',   '@CR', '523-01-01^ChineseTwin::正光暦'],
+      ['[興和暦=]540.01.01',   '@CR', '540-01-01^ChineseTwin::興和暦'],
+      ['[天保暦=]551.01.01',   '@CR', '551-01-01^ChineseTwin::天保暦'],
+      ['[天和暦=]566.01.01',   '@CR', '566-01-01^ChineseTwin::天和暦'],
+      ['[大象暦=]579.01.01',   '@CR', '579-01-01^ChineseTwin::大象暦'],
+      ['[開皇暦=]584.01.01',   '@CR', '584-01-01^ChineseTwin::開皇暦'],
+      ['[大業暦=]597.01.01',   '@CR', '597-01-01^ChineseTwin::大業暦'],
+      ['[戊寅元暦]619.01.01',  '@CR', '619-01-01^ChineseTwin::戊寅元暦'],
+      ['[平朔戊寅暦=]645.01.01','@CR','645-01-01^ChineseTwin::平朔戊寅暦'],
+      ['[麟徳暦]665.01.01',    '@CR', '665-01-01^ChineseTwin::麟徳暦'],
+      ['[大衍暦]729.01.01',    '@CR', '729-01-01^ChineseTwin::大衍暦'],
+      ['[五紀暦]762.01.01',    '@CR', '762-01-01^ChineseTwin::五紀暦'],
+      ['[正元暦=]784.01.01',   '@CR', '784-01-01^ChineseTwin::正元暦',  '807-01-01'],
+      ['[宣明暦]822.01.01',    '@CR', '822-01-01^ChineseTwin::宣明暦'],
+      ['[崇玄暦=]893.01.01',   '@CR', '893-01-01^ChineseTwin::崇玄暦',  '956-01-01'],
+      ['[授時暦]1281.01.01',   '@CR','1281-01-01^ChineseTwin::授時暦'],
+      ['[大統暦]1368.01.01',   '@CR','1368-01-01^ChineseTwin::大統暦', '1645-01-01']
     ]]
 
     # Chinese Solar Calendar Series for Chinese Note
     ChineseSolar = [self, [
       'locale:[=ja:, en=en:]',
       'area:[中国の節月=, *ChineseSolar=]',
-      ['[太初暦]1.01.01',     '@CR',    '1-01-01^ChineseTwin::太初暦(節月)',    '85-01-06'], # 西暦が正になるところから開始(実際は-103.01.15)
-      ['[四分暦]85.01.07',    '@CR',   '85-01-07^ChineseTwin::四分暦(節月)',   '264-12-28'],
-      ['[乾象暦]221.12.23',   '@CR',  '221-12-23^ChineseTwin::乾象暦(節月)',   '280-12-31'],
-      ['[景初暦]237.01.07',   '@CR',  '237-01-07^ChineseTwin::景初暦(節月)',   '451-12-31'],
-      ['[元嘉暦]444.12.22',   '@CR',  '444-12-22^ChineseTwin::元嘉暦(節月)',   '509-12-24'],
-      ['[大明暦]509.12.23',   '@CR',  '509-12-23^ChineseTwin::大明暦(節月)',   '590-01-08'],
-      ['[三紀暦=]384.01.02',  '@CR',  '384-01-02^ChineseTwin::三紀暦(節月)',   '418-01-16'],
-      ['[玄始暦=]411.12.26',  '@CR',  '411-12-26^ChineseTwin::玄始暦(節月)',   '440-01-15'],
-      ['[玄始暦=]452.01.02',  '@CR',  '452-01-02^ChineseTwin::玄始暦(節月)',   '522-12-29'],
-      ['[正光暦=]522.12.29',  '@CR',  '522-12-29^ChineseTwin::正光暦(節月)',   '566-01-05'],
-      ['[興和暦=]539.12.22',  '@CR',  '539-12-22^ChineseTwin::興和暦(節月)',   '550-12-20'],
-      ['[天保暦=]550.12.19',  '@CR',  '550-12-19^ChineseTwin::天保暦(節月)',   '577-12-21'],
-      ['[天和暦=]566.01.05',  '@CR',  '566-01-05^ChineseTwin::天和暦(節月)',   '579-01-11'],
-      ['[大象暦=]579.01.11',  '@CR',  '579-01-11^ChineseTwin::大象暦(節月)',   '584-01-15'],
-      ['[開皇暦=]584.01.16',  '@CR',  '584-01-16^ChineseTwin::開皇暦(節月)',   '596-12-23'],
-      ['[大業暦=]596.12.22',  '@CR',  '596-12-22^ChineseTwin::大業暦(節月)',   '618-12-19'],
-      ['[戊寅元暦]618.12.19', '@CR',  '618-12-19^ChineseTwin::戊寅元暦(節月)', '664-12-21'],
-      ['[麟徳暦]664.12.21',   '@CR',  '664-12-21^ChineseTwin::麟徳暦(節月)',   '729-01-03'],
-      ['[大衍暦]729.01.03',   '@CR',  '729-01-03^ChineseTwin::大衍暦(節月)',   '761-12-29'],
-      ['[五紀暦]761.12.29',   '@CR',  '761-12-29^ChineseTwin::五紀暦(節月)',   '783-12-26'],
-      ['[正元暦=]783.12.26',  '@CR',  '783-12-26^ChineseTwin::正元暦(節月)',   '807-01-11'],
-      ['[宣明暦]821.01.01',   '@CR',  '821-01-01^ChineseTwin::宣明暦(節月)',   '892-12-22'],  # 年の始めに遡って開始(実際は12.27)
-      ['[崇玄暦=]892.12.22',  '@CR',  '892-12-22^ChineseTwin::崇玄暦(節月)',   '956-01-15'],
-      ['[授時暦]1280.01.01',  '@CR', '1280-01-01^ChineseTwin::授時暦(節月)',  '1367-12-24'],
-      ['[大統暦]1367.12.24',  '@CR', '1367-12-24^ChineseTwin::大統暦(節月)',  '1644-12-24']
+      ['[太初暦]1.01.01',     '@CR',    '1-01-01^ChineseTwin::太初暦(節月)'], # 西暦が正になるところから開始(実際は-103.01.15)
+      ['[四分暦]85.01.07',    '@CR',   '85-01-07^ChineseTwin::四分暦(節月)'],
+      ['[乾象暦]221.12.23',   '@CR',  '221-12-23^ChineseTwin::乾象暦(節月)'],
+      ['[景初暦]237.01.07',   '@CR',  '237-01-07^ChineseTwin::景初暦(節月)'],
+      ['[元嘉暦]444.12.22',   '@CR',  '444-12-22^ChineseTwin::元嘉暦(節月)'],
+      ['[大明暦]509.12.23',   '@CR',  '509-12-23^ChineseTwin::大明暦(節月)'],
+      ['[三紀暦=]384.01.02',  '@CR',  '384-01-02^ChineseTwin::三紀暦(節月)'],
+      ['[玄始暦=]411.12.26',  '@CR',  '411-12-26^ChineseTwin::玄始暦(節月)'],
+      ['[玄始暦=]452.01.02',  '@CR',  '452-01-02^ChineseTwin::玄始暦(節月)'],
+      ['[正光暦=]522.12.29',  '@CR',  '522-12-29^ChineseTwin::正光暦(節月)'],
+      ['[興和暦=]539.12.22',  '@CR',  '539-12-22^ChineseTwin::興和暦(節月)'],
+      ['[天保暦=]550.12.19',  '@CR',  '550-12-19^ChineseTwin::天保暦(節月)'],
+      ['[天和暦=]566.01.05',  '@CR',  '566-01-05^ChineseTwin::天和暦(節月)'],
+      ['[大象暦=]579.01.11',  '@CR',  '579-01-11^ChineseTwin::大象暦(節月)'],
+      ['[開皇暦=]584.01.16',  '@CR',  '584-01-16^ChineseTwin::開皇暦(節月)'],
+      ['[大業暦=]596.12.22',  '@CR',  '596-12-22^ChineseTwin::大業暦(節月)'],
+      ['[戊寅元暦]618.12.19', '@CR',  '618-12-19^ChineseTwin::戊寅元暦(節月)'],
+      ['[麟徳暦]664.12.21',   '@CR',  '664-12-21^ChineseTwin::麟徳暦(節月)'],
+      ['[大衍暦]729.01.03',   '@CR',  '729-01-03^ChineseTwin::大衍暦(節月)'],
+      ['[五紀暦]761.12.29',   '@CR',  '761-12-29^ChineseTwin::五紀暦(節月)'],
+      ['[正元暦=]783.12.26',  '@CR',  '783-12-26^ChineseTwin::正元暦(節月)',  '807-01-11'],
+      ['[宣明暦]821.01.01',   '@CR',  '821-01-01^ChineseTwin::宣明暦(節月)'],  # 年の始めに遡って開始(実際は12.27)
+      ['[崇玄暦=]892.12.22',  '@CR',  '892-12-22^ChineseTwin::崇玄暦(節月)',  '956-01-15'],
+      ['[授時暦]1280.01.01',  '@CR', '1280-01-01^ChineseTwin::授時暦(節月)'],
+      ['[大統暦]1367.12.24',  '@CR', '1367-12-24^ChineseTwin::大統暦(節月)', '1644-12-24']
     ]]
   end
 

data/lib/when_exe/region/christian.rb

@@ -105,6 +105,7 @@ module When
       def _normalize(args=[], options={})
         raise TypeError, "#{self.class} is abstract class" unless @label
         @note = When.CalendarNote(@note || 'Christian')
+        @diff_to_CE ||= 0
         super
       end
     end
@@ -364,7 +365,7 @@ module When
       # @return nil
       #
       def first_year_of_border
-        return nil unless @border.kind_of?(When::CalendarTypes::MultiBorder)
+        return nil unless @border.kind_of?(When::Coordinates::MultiBorder)
         year = @border.borders[-1][:key]
         year.kind_of?(Integer) ? year : nil
       end
@@ -503,6 +504,9 @@ module When
         (skip && digit >= limit ? digit+skip : digit)+@base[date.length-1]
       end
     end
+  end
+
+  module Coordinates
 
     #
     # 日時要素の境界 - 復活祭
@@ -783,7 +787,8 @@ module When
     # 任意の暦をグレゴリオorユリウス暦日に変換
     #
     def _to_date_for_note(date)
-      return When.Calendar(When::CalendarTypes::Christian._default_start(date)) ^ date if ::Object.const_defined?(:Date) && date.kind_of?(::Date)
+      return When.Calendar(When::CalendarTypes::Christian._default_start(date)) ^ date if ::Object.const_defined?(:Date) &&
+                                                                                          ::Date.method_defined?(:+) && date.kind_of?(::Date)
       return When::Gregorian ^ date if date.kind_of?(::Time)
       return date if date.frame.kind_of?(When::CalendarTypes::Christian)
       When.Calendar(date.frame.iri =~ /Coptic/ || date.to_i < 2299161 ? 'Julian' : 'Gregorian') ^ date

data/lib/when_exe/region/coptic.rb

@@ -79,7 +79,7 @@ module When
       'label'         => 'Coptic::Coptic',
       'origin_of_LSC' => 1825030,
       'origin_of_MSC' =>       1,
-      'epoch_in_CE'   =>     285,
+      'diff_to_CE'    =>     285,
       'indices'       => _egyptian_month_indices,
       'rule_table' => {
         'T' => {'Rule'  =>[365,365,366,365]},

data/lib/when_exe/region/discordian.rb

@@ -173,7 +173,7 @@ module When
     #
     # Discordian Calendar
     #
-    class Discordian < TableBased
+    class Discordian < YearLengthTableBased
 
       # @private
       Normal_IDS = (1..73).to_a
@@ -188,14 +188,13 @@ module When
       #
       def _normalize(args=[], options={})
         @label         ||= 'Discordian'
-        @epoch_in_CE   ||= -1166
-        @note          ||= 'DiscordianWeek'
-        @engine        ||= 'Gregorian'
-        @engine          = When.Calendar(@engine)
         @indices       ||= [
           When.Index('DiscordianWeekNotes::month::Month', {:unit =>5}),
           When.Index({:branch=>{1=>When.M17n('Discordian::IntercalaryDay')[0]}})
         ]
+        @origin_of_MSC ||= +1166
+        @diff_to_CE    ||=     0
+        @note          ||= 'DiscordianWeek'
         @rule_table ||= {
           365 => {'Length'=>        [73]*5},
           366 => {'Length'=> [74] + [73]*4}
@@ -203,22 +202,16 @@ module When
         super
       end
 
-      # first day of year
-      #
-      def _sdn_(date)
-        year = +date[0] + @epoch_in_CE
-        @engine._coordinates_to_number(year, 0, 0)
-      end
-
       #
       # day arrangement pattern
       #
       def _ids_(date)
         y, m = date
-        return super unless m
-        return Normal_IDS unless m == 0
-        year = +y + @epoch_in_CE
-        @engine._length([year,1]) == 28 ?  Normal_IDS : Long_IDS
+        case m
+        when nil ; super
+        when 0   ; @engine._length([+y, 1]) == 28 ?  Normal_IDS : Long_IDS
+        else     ; Normal_IDS
+        end
       end
     end
   end

data/lib/when_exe/region/french.rb

@@ -44,7 +44,7 @@ module When
          When::Coordinates::DefaultDayIndex
        ],
        'origin_of_MSC' => -1791,
-       'epoch_in_CE'   => +1,
+       'epoch_in_CE'   => +1792,
        'cycle_offset'  => Rational(1,2),
        'time_basis'    => '+00:09:20',
        'rule_table'    => {

data/lib/when_exe/region/hanke_henry.rb

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 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 When
+
+  class BasicTypes::M17n
+
+    HankeHenry = [self, [
+      "locale:[=en:, ja]",
+      "names:[HankeHenry=]",
+      "[HankeHenry=en:Hanke-Henry_Permanent_Calendar, ハンキ＝ヘンリー暦=ja:%%<ハンキ＝ヘンリー・パーマネント・カレンダー>]",
+
+      [self,
+        "names:[Month, 月=ja:%%<月_(暦)>]",
+        "[January,   1月, /date/month_names/1] ",
+        "[February,  2月, /date/month_names/2] ",
+        "[March,     3月, /date/month_names/3] ",
+        "[April,     4月, /date/month_names/4] ",
+        "[May,       5月, /date/month_names/5] ",
+        "[June,      6月, /date/month_names/6] ",
+        "[July,      7月, /date/month_names/7] ",
+        "[August,    8月, /date/month_names/8] ",
+        "[September, 9月, /date/month_names/9] ",
+        "[October,  10月, /date/month_names/10]",
+        "[November, 11月, /date/month_names/11]",
+        "[December, 12月, /date/month_names/12]",
+        "[Xtra=en:Hanke-Henry_Permanent_Calendar, 追加週=ja:%%<ハンキ＝ヘンリー・パーマネント・カレンダー>]" # Leap week
+      ]
+    ]]
+  end
+
+  module CalendarTypes
+
+    #
+    # Hanke-Henry Calendar
+    #
+    HankeHenry = [CyclicTableBased, {
+      'label'         => 'HankeHenry::HankeHenry',
+      'origin_of_LSC' => 1721061,
+      'indices'       => [
+        When.Index('HankeHenry::Month'),
+        When::Coordinates::DefaultDayIndex
+      ],
+      'rule_table'    => {
+        'T'  => {'Rule'  =>(2000...2400).to_a.map {|year|
+                  [When.tm_pos(year,1,1), When.tm_pos(year,12,31)].map {|date| date.to_i % 7}.include?(3) ? 371 : 364
+                }},
+        364  => {'Length'=>[30,30,31]*4},
+        371  => {'Length'=>[30,30,31]*4 +[7]}
+      }
+    }]
+  end
+end

data/lib/when_exe/region/indian.rb

@@ -562,91 +562,59 @@ module When
     #
     # Indian national solar calendar
     #
-    IndianNationalSolar =  [CyclicTableBased, {
+    IndianNationalSolar =  [TableBasedWithSunrise, {
       'label'   => 'Indian::IndianNationalSolar',
-      'origin_of_LSC' => 1721140,
       'origin_of_MSC' => -78,
-      'epoch_in_CE'   =>   0,
+      'diff_to_CE'    =>   0,
+      'engine_month'  =>   2,   # February
+      'engine_day'    => 28+22, # 22nd of next month
       'indices' => [
          When.Index('Indian::LunarMonth', {:unit =>12, :shift=>4}),
          When::Coordinates::DefaultDayIndex
        ],
-      'rule_table'      => {
-        'T'  => {'Rule'  =>['LC', 'SC', 'SC', 'SC']},
-        'SC' => {'Rule'  =>[365]*4 + [366, 365, 365, 365]*24},
-        'LC' => {'Rule'  =>[366, 365, 365, 365]*25},
+      'rule_table'    => {
         365  => {'Length'=>[30] + [31]*5 + [30]*6},
         366  => {'Length'=>       [31]*6 + [30]*6}
-      },
+      }
     }]
 
     #
     # Nanakshahi Calendar
     #
-    class Nanakshahi < TableBased
-
-      private
-
-      #
-      # Object Normalization
-      #
-      def _normalize(args=[], options={})
-        @label         ||= 'Indian::Nanakshahi'
-        @epoch_in_CE   ||= 1468
-        @engine        ||= 'Gregorian'
-        @engine          = When.Calendar(@engine)
-        @indices       ||= [
-          When.Index('Indian::NanakshahiMonth', {:unit=>12, :shift=>4}),
-          When::Coordinates::DefaultDayIndex
-        ]
-        @rule_table    ||= {
-          365 => {'Length'=> [31]*5 + [30]*7},
-          366 => {'Length'=> [31]*5 + [30]*6 + [31]}
-        }
-        super
-      end
-
-      # first day of year
-      #
-      def _sdn_(date)
-        year = +date[0] + @epoch_in_CE
-        @engine._coordinates_to_number(year, 2, 13)
-      end
-    end
+    Nanakshahi = [YearLengthTableBased, {
+      'label'   =>  'Indian::Nanakshahi',
+      'origin_of_MSC' => -1468,
+      'diff_to_CE'    =>     0,
+      'engine_month'  =>     3,
+      'engine_day'    =>    14,
+      'indices' => [
+        When.Index('Indian::NanakshahiMonth', {:unit=>12, :shift=>4}),
+        When::Coordinates::DefaultDayIndex
+      ],
+      'rule_table'    => {
+        365 => {'Length'=> [31]*5 + [30]*7},
+        366 => {'Length'=> [31]*5 + [30]*6 + [31]}
+      }
+    }]
 
     #
     # Revised Bengali Calendar
     #
-    class RevisedBengali < TableBased
-
-      private
-
-      #
-      # Object Normalization
-      #
-      def _normalize(args=[], options={})
-        @label         ||= 'Indian::RevisedBengali'
-        @epoch_in_CE   ||=  593
-        @engine        ||= 'Gregorian'
-        @engine          = When.Calendar(@engine)
-        @indices       ||= [
-          When.Index('Indian::BengaliMonth', {:unit=>12, :shift=>5}),
-          When::Coordinates::DefaultDayIndex
-        ]
-        @rule_table    ||= {
-          365 => {'Length'=> [31]*5 + [30]*7},
-          366 => {'Length'=> [31]*5 + [30]*5 + [31, 30]}
-        }
-        super
-      end
-
-      # first day of year
-      #
-      def _sdn_(date)
-        year = +date[0] + @epoch_in_CE
-        @engine._coordinates_to_number(year, 3, 13)
-      end
-    end
+    RevisedBengali = [YearLengthTableBased, {
+      'label'   =>   'Indian::RevisedBengali',
+      'origin_of_MSC' => -593,
+      'diff_to_CE'    =>    0,
+      'engine_month'  =>    4,
+      'engine_day'    =>   14,
+      'indices' => [
+        When.Index('Indian::BengaliMonth', {:unit=>12, :shift=>5}),
+        When::Coordinates::DefaultDayIndex
+      ],
+      'rule_table'    => {
+        365 => {'Length'=> [31]*5 + [30]*7},
+        366 => {'Length'=> [31]*5 + [30]*5 + [31, 30]}
+      }
+    }]
 
     #
     # Hindu Solar Calendar
@@ -679,12 +647,12 @@ module When
       def _normalize(args=[], options={})
         @label ||= 'Indian::HinduSolar'
         @type  ||= 'SBS'
-        raise ArgumentError, "Irregal formula: #{@formula}" unless @type.upcase =~ /\A(M|SS|SB)(V|S||B|H|VZ|SZ|BZ|HZ)\z/
+        raise ArgumentError, "Irregal formula: #{@formula}" unless @type.upcase =~ /\A(M|SS|SB)(V|S|B|H|VZ|SZ|BZ|HZ)\z/
 
         @location      ||=  HinduLuniSolar::Location_E[$2] || HinduLuniSolar::Location_F[$1]
         @cycle_offset  ||=  HinduLuniSolar::CycleOffset[$1]
         @origin_of_MSC ||= -HinduLuniSolar::YearEpoch[$2]
-        @epoch_in_CE   ||=  0
+        @diff_to_CE    ||=  0
         @start_month   ||=  1 # Maysha
         @start_month     = @start_month.to_i
         @cycle_offset    = @cycle_offset.to_f + (@start_month - 1)
@@ -822,13 +790,13 @@ module When
       def _normalize(args=[], options={})
         @label ||= 'Indian::HinduLuniSolar'
         @type  ||= 'SBSA'
-        raise ArgumentError, "Irregal formula: #{@formula}" unless @type.upcase =~ /\A(M|SS|SB)(V|S||B|H|VZ|SZ|BZ|HZ)(A|P|PX)\z/
+        raise ArgumentError, "Irregal formula: #{@formula}" unless @type.upcase =~ /\A(M|SS|SB)(V|S|B|H|VZ|SZ|BZ|HZ)(A|P|PX)\z/
 
         @location      ||=  Location_E[$2] || Location_F[$1]
         @cycle_offset  ||=  CycleOffset[$1]
         @origin_of_MSC ||= -YearEpoch[$2]
         @hindu_style   ||=  HinduStyle[$3]
-        @epoch_in_CE   ||=  0
+        @diff_to_CE    ||=  0
         @start_month   ||=  5 # Chaitra
         @start_month     = @start_month.to_i
         @cycle_offset    = @cycle_offset.to_f + (@start_month - 5)
@@ -1133,7 +1101,7 @@ module When
       # see {http://en.wikipedia.org/wiki/Samvatsara Samvatsara}
       #
       def samvatsara(dates)
-        year_kali = dates.l_date.most_significant_coordinate + dates.l_date.frame._diff_to_CE + 3101
+        year_kali = dates.l_date.most_significant_coordinate + dates.l_date.frame.epoch_in_CE + 3101
         year_mod  = year_kali >= jovian ? (year_kali + 12) % 60 :
                                          ((year_kali * 211 - 108).div(18000) + year_kali + 26) % 60
         When.CalendarNote('HinduNote/Notes')['year']['samvatsara'][year_mod]