when_exe 0.3.7 → 0.3.8

data/lib/when_exe/region/shire.rb

@@ -180,7 +180,7 @@ module When
     #
     # @private
     def _to_date_for_note(date)
-      date = When::ShireG ^ date unless date.frame.label.to_s == 'Shire'
+      date = When::Shire ^ date unless date.frame.label.to_s == 'Shire'
       date
     end
 
@@ -209,32 +209,15 @@ module When
       'label'   => 'Shire::Shire',
       'indices' => _shire_indices,
       'border'       => '00-00-02',
+      'engine_day'   =>   -9,           # Jun 1st is 01-09
       'day_offset'   => -183,           # the day 183 days before summer solstice
       'cycle_offset' => Rational(1,4),  # summer solstice
-      'time_basis'   => '+09:00',       # JST
+    # 'time_basis'   => '+09:00',       # JST
       'rule_table'   => {
         365 => {'Length'=>[2]+[30]*6+[3]+[30]*6, 'IDs'=>_IDs},
         366 => {'Length'=>[2]+[30]*6+[4]+[30]*6, 'IDs'=>_IDs}
       },
       'note'   => 'ShireWeek'
     }]
-
-    #
-    # Shire Calendar based on Gregorian Date
-    #
-    ShireG =  [CyclicTableBased, {
-      'label'   => 'Shire::Shire',
-      'origin_of_LSC' => 1721060-10,
-      '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, 'IDs'=>_IDs},
-        366 => {'Length'=>[2]+[30]*6+[4]+[30]*6, 'IDs'=>_IDs}
-      },
-      'note'   => 'ShireWeek'
-    }]
   end
 end

data/lib/when_exe/region/thai.rb

@@ -226,13 +226,13 @@ module When
       def _normalize(args=[], options={})
         @origin_of_LSC ||=  2392666
         @origin_of_MSC ||=     1201
-        @epoch_in_CE   ||=     1839
+        @epoch_in_CE   ||=      638
         @before = @after =  'ThaiC'
         @indices       ||= ThaiP::Indices
         pattern        ||= Pattern.dup
         if @patch
           @patch.scan(/(\d+)([ABC])/i) do |year,type|
