when_exe 0.3.5 → 0.3.6

data/lib/when_exe/region/chinese.rb

@@ -9,80 +9,78 @@ module When
 
   class BasicTypes::M17n
 
-    ChineseTerms = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+    Chinese = [self, [
       "locale:[=ja:, en=en:, alias]",
-      "names:[ChineseTerms=]",
+      "names:[Chinese=]",
       "[中国太陽暦(節月)=ja:%%<二十四節気>#%.<暦月と節月>, *ChineseSolar=en:Solar_term]",
       "[中国太陰太陽暦=ja:%%<中国暦>, *ChineseLuniSolar=en:Chinese_calendar]",
       "[彝暦=ja:%%<イ族>, *Yi=en:Yi_people]",
 
       [self,
         "names:[月=ja:%%<月_(暦)>, *Month]",
-        "[正月,   1st Month= ]",
-        "[二月,   2nd Month= ]",
-        "[三月,   3rd Month= ]",
-        "[四月,   4th Month= ]",
-        "[五月,   5th Month= ]",
-        "[六月,   6th Month= ]",
-        "[七月,   7th Month= ]",
-        "[八月,   8th Month= ]",
-        "[九月,   9th Month= ]",
-        "[十月,   10th Month=]",
-        "[十一月, 11th Month=]",
-        "[十二月, 12th Month=]"
+        "[正月,   Month 1= ]",
+        "[二月,   Month 2= ]",
+        "[三月,   Month 3= ]",
+        "[四月,   Month 4= ]",
+        "[五月,   Month 5= ]",
+        "[六月,   Month 6= ]",
+        "[七月,   Month 7= ]",
+        "[八月,   Month 8= ]",
+        "[九月,   Month 9= ]",
+        "[十月,   Month 10=]",
+        "[十一月, Month 11=]",
+        "[十二月, Month 12=]"
       ],
 
       [self,
         "names:[月=ja:%%<月_(暦)>, *MonthA]",
-        "[一月,   1st Month= ]",
-        "[二月,   2nd Month= ]",
-        "[三月,   3rd Month= ]",
-        "[四月,   4th Month= ]",
-        "[五月,   5th Month= ]",
-        "[六月,   6th Month= ]",
-        "[七月,   7th Month= ]",
-        "[八月,   8th Month= ]",
-        "[九月,   9th Month= ]",
-        "[十月,   10th Month=]",
+        "[一月,   Month 1= ]",
+        "[二月,   Month 2= ]",
+        "[三月,   Month 3= ]",
+        "[四月,   Month 4= ]",
+        "[五月,   Month 5= ]",
+        "[六月,   Month 6= ]",
+        "[七月,   Month 7= ]",
+        "[八月,   Month 8= ]",
+        "[九月,   Month 9= ]",
+        "[十月,   Month 10=]",
         "[正月,   New Year Month=]",
-        "[臘月,   12th Month=]"
+        "[臘月,   Month 12=]"
       ],
 
       [self,
         "names:[月=ja:%%<月_(暦)>, *MonthB]",
-        "[建寅月, 3rd Month= ]",
-        "[建卯月, 4th Month= ]",
-        "[建辰月, 5th Month= ]",
-        "[建巳月, 6th Month= ]",
-        "[建午月, 7th Month= ]",
-        "[建未月, 8th Month= ]",
-        "[建申月, 9th Month= ]",
-        "[建酉月, 10th Month ]",
-        "[建戌月, 11th Month ]",
-        "[建亥月, 12th Month=]",
-        "[建子月, 1st Month= ]",
-        "[建丑月, 2nd Month= ]"
+        "[建寅月, Month 3= ]",
+        "[建卯月, Month 4= ]",
+        "[建辰月, Month 5= ]",
+        "[建巳月, Month 6= ]",
+        "[建午月, Month 7= ]",
+        "[建未月, Month 8= ]",
+        "[建申月, Month 9= ]",
+        "[建酉月, Month 10=]",
+        "[建戌月, Month 11=]",
+        "[建亥月, Month 12=]",
+        "[建子月, Month 1= ]",
+        "[建丑月, Month 2= ]"
       ]
     ]]
 
