when_exe 0.3.5 → 0.3.6

data/lib/when_exe/region/{chinese_epoch.rb → chinese/epochs.rb}

@@ -6,7 +6,7 @@
 =end
 
 require 'when_exe/region/chinese'
-require 'when_exe/region/chinese_calendar'
+require 'when_exe/region/chinese/calendars'
 
 module When
   class TM::CalendarEra
@@ -15,7 +15,6 @@ module When
     # 中国の年号
     #
     Chinese = [{'V'=>{'0618'=>{'A'=>'0618', 'B'=>'0618B', 'C'=>'0618C'}}}, self, [
-      "namespace:[ja=http://ja.wikipedia.org/wiki/, en=http://en.wikipedia.org/wiki/]",
       "locale:[=ja:, en=en:]",
       'area:[中国#{?V=A}=ja:%%<元号>#%.<中国>,China#{?V=A}=en:Chinese_era_name]',
       [self,
@@ -679,7 +678,7 @@ module When
       ],
       [self,
 	"period:[唐]",
-	["[武徳]1"	,	"@F"	,	'name=[高祖];618-05-20^Chinese#{A:0523}'], # 甲子 武徳２年から戊寅暦を使用
+	["[武徳]1"	,	"@F"	,	'name=[高祖];618-05-20^Chinese#{A:0523}'], # 甲子 武徳２年から戊寅元暦を使用
 	["[貞観]1"	,	"@A"	,	"name=[太宗];627-01-01"],		# 乙酉
 	["[永徽]1"	,	"@A"	,	"name=[高宗];650-01-01"],		# 辛丑
 	["[顕慶]1"	,	""	,	"	     656-01-07"],		# 壬申
@@ -1239,7 +1238,7 @@ module When
       [self,
 	"period:[中華民国=ja:%%<民国紀元>,ROC=en:Chinese_era_name#The_Republic_of_China_Era]",
 	["[民国=ja:%%<民国紀元>,ROC=en:Chinese_era_name#The_Republic_of_China_Era]1",
-				"@F",		"name=;1912-01-01^Gregorian?note=ChineseNotes"]
+				"@F",		"name=;1912-01-01^Gregorian?note=Chinese"]
       ]
     ]]
   end

data/lib/when_exe/region/{chinese_twin.rb → chinese/twins.rb}

@@ -9,69 +9,67 @@ module When
 
   class TM::CalendarEra
 
