when_exe 0.3.5 → 0.3.6

data/lib/when_exe/region/symmetry.rb

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+=begin
+  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.
+=end
+
+module When
+
+  class BasicTypes::M17n
+
+    Symmetry = [self, [
+      "locale:[=en:, ja]",
+      "names:[Symmetry=]",
+      "[Sym454=en:Symmetry454, 対称454暦=]",
+      "[Sym010=http://individual.utoronto.ca/kalendis/classic.htm, 対称010暦=]"
+    ]]
+  end
+
+  module CalendarTypes
+
+    _pattern = (0...293).to_a.map {|year| (52 * year + 146) % 293 < 52 ? 371 : 364}
+
+    #
+    # Symmetry 454 Calendar
+    #
+    Sym454 =  [CyclicTableBased, {
+      'label'   => 'Symmetry::Sym454',
+      'origin_of_LSC'  => 1721062,
+      'rule_table'       => {
+        'T'  => {'Rule'  =>_pattern},
+        364  => {'Length'=>[28,35,28] * 4},
+        371  => {'Length'=>[28,35,28] * 3 + [28,35,35]}
+      }
+    }]
+
+    #
+    # Symmetry 010 Calendar
+    #
+    Sym010 =  [CyclicTableBased, {
+      'label'   => 'Symmetry::Sym010',
+      'origin_of_LSC'  => 1721062,
+      'rule_table'       => {
+        'T'  => {'Rule'  =>_pattern},
+        364  => {'Length'=>[30,31,30] * 4},
+        371  => {'Length'=>[30,31,30] * 3 + [30,31,37]}
+      }
+    }]
+  end
+end

data/lib/when_exe/region/thai.rb

@@ -8,23 +8,43 @@
 module When
   class BasicTypes::M17n
 
-    ThaiTerms = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+    Thai = [self, [
       "locale:[=en:, ja=ja:, alias]",
-      "names:[ThaiTerms=]",
-      "[ThaiLuniSolar=en:Thai_lunar_calendar, タイ太陰太陽暦=ja:%%<チャントラカティ>]"
+      "names:[Thai=]",
+      "[ThaiLuniSolar=en:Thai_lunar_calendar, タイ太陰太陽暦=ja:%%<チャントラカティ>]",
+
+      [self,
+        "names:[IntercalaryMonth=en:Intercalation, 閏月]",
+        "[%s Śuklapakṣa=,        %s 白分=,   _IAST_]",
+        "[%s Kṛṣṇapakṣa=,        %s 黒分=,   _IAST_]",
+        "[adhika %s Śuklapakṣa=, 閏%s 白分=, _IAST_]",
+        "[adhika %s Kṛṣṇapakṣa=, 閏%s 黒分=, _IAST_]"
+      ],
+
+      [self,
+        "names:[LunarMonth=, 太陰月=ja:%%<月_(暦)>]",
+        "[Mārgaśīra=en:Margashirsha,   マールガシールシャ=, _IAST_]",
+        "[Pauṣa=en:Pausha,             パウシャ=,           _IAST_]",
+        "[Māgha=en:Maagha,             マーガ=,             _IAST_]",
+        "[Phālguna=en:Phalguna,        パールグナ=,         _IAST_]",
+        "[Caitra=en:Chaitra,           チャイトラ=,         _IAST_]",
+        "[Vaiśākha=en:Vaisakha,        ヴァイシャーカ=,     _IAST_]",
+        "[Jyaiṣṭha=en:Jyeshta,         ジャイシュタ=,       _IAST_]",
+        "[Āṣāḍha=en:Aashaadha,         アーシャーダ=,       _IAST_]",
+        "[Śrāvaṇa=en:Shraavana,        シュラーヴァナ=,     _IAST_]",
+        "[Bhādrapada=en:Bhadrapada,    バードラパダ=,       _IAST_]",
+        "[Āśvina=en:Ashwin,            アーシュヴィナ=,     _IAST_]",
+        "[Kārttika=en:Kartika_(month), カールッティカ=,     _IAST_]"
+      ]
     ]]
   end
 
   module CalendarTypes
 
     #
