when_exe 0.3.2 → 0.3.3

data/LICENSE.ja.txt

@@ -1,25 +1,25 @@
-    When.exe: A multicultural and multilingualized calendar library
-
-本プログラムの著作権は須賀隆 <suchowan@box.email.ne.jp> にあります。
-
-本プログラムは，下記の条件で使用できます．
-
-  1. 必ず、著作権表示や免責事項を含めて、制限なく自由に複製できます．
-
-  2. 以下の条件のいずれかを満たす時に本プログラムを自由に変更できます．
-
-     (a) 変更した本プログラムを自分だけで使う．
-
-     (b) その他の変更条件を作者と書面により合意する．
-
-  3. 本プログラム，変更した本プログラム及び本プログラムから生成した実行形式は，
-     作者との書面による合意がなければ配布できません．
-
-  4. 他のプログラムとの併合はいかなる目的であれ自由です．
-
-  5. 本プログラムへの入力となるデータおよび本プログラムからの出力の権利は
-     本プログラムの作者ではなく，それぞれの入出力を生成した人に属します．
-
-  6. 本プログラムは無保証です．作者は本プログラムをサポートする意志はありますが，
-     プログラム自身のバグあるいは本プログラムの実行などから発生するいかなる損害に
-     対しても責任を持ちません．
+    When.exe: A multicultural and multilingualized calendar library
+
+本プログラムの著作権は須賀隆 <suchowan@box.email.ne.jp> にあります。
+
+本プログラムは，下記の条件で使用できます．
+
+  1. 必ず、著作権表示や免責事項を含めて、制限なく自由に複製できます．
+
+  2. 以下の条件のいずれかを満たす時に本プログラムを自由に変更できます．
+
+     (a) 変更した本プログラムを自分だけで使う．
+
+     (b) その他の変更条件を作者と書面により合意する．
+
+  3. 本プログラム，変更した本プログラム及び本プログラムから生成した実行形式は，
+     作者との書面による合意がなければ配布できません．
+
+  4. 他のプログラムとの併合はいかなる目的であれ自由です．
+
+  5. 本プログラムへの入力となるデータおよび本プログラムからの出力の権利は
+     本プログラムの作者ではなく，それぞれの入出力を生成した人に属します．
+
+  6. 本プログラムは無保証です．作者は本プログラムをサポートする意志はありますが，
+     プログラム自身のバグあるいは本プログラムの実行などから発生するいかなる損害に
+     対しても責任を持ちません．

data/LICENSE.txt

@@ -1,31 +1,31 @@
-      When.exe: A multicultural and multilingualized calendar library
-
-This library is copyrighted free software by Takashi SUGA <suchowan@box.email.ne.jp>.
-
-You can use and/or modify the software under the conditions below:
-
-  1. You may make verbatim copies of the software without restriction, provided
-     that you duplicate all of the original copyright notices and associated
-     disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in your private domain.
-
-       b) make other written arrangements with the author.
-
-  3. You cannot distribute the software with/without modification or
-     derived executable binary form without written arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software.
-
-  5. The data supplied as input to or produced as output from the software
-     do not automatically fall under the copyright of the software,
-     but belong to whomever generated them.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
+      When.exe: A multicultural and multilingualized calendar library
+
+This library is copyrighted free software by Takashi SUGA <suchowan@box.email.ne.jp>.
+
+You can use and/or modify the software under the conditions below:
+
+  1. You may make verbatim copies of the software without restriction, provided
+     that you duplicate all of the original copyright notices and associated
+     disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in your private domain.
+
+       b) make other written arrangements with the author.
+
+  3. You cannot distribute the software with/without modification or
+     derived executable binary form without written arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software.
+
+  5. The data supplied as input to or produced as output from the software
+     do not automatically fall under the copyright of the software,
+     but belong to whomever generated them.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

data/bin/locales.rb