-    # Chinese Luni-Solar Calendar Series for ChineseNote
-    ChineseLuniSolarSeries = [self, [
-      'namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]',
-      'locale:[=en:, ja=ja:, alias]',
-      'area:[ChineseLuniSolarSeries=, 中国の暦月=]',
+    # Chinese Luni-Solar Calendar Series for Chinese Note
+    ChineseLuniSolar = [self, [
+      'locale:[ja=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'],
+      ['[三紀暦=]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'],
+      ['[正元暦=]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'],
+      ['[崇玄暦=]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']
     ]]
 
-    # Chinese Solar Calendar Series for ChineseNote
-    ChineseSolarSeries = [self, [
-      'namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]',
-      'locale:[=en:, ja=ja:, alias]',
-      'area:[ChineseSolarSeries=, 中国の節月=]',
-      ['[太初暦]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']
+    # Chinese Solar Calendar Series for Chinese Note
+    ChineseSolar = [self, [
+      'locale:[ja=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']
     ]]
   end
 
@@ -106,7 +104,6 @@ module When
     }
 
     ChineseTwin = [{}, When::BasicTypes::M17n, ChineseSolar.twin('ChineseTwin', [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=ja:, en=en:, alias]",
       "area:[中国,China]",
 
@@ -223,7 +220,7 @@ module When
       ],
 
       [ChineseLuniSolar,
-        'name:[戊寅暦]',
+        'name:[戊寅元暦]',
         'time_basis:+00,+#{P:00}',
         {'formula'=>['12S', '1L'].map {|f| [
           Ephemeris::ChineseTrueLunation, {

data/lib/when_exe/region/christian.rb

@@ -9,12 +9,13 @@ module When
 
   class BasicTypes::M17n
 
-    ChristianTerms = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+    Christian = [self, [
       "locale:[=en:, ja=ja:, alias]",
-      "names:[ChristianTerms=]",
-      "[Julian=en:Julian_calendar,       ユリウス暦  ]",
-      "[Gregorian=en:Gregorian_calendar, グレゴリオ暦]",
+      "names:[Christian=]",
+      "[Julian=en:Julian_calendar,                ユリウス暦    ]",
+      "[Gregorian=en:Gregorian_calendar,          グレゴリオ暦  ]",
+      "[RevisedJulian=en:Revised_Julian_calendar, 修正ユリウス暦]",
+      "[Swedish=en:Swedish_calendar,              スウェーデン暦]",
       "[Civil in the West=en:Civil_calendar, 西暦, *alias:Civil]"
     ]]
   end
@@ -22,11 +23,10 @@ module When
   class TM::CalendarEra
     # Anno Mundi Era
     Byzantine = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
       "period:[Byzantine=en:Byzantine_calendar, ビザンティン暦=ja:%%<世界創造紀元>]",
       ["[AM=en:Anno_Mundi, 世界創造紀元, alias:Anno_Mundi]6497.9.1",
-       "Calendar Epoch", "989-09-01^Julian?border=[-1,9,1]&note=RomanNote", "1453=5-29"]
+       "Calendar Epoch", "989-09-01^Julian?border=[-1,9,1]&note=Roman", "1453=5-29"]
     ]]
   end
 
@@ -37,6 +37,11 @@ module When
     #
     class Christian < When::TM::Calendar
 
+      # デフォルトの改暦日付(ユリウス通日)
+      # 
+      # @private
+      DefaultReformDate = 2299161 # 1582-10-15
+
       # @private
       # 
       # ::Date オブジェクトに対応する暦法名
@@ -52,11 +57,7 @@ module When
 
       # 年月日 -> 通日
       #
-      # @param  [Numeric] y 年
-      # @param  [Integer] m 月 (0 始まり)
-      # @param  [Integer] d 日 (0 始まり)
-      #
-      # @return [Integer] 通日
+      # @see When::CalendarTypes::TableBased#_coordinates_to_number
       #
       def _coordinates_to_number(y,m,d)
         m = (+m + 10) % 12
@@ -68,12 +69,7 @@ module When
 
       # 通日 - > 年月日
       #
-      # @param  [Integer] jdn 通日
-      #
-      # @return [Array<Integer>] ( y, m, d )
-      #   [ y 年 ]
-      #   [ m 月 (0 始まり) ]
-      #   [ d 日 (0 始まり) ]
+      # @see When::CalendarTypes::TableBased#_number_to_coordinates
       #
       def _number_to_coordinates(jdn)
         j    =   jdn.to_i + 1401
@@ -88,14 +84,7 @@ module When
 
       # 暦要素数
       #
-      # @overload _length(date)
-      #   @param [Array<Integer>] date ( 年 )
-      #   @return [Integer] 12 (=その年の月数)
-      #
-      # @overload _length(date)
-      #   @param [Array<Integer>] date ( 年, 月 )
-      #   @note 月は 0 始まりの通番
-      #   @return [Integer] その年月の日数
+      # @see When::CalendarTypes::TableBased#_length
       #
       def _length(date)
         yy, mm = date
@@ -104,17 +93,18 @@ module When
         return (((((mm + 10) % 12) % 5) % 2) == 0) ? 31 : 30
       end
 
+      # 復活祭の遅延日数
+      # 
+      # @private
+      def _easter_delay(year)
+        0
+      end
+
       private
 
       def _normalize(args=[], options={})
         raise TypeError, "#{self.class} is abstract class" unless @label
-        @note      = When.CalendarNote(@note || 'Christian')
-        @indices ||= [
-           Index.new({:unit =>12,
-                      :trunk=>m17n('[::_m:CalendarTerms::Month::*]')}),
-
-           DefaultDayIndex
-        ]
+        @note = When.CalendarNote(@note || 'Christian')
         super
       end
     end
@@ -143,69 +133,127 @@ module When
       private
 
       def _normalize(args=[], options={})
-        @label ||= When.Resource('_m:ChristianTerms::Julian')
+        @label ||= 'Christian::Julian'
         super
       end
     end
 
     #
-    # Gregorian Calendar
+    # Swedish Calendar
     #
-    class Gregorian < Christian
+    class Swedish < Julian
 
-      # 通日 - > ユリウス暦とグレゴリオ暦の差
+      # デフォルトの改暦日付(ユリウス通日)
+      # 
+      # @private
+      DefaultReformDate = 2361390 # 1753-03-01
+
+      # @private
+      #           Julian -  17000229  17120229
+      SwedishCalendarRange = 2342042...2346425
+
+      # @private
+      ExtraDate = [1712,1,29]
+
+      # @private
+      Length = {
+        [1700, nil] => 365,
+        [1700,   1] =>  28,
+        [1712, nil] => 367,
+        [1712,   1] =>  30
+      }
+
+      # Ref: http://www.ortelius.de/kalender/east_en.php
+      # @private
+      EasterDelay = {
+        1741 =>  -7,
+        1742 => -35,
+        1744 =>  -7,
+        1745 =>  -7,
+        1747 => -28,
+        1748 =>  -7,
+        1750 => -28,
+        1751 =>  -7,
+        1752 =>  -7,
+        1802 =>  +7,
+        1805 =>  +7,
+        1818 =>  +7
+      }
+
+      # 年月日 -> 通日
       #
-      # @param [Integer] jdn 通日
+      # @see When::CalendarTypes::TableBased#_coordinates_to_number
       #
-      # @return [Integer] ユリウス暦とグレゴリオ暦の差
+      def _coordinates_to_number(y,m,d)
+        jdn = super
+        return SwedishCalendarRange.last if [+y, m, d] == ExtraDate
+        SwedishCalendarRange.include?(jdn-1) ? jdn-1 : jdn
+      end
+
+      # 通日 - > 年月日
       #
-      def self.diff(jdn)
-        div, mod = (jdn - 77528).divmod(36524.25)
-        c = div - 45
-        (3*(c-3)).div(4)+1
+      # @see When::CalendarTypes::TableBased#_number_to_coordinates
+      #
+      def _number_to_coordinates(jdn)
+        return ExtraDate.dup if jdn == SwedishCalendarRange.last
+        super(SwedishCalendarRange.include?(jdn) ? jdn+1 : jdn)
       end
 
-      # 年月日 -> 通日
+      # 暦要素数
+      #
+      # @see When::CalendarTypes::TableBased#_length
       #
-      # @param  [Numeric] y 年
-      # @param  [Integer] m 月 (0 始まり)
-      # @param  [Integer] d 日 (0 始まり)
+      def _length(date)
+        y, m = date
+        Length[[+y,m]] || super
+      end
+
+      # 復活祭の遅延日数
+      # 
+      # @private
+      def _easter_delay(year)
+        EasterDelay[year] || 0
+      end
+
+      private
+
+      def _normalize(args=[], options={})
+        @label ||= 'Christian::Swedish'
+        super
+      end
+    end
+
+    #
+    # Variation of Christian Calendar
+    #
+    class ReformVariation < Christian
+
+      # 年月日 -> 通日
       #
-      # @return [Integer] 通日
+      # @see When::CalendarTypes::TableBased#_coordinates_to_number
       #
       def _coordinates_to_number(y,m,d)
-        c = ((m < 2) ? +y-1 : +y).to_i.div(100)
-        super - ((3*(c-3)).div(4)+1)
+        super - _diff_from_century(((m < 2) ? +y-1 : +y).to_i.div(100))
       end
 
       # 通日 - > 年月日
       #
-      # @param  [Integer] jdn 通日
-      #
-      # @return [Array<Integer>] [ y, m, d ]
-      #   y 年
-      #   m 月 (0 始まり)
-      #   d 日 (0 始まり)
+      # @see When::CalendarTypes::TableBased#_number_to_coordinates
       #
       def _number_to_coordinates(jdn)
-        super(jdn + Gregorian.diff(jdn))
+        super(jdn + _diff_from_century(_century_from_jdn(jdn)))
       end
 
       # 暦要素数
       #
-      # @overload _length(date)
-      #   @param [Array<Integer>] date ( 年 )
-      #   @return [Integer] 12 (=その年の月数)
-      #
-      # @overload _length(date)
-      #   @param [Array<Integer>] date ( 年, 月 )
-      #   @note 月は 0 始まりの通番
-      #   @return [Integer] その年月の日数
+      # @see When::CalendarTypes::TableBased#_length
       #
       def _length(date)
         yy, mm = date
-        return 28 if (((yy % 400) != 0) && ((yy % 100) == 0) && (mm == 1))
-        return super
+        return super unless mm == 1 # ２月でなければユリウス暦と同じ
+        cc, yy = yy.divmod(100)
+        return super unless yy == 0 # 100で割り切れない年はユリウス暦と同じ
+        29 - (_diff_from_century(cc) - _diff_from_century(cc-1))
       end
 
       # 太陰方程式
@@ -216,13 +264,78 @@ module When
       #
       def _lunar_equation(year)
         h = +year.div(100)
-        -h + h.div(4) + (8*(h+11)).div(25) - 3
+        (8*(h+11)).div(25) - (_diff_from_century(h) + 5)
+      end
+    end
+
+    #
+    # Gregorian Calendar
+    #
+    class Gregorian < ReformVariation
+
+      # 百年代 - > ユリウス暦とグレゴリオ暦の差
+      #
+      # @param [Integer] century 百年代
+      #
+      # @return [Integer] ユリウス暦とグレゴリオ暦の差
+      #
+      def _diff_from_century(century)
+        (3*(century-3)).div(4)+1
+      end
+
+      # 通日 - > 百年代
+      #
+      # @param [Integer] jdn 通日
+      #
+      # @return [Integer] 百年代
+      #
+      def _century_from_jdn(jdn)
+        (4 * jdn - 6884477).div(146097)
       end
 
       private
 
       def _normalize(args=[], options={})
-        @label ||= When.Resource('_m:ChristianTerms::Gregorian')
+        @label ||= 'Christian::Gregorian'
+        super
+      end
+    end
+
+    #
+    # Revised Julian Calendar
+    #
+    class RevisedJulian < ReformVariation
+
+      # デフォルトの改暦日付(ユリウス通日)
+      # 
+      # @private
+      DefaultReformDate = 2423707 # 1923-10-14
+
+      # 百年代 - > ユリウス暦と修正ユリウス暦の差
+      #
+      # @param [Integer] century 百年代
+      #
+      # @return [Integer] ユリウス暦と修正ユリウス暦の差
+      #
+      def _diff_from_century(century)
+        (7*(century-1)).div(9)-1
+      end
+
+      # 通日 - > 百年代
+      #
+      # @param [Integer] jdn 通日
+      #
+      # @return [Integer] 百年代
+      #
+      def _century_from_jdn(jdn)
+        (9 * jdn - 15490078).div(328718)
+      end
+
+      private
+
+      def _normalize(args=[], options={})
+        @label ||= 'Christian::RevisedJulian'
+      # @diff  ||= [-2, -1, -1, 0, 1, 2, 2, 3, 4, 5] # 1～10世紀の各世紀のユリウス暦と差の日数
         super
       end
     end
@@ -233,7 +346,7 @@ module When
     class Civil < Gregorian
 
       #
-      # グレゴリオ暦への改暦日付
+      # 改暦日付
       #
       # @return [Integer]
       #
@@ -258,34 +371,25 @@ module When
 
       # 年月日 -> 通日
       #
-      # @param  [Numeric] y 年
-      # @param  [Integer] m 月 (0 始まり)
-      # @param  [Integer] d 日 (0 始まり)
-      #
-      # @return [Integer] 通日
+      # @see When::CalendarTypes::TableBased#_coordinates_to_number
       #
       def _coordinates_to_number(y,m,d)
         skip, limit = @the_length[[y,m]]
         d += skip if skip && d >= limit
-        jdn  = super(y,m,d)
-        jdn >= @reform_jdn ? jdn :  @past._coordinates_to_number(y + @origin_of_MSC - @past.origin_of_MSC, m, d)
+        jdn  = @new._coordinates_to_number(y,m,d)
+        jdn >= @reform_jdn ? jdn :  @old._coordinates_to_number(y + @origin_of_MSC - @old.origin_of_MSC, m, d)
       end
 
       # 通日 - > 年月日
       #
-      # @param  [Integer] jdn 通日
-      #
-      # @return [Array<Integer>] ( y, m, d )
-      #   [ y 年 ]
-      #   [ m 月 (0 始まり) ]
-      #   [ d 日 (0 始まり) ]
+      # @see When::CalendarTypes::TableBased#_number_to_coordinates
       #
       def _number_to_coordinates(jdn)
         if jdn >= @reform_jdn
-          date     = super
+          date     = @new._number_to_coordinates(jdn)
         else
-          date     = @past._number_to_coordinates(jdn)
-          date[0] -= @origin_of_MSC - @past.origin_of_MSC
+          date     = @old._number_to_coordinates(jdn)
+          date[0] -= @origin_of_MSC - @old.origin_of_MSC
         end
         skip, limit = @the_length[date[0..-2]]
         date[2] -= skip if skip && date[2] >= limit
@@ -294,22 +398,15 @@ module When
 
       # 暦要素数
       #
-      # @overload _length(date)
-      #   @param [Array<Integer>] date ( 年 )
-      #   @return [Integer] 12 (=その年の月数)
-      #
-      # @overload _length(date)
-      #   @param [Array<Integer>] date ( 年, 月 )
-      #   @note 月は 0 始まりの通番
-      #   @return [Integer] その年月の日数
+      # @see When::CalendarTypes::TableBased#_length
       #
       def _length(date)
         return @the_length[date][2] if @the_length[date]
         yy, mm = date
         (yy >  @reform_date[0]) ||
         (yy == @reform_date[0] && (!mm || mm >= @reform_date[1])) ?
-          super :
-          @past._length([yy + @origin_of_MSC - @past.origin_of_MSC, mm])
+          @new._length(date) :
+          @old._length([yy + @origin_of_MSC - @old.origin_of_MSC, mm])
       end
 
       # 太陰方程式
@@ -319,27 +416,35 @@ module When
       # @note 太陽暦日の補正も、本メソッドで行う
       #
       def _lunar_equation(year)
-        year >= @the_easter ? super : 0
+        year >= @the_easter ? @new._lunar_equation(year) : @old._lunar_equation(year)
+      end
+
+      # 復活祭の遅延日数
+      # 
+      # @private
+      def _easter_delay(year)
+        @old._easter_delay(year)
       end
 
       private
 
       # オブジェクトの正規化
       #
-      #   @past        = グレゴリオ暦への改暦前の暦法
+      #   @old         = 改暦前の暦法(デフォルトはユリウス暦)
+      #   @new         = 改暦後の暦法(デフォルトはグレゴリオ暦)
       #   @reform_date = 改暦日付(月日は 1 オリジンで指定し、0 オリジンに直して保持)
       #   @reform_jdn  = 改暦日付のユリウス通日
       #   @reform      = reform_date か reform_jdn を内容で判別し、どちらかに反映する
-      #   @the_easter  = グレゴリオ暦の復活祭計算の適用を始める年
+      #   @the_easter  = 新暦法の復活祭計算の適用を始める年
       #   @the_length  = 通常と異なる日付となる年月の情報({[年,月]=>[スキップした日数, スキップし始める日, 月の日数]})
       #
       def _normalize(args=[], options={})
-        @label     ||= When.Resource('_m:ChristianTerms::Civil')
+        @label   ||= 'Christian::Civil'
 
         # 前後の暦法
-        @past        = When.Calendar(@past || 'Julian')
-        gregorian    = When.Calendar('Gregorian')
-        @indices   ||= @past.indices
+        @old       = When.Calendar(@old || 'Julian')
+        @new       = When.Calendar(@new || 'Gregorian')
+        @indices ||= @old.indices
 
         # 改暦日付 (0 オリジン)
         @reform = When::Coordinates::Pair._en_pair_date_time(@reform) if @reform.kind_of?(String)
@@ -353,27 +458,27 @@ module When
           @reform_date  = When::Coordinates::Pair._en_pair_date_time(@reform_date) if @reform_date.kind_of?(String)
           @reform_date  = @reform_date.map {|c| c.to_i}
           (1..2).each {|i| @reform_date[i] = @reform_date[i] ? @reform_date[i] - 1 : 0 }
-          @reform_jdn   = gregorian._coordinates_to_number(*@reform_date)
+          @reform_jdn   = @new._coordinates_to_number(*@reform_date)
         else
-          @reform_jdn ||= 2299161 # 1582-10-15
+          @reform_jdn ||= [@old.class::DefaultReformDate, @new.class::DefaultReformDate].max
           @reform_jdn   = @reform_jdn.to_i
-          @reform_date  = gregorian._number_to_coordinates(@reform_jdn)
+          @reform_date  = @new._number_to_coordinates(@reform_jdn)
         end
-        last_date    = @past._number_to_coordinates(@reform_jdn-1)
+        last_date   = @old._number_to_coordinates(@reform_jdn-1)
 
         # 復活祭との前後関係
-        @the_easter = @reform_jdn > When.CalendarNote('Christian').easter(@reform_date[0], gregorian) ? @reform_date[0]+1 : @reform_date[0]
+        @the_easter = @reform_jdn > When.CalendarNote('Christian').easter(@reform_date[0], @new) ? @reform_date[0]+1 : @reform_date[0]
 
         # 月の日数
-        this_month   = @reform_date[0..1]
-        greg_length  = gregorian._length(this_month)
-        @the_length  = {}
+        this_month  = @reform_date[0..1]
+        new_length  = @new._length(this_month)
+        @the_length = {}
         if @reform_date[1] == last_date[1] # 同一月内に閉じた改暦
           skipped_length = @reform_date[2] - last_date[2] - 1
-          @the_length[this_month] = [skipped_length, last_date[2]+1, greg_length-skipped_length]
+          @the_length[this_month] = [skipped_length, last_date[2]+1, new_length-skipped_length]
         else
           last_month = [(@reform_date[1] > last_date[1] ? @reform_date[0] : @reform_date[0]-1), last_date[1]]
-          @the_length[this_month] = [@reform_date[2], 0, greg_length - @reform_date[2]]
+          @the_length[this_month] = [@reform_date[2], 0, new_length - @reform_date[2]]
           @the_length[last_month] = [false, false, last_date[2]+1]
         end
 
@@ -411,7 +516,7 @@ module When
       #
       # @return [Array<Numeric>] その年の境界
       #
-      def border(date=[], frame=When.Calendar('Gregorian'))
+      def border(date=[], frame=When::Gregorian)
         frame._encode(frame._number_to_coordinates(frame.note.easter(date[0], frame)), false)
       end
 
@@ -429,8 +534,7 @@ module When
   #
   class CalendarNote::Christian < CalendarNote
 
-    NoteObjects = [When::BasicTypes::M17n, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+    Notes = [When::BasicTypes::M17n, [
       "locale:[=en:, ja=ja:, alias]",
       "names:[Christian]",
 
@@ -515,6 +619,11 @@ module When
        60 => "Corpus Christi",
     }.update(moveable_feasts) 
 
+    #
+    # 暦法によってイベントの動作を変えるか否か
+    #
+    CalendarDepend = true
+
     # 週日補正フラグ
     # @return [Integer]
     attr_reader :w
@@ -554,11 +663,11 @@ module When
     # 七曜
     #
     # @param [When::TM::TemporalPosition] date
-    # @param [When::TM::ReferenceSystem] frame 使用する暦法(ダミー)
+    # @param [When::TM::CalDate] base (not used)
     #
     # @return [When::Coordinates::Residue] 七曜
     #
-    def week(date, frame=nil)
+    def week(date, base=nil)
       When.Residue('Week')[date.to_i % 7]
     end
 
@@ -566,7 +675,7 @@ module When
     #
     # @param [Numeric] date 西暦の年数
     # @param [When::TM::TemporalPosition] date
-    # @param [When::TM::ReferenceSystem] frame 使用する暦法(デフォルトは When.Resource('_c:Gregorian'))
+    # @param [When::TM::ReferenceSystem] frame 使用する暦法(デフォルトは When::Gregorian)
     #
     # @return [Integer]           クリスマスのユリウス通日(dateが西暦の年数の場合)
     # @return [When::TM::CalDate] クリスマスのWhen::TM::CalDate(yearがWhen::TM::TemporalPositionの場合)
@@ -581,7 +690,7 @@ module When
     #
     # @param [Numeric] date 西暦の年数
     # @param [When::TM::TemporalPosition] date
-    # @param [When::TM::ReferenceSystem] frame 使用する暦法(デフォルトは When.Resource('_c:Gregorian'))
+    # @param [When::TM::ReferenceSystem] frame 使用する暦法(デフォルトは When::Gregorian)
     #
     # @return [Integer]           復活祭のユリウス通日(dateが西暦の年数の場合)
     # @return [When::TM::CalDate] 復活祭のWhen::TM::CalDate(yearがWhen::TM::TemporalPositionの場合)
@@ -598,14 +707,14 @@ module When
         end
         result  = frame._coordinates_to_number(year, 2, 0) + @d - 1 - m
         result += @g - (result-@w) % 7 if @w<7
-        result
+        result + frame._easter_delay(year)
       end
     end
 
     #   イベントの標準的な間隔を返す
     # @private
     def _delta(parameter=nil)
-      return When::DurationP1Y
+      return When::P1Y
     end
 
     # @private
@@ -617,7 +726,7 @@ module When
     # 固定祝日
     #
     # @param [When::TM::TemporalPosition] date
-    # @param [When::TM::ReferenceSystem] frame 使用する暦法(デフォルトは When.Resource('_c:Gregorian'))
+    # @param [When::TM::ReferenceSystem] frame 使用する暦法(デフォルトは When::Gregorian)
     #
     # @return [String] 祝日の名称
     # @return [nil]    祝日に該当しない
@@ -630,7 +739,7 @@ module When
     # 移動祝日
     #
     # @param [When::TM::TemporalPosition] date
-    # @param [When::TM::ReferenceSystem] frame 使用する暦法(デフォルトは When.Resource('_c:Gregorian'))
+    # @param [When::TM::ReferenceSystem] frame 使用する暦法(デフォルトは When::Gregorian)
     #
     # @return [String] 祝日の名称
     # @return [nil]    祝日に該当しない
@@ -675,7 +784,7 @@ module When
     #
     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('Gregorian') ^ date if date.kind_of?(::Time)
+      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
     end
@@ -683,7 +792,7 @@ module When
     # 当該年のイベントの日付
     #   date       : 西暦の年数 or When::TM::(Temporal)Position
     #   event      : イベント名 (String)
-    #   frame      : 暦法(デフォルトは When.Resource('_c:Gregorian'))
+    #   frame      : 暦法(デフォルトは When:Gregorian)
     #
     # @return [Integer]           イベントのユリウス通日(dateが西暦の年数の場合)
     # @return [When::TM::CalDate] イベントのWhen::TM::CalDate(yearがWhen::TM::(Temporal)Positionの場合)
@@ -706,7 +815,7 @@ module When
       else
         raise TypeError, "Irregal date type: #{date.class}"
       end
-      frame ||= When.Resource('_c:Gregorian')
+      frame ||= When::Gregorian
       result  = yield(year, frame)
       return result if date.kind_of?(Numeric)
       return frame.jul_trans(result, options)