when_exe 0.3.2 → 0.3.3

data/lib/when_exe/icalendar.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
@@ -86,7 +86,7 @@ module When::V
 
     #
     # iCalendar クラス群の属性
-    # @return [Hash] { String => When::Parts::Resource::Element }
+    # @return [Hash] { String => When::Parts::Resource::ContentLine }
     #
     attr_reader :property
 
@@ -128,9 +128,27 @@ module When::V
       raise ArgumentError, "No enumerator exists" if (enumerators.length==0)
 
       # Enumerator の生成
-      return enumerators[0] if (enumerators.length==1 && exdate.node.size==0)
-      options[:exdate] = exdate
-      return When::Parts::Enumerator::Integrated.new(self, enumerators, *args)
+      enumerator =
+        if (enumerators.length==1 && exdate.node.size==0)
+          enumerators[0]
+        else
+          options[:exdate] = exdate
+          When::Parts::Enumerator::Integrated.new(self, enumerators, *args)
+        end
+      if ::Object.const_defined?(:Date) && (args[0].kind_of?(Range) ? args[0].first : args[0]).kind_of?(::Date)
+        enumerator.instance_eval %Q{
+          alias :_succ_of_super :succ
+          def succ
+            result = _succ_of_super
+            case result
+            when When::TM::DateAndTime ; result.to_date_time
+            when When::TM::CalDate     ; result.to_date
+            else                       ; result
+            end
+          end
+        }
+      end
+      enumerator
     end
     alias :to_enum  :_enumerator
     alias :enum_for :_enumerator
@@ -147,7 +165,14 @@ module When::V
       @_pool['..'] = options['..']
 
       # parsed 部の属性化
-      _parsed(options)
+      @property  = {}
+      @namespace = @_pool['..'].respond_to?(:namespace) ? @_pool['..'].namespace : {}
+      if options['.']
+        _parse_from_file(options)
+      else
+        _parse_from_code(options)
+      end
+      _set_variables
 
       # 属性の存在チェック & 設定
       _initialize_attributes(_attribute_appearance(self.class::Properties)) # .const_get(:Properties)))
@@ -156,29 +181,47 @@ module When::V
       _child(options, self.class::Classes) #.const_get(:Classes))
     end
 
-    # parsed 部の属性化
-    def _parsed(options)
-      @property = {}
-      if options['.']
-        options['.'].each do |v|
-          v = When::Parts::Resource._parse(v)
-          next unless (v.kind_of?(Element))
-          key = v.predicate
-          case @property[key]
-          when nil   ; @property[key] =  v
-          when Array ; @property[key] << v
-          else       ; @property[key] = [@property[key], v]
-          end
+    # ファイルからの属性読み込み
+    def _parse_from_file(options)
+      options['.'].each do |v|
+        v = When::Parts::Resource._parse(v)
+        _parse_altid(@property, v) if v.kind_of?(ContentLine)
+      end
+
+      keys = @property.keys
+      if keys.delete('namespace')
+        content = @property['namespace'][0]
+        @property['namespace'] = content if @property['namespace'].size == 1
+        if content.attribute['prefix']
+          begin
+            @namespace[content.attribute['prefix'].object] = content.object
+          end while (content = content.same_altid)
+        else
+          @namespace.update(When::Parts::Locale._namespace(content.object))
         end
-      else
-        options.each_pair do |key, value|
-          @property[key] = Element.new(key, value) if key.kind_of?(String)
+      end
+
+      keys.each do |key|
+        @property[key].each do |content|
+          content.object = When::BasicTypes::M17n.new(content, @namespace, []) if content.same_altid
         end
-        @property['dtstamp'] ||= Element.new('dtstamp',
-                                             When.now.to_s.gsub(/[-:]/,'')) if self.class::Properties[0].index('dtstamp')
-        @property['uid']     ||= Element.new('uid',
-                                             @property['dtstamp'].object + '-auto') if self.class::Properties[0].index('uid')
+        @property[key] = @property[key][0] if @property[key].size == 1
+      end
+    end
+
+    # コードからの属性読み込み
+    def _parse_from_code(options)
+      options.each_pair do |key, value|
+        @property[key] = ContentLine.new(key, value) if key.kind_of?(String)
       end