@@ -54,7 +54,8 @@ site.get('/svenfuchs/rails-i18n/tree/master/rails/locale').body.scan(/>([^> ]+?)
   end
   yaml = YAML.load(locale)
   next unless yaml
-  yaml[code]['time']['formats']['time'] ||= yaml[code]['time']['formats']['default'][/%H.*$/].sub(/\s*%Y.*$/,'')
+  time_format = yaml[code]['time']['formats']['default'][/%H.*$/]
+  yaml[code]['time']['formats']['time'] ||= time_format.sub(/\s*%Y.*$/,'') if time_format
   yamls[code.sub(/-/,'_')] = {'date'=>yaml[code]['date'], 'time'=>yaml[code]['time'], 'datetime'=>yaml[code]['datetime']}
 end
 

data/bin/when.rb.config

@@ -4,4 +4,4 @@ G:Gregorian
 J:Julian
 W:_e:Japanese
 K:_e:Chinese
-E:ChineseLuniSolar?timezone=9&intercalary_span=3
+E:ChineseLuniSolar?time_basis=+09&intercalary_span=3

data/lib/when_exe.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
@@ -22,6 +22,7 @@ end
 
 autoload :URI,     'uri'
 autoload :OpenURI, 'open-uri'
+autoload :OpenSSL, 'openssl'
 autoload :JSON,    'json'
 autoload :REXML,   'rexml/document'
 autoload :Mutex,   'thread' unless Object.const_defined?(:Mutex)
@@ -47,6 +48,7 @@ module When
     #
     # @param [Hash] options
     # @option options [When::TM::Clock, When::V::Timezone, When::Parts::Timezone] :local        デフォルトの地方時
+    # @option options [When::Coordinates::Spatial]  :location     デフォルトの空間位置
     # @option options [When::TM::IntervalLength]    :until        V::Event::Enumerator の until
     # @option options [Hash{String=>String}]        :alias        Locale の読替パターン         ({ 読替前のlocale=>読替後のlocale })
     # @option options [Hash{String=>String}]        :unification  漢字の包摂パターン            ({ 包摂前の文字列=>包摂後の文字列 })
@@ -54,6 +56,8 @@ module When
     # @option options [Hash{String=>Array, String}] :format       strftime で用いる記号の定義   ({ 記号=>[ 書式,項目名 ] or 記号列 })
     # @option options [Array<Array>]                :leap_seconds 閏秒の挿入記録                ([ [JD, TAI-UTC, (MJD, OFFSET)] ])
     # @option options [Boolean]                     :multi_thread マルチスレッド対応            (true: 対応, false/nil: 非対応)
+    # @option options [Boolean]                     :direct       '_' で終わるメソッドをキャッシュせずに毎回計算するか否か
+    # @option options [Hash{Symbol=>boolean}]       :escape       毎回 method_missing を発生させるメソッドを true にする
     #
     # @return [void]
     #
@@ -63,8 +67,10 @@ module When
     #
     def _setup_(options={})
       @multi_thread = options[:multi_thread]
+      Parts::MethodCash._setup_(options[:direct], options[:escape])
       Parts::Resource._setup_
       Parts::Locale._setup_(options)
+      Coordinates::Spatial._setup_(options[:location])
       TM::CalendarEra._setup_(options[:order])
       TM::Calendar._setup_
       TM::Clock._setup_(options[:local])
@@ -182,6 +188,9 @@ module When
     end
 
     class CalendarNote
+      autoload :SolarTerms,          'when_exe/region/ephemeric_notes'
+      autoload :LunarPhases,         'when_exe/region/ephemeric_notes'
+      autoload :EphemericNote,       'when_exe/region/ephemeric_notes'
       autoload :JapaneseNote,        'when_exe/region/japanese_notes'
       autoload :BalineseNote,        'when_exe/region/balinese'
       autoload :RomanNote,           'when_exe/region/roman'
@@ -194,12 +203,15 @@ module When
       JavaneseNotes  = [['Javanese::Windu'], ['_m:CalendarTerms::Month'],
                         ['Javanese::Pasaran', 'Javanese::Paringkelan', 'Javanese::Week', 'Javanese::Wuku']]
       ChineseNotes   = [['CommonResidue::干支'], ['_m:CalendarTerms::Month'], ['CommonResidue::干支']]
+      TibetanNotes   = [['Tibetan::干支'], ['_m:CalendarTerms::Month'], []]
       YiNotes        = [['Yi::YearName'], ['_m:CalendarTerms::Month'], []]
-      MayanNotes     = [["Mayan::Trecena", "Mayan::Tzolk'in", "Mayan::Lords_of_the_Night", "Mayan::Haab'"]]
+      MayanNotes     = [{'0B'=>{'Base'=>'?Epoch=0D'}, '2B'=>{'Base'=>'?Epoch=2D'}},
+                        ['Mayan#{Base:}::Trecena', 'Mayan#{Base:}::Tzolk\'in', 'Mayan#{Base:}::Lords_of_the_Night', 'Mayan#{Base:}::Haab\'']]
     end
   end
 
   module Coordinates
+    autoload :Tibetan,               'when_exe/region/tibetan'
     autoload :Yi,                    'when_exe/region/chinese'
     autoload :Javanese,              'when_exe/region/javanese'
     autoload :IndianCities,          'when_exe/region/indian'
@@ -225,42 +237,52 @@ module When
   end
 
   module TM
-    autoload :GeologicalAge,           'when_exe/region/geologicalage'
+    class OrdinalReferenceSystem
+      autoload :GeologicalAge,           'when_exe/region/geologicalage'
+    end
+
     class CalendarEra
-      autoload :Japanese,              'when_exe/region/japanese'
-      autoload :JapanesePrimeMinister, 'when_exe/region/japanese'
-      autoload :NihonKoki,             'when_exe/region/nihon_shoki'
-      autoload :NihonShoki,            'when_exe/region/nihon_shoki'
-      autoload :Chinese,               'when_exe/region/chinese_epoch'
-      autoload :Ryukyu,                'when_exe/region/ryukyu'
-      autoload :Korean,                'when_exe/region/korean'
-      autoload :Vietnamese,            'when_exe/region/vietnamese'
-      autoload :Manchurian,            'when_exe/region/far_east'
-      autoload :Rouran,                'when_exe/region/far_east'
-      autoload :Gaochang,              'when_exe/region/far_east'
-      autoload :Yunnan,                'when_exe/region/far_east'
-    # autoload :Tibetan,               'when_exe/region/tibetan'
-      autoload :Balinese,              'when_exe/region/balinese'
-      autoload :Javanese,              'when_exe/region/javanese'
-      autoload :Indian ,               'when_exe/region/indian'
-      autoload :Iranian,               'when_exe/region/iranian'
-      autoload :Hijra,                 'when_exe/region/islamic'
-      autoload :Jewish,                'when_exe/region/jewish'
-      autoload :Roman,                 'when_exe/region/roman'
-      autoload :Julian,                'when_exe/region/roman'
-      autoload :Pope,                  'when_exe/region/pope'
-      autoload :Byzantine,             'when_exe/region/christian'
-      autoload :French,                'when_exe/region/french'
-      autoload :World,                 'when_exe/region/world'
-      autoload :Mayan,                 'when_exe/region/mayan'
+      autoload :Japanese,                'when_exe/region/japanese'
+      autoload :JapanesePrimeMinister,   'when_exe/region/japanese'
+      autoload :NihonKoki,               'when_exe/region/nihon_shoki'
+      autoload :NihonShoki,              'when_exe/region/nihon_shoki'
+      autoload :JapaneseSolarSeries,     'when_exe/region/japanese_notes'
+      autoload :JapaneseLuniSolarSeries, 'when_exe/region/japanese_notes'
+      autoload :Chinese,                 'when_exe/region/chinese_epoch'
+      autoload :ChineseSolarSeries,      'when_exe/region/chinese_epoch'
+      autoload :ChineseLuniSolarSeries,  'when_exe/region/chinese_epoch'
+      autoload :Ryukyu,                  'when_exe/region/ryukyu'
+      autoload :Korean,                  'when_exe/region/korean'
+      autoload :Vietnamese,              'when_exe/region/vietnamese'
+      autoload :Manchurian,              'when_exe/region/far_east'
+      autoload :Rouran,                  'when_exe/region/far_east'
+      autoload :Gaochang,                'when_exe/region/far_east'
+      autoload :Yunnan,                  'when_exe/region/far_east'
+    # autoload :Tibetan,                 'when_exe/region/tibetan'
+      autoload :BalineseLuniSolar,       'when_exe/region/balinese'
+      autoload :JavaneseLunar,           'when_exe/region/javanese'
+      autoload :IndianNationalSolar,     'when_exe/region/indian'
+      autoload :Iranian,                 'when_exe/region/iranian'
+      autoload :Hijra,                   'when_exe/region/islamic'
+      autoload :Jewish,                  'when_exe/region/jewish'
+      autoload :Roman,                   'when_exe/region/roman'
+      autoload :Julian,                  'when_exe/region/roman'
+      autoload :Pope,                    'when_exe/region/pope'
+      autoload :Byzantine,               'when_exe/region/christian'
+      autoload :French,                  'when_exe/region/french'
+      autoload :World,                   'when_exe/region/world'
+      autoload :LongCount,               'when_exe/region/mayan'
 
       # Defualt search path for Epochs and Eras
-      DefaultEpochs = ['Common',     'ModernJapanese',
-                       'Indian',     'Iranian',   'Hijra',    'Jewish',
-                        'Roman',     'Byzantine', 'French',   'World', 'Mayan',
-                       'Balinese',   'Javanese',
+      DefaultEpochs = ['Common',     'Common?Reform=1752.09.14', 'ModernJapanese',
+                       'IndianNationalSolar',  'Iranian',   'Hijra',    'Jewish',
+                       'Roman',      'Byzantine', 'French',   'World',
+                       'LongCount',  'LongCount?Epoch=0D', 'LongCount?Epoch=2D',
+                       'BalineseLuniSolar',  'JavaneseLunar',
                        'Japanese',   'JapanesePrimeMinister', 'NihonKoki', 'NihonShoki',
                        'Chinese',    'Ryukyu',  'Vietnamese', 'Korean',
+                       'JapaneseSolarSeries', 'JapaneseLuniSolarSeries',
+                       'ChineseSolarSeries',  'ChineseLuniSolarSeries',
                        'Manchurian', 'Rouran',  'Gaochang',   'Yunnan', # 'Tibetan',
                        'Pope' ]
 
@@ -275,22 +297,22 @@ module When
       }.flatten)]
 
       # Common Era