-    # The Calendar of Thai people in China
+    # ソンクラーンとタイ暦の暦定数
     #
-    class ThaiC < TableBased
-
-      NormalIDs    =  '1,1<,2,2<,3,3<,4,4<,5,5<,6,6<,7,7<,8,8<,9,9<,10,10<,11,11<,12,12<'
-      LeapIDs      =  '1,1<,2,2<,3,3<,4,4<,5,5<,6,6<,7,7<,8,8<,9&,9*,9,9<,10,10<,11,11<,12,12<'
+    module Songkran
 
       # ソンクラーン - 太陽の白羊宮入り
       #
@@ -37,14 +57,56 @@ module When
         return @origin_of_LSC - 1 + e['H'][0]
       end
 
+      # y で指定した年の暦定数を返します。
+      #
+      # @param [Integer] y 年
+      #
+      # @return [Hash]
+      #
+      def _eph(y) # C
+        h  = (y+4).divmod(9)[0]                   # y
+        h  = (y-h).divmod(3)[0]                   # z
+        h  = (y+1-h).divmod(2)[0]                 # r (2 => h?)
+        h  = (36525876*y+149049-h).divmod(100000) # s
+        a  = (h[0]*11+633-((h[0]+7368).divmod(8878))[0]).divmod(692)
+        m  = (h[0]+a[0]+0).divmod(30)
+        return {'H'=>h, 'A'=>a, 'M'=>m}
+      end
+    end
+
+    #
+    # The Calendar of Thai (Prototype)
+    #
+    class ThaiP < TableBased
+
+      include Lunar
+      include Songkran
+
+      # 月番号
+      _intercalary_month = When.Resource('_m:Thai::IntercalaryMonth::*')
+      Indices = [
+        When.Index('Thai::LunarMonth', {:branch=>{0   => _intercalary_month[0],
+                                                  0.5 => _intercalary_month[1],
+                                                 -1.5 => _intercalary_month[2],
+                                                 -1   => _intercalary_month[3]}}),
+        When::Coordinates::DefaultDayIndex
+      ]
+
+      # 月の大小と閏
+      _NormalIDs =  '1,1<,2,2<,3,3<,4,4<,5,5<,6,6<,7,7<,8,8<,9,9<,10,10<,11,11<,12,12<'
+      _LeapIDs   =  '1,1<,2,2<,3,3<,4,4<,5,5<,6,6<,7,7<,8,8<,9&,9*,9,9<,10,10<,11,11<,12,12<'
+      RuleTable = {
+        354 => {'Length'=>[15,15,15,14]*6,                            'IDs' => _NormalIDs},
+        355 => {'Length'=>[15,15,15,14]*3 + [15]*4 + [15,15,15,14]*2, 'IDs' => _NormalIDs},
+        384 => {'Length'=>[15,15,15,14]*4 + [15]*2 + [15,15,15,14]*2, 'IDs' => _LeapIDs}
+      }
+
       private
 
-      # ThaiC+オブジェクトの性質定義を初期設定します。
-      #
       # オブジェクトの正規化
       # @private
       def _normalize(args=[], options={})
-        @label ||= When.Resource('_m:ThaiTerms::ThaiLuniSolar')
+        @label ||= 'Thai::ThaiLuniSolar'
 
         Rational
         @mean_month    ||=       29 + Rational(  373,    703)
@@ -54,24 +116,8 @@ module When
         @origin_of_LSC ||=  1954168
         @origin_of_MSC   =  @origin_of_MSC.to_i
         @origin_of_LSC   =  @origin_of_LSC.to_i
