when_exe 0.3.2 → 0.3.3

data/lib/when_exe/region/javanese.rb

@@ -138,20 +138,20 @@ module When
   class TM::CalendarEra
 
     # シャカ紀元
-     Javanese = [self, [
+     JavaneseLunar = [self, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
       "period:[JavaneseLunar=, ジャワ・イスラーム暦=]",
-      ["[JSE=, サカ暦=, alias:Javanese_Saka_Era]1547.1.1", "Calendar Epoch", "1035-01-01^Javanese1547",
-                                                                             "1163-01-01^Javanese1675",
-                                                                             "1237-01-01^Javanese1749", '+Infinity']
+      ["[SE=, サカ暦=, alias:Javanese_Saka_Era]1547.1.1", "Calendar Epoch", "1035-01-01^Javanese1547",
+                                                                            "1163-01-01^Javanese1675",
+                                                                            "1237-01-01^Javanese1749", '+Infinity']
     ]]
   end
 
   module CalendarTypes
 
     #
-    # Javanese Calendar (JSE1547-1674) : Dal年 - 閏年
+    # Javanese Calendar (SE1547-1674) : Dal年 - 閏年
     #
     Javanese1547 =  [CyclicTableBased, {
       'origin_of_LSC' =>  2317690,
@@ -169,7 +169,7 @@ module When
     }]
 
     #
-    # Javanese Calendar (JSE1675-1748) : Dal年 - 平年
+    # Javanese Calendar (SE1675-1748) : Dal年 - 平年
     #
     Javanese1675 =  [CyclicTableBased, {
       'origin_of_LSC' =>  2360214,
@@ -187,7 +187,7 @@ module When
     }]
 
     #
-    # Javanese Calendar (JSE1749-) : Dal年 - 平年,月日別配当
+    # Javanese Calendar (SE1749-) : Dal年 - 平年,月日別配当
     #
     Javanese1749 =  [CyclicTableBased, {
       'origin_of_LSC' =>  2385728,

data/lib/when_exe/region/mayan.rb

@@ -10,13 +10,14 @@ module When
   module Coordinates
 
     # Mayan Residue
-    Mayan = [BasicTypes::M17n, [
+    Mayan = [{'Epoch' => {'0D'=>{'Haab'=>'-65', 'Trecena'=> '8', 'Tzolkin'=>'4', 'LoN'=>'3'},
+                          '2D'=>{'Haab'=>'-63', 'Trecena'=>'10', 'Tzolkin'=>'6', 'LoN'=>'5'}}}, 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:-65", "format:[%2$d%1$s/365]",
+        "label:[Haab', ハアブ, Haab]", "divisor:365", 'day:#{Haab:-65}', "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"],
@@ -40,12 +41,12 @@ module When
       ],
 
       [Residue,
-        "label:[Trecena, トレセナ=, Trecena]", "divisor:13", "day: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: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"],
@@ -70,7 +71,7 @@ module When
 
       [Residue,
         "namespace:[glyph=http://www.pauahtun.org/G/G]",
-        "label:[Lords_of_the_Night, 夜の九王]", "divisor:9", "day: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"],
@@ -89,11 +90,12 @@ module When
     #
     # Mayan Long Count
     #
-    Mayan = [self, [
+    LongCount = [{'Epoch'=>{'0D' => {'Base' => '?Epoch=0D'},
+                            '2D' => {'Base' => '?Epoch=2D'}}}, self, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
-      "area:[MayanLongCount=en:Mesoamerican_Long_Count_calendar, マヤ長期暦=ja:%%<長期暦>]",
-     ["[PHLC=, 先史時代=, PreHistoricLongCount=]0.0.0.0.0", "[Pre Historic=]",	"-13.0.0.0.0^LongCount"],
+      '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}'],
      ["[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"]
     ]]
@@ -101,22 +103,22 @@ module When
 
   module CalendarTypes
 
+    _c20 = Coordinates::Index.new({:base=>0, :unit=>20})
+    _c18 = Coordinates::Index.new({:base=>0, :unit=>18})
+
     #
     # Mayan Long Count
     #
-    LongCount =  [CyclicTableBased, {
+    LongCount =  [{'Epoch'=>{'0D' => {'origin_of_LSC' => 584283, 'Base'=>'?Epoch=0D'},
+                             '2D' => {'origin_of_LSC' => 584285, 'Base'=>'?Epoch=2D'}}}, CyclicTableBased, {
       'origin_of_LSC' => 584283,
       'rule_table'    => {
         'T' => {'Rule'  =>[360]},
-        360 => {'Length'=>[20] * 18}},
+        360 => {'Length'=>[20] * 18}
+      },
       'index_of_MSC' => 2,
-      'indices'=> [
-         Coordinates::Index.new({:base=>0, :unit=>20}),
-         Coordinates::Index.new({:base=>0, :unit=>20}),
-         Coordinates::Index.new({:base=>0, :unit=>18}),
-         Coordinates::Index.new({:base=>0, :unit=>20}),
-       ],
-      'note'   => 'MayanNotes'
+      'indices'=> [_c20, _c20, _c18, _c20],
+      'note'   => 'MayanNotes#{Base}'
     }]
   end
 end

data/lib/when_exe/region/nihon_shoki.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
@@ -14,7 +14,7 @@ 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::儀鳳暦"],
+    ["[皇紀]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"]
@@ -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^Chinese::平朔儀鳳暦"],
     ["[綏靖]1",	"@A",	"name=[綏靖];-580-01-08"],
     ["[安寧]0",	"@A",	"name=[安寧];-548-07-03"],
     ["[懿徳]1",	"@A",	"name=[懿徳];-509-02-04"],

data/lib/when_exe/region/residue.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
@@ -20,7 +20,8 @@ module When::Coordinates
   class Kyusei     < Residue; end
 
   # Common Residue
-  CommonResidue = [When::BasicTypes::M17n, [
+  CommonResidue = [{'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]",
@@ -49,7 +50,7 @@ module When::Coordinates
 
     [Residue,
       "locale:[=en:, ja=ja:, alias]",
-      "label:[StarMansion, *宿]", "divisor:28", "day:17",
+      "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 
@@ -111,7 +112,7 @@ module When::Coordinates
     ],
 
     [StemBranch,
-      "label:[Stem-Branch, *干支]", "divisor:60", "day:11", "year:4",
+      "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"],
@@ -191,30 +192,30 @@ module When::Coordinates
     [Residue,
       "locale:[=en:, ja=ja:, alias]",
       "label:[SolarTerm=en:Solar_term, *二十四節気]", "divisor:360",
-      [Residue, "label:[vernal_equinox=,       *春分, 二月中=]  ", "remainder:0"  ],
-      [Residue, "label:[clear_and_bright=,     *清明, 三月節=]  ", "remainder:15" ],
-      [Residue, "label:[grain_rain=,           *穀雨, 三月中=]  ", "remainder:30" ],
-      [Residue, "label:[start_of_summer=,      *立夏, 四月節=]  ", "remainder:45" ],
-      [Residue, "label:[grain_full=,           *小満, 四月中=]  ", "remainder:60" ],
-      [Residue, "label:[grain_in_ear=,         *芒種, 五月節=]  ", "remainder:75" ],
-      [Residue, "label:[summer_solstice=,      *夏至, 五月中=]  ", "remainder:90" ],
-      [Residue, "label:[minor_heat=,           *小暑, 六月節=]  ", "remainder:105"],
-      [Residue, "label:[major_heat=,           *大暑, 六月中=]  ", "remainder:120"],
-      [Residue, "label:[start_of_autumn=,      *立秋, 七月節=]  ", "remainder:135"],
-      [Residue, "label:[limit_of_heat=,        *処暑, 七月中=]  ", "remainder:150"],
-      [Residue, "label:[white_dew=,            *白露, 八月節=]  ", "remainder:165"],
-      [Residue, "label:[autumnal_equinox=,     *秋分, 八月中=]  ", "remainder:180"],
-      [Residue, "label:[cold_dew=,             *寒露, 九月節=]  ", "remainder:195"],
-      [Residue, "label:[frost_descent=,        *霜降, 九月中=]  ", "remainder:210"],
-      [Residue, "label:[start_of_winter=,      *立冬, 十月節=]  ", "remainder:225"],
-      [Residue, "label:[minor_snow=,           *小雪, 十月中=]  ", "remainder:240"],
-      [Residue, "label:[major_snow=,           *大雪, 十一月節=]", "remainder:255"],
-      [Residue, "label:[winter_solstice=,      *冬至, 十一月中=]", "remainder:270"],
-      [Residue, "label:[minor_cold=,           *小寒, 十二月節=]", "remainder:285"],
-      [Residue, "label:[major_cold=,           *大寒, 十二月中=]", "remainder:300"],
-      [Residue, "label:[start_of_spring=,      *立春, 正月節=]  ", "remainder:315"],
-      [Residue, "label:[rain_water=,           *雨水, 正月中=]  ", "remainder:330"], # 儀鳳暦では啓蟄
-      [Residue, "label:[awakening_of_insects=, *啓蟄, 二月節=]  ", "remainder:345"]  # 儀鳳暦では雨水
+      [Residue, "label:[vernal_equinox=,          *春分, 二月中=]  ", "remainder:0"  ],
+      [Residue, "label:[clear_and_bright=,        *清明, 三月節=]  ", "remainder:15" ],
+      [Residue, "label:[grain_rain=,              *穀雨, 三月中=]  ", "remainder:30" ],
+      [Residue, "label:[start_of_summer=,         *立夏, 四月節=]  ", "remainder:45" ],
+      [Residue, "label:[grain_full=,              *小満, 四月中=]  ", "remainder:60" ],
+      [Residue, "label:[grain_in_ear=,            *芒種, 五月節=]  ", "remainder:75" ],
+      [Residue, "label:[summer_solstice=,         *夏至, 五月中=]  ", "remainder:90" ],
+      [Residue, "label:[minor_heat=,              *小暑, 六月節=]  ", "remainder:105"],
+      [Residue, "label:[major_heat=,              *大暑, 六月中=]  ", "remainder:120"],
+      [Residue, "label:[start_of_autumn=,         *立秋, 七月節=]  ", "remainder:135"],
+      [Residue, "label:[limit_of_heat=,           *処暑, 七月中=]  ", "remainder:150"],
+      [Residue, "label:[white_dew=,               *白露, 八月節=]  ", "remainder:165"],
+      [Residue, "label:[autumnal_equinox=,        *秋分, 八月中=]  ", "remainder:180"],
+      [Residue, "label:[cold_dew=,                *寒露, 九月節=]  ", "remainder:195"],
+      [Residue, "label:[frost_descent=,           *霜降, 九月中=]  ", "remainder:210"],
+      [Residue, "label:[start_of_winter=,         *立冬, 十月節=]  ", "remainder:225"],
+      [Residue, "label:[minor_snow=,              *小雪, 十月中=]  ", "remainder:240"],
+      [Residue, "label:[major_snow=,              *大雪, 十一月節=]", "remainder:255"],
+      [Residue, "label:[winter_solstice=,         *冬至, 十一月中=]", "remainder:270"],
+      [Residue, "label:[minor_cold=,              *小寒, 十二月節=]", "remainder:285"],
+      [Residue, "label:[major_cold=,              *大寒, 十二月中=]", "remainder:300"],
+      [Residue, "label:[start_of_spring=,         *立春, 正月節=]  ", "remainder:315"],
+      [Residue, 'label:[#{A:rain_water=,          *雨水},正月中=]  ', "remainder:330"], # 戊寅・儀鳳暦では啓蟄
+      [Residue, 'label:[#{B:awakening_of_insects=,*啓蟄},二月節=]  ', "remainder:345"]  # 戊寅・儀鳳暦では雨水
     ],
 
     [Residue,

data/lib/when_exe/region/shire.rb

@@ -127,7 +127,7 @@ module When
         module_eval %Q{
           def #{name}(date, parameter=nil)
             event_name = 'from_#{name}'
-            date  = date.frame.jul_trans(date, {:events=>[event_name]})
+            date  = date.frame.jul_trans(date, {:events=>[event_name], :precision=>When::DAY})
             y,m,d = date.cal_date
             h,n   = (m+5).divmod(7)
             dow   = (182 * h[0] + 30 * n + d - #{k}) % 7
@@ -222,7 +222,7 @@ module When
       'border'       => '00-01-02',
       'day_offset'   => -183,           # the day 183 days before summer solstice
       'cycle_offset' => Rational(1,4),  # summer solstice
-      'timezone'     => 9,              # JST
+      'time_basis'   => '+09:00',       # JST
       'rule_table'   => {
         365 => {'Length'=>[2]+[30]*6+[3]+[30]*6},
         366 => {'Length'=>[2]+[30]*6+[4]+[30]*6}

data/lib/when_exe/region/tibetan.rb

@@ -44,6 +44,80 @@ 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]",
+
+    [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
+
   module CalendarTypes
 
     #
@@ -83,11 +157,18 @@ module When
       def _normalize(args=[], options={})
         intercalary_month = When.Resource('_m:TibetanTerms::IntercalaryMonth::*')
         intercalary_day   = When.Resource('_m:TibetanTerms::IntercalaryDay::*')
-        @indices ||= [
-          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]}})
-        ]
+        @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]}})
+          ] :
+          [
+            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]}})
+          ]
         @label       ||= When.Resource('_m:TibetanTerms::Tibetan')
         @epoch_in_CE ||= 0
         @type        ||= 1