-      Common = [self, [
-        "namespace:[en=http://en.wikipedia.org/wiki/]",
-        "area:[Common]",
-        ["[BeforeCommonEra=en:BCE_(disambiguation),*alias:BCE]0.1.1"],
-        ["[CommonEra=en:Common_Era,*alias:CE]1.1.1", "Calendar Epoch", "01-01-01^Julian"],
-        ["[CommonEra=en:Common_Era,*alias:CE]1582.10.15", "Calendar Reform", "1582-10-15^Gregorian"]
+      Common = [{}, self, [
+        'namespace:[en=http://en.wikipedia.org/wiki/]',
+        'area:Common#{?Reform=Reform}',
+        ['[BeforeCommonEra=en:BCE_(disambiguation),*alias:BCE]0.1.1'],
+        ['[CommonEra=en:Common_Era,*alias:CE]1.1.1', 'Calendar Epoch', '01-01-01^Julian'],
+        ['[CommonEra=en:Common_Era,*alias:CE]#{Reform:1582.10.15}', 'Calendar Reform', '#{Reform:1582.10.15}^Gregorian']
       ]]
 
       # Modern Japanese Eras after the calendar reform to the Gregorian Calendar
       ModernJapanese = [self, [
-        "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
-        "area:[Japan]",
-        ["[M=,alias:明=ja:明治]6.01.01", "Calendar Reform", "1873-01-01^Gregorian?note=DefaultNotes"],
-        ["[T=,alias:大=ja:大正]1.07.30", "Accession",       "1912-07-30"],
-        ["[S=,alias:昭=ja:昭和]1.12.25", "Accession",       "1926-12-25"],
-        ["[H=,alias:平=ja:平成]1.01.08", "Accession",       "1989-01-08"]
+        'namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]',
+        'area:[ModernJapanese]',
+        ['[M=,alias:明=ja:明治]6.01.01', '@CR', '1873-01-01^Gregorian?note=DefaultNotes'],
+        ['[T=,alias:大=ja:大正]1.07.30', '@A',  '1912-07-30'],
+        ['[S=,alias:昭=ja:昭和]1.12.25', '@A',  '1926-12-25'],
+        ['[H=,alias:平=ja:平成]1.01.08', '@A',  '1989-01-08']
       ]]
     end
   end
@@ -358,7 +380,7 @@ module When
     # 時間位置の生成
     date = Array.new(options[:frame].indices.length+1) {args.shift}
     if (args.length > 0)
-      options[:clock] ||= TM::Clock.local_time || utc
+      options[:clock] ||= TM::Clock.local_time
       time = Array.new(options[:clock].indices.length) {args.shift}
       position = TM::DateAndTime.new(date, time.unshift(0), options)
     else
@@ -398,8 +420,8 @@ module When
     options = options._attr if options.kind_of?(TM::TemporalPosition)
     options[:frame] ||= 'Gregorian'
     options[:frame]   = Resource(options[:frame], '_c:') if options[:frame].kind_of?(String)
-    clock = TM::Clock.get_clock(options)
-    jdt  = TM::JulianDate.universal_time(time.to_f * TM::IntervalLength::SECOND, {:frame=>clock})
+    options[:clock] ||= Clock(time.utc_offset) if time.kind_of?(::Time)
+    jdt  = TM::JulianDate.universal_time(time.to_f * TM::IntervalLength::SECOND, {:frame=>TM::Clock.get_clock(options)})
     options[:clock]   = jdt.frame
     date = options[:frame].jul_trans(jdt, options)
     date = TM::CalDate.new(date.cal_date, options) if options[:precision] &&

data/lib/when_exe/basictypes.rb

@@ -26,6 +26,7 @@ module When
         # @param [Hash] options
         # @option options [String, Array<String, Integer>] :era_name デフォルトの年号(Integerは0年に対応する通年)
         # @option options [Array<Numeric>] :abbr 上位省略形式で使用する上位部分
+        # @option options [Integer] :extra_year_digits ISO8601拡大表記のための年の構成要素拡大桁数(省略時 1桁)
         #
         # @return [Array] format, date, time, clock, era
         #
@@ -48,7 +49,7 @@ module When
           if options[:abbr].kind_of?(When::TimeValue)
             options[:abbr] = ((options[:frame]||When.Calendar('Gregorian')) ^ options[:abbr]).cal_date
           end
-          date_time = date_time.gsub(/_+/, '')
+          date_time = date_time.gsub(/_([\d])/, '\1')
           begin
             return _to_array_basic(date_time, options)
           rescue ArgumentError
@@ -97,8 +98,8 @@ module When
             format, date  = Date._to_array_extended_ISO8601(d, options)
 
           # extended date & time format (JIS X0301)
-          when  /^(\[[^\]]+\]|[^-+\d]+)([-+*&%@!>=<?\dW.\(\)]+)?(?:(T([:*=.,\d]+)?)([A-Z]+|[-+][:\d]+)?)?$/
-            era, d, t, time, clock = $~[1..5]
+          when  /^((.+::)?(\[[^\]]+\]|[^-+\d]+))([-+*&%@!>=<?\dW.\(\)]+)?(?:(T([:*=.,\d]+)?)([A-Z]+|[-+][:\d]+)?)?$/
+            era, parent, child, d, t, time, clock = $~[1..7]
             format, date, era = Date._to_array_extended_X0301(d, era, options)
             era ||= options[:era_name] if (d =~ /\./)
 
