when_exe 0.3.4 → 0.3.5

data/lib/when_exe/region/iranian.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
     IranianTerms = [self, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/, ar=http://ar.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, ar=ar:, alias=ja:]",
-      "names:[IranianTerms]",
+      "names:[IranianTerms=]",
       "[SolarHejri=en:Iranian_calendars#Modern_calendar_.28Solar_Hejri.29, ヘジラ太陽暦=ja:%%<イラン暦>]",
 
       [self,

data/lib/when_exe/region/islamic.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
     IslamicTerms = [self, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/, ar=http://ar.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, ar=ar:, alias]",
-      "names:[IslamicTerms]",
+      "names:[IslamicTerms=]",
       "[TabularIslamic=en:Islamic_calendar, イスラーム暦=ja:ヒジュラ暦]",
       "[EphemerisBasedIslamic=en:Islamic_calendar, イスラーム暦=ja:ヒジュラ暦]",
 
@@ -38,7 +38,7 @@ module When
     # ヒジュラ紀元
      Hijra = [self, [
       "namespace:[en=http://en.wikipedia.org/wiki/]",
-      "area:[Islamic]",
+      "area:[Islamic=]",
       ["[AfterHijra=en:Islamic_calendar,*alias:AH]1.1.1", "Calendar Epoch", "01-01-01^TabularIslamic"],
     ]]
   end

data/lib/when_exe/region/japanese.rb

@@ -12,7 +12,7 @@ module When
     JapaneseTerms = [self, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
-      "names:[JapaneseTerms]",
+      "names:[JapaneseTerms=]",
 
       [self,
         "names:[Month, 月=ja:%%<月_(暦)>]",

data/lib/when_exe/region/japanese_notes.rb

@@ -8,61 +8,7 @@
 require 'when_exe/region/ephemeric_notes'
 require 'when_exe/region/japanese_residues'
 
-
-class When::TM::CalendarEra
-
-  kyoto = '?time_basis=(LAT?long=135.4520E&lat=35.0117N)'
-  tokyo = '?time_basis=+09:18:59'
-  jst   = '?time_basis=+09:00&intercalary_span=3'
-
-  # Japanese Luni-Solar Calendar Series for JapaneseNote
-  JapaneseLuniSolarSeries = [self, [
-    'namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]',
-    'locale:[=en:, ja=ja:, alias]',
-    'area:[JapaneseLuniSolarSeries=, 日本の暦月=]',
-    ['[平朔儀鳳暦=]-660.01.01', '@F',  "-660-01-01^Chinese::平朔儀鳳暦"],
-    ['[元嘉暦]454.01.01',       '@CR',  "454-01-01^Chinese::元嘉暦"],
-    ['[儀鳳暦]697.01.01',       '@CR',  "697-01-01^Chinese::麟徳暦"],
-    ['[大衍暦]764.01.01',       '@CR',  "764-01-01^Chinese::大衍暦"],
-    ['[五紀暦]858.01.01',       '@CR',  "858-01-01^Chinese::五紀暦"],
-    ['[宣明暦]862.01.01',       '@CR',  "862-01-01^Chinese::宣明暦"],
-    ['[前貞享暦=]1685.01.01',   '@CR', "1685-01-01^ChineseLuniSolar#{kyoto}"],
-    ['[貞享暦]1687.01.01',      '@CR', "1687-01-01^ChineseLuniSolar#{kyoto}"],
-    ['[貞享補暦A=]1753.01.01',  '@CR', "1753-01-01^ChineseLuniSolar#{kyoto}"],
-    ['[貞享補暦B=]1754.01.01',  '@CR', "1754-01-01^ChineseLuniSolar#{kyoto}"],
-    ['[宝暦暦]1755.01.01',      '@CR', "1755-01-01^ChineseLuniSolar#{kyoto}"],
-    ['[修正宝暦暦=]1771.01.01', '@CR', "1771-01-01^ChineseLuniSolar#{kyoto}"],
-    ['[寛政暦]1798.01.01',      '@CR', "1798-01-01^ChineseLuniSolar#{kyoto}"],
-    ['[天保暦]1844.01.01',      '@CR', "1844-01-01^ChineseLuniSolar#{kyoto}"], # 京都平均太陽時
-    ['[JLSA=,旧暦A=]1872.12.03','@CR', "1872-12-03^ChineseLuniSolar#{tokyo}"], # 東京平均太陽時
-    ['[JLSB=,旧暦B=]1887.11.18','@CR', "1887-11-18^ChineseLuniSolar#{jst}"]    # 日本標準時
-  ]]
-
-  # Japanese Solar Calendar Series for JapaneseNote
-  JapaneseSolarSeries = [self, [
-    'namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]',
-    'locale:[=en:, ja=ja:, alias]',
-    'area:[JapaneseSolarSeries=, 日本の節月=]',
-    ['[平朔儀鳳暦=]-661.01.01', '@F',  "-661-01-01^Chinese::平朔儀鳳暦(節月)"], # 年の始めに遡って開始(実際は12.22)
-    ['[元嘉暦]454.01.12',       '@CR',  "454-01-12^Chinese::元嘉暦(節月)"],
-    ['[儀鳳暦]696.12.27',       '@CR',  "696-12-27^Chinese::麟徳暦(節月)"],
-    ['[大衍暦]764.01.06',       '@CR',  "764-01-06^Chinese::大衍暦(節月)"],
-    ['[五紀暦]857.12.19',       '@CR',  "857-12-19^Chinese::五紀暦(節月)"],
-    ['[宣明暦]862.01.03',       '@CR',  "862-01-03^Chinese::宣明暦(節月)"],
-    ['[前貞享暦=]1685.01.01',   '@CR', "1685-01-01^Chinese::前貞享暦(節月)"],
-    ['[貞享暦]1687.01.08',      '@CR', "1687-01-08^Chinese::貞享暦(節月)"],
-    ['[貞享補暦A=]1752.12.30',  '@CR', "1752-12-30^Chinese::貞享補暦A(節月)"],
-    ['[貞享補暦B=]1753.12.19',  '@CR', "1753-12-19^Chinese::貞享補暦B(節月)"],
-    ['[宝暦暦]1755.01.07',      '@CR', "1755-01-07^Chinese::宝暦暦(節月)"],
-    ['[修正宝暦暦=]1771.01.11', '@CR', "1771-01-11^Chinese::修正宝暦暦(節月)"],
-    ['[寛政暦]1798.01.12',      '@CR', "1798-01-12^Chinese::寛政暦(節月)"],
-    ['[天保暦]1844.01.14',      '@CR', "1844-01-14^ChineseSolar#{kyoto}"], # 京都平均太陽時
-    ['[JSA=,旧暦A=]1872.11.26', '@CR', "1872-11-26^ChineseSolar#{tokyo}"], # 東京平均太陽時
-    ['[JSB=,旧暦B=]1887.11.26', '@CR', "1887-11-26^ChineseSolar#{jst}"]    # 日本標準時
-  ]]
-end
-
-class When::CalendarTypes::CalendarNote
+class When::CalendarNote
 
   #
   # 日本暦注
@@ -84,7 +30,7 @@ class When::CalendarTypes::CalendarNote
     # 日本暦注の要素
     #
     # @private
-    class Note < When::CalendarTypes::CalendarNote::NoteElement
+    class Note < When::CalendarNote::NoteElement
     end
 
     #
@@ -92,7 +38,7 @@ class When::CalendarTypes::CalendarNote
     #
     NoteObjects = [When::BasicTypes::M17n, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
-      "locale:[=ja:]",
+      "locale:[=ja:, en=en:]",
       "names:[日本暦注]",
 
       # 年の暦注 ----------------------------
@@ -136,7 +82,7 @@ class When::CalendarTypes::CalendarNote
       # 月の暦注 ----------------------------
       [When::BasicTypes::M17n,
         "names:[月]",
-        [Note, 0xFFFF, "label:[月名=ja:%%<月_(暦)>#%.<日本の和風月名>]",
+        [Note, 0xFFFF, "label:[月名=ja:%%<月_(暦)>#%.<日本の和風月名>, Month]",
                                              'position:月建'],                               #  0: 月の和名
       # [Note, 0xFFFF, "label:[干支]",       'position:共通'],                               #     干支
       # [Note, 0xFFFF, "label:[干=ja:%%<十干>]",
@@ -203,7 +149,7 @@ class When::CalendarTypes::CalendarNote
 
         [Note, 0x07F8, "label:[甘露=]",      'position:上段 上段 上段 上段', 'suffix:日'],   # 22: 七曜 廿七宿
         [Note, 0x07F8, "label:[金剛峯=]",    'position:上段 上段 上段 上段'],                # 23: 七曜 廿七宿
-        [Note, 0x07F8, "label:[羅刹=]",      'position:中段 中段 上段 上段'],                # 24: 七曜 廿七宿
+        [Note, 0x07F8, "label:[羅刹=]",      'position:上段 上段 上段 上段'],                # 24: 七曜 廿七宿
 
         [Note, 0x3FFC, "label:[大將軍=ja:%%<大将軍_(方位神)>]",
                                              'position:上段 上段 上段 上段',   'suffix:-'],  # 25: 干支 節年
@@ -213,11 +159,11 @@ class When::CalendarTypes::CalendarNote
                                              'position:上段 上段 上段 上段',   'suffix:-'],  # 27: 干支
         [Note, 0x3FFC, "label:[歳下食=ja:%%<暦注下段>#%.<歳下食>]",
                                              'position:上段 上段 上段 上段'],                # 28: 干支 節年
-        [Note, 0x3FFC, "label:[忌遠行=]",    'position:上段 中段 上段 上段'],                # 29: 支 節月
-        [Note, 0x3FFC, "label:[忌夜行=]",    'position:上段 中段 上段 上段'],                # 30: 支 節月
+        [Note, 0x3FFC, "label:[忌遠行=]",    'position:上段 上段 上段 上段'],                # 29: 支 節月
+        [Note, 0x3FFC, "label:[忌夜行=]",    'position:上段 上段 上段 上段'],                # 30: 支 節月
         [Note, 0x3FFC, "label:[下食時=ja:%%<暦注下段>#%.<時下食>]",
                                              'position:上段 上段 上段 上段',   'suffix:-'],  # 31: 支 節月 貞享暦で一部廃止
-        [Note, 0x3FFC, "label:[天間=]",      'position:上段 中段 上段 中段上'],              # 32: 干支 節月
+        [Note, 0x3FFC, "label:[天間=]",      'position:上段 上段 上段 中段上'],              # 32: 干支 節月
         [Note, 0x3FFC, "label:[不視病=]",    'position:上段 上段 上段 上段'],                # 33: 干
         [Note, 0x3FFC, "label:[不問疾=]",    'position:上段 上段 上段 上段'],                # 34: 干
         [Note, 0x3FFC, "label:[不弔人=]",    'position:上段 上段 上段 上段'],                # 35: 支
@@ -229,13 +175,13 @@ class When::CalendarTypes::CalendarNote
         [Note, 0x3FFC, "label:[沐浴=]",      'position:中段 中段 中段 中段'],                # 40: 支 没滅凶会日×
         [Note, 0x3FFD, "label:[臘=ja:%%<臘日>]",
                                              'position:中段 中段 中段 中段', 'suffix:日'],   # 41: 支 太陽黄経
-        [Note, 0x3FFC, "label:[伐=]",        'position:上段 中段 中段 中段上', 'suffix:日'], # 42: 干支
+        [Note, 0x3FFC, "label:[伐=]",        'position:中段 中段 中段 中段上', 'suffix:日'], # 42: 干支
         [Note, 0x3FFC, "label:[五墓=ja:%%<暦注下段>#%.<五墓日>]",
-                                             'position:上段 上段 中段 中段下', 'suffix:日'], # 43: 干支
-        [Note, 0x3FFC, "label:[六蛇=]",      'position:上段 上段 中段 中段上'],              # 44: 干支 節月
-        [Note, 0x3FFC, "label:[七鳥=]",      'position:上段 上段 中段 中段上'],              # 45: 干支 節月
-        [Note, 0x3FFC, "label:[八龍=]",      'position:上段 上段 中段 中段上'],              # 46: 干支 節月
-        [Note, 0x3FFC, "label:[九虎=]",      'position:上段 中段 中段 中段上'],              # 47: 干支 節月
+                                             'position:中段 中段 中段 中段下', 'suffix:日'], # 43: 干支
+        [Note, 0x3FFC, "label:[六蛇=]",      'position:中段 中段 中段 中段上'],              # 44: 干支 節月
+        [Note, 0x3FFC, "label:[七鳥=]",      'position:中段 中段 中段 中段上'],              # 45: 干支 節月
+        [Note, 0x3FFC, "label:[八龍=]",      'position:中段 中段 中段 中段上'],              # 46: 干支 節月
+        [Note, 0x3FFC, "label:[九虎=]",      'position:中段 中段 中段 中段上'],              # 47: 干支 節月
         [Note, 0x07FF, "label:[没=ja:%%<没日>]",
                                              'position:中段 中段 中段 中段', 'suffix:日'],   # 48: 太陽黄経
         [Note, 0xFFF8, "label:[日食]",       'position:中段 中段 中段 中段'],                # 49: 日食表
@@ -323,6 +269,7 @@ class When::CalendarTypes::CalendarNote
                                              'position:上段 上段 中段 中段上', 'suffix:日'], #100: 干支 節月
         [Note, 0x3FFF, "label:[雑事吉=]",    'position:雑事吉'],                             #101: 干支 節月(宣明暦以前)/暦月(貞享暦以降)
         [Note, 0x07FF, "label:[小字注=]",    'position:下段小字 下段小字 下段小字 下段小字'],#102: 干支 節月(宣明暦以前)/暦月(貞享暦以降)
+        [Note, 0x3800, "label:[鬼宿]",       'position:仮名暦'],                             #103: 廿八宿
       ]
     ]]
 
@@ -468,6 +415,7 @@ class When::CalendarTypes::CalendarNote
           cal4note = Cal4Note.new(date.frame, date.frame.twin)
           @range =
             case cal4note.l_calendar.formula[-1]
+            when When::Ephemeris::ChineseTrueLunation::JujiMethods ; 11 # 江戸時代の暦
             when When::Ephemeris::ChineseTrueLunation
               date.frame.twin =~ /戊寅|麟徳/ ? 1 : 10 # 唐代定朔暦(儀鳳暦 or 宣明暦)
             when When::Ephemeris::MeanLunation   ;  0 # 唐代以前平朔暦(元嘉暦)
@@ -487,7 +435,7 @@ class When::CalendarTypes::CalendarNote
         @cal4note  = cal4note
         @o_date    = date
         @l_date    = @cal4note.l_calendar ^ date
-        @m_date    = date.frame.kind_of?(When::CalendarTypes::Julian) ? @l_date : @o_date
+        @m_date    = date.frame.kind_of?(When::CalendarTypes::Christian) ? @l_date : @o_date
         @s_date    = @cal4note.s_calendar ^ date
       end
     end
@@ -499,7 +447,7 @@ class When::CalendarTypes::CalendarNote
     # @param [When::TM::TemporalPosition] date 暦注を計算する日時
     #   (date が When::TM::TemporalPosition でない場合、When::TM::TemporalPosition に変換して使用する)
     # @param [Hash] options
-    #   :indices, :notes およびその他のキー => {When::CalendarTypes::CalendarNote#notes} を参照
+    #   :indices, :notes およびその他のキー => {When::CalendarNote#notes} を参照
     #
     # @return [Hash]               :notes が String の場合
     # @return [Array<Hash>]        上記に該当せず、:indices が Integer の場合
@@ -510,18 +458,91 @@ class When::CalendarTypes::CalendarNote
     #   :position => 具注暦でのその暦注の配置場所(String)
     #
     def notes(date, options={})
-      dates, indices, notes, conditions, options = _parse_note(date, options)
-      _result(indices.map {|i|
+      dates, indices, notes, persistence, conditions, options = _parse_note(date, options)
+      Notes.register(indices.map {|i|
         next [] unless i <= dates.precision
         send(NoteMethods[i-1], dates, notes[i-1], conditions)
-      }, options)
+      }, persistence, date.to_i)
+    end
+
+    # 太陽の位置 => 日時
+    #
+    # @param [When::TM::TemporalPosition] date 探す基準とする日時
+    # @param [Array<Numeric>] parameter 太陽の位置の分子と分母( num, den)
+    #
+    #   num 分子 (デフォルト   0 : 基準日時直後の春分)
+    #
+    #   den 分母 (デフォルト 360 : 検索範囲の長さ)
+    #
+    # @param [String] parameter   太陽の位置の分子と分母("#{ num }/#{ den }" の形式)
+    # @param [Integer] precision  取得したい時間位置の分解能(デフォルト date の分解能)
+    # @param [When::TM::Calendar] frame 暦法(ダミー)
+    #
+    # @return [When::TM::CalDate] date またはその直後に太陽の位置が指定の値になる日時
+    #
+    def term(date, parameter=nil, precision=date.precision, frame=nil)
+      dates  = _to_date_for_note(date)
+      result = dates.cal4note.s_terms.term(date, parameter)
+      patch  = SolarTerms::Patch[result.to_i]
+      return result unless patch
+      num, den  = parameter.kind_of?(String) ? parameter.split(/\//, 2) : parameter
+      num  = (num ||   0).to_f
+      den  = (den || 360).to_f
+      diff = (num - patch[0] + 1) % den - 1
+      return result if diff == 0
+      patched = result + When::DurationP1D * diff
+      result.cal_date[0..-2] = patched.cal_date[0..-2]
+      result.cal_date[-1]    = When::Coordinates::Pair.new(patched.cal_date[-1], -diff)
+      result
+    end
+
+    # 月の位相 => 日時
+    #
+    # @param [When::TM::TemporalPosition] date 探す基準とする日時
+    # @param [Array<Numeric>] parameter 月の位相の分子と分母( num, den)
+    #
+    #   num 分子 (デフォルト  0 : 基準日時直後の朔)
+    #
+    #   den 分母 (デフォルト 30 : 検索範囲の長さ)
+    #
+    # @param [String] parameter   月の位相の分子と分母("#{ num }/#{ den }" の形式)
+    # @param [Integer] precision  取得したい時間位置の分解能(デフォルト date の分解能)
+    # @param [When::TM::Calendar] frame 暦法(ダミー)
+    #
+    # @return [When::TM::CalDate] date またはその直後に月の位相が指定の値になる日時
+    #
+    def phase(date, parameter=nil, precision=date.precision, frame=nil)
+      dates  = _to_date_for_note(date)
+      note   = dates.cal4note.l_phases
+      result = note.phase(date, parameter)
+      return result if dates.o_date.frame.kind_of?(When::CalendarTypes::Christian)
+      num, den  = parameter.kind_of?(String) ? parameter.split(/\//, 2) : parameter
+      num  = (num ||  0).to_f
+      den  = (den || 30).to_f
+      return result unless den == 30
+      case num % 30
+      when 0     # 朔
+        return result if result.cal_date[-1] == 1
+        diff = result.cal_date[-1] < 15 ? -1 : +1
+      when 5..25 # 弦、望
+        return result unless note.formula.kind_of?(When::Ephemeris::ChineseTrueLunation)
+        time = result.kind_of?(When::TM::DateAndTime) ? result : note.phase(date, [num,den], When::SYSTEM)
+        return result if time.clk_time.universal_time >= When::TM::Duration::DAY/4 # 午前6時以降
+        diff = -1
+      else       # その他
+        return result
+      end
+      patched = result + When::DurationP1D * diff
+      result.cal_date[0..-2] = patched.cal_date[0..-2]
+      result.cal_date[-1]    = When::Coordinates::Pair.new(patched.cal_date[-1], -diff)
+      result
     end
 
     private
 
     # オブジェクトの正規化
     def _normalize(args=[], options={})
-      @prime ||= [%w(干支), %w(月名), %w(干支 六曜 廿四節気 祝祭日)]
+      @prime ||= [%w(干支), %w(月名), %w(七曜 干支 六曜 廿四節気 祝祭日)]
       super
     end
 
@@ -551,7 +572,7 @@ class When::CalendarTypes::CalendarNote
           pattern = ''
           while year == month
             length   = month.length(When::MONTH)
-            length   = -length if dates.o_date.frame.kind_of?(When::CalendarTypes::Julian) # 太陽暦
+            length   = -length if dates.o_date.frame.kind_of?(When::CalendarTypes::Christian) # 太陽暦
             pattern += '閏' if month[When::MONTH] * 0 == 1
             pattern += MonthPattern[length] || '改'
             month   += When::DurationP1M
@@ -590,7 +611,7 @@ class When::CalendarTypes::CalendarNote
         # 大小
         unless notes_hash['大小']
           length = dates.o_date.length(When::MONTH)
-          length = -length if dates.o_date.frame.kind_of?(When::CalendarTypes::Julian) # 太陽暦
+          length = -length if dates.o_date.frame.kind_of?(When::CalendarTypes::Christian) # 太陽暦
           notes_hash['大小'] = "#{dates.o_date[When::MONTH]*0==1 ? '閏' : ''}#{MonthPattern[length] || '改'}(#{length.abs})"
         end
 
@@ -607,7 +628,7 @@ class When::CalendarTypes::CalendarNote
       _note_values(dates, notes, _all_keys[-1], _elements[-1]) do |dates, focused_notes, notes_hash|
 
         focused_notes[0..-1] = focused_notes & NoteFocused[dates.range][-1]
-        root = When.Resource(dates.range == 1 ? '_co:CommonResidue?V=0618' : '_co:CommonResidue')
+        root = When.Resource('_co:CommonResidue')
 
         # 干支
         residue = dates.s_date.to_i-11
@@ -621,17 +642,15 @@ class When::CalendarTypes::CalendarNote
           note._day_notes(notes_hash, dates, conditions)
         end
 
-        # 廿四節気
-        notes_hash['廿四節気'] = _residue24(notes_hash['廿四節気'], root, dates)
-
         # 七曜
         notes_hash['七曜']   ||= root['Week'][dates.s_date.to_i % 7]
 
         # 廿七宿
         notes_hash['廿七宿']   = _residue27(notes_hash['廿七宿'], root)
 
-        # 廿八宿
+        # 廿八宿 / 鬼宿
         notes_hash['廿八宿'] ||= root['宿'][(dates.s_date.to_i+11) % 28]
+        notes_hash['鬼宿']   ||= /鬼/ =~ notes_hash['廿八宿'].to_s ? '鬼宿' : nil
 
         # 九星
         notes_hash['九星']   ||= root['九星'][When::Coordinates::Kyusei.day(dates.s_date, dates.cal4note.s_terms)]
@@ -672,14 +691,6 @@ class When::CalendarTypes::CalendarNote
       nil
     end
 
-    #
-    # 廿四節気を Resudue 化
-    #
-    def _residue24(index, root, dates)
-      return index unless index.kind_of?(Integer)
-      root['二十四節気::*'][(index-3) % 24]
-    end
-
     #
     # 廿七宿を Resudue 化
     #
@@ -693,7 +704,7 @@ class When::CalendarTypes::CalendarNote
     #
     def month_stem_branch(date)
       date.most_significant_coordinate*12+(date.cal_date[1] * 1) +
-     (date.frame.kind_of?(When::CalendarTypes::Julian) ? 12 : 13)
+     (date.frame.kind_of?(When::CalendarTypes::Christian) ? 12 : 13)
     end
   end
 
@@ -923,21 +934,49 @@ class When::CalendarTypes::CalendarNote
       phase, metsu = dates.cal4note.l_phases.position(date)
 
       # 滅
-      notes['滅'] = '滅' if metsu == 2
+      notes['滅'] =  metsu == 2 && dates.range < 11 ? '滅' : nil
 
       # 月相
       unless notes['月相']
-        date  = When.when?(dates.o_date.to_cal_date.to_s,
-                  {:frame=>dates.o_date.frame,
-                   :clock=>dates.l_date.frame.formula[-1].kind_of?(When::Ephemeris::ChineseTrueLunation) ?
-                           When.Clock(-21600) : dates.l_date.frame.time_basis})
-        range = dates.cal4note.l_phases.formula.thiti_range(date)
-        notes['月相'] = if range
+        # イベントの判定
+        formula = dates.cal4note.l_phases.formula
+        clock   = formula.kind_of?(When::Ephemeris::ChineseTrueLunation) &&
+          (5..25).include?(dates.l_date.cal_date[2]) ?
+            When.Clock(-21600) :               # 唐代暦法の望弦は午前6時を日の境界とする
+            dates.l_date.frame._time_basis[-1] # その他(進朔も考慮した時刻)
+        odate   = When.when?(dates.o_date.to_cal_date.to_s, {:frame=>dates.o_date.frame, :clock=>clock})
+        phases  = formula.phase_range(odate)
+        thitis  = phases.map {|phase| (phase % 1) * 30.0}
+        note    = if thitis[0] >= thitis[1]
+          dates.o_date.frame.kind_of?(When::CalendarTypes::Christian) || conditions[:shoyo] ? '朔' : nil
+        else
+          range = thitis[0]...thitis[1]
           range.include?( 7.5) ? '上弦' :
           range.include?(15.0) ? '望'   :
           range.include?(22.5) ? '下弦' : nil
+        end
+
+        # 結果の反映
+        if conditions[:shoyo]
+          # :shoyo が true ならイベント時刻も返す
+          notes['月相'] = if note
+            etime = formula._to_seed_type(formula.cn_to_time((phases[1] * 4).floor / 4.0), odate)
+            if formula.respond_to?(:lunation_length) && formula.lunation_length.kind_of?(Rational)
+              shoyo  =  etime.clk_time.universal_time
+              shoyo +=  When::TM::Duration::DAY if (0...clock.universal_time).include?(shoyo)
+              shoyo  = (shoyo  / When::TM::Duration::DAY * formula.denominator * 1000 + 0.5).floor / 1000.0
+              shoyo  =  shoyo.to_i if shoyo == shoyo.to_i
+              "#{note}(#{shoyo}/#{formula.denominator})"
+            else
+              etime.events = [note]
+              etime
+            end
+          else
+            nil
+          end
         else
-          dates.o_date.frame.kind_of?(When::CalendarTypes::Julian) ? '朔' : nil
+          # :shoyo が false ならイベン名のみ返す
+          notes['月相'] = note
         end
       end
 
@@ -1141,7 +1180,7 @@ class When::CalendarTypes::CalendarNote
       def _day_notes(notes, dates, conditions={})
         date  = When.when?(dates.o_date.to_cal_date.to_s,
                   {:frame=>dates.o_date.frame,
-                   :clock=>dates.s_date.frame.time_basis})
+                   :clock=>dates.s_date.frame._time_basis[0]})
         patch = (@patch || Patch)[date.to_i] unless dates.o_date.frame.respond_to?(:twin) &&
                                                     dates.o_date.frame.twin
         longitude, motsu = patch ? patch : dates.cal4note.s_terms.position(date)
@@ -1239,16 +1278,39 @@ class When::CalendarTypes::CalendarNote
 
         # 没
         if motsu == 0
-          notes['没'] = '没' if dates.range < 11
+          notes['没'] = dates.range < 11 ? '没' : nil
           return notes unless patch
+        else
+          notes['没'] = nil
         end
 
         # 廿四節気
         div, mod = longitude.divmod(15)
         if mod == 0
-          notes['廿四節気'] = (div - 21) % 24
-          div, mod = notes['廿四節気'].divmod(2)
-          notes['節中']   ||= Notes12[div] + %w(節 中)[mod]
+          note = (div - 21) % 24
+          div, mod = note.divmod(2)
+          notes['節中']     ||= Notes12[div] + %w(節 中)[mod]
+          notes['廿四節気'] ||= 
+            begin
+              root      = When.Resource(dates.range == 1 ? '_co:CommonResidue?V=0618' : '_co:CommonResidue')
+              residue   = root['二十四節気::*'][(note-3) % 24]
+              if conditions[:shoyo]
+                formula = dates.cal4note.s_terms.formula
+                etime   = dates.cal4note.s_terms.term(date - When.Duration('P3D'), [0,15], When::SYSTEM)
+                if formula.respond_to?(:year_length) && formula.denominator
+                  shoyo  =  etime.clk_time.universal_time
+                  shoyo +=  When::TM::Duration::DAY * (etime.to_i - date.to_i)
+                  shoyo  = (shoyo  / When::TM::Duration::DAY * formula.denominator * 1000 + 0.5).floor / 1000.0
+                  shoyo  =  shoyo.to_i if shoyo == shoyo.to_i
+                  residue.label + "(#{shoyo}/#{formula.denominator})"
+                else
+                  etime.events = [residue.label]
+                  etime
+                end
+              else
+                residue
+              end
+            end
         end
 
         # 七十二候