-            pattern[year.to_i-@epoch_in_CE] = type.upcase
+            pattern[year.to_i-(@origin_of_MSC+@epoch_in_CE)] = type.upcase
           end
         end
         @rule_table    = {

data/lib/when_exe/region/tibetan.rb

@@ -170,9 +170,9 @@ module When
             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       ||= 'Tibetan::Tibetan'
-        @epoch_in_CE ||= 0
-        @type        ||= 1
+        @label      ||= 'Tibetan::Tibetan'
+        @diff_to_CE ||= 0
+        @type       ||= 1
         @parameter = case @type.to_i
           when 1
             {'M0'=>(60+15),

data/lib/when_exe/region/tranquility.rb

@@ -0,0 +1,208 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 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
+
+    Tranquility = [self, [
+      "locale:[=en:, ja=ja:, alias]",
+      "names:[Tranquility=]",
+      "[Tranquility=en:Tranquility_Calendar, 静かの海の暦=]",
+
+      [self,
+        "names:[IntercalaryDay=en:Intercalation, 閏日=ja:%%<閏>]",
+        "[%0sAldrin Day=, %0s閏日=]"
+      ]
+    ]]
+  end
+
+  #
+  # Tranquility Week
+  #
+  class CalendarNote::TranquilityWeek < CalendarNote::Week
+
+    #
+    # Tranquility Note
+    #
+    Notes = [When::BasicTypes::M17n, [
+      "locale:[=en:, ja=ja:, alias]",
+      "names:[Tranquility]",
+
+      # Notes for year ----------------------------
+      [When::BasicTypes::M17n,
+        "names:[year]"
+      ],
+
+      # Notes for month ----------------------------
+      [When::BasicTypes::M17n,
+        "names:[month]",
+        [When::BasicTypes::M17n,
+          "names:[Month]",
+          "[Archimedes,                        アルキメデス                                         ]",
+          "[Brahe=en:Tycho_Brahe,              ブラーエ=ja:%%<ティコ・ブラーエ>                     ]",
+          "[Copernicus=en:Nicolaus_Copernicus, コペルニクス=ja:%%<ニコラウス・コペルニクス>         ]",
+          "[Darwin=en:Charles_Darwin,          ダーウィン=ja:%%<チャールズ・ダーウィン>             ]",
+          "[Einstein=en:Albert_Einstein,       アインシュタイン=ja:%%<アルベルト・アインシュタイン> ]",
+          "[Faraday=en:Michael_Faraday,        ファラデー=ja:%%<マイケル・ファラデー>               ]",
+          "[Galileo=en:Galileo_Galilei,        ガリレオ=ja:%%<ガリレオ・ガリレイ>                   ]",
+          "[Hippocrates,                       ヒポクラテス                                         ]",
+          "[Imhotep,                           イムホテプ                                           ]",
+          "[Jung=en:Carl_Jung,                 ユング=ja:%%<カール・グスタフ・ユング>               ]",
+          "[Kepler=en:Johannes_Kepler,         ケプラー=ja:%%<ヨハネス・ケプラー>                   ]",
+          "[Lavoisier=en:Antoine_Lavoisier,    ラヴォアジエ=ja:%%<アントワーヌ・ラヴォアジエ>       ]",
+          "[Mendel=en:Gregor_Mendel,           メンデル=ja:%%<グレゴール・ヨハン・メンデル>         ]"
+        ]
+      ],
+
+      # Notes for day ----------------------------
+      [When::BasicTypes::M17n,
+        "names:[day]",
+        [When::BasicTypes::M17n,
+          "names:[Week]",
+          [DayOfWeek, "label:[Friday,    金曜日, /date/day_names/5]", {'delta'=>  7}],
+          [DayOfWeek, "label:[Saturday,  土曜日, /date/day_names/6]", {'delta'=>  7}],
+          [DayOfWeek, "label:[Sunday,    日曜日, /date/day_names/0]", {'delta'=>  7}],
+          [DayOfWeek, "label:[Monday,    月曜日, /date/day_names/1]", {'delta'=>  7}],
+          [DayOfWeek, "label:[Tuesday,   火曜日, /date/day_names/2]", {'delta'=>  7}],
+          [DayOfWeek, "label:[Wednesday, 水曜日, /date/day_names/3]", {'delta'=>  7}],
+          [DayOfWeek, "label:[Thursday,  木曜日, /date/day_names/4]", {'delta'=>  7}],
+          [DayOfWeek, "label:[Armstrong Day=en:Neil_Armstrong, アームストロングの日=ja:%%<ニール・アームストロング>]", {'delta'=> 366}],
+          [DayOfWeek, "label:[Aldrin Day=en:Buzz_Aldrin,       オルドリンの日=ja:%%<バズ・オルドリン>]",               {'delta'=>1461}]
+        ],
+
+        "[Common_Week]"
+      ]
+    ]]
+
+    # @private
+    IndexOfWeek = [0, 1, 2, 3, 4, 5, 7, nil, 6]
+
+    # Just or last friday
+    #
+    # @param [When::TM::TemporalPosition] date
+    # @param [nil] parameter (not used)
+    #
+    # @return [When::TM::TemporalPosition]
+    #
+    def friday(date, parameter=nil)
+      date  = _to_date_for_note(date)
+      y,m,d = date.cal_date
+      dow   = (+d-1) % 7
+      if date.length(When::MONTH) == 29 && +d >= 28
+        dow = (m == 8) ? (d*1 == 27 ? 6 : 7) :
+                         (d   == 28 ? 6 : 7)
+      end
+      date -= When::P1D * dow unless dow == 0
+      date.events = [@days_of_week[0]]
+      date
+    end
+
+    #
+    # What day is it the specified date?
+    #
+    # @param [When::TM::TemporalPosition] date
+    # @param [When::TM::CalDate] base
+    #
+    # @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
+      dow    = d*0 == 0 ? (d<=28 ? (d-1) % 7 : d-22) : 8
+      length = (base||date).length(When::MONTH) - 21
+      index  = (length == 7 || m == 13) ? dow : IndexOfWeek[dow]
+      {:value=>@days_of_week[dow], :position=>[index, length]}
+    end
+
+    #
+    # Week labels
+    #
+    # @param [When::TM::TemporalPosition] date
+    #
+    # @return [Array<When::CalendarNote::Week::DayOfWeek>]
+    #
+    def week_labels(date)
+      date = _to_date_for_note(date)
+      date.length(When::MONTH) == 28 ? @days_of_week.child[0...7] :
+      date.month == 13               ? @days_of_week.child[0...8] :
+                                       @days_of_week.child[0...6] + [@days_of_week.child[8], @days_of_week.child[6]]
+    end
+
+    #
+    # convert any date to Tranquility calendar date
+    #
+    # @private
+    def _to_date_for_note(date)
+      date = When::Tranquility ^ date unless date.frame.equal?(When::Tranquility)
+      date
+    end
+
+    private
+
+    # Normalization fo object
+    # @private
+    def _normalize(args=[], options={})
+      @event ||= 'friday'
+      super
+    end
+  end
+
+  module CalendarTypes
+
+    #
+    # Tranquility calendar based on Gregorian calendar
+    #
+    class Tranquility < YearLengthTableBased
+
+      # @private
+      Normal_IDS = (1..28).to_a
+
+      # @private
+      Long_IDS   = (1..29).to_a
+
+      # @private
+      Leap_IDS   = (1..27).to_a + [When.Pair(27,1), 28]
+
+      private
+
+      #
+      # Object Normalization
+      #
+      def _normalize(args=[], options={})
+        @label         ||= 'Tranquility::Tranquility'
+        @indices       ||= [
+          When.Index('TranquilityWeekNotes::month::Month', {:unit =>13}),
+          When.Index({:branch=>{1=>When.M17n('Tranquility::IntercalaryDay')[0]}})
+        ]
+        @origin_of_MSC ||= -1968
+        @diff_to_CE    ||=     0
+        @engine_month  ||=     7
+        @engine_day    ||=    21
+        @note          ||= 'TranquilityWeek'
+        @rule_table    ||= {
+          365 => {'Length'=>[28]*12 + [29]},
+          366 => {'Length'=>[28]* 7 + [29] + [28]*4 + [29]}
+        }
+        super
+      end
+
+      #
+      # day arrangement pattern
+      #
+      def _ids_(date)
+        y, m = date
+        case m
+        when nil ; super
+        when 12  ; Long_IDS
+        when  7  ; @engine._length([+y + 1, 1]) == 28 ?  Normal_IDS : Leap_IDS
+        else     ; Normal_IDS
+        end
+      end
+    end
+  end
+end

data/lib/when_exe/region/vanishing_leprechaun.rb

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 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
+
+    VanishingLeprechaun = [self, [
+      "locale:[=en:, ja]",
+      "names:[VanishingLeprechaun=http://suchowan.at.webry.info/201110/article_12.html, 消える小妖精=]"
+    ]]
+  end
+
+  module CalendarTypes
+
+    class VanishingLeprechaun < EphemerisBased
+
+      # 月初の通日
+      #
+      # @param  [Integer] m 通月
+      #
+      # @return [Integer] 月初の通日
+      #
+      def _new_month_(m)
+        div, mod = m.divmod(@cycle_months)
+        div * @cycle_days + @offset_table[m % @cycle_months] + @origin_of_LSC
+      end
+
+      private
+
+      #
+      # Object Normalization
+      #
+      def _normalize(args=[], options={})
+        @label         ||= 'VanishingLeprechaun::VanishingLeprechaun'
+        @origin_of_LSC ||= -372154
+        @origin_of_MSC ||=   -5731
+        @epoch_in_CE   ||=       0
+        _normal = [31] * 5 + [30] * 7
+        _leap   = [31] * 6 + [30] * 6
+        _length_table = ((_normal * 3 + _leap) * 4 + _normal + ((_normal * 3 + _leap) * 4)) * 53 + [30]
+        @offset_table = _length_table.inject([0]) {|sum,len| sum << (sum.last + len)}
+        @cycle_days   = @offset_table.pop
+        @cycle_months = @offset_table.length
+        super
+      end
+    end
+  end
+end

data/lib/when_exe/region/vietnamese.rb

@@ -225,11 +225,11 @@ module When
       "locale:[=ja:, en=en:, alias]",
       'area:[ベトナム#{?LY=LY}#{&DN=DN}=ja:%%<元号>#%.<ベトナム>,Vietnam#{?LY=LY}#{&DN=DN}=en:Vietnam]',
       [self,
-	"period:[前李朝,Early Lý Dynasty]",
+	"period:[前李朝=zh:%%<前李朝>,Early Lý Dynasty]",
 	["[天徳,alias:大徳]1","@F","name=[李賁];544.01^Chinese0445", "548.03.21="],
-	["[桃郎王]1",  "@A","name=[李天宝];548.03.21", "555="],
-	["[趙越王]1",  "@A","name=[趙光復];548.03.21"],
-	["[後李南帝]1","@A","name=[李仏子];571", "590^Chinese0523", "602="]
+	["[桃郎王=zh:%%<李天寶>]1",  "@A","name=[李天宝=zh:%%<李天寶>];548.03.21", "555="],
+	["[趙越王=zh:%%<趙光復>]1",  "@A","name=[趙光復=zh:%%<趙光復>];548.03.21"],
+	["[後李南帝=zh:%%<李佛子>]1","@A","name=[李仏子=zh:%%<李佛子>];571", "590^Chinese0523", "602="]
       ],
       [self,
 	"period:[呉朝,Ngô Dynasty]",

data/lib/when_exe/region/world.rb

@@ -46,14 +46,14 @@ module When
         "names:[day]",
         [When::BasicTypes::M17n,
           "names:[Week]",
-          [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:[Saturday,  土曜日]", {'delta'=>7}],
-          [DayOfWeek, "label:[Worldsday, 週外日]", {'delta'=>183}],
+          [DayOfWeek, "label:[Sunday,     日曜日, /date/day_names/0]", {'delta'=>7}],
+          [DayOfWeek, "label:[Monday,     月曜日, /date/day_names/1]", {'delta'=>7}],
+          [DayOfWeek, "label:[Tuesday,    火曜日, /date/day_names/2]", {'delta'=>7}],
+          [DayOfWeek, "label:[Wednesday,  水曜日, /date/day_names/3]", {'delta'=>7}],
+          [DayOfWeek, "label:[Thursday,   木曜日, /date/day_names/4]", {'delta'=>7}],
+          [DayOfWeek, "label:[Friday,     金曜日, /date/day_names/5]", {'delta'=>7}],
+          [DayOfWeek, "label:[Saturday,   土曜日, /date/day_names/6]", {'delta'=>7}],
+          [DayOfWeek, "label:[Worldsday=, 週外日=]", {'delta'=>366}],
         ],
 
         "[Common_Week]"
@@ -159,13 +159,9 @@ module When
     #
     # World calendar based on Gregorian calendar
     #
-    World =  [CyclicTableBased, {
+    World =  [YearLengthTableBased, {
       'label'   => 'World::World',
-      'origin_of_LSC'    => 1721060,
       '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'=>[31,30,30]*3 + [31,30,31]},
         366  => {'Length'=>[31,30,30,31,30,31] *2}
       },

data/lib/when_exe/region/world_season.rb

@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 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
+
+    WorldSeason = [self, [
+      "locale:[=en:, ja=ja:, alias]",
+      "names:[WorldSeason=]",
+      "[WorldSeason=http://calendars.wikia.com/wiki/World_Season_Calendar, アシモフの季節暦=]"
+    ]]
+  end
+
+  #
+  # WorldSeason Week
+  #
+  class CalendarNote::WorldSeasonWeek < CalendarNote::Week
+
+    #
+    # WorldSeason Note
+    #
+    Notes = [When::BasicTypes::M17n, [
+      "locale:[=en:, ja=ja:, alias]",
+      "names:[WorldSeason]",
+
+      # Notes for year ----------------------------
+      [When::BasicTypes::M17n,
+        "names:[year]"
+      ],
+
+      # Notes for month ----------------------------
+      [When::BasicTypes::M17n,
+        "names:[month]",
+        [When::BasicTypes::M17n,
+          "names:[Month]",
+          "[A=] ",
+          "[B=] ",
+          "[C=] ",
+          "[D=] "
+        ]
+      ],
+
+      # Notes for day ----------------------------
+      [When::BasicTypes::M17n,
+        "names:[day]",
+        [When::BasicTypes::M17n,
+          "names:[Week]",
+          [DayOfWeek, "label:[Sunday,     日曜日, /date/day_names/0]", {'delta'=>  7}],
+          [DayOfWeek, "label:[Monday,     月曜日, /date/day_names/1]", {'delta'=>  7}],
+          [DayOfWeek, "label:[Tuesday,    火曜日, /date/day_names/2]", {'delta'=>  7}],
+          [DayOfWeek, "label:[Wednesday,  水曜日, /date/day_names/3]", {'delta'=>  7}],
+          [DayOfWeek, "label:[Thursday,   木曜日, /date/day_names/4]", {'delta'=>  7}],
+          [DayOfWeek, "label:[Friday,     金曜日, /date/day_names/5]", {'delta'=>  7}],
+          [DayOfWeek, "label:[Saturday,   土曜日, /date/day_names/6]", {'delta'=>  7}],
+          [DayOfWeek, "label:[OutOfWeek=, 週外日=]", {'delta'=>366}]
+        ],
+
+        "[Common_Week]"
+      ]
+    ]]
+
+    fixed_week_definitions(7*13)
+
+  end
+
+  module CalendarTypes
+    #
+    # WorldSeason calendar based on Gregorian calendar
+    #
+    WorldSeason =  [YearLengthTableBased, {
+      'label'   => 'WorldSeason::WorldSeason',
+      'indices' => [
+          When.Index('WorldSeasonWeekNotes::month::Month', {:unit =>4}),
+         When::Coordinates::DefaultDayIndex
+        ],
+      'engine_day'       => -10, # 11th day before new year
+      'rule_table'       => {
+        365  => {'Length'=>[91] * 3 + [92]},
+        366  => {'Length'=>[91, 92] * 2}
+      },
+      'note'   => 'WorldSeasonWeek'
+    }]
+  end
+end