+      @property['dtstamp'] ||= ContentLine.new('dtstamp',
+                                           When.now.to_s.gsub(/[-:]/,'')) if self.class::Properties[0].index('dtstamp')
+      @property['uid']     ||= ContentLine.new('uid',
+                                           @property['dtstamp'].object + '-auto') if self.class::Properties[0].index('uid')
+    end
+
+    # @propertyの個別属性化
+    def _set_variables
       @property.each_key do |key|
         next if respond_to?(key)
         instance_eval %Q{
@@ -220,7 +263,7 @@ module When::V
 
       # REQUIRED but MUST NOT occur more than once
       require_unique.each do |key|
-        unless @property[key].kind_of?(When::Parts::Resource::Element)
+        unless @property[key].kind_of?(When::Parts::Resource::ContentLine)
           raise ArgumentError, "The #{key.upcase.gsub(/_/,'-')} is REQUIRED but MUST NOT occur more than once"
         end
       end
@@ -230,7 +273,7 @@ module When::V
         unless @property[key]
           raise ArgumentError, "The #{key.upcase.gsub(/_/,'-')} is REQUIRED and MAY occur more than once"
         end
-        @property[key] = [@property[key]] if (@property[key].kind_of?(When::Parts::Resource::Element))
+        @property[key] = [@property[key]] if (@property[key].kind_of?(When::Parts::Resource::ContentLine))
       end
 
       # OPTIONAL but MUST NOT occur more than once
@@ -249,7 +292,7 @@ module When::V
 
       # OPTIONAL and MAY occur more than once
       (optional + DefaultOptional).each do |key|
-        @property[key] = [@property[key]] if (@property[key].kind_of?(When::Parts::Resource::Element))
+        @property[key] = [@property[key]] if (@property[key].kind_of?(When::Parts::Resource::ContentLine))
       end
 
       # Other Properties
@@ -269,10 +312,6 @@ module When::V
       @calscale = @property['calscale'].object if @property['calscale']
       @calscale = When.Resource((@calscale||'GREGORIAN').capitalize, '_c:') unless (@calscale.kind_of?(When::TM::Calendar))
 
-      # namespace の登録
-      @namespace = @_pool['..'].respond_to?(:namespace) ? @_pool['..'].namespace : {}
-      @namespace.update(When::Parts::Locale._namespace(@property['namespace'].object)) if @property['namespace']
-
       # locale の登録
       @locale = @_pool['..'].respond_to?(:locale) ? @_pool['..'].locale : []
       @locale = When::Parts::Locale._locale(@property['locale'].object) if @property['locale']
@@ -367,7 +406,7 @@ module When::V
         @exdate  = When::Parts::GeometricComplex.new()
         if (@property['rdate'])
           @rdate = @property['rdate'].inject([]) do |sum, v|
-            if When::Parts::Resource::Element === v
+            if v.kind_of?(When::Parts::Resource::ContentLine)
               if new_zone == ''
                 sum += When.when?(v.attribute['.'].split(/,/), date_options)
               else
@@ -388,7 +427,7 @@ module When::V
       # exdate の登録
       if @property['exdate']
         dates  = @property['exdate'].inject([]) do |sum, v|
-          if When::Parts::Resource::Element === v
+          if v.kind_of?(When::Parts::Resource::ContentLine)
             sum += When.when?(v.attribute['.'].split(/,/), date_options)
           else
             sum << v
@@ -416,7 +455,7 @@ module When::V
         @freebusy  = []
         if (@property['freebusy'])
           @freebusy = @property['freebusy'].inject([]) do |sum, v|
-            if When::Parts::Resource::Element === v
+            if v.kind_of?(When::Parts::Resource::ContentLine)
               sum += When.when?((v.attribute['.']||v.object).split(/,/), date_options)
             else
               sum << v
@@ -454,8 +493,10 @@ module When::V
       copy.child = @child.select {|ev|
         if ev.kind_of?(Event)
           keys.each_pair do |key, value|
-            value = /#{value}/ if value.kind_of?(String)
-            break unless (value === ev.property[key].object)
+            case value
+            when String ; break unless ev.property[key].object.index(value)
+            when Regexp ; break unless (ev.property[key].object =~ value)
+            end
           end
         else
           true
@@ -467,7 +508,7 @@ module When::V
     # @private
     def _enumerator_list(args)
       (@child.reject {|el| !el.kind_of?(Event)}).inject([]) { |sum, ev|
-          sum += ev._enumerator_list(args)
+        sum += ev._enumerator_list(args)
       }
     end
   end
@@ -517,6 +558,12 @@ module When::V
       end
     end
 
+    # SUMMARY Property
+    #
+    # @return [String, When::BasicTypes::M17n]
+    #
+    attr_reader :summary
+
     # RRULE Property
     #
     # @return [Hash]
@@ -587,7 +634,7 @@ module When::V
     # @return [String]
     #
     def label
-      @property['uid'].object
+      @label ||= @property['uid'].object
     end
 
     # 最後のイベント
@@ -679,7 +726,7 @@ module When::V
     # ユニーク識別名 - ACTION Property をユニーク識別名とする。
     # @return [String]
     def label
-      @property['action'].object # TODO
+      @label ||= @property['action'].object # TODO
     end
 
     # @private
@@ -692,7 +739,7 @@ module When::V
       _parsed(options)
 
       # 属性の存在チェック
-      case (@property['action'].kind_of?(When::Parts::Resource::Element) && @property['action'].object)
+      case (@property['action'].kind_of?(When::Parts::Resource::ContentLine) && @property['action'].object)
       when 'AUDIO'
         aware = _attribute_appearance([
           ['action', 'trigger'], [],
@@ -808,7 +855,7 @@ module When::V
     # ユニーク識別名 - DTSTART Property をユニーク識別名とする
     # @return [String]
     def label
-      @property['dtstart'].attribute['.']
+      @label ||= @property['dtstart'].attribute['.']
     end
   end
 
@@ -838,22 +885,12 @@ module When::V
 
     class << self; include When::Parts::Resource::Pool; end
 
-    # 標準時間帯の時計
-    # @return [When::TM::Clock]
-    attr_reader :standard
-
-    # 夏時間帯の時計
-    # @return [When::TM::Clock]
-    attr_reader :daylight
-
-    # 夏時間帯と標準時間帯の時間差
-    # @return [When::TM:IntervalLength]
-    attr_reader :difference
+    include When::Parts::Timezone::Base
 
     # ユニーク識別名 - TZID Property をユニーク識別名とする
     # @return [String]
     def label
-      @property['tzid'].object
+      @label ||= @property['tzid'].object
     end
 
     # 同一の時間帯を用いた期間
@@ -866,24 +903,21 @@ module When::V
     #
     def current_period(current_date=Time.now)
       current_date = When.when?(current_date) unless current_date.kind_of?(When::TM::TemporalPosition)
-      period = _tz_period(current_date)
+      period = _tz_period(current_date.universal_time)
       range  = period[1]
       return range if range.kind_of?(Range)
       GeometricComplex.new([period], !range)
     end
 
     # @private
-    def _daylight(zdate=nil)
+    def _daylight(time)
       raise ArgumentError, "Needless daylight saving time evaluation" unless _need_validate
-      zdate = yield(@standard.dup.tap{|clock| clock.tz_prop = nil}) if block_given?
-      ndate = _neighbor_event_date(zdate)
-      nprop = ndate.clock.tz_prop
-      if block_given? && !@standard.equal?(nprop.tzoffsetfrom)
-        zdate = yield(nprop.tzoffsetfrom.dup.tap{|clock| clock.tz_prop = nil})
-      end
-      deltad = zdate.universal_time - ndate.universal_time
-      return nprop.tzoffsetto   if (deltad >= 0)
-      return nprop.tzoffsetfrom
+      frame, cal_date, clk_time = time
+      time   = frame.to_universal_time(cal_date, clk_time, @standard) if clk_time
+      ndate  = _neighbor_event_date(time)
+      nprop  = ndate.clock.tz_prop
+      time   = frame.to_universal_time(cal_date, clk_time, nprop.tzoffsetfrom) if clk_time && !@standard.equal?(nprop.tzoffsetfrom)
+      (time >= ndate.universal_time) ? nprop.tzoffsetto : nprop.tzoffsetfrom
     end
 
     # @private
@@ -922,43 +956,42 @@ module When::V
 
     # 指定の日時に最も近い、時間帯変更イベントの日時
     #
-    # @param [When::TM::TemporalPosition] current_date 捜索の基点の日時
+    # @param [Numeric] current_time 捜索の基点の日時の universal time
     #
     # @return [When::TM::TemporalPosition] 捜索の基点の日時に最も近い、時間帯変更イベントの日時
     #
-    def _neighbor_event_date(current_date)
-      _tz_period(current_date)[0]
+    def _neighbor_event_date(current_time)
+      _tz_period(current_time)[0]
     end
 
-    def _tz_period(current_date)
-      universal_time = current_date.universal_time
-      return [@dtstart, false] if  (universal_time <= @dtstart.universal_time)
+    def _tz_period(current_time)
+      return [@dtstart, false] if (current_time <= @dtstart.universal_time)
       return [@dtstop,  true ] if (@dtstop.kind_of?(When::TimeValue) &&
-                                    universal_time >= @dtstop.universal_time)
+                                    current_time >= @dtstop.universal_time)
 
       # Thread 要注意 - @range は生成後に更新
       synchronize do
         @range.each do |range|
-          from = universal_time - range.first.universal_time
-          to   = range.last.universal_time  - universal_time
+          from = current_time - range.first.universal_time
+          to   = range.last.universal_time  - current_time
           return [(from < to) ? range.first : range.last, range] if (from >= 0 && to > 0)
         end
-        early = _neighbor(current_date, :reverse)
-        late  = _neighbor(current_date, :forward)
-        from  = universal_time - early.universal_time
-        to    = late.universal_time  - universal_time
+        early = _neighbor(current_time, :reverse)
+        late  = _neighbor(current_time, :forward)
+        from  = current_time - early.universal_time
+        to    = late.universal_time  - current_time
         @range << (early...late)
         return [(from < to) ? early : late, @range[-1]]
       end
     end
 
-    def _neighbor(current_date, direction)
+    def _neighbor(current_time, direction)
       event   = nil
       minimum = nil
       @child.each do |prop|
-        date = prop.enum_for(current_date, direction, 1).succ
+        date = prop.enum_for(current_time, direction, 1).succ
         if (date)
-          diff = (date - current_date).duration.abs
+          diff = (date.universal_time - current_time).abs
           if (minimum == nil || minimum > diff)
             event   = date 
             minimum = diff
@@ -1020,14 +1053,14 @@ module When::V
 
       # オブジェクトの生成
       def initialize(*args)
-        @options  = When::Parts::Enumerator._options(args)
-        @exdate   = @options.delete(:exdate)
-        @exevent  = @options.delete(:exevent)
+        @options = When::Parts::Enumerator._options(args)
+        @exdate  = @options.delete(:exdate)
+        @exevent = @options.delete(:exevent)
         @parent, @rule, @dtstart, @duration, *args = args
-        @dtstart  = When.when?(@dtstart)
-        @rule     = self.class._decode_rule(@rule, @dtstart) if (@rule.kind_of?(String))
-        @logics   = @rule[:logics]
-        @tz_prop  = nil
+        @dtstart = When.when?(@dtstart)
+        @rule    = self.class._decode_rule(@rule, @dtstart) if (@rule.kind_of?(String))
+        @logics  = @rule[:logics]
+        @tz_prop = nil
         if (@dtstart.kind_of?(When::TM::DateAndTime))
           clock = @dtstart.clock
           if (clock.kind_of?(When::TM::Clock) && 
@@ -1054,10 +1087,11 @@ module When::V
         else
           @interval  = When::TM::PeriodDuration.new(@rule['INTERVAL'], FreqIndex[@rule['FREQ']])
         end
-        return dtstart if (target == dtstart)
+        return dtstart if (dtstart == target)
         interval_time = (dtstart + @interval) - dtstart
         return dtstart if (interval_time == 0)
-        div, mod = (target - dtstart).duration.divmod(interval_time.duration)
+        duration = target.kind_of?(Numeric) ? target - dtstart.universal_time : (target - dtstart).duration
+        div, mod = duration.divmod(interval_time.duration)
         seed = dtstart + (@interval * div)
         case @direction
         when :reverse ; seed += @interval while (seed <= target)

data/lib/when_exe/inspect.rb

@@ -11,29 +11,30 @@ module When
     #
     # オブジェクトの内容を Hash 化
     #
-    # @param [String, Integer] options {When::TM::TemporalPosition#_to_hash}に渡す
+    # @param [String, Integer] options {When::TM::TemporalPosition#_to_h}に渡す
     # @param [Hash] options 下記のとおり
+    # @option options [Numeric] :precision 指定があれば「イベント名(イベント時刻)」出力の時刻を指定の精度に丸める
     # @option options [Boolean] :camel   true ならシンボルを camel case にする
     # @option options [String]  :locale  文字列化の locale(指定なしは M17nオブジェクトに変換)
     # @option options [Boolean] :simple  true ならIRI の先頭部分を簡約表現にする
     # @option options [Boolean] :residue true なら Residue をそのまま出力
-    # @option options [Object]  :その他  各クラス#_to_hash を参照
+    # @option options [Object]  :その他  各クラス#_to_h を参照
     #
     # @return [Hash] (Whenモジュール内のクラスは文字列 or M17n化)
     #
-    def to_hash(options={})
-      _m17n_form(_to_hash(options), options.kind_of?(Hash) ? options : {})
+    def to_h(options={})
+      _m17n_form(_to_h(options), options.kind_of?(Hash) ? options : {})
     end
 
     #
     # オブジェクトの内容を JSON 化
     #
-    # @param [Object] options #to_hash を参照
+    # @param [Object] options #to_h を参照
     #
-    # @return [String] to_hash 結果を JSON文字列化したもの
+    # @return [String] to_h 結果を JSON文字列化したもの
     #
     def _to_json(options={})
-      JSON.dump(to_hash(options))
+      JSON.dump(to_h(options))
     end
 
     #
@@ -47,14 +48,14 @@ module When
     #
     # 時間位置オブジェクトの内容を Hash 化
     #
-    # @param [Object] options #to_hash を参照
+    # @param [Object] options #to_h を参照
     #
     # @return [Hash]
     #   各クラスの HashProperty に列挙した属性のうち値が false/nil でないものを
     #     属性 => 値
     #   とする Hash
     #
-    def _to_hash(options={})
+    def _to_h(options={})
       hash = {}
       self.class::HashProperty.each do |property|
         method, skip = property
@@ -69,19 +70,20 @@ module When
     #
     # @param [Object] element 変換元
     # @param [Hash] options 下記の通り
-    # @option options [Boolean] :camel   true ならシンボルを camel case にする
-    # @option options [String]  :locale  文字列化の locale(指定なしは M17nオブジェクトに変換)
-    # @option options [Boolean] :simple  true ならIRI の先頭部分を簡約表現にする
-    # @option options [Boolean] :residue true なら Residue をそのまま出力
+    # @option options [Numeric] :precision 指定があれば「イベント名(イベント時刻)」出力の時刻を指定の精度に丸める
+    # @option options [Boolean] :camel     true ならシンボルを camel case にする
+    # @option options [String]  :locale    文字列化の locale(指定なしは M17nオブジェクトに変換)
+    # @option options [Boolean] :simple    true ならIRI の先頭部分を簡約表現にする
+    # @option options [Boolean] :residue   true なら Residue をそのまま出力
     #
     # @return [Hash, Array] 変換結果
     #
     # @note element.events のある日付は _event_form で変換する
     #
     def _m17n_form(element, options={})
-      result = element.respond_to?(:_event_form)    ? element._event_form(self)       :
-               element.respond_to?(:_to_hash_value) ? element._to_hash_value(options) :
-               element.respond_to?(:label)         && element.label ?   element.label :
+      result = element.respond_to?(:_event_form)    ? element._event_form(self, options[:precision]) :
+               element.respond_to?(:_to_hash_value) ? element._to_hash_value(options)                :
+               element.respond_to?(:label)         && element.label ?   element.label                :
         case element
         when Hash   ; Hash[*(element.keys.inject([]) { |s, k|
                         s + [_m17n_form(k, options), _m17n_form(element[k], options)]
@@ -121,7 +123,7 @@ module When
       end
 
       #
-      # to_hash のための要素生成
+      # to_h のための要素生成
       # @private
       def _to_hash_value(options={})
         options[:residue] ? self : to_m17n
@@ -130,7 +132,7 @@ module When
 
     class Pair
       #
-      # to_hash のための要素生成
+      # to_h のための要素生成
       # @private
       def _to_hash_value(options={})
         to_s
@@ -319,6 +321,7 @@ module When
                 begin
                   date = it.next
                 end while date.to_i == dates[-1].to_i
+                date = date.to_cal_date unless date.instance_of?(TM::CalDate)
                 dates << date
               end
             end
@@ -326,6 +329,11 @@ module When
         else
           begun = self.floor(MONTH,DAY) + When::TM::PeriodDuration.new([0, first,  0])
           ended = begun                 + When::TM::PeriodDuration.new([0, length, 0])
+          loop do
+            last = ended.prev
+            break unless last.cal_date[MONTH-1] == ended.cal_date[MONTH-1]
+            ended = last
+          end
           if block_given?
             (begun...ended).map do |date|
               yield(date)
@@ -535,7 +543,7 @@ module When
       #   - :dynamical dynamical_time / 秒
       #   - :universal universal_time / 秒
       #
-      def _to_hash(options={})
+      def _to_h(options={})
         hash = super.update({
           :sdn      => to_i,
           :calendar => calendar_name,
@@ -596,9 +604,7 @@ module When
 
       def _to_uri(date)
         uri  = date.gsub(/\./, '-').gsub(/%/, '@')
-        unless @calendar_era_name || @frame == When.Calendar('Gregorian')
-          uri += '^^' + @frame.iri.gsub(/\?/, '%3F').gsub('.', '@').split(/\//)[-1]
-        end
+        uri += '^^' + @frame.iri.split(/\//)[-1] unless @calendar_era_name || @frame == When.Calendar('Gregorian')
         uri
       end
       private :_to_uri
@@ -772,7 +778,9 @@ module When
       #
       def to_m17n(precision=@precision)
         time  = m17n('T' + _time_to_s(precision))
-        time += @frame.zone if (@frame && !@frame.equal?(Clock.local_time))
+        if @frame
+          time += @frame.zone unless Clock.is_local_time_set? && @frame.equal?(Clock.local_time)
+        end
         return time
       end
 
@@ -784,7 +792,9 @@ module When
       #
       def to_s(precision=@precision)
         time  = 'T' + _time_to_s(precision)
-        time += @frame.zone if (@frame && !@frame.equal?(Clock.local_time))
+        if @frame
+          time += @frame.zone unless Clock.is_local_time_set? && @frame.equal?(Clock.local_time)
+        end
         return time
       end
 
@@ -846,9 +856,12 @@ module When
 
         # 秒
         digits  = [precision - @clk_time.length + 1, STRING-SECOND].min
-        if digits >= 0
-          terms  << @clk_time[-1]
-          format += (digits == 0) ? "%02d" : "%02.#{digits}f"
+        if digits == 0
+          format += "%02d"
+        elsif digits > 0
+          factor  = 10**digits
+          terms[-1] = ((@clk_time[-1] + 1E-6) * factor).floor.to_f / factor  # 切り捨て(10で割る丸めガードあり)
+          format += "%02.#{digits}f"
         end
 
         # 結果
@@ -857,7 +870,7 @@ module When
       end
 
       #
-      # to_hash のための要素生成
+      # to_h のための要素生成
       # @private
       def _to_hash_value(options={})
         clk_time.map {|e| _m17n_form(e, options) }
@@ -923,7 +936,7 @@ module When
       #   - :clk_time to_clock_time の結果 ( 日, 時, 分, 秒 )
       #   - :notes  Hash (の Array (の Array)) - _notes(options)
       #
-      def _to_hash(options={})
+      def _to_h(options={})
         super.update({:cal_date=>@cal_date})
       end
 
@@ -1090,32 +1103,37 @@ module When
       # 多言語対応文字列化 - When.exe Standard Representation により多言語対応文字列化する
       #
       # @param [Integer] precision どの桁まで多言語対応文字列化するか、分解能で指定する
+      # @param [false]   round 常に切り捨てる(DateAndTimeとの互換性のためのダミーの引数)
       #
       # @return [When::BasicTypes::M17n]
       #
-      def to_m17n(precision=@precision)
-        era, = @calendar_era_name
-        date = _date_to_s(precision)
-        return m17n(date) unless era
-        return m17n(era) + date
+      def to_m17n(precision=@precision, round=false)
+        date = m17n(_date_to_s(precision))
+        return date unless @calendar_era
+        return _parent_labels.inject(m17n(@calendar_era_name[0])) {|era_name, parent|
+          era_name.prefix(m17n(parent) + '::')
+        } + date
       end
 
       # 文字列化 - When.exe Standard Representation により文字列化する
       #
       # @param [Integer] precision どの桁まで多言語対応文字列化するか、分解能で指定する
+      # @param [false]   round 常に切り捨てる(DateAndTimeとの互換性のためのダミーの引数)
       #
       # @return [String]
       #
-      def to_s(precision=@precision)
-        era, = @calendar_era_name
+      def to_s(precision=@precision, round=false)
         date = _date_to_s(precision)
-        return date unless era
-        return era.to_s + date
+        return date unless @calendar_era
+        return _parent_labels.inject(@calendar_era_name[0].to_s) {|era_name, parent|
+          parent.to_s + '::' + era_name
+        } + date
       end
 
       # event を 文字列化 - 日時で与えられた event を文字列化する
       #
       # @param [When::TM::TemporalPosition] other 時系の歩度を比較する基準(nilは比較しない)
+      # @param [Numeric] round_precision イベント名(イベント)出力の場合の時刻の丸め位置(nilなら丸めない)
       #
       # @return [String]
       #
@@ -1124,15 +1142,36 @@ module When
       #   日時の精度が日より細かい - イベント名(イベント時刻)
       #   日時の精度が日           - イベント名(当日までの経過日数)
       #
-      def _event_form(other=nil)
+      def _event_form(other=nil, round_precision=nil)
         return to_m17n unless events
-        return events[0] + '(' + clk_time.to_s[/[:*=0-9]+/] + ')' if precision > When::DAY
+        return events[0] + '(' + _clk_time_for_inspect(round_precision).to_s(round_precision || precision)[/[:*=0-9]+/] + ')' if precision > When::DAY
         return events[0] unless other
         other = JulianDate.dynamical_time(other.dynamical_time,
                   {:time_standard=>time_standard}) unless time_standard.rate_of_clock == other.time_standard.rate_of_clock
         events[0] + '('  + (other.to_i - to_i).to_s + ')'
       end
 
+      private
+
+      # 日付の年号に曖昧性がある場合の親年号の label の Array
+      #
+      # @return [Array<String>]
+      #
+      def _parent_labels
+        return [] unless (area   = When::TM::CalendarEra[nil]) &&
+                         (period = area[nil])
+        list = []
+        era  = @calendar_era
+        while (labels = period[era.label.to_s]) &&
+              (epoch  = labels[era.epoch_year]) &&
+              (epoch.size > 1) &&
+              (parent = era.parent).respond_to?(:epoch_year)
+          list << parent.label
+          era = parent
+        end
+        list
+      end
+
       # 日付の年号以外の部分を文字列化する
       #
       # @param [Integer] precision どの桁まで多言語対応文字列化するか、分解能で指定する
@@ -1144,23 +1183,23 @@ module When
         precision = [precision, 1 - @cal_date.length].max
         precision = [precision, DAY].min
         terms  = []
-        format = ""
+        ext_dg = [(@extra_year_digits||1).to_i, 0].max
 
         # 年
         year_by_epoch = @cal_date[0]
-        if (@calendar_era_name)
+        if @calendar_era_name
           era, epoch, reverse = @calendar_era_name
           year_in_term        = reverse ? -year_by_epoch : year_by_epoch
           year_by_calendar    = epoch + year_by_epoch if epoch
           terms  << year_in_term
-          format += (0..99) === (year_in_term * 1) ? "%02d." : "%04d."
+          format = (0..99) === (year_in_term * 1) ? "%02d." : "%04d."
           if year_by_calendar && year_by_calendar != year_in_term
             terms  << (year_by_calendar * 1)
             format += "(%04d)"
           end
         else
           terms  << year_by_epoch
-          format += (0..9999) === (year_by_epoch * 1) ? "%04d." : "%06d."
+          format = (0..9999) === (year_by_epoch * 1) ? "%04d." : "%+0#{5+ext_dg}d."
         end
 
         # 月日
@@ -1196,22 +1235,35 @@ module When
       # 多言語対応文字列化 - When.exe Standard Representation により多言語対応文字列化する
       #
       # @param [Integer] precision どの桁まで多言語対応文字列化するか、分解能で指定する
+      # @param [true, false] round 指定の桁までで丸める(true)か, 切り捨てる(false)か
+      # @note 丸めるのは precision が When::DAY よりも高精度の場合のみである
       #
       # @return [When::BasicTypes::M17n]
       #
-      def to_m17n(precision=@precision)
-        super + @clk_time.to_m17n(precision)
+      def to_m17n(precision=@precision, round=false)
+        super + _clk_time_for_inspect(round ? precision : nil).to_m17n(precision)
       end
 
       # 文字列化 -When.exe Standard Representation により文字列化する
       #
       # @param [Integer] precision どの桁まで多言語対応文字列化するか、分解能で指定する
+      # @param [true, false] round 指定の桁までで丸める(true)か, 切り捨てる(false)か
+      # @note 丸めるのは precision が When::DAY よりも高精度の場合のみである
       #
       # @return [String]
       #
-      def to_s(precision=@precision)
-        super + @clk_time.to_s(precision)
+      def to_s(precision=@precision, round=false)
+        super + _clk_time_for_inspect(round ? precision : nil).to_s(precision)
+      end
+
+      # 出力に使用する clk_time の作成
+      def _clk_time_for_inspect(precision)
+        return @clk_time unless precision && precision > When::DAY
+        base = self + When::TM::Duration.new(@clk_time.frame._round_value(precision))
+        base.clk_time.clk_time[When::HOUR] = @clk_time.clk_time[When::HOUR] + 1 unless self.to_i == base.to_i
+        return base.clk_time
       end
+      private :_clk_time_for_inspect
 
       # 時
       #