when_exe 0.3.5 → 0.3.6

data/lib/when_exe/region/m17n.rb

@@ -21,10 +21,11 @@ module When
       def self.month_name(name)
         return name if name.kind_of?(self)
 
-        months = When.Resource('_m:CalendarTerms::Month').child
-        abbrs  = When.Resource('_m:CalendarTerms::Abbr_Month').child
+        months = When.Resource('_m:Calendar::Month').child
+        abbrs  = When.Resource('_m:Calendar::Abbr_Month').child
         return name > 0 ? months[name-1] : abbrs[-name-1] if name.kind_of?(Numeric)
 
+        name   = When::EncodingConversion.to_internal_encoding(name)
         match  = name[/^...|^..$/]
         if match
           (months+abbrs).each do |month|
@@ -39,14 +40,12 @@ module When
         return nil
       end
 
-      Namespace = "[ja=http://ja.wikipedia.org/wiki/, en=http://en.wikipedia.org/wiki/]"
-      Locale    = "[=ja:, en=en:]"
-
-      # Terms
-      CalendarTerms = [M17n, [
-        "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+      #
+      # 共通的な暦用語
+      # 
+      Calendar = [M17n, [
         "locale:[=en:, ja=ja:, alias]",
-        "names:[CalendarTerms=]",
+        "names:[Calendar=]",
 
         "[Intercalary %s=, *閏]",
 
@@ -85,7 +84,6 @@ module When
 
       # Events
       EpochEvents = [M17n, [
-        "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
         "locale:[=en:, ja=ja:, alias]",
         "names:[EpochEvents=]",
         "[Accession=,        代始]",

data/lib/when_exe/region/martian.rb

@@ -9,10 +9,9 @@ module When
 
   class BasicTypes::M17n
 
-    MartianTerms = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+    Martian = [self, [
       "locale:[=en:, ja=ja:, alias]",
-      "names:[MartianTerms=]",
+      "names:[Martian=]",
       "[Darian=en:Darian_calendar, ダリアン暦]",
 
       [self,
@@ -118,8 +117,7 @@ module When
     #
     class DarianWeek < WorldWeek
 
-      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:[Darian]",
 
@@ -141,13 +139,13 @@ module When
           "names:[day]",
           [When::BasicTypes::M17n,
             "names:[Week]",
-            "[Solis,    日曜日]",
-            "[Lunae,    月曜日]",
-            "[Martis,   火曜日]",
-            "[Mercurii, 水曜日]",
-            "[Jovis,    木曜日]",
-            "[Veneris,  金曜日]",
-            "[Saturni,  土曜日]"
+            [DayOfWeek, "label:[Solis=,    日曜日]", {'delta'=>7}],
+            [DayOfWeek, "label:[Lunae=,    月曜日]", {'delta'=>7}],
+            [DayOfWeek, "label:[Martis=,   火曜日]", {'delta'=>7}],
+            [DayOfWeek, "label:[Mercurii=, 水曜日]", {'delta'=>7}],
+            [DayOfWeek, "label:[Jovis=,    木曜日]", {'delta'=>7}],
+            [DayOfWeek, "label:[Veneris=,  金曜日]", {'delta'=>7}],
+            [DayOfWeek, "label:[Saturni=,  土曜日]", {'delta'=>7}]
           ]
         ]
       ]]
@@ -169,10 +167,40 @@ module When
         date.events = ['from_solis']
         date
       end
-      alias :week :solis
 
+      #
+      # この日は何曜？
+      #
+      # @param [When::TM::TemporalPosition] date
+      # @param [When::TM::CalDate] base (not used)
+      #
+      # @return [Array<When::CalendarNote::Week::DayOfWeek, Array<Integer,Integer>>]
+      #
+      def week(date, base=nil)
+        date  = _to_date_for_note(date)
+        index = (date.cal_date.last - 1) % 7
+        [@days_of_week[index], [index, 7]]
+      end
+
+      #
+      # 曜日の名前の一覧
+      #
+      # @param [When::TM::TemporalPosition] date (ダミー)
+      #
+      # @return [Array<When::CalendarNote::Week::DayOfWeek>]
+      #
+      def week_labels(date)
+        @days_of_week.child
+      end
+
+      #
+      # 暦日を当該暦注計算用クラスに変換
+      #
       # @private
-      alias :solis_delta :_delta
+      def _to_date_for_note(date)
+        date = When::Darian ^ date unless date.frame.label.to_s == 'Darian'
+        date
+      end
 
       private
 
@@ -205,11 +233,11 @@ module When
     # Darian Calendar
     #
     Darian =  [CyclicTableBased, {
-      'label' => When.Resource('_m:MartianTerms::Darian'),
+      'label'         => 'Martian::Darian',
       'time_basis'    => 'MTC',
       'origin_of_LSC' =>  -94798,
       'indices' => [
-         When::Coordinates::Index.new({:unit =>24, :trunk=>When.Resource('_m:MartianTerms::DarianMonth::*')}),
+         When.Index('Martian::DarianMonth', {:unit =>24}),
          When::Coordinates::DefaultDayIndex
        ],
       'rule_table' => {

data/lib/when_exe/region/mayan.rb

@@ -19,12 +19,11 @@ module When
                              'LoN'     => ((  3 + epoch) %   9).to_s
                            } : nil
                          }}, BasicTypes::M17n, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
       "names:[Mayan]",
 
       [Residue,
-        "label:[Haab', ハアブ, Haab]", "divisor:365", 'day:#{Haab:300}', "format:[%2$d%1$s/365]",
+        "label:[Haab', ハアブ, Haab]", "divisor:365", 'day:#{Haab:300}', "format:[%2$d%1$s/365=]",
         "namespace:[glyph=http://en.wikipedia.org/wiki/File:Maya-]",
         [Residue, "label:[Pop     =glyph:Pop.jpg,            ポプ,       Pop   ]", "remainder:  0"],
         [Residue, "label:[Wo'     =glyph:Dresden-wo.jpg,     ウオ,       Wo    ]", "remainder: 20"],
@@ -48,12 +47,12 @@ module When
       ],
 
       [Residue,
-        "label:[Trecena, トレセナ=, Trecena]", "divisor:13", 'day:#{Trecena:8}', "format:[%1$s(%3$d/13)]"
+        "label:[Trecena, トレセナ=, Trecena]", "divisor:13", 'day:#{Trecena:8}', "format:[%1$s(%3$d/13)=]"
       ],
 
       [Residue,
         "namespace:[glyph=http://en.wikipedia.org/wiki/File:MAYA-g-log-cal-]",
-        "label:[Tzolk'in, ツォルキン, Tzolkin]", "divisor:20", 'day:#{Tzolkin:4}', "format:[%s(%d/20)]",
+        "label:[Tzolk'in, ツォルキン, Tzolkin]", "divisor:20", 'day:#{Tzolkin:4}', "format:[%s(%d/20)=]",
         [Residue, "label:[Imix'   =glyph:D01-Imix.png,     イミシュ,   Imix    =glyph:D01-Imix-cdxW.png    ]", "remainder: 0"],
         [Residue, "label:[Ik'     =glyph:D02-Ik.png,       イック,     Ik      =glyph:D02-Ik-cdxW.png      ]", "remainder: 1"],
         [Residue, "label:[Ak'b'al =glyph:D03-Akbal.png,    アクバル,   Akbal   =glyph:D03-Akbal-cdxW.png   ]", "remainder: 2"],
@@ -78,7 +77,7 @@ module When
 
       [Residue,
         "namespace:[glyph=http://www.pauahtun.org/G/G]",
-        "label:[Lords_of_the_Night, 夜の九王]", "divisor:9", 'day:#{LoN:3}', "format:[%s(%d/9)]",
+        "label:[Lords_of_the_Night, 夜の九王]", "divisor:9", 'day:#{LoN:3}', "format:[%s(%d/9)=]",
         [Residue, "label:[G9=glyph:9_m.png]", "remainder: 0"],
         [Residue, "label:[G1=glyph:1_m.png]", "remainder: 1"],
         [Residue, "label:[G2=glyph:2_m.png]", "remainder: 2"],
@@ -92,13 +91,17 @@ module When
     ]]
   end
 
+  class CalendarNote
+    Mayan = [{},['Mayan#{?Epoch=Epoch}::Trecena', 'Mayan#{?Epoch=Epoch}::Tzolk\'in',
+                      'Mayan#{?Epoch=Epoch}::Lords_of_the_Night', 'Mayan#{?Epoch=Epoch}::Haab\'']]
+  end
+
   class TM::CalendarEra
 
     #
     # Mayan Long Count
     #
     LongCount = [{}, self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
       'area:[LongCount#{?Epoch=Epoch}=en:Mesoamerican_Long_Count_calendar, マヤ長期暦=ja:%%<長期暦>]',
      ["[PHLC=, 先史時代=, PreHistoricLongCount=]0.0.0.0.0", "[Pre Historic=]",	'-13.0.0.0.0^LongCount#{?Epoch=Epoch}'],
@@ -109,8 +112,8 @@ module When
 
   module CalendarTypes
 
-    _c20 = Coordinates::Index.new({:base=>0, :unit=>20})
-    _c18 = Coordinates::Index.new({:base=>0, :unit=>18})
+    _c20 = When.Index({:base=>0, :unit=>20})
+    _c18 = When.Index({:base=>0, :unit=>18})
 
     #
     # Mayan Long Count
@@ -124,9 +127,8 @@ module When
         'T' => {'Rule'  =>[360]},
         360 => {'Length'=>[20] * 18}
       },
-      'index_of_MSC' => 2,
       'indices'=> [_c20, _c20, _c18, _c20],
-      'note'   => 'MayanNotes#{?Epoch=Epoch}'
+      'note'   => 'Mayan#{?Epoch=Epoch}'
     }]
   end
 end

data/lib/when_exe/region/pope.rb

@@ -19,7 +19,6 @@ module When
 
 # ローマ教皇
     Pope = [self, [
-      "namespace:[ja=http://ja.wikipedia.org/wiki/, en=http://en.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
       "area:[Pope,ローマ教皇]",
 	["StPetros1",			"@A", "0042^Julian"], # <- (Gk.) Petrus <- (L.)

data/lib/when_exe/region/residue.rb

@@ -20,11 +20,10 @@ module When::Coordinates
   class Kyusei     < Residue; end
 
   # Common Residue
-  CommonResidue = [{'V'=>{'0618'=>{'A'=>'awakening_of_insects=,*啓蟄',
+  Common = [{'V'=>{'0618'=>{'A'=>'awakening_of_insects=,*啓蟄',
                                    'B'=>'rain_water=,*雨水'}}}, When::BasicTypes::M17n, [
-    "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
     "locale:[=en:, ja=ja:, tenreki, tibetan, yi, alias]",
-    "names:[CommonResidue]",
+    "names:[Common]",
 
     [Residue,
       "label:[Week, 週]", "divisor:7", "day:0",
@@ -50,7 +49,7 @@ module When::Coordinates
 
     [Residue,
       "locale:[=en:, ja=ja:, alias]",
-      "label:[StarMansion, *宿]", "divisor:28", "day:17",   "format:[%s(%02d)]",
+      "label:[StarMansion, *宿]", "divisor:28", "day:17",   "format:[%s(%02d)=]",
       [Residue, "label:[Horn=,            *角宿,  Jiăo= ]", "remainder:0"],  #  1 α Vir 
       [Residue, "label:[Neck=,            *亢宿,  Kàng= ]", "remainder:1"],  #  2 κ Vir 
       [Residue, "label:[Root=,            *氐宿,  Dĭ=   ]", "remainder:2"],  #  3 α Lib 
@@ -112,7 +111,7 @@ module When::Coordinates
     ],
 
     [StemBranch,
-      "label:[Stem-Branch, *干支]", "divisor:60", "day:11", "year:4", "format:[%s(%02d)]",
+      "label:[Stem-Branch, *干支]", "divisor:60", "day:11", "year:4", "format:[%s(%02d)=]",
       [StemBranch, "label:[kinoe-ne=,           *甲子, 甲子, 木男鼠, 木公鼠]", "remainder: 0"],
       [StemBranch, "label:[kinoto-ushi=,        *乙丑, 乙好, 木女牛, 木母牛]", "remainder: 1"],
       [StemBranch, "label:[hinoe-tora=,         *丙寅, 丙寅, 火男虎, 火公虎]", "remainder: 2"],

data/lib/when_exe/region/roman.rb

@@ -9,10 +9,9 @@ module When
 
   class BasicTypes::M17n
 
-    RomanTerms = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+    Roman = [self, [
       "locale:[=en:, ja=ja:, alias]",
-      "names:[RomanTerms=]",
+      "names:[Roman=]",
 
       [self, # ..CE-44 / ..BCE45
         "names:[MonthA, 月=ja:%%<月_(暦)>]",
@@ -95,7 +94,6 @@ module When
 
     # From http://en.wikipedia.org/wiki/Julian_calendar#Sacrobosco.27s_theory_on_month_lengths
     Julian = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
       "period:[Roman=en:Roman_calendar, ローマ暦]",
       ["[AUC=en:Ab_urbe_condita, 建国紀元=ja:%%<ローマ建国紀元>, alias:Ab_urbe_condita]709.1.1",
@@ -106,7 +104,6 @@ module When
 
     # From http://www.tyndalehouse.com/Egypt/ptolemies/chron/roman/chron_rom_intro_fr.htm
     Roman = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
       "period:[Roman=en:Roman_calendar, ローマ暦]",
       ["[AUC=en:Ab_urbe_condita, 建国紀元=ja:%%<ローマ建国紀元>, alias:Ab_urbe_condita]492.5.1",
@@ -124,9 +121,9 @@ module When
   module CalendarTypes
 
     # From http://en.wikipedia.org/wiki/Julian_calendar#Sacrobosco.27s_theory_on_month_lengths
-    _Index0     = Coordinates::DefaultDayIndex
-    _IndicesB12 = [Coordinates::Index.new({:unit=>12, :trunk=>When.Resource('_m:RomanTerms::MonthB::*')}), _Index0]
-    _Indices12  = [Coordinates::Index.new({:unit=>12, :trunk=>When.Resource('_m:RomanTerms::Month::*')}),  _Index0]
+    _Index0     = When::Coordinates::DefaultDayIndex
+    _IndicesB12 = [When.Index('Roman::MonthB', {:unit=>12}), _Index0]
+    _Indices12  = [When.Index('Roman::Month',  {:unit=>12}), _Index0]
 
     #
     # Julian Calendar A : BCE45-BCE8
@@ -140,7 +137,7 @@ module When
         365 => {'Length'=>[31,29] + [31,30]*5},
         366 => {'Length'=>[31,30] + [31,30]*5}
       },
-      'note' => 'RomanNote'
+      'note' => 'Roman'
     }]
 
     #
@@ -154,7 +151,7 @@ module When
         'T' => {'Rule'  =>[365]},
         365 => {'Length'=>[31,28] + [31,30,31,30,31]*2}
       },
-      'note' => 'RomanNote'
+      'note' => 'Roman'
     }]
 
     #
@@ -162,10 +159,10 @@ module When
     #
     JulianC =  [Julian, {
       'indices' => _Indices12,
-      'note' => 'RomanNote'
+      'note' => 'Roman'
     }]
 
-    # From http://www.tyndalehouse.com/Egypt/ptolemies/chron/roman/chron_rom_intro_fr.htm
+    # From Chris Bennett, http://www.tyndalehouse.com/Egypt/ptolemies/chron/roman/chron_rom_intro_fr.htm
     #
     # Roman Calendar BCE262-(CE60)-CE480
     #
@@ -173,14 +170,14 @@ module When
     _ID_L = '1,2,2=,3,4,5,6,7,8,9,10,11,12'
     _ID_J = '1,2,2=,3,4,5,6,7,8,9,10,11,11<,11>,12'
     _Branch = {
-        1=>When.Resource('_m:RomanTerms::IntercalaryMonth::*')[0],
-      0.5=>When.Resource('_m:RomanTerms::IntercalaryMonth::*')[1],
-      1.5=>When.Resource('_m:RomanTerms::IntercalaryMonth::*')[2]
+        1=>When.Resource('_m:Roman::IntercalaryMonth::*')[0],
+      0.5=>When.Resource('_m:Roman::IntercalaryMonth::*')[1],
+      1.5=>When.Resource('_m:Roman::IntercalaryMonth::*')[2]
     }
-    _IndicesA = [Coordinates::Index.new({:branch=>_Branch, :trunk=>When.Resource('_m:RomanTerms::MonthA::*')}), _Index0]
-    _IndicesB = [Coordinates::Index.new({:branch=>_Branch, :trunk=>When.Resource('_m:RomanTerms::MonthB::*')}), _Index0]
-    _Indices  = [Coordinates::Index.new({:branch=>_Branch, :trunk=>When.Resource('_m:RomanTerms::Month::*')}),  _Index0]
-    _IndicesC = [Coordinates::Index.new({:branch=>_Branch, :trunk=>When.Resource('_m:RomanTerms::MonthC::*')}), _Index0]
+    _IndicesA = [When.Index('Roman::MonthA', {:branch=>_Branch}), _Index0]
+    _IndicesB = [When.Index('Roman::MonthB', {:branch=>_Branch}), _Index0]
+    _Indices  = [When.Index('Roman::Month',  {:branch=>_Branch}), _Index0]
+    _IndicesC = [When.Index('Roman::MonthC', {:branch=>_Branch}), _Index0]
     Options = {
       'origin_of_LSC'  =>  1625698,
       'origin_of_MSC'  =>  -261,
@@ -201,7 +198,7 @@ module When
         'N' => {'Length'=>[31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]},
         'L' => {'Length'=>[31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]},
       },
-      'note' => 'RomanNote'
+      'note' => 'Roman'
     }
     RomanA =  [CyclicTableBased, Options.merge({'indices' => _IndicesA})]
     RomanB =  [CyclicTableBased, Options.merge({'indices' => _IndicesB})]
@@ -212,10 +209,9 @@ module When
   #
   # 古代ローマの暦注
   #
-  class CalendarNote::RomanNote < CalendarNote
+  class CalendarNote::Roman < 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:[Roman]",
 
@@ -232,7 +228,7 @@ module When
         ],
 
         [When::Coordinates::Residue,
-          "label:[Indiction, インディクション]", "divisor:15", "year:-2",
+          "label:[Indiction, インディクション]", "divisor:15", "year:-2", "format:[%s=]",
           [When::Coordinates::Residue, "label:[I=   ]", "remainder:  0"],
           [When::Coordinates::Residue, "label:[II=  ]", "remainder:  1"],
           [When::Coordinates::Residue, "label:[III= ]", "remainder:  2"],

data/lib/when_exe/region/ryukyu.rb

@@ -5,8 +5,8 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-require 'when_exe/region/japanese'
-require 'when_exe/region/chinese_calendar'
+require 'when_exe/region/japanese/calendars'
+require 'when_exe/region/chinese/calendars'
 
 #
 #  琉球王位一覧表
@@ -23,7 +23,6 @@ module When
     # 琉球王朝
     #
     Ryukyu = [self, [
-      "namespace:[ja=http://ja.wikipedia.org/wiki/, en=http://en.wikipedia.org/wiki/]",
       "locale:[=ja:, en=en:, alias]",
       "area:[琉球,Ryukyu]",
       [self,
@@ -77,7 +76,7 @@ module When
 	["[尚元王]0",	"@A",	"name=[尚元王];1555-06-25"],            # 弘治  2～元亀  3(1572)  4  1 45歳
 	["[尚永王]0",	"@A",	"name=[尚永王];1572-04-01"],            # 天正 元～天正 16(1588) 11 25 30歳
 	["[尚寧王]0",	"@A",	"name=[尚寧王];1588-11-25",             # 天正 17～元和  6(1620)  9 19 57歳
-					      "1609-04-05^Japanese?note=ChineseNotes", ""],	# 慶長 14(1609)  4  5 尚寧、島津と和議
+					      "1609-04-05^Japanese?note=Chinese", ""],	# 慶長 14(1609)  4  5 尚寧、島津と和議
 	["[尚豊王]0",	"@A",	"name=[尚豊王];1620-09-19"],            # 元和  7～寛永 17(1640)  5  4 51歳
 	["[尚賢王]0",	"@A",	"name=[尚賢王];1640-05-04"],            # 寛永 18～正保  4(1647)  9 22 23歳
 	["[尚質王]0",	"@A",	"name=[尚質王];1647-09-22"],            # 慶安 元～寛文  8(1668) 11 17 40歳

data/lib/when_exe/region/shire.rb

@@ -8,30 +8,33 @@
 module When
   class BasicTypes::M17n
 
-    ShireTerms = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, " +
-                 "ja=http://ja.wikipedia.org/wiki/, " +
-                 "cal=http://en.wikipedia.org/wiki/Middle-earth_calendar]",
+    Shire = [self, [
+      "namespace:[cal=http://en.wikipedia.org/wiki/Middle-earth_calendar#]",
       "locale:[=en:, ja=ja:, alias]",
-      "names:[ShireTerms=]",
+      "names:[Shire=]",
       "[Shire=en:The_Lord_of_the_Rings, ホビット庄暦=ja:%%<指輪物語>]",
 
+      [self,
+        "names:[Festival=,                 祭=                ]",
+        "[%0sYule=en:Yule,                 %0sユール祭=       ]",
+        "[%0sLithe=cal:Hobbit_calendar,    %0sライズ祭=       ]",
+      ],
+
       [self,
         "names:[Month, 月=ja:%%<月_(暦)>]",
-        "[Yule=en:Yule,      ユール祭=          ]",
-        "[Afteryule=en:Yule, ユール後月=        ]",
-        "[Solmath=cal,       ソマス=            ]",
-        "[Rethe=cal,         レセ=              ]",
-        "[Astron=cal,        アストロン=        ]",
-        "[Thrimidge=cal,     スリミッジ=        ]",
-        "[Forelithe=cal,     ライズ前月=        ]",
-        "[Lithe=cal,         ライズ祭=          ]",
-        "[Afterlithe=cal,    ライズ後月=        ]",
-        "[Wedmath=cal,       ウェドマス=        ]",
-        "[Halimath=cal,      ハリマス=          ]",
-        "[Winterfilth=cal,   ウィンターフィルス=]",
-        "[Blotmath=cal,      ブロドマス=        ]",
-        "[Foreyule=en:Yule,  ユール前月=        ]"
+        "[Yule=en:Yule,                    ユール祭=          ]",
+        "[Afteryule=en:Yule,               ユール後月=        ]",
+        "[Solmath=cal:Hobbit_calendar,     ソマス=            ]",
+        "[Rethe=cal:Hobbit_calendar,       レセ=              ]",
+        "[Astron=cal:Hobbit_calendar,      アストロン=        ]",
+        "[Thrimidge=cal:Hobbit_calendar,   スリミッジ=        ]",
+        "[Forelithe=cal:Hobbit_calendar,   ライズ前月=        ]",
+        "[Afterlithe=cal:Hobbit_calendar,  ライズ後月=        ]",
+        "[Wedmath=cal:Hobbit_calendar,     ウェドマス=        ]",
+        "[Halimath=cal:Hobbit_calendar,    ハリマス=          ]",
+        "[Winterfilth=cal:Hobbit_calendar, ウィンターフィルス=]",
+        "[Blotmath=cal:Hobbit_calendar,    ブロドマス=        ]",
+        "[Foreyule=en:Yule,                ユール前月=        ]"
       ]
     ]]
   end
@@ -39,10 +42,9 @@ module When
   #
   # ホビット庄暦の暦週
   #
-  class CalendarNote::ShireWeek < CalendarNote
+  class CalendarNote::ShireWeek < CalendarNote::Week
 
-    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:[Shire]",
 
@@ -64,29 +66,35 @@ module When
         "names:[day]",
         [When::BasicTypes::M17n,
           "names:[Week]",
-          "[Saturday,     土曜日]",
-          "[Sunday,       日曜日]",
-          "[Monday,       月曜日]",
-          "[Tuesday,      火曜日]",
-          "[Wednesday,    水曜日]",
-          "[Thursday,     木曜日]",
-          "[Friday,       金曜日]",
-          "[lithe,        中日= ]",
-          "[double,       重日= ]"
-        ]
+          [DayOfWeek, "label:[Saturday,     土曜日]", {'delta'=>7}],
+          [DayOfWeek, "label:[Sunday,       日曜日]", {'delta'=>7}],
+          [DayOfWeek, "label:[Monday,       月曜日]", {'delta'=>7}],
+          [DayOfWeek, "label:[Tuesday,      火曜日]", {'delta'=>7}],
+          [DayOfWeek, "label:[Wednesday,    水曜日]", {'delta'=>7}],
+          [DayOfWeek, "label:[Thursday,     木曜日]", {'delta'=>7}],
+          [DayOfWeek, "label:[Friday,       金曜日]", {'delta'=>7}],
+          [DayOfWeek, "label:[lithe,        中日= ]", {'delta'=> 365}],
+          [DayOfWeek, "label:[double,       重日= ]", {'delta'=>1827}]
+        ],
+
+        "[Standard_Week]"
       ]
     ]]
 
-    # イベントの標準的な間隔を返す
     # @private
-    def _delta(parameter=nil)
-      return When::DurationP1W
-    end
+    FirstDayOfWeek  = [6, 1, 3, 5, 0, 2, 4] * 2
 
     # @private
-    def lithe_delta(parameter=nil)
-      return When::TM::PeriodDuration.new([0,0,7*52+1])
-    end
+    ExtraDayInYear = {
+      [ 8, 2] => 7,
+      [ 8, 4] => 0
+    }
+
+    # @private
+    WeekLength = {
+      [ 8, 3] => 8,
+      [ 8, 4] => 9
+    }
 
     # 当日または直前の lithe の日
     # @param date [When::TM::TemporalPosition]
@@ -97,6 +105,7 @@ module When
       event_name = 'lithe'
       date  = date.frame.jul_trans(date, {:events=>[event_name]})
       y,m,d = date.cal_date
+      m = date.frame.send(:_to_index,[y,m]) + 1
       h,n   = (m+5).divmod(7)
       dow   = 182 * h[0] + 30 * n + d + 1
       if m==8
@@ -114,19 +123,20 @@ module When
 
     # 当日または直前の week_day の日
     # @method week_day(date, parameter=nil)
-    #   @param date [When::TM::TemporalPosition]
-    #   @param parameter [nil] 未使用
+    #   @param [When::TM::TemporalPosition] date
+    #   @param [nil] parameter 未使用
     #   @return [When::TM::TemporalPosition]
     #   @note week_day は saturday, sunday, monday, tuesday, wednesday, thursday, friday に読み替えてください。
 
     # @private
     7.times do |k|
-      name = When.CalendarNote('ShireWeek/NoteObjects::day::Week')[k].to_s.downcase
+      name = When.CalendarNote('ShireWeek/Notes::day::Week')[k].to_s.downcase
       module_eval %Q{
         def #{name}(date, parameter=nil)
           event_name = 'from_#{name}'
           date  = date.frame.jul_trans(date, {:events=>[event_name], :precision=>When::DAY})
           y,m,d = date.cal_date
+          m = date.frame.send(:_to_index, [y,m]) + 1
           h,n   = (m+5).divmod(7)
           dow   = (182 * h[0] + 30 * n + d - #{k}) % 7
           case m
@@ -144,12 +154,35 @@ module When
           date.events = [event_name]
           date
         end
-
-        alias :#{name}_delta :_delta
       }
     end
 
-    alias :week :saturday
+    #
+    # この日は何曜？
+    #
+    # @param [When::TM::TemporalPosition] date
+    # @param [When::TM::CalDate] base (not used)
+    #
+    # @return [Hash<:value=>When::CalendarNote::Week::DayOfWeek, :position=>Array<Integer>>]
+    #
+    def week(date, base=nil)
+      date    = _to_date_for_note(date)
+      y, m, d = date.cal_date
+      m = date.frame.send(:_to_index, [y,m]) + 1
+      length  = WeekLength[[m, date.length(When::MONTH)]] || 7
+      index   = length == 8 ? 0 : 8 if [m,d] == [8,3]
+      index ||= ExtraDayInYear[[m,d]] || (FirstDayOfWeek[m-1] + d - 1) % 7
+      {:value=>@days_of_week[index], :position=>[index, length]}
+    end
+
+    #
+    # 暦日を当該暦注計算用クラスに変換
+    #
+    # @private
+    def _to_date_for_note(date)
+      date = When::ShireG ^ date unless date.frame.label.to_s == 'Shire'
+      date
+    end
 
     # オブジェクトの正規化
     # @private
@@ -157,58 +190,31 @@ module When
       @event ||= 'saturday'
       super
     end
-
-    #
-    # イベントを取得する Enumerator
-    #
-    class Enumerator < When::CalendarNote::Enumerator
-
-      #
-      # 次のイベントを得る
-      #
-      # @return [When::TM::TemporalPosition]
-      #
-      def succ
-        value = @current
-        plus  = @delta.sign > 0
-        if @current==:first
-          @first   = event_eval(@first) unless plus
-          @current = @first
-        else
-          if plus
-            @current = event_eval(@current + @delta)
-          else
-            @last    = event_eval(@current - When.Duration('P1D'))
-            @current = event_eval(@current + @delta)
-            unless [@current.to_i, value.to_i].include?(@last.to_i) 
-              @current = @last
-              return value
-            end
-          end
-          @current = event_eval(@current + @delta * 2) if @current.to_i == value.to_i
-        end
-        return value
-      end
-    end
   end
 
   module CalendarTypes
+
+    _shire_indices = [
+      When.Index('Shire::Month', {:base  => 0,
+                                  :branch=>{1=>When.Resource('_m:Shire::Festival::*')[1]}}),
+      When::Coordinates::DefaultDayIndex
+    ]
+
+    _IDs = '0,1,2,3,4,5,6,6=,7,8,9,10,11,12'
+
     #
     # Shire Calendar based on summer solstice date
     #
     Shire =  [YearLengthTableBased, {
-      'label'   => When.Resource('_m:ShireTerms::Shire'),
-      'indices' => [
-         Coordinates::Index.new({:unit=>14, :trunk=>When.Resource('_m:ShireTerms::Month::*')}),
-         Coordinates::DefaultDayIndex
-       ],
-      'border'       => '00-01-02',
+      'label'   => 'Shire::Shire',
+      'indices' => _shire_indices,
+      'border'       => '00-00-02',
       'day_offset'   => -183,           # the day 183 days before summer solstice
       'cycle_offset' => Rational(1,4),  # summer solstice
       'time_basis'   => '+09:00',       # JST
       'rule_table'   => {
-        365 => {'Length'=>[2]+[30]*6+[3]+[30]*6},
-        366 => {'Length'=>[2]+[30]*6+[4]+[30]*6}
+        365 => {'Length'=>[2]+[30]*6+[3]+[30]*6, 'IDs'=>_IDs},
+        366 => {'Length'=>[2]+[30]*6+[4]+[30]*6, 'IDs'=>_IDs}
       },
       'note'   => 'ShireWeek'
     }]
@@ -217,19 +223,16 @@ module When
     # Shire Calendar based on Gregorian Date
     #
     ShireG =  [CyclicTableBased, {
-      'label'   => When.Resource('_m:ShireTerms::Shire'),
+      'label'   => 'Shire::Shire',
       'origin_of_LSC' => 1721060-10,
-      'indices' => [
-        Coordinates::Index.new({:unit=>14, :trunk=>When.Resource('_m:ShireTerms::Month::*')}),
-        Coordinates::DefaultDayIndex
-      ],
-      'border'     => '00-01-02',
+      'indices' => _shire_indices,
+      'border'     => '00-00-02',
       'rule_table' => {
         'T'  => {'Rule'  =>['LC', 'SC', 'SC', 'SC']},
         'SC' => {'Rule'  =>[365]*4 + [366, 365, 365, 365]*24},
         'LC' => {'Rule'  =>[366, 365, 365, 365]*25},
-        365 => {'Length'=>[2]+[30]*6+[3]+[30]*6},
-        366 => {'Length'=>[2]+[30]*6+[4]+[30]*6}
+        365 => {'Length'=>[2]+[30]*6+[3]+[30]*6, 'IDs'=>_IDs},
+        366 => {'Length'=>[2]+[30]*6+[4]+[30]*6, 'IDs'=>_IDs}
       },
       'note'   => 'ShireWeek'
     }]