@@ -113,6 +194,7 @@ module When
              'A0'=>(22.0+28.0/126)
             }
           end
+        @note = 'TibetanNotes'
         super
       end
 

data/lib/when_exe/region/world.rb

@@ -111,7 +111,7 @@ module When
         module_eval %Q{
           def #{name}(date, parameter=nil)
             event_name = 'from_#{name}'
-            date  = When.Calendar('World').jul_trans(date, {:events=>[event_name]})
+            date  = When.Calendar('World').jul_trans(date, {:events=>[event_name], :precision=>When::DAY})
             y,m,d = date.cal_date
             dow   = (m % 6 == 0 && d == 31) ? 7-#{k} : ([4,6,2][m % 3] + d - #{k}) % 7
             return date if dow == 0

data/lib/when_exe/timestandard.rb

@@ -54,9 +54,9 @@ module When::TimeStandard
      [2454832.5, 34.0],
      [2456109.5, 35.0]]
 
-  DeltaT  = [                                                       63.47, # 1999
-     63.83, 64.09, 64.30, 64.47, 64.57, 64.69, 64.85, 65.15, 65.46, 65.78, # 2000-
-     66.07, 66.32, 66.60                                                   # 2010-
+  DeltaT  = [                                                                63.467, # 1999
+     63.827, 64.092, 64.300, 64.473, 64.573, 64.689, 64.846, 65.145, 65.456, 65.779, # 2000-
+     66.070, 66.324, 66.603, 66.909                                                  # 2010-
   ]
 
   class << self
@@ -304,6 +304,83 @@ module When::TimeStandard
   # @private
   DeltaThreshold = DeltaT[-2] - delta_t_observed_poly(YearThreshold)
 
+  #
+  # When::TM::Calendar のための TimeBasis の初期化
+  #
+  # @private
+  module TimeBasis
+
+    module FixedTimeBasis
+
+      private
+
+      # 太陽黄経のための日付境界のオフセットを反映した通日
+      #
+      # @param [Numeric] t ユリウス日(Terrestrial Time)
+      #
+      # @return [Integer]
+      #
+      def solar_sdn(t)
+        (t + 0.5 + @_time_basis_offset[0]).floor
+      end
+
+      # 月の位相のための日付境界のオフセットを反映した通日
+      #
+      # @param [Numeric] t ユリウス日(Terrestrial Time)
+      #
+      # @return [Integer]
+      #
+      def lunar_sdn(t)
+        (t + 0.5 + @_time_basis_offset[-1]).floor
+      end
+    end
+
+    module ApparentTimeBasis
+
+      private
+
+      # 太陽黄経のための日付境界のオフセットを反映した通日
+      #
+      # @param [Numeric] t ユリウス日(Terrestrial Time)
+      #
+      # @return [Integer]
+      #
+      def solar_sdn(t)
+        time_basis.time_standard.from_dynamical_date(t + 0.5 + @_time_basis_offset[0]).floor
+      end
+
+      # 月の位相のための日付境界のオフセットを反映した通日
+      #
+      # @param [Numeric] t ユリウス日(Terrestrial Time)
+      #
+      # @return [Integer]
+      #
+      def lunar_sdn(t)
+        time_basis.time_standard.from_dynamical_date(t + 0.5 + @_time_basis_offset[-1]).floor
+      end
+    end
+
+    #
+    # When::TM::Calendar のための TimeBasis の初期化
+    #
+    def _normalize_time_basis
+
+      @_time_basis ||= @time_basis || (@location ? @location.long / When::Coordinates::Spatial::DEGREE * 240 : When.utc)
+      @_time_basis   = When::Parts::Locale._split(@_time_basis) if @_time_basis.kind_of?(String)
+      @_time_basis   = [@_time_basis] unless @_time_basis.kind_of?(Array)
+      @_time_basis   = @_time_basis.map {|clock| When.Clock(clock)}
+      @_time_basis_offset = @_time_basis.map {|clock| -clock.universal_time / When::TM::Duration::DAY}
+
+      @time_basis = @_time_basis[0] if @time_basis
+
+      if @_time_basis[0].time_standard.kind_of?(LocalApparentTime)
+        class << self; include ApparentTimeBasis ; end
+      else
+        class << self; include FixedTimeBasis    ; end
+      end
+    end
+  end
+
   #
   # 時刻系のひながた
   #
@@ -497,7 +574,8 @@ module When::TimeStandard
     # @return [Numeric] local apparent time
     #
     def from_dynamical_time(time)
-      super(time) + When::TM::Duration::DAY * @datum.equation_of_time(When::TM::JulianDate._t_to_d(time))
+      super(time) + When::TM::Duration::DAY * (@location.long  / (360.0 * When::Coordinates::Spatial::DEGREE) +
+                                               @datum.equation_of_time(When::TM::JulianDate._t_to_d(time)))
     end
 
     private
@@ -505,7 +583,7 @@ module When::TimeStandard
     # オブジェクトの正規化
     def _normalize(args=[], options={})
       @location ||= '_l:long=0&lat=0'
-      @location   = When.Resource(@location.gsub(/%26/, '&')) if @location.kind_of?(String)
+      @location   = When.Resource(@location) if @location.kind_of?(String)
       @datum      = When.Resource(@datum    || '_ep:Earth'       )
       super
     end
@@ -556,11 +634,11 @@ module When::TimeStandard
       d, t = [-1, +1].map {|v| @formula.day_event(date, v, When.Resource('_ep:Sun'), @height)}
 
       if    date < d # after midnight
-        t = @formula.sun_set(date-1, @height)
+        t = @formula.sunset(date-1, @height)
         f = (date - t) / (d - t) / 2 - 0.25
 
       elsif date > t # before midnight
-        d = @formula.sun_rise(date+1, @height)
+        d = @formula.sunrise(date+1, @height)
         f = (date - t) / (d - t) / 2 - 0.25
 
       else           # day time