when_exe 0.3.4 → 0.3.5

data/lib/when_exe/region/javanese.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 Takashi SUGA
+  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
@@ -11,7 +11,7 @@ module When
     JavaneseTerms = [self, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
-      "names:[JavaneseTerms]",
+      "names:[JavaneseTerms=]",
       "[JavaneseLunar=, ジャワ・イスラーム暦=]",
       "[Pranatamangsa=, プラノトモンソ=]",
 

data/lib/when_exe/region/jewish.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 Takashi SUGA
+  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
@@ -11,7 +11,7 @@ module When
     JewishTerms = [self, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
-      "names:[JewishTerms]",
+      "names:[JewishTerms=]",
       "[Jewish=en:Hebrew_calendar, ユダヤ暦]",
 
       [self,

data/lib/when_exe/region/korean.rb

@@ -149,7 +149,7 @@ module When
 	["[景文王]1",	"@A",	"name=[景文王];861"],
 	["[憲康王]1",	"@A",	"name=[憲康王];875"],
 	["[定康王]1",	"@A",	"name=[定康王];886"],
-	["[真聖女王]1",	"@A", "name=[真聖女王];887^Chinese::宣明暦"],	# 東洋史辞典のみ１年遅
+	["[真聖女王]1",	"@A", "name=[真聖女王];887^ChineseTwin::宣明暦"],	# 東洋史辞典のみ１年遅
 	["[孝恭王]1",	"@A",	"name=[孝恭王];897"],                   #        〃
 	["[神徳王]1",	"@A",	"name=[神徳王];912"],                   #        〃
 	["[景明王]1",	"@A",	"name=[景明王];917"],
@@ -172,11 +172,11 @@ module When
       ],
       [self,
 	"period:[後百済]",		# 三国遺事による
-	["[甄萱]1",	"@F",	"name=[甄萱];900^Chinese::宣明暦", "936.09.08="]
+	["[甄萱]1",	"@F",	"name=[甄萱];900^ChineseTwin::宣明暦", "936.09.08="]
       ],
       [self,
 	"period:[後高句麗]",
-	["[弓裔]1",	"@F",	"name=[弓裔];901^Chinese::宣明暦"],
+	["[弓裔]1",	"@F",	"name=[弓裔];901^ChineseTwin::宣明暦"],
 	["[摩震]1",	"@A",	"name=[武泰];904"],
 	["[聖冊]1",	"",		    "905"],
 	["[泰封]1",	"@A","name=[水徳万歳];911"],
@@ -184,7 +184,7 @@ module When
       ],
       [self,
 	"period:[高麗]",
-	["[天授]1",	"@F",	"name=[太祖];918.06^Chinese::宣明暦"],	# 三国遺事による
+	["[天授]1",	"@F",	"name=[太祖];918.06^ChineseTwin::宣明暦"],	# 三国遺事による
 	["[太祖]16",	"",		    "933"],
 	["[恵宗]1",	"@A",	"name=[恵宗];944"],
 	["[定宗]1",	"@A",	"name=[定宗];946"],

data/lib/when_exe/region/m17n.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 Takashi SUGA
+  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
@@ -46,7 +46,7 @@ module When
       CalendarTerms = [M17n, [
         "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
         "locale:[=en:, ja=ja:, alias]",
-        "names:[CalendarTerms]",
+        "names:[CalendarTerms=]",
 
         "[Intercalary %s=, *閏]",
 
@@ -87,28 +87,28 @@ module When
       EpochEvents = [M17n, [
         "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
         "locale:[=en:, ja=ja:, alias]",
-        "names:[EpochEvents]",
-        "[Accession,        代始]",
-        "[FelicitousEvent,  祥瑞]",
-        "[NaturalDisaster,  災異]",
-        "[InauspiciousYear, 革年]",
-        "[Foundation,       創業]",
-        "[CalendarReform,   改暦]"
+        "names:[EpochEvents=]",
+        "[Accession=,        代始]",
+        "[FelicitousEvent=,  祥瑞]",
+        "[NaturalDisaster=,  災異]",
+        "[InauspiciousYear=, 革年]",
+        "[Foundation=,       創業]",
+        "[CalendarReform=,   改暦]"
       ]]
 
       # Formats
       CalendarFormats = [M17n, [
         "locale:[=]",
-        "names:[CalendarFormats]",
-        "[Date,          /date/formats/default]",
-        "[DateLong,      /date/formats/long   ]",
-        "[DateShort,     /date/formats/short  ]",
-        "[DateTime,      /time/formats/default]",
-        "[DateTimeLong,  /time/formats/long   ]",
-        "[DateTimeShort, /time/formats/short  ]",
-        "[Time,          /time/formats/time   ]",
-        "[AM,            /time/am             ]",
-        "[PM,            /time/pm             ]"
+        "names:[CalendarFormats=]",
+        "[Date=,          /date/formats/default]",
+        "[DateLong=,      /date/formats/long   ]",
+        "[DateShort=,     /date/formats/short  ]",
+        "[DateTime=,      /time/formats/default]",
+        "[DateTimeLong=,  /time/formats/long   ]",
+        "[DateTimeShort=, /time/formats/short  ]",
+        "[Time=,          /time/formats/time   ]",
+        "[AM=,            /time/am             ]",
+        "[PM=,            /time/pm             ]"
       ]]
     end
   end

data/lib/when_exe/region/martian.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2013 Takashi SUGA
+  Copyright (C) 2013-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
@@ -12,7 +12,7 @@ module When
     MartianTerms = [self, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
-      "names:[MartianTerms]",
+      "names:[MartianTerms=]",
       "[Darian=en:Darian_calendar, ダリアン暦]",
 
       [self,
@@ -63,7 +63,7 @@ module When
       # @return [Numeric] dynamical date
       #
       def to_dynamical_date(date)
-        (date - MTC0) * Ratio + J2000Jan6
+        (date - @mtc0) * Ratio + J2000Jan6
       end
 
       # dynamical date を当該時刻系の日付に変換する
@@ -73,7 +73,7 @@ module When
       # @return [Numeric] 当該時刻系の日付
       #
       def from_dynamical_date(date)
-        (date - J2000Jan6) / Ratio + MTC0
+        (date - J2000Jan6) / Ratio + @mtc0
       end
 
       # universal time を dynamical time に変換する
@@ -99,15 +99,24 @@ module When
           from_dynamical_date(
             When::TM::JulianDate._t_to_d(time)))
       end
+
+      private
+
+      # オブジェクトの正規化
+      def _normalize(args=[], options={})
+        @location = When.Resource(@location || '_l:long=0&lat=0&datum=Mars')
+        @mtc0     = MTC0 + @location.long / (360.0 * When::Coordinates::Spatial::DEGREE)
+        super
+      end
     end
   end
 
-  module CalendarTypes
+  class CalendarNote
 
     #
     # Darian Week
     #
-    class CalendarNote::DarianWeek < CalendarNote::WorldWeek
+    class DarianWeek < WorldWeek
 
       NoteObjects = [When::BasicTypes::M17n, [
         "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
@@ -169,22 +178,25 @@ module When
 
       # オブジェクトの正規化
       def _normalize(args=[], options={})
-        @event ||= 'solis'
+        @event  ||= 'solis'
         super
       end
     end
+  end
+
+  module CalendarTypes
 
     #
     # Martian Time, Coordinated
     #
-    class MTC < UTC
+    class MTC < LocalTime
 
       private
 
       # オブジェクトの正規化
       def _normalize(args=[], options={})
         @label         = m17n('MTC')
-        @time_standard = When.Resource("_t:MartianTimeCoordinated")
+        @time_standard = When.Resource("_t:MartianTimeCoordinated?location=(_l:long=#{@long||0}&datum=Mars)")
         super
       end
     end

data/lib/when_exe/region/mayan.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2012 Takashi SUGA
+  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
@@ -10,14 +10,21 @@ module When
   module Coordinates
 
     # Mayan Residue
-    Mayan = [{'Epoch' => {'0D'=>{'Haab'=>'-65', 'Trecena'=> '8', 'Tzolkin'=>'4', 'LoN'=>'3'},
-                          '2D'=>{'Haab'=>'-63', 'Trecena'=>'10', 'Tzolkin'=>'6', 'LoN'=>'5'}}}, BasicTypes::M17n, [
+    Mayan = [{'Epoch' => Hash.new {|hash, key|
+                           epoch = key.to_i
+                           hash[key] = key ? {
+                             'Haab'    => ((300 + epoch) % 365).to_s,
+                             'Trecena' => ((  8 + epoch) %  13).to_s,
+                             'Tzolkin' => ((  4 + epoch) %  20).to_s,
+                             '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:-65}', "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"],
@@ -90,12 +97,11 @@ module When
     #
     # Mayan Long Count
     #
-    LongCount = [{'Epoch'=>{'0D' => {'Base' => '?Epoch=0D'},
-                            '2D' => {'Base' => '?Epoch=2D'}}}, self, [
+    LongCount = [{}, self, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
-      'area:[LongCount#{Base}=en:Mesoamerican_Long_Count_calendar, マヤ長期暦=ja:%%<長期暦>]',
-     ["[PHLC=, 先史時代=, PreHistoricLongCount=]0.0.0.0.0", "[Pre Historic=]",	'-13.0.0.0.0^LongCount#{Base}'],
+      '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}'],
      ["[HLC=,  歴史時代=, HistoricLongCount=]0.0.0.0.1",    "[Historic Age=]",	  "0.0.0.0.1"],
      ["[NLC=,  新時代=,   NewLongCount=]0.0.0.0.1",	    "[New Age=]",	 "13.0.0.0.1", "26.0.0.0.1"]
     ]]
@@ -109,8 +115,10 @@ module When
     #
     # Mayan Long Count
     #
-    LongCount =  [{'Epoch'=>{'0D' => {'origin_of_LSC' => 584283, 'Base'=>'?Epoch=0D'},
-                             '2D' => {'origin_of_LSC' => 584285, 'Base'=>'?Epoch=2D'}}}, CyclicTableBased, {
+    LongCount =  [{'Epoch' => Hash.new {|hash, key|
+                                hash[key] = {
+                                  'origin_of_LSC' => 584283 + key.to_i
+                                }}}, CyclicTableBased, {
       'origin_of_LSC' => 584283,
       'rule_table'    => {
         'T' => {'Rule'  =>[360]},
@@ -118,7 +126,7 @@ module When
       },
       'index_of_MSC' => 2,
       'indices'=> [_c20, _c20, _c18, _c20],
-      'note'   => 'MayanNotes#{Base}'
+      'note'   => 'MayanNotes#{?Epoch=Epoch}'
     }]
   end
 end

data/lib/when_exe/region/moon.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 Takashi SUGA
+  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
@@ -23,11 +23,11 @@ module When
     # @private
     P0L =
       [[LIN   ,  124.8757417 ,  4812.6788201  , -1.330000E-7],
-       [SINL  ,  338.9158263 ,  4771.9886313  ,  6.2887   ,+8.99400E-7],
-       [SIN   ,  107.236832  ,   -4133.3536154,  1.2740   ,+1.22612E-6],
-       [SIN   ,   51.678963  ,    8905.3422467,  0.6583   ,-0.32672E-6],
-       [SIN   ,  317.831653  ,    9543.9772627,  0.2136   ,+1.7988E-6 ],
-       [SIN   ,  176.528826  ,     359.990504 ,  0.1856   ,-1.561E-8  ],
+       [SINL  ,  338.9158263 ,  4771.9886313  ,  6.2887   ,+8.99400E-7], # 中心差 
+       [SIN   ,  107.236832  ,   -4133.3536154,  1.2740   ,+1.22612E-6], # 出差
+       [SIN   ,   51.678963  ,    8905.3422467,  0.6583   ,-0.32672E-6], # 二均差
+       [SIN   ,  317.831653  ,    9543.9772627,  0.2136   ,+1.7988E-6 ], # 中心差 x 2
+       [SIN   ,  176.528826  ,     359.990504 ,  0.1856   ,-1.561E-8  ], # 年差
 
        [SIN   ,  292.463     ,    9664.0403505,  0.1143   ,-0.6812E-6 ],
        [SIN   ,   86.16      ,     638.63475182, 0.0588   ,+2.1256E-6 ],
@@ -36,7 +36,7 @@ module When
        [SIN   ,  124.86      ,   -8545.352    ,  0.0459   ],
 
        [SIN   ,  342.38      ,    4411.998    ,  0.0410   ],
-       [SIN   ,   25.83      ,    4452.671    ,  0.0348   ],
+       [SIN   ,   25.83      ,    4452.671    ,  0.0348   ], # 月角差( 二均差 / 2)
        [SIN   ,  155.45      ,    5131.979    ,  0.0305   ],
        [SIN   ,  240.79      ,     758.698    ,  0.0153   ],
        [SIN   ,  271.38      ,   14436.029    ,  0.0125   ],

data/lib/when_exe/region/nihon_shoki.rb

@@ -14,10 +14,10 @@ class When::TM::CalendarEra
     "namespace:[ja=http://ja.wikipedia.org/wiki/, en=http://en.wikipedia.org/wiki/]",
     "locale:[=ja:, en=en:, alias]",
     "area:[日本]",
-    ["[皇紀]1",		"@A",	"-659-01-01^Chinese::平朔儀鳳暦"],
-    ["[皇紀]1113",	"[::_m:EpochEvents::CalendarReform]",	"0453-12-14^Chinese::元嘉暦"],
-    ["[皇紀]1253",	"",					"0593-01-01^Japanese"],
-    ["[皇紀]2533",	"[::_m:EpochEvents::CalendarReform]",	"1873-01-01^Gregorian"]
+    ["[皇紀]1",		"@A",	"-659-01-01^JapaneseTwin::平朔儀鳳暦"],
+    ["[皇紀]1113",	"@CR",	"0453-12-14^ChineseTwin::元嘉暦"],
+    ["[皇紀]1253",	"",	"0593-01-01^Japanese"],
+    ["[皇紀]2533",	"@CR",	"1873-01-01^Gregorian"]
   ]]
 
   #
@@ -27,7 +27,7 @@ class When::TM::CalendarEra
     "namespace:[ja=http://ja.wikipedia.org/wiki/, en=http://en.wikipedia.org/wiki/]",
     "locale:[=ja:, en=en:, alias]",
     "period:[(日本書紀)=ja:%%<日本書紀>, (Nihon_Shoki)=en:Nihon_Shoki]",
-    ["[神武]1",	"@A",	"name=[神武];-659-01-01^Chinese::平朔儀鳳暦"],
+    ["[神武]1",	"@A",	"name=[神武];-659-01-01^JapaneseTwin::平朔儀鳳暦"],
     ["[綏靖]1",	"@A",	"name=[綏靖];-580-01-08"],
     ["[安寧]0",	"@A",	"name=[安寧];-548-07-03"],
     ["[懿徳]1",	"@A",	"name=[懿徳];-509-02-04"],
@@ -47,7 +47,7 @@ class When::TM::CalendarEra
     ["[履中]1",	"@A",	"name=[履中];0400-02-01"],
     ["[反正]1",	"@A",	"name=[反正];0406-01-02"],
     ["[允恭]1",	"@A",	"name=[允恭];0412-12"],
-    ["[安康]0",	"@A",	"name=[安康];0453-12-14^Chinese::元嘉暦"],
+    ["[安康]0",	"@A",	"name=[安康];0453-12-14^ChineseTwin::元嘉暦"],
     ["[雄略]0",	"@A",	"name=[雄略];0456-11-13"],
     ["[清寧]1",	"@A",	"name=[清寧];0480-01-15"],
     ["[顕宗]1",	"@A",	"name=[顕宗];0485-01-01"],
@@ -64,7 +64,7 @@ class When::TM::CalendarEra
     ["[舒明]1",	"@A",	"name=[舒明];0629-01-04"],
     ["[皇極]1",	"@A",	"name=[皇極];0642-01-15"],
     ["[大化]1",	"@A",	"name=[孝徳];0645-06-19"],
-    ["[白雉]1",	"[::_m:EpochEvents::FelicitousEvent]",	"	     0650-02-15"],
+    ["[白雉]1",	"@FE",	"	     0650-02-15"],
     ["[斉明]1",	"@A",	"name=[斉明];0655-01-03"],
     ["[天智]1",	"@A",	"name=[天智];0662-01-01"],
     ["[天武]1",	"@A",	"name=[天武];0672-01-01"],

data/lib/when_exe/region/roman.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 Takashi SUGA
+  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
@@ -12,7 +12,7 @@ module When
     RomanTerms = [self, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
-      "names:[RomanTerms]",
+      "names:[RomanTerms=]",
 
       [self, # ..CE-44 / ..BCE45
         "names:[MonthA, 月=ja:%%<月_(暦)>]",
@@ -207,120 +207,120 @@ module When
     RomanB =  [CyclicTableBased, Options.merge({'indices' => _IndicesB})]
     Roman  =  [CyclicTableBased, Options]
     RomanC =  [CyclicTableBased, Options.merge({'indices' => _IndicesC})]
+  end
 
-    #
-    # 古代ローマの暦注
-    #
-    class CalendarNote::RomanNote < CalendarNote
+  #
+  # 古代ローマの暦注
+  #
+  class CalendarNote::RomanNote < CalendarNote
 
-      NoteObjects = [When::BasicTypes::M17n, [
-        "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
-        "locale:[=en:, ja=ja:, alias]",
-        "names:[Roman]",
+    NoteObjects = [When::BasicTypes::M17n, [
+      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+      "locale:[=en:, ja=ja:, alias]",
+      "names:[Roman]",
 
-        # 年の暦注 ----------------------------
-        [When::BasicTypes::M17n,
-          "names:[year]",
-
-          [When::Coordinates::Residue,
-            "label:[Solar=en:Solar_cycle_(calendar), 太陽章=]", "divisor:28", "year:-8",
-          ],
-
-          [When::Coordinates::Residue,
-            "label:[Metonic=en:Metonic_cycle, 太陰章=]", "divisor:19", "year:0",
-          ],
-
-          [When::Coordinates::Residue,
-            "label:[Indiction, インディクション]", "divisor:15", "year:-2",
-            [When::Coordinates::Residue, "label:[I=   ]", "remainder:  0"],
-            [When::Coordinates::Residue, "label:[II=  ]", "remainder:  1"],
-            [When::Coordinates::Residue, "label:[III= ]", "remainder:  2"],
-            [When::Coordinates::Residue, "label:[IV=  ]", "remainder:  3"],
-            [When::Coordinates::Residue, "label:[V=   ]", "remainder:  4"],
-            [When::Coordinates::Residue, "label:[VI=  ]", "remainder:  5"],
-            [When::Coordinates::Residue, "label:[VII= ]", "remainder:  6"],
-            [When::Coordinates::Residue, "label:[VIII=]", "remainder:  7"],
-            [When::Coordinates::Residue, "label:[IX=  ]", "remainder:  8"],
-            [When::Coordinates::Residue, "label:[X=   ]", "remainder:  9"],
-            [When::Coordinates::Residue, "label:[XI=  ]", "remainder: 10"],
-            [When::Coordinates::Residue, "label:[XII= ]", "remainder: 11"],
-            [When::Coordinates::Residue, "label:[XIII=]", "remainder: 12"],
-            [When::Coordinates::Residue, "label:[XIV= ]", "remainder: 13"],
-            [When::Coordinates::Residue, "label:[XV=  ]", "remainder: 14"],
-          ]
+      # 年の暦注 ----------------------------
+      [When::BasicTypes::M17n,
+        "names:[year]",
+
+        [When::Coordinates::Residue,
+          "label:[Solar=en:Solar_cycle_(calendar), 太陽章=]", "divisor:28", "year:-8",
         ],
 
-        # 月の暦注 ----------------------------
-        [When::BasicTypes::M17n,
-          "names:[month]",
-          [When::BasicTypes::M17n,
-            "names:[Month]"
-          ]
+        [When::Coordinates::Residue,
+          "label:[Metonic=en:Metonic_cycle, 太陰章=]", "divisor:19", "year:0",
         ],
 
-        # 日の暦注 ----------------------------
-        [When::BasicTypes::M17n,
-          "names:[day]",
+        [When::Coordinates::Residue,
+          "label:[Indiction, インディクション]", "divisor:15", "year:-2",
+          [When::Coordinates::Residue, "label:[I=   ]", "remainder:  0"],
+          [When::Coordinates::Residue, "label:[II=  ]", "remainder:  1"],
+          [When::Coordinates::Residue, "label:[III= ]", "remainder:  2"],
+          [When::Coordinates::Residue, "label:[IV=  ]", "remainder:  3"],
+          [When::Coordinates::Residue, "label:[V=   ]", "remainder:  4"],
+          [When::Coordinates::Residue, "label:[VI=  ]", "remainder:  5"],
+          [When::Coordinates::Residue, "label:[VII= ]", "remainder:  6"],
+          [When::Coordinates::Residue, "label:[VIII=]", "remainder:  7"],
+          [When::Coordinates::Residue, "label:[IX=  ]", "remainder:  8"],
+          [When::Coordinates::Residue, "label:[X=   ]", "remainder:  9"],
+          [When::Coordinates::Residue, "label:[XI=  ]", "remainder: 10"],
+          [When::Coordinates::Residue, "label:[XII= ]", "remainder: 11"],
+          [When::Coordinates::Residue, "label:[XIII=]", "remainder: 12"],
+          [When::Coordinates::Residue, "label:[XIV= ]", "remainder: 13"],
+          [When::Coordinates::Residue, "label:[XV=  ]", "remainder: 14"],
+        ]
+      ],
 
-          [When::BasicTypes::M17n,
-            "names:[Nomen]"
-          ]
+      # 月の暦注 ----------------------------
+      [When::BasicTypes::M17n,
+        "names:[month]",
+        [When::BasicTypes::M17n,
+          "names:[Month]"
         ]
-      ]]
+      ],
+
+      # 日の暦注 ----------------------------
+      [When::BasicTypes::M17n,
+        "names:[day]",
 
-      Order = [
-        'a.d. bis VI',
-        'prid.',    'a.d. III',  'a.d. IV',    'a.d. V',   'a.d. VI',   'a.d. VII', 'a.d. VIII', 
-        'a.d. IX',  'a.d. X',    'a.d. XI',    'a.d. XII', 'a.d. XIII', 'a.d. XIV', 'a.d. XV', 
-        'a.d. XVI', 'a.d. XVII', 'a.d. XVIII', 'a.d. XIX', 'a.d. XX',   'a.d. XXI', 'a.d. XXII'
+        [When::BasicTypes::M17n,
+          "names:[Nomen]"
+        ]
       ]
+    ]]
 
-      LongMonths = [3, 5, 7, 10, When.Pair(11,0.5), When.Pair(11,1.5)]
-      LongType   = [1, 2..6, 7, 8..14, 15]
-      ShortType  = [1, 2..4, 5, 6..12, 13]
-
-      # 暦注 - 日の名前
-      #
-      # @param [When::TM::CalDate] date
-      #
-      # @return [String]
-      #
-      def nomen(date)
-        y, m, d = date.cal_date
-        month_name = _abbr_of_month(date)
-        kal, to_nonae, nonae, to_idus, idus = LongMonths.include?(m) ? LongType : ShortType
-        case d
-        when kal      ; return                     'Kal. ' + month_name
-        when to_nonae ; return Order[nonae - d] + ' Non. ' + month_name
-        when nonae    ; return                     'Non. ' + month_name
-        when to_idus  ; return Order[idus  - d] + ' Id. '  + month_name
-        when idus     ; return                     'Id. '  + month_name
-        end
-        this_month = date.floor(When::MONTH)
-        next_month = this_month.succ
-        month_name = _abbr_of_month(next_month)
-        rest = next_month.to_i - date.to_i
-        if m == 2 && next_month.to_i - this_month.to_i == 29
-          return Order[0] + ' Kal. ' + month_name if rest == 5
-          rest -= 1 if rest > 5
-        end
-        return Order[rest] + ' Kal. ' + month_name
-      end
+    Order = [
+      'a.d. bis VI',
+      'prid.',    'a.d. III',  'a.d. IV',    'a.d. V',   'a.d. VI',   'a.d. VII', 'a.d. VIII', 
+      'a.d. IX',  'a.d. X',    'a.d. XI',    'a.d. XII', 'a.d. XIII', 'a.d. XIV', 'a.d. XV', 
+      'a.d. XVI', 'a.d. XVII', 'a.d. XVIII', 'a.d. XIX', 'a.d. XX',   'a.d. XXI', 'a.d. XXII'
+    ]
 
-      private
+    LongMonths = [3, 5, 7, 10, When.Pair(11,0.5), When.Pair(11,1.5)]
+    LongType   = [1, 2..6, 7, 8..14, 15]
+    ShortType  = [1, 2..4, 5, 6..12, 13]
 
-      # オブジェクトの正規化
-      def _normalize(args=[], options={})
-       @event = 'nomen'
-       super
+    # 暦注 - 日の名前
+    #
+    # @param [When::TM::CalDate] date
+    #
+    # @return [String]
+    #
+    def nomen(date)
+      y, m, d = date.cal_date
+      month_name = _abbr_of_month(date)
+      kal, to_nonae, nonae, to_idus, idus = LongMonths.include?(m) ? LongType : ShortType
+      case d
+      when kal      ; return                     'Kal. ' + month_name
+      when to_nonae ; return Order[nonae - d] + ' Non. ' + month_name
+      when nonae    ; return                     'Non. ' + month_name
+      when to_idus  ; return Order[idus  - d] + ' Id. '  + month_name
+      when idus     ; return                     'Id. '  + month_name
       end
-
-      # 日の省略名
-      def _abbr_of_month(month)
-        name = month.name('month').to_s
-        return name.sub(/ (..).*/, ' \1.') if name.sub!(/Intercalaris(.*)?/, 'Int.\1')
-        name.size <= 3 ? name : name[/^...[^caeiou]*/] + '.'
+      this_month = date.floor(When::MONTH)
+      next_month = this_month.succ
+      month_name = _abbr_of_month(next_month)
+      rest = next_month.to_i - date.to_i
+      if m == 2 && next_month.to_i - this_month.to_i == 29
+        return Order[0] + ' Kal. ' + month_name if rest == 5
+        rest -= 1 if rest > 5
       end
+      return Order[rest] + ' Kal. ' + month_name
+    end
+
+    private
+
+    # オブジェクトの正規化
+    def _normalize(args=[], options={})
+     @event = 'nomen'
+     super
+    end
+
+    # 日の省略名
+    def _abbr_of_month(month)
+      name = month.name('month').to_s
+      return name.sub(/ (..).*/, ' \1.') if name.sub!(/Intercalaris(.*)?/, 'Int.\1')
+      name.size <= 3 ? name : name[/^...[^caeiou]*/] + '.'
     end
   end
 end