-    YiTerms = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+    Yi = [self, [
       "locale:[=ja:, en=en:, alias]",
-      "names:[YiTerms=]",
+      "names:[Yi=]",
 
       [self,
         "names:[月=ja:%%<月_(暦)>, *Month]",
-        "[木公月, 1st Month= ]",
-        "[木母月, 2nd Month= ]",
-        "[火公月, 3rd Month= ]",
-        "[火母月, 4th Month= ]",
-        "[土公月, 5th Month= ]",
-        "[土母月, 6th Month= ]",
-        "[銅公月, 7th Month= ]",
-        "[銅母月, 8th Month= ]",
-        "[水公月, 9th Month= ]",
-        "[水母月, 10th Month=]",
+        "[木公月, Month 1= ]",
+        "[木母月, Month 2= ]",
+        "[火公月, Month 3= ]",
+        "[火母月, Month 4= ]",
+        "[土公月, Month 5= ]",
+        "[土母月, Month 6= ]",
+        "[銅公月, Month 7= ]",
+        "[銅母月, Month 8= ]",
+        "[水公月, Month 9= ]",
+        "[水母月, Month 10=]",
         "[過年日, end of year days=]"
       ]
     ]]
@@ -92,7 +90,6 @@ module When
 
     # Yi years
     Yi = [When::BasicTypes::M17n, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=ja:, en=en:, alias]",
       "names:[Yi]",
 
@@ -110,6 +107,10 @@ module When
     ]]
   end
 
+  class CalendarNote
+    Yis = [['Yi::YearName'], ['_m:Calendar::Month'], ['Common::Week']]
+  end
+
   module Ephemeris
 
     #
@@ -139,10 +140,6 @@ module When
           # 近点月
           @anomalistic_month_length =  @anomalistic_month_length.to_r
 
-          # 通法
-          @denominator = @year_length.denominator if @year_length.kind_of?(Rational)
-          @denominator = [@denominator||0, @lunation_length.denominator].max if @lunation_length.kind_of?(Rational)
-
           # 計算式 C) のための繰り返し回数
           @repeat_count ||= @method.upcase == 'C' ? 2 : 1
           @repeat_count   = @repeat_count.to_i
@@ -184,7 +181,7 @@ module When
           end
         end
 
-        # 戊寅暦 立成 １次補間
+        # 戊寅元暦 立成 １次補間
         def _rissei_a(k)
           tv = [0,1].map {|i| _tv_s(k+i)}
           [(tv[1][1]-tv[0][1]) / (tv[1][0]-tv[0][0]), 0.0]
@@ -615,7 +612,7 @@ module When
         return super unless @cycle_number_1m
         time = @is_dynamical ? +t : t.to_f
         cn0  = time * @cycle_number_1m + @cycle_number_0m
-        root(cn0, time) {|cn| cn_to_time(cn)}
+        root(cn0, time, 0, 5) {|cn| cn_to_time(cn)}
       end
 
       # 当該日付の月の位相の変化範囲(唐代の定朔の暦法用 cn_to_time(1L) を使用する)
@@ -633,7 +630,10 @@ module When
           loop do
             t0 = cn_to_time( c   / 60.0)
             t1 = cn_to_time((c+1)/ 60.0)
-            if t0 > t
+            d  = ((t-t0) / (t1-t0)).round
+            if d.abs > 1
+              c += d
+            elsif t0 > t
               c -= 1
             elsif t1 <= t
               c += 1
@@ -650,26 +650,31 @@ module When
       # オブジェクトの正規化
       def _normalize(args=[], options={})
         super
+
+        # 通法
+        @denominator = @year_length.denominator if @year_length.kind_of?(Rational)
+        @denominator = [@denominator||0, @lunation_length.denominator].max if @lunation_length.kind_of?(Rational)
+
         if @formula == '1L'
 
           # 月の位相の計算
           @method ||= @year_span ? 'J' : 'A'