-
-        intercalary_month = When.Resource('_m:IndianTerms::IntercalaryMonth::*')
-        @indices ||= [
-          Coordinates::Index.new({:branch=>{0   =>  intercalary_month[0],
-                                            0.5 =>  intercalary_month[1],
-                                           -1.5 =>  intercalary_month[2],
-                                           -1   =>  intercalary_month[3]},
-                                  :trunk =>When.Resource('_m:IndianTerms::LunarMonth::*')}),
-          Coordinates::DefaultDayIndex
-        ]
-        @rule_table  ||=  {
-          354 => {'Length'=>[15,15,15,14]*6,                            'IDs' => NormalIDs},
-          355 => {'Length'=>[15,15,15,14]*3 + [15]*4 + [15,15,15,14]*2, 'IDs' => NormalIDs},
-          356 => {'Length'=>[15,15,15,14]*3 + [15]*7 + [14] + [15]*4,   'IDs' => NormalIDs},
-          383 => {'Length'=>[15,14,15,15]*6 + [15,14],                  'IDs' => LeapIDs},
-          384 => {'Length'=>[15,15,15,14]*4 + [15]*2 + [15,15,15,14]*2, 'IDs' => LeapIDs}
-        }
-
+        @indices       ||= Indices
+        @rule_table    ||= RuleTable
         super
       end
 
@@ -85,26 +131,13 @@ module When
         y  = +date[0]
         e0 = _thai(y,  0)[0]
         e1 = _thai(y+1,0)[0]
-        e0['T'] -= 1 if (e1['T']-e0['T'] == 353)
+        case e1['T']-e0['T']
+        when 353,383 ; e0['T'] -= 1
+        when 385     ; e0['T'] += 1
+        end
         return @origin_of_LSC - 1 + e0['T'] - 30*3 - 29*2
       end
 
-      # y で指定した年の暦定数を返します。
-      #
-      # @param [Integer] y 年
-      #
-      # @return [Hash]
-      #
-      def _eph(y) # C
-        h  = (y+4).divmod(9)[0]                   # y
-        h  = (y-h).divmod(3)[0]                   # z
-        h  = (y+1-h).divmod(2)[0]                 # r (2 => h?)
-        h  = (36525876*y+149049-h).divmod(100000) # s
-        a  = (h[0]*11+633-((h[0]+7368).divmod(8878))[0]).divmod(692)
-        m  = (h[0]+a[0]+0).divmod(30)
-        return {'H'=>h, 'A'=>a, 'M'=>m}
-      end
-
       #  y で指定した年の平閏、8月の大小を判定します。
       #
       # @param [Integer] y   年
@@ -137,27 +170,102 @@ module When
       end
     end
 
+    #
+    # The Calendar of Thai people in China (Calculation)
+    #
+    class ThaiC < ThaiP
+
+      # オブジェクトの正規化
+      # @private
+      def _normalize(args=[], options={})
+        super
+        @thoreshold    = (@mean_month * 13) % 1
+        @eoch_new_moon = (@origin_of_LSC - 18.90409 + 12 * @mean_month / 19)
+      end
+
+      # 年初の通日
+      #
+      # @param [Array<Numeric>] date ( 年 )
+      #
+      # @return [Integer] 年初の通日
+      #
+      def _sdn_(date)
+        year  = +date[0]
+        prev  = _meton(year-1)
+        this  = _meton(year)
+        this += 1 if this.floor - prev.floor > 360 && this % 1 > @thoreshold
+        this.floor
+      end
+
+      private
+
+      def _meton(year)
+        (((year + 9) * 235 / 19) - 111) * @mean_month + @eoch_new_moon
+      end
+    end
+
+    #
+    # The Calendar of Thai people in China (Table based)
+    #
+    class ThaiT < CyclicTableBased
+
+      include Lunar
+      include Songkran
+
+      Pattern = %w(
+        B A C A C B A C A B  C A A C B C A A C B  A C A C B A C A A C
+        B A C A C A B C A A  C B C A A C B A C A  C B A C A B C A A C
+        B C A A C B A C A C  B A C A B C A A C A  C B A C A B C A A C
+        A C B B C A A C A C  A A C B A C A B C A  C A B C A A C B C A
+        A C B A C A A C B C  A A C B A C A C B A  C A A C B A C A C B
+        A C A B C A C A B C  A A C A B C A C A B  C A A C B C A A C B
+        A C A A C B C A A C  B A C A C B A C A A  C B A C A C B A C A)
+
+      # オブジェクトの正規化
+      # @private
+      def _normalize(args=[], options={})
+        @origin_of_LSC =  2393198
+        @origin_of_MSC =     1202
+        @epoch_in_CE   =     1840
+        @indices       = ThaiP::Indices
+        pattern        = Pattern.dup
+        if @patch
+          @patch.scan(/\d+[ABC]/i) do |patch|
+            pattern[patch[0..-2].to_i-@epoch_in_CE] = patch[-1..-1].upcase
+          end
+        end
+        @rule_table    = {
+          'T' => {'Rule' => pattern},
+          'A' => {'Rule' => [354]},
+          'B' => {'Rule' => [355]},
+          'C' => {'Rule' => [384]}}.merge(ThaiP::RuleTable)
+        super
+      end
+    end
+
     #
     # The Calendar of central Thailand
     #