@@ -124,46 +125,69 @@ module When
     #
     class Date < DateTime
 
+      # @private
+      Extra_Year_Digits = Hash.new {|hash, key|
+        ex = (key || 1).to_i
+        hash[key] =
+          if ex > 0
+            [
+              /^(\d{2})$/,
+              /^([-+]\d{#{4+ex}})(\d{2})(\d{2})$/,
+              /^([-+]\d{#{4+ex}})-(\d{2})$/,
+              /^([-+]\d{#{4+ex}})$/,
+              /^([-+]\d{#{4+ex}})W(\d{2})(\d{1})?$/,
+              /^([+]\d{#{2+ex}})$/,
+              /^([-]\d{#{2+ex}})$/,
+              /^([-+]\d{#{4+ex}})(\d{3})$/
+            ]
+          elsif ex == 0
+            [/^(\d{2})$/] + [/^(\d{4})$/] * 6
+          else
+            [/^(\d{4})$/] * 7
+          end
+      }
+
       class << self
         # ISO 8601 基本形式の表現を分解して配列化する
         def _to_array_basic_ISO8601(date, options={})
           by, bm, bd = options[:abbr]
+          extra_reg  = Extra_Year_Digits[options[:extra_year_digits]]
           case date
-          when nil                            ; return nil
-          when /^(\d{4})(\d{2})(\d{2})$/      ; return nil,     [$1.to_i, $2.to_i, $3.to_i]          # 5.2.1.1
-          when /^(\d{4})-(\d{2})$/            ; return nil,     [$1.to_i, $2.to_i]                   # 5.2.1.2
-          when /^(\d{4})$/                    ; return nil,     [$1.to_i]                            # 5.2.1.2
-          when /^(\d{2})$/                    ; return :century,[$1.to_i * 100]                      # 5.2.1.2
-          when /^(\d{4})(\d{3})$/             ; return :day,    [$1.to_i, $2.to_i]                   # 5.2.2.1
-          when /^(\d{4})W(\d{2})(\d{1})?$/    ; return :week,   [$1.to_i, $2.to_i, _int($3)]         # 5.2.3.1-2
-          when /^([-+]\d{6})(\d{2})(\d{2})$/  ; return nil,     [$1.to_i, $2.to_i, $3.to_i]          # 5.2.1.4 a)
-          when /^([-+]\d{6})-(\d{2})$/        ; return nil,     [$1.to_i, $2.to_i]                   # 5.2.1.4 b)
-          when /^([-+]\d{6})$/                ; return nil,     [$1.to_i]                            # 5.2.1.4 c)
-          when /^([-+]\d{6})W(\d{2})(\d{1})?$/; return :week,   [$1.to_i, $2.to_i, _int($3)]         # 5.2.3.4 a-b)
-          when /^([+]\d{4})$/                 ; return :century,[$1.to_i * 100]                      # 5.2.1.4 d)
-          when /^([-]\d{4})$/                 ; return :century,[$1.to_i * 100]       unless by      # 5.2.1.4 d)
-          when /^([-+]\d{6})(\d{3})$/         ; return :day,    [$1.to_i, $2.to_i]                   # 5.2.2.3 a)
-          else                                ; raise ArgumentError, "Wrong date format" unless by
+          when nil                          ; return nil
+          when /^(\d{4})(\d{2})(\d{2})$/    ; return nil,     [$1.to_i, $2.to_i, $3.to_i]          # 5.2.1.1
+          when /^(\d{4})-(\d{2})$/          ; return nil,     [$1.to_i, $2.to_i]                   # 5.2.1.2
+          when /^(\d{4})$/                  ; return nil,     [$1.to_i]                            # 5.2.1.2
+          when extra_reg[0]                 ; return :century,[$1.to_i * 100]                      # 5.2.1.2
+          when /^(\d{4})(\d{3})$/           ; return :day,    [$1.to_i, $2.to_i]                   # 5.2.2.1
+          when /^(\d{4})W(\d{2})(\d{1})?$/  ; return :week,   [$1.to_i, $2.to_i, _int($3)]         # 5.2.3.1-2
+          when extra_reg[1]                 ; return nil,     [$1.to_i, $2.to_i, $3.to_i]          # 5.2.1.4 a)
+          when extra_reg[2]                 ; return nil,     [$1.to_i, $2.to_i]                   # 5.2.1.4 b)
+          when extra_reg[3]                 ; return nil,     [$1.to_i]                            # 5.2.1.4 c)
+          when extra_reg[4]                 ; return :week,   [$1.to_i, $2.to_i, _int($3)]         # 5.2.3.4 a-b)
+          when extra_reg[5]                 ; return :century,[$1.to_i * 100]                      # 5.2.1.4 d)
+          when extra_reg[6]                 ; return :century,[$1.to_i * 100]       unless by      # 5.2.1.4 d)
+          when extra_reg[7]                 ; return :day,    [$1.to_i, $2.to_i]                   # 5.2.2.3 a)
+          else                              ; raise ArgumentError, "Wrong date format" unless by
           end
 
           by = by.to_i
           case date
-          when /^(\d{2})(\d{2})(\d{2})$/      ; return nil,     [_century($1,by), $2.to_i, $3.to_i]  # 5.2.1.3 a)
-          when /^-(\d{2})(\d{2})?$/           ; return nil,     [_century($1,by), _int($2)]          # 5.2.1.3 b-c)
-          when /^--(\d{2})(\d{2})?$/          ; return nil,     [by, $1.to_i,     _int($2)]          # 5.2.1.3 d-e)
-          when /^(\d{2})(\d{3})$/             ; return :day,    [_century($1,by), $2.to_i]           # 5.2.2.2 a)
-          when /^-(\d{3})$/                   ; return :day,    [by, $1.to_i]                        # 5.2.2.2 b)
-          when /^(\d{2})W(\d{2})(\d{1})?$/    ; return :week,   [_century($1,by), $2.to_i, _int($3)] # 5.2.3.3 a-b)
-          when /^-(\d{1})W(\d{2})(\d{1})?$/   ; return :week,   [_decade($1,by),  $2.to_i, _int($3)] # 5.2.3.3 c-d)
-          when /^-W(\d{2})(\d{1})?$/          ; return :week,   [by, $1.to_i,     _int($2)]          # 5.2.3.3 e-f)
-          else                                ; raise ArgumentError, "Wrong date format" unless bm
+          when /^(\d{2})(\d{2})(\d{2})$/    ; return nil,     [_century($1,by), $2.to_i, $3.to_i]  # 5.2.1.3 a)
+          when /^-(\d{2})(\d{2})?$/         ; return nil,     [_century($1,by), _int($2)]          # 5.2.1.3 b-c)
+          when /^--(\d{2})(\d{2})?$/        ; return nil,     [by, $1.to_i,     _int($2)]          # 5.2.1.3 d-e)
+          when /^(\d{2})(\d{3})$/           ; return :day,    [_century($1,by), $2.to_i]           # 5.2.2.2 a)
+          when /^-(\d{3})$/                 ; return :day,    [by, $1.to_i]                        # 5.2.2.2 b)
+          when /^(\d{2})W(\d{2})(\d{1})?$/  ; return :week,   [_century($1,by), $2.to_i, _int($3)] # 5.2.3.3 a-b)
+          when /^-(\d{1})W(\d{2})(\d{1})?$/ ; return :week,   [_decade($1,by),  $2.to_i, _int($3)] # 5.2.3.3 c-d)
+          when /^-W(\d{2})(\d{1})?$/        ; return :week,   [by, $1.to_i,     _int($2)]          # 5.2.3.3 e-f)
+          else                              ; raise ArgumentError, "Wrong date format" unless bm
           end
 
           bm = bm.to_i
           case date
-          when /^---(\d{2})$/                 ; return nil,     [by, bm, $1.to_i]                    # 5.2.1.3 f)
-          when /^-W-(\d{1})$/                 ; return :week,   [by, bm, $1.to_i]                    # 5.2.3.3 g)
-          when /^----$/                       ; return nil,     [by, bm, bd.to_i] if bd              # extension
+          when /^---(\d{2})$/               ; return nil,     [by, bm, $1.to_i]                    # 5.2.1.3 f)
+          when /^-W-(\d{1})$/               ; return :week,   [by, bm, $1.to_i]                    # 5.2.3.3 g)
+          when /^----$/                     ; return nil,     [by, bm, bd.to_i] if bd              # extension
           end
 
           raise ArgumentError, "Wrong date format: #{date}"
@@ -402,15 +426,7 @@ module When
       def to_m17n
         self
       end
-
-      #
-      # 識別文字列
-      #
-      # @return [String]
-      #
-      def label
-        @label || to_s
-      end
+      alias :label :to_m17n
 
       #
       # _m17n_form のための要素生成 - 何もしないで自身を返す
@@ -463,22 +479,39 @@ module When
         rest, options = _attributes(args)
         _sequence
 
-        if (_pool[@label])
-          _copy_all(_pool[@label])
+        return _copy_all(_pool[@label.to_s]) if _pool[@label.to_s]
 
+        case rest[0]
+        when When::Parts::Resource::ContentLine
+          content, namespace = rest
+          namespace ||= {}
+          names       = []
+          locale      = []
+          begin
+            loc   = content.attribute['language'].object
+            locale << [nil, loc, namespace[loc]]
+            name  = content.object
+            ref   = content.attribute['reference'] || content.attribute['url']
+            name += '=' + (/^NUL$/i =~ ref.object ? '' : ref.object) if ref
+            names << name
+          end while (content = content.same_altid)
+          @names     ||= names.reverse
+          @namespace ||= namespace if namespace.kind_of?(Hash)
+          @locale    ||= locale.reverse
+          @label       = self
+        when nil ;
         else
-          if (rest)
-            names, namespace, locale = args
-            @names       = names if names
-            @namespace ||= Parts::Locale._namespace(namespace) if namespace
-            @locale    ||= Parts::Locale._locale(locale)       if locale
-          end
-          @namespace ||= {}
-          @locale    ||= []
-
-          @code_space = @namespace['']
-          self[0..-1] = _names(@names, @namespace, @locale)
+          names, namespace, locale = rest
+          @names       = names if names
+          @namespace ||= Parts::Locale._namespace(namespace) if namespace
+          @locale    ||= Parts::Locale._locale(locale)       if locale
+          @label       = self
         end
+        @namespace ||= {}
+        @locale    ||= []
+
+        @code_space = @namespace['']
+        self[0..-1] = _names(@names, @namespace, @locale)
       end
     end
 
@@ -498,17 +531,6 @@ module When
       #
       attr_reader :label
 
-      # オブジェクトのtap
-      unless method_defined?(:tap)
-        #
-        # tap - yield による処理のチェーン化
-        #
-        def tap
-          yield(self)
-          self
-        end
-      end
-
       private
 
       # オブジェクトの初期化
@@ -567,7 +589,12 @@ module When
       #   処理を @name (type: When::BasicTypes::Code) に委譲する
       #
       def method_missing(name, *args, &block)
-        @name.send(name.to_sym, *args, &block)
+        self.class.module_eval %Q{
+          def #{name}(*args, &block)
+            @name.send("#{name}", *args, &block)
+          end
+        } unless When::Parts::MethodCash.escape(name)
+        @name.send(name, *args, &block)
       end
     end
   end
@@ -608,7 +635,14 @@ module When
       #   処理を @temporal_extent (type: When::TM::Period) に委譲する
       #
       def method_missing(name, *args, &block)
-        @temporal_extent.send(name.to_sym, *args, &block)
+        self.class.module_eval %Q{
+          def #{name}(*args, &block)
+            list = args.map {|arg| arg.kind_of?(self.class) ? arg.temporal_extent : arg}
+            @temporal_extent.send("#{name}", *list, &block)
+          end
+        } unless When::Parts::MethodCash.escape(name)
+        list = args.map {|arg| arg.kind_of?(self.class) ? arg.temporal_extent : arg}
+        @temporal_extent.send(name, *list, &block)
       end
     end
   end