-          instance_eval("class << self; include const_get('Method#{@method.upcase}'); end")
+          extend self.class.const_get("Method#{@method.upcase}")
 
           # 立成の初期化
           _initialize_rissei
 
         elsif @year_span
           # 太陽黄経の計算(消長あり)
-          class << self; include MethodS; end
+          extend MethodS
           @year_span = @year_span.to_i
         end
 
         if self.kind_of?(JujiMethods)
           case @year_span
-          when 0,1; class << self; include JujiMethods::Y; end
-        # when 10 ; class << self; include JujiMethods::D; end
-          else    ; class << self; include JujiMethods::C; end
+          when 0,1; extend JujiMethods::Y
+        # when 10 ; extend JujiMethods::D
+          else    ; extend JujiMethods::C
           end
         end
       end
@@ -734,15 +739,15 @@ module When
       #   @formula      = 太陽黄経の計算に用いるEphemeris
       #
       def _normalize(args=[], options={})
-        @label            ||= When.Resource('_m:ChineseTerms::ChineseSolar')
+        @label            ||= 'Chinese::ChineseSolar'
         @formula          ||= ['Formula']
         @formula            = Array(@formula)
         @formula           *= 2 if @formula.length == 1
         @formula[0]        += (@formula[0] =~ /\?/ ? '&' : '?') + 'formula=12S' if @formula[0].kind_of?(String)
         @formula[1]        += (@formula[1] =~ /\?/ ? '&' : '?') + 'formula=1L'  if @formula[1].kind_of?(String)
-        @note             ||= When.CalendarNote('ChineseNotes')
+        @note             ||= When.CalendarNote('Chinese')
         @indices          ||= [
-            When::Coordinates::Index.new({:trunk=>When.Resource('_m:ChineseTerms::Month::*')}),
+            When.Index('Chinese::Month'),
             When::Coordinates::DefaultDayIndex
           ]
         super
@@ -787,7 +792,7 @@ module When
       #   @formula      = 太陽黄経および月の位相の計算に用いるEphemeris
       #
       def _normalize(args=[], options={})
-        @label            ||= When.Resource('_m:ChineseTerms::ChineseLuniSolar')
+        @label            ||= 'Chinese::ChineseLuniSolar'
         @formula          ||= ['Formula']
         @formula            = Array(@formula)
         @formula           *= 2 if @formula.length == 1
@@ -799,10 +804,9 @@ module When
         @intercalary_span ||= 12
         @intercalary_span   =  @intercalary_span.to_i
         @intercalary_month  = (@intercalary_month.to_i - @base_month) % 12 + 1 if @intercalary_month
-        @note             ||= When.CalendarNote('ChineseNotes')
+        @note             ||= When.CalendarNote('Chinese')
         @indices          ||= [
-            When::Coordinates::Index.new({:branch=>{1=>When.Resource('_m:CalendarTerms::閏')},
-                                          :trunk=>When.Resource('_m:ChineseTerms::Month::*')}),
+            When.Index('Chinese::Month', {:branch=>{1=>'_m:Calendar::閏'}}),
             When::Coordinates::DefaultDayIndex
           ]
         super