-    class ThaiB < ThaiC
+    class Thai < ThaiP
 
+      # 年の朔閏パターン
       YEAR_TYPE = {'A'=>354, 'B'=>355, 'C'=>384, 'D'=>384, 'E'=>384}
 
-      NormalIDs    =  '1,1<,2,2<,3,3<,4,4<,5,5<,6,6<,7,7<,8,8<,9,9<,10,10<,11,11<,12,12<'
-      LeapIDs      =  '1,1<,2,2<,3,3<,4,4<,5,5<,6,6<,7,7<,8&,8*,8,8<,9,9<,10,10<,11,11<,12,12<'
+      # 月の大小と閏
+      _NormalIDs    =  '1,1<,2,2<,3,3<,4,4<,5,5<,6,6<,7,7<,8,8<,9,9<,10,10<,11,11<,12,12<'
+      _LeapIDs      =  '1,1<,2,2<,3,3<,4,4<,5,5<,6,6<,7,7<,8&,8*,8,8<,9,9<,10,10<,11,11<,12,12<'
+      RuleTable = {
+          354 => {'Length'=>[15,14,15,15]*6,    'IDs' => _NormalIDs},
+          355 => {'Length'=>[15,14,15,15]*3 + [15]*4 + [15,14,15,15]*2, 'IDs' => _NormalIDs},
+          384 => {'Length'=>[15,14,15,15]*4 + [15]*2 + [15,14,15,15]*2, 'IDs' => _LeapIDs  }
+      }
 
       private
 
       # オブジェクトの正規化
       #
       def _normalize(args=[], options={})
-        @rule_table ||= {
-          354 => {'Length'=>[15,14,15,15]*6,    'IDs' => NormalIDs},
-          355 => {'Length'=>[15,14,15,15]*3 + [15]*4 + [15,14,15,15]*2, 'IDs' => NormalIDs},
-          384 => {'Length'=>[15,14,15,15]*4 + [15]*2 + [15,14,15,15]*2, 'IDs' => LeapIDs  }
-        }
-
+        @rule_table ||= RuleTable
         super
       end
 

data/lib/when_exe/region/tibetan.rb

@@ -8,10 +8,9 @@
 module When
   class BasicTypes::M17n
 
-    TibetanTerms = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+    Tibetan = [self, [
       "locale:[=en:, ja=ja:, alias]",
-      "names:[TibetanTerms=]",
+      "names:[Tibetan=]",
       "[Tibetan=en:Tibetan_calendar, 時輪暦=ja:%%<チベット暦>]",
 
       [self,
@@ -44,79 +43,82 @@ module When
     ]]
   end
 
-module When::Coordinates
-
-  # 六十干支
-  Tibetan = [When::BasicTypes::M17n, [
-    "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
-    "locale:[=en:, ja=ja:, alias]",
-    "names:[Tibetan]",
+  module Coordinates
+  
+    # 六十干支
+    Tibetan = [When::BasicTypes::M17n, [
+      "locale:[=en:, ja=ja:, alias]",
+      "names:[Tibetan]",
+  
+      [StemBranch,
+        "label:[Stem-Branch, *干支]", "divisor:60", "day:11", "year:4",
+        [StemBranch, "label:[Wood-Rat=,      *木男鼠=]", "remainder: 0"],
+        [StemBranch, "label:[Wood-Ox=,       *木女牛=]", "remainder: 1"],
+        [StemBranch, "label:[Fire-Tiger=,    *火男虎=]", "remainder: 2"],
+        [StemBranch, "label:[Fire-Rabbit=,   *火女兎=]", "remainder: 3"],
+        [StemBranch, "label:[Earth-Dragon=,  *土男龍=]", "remainder: 4"],
+        [StemBranch, "label:[Earth-Snake=,   *土女蛇=]", "remainder: 5"],
+        [StemBranch, "label:[Iron-Horse=,    *金男馬=]", "remainder: 6"],
+        [StemBranch, "label:[Iron-Goat=,     *金女羊=]", "remainder: 7"],
+        [StemBranch, "label:[Water-Monkey=,  *水男猴=]", "remainder: 8"],
+        [StemBranch, "label:[Water-Rooster=, *水女鷄=]", "remainder: 9"],
+        [StemBranch, "label:[Wood-Dog=,      *木男狗=]", "remainder:10"],
+        [StemBranch, "label:[Wood-Pig=,      *木女猪=]", "remainder:11"],
+        [StemBranch, "label:[Fire-Rat=,      *火男鼠=]", "remainder:12"],
+        [StemBranch, "label:[Fire-Ox=,       *火女牛=]", "remainder:13"],
+        [StemBranch, "label:[Earth-Tiger=,   *土男虎=]", "remainder:14"],
+        [StemBranch, "label:[Earth-Rabbit=,  *土女兎=]", "remainder:15"],
+        [StemBranch, "label:[Iron-Dragon=,   *金男龍=]", "remainder:16"],
+        [StemBranch, "label:[Iron-Snake=,    *金女蛇=]", "remainder:17"],
+        [StemBranch, "label:[Water-Horse=,   *水男馬=]", "remainder:18"],
+        [StemBranch, "label:[Water-Goat=,    *水女羊=]", "remainder:19"],
+        [StemBranch, "label:[Wood-Monkey=,   *木男猴=]", "remainder:20"],
+        [StemBranch, "label:[Wood-Rooster=,  *木女鷄=]", "remainder:21"],
+        [StemBranch, "label:[Fire-Dog=,      *火男狗=]", "remainder:22"],
+        [StemBranch, "label:[Fire-Pig=,      *火女猪=]", "remainder:23"],
+        [StemBranch, "label:[Earth-Rat=,     *土男鼠=]", "remainder:24"],
+        [StemBranch, "label:[Earth-Ox=,      *土女牛=]", "remainder:25"],
+        [StemBranch, "label:[Iron-Tiger=,    *金男虎=]", "remainder:26"],
+        [StemBranch, "label:[Iron-Rabbit=,   *金女兎=]", "remainder:27"],
+        [StemBranch, "label:[Water-Dragon=,  *水男龍=]", "remainder:28"],
+        [StemBranch, "label:[Water-Snake=,   *水女蛇=]", "remainder:29"],
+        [StemBranch, "label:[Wood-Horse=,    *木男馬=]", "remainder:30"],
+        [StemBranch, "label:[Wood-Goat=,     *木女羊=]", "remainder:31"],
+        [StemBranch, "label:[Fire-Monkey=,   *火男猴=]", "remainder:32"],
+        [StemBranch, "label:[Fire-Rooster=,  *火女鷄=]", "remainder:33"],
+        [StemBranch, "label:[Earth-Dog=,     *土男狗=]", "remainder:34"],
+        [StemBranch, "label:[Earth-Pig=,     *土女猪=]", "remainder:35"],
+        [StemBranch, "label:[Iron-Rat=,      *金男鼠=]", "remainder:36"],
+        [StemBranch, "label:[Iron-Ox=,       *金女牛=]", "remainder:37"],
+        [StemBranch, "label:[Water-Tiger=,   *水男虎=]", "remainder:38"],
+        [StemBranch, "label:[Water-Rabbit=,  *水女兎=]", "remainder:39"],
+        [StemBranch, "label:[Wood-Dragon=,   *木男龍=]", "remainder:40"],
+        [StemBranch, "label:[Wood-Snake=,    *木女蛇=]", "remainder:41"],
+        [StemBranch, "label:[Fire-Horse=,    *火男馬=]", "remainder:42"],
+        [StemBranch, "label:[Fire-Goat=,     *火女羊=]", "remainder:43"],
+        [StemBranch, "label:[Earth-Monkey=,  *土男猴=]", "remainder:44"],
+        [StemBranch, "label:[Earth-Rooster=, *土女鷄=]", "remainder:45"],
+        [StemBranch, "label:[Iron-Dog=,      *金男狗=]", "remainder:46"],
+        [StemBranch, "label:[Iron-Pig=,      *金女猪=]", "remainder:47"],
+        [StemBranch, "label:[Water-Rat=,     *水男鼠=]", "remainder:48"],
+        [StemBranch, "label:[Water-Ox=,      *水女牛=]", "remainder:49"],
+        [StemBranch, "label:[Wood-Tiger=,    *木男虎=]", "remainder:50"],
+        [StemBranch, "label:[Wood-Rabbit=,   *木女兎=]", "remainder:51"],
+        [StemBranch, "label:[Fire-Dragon=,   *火男龍=]", "remainder:52"],
+        [StemBranch, "label:[Fire-Snake=,    *火女蛇=]", "remainder:53"],
+        [StemBranch, "label:[Earth-Horse=,   *土男馬=]", "remainder:54"],
+        [StemBranch, "label:[Earth-Goat=,    *土女羊=]", "remainder:55"],
+        [StemBranch, "label:[Iron-Monkey=,   *金男猴=]", "remainder:56"],
+        [StemBranch, "label:[Iron-Rooster=,  *金女鷄=]", "remainder:57"],
+        [StemBranch, "label:[Water-Dog=,     *水男狗=]", "remainder:58"],
+        [StemBranch, "label:[Water-Pig=,     *水女猪=]", "remainder:59"]
+      ]
+    ]]
+  end
 
-    [StemBranch,
-      "label:[Stem-Branch, *干支]", "divisor:60", "day:11", "year:4",
-      [StemBranch, "label:[Wood-Rat=,      *木男鼠=]", "remainder: 0"],
-      [StemBranch, "label:[Wood-Ox=,       *木女牛=]", "remainder: 1"],
-      [StemBranch, "label:[Fire-Tiger=,    *火男虎=]", "remainder: 2"],
-      [StemBranch, "label:[Fire-Rabbit=,   *火女兎=]", "remainder: 3"],
-      [StemBranch, "label:[Earth-Dragon=,  *土男龍=]", "remainder: 4"],
-      [StemBranch, "label:[Earth-Snake=,   *土女蛇=]", "remainder: 5"],
-      [StemBranch, "label:[Iron-Horse=,    *金男馬=]", "remainder: 6"],
-      [StemBranch, "label:[Iron-Goat=,     *金女羊=]", "remainder: 7"],
-      [StemBranch, "label:[Water-Monkey=,  *水男猴=]", "remainder: 8"],
-      [StemBranch, "label:[Water-Rooster=, *水女鷄=]", "remainder: 9"],
-      [StemBranch, "label:[Wood-Dog=,      *木男狗=]", "remainder:10"],
-      [StemBranch, "label:[Wood-Pig=,      *木女猪=]", "remainder:11"],
-      [StemBranch, "label:[Fire-Rat=,      *火男鼠=]", "remainder:12"],
-      [StemBranch, "label:[Fire-Ox=,       *火女牛=]", "remainder:13"],
-      [StemBranch, "label:[Earth-Tiger=,   *土男虎=]", "remainder:14"],
-      [StemBranch, "label:[Earth-Rabbit=,  *土女兎=]", "remainder:15"],
-      [StemBranch, "label:[Iron-Dragon=,   *金男龍=]", "remainder:16"],
-      [StemBranch, "label:[Iron-Snake=,    *金女蛇=]", "remainder:17"],
-      [StemBranch, "label:[Water-Horse=,   *水男馬=]", "remainder:18"],
-      [StemBranch, "label:[Water-Goat=,    *水女羊=]", "remainder:19"],
-      [StemBranch, "label:[Wood-Monkey=,   *木男猴=]", "remainder:20"],
-      [StemBranch, "label:[Wood-Rooster=,  *木女鷄=]", "remainder:21"],
-      [StemBranch, "label:[Fire-Dog=,      *火男狗=]", "remainder:22"],
-      [StemBranch, "label:[Fire-Pig=,      *火女猪=]", "remainder:23"],
-      [StemBranch, "label:[Earth-Rat=,     *土男鼠=]", "remainder:24"],
-      [StemBranch, "label:[Earth-Ox=,      *土女牛=]", "remainder:25"],
-      [StemBranch, "label:[Iron-Tiger=,    *金男虎=]", "remainder:26"],
-      [StemBranch, "label:[Iron-Rabbit=,   *金女兎=]", "remainder:27"],
-      [StemBranch, "label:[Water-Dragon=,  *水男龍=]", "remainder:28"],
-      [StemBranch, "label:[Water-Snake=,   *水女蛇=]", "remainder:29"],
-      [StemBranch, "label:[Wood-Horse=,    *木男馬=]", "remainder:30"],
-      [StemBranch, "label:[Wood-Goat=,     *木女羊=]", "remainder:31"],
-      [StemBranch, "label:[Fire-Monkey=,   *火男猴=]", "remainder:32"],
-      [StemBranch, "label:[Fire-Rooster=,  *火女鷄=]", "remainder:33"],
-      [StemBranch, "label:[Earth-Dog=,     *土男狗=]", "remainder:34"],
-      [StemBranch, "label:[Earth-Pig=,     *土女猪=]", "remainder:35"],
-      [StemBranch, "label:[Iron-Rat=,      *金男鼠=]", "remainder:36"],
-      [StemBranch, "label:[Iron-Ox=,       *金女牛=]", "remainder:37"],
-      [StemBranch, "label:[Water-Tiger=,   *水男虎=]", "remainder:38"],
-      [StemBranch, "label:[Water-Rabbit=,  *水女兎=]", "remainder:39"],
-      [StemBranch, "label:[Wood-Dragon=,   *木男龍=]", "remainder:40"],
-      [StemBranch, "label:[Wood-Snake=,    *木女蛇=]", "remainder:41"],
-      [StemBranch, "label:[Fire-Horse=,    *火男馬=]", "remainder:42"],
-      [StemBranch, "label:[Fire-Goat=,     *火女羊=]", "remainder:43"],
-      [StemBranch, "label:[Earth-Monkey=,  *土男猴=]", "remainder:44"],
-      [StemBranch, "label:[Earth-Rooster=, *土女鷄=]", "remainder:45"],
-      [StemBranch, "label:[Iron-Dog=,      *金男狗=]", "remainder:46"],
-      [StemBranch, "label:[Iron-Pig=,      *金女猪=]", "remainder:47"],
-      [StemBranch, "label:[Water-Rat=,     *水男鼠=]", "remainder:48"],
-      [StemBranch, "label:[Water-Ox=,      *水女牛=]", "remainder:49"],
-      [StemBranch, "label:[Wood-Tiger=,    *木男虎=]", "remainder:50"],
-      [StemBranch, "label:[Wood-Rabbit=,   *木女兎=]", "remainder:51"],
-      [StemBranch, "label:[Fire-Dragon=,   *火男龍=]", "remainder:52"],
-      [StemBranch, "label:[Fire-Snake=,    *火女蛇=]", "remainder:53"],
-      [StemBranch, "label:[Earth-Horse=,   *土男馬=]", "remainder:54"],
-      [StemBranch, "label:[Earth-Goat=,    *土女羊=]", "remainder:55"],
-      [StemBranch, "label:[Iron-Monkey=,   *金男猴=]", "remainder:56"],
-      [StemBranch, "label:[Iron-Rooster=,  *金女鷄=]", "remainder:57"],
-      [StemBranch, "label:[Water-Dog=,     *水男狗=]", "remainder:58"],
-      [StemBranch, "label:[Water-Pig=,     *水女猪=]", "remainder:59"]
-    ]
-  ]]
-end
+  class CalendarNote
+    Tibetan = [['Tibetan::干支'], ['_m:Calendar::Month'], ['Common::Week']]
+  end
 
   module CalendarTypes
 
@@ -155,21 +157,19 @@ end
       #    @parameter = 太陽と月の位相計算用のテーブル
       #
       def _normalize(args=[], options={})
-        intercalary_month = When.Resource('_m:TibetanTerms::IntercalaryMonth::*')
-        intercalary_day   = When.Resource('_m:TibetanTerms::IntercalaryDay::*')
+        intercalary_month = When.Resource('_m:Tibetan::IntercalaryMonth::*')
+        intercalary_day   = When.Resource('_m:Tibetan::IntercalaryDay::*')
         @indices ||= @index_of_MSC && @index_of_MSC.to_i == 1 ? 
           [
-            Coordinates::Index.new({:unit=>60}),
-            Coordinates::Index.new({:branch=>{0=>intercalary_month[0], 1=>intercalary_month[1]},
-                                    :trunk=>When.Resource('_m:TibetanTerms::Month::*'), :shift=>2}),
-            Coordinates::Index.new({:branch=>{-2=>intercalary_day[0], -1=>intercalary_day[1]}})
+            When.Index({:unit=>60}),
+            When.Index('Tibetan::Month', {:branch=>{0=>intercalary_month[0], 1=>intercalary_month[1]}, :shift=>2}),
+            When.Index({:branch=>{-2=>intercalary_day[0], -1=>intercalary_day[1]}})
           ] :
           [
-            Coordinates::Index.new({:branch=>{0=>intercalary_month[0], 1=>intercalary_month[1]},
-                                    :trunk=>When.Resource('_m:TibetanTerms::Month::*'), :shift=>2}),
-            Coordinates::Index.new({:branch=>{-2=>intercalary_day[0], -1=>intercalary_day[1]}})
+            When.Index('Tibetan::Month', {:branch=>{0=>intercalary_month[0], 1=>intercalary_month[1]}, :shift=>2}),
+            When.Index({:branch=>{-2=>intercalary_day[0], -1=>intercalary_day[1]}})
           ]
-        @label       ||= When.Resource('_m:TibetanTerms::Tibetan')
+        @label       ||= 'Tibetan::Tibetan'
         @epoch_in_CE ||= 0
         @type        ||= 1
         @parameter = case @type.to_i
@@ -194,7 +194,7 @@ end
              'A0'=>(22.0+28.0/126)
             }
           end
-        @note = 'TibetanNotes'
+        @note = 'Tibetan'
         super
       end