@@ -908,7 +912,7 @@ module When
       'origin_of_LSC'  =>  2397523,
       'origin_of_MSC'  =>  1852,
       'indices' => [
-         When::Coordinates::Index.new({:unit =>12, :trunk=>When.Resource('_m:ChineseTerms::Month::*')}),
+         When.Index('Chinese::Month', {:unit =>12}),
          When::Coordinates::DefaultDayIndex
        ],
       'rule_table'     => {
@@ -924,25 +928,25 @@ module When
       'origin_of_LSC'  =>  2397522,
       'origin_of_MSC'  =>  1852,
       'indices' => [
-         When::Coordinates::Index.new({:unit  =>12, :trunk=>When.Resource('_m:ChineseTerms::Month::*')}),
-         When::Coordinates::Index.new({:shift => 1})
+         When.Index('Chinese::Month', {:unit  =>12}),
+         When.Index({:shift => 1})
        ],
       'rule_table'     => {
         'T' => {'Rule'  =>[366]},
         366 => {'Length'=>[31,30]*6}
       },
-      'note' => 'DefaultNotes'
+      'note' => 'Default'
     }]
 
     #
     # 彝
     #
     Yi =  [CyclicTableBased, {
-      'label'   => When.Resource('_m:ChineseTerms::Yi'),
+      'label'   => 'Chinese::Yi',
       'origin_of_LSC'  =>  1721431,
       'origin_of_MSC'  =>  1,
       'indices' => [
-         When::Coordinates::Index.new({:unit  =>11, :trunk=>When.Resource('_m:YiTerms::Month::*')}),
+         When.Index('Yi::Month', {:unit  =>11}),
          When::Coordinates::DefaultDayIndex
        ],
       'rule_table'     => {
@@ -950,7 +954,7 @@ module When
         365 => {'Length'=>[36]*10 + [5]},
         366 => {'Length'=>[36]*10 + [6]}
       },
-      'note' => 'YiNotes'
+      'note' => 'Yis'
     }]
   end
 end

data/lib/when_exe/region/{chinese_calendar.rb → chinese/calendars.rb}

@@ -10,29 +10,28 @@ require 'when_exe/region/chinese'
 module When
   module CalendarTypes
 
-    _IndicesM1 = [
-      Coordinates::Index.new({:branch=>{1=>When.Resource('_m:CalendarTerms::閏')},
-                              :trunk=>When.Resource('_m:ChineseTerms::Month::*')}),
-      Coordinates::DefaultDayIndex
+    # @private
+    ChineseIndices = [
+      When.Index('Chinese::Month', {:branch=>{1=>'_m:Calendar::閏'}}),
+      When::Coordinates::DefaultDayIndex
     ]
 
     _IndicesM12 = [
-      Coordinates::Index.new({:branch=>{1=>When.Resource('_m:CalendarTerms::閏')},
-                              :trunk=>When.Resource('_m:ChineseTerms::Month::*'), :shift=>1}),
-      Coordinates::DefaultDayIndex
+      When.Index('Chinese::Month', {:branch=>{1=>'_m:Calendar::閏'}, :shift=>1}),
+      When::Coordinates::DefaultDayIndex
     ]
 
     _IndicesM11 = [
-      Coordinates::Index.new({:branch=>{1=>When.Resource('_m:CalendarTerms::閏')},
-                              :trunk=>When.Resource('_m:ChineseTerms::Month::*'), :shift=>2}),
-      Coordinates::DefaultDayIndex
+      When.Index('Chinese::Month', {:branch=>{1=>'_m:Calendar::閏'}, :shift=>2}),
+      When::Coordinates::DefaultDayIndex
     ]
 
-    # 秦・漢::      顓頊暦  -221 - -162 （冬至を１１月に固定） (歳首 建亥月)
+    # 秦・漢::      顓頊暦  -221 - -162 （冬至を11月に固定）   (歳首 建亥月)
     # 漢::          顓頊暦  -161 - -103 （雨水を１月に固定）   (歳首 建亥月)
     Chinese_221 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>-222, 'origin_of_LSC'=>1640021, 'border'=>'0*10-01',
-      'indices'=> _IndicesM1,
+      'before' => 'ChineseTwin::顓頊暦', 'after' => 'Chinese_103',
+      'indices'=> ChineseIndices,
       'rule_table'=> %w(
 					AbCdEfGhIjKl	ABcDeFgHiJkL	aBcDeFGhIiJkL
 	aBcDeFgHiJKl	AbCdEfGhIjKl	ABcDeFgHiIjKl	AbCdEFgHiJkL	aBcDeFgHIiJkL
@@ -69,7 +68,8 @@ module When
     # 蜀漢::         四分暦    221 -  264
     Chinese_103 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>-103, 'origin_of_LSC'=>1683490,
-      'indices'=> _IndicesM1,
+      'before' => 'Chinese_221', 'after' => 'Chinese0239',
+      'indices'=> ChineseIndices,
       'rule_table'=> %w(
 			ABcdeFgHiJkL	aBCdEfGhIjKl	AbCdEfFGhIjKl	AbCdEfGhIJkL
 
@@ -159,6 +159,7 @@ module When
     # 新::           太初暦      7 -   23 (歳首 建丑月)
     Chinese0008 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>7, 'origin_of_LSC'=>1723652, 'border'=>'0*12-01',
+      'before' => 'Chinese_103', 'after' => 'Chinese_103',
       'indices'=> _IndicesM12,
       'rule_table'=> %w(
         		aBcDeFgHiJkL	aABcDeFgHiJkL	aBcDeFGhIjKl	AbCdEfGhIiJKl
@@ -172,7 +173,8 @@ module When
     # 呉::           乾象暦    223 - 280
     Chinese0223 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>222, 'origin_of_LSC'=>1802173,
-      'indices'=> _IndicesM1,
+      'before' => 'Chinese_103', 'after' => 'Chinese0239',
+      'indices'=> ChineseIndices,
       'rule_table'=> %w(
 			AbCdEfFGhIjKl	aBcDeFgHiJKl	AbCdEfGhIjKl	ABcDdEfGhIjKl
 	AbCdEFgHiJkL	aBcDeFgHiJKlL	aBcDeFgHiJkL	aBCdEfGhIjKl	AbCdEFgHhIjKl
@@ -194,6 +196,7 @@ module When
     # 魏::           景初暦    237 - 239 (歳首 建丑月)
     Chinese0237 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>236, 'origin_of_LSC'=>1807282, 'border'=>'0*12-01',
+      'before' => 'Chinese_103', 'after' => 'Chinese0239',
       'indices'=> _IndicesM12,
       'rule_table'=> %w(AaBcDeFgHiJKl	AbCdeFgHiJkL	aBcDeFGhIjJkL	aBcDeFgHiJKl)
       }
@@ -204,7 +207,8 @@ module When
     # 北魏::         景初暦    386? - 451
     Chinese0239 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>239, 'origin_of_LSC'=>1808404,
-      'indices'=> _IndicesM1,
+      'before' => 'Chinese0237', 'after' => 'Chinese0445',
+      'indices'=> ChineseIndices,
       'rule_table'=> %w(
         						aBcDeFgHiJKl	AbCdEfGhIjKl
 	AbCDeFfGhIjKl	AbCdEFgHiJkL	aBcDeFgHiJKl	AbCcDeFgHiJkL	aBCdEfGhIjKl
@@ -263,7 +267,8 @@ module When
     # 及び後梁
     Chinese0445 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>445, 'origin_of_LSC'=>1883618,
-      'indices'=> _IndicesM1,
+      'before' => 'Chinese0239', 'after' => 'Chinese0523',
+      'indices'=> ChineseIndices,
       'rule_table'=> %w(
 									AbCdEeFgHiJkL
 	AbCdEfGhIjKl	AbCDeFgHiJkL	aBbCdEfGHiJkL	aBcDeFgHiJkL	AbCdEfGhIjJkL
@@ -297,14 +302,15 @@ module When
 	AbCdEfGHiJkL	aBcDeFgHiJKlL	aBcDeFgHiJkL	aBCdEfGhIjKl	AbCdEfGHiIjKl
 	AbCdEfGhIJkL	aBcDeFgHiJkL	aBCdEeFgHiJkL	aBcDeFGhIjKl	AbCdEfGhIJkL
 	aBbCdEfGhIjKl	ABcDeFgHiJkL	aBcDeFGhIjKkL	aBcDeFgHIjKl	AbCdEfGhIjKl
-	ABcDeFgGhIjKl	AbCdEFgHiJkL	aBcDeFgHIjKl	AbCdDEfGhIjKl	)
+	ABcDeFgGhIjKl	AbCdEFgHiJkL	aBcDeFgHIjKl	AbCcDeFgHiJkL	)
       }
     ]
 
     # 後秦::         三紀暦    384 - 417
     Chinese0384 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>384, 'origin_of_LSC'=>1861352,
-      'indices'=> _IndicesM1,
+      'before' => 'Chinese0239', 'after' => 'Chinese0239',
+      'indices'=> ChineseIndices,
       'rule_table'=> %w(
 							AbCdEfGhIjKl	AbCDeEfGhIjKl
 	AbCdEfGHiJkL	aBcDeFgHiJkL	AaBcDeFgHiJkL	aBCdEfGhIjKl	AbCdEfGHiJjKl
@@ -322,7 +328,8 @@ module When
     # 北魏::         玄始暦    452 - 522
     Chinese0412 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>412, 'origin_of_LSC'=>1871570,
-      'indices'=> _IndicesM1,
+      'before' => 'Chinese0239', 'after' => 'Chinese0523',
+      'indices'=> ChineseIndices,
       'rule_table'=> %w(
 			aBcDeFgHhIjKL	aBcDeFgHiJkL	aBcDEfGhIjKl	AbCdEeFgHIjKl
 	AbCdEfGhIjKL	aBcDeFgHiJkL	aBbCDeFgHiJkL	aBcDeFgHIjKl	AbCdEfGhIjKKl
@@ -356,7 +363,8 @@ module When
     # 北斉::         天保暦    551 - 577
     Chinese0540 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>540, 'origin_of_LSC'=>1918317,
-      'indices'=> _IndicesM1,
+      'before' => 'Chinese0523', 'after' => 'Chinese0523',
+      'indices'=> ChineseIndices,
       'rule_table'=> %w(
 									aBcDeEfGhIjKl
 	ABcDeFgHiJkL	aBcDeFGhIjKl	AaBcDeFgHIjKl	AbCdEfGhIjKl	ABcDeFgHiJjKl
@@ -378,7 +386,7 @@ module When
     # 北周・隋::     大象暦    579 -  583
     # 隋::           開皇暦    584 -  596
     # 隋・唐::       大業暦    597 -  618
-    # 唐::           戊寅暦    619 -  664
+    # 唐::           戊寅元暦  619 -  664
     # 唐・周::       麟徳暦    665 -  728 総法 1340(小余の分母)
     # 唐::           大衍暦    729 -  761 通法 3040(    〃    )
     # 唐::           五紀暦    762 -  783 通法 1340(    〃    )
@@ -390,7 +398,8 @@ module When
     # (後晋::        調元暦?   944 -  946)
     Chinese0523 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>523, 'origin_of_LSC'=>1912115,
-      'indices'=> _IndicesM1,
+      'before' => 'Chinese0412', 'after' => 'Chinese0956',
+      'indices'=> ChineseIndices,
       'rule_table'=> %w(
         				AbCdEfGhIjKL	aBbCdEfGhIjKl	AbCDeFgHiJkL
 	aBcDeFgHIjKkL	aBcDeFgHiJKl	AbCdEfGhIjKl	AbCDeFgGhIjKl	AbCdEfGHiJkL
@@ -492,10 +501,10 @@ module When
     # 唐・周::       麟徳暦    688 -  700 (歳首 建子月)
     Chinese0689 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>688, 'origin_of_LSC'=>1972387, 'border'=>'0*11-01',
+      'before' => 'Chinese0523', 'after' => 'Chinese0523',
       'indices'=> [
-           Coordinates::Index.new({:branch=>{1=>When.Resource('_m:CalendarTerms::閏')},
-                                   :trunk=>When.Resource('_m:ChineseTerms::MonthA::*')}),
-           Coordinates::DefaultDayIndex
+           When.Index('Chinese::MonthA', {:branch=>{1=>'_m:Calendar::閏'}}),
+           When::Coordinates::DefaultDayIndex
        ],
       'rule_table'=> %w(
         				AbcDeFgHIJkL	aBcdEfGhIIJkL	aBcdEfgHIjKL
@@ -508,10 +517,10 @@ module When
     # 唐::           五紀暦    762     (歳首 建子月)
     Chinese0761 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>760, 'origin_of_LSC'=>1998670, 'border'=>'0*11-01',
+      'before' => 'Chinese0523', 'after' => 'Chinese0523',
       'indices'=> [
-           Coordinates::Index.new({:branch=>{1=>When.Resource('_m:CalendarTerms::閏')},
-                                   :trunk=>When.Resource('_m:ChineseTerms::MonthB::*')}),
-           Coordinates::DefaultDayIndex
+           When.Index('Chinese::MonthB', {:branch=>{1=>'_m:Calendar::閏'}}),
+           When::Coordinates::DefaultDayIndex
        ],
       'rule_table'=> %w(AbcDdeFgHIjKL	aBcDefGhIJkL	AbCdEfgHiJkL)
       }
@@ -521,7 +530,7 @@ module When
     # 『唐・日本における進朔に関する研究』(2013-10版)を使用する場合の朔閏表(一部修正あり)
     #
     # 隋・唐::       大業暦    618
-    # 唐::           戊寅暦    619 -  664
+    # 唐::           戊寅元暦  619 -  664
     # 唐・周::       麟徳暦    665 -  728 総法 1340(小余の分母)
     # 唐::           大衍暦    729 -  761 通法 3040(    〃    )
     # 唐::           五紀暦    762 -  783 通法 1340(    〃    )
@@ -531,7 +540,8 @@ module When
     # 唐～後梁::     崇玄暦    893 -  907
     Chinese0618 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>618, 'origin_of_LSC'=>1946814,
-      'indices'=> _IndicesM1,
+      'before' => 'Chinese0523', 'after' => 'Chinese0523',
+      'indices'=> ChineseIndices,
       'rule_table'=> %w(		aBcDeFgHiJkL	ABbcDefGhIJKl	AbCdeFgHiJkL
 	ABcDefGhIjJkL	AbCDefGhIjKl	AbCDeFgHiJkL	aBcDeFGgHiJkL	aBcdEFgHIjKl
 	AbCdeFgHIJkL	aBcCdeFgHIjKL	aBcdEfgHIjKL	AbCdeFghIJkLL	AbCdeFgHiJkL
@@ -606,10 +616,10 @@ module When
     # 唐・周::       麟徳暦    688 -  700 (歳首 建子月)
     Chinese0618B = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>688, 'origin_of_LSC'=>1972387, 'border'=>'0*11-01',
+      'before' => 'Chinese0618', 'after' => 'Chinese0618',
       'indices'=> [
-           Coordinates::Index.new({:branch=>{1=>When.Resource('_m:CalendarTerms::閏')},
-                                   :trunk=>When.Resource('_m:ChineseTerms::MonthA::*')}),
-           Coordinates::DefaultDayIndex
+           When.Index('Chinese::MonthA', {:branch=>{1=>'_m:Calendar::閏'}}),
+           When::Coordinates::DefaultDayIndex
        ],
       'rule_table'=> %w(		AbcDeFgHIJkL	aBcdEfGhIIJkL	aBcdEfgHIjKL 
 	AbCdeFghIJKL	aBcDeeFghIJKL	abCdEfGhIjkL	AbCDeFgHiJkL	aBbCdEFgHiJkL
@@ -624,10 +634,10 @@ module When
     # 唐::           五紀暦    762     (歳首 建子月)
     Chinese0618C = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>760, 'origin_of_LSC'=>1998670, 'border'=>'0*11-01',
+      'before' => 'Chinese0618', 'after' => 'Chinese0618',
       'indices'=> [
-           Coordinates::Index.new({:branch=>{1=>When.Resource('_m:CalendarTerms::閏')},
-                                   :trunk=>When.Resource('_m:ChineseTerms::MonthB::*')}),
-           Coordinates::DefaultDayIndex
+           When.Index('Chinese::MonthB', {:branch=>{1=>'_m:Calendar::閏'}}),
+           When::Coordinates::DefaultDayIndex
        ],
       'rule_table'=> %w(AbcDdeFgHIjKL	aBcdeFGhIJkL	AbCdEFghiJkL)
       }
@@ -644,7 +654,8 @@ module When
     # 南明::         大統暦   1645 - 1662
     Chinese0939 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>939, 'origin_of_LSC'=>2064050,
-      'indices'=> _IndicesM1,
+      'before' => 'Chinese0523', 'after' => 'Chinese1645',
+      'indices'=> ChineseIndices,
       'rule_table'=> %w(
 							ABcDefGgHiJkL	ABcDefGhIjKl
 	ABcDEfgHiJkL	aBcCDeFgHiJkL	aBcDeFGhIjKl	AbCdeFGhIJkLl	AbcDeFgHIJkL
@@ -834,7 +845,8 @@ module When
     # 南宋::         本天暦   1277 - 1279
     Chinese0956 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>947, 'origin_of_LSC'=>2066974,
-      'indices'=> _IndicesM1,
+      'before' => 'Chinese0523', 'after' => 'Chinese0939',
+      'indices'=> ChineseIndices,
       'rule_table'=> %w(
 			AbCdeFggHIjKL	AbCdeFghIJkL	AbCDefGhiJKl	AbCDeEfGhIjKl
 
@@ -916,6 +928,7 @@ module When
     # 方臘::         紀元暦   1118 - 1120 (歳首 建子月)
     Chinese1119 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>1118, 'origin_of_LSC'=>2129431, 'border'=>'0*11-01',
+      'before' => 'Chinese0956', 'after' => 'Chinese0956',
       'indices'=> _IndicesM11,
       'rule_table'=> %w(		aBCdEfGhIiJkL	aBcDEfGhIjKl	AbCdEfGHiJkL)
       }
@@ -926,9 +939,11 @@ module When
     # 清::           時憲暦   1669 - 1725 天聡戊辰元法
     # 清::           時憲暦   1726 - 1741 康熙甲子元法
     # 清::           時憲暦   1742 - 1911 雍正癸卯元法
+    # 中華民国::     農暦     1912 - 1930 (北京時間 +07:45:34 で計算)
     Chinese1645 = [PatternTableBasedLuniSolar, {
       'origin_of_MSC'=>1645, 'origin_of_LSC'=>2321912,
-      'indices'=> _IndicesM1,
+      'before' => 'Chinese0939', 'after' => 'ChineseLuniSolar?time_basis=+08',
+      'indices'=> ChineseIndices,
       'rule_table'=> %w(
 									aBcdEffGhIJKL
 	aBcdEfgHiJKL	aBCdeFghIjKL	aBCdDeFghIjKl	ABcDEfGhiJkL	aBCdEfGHijKl
@@ -990,7 +1005,11 @@ module When
 
 	aBcdEfGhIJKl	AbCdeFgHiJKL	aBcDeeFghIJkL	ABcDefGhiJKl	ABcDEfgHiJkL
 	aBCdDeFgHiJkL	aBcDeFGhIjKl	AbcDEfGhIJkL	aBbcDeFgHIJkL	aBcdEfGhIJKl
-	AbCdeFfgHIjKL	)
+	AbCdeFfgHIjKL
+			AbCdeFghIJkL	ABcDefGhiJkL	ABcDeEfGhiJkL	AbCDeFgHiJkl
+	ABcDeFGhIjKl	AbbCdEFgHIjKl	AbcDeFgHIjKL	aBcdEfgGHiJKL	aBcdEfgHiJKL
+	AbCdeFghIjKL	AbCDeeFghIjKL	aBCdEfGhiJkL	aBCdEFgHiJkl	AbCdDEfGHiJkL
+	abCdEfGHiJKl	AbcDeFgHiJKL	aBbcDefGhIJKL	aBcdEfgHiJKL	aBCdeFfgHiJKl)
       }
     ]
   end