when_exe 0.3.4 → 0.3.5

data/bin/locales.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2012 Takashi SUGA
+  Copyright (C) 2011-2014 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -14,7 +14,7 @@ require 'net/https'
 HEADER = <<HEADER
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2012-2013 Takashi SUGA
+  Copyright (C) 2012-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

data/bin/when.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- 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
@@ -12,5 +12,5 @@ require 'when_exe/mini_application'
 args   = ARGV.map {|arg| arg.encode('UTF-8')}
 config = When.config
 server, port = config['?']
-result = !port ? When.free_conv(*args) : args == [] ? When.server(port) : When.client(server, port, args.join(' '))
+result = !port || !Object.const_defined?(:JSON) ? When.free_conv(*args) : args == [] ? When.server(port) : When.client(server, port, args.join(' '))
 pp When::Parts::Locale.translate(result, config['!']) if result

data/lib/when_exe.rb

@@ -5,6 +5,10 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
+begin
+  require 'json'
+rescue LoadError
+end
 begin
   require 'rubygems'
 rescue LoadError
@@ -20,12 +24,12 @@ begin
 rescue LoadError, NoMethodError
 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)
+autoload :URI,       'uri'
+autoload :OpenURI,   'open-uri'
+autoload :OpenSSL,   'openssl'
+autoload :FileUtils, 'fileutils'
+autoload :REXML,     'rexml/document'
+autoload :Mutex,     'thread' unless Object.const_defined?(:Mutex)
 
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
@@ -46,8 +50,8 @@ module When
 
     # Initializations
     #
-    # @param [Hash] options
-    # @option options [When::TM::Clock, When::V::Timezone, When::Parts::Timezone] :local        デフォルトの地方時
+    # @param [Hash] options 以下の通り
+    # @option options [When::Parts::Timezone::Base] :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 })
@@ -55,9 +59,13 @@ module When
     # @option options [Array<String>]               :order        CalendarEra の検索順序        ([ IRI of When::TM::CalendarEra ])
     # @option options [Hash{String=>Array, String}] :format       strftime で用いる記号の定義   ({ 記号=>[ 書式,項目名 ] or 記号列 })
     # @option options [Array<Array>]                :leap_seconds 閏秒の挿入記録                ([ [JD, TAI-UTC, (MJD, OFFSET)] ])
+    # @option options [String]                      :base_uri     Base URI for When_exe Resources (Default When::SourceURI)
+    # @option options [String]                      :root_dir     Root Directory for When_exe Resources Cash data (Default When::RootDir)
     # @option options [Boolean]                     :multi_thread マルチスレッド対応            (true: 対応, false/nil: 非対応)
     # @option options [Boolean]                     :direct       '_' で終わるメソッドをキャッシュせずに毎回計算するか否か
     # @option options [Hash{Symbol=>boolean}]       :escape       毎回 method_missing を発生させるメソッドを true にする
+    # @option options [false, nil]                  :escape       to_str, to_ary, to_hash のみ毎回 method_missing を発生させる
+    # @option options [true]                        :escape       すべて毎回 method_missing を発生させる
     #
     # @return [void]
     #
@@ -67,8 +75,8 @@ module When
     #
     def _setup_(options={})
       @multi_thread = options[:multi_thread]
-      Parts::MethodCash._setup_(options[:direct], options[:escape])
-      Parts::Resource._setup_
+      Parts::MethodCash._setup_(options)
+      Parts::Resource._setup_(options)
       Parts::Locale._setup_(options)
       Coordinates::Spatial._setup_(options[:location])
       TM::CalendarEra._setup_(options[:order])
@@ -80,10 +88,35 @@ module When
       Parts::Timezone._setup_
       TimeStandard._setup_(options[:leap_seconds])
     end
+
+    # 設定情報を取得する
+    #
+    # @return [Hash] 設定情報
+    #
+    def _setup_info
+      {:multi_thread => @multi_thread}.
+      update(Parts::MethodCash._setup_info).
+      update(Parts::Resource._setup_info).
+      update(Parts::Locale._setup_info).
+      update(Coordinates::Spatial._setup_info).
+      update(TM::CalendarEra._setup_info).
+      update(TM::Clock._setup_info).
+      update(TM::TemporalPosition._setup_info).
+      update(V::Event._setup_info).
+      update(TimeStandard._setup_info)
+    end
   end
 
+  #
+  # when_exe 用 International Resource Identifier
+  #
   SourceURI = "http://hosi.org/When/"
 
+  #
+  # ライブラリのあるディレクトリ
+  #
+  RootDir   = File.dirname(__FILE__).sub(/\/[^\/]*$/,'')
+
   require 'when_exe/version'
   require 'when_exe/parts/enumerator'
   require 'when_exe/parts/locale'
@@ -102,6 +135,7 @@ module When
   require 'when_exe/tmposition'
   require 'when_exe/tmreference'
   require 'when_exe/calendartypes'
+  require 'when_exe/calendarnote'
   require 'when_exe/locales/locales'
   require 'when_exe/region/m17n'
   require 'when_exe/region/residue'
@@ -138,7 +172,7 @@ module When
     autoload :IslamicTerms,          'when_exe/region/islamic'
     autoload :JewishTerms,           'when_exe/region/jewish'
     autoload :RomanTerms,            'when_exe/region/roman'
-    autoload :ChristianTerms,        'when_exe/region/christian'
+    autoload :CopticTerms,           'when_exe/region/coptic'
     autoload :FrenchTerms,           'when_exe/region/french'
     autoload :WorldTerms,            'when_exe/region/world'
     autoload :ShireTerms,            'when_exe/region/shire'
@@ -148,9 +182,10 @@ module When
 
   module CalendarTypes
     autoload :Japanese,              'when_exe/region/japanese'
+    autoload :JapaneseTwin,          'when_exe/region/japanese_twin'
+    autoload :ChineseTwin,           'when_exe/region/chinese_twin'
     autoload :ChineseSolar,          'when_exe/region/chinese'
     autoload :ChineseLuniSolar,      'when_exe/region/chinese'
-    autoload :Chinese,               'when_exe/region/chinese'
     autoload :Yi,                    'when_exe/region/chinese'
     autoload :Tibetan,               'when_exe/region/tibetan'
     autoload :ThaiB,                 'when_exe/region/thai'
@@ -165,6 +200,7 @@ module When
     autoload :TabularIslamic,        'when_exe/region/islamic'
     autoload :EphemerisBasedIslamic, 'when_exe/region/islamic'
     autoload :Jewish,                'when_exe/region/jewish'
+    autoload :Coptic,                'when_exe/region/coptic'
     autoload :JulianA,               'when_exe/region/roman'
     autoload :JulianB,               'when_exe/region/roman'
     autoload :JulianC,               'when_exe/region/roman'
@@ -186,28 +222,28 @@ module When
     _time_systems.each_pair do |key, required|
       autoload key.to_sym, required if required
     end
+  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'
-      autoload :WorldWeek,           'when_exe/region/world'
-      autoload :ShireWeek,           'when_exe/region/shire'
-
-      DefaultNotes   = [['_m:CalendarTerms::Month'], []]
-      JulianDayNotes = [['CommonResidue::Week', 'CommonResidue::干支']]
-      BahaiNotes     = [['Bahai::YearName'], ['_m:BahaiTerms::Month'], []]
-      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     = [{'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
+  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'
+    autoload :WorldWeek,             'when_exe/region/world'
+    autoload :ShireWeek,             'when_exe/region/shire'
+
+    DefaultNotes   = [['_m:CalendarTerms::Month'], ['CommonResidue::Week']]
+    JulianDayNotes = [['CommonResidue::Week', 'CommonResidue::干支']]
+    BahaiNotes     = [['Bahai::YearName'], ['_m:BahaiTerms::Month'], ['CommonResidue::Week']]
+    JavaneseNotes  = [['Javanese::Windu'], ['_m:CalendarTerms::Month'],
+                      ['Javanese::Pasaran', 'Javanese::Paringkelan', 'Javanese::Week', 'Javanese::Wuku']]
+    ChineseNotes   = [['CommonResidue::干支'], ['_m:CalendarTerms::Month'], ['CommonResidue::Week', 'CommonResidue::干支']]
+    TibetanNotes   = [['Tibetan::干支'], ['_m:CalendarTerms::Month'], ['CommonResidue::Week']]
+    YiNotes        = [['Yi::YearName'], ['_m:CalendarTerms::Month'], ['CommonResidue::Week']]
+    MayanNotes     = [{},['Mayan#{?Epoch=Epoch}::Trecena', 'Mayan#{?Epoch=Epoch}::Tzolk\'in',
+                          'Mayan#{?Epoch=Epoch}::Lords_of_the_Night', 'Mayan#{?Epoch=Epoch}::Haab\'']]
   end
 
   module Coordinates
@@ -246,11 +282,11 @@ module When
       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 :JapaneseSolarSeries,     'when_exe/region/japanese_twin'
+      autoload :JapaneseLuniSolarSeries, 'when_exe/region/japanese_twin'
       autoload :Chinese,                 'when_exe/region/chinese_epoch'
-      autoload :ChineseSolarSeries,      'when_exe/region/chinese_epoch'
-      autoload :ChineseLuniSolarSeries,  'when_exe/region/chinese_epoch'
+      autoload :ChineseSolarSeries,      'when_exe/region/chinese_twin'
+      autoload :ChineseLuniSolarSeries,  'when_exe/region/chinese_twin'
       autoload :Ryukyu,                  'when_exe/region/ryukyu'
       autoload :Korean,                  'when_exe/region/korean'
       autoload :Vietnamese,              'when_exe/region/vietnamese'
@@ -274,10 +310,9 @@ module When
       autoload :LongCount,               'when_exe/region/mayan'
 
       # Defualt search path for Epochs and Eras
-      DefaultEpochs = ['Common',     'Common?Reform=1752.09.14', 'ModernJapanese',
-                       'IndianNationalSolar',  'Iranian',   'Hijra',    'Jewish',
-                       'Roman',      'Byzantine', 'French',   'World',
-                       'LongCount',  'LongCount?Epoch=0D', 'LongCount?Epoch=2D',
+      DefaultEpochs = ['Common',     'ModernJapanese',
+                       'IndianNationalSolar',  'Iranian',   'Hijra', 'Jewish',
+                       'Roman',      'Byzantine', 'French', 'World', 'LongCount',
                        'BalineseLuniSolar',  'JavaneseLunar',
                        'Japanese',   'JapanesePrimeMinister', 'NihonKoki', 'NihonShoki',
                        'Chinese',    'Ryukyu',  'Vietnamese', 'Korean',
@@ -512,11 +547,11 @@ module When
     Parts::Resource._instance(calendar, '_c:')
   end
 
-  # When::CalendarTypes::CalendarNote の生成/参照
+  # When::CalendarNote の生成/参照
   #
   # @param [String] notes 暦注リストを表す文字列
   #
-  # @return [When::CalendarTypes::CalendarNote] notes に対応する When::CalendarTypes::CalendarNote オブジェクト
+  # @return [When::CalendarNote] notes に対応する When::CalendarNote オブジェクト
   #
   def CalendarNote(notes)
     Parts::Resource._instance(notes, '_n:')
@@ -538,7 +573,7 @@ module When
   #   @param [String, Regexp] key     検索する暦年代または、暦年代にマッチする正規表現
   #   @param [Integer]        epoch   年数を昇順にカウントする方式での暦元(0年)の通年(デフォルトは nil - 指定なし)
   #   @param [Integer]        reverse 年数を降順にカウントする方式での暦元(0年)の通年(デフォルトは nil - 指定なし)
-  #   @param [Hash] options
+  #   @param [Hash] options 以下の通り
   #   @option options [String]  :area   暦年代の使用地域の指定(デフォルトは nil - 指定なし)
   #   @option options [String]  :period 暦年代の使用時代の指定(デフォルトは nil - 指定なし)
   #   @option options [Integer] :count  何件ヒットするまで検索するかを指定(デフォルトは 1件)
@@ -554,25 +589,27 @@ module When
 
   # When::TM::Clock の生成/参照
   #
+  # @param [When::Parts::Timezone::Base] clock なにもせず clock をそのまま返す
   # @param [String] clock  時法を表す文字列
   # @param [Numeric] clock 秒を単位として表した時差(東経側を + とする)
-  # @param [When::TM::Clock] clock なにもせず clock をそのまま返す
   #
-  # @return [When::TM::Clock] clock に対応する When::TM::Clock オブジェクト
+  # @return [When::Parts::Timezone::Base] 生成/参照した When::Parts::Timezone::Base オブジェクト
   #
   def Clock(clock)
     case clock
-    when TM::Clock ; return clock
-    when 'Z'       ; return utc
+    when Parts::Timezone::Base            ; return clock
+    when 'Z', 0                           ; return utc
+    when Numeric                          ; return Parts::Resource._instance("_tm:Clock?label=" + TM::Clock.to_hms(clock))
     when /^#{CalendarTypes::TimeSystems}/ ; return Parts::Resource._instance('_c:' + clock)
-    when Numeric   ; return utc if clock==0
-    when String
-      c = TM::Clock[clock] || V::Timezone[clock]
-      return c if c
-      clock, options = clock.split('?')
-    else           ; raise TypeError, "Invalid Type: #{clock.class}"
+    when String                           ;
+    else                                  ; raise TypeError, "Invalid Type: #{clock.class}"
     end
-    iri  = "_tm:Clock?label=" + TM::Clock.to_hms(clock)
+    c    = TM::Clock[clock] || V::Timezone[clock]
+    return c if c
+    clock, options = clock.split('?')
+    hms  = TM::Clock.to_hms(clock)
+    return Parts::Timezone[clock] unless hms
+    iri  = "_tm:Clock?label=" + hms
     iri += "&" + options if options
     Parts::Resource._instance(iri)
   end
@@ -585,6 +622,52 @@ module When
     Parts::Resource._instance("_c:UTC")
   end
 
+  # When::Coordinates::Spatial の生成/参照
+  #
+  # @overload Location(location)
+  #   @param [When::Coordinates::Spatial] location なにもせず location をそのまま返す
+  #   @param [String] location  空間位置の IRI (デフォルトプレフィクス _l:)
+  #   @param [When::Parts::Timezone] 代表する都市の時間帯
+  #
+  # @overload Location(longitude, latitide, altitide=0, datum='Earth')
+  #   @param [Numeric] longitude 経度 / 度 (東経を正とする)
+  #   @param [Numeric] latitide  緯度 / 度 (北緯を正とする)
+  #   @param [Numeric] altitide  高度 / m
+  #   @param [When::Ephemeris::Datum] datum 座標系
+  #   @param [String] datum 座標系の IRI (デフォルトプレフィクス _ep:)
+  #
+  # @note longitudeが経度を意味する文字列, latitude が緯度を意味する文字列の場合、
+  #       引数の順番によらず、それぞれ経度および緯度と解釈する
+  #
+  # @return [When::Coordinates::Spatial] 生成/参照した When::Coordinates::Spatial オブジェクト
+  #
+  def Location(*args)
+    case args[0]
+    when Coordinates::Spatial ; return args[0]
+    when Parts::Timezone      ; return args[0].location
+    when String               ; return Parts::Resource._instance(args[0], '_l:') if args.size == 1
+    when Numeric              ;
+    else                      ; raise TypeError, "Invalid Type: #{args[0].class}"
+    end
+    rest = []
+    longitude = latitude = nil
+    args.each do |arg|
+      case arg
+      when /^#{Coordinates::MATCH['EW']}\s*[.@\d]/, /[.@\d]\s*#{Coordinates::MATCH['EW']}$/; longitude = arg
+      when /^#{Coordinates::MATCH['NS']}\s*[.@\d]/, /[.@\d]\s*#{Coordinates::MATCH['NS']}$/; latitude  = arg
+      else ; rest << arg
+      end
+    end
+    longitude ||= rest.shift
+    latitude  ||= rest.shift
+    raise ArgumentError, "too few arguments" unless longitude && latitude
+    altitude, datum = rest
+    iri = "_l:long=#{longitude}&lat=#{latitude}"
+    iri += "&alt=#{altitude}" if altitude
+    iri += "&datum=#{datum}"  if datum
+    Parts::Resource._instance(iri)
+  end
+
   #
   # 曜日(剰余類)
   #
@@ -646,6 +729,29 @@ module When
     end
   end
 
+  # Wikipedia を参照して When::BasicTypes::M17n を生成する
+  #
+  # @param [String] title Wikipedia の項目名
+  # @param [Hash] options 以下の通り
+  # @option options [String]       :locale   Wikipedia の言語(デフォルト 'en' - 英語)
+  # @option options [Numeric, nil] :interval Wikipedia サイトへのアクセス制御(デフォルト When::Parts::Locale.wikipedia_interval)
+  # @option options [Object]       :その他   キャッシュファイルへの追加書き出し要素
+  #
+  # @return [When::BasicTypes::M17n] 項目に対応する多言語対応文字列
+  #
+  # @note 生成した多言語対応文字列の what が nil でない場合、
+  #       その項目の位置情報を表わす When::Coordinates::Spatial を指す
+  #
+  def Wikipedia(title, options={})
+    locale = options.delete(:locale) || 'en'
+    entry, query = title.split('?', 2)
+    url  = "http://#{locale}.wikipedia.org/wiki/#{URI.encode(entry).gsub(' ', '_')}"
+    Parts::Locale.send(:wikipedia_object, url, options) unless options.empty?
+    url += '?' + query if query
+    object = Parts::Resource._instance(url)
+    object.kind_of?(BasicTypes::M17n) ? object : object.label
+  end
+
   # When::Parts::Resource の生成/参照
   #
   # @param [String] iri        IRI を表す文字列

data/lib/when_exe/basictypes.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
@@ -23,7 +23,7 @@ module When
         # When.exe Standard Representation 形式の表現を分解してArray化する
         #
         # @param [String] date_time 日時を表現する When.exe Standard Representation 形式の文字列
-        # @param [Hash] options
+        # @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桁)
@@ -64,19 +64,19 @@ module When
 
           case date_time
           # basic date & time format (ISO 8601)
-          when /^([-+W\d]+)(?:(T([.,\d]+)?)([A-Z]+|[-+]\d+)?)?$/
+          when /^([-+W\d]+)(?:(T([.,\d]+)?)([A-Z]+(\?.+)?|[-+]\d+)?)?$/
             d, t, time, clock = $~[1..4]
             format, date  = Date._to_array_basic_ISO8601(d, options)
 
           # basic date & time format (JIS X0301)
-          when /^([.\d]+)(?:(T([.,\d]+)?)([A-Z]+|[-+]\d+)?)?$/
+          when /^([.\d]+)(?:(T([.,\d]+)?)([A-Z]+(\?.+)?|[-+]\d+)?)?$/
             raise ArgumentError, "Wrong date format" unless options[:era_name]
             d, t, time, clock = $~[1..4]
             format, date  = Date._to_array_basic_X0301(d, options)
             era = options[:era_name]
 
           # basic time format (ISO 8601)
-          when /^(T(-{0,2}[.,\d]+)?)([A-Z]+|[-+]\d+)?$/
+          when /^(T(-{0,2}[.,\d]+)?)([A-Z]+(\?.+)?|[-+]\d+)?$/
             t, time, clock = $~[1..3]
 
           # not supported
@@ -93,18 +93,18 @@ module When
 
           case date_time
           # extended date & time format (ISO 8601)
-          when /^([-+*&%@!>=<?\dW.]+)(?:(T([:*=.,\d]+)?)([A-Z]+|[-+][:\d]+)?)?$/
+          when /^([-+*&%@!>=<?\dW.]+)(?:(T([:*=.,\d]+)?)([A-Z]+(\?.+)?|[-+][:\d]+)?)?$/
             d, t, time, clock = $~[1..4]
             format, date  = Date._to_array_extended_ISO8601(d, options)
 
           # extended date & time format (JIS X0301)
-          when  /^((.+::)?(\[[^\]]+\]|[^-+\d]+))([-+*&%@!>=<?\dW.\(\)]+)?(?:(T([:*=.,\d]+)?)([A-Z]+|[-+][:\d]+)?)?$/
+          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 =~ /\./)
 
           # extended time format (ISO 8601)
-          when /^(T(-{0,2}[:*=.,\d]+)?)([A-Z]+|[-+][:\d]+)?$/
+          when /^(T(-{0,2}[:*=.,\d]+)?)([A-Z]+(\?.+)?|[-+][:\d]+)?$/
             t, time, clock = $~[1..3]
 
           # not supported
@@ -336,10 +336,12 @@ module When
         # 時間帯の表現を正規化する
         def _to_string_clock(clock)
           return nil unless clock
-          return clock if (clock =~ /^[A-Z]+$/)
-          raise ArgumentError, "Wrong clock format: #{clock}" unless (clock =~ /^([-+])(\d{2})(?::?(\d{2}))?$/)
-          s, h, m = $~[1..3]
-          return s + h + ':' + (m||'00')
+          return clock if (clock =~ /^[A-Z]+(\?.+)?$/)
+          raise ArgumentError, "Wrong clock format: #{clock}" unless clock =~ /^([-+])(\d{2})(?::?(\d{2}))?(?::?(\d{2}))?$/
+          sgn, h, m, s = $~[1..4]
+          zone  = sgn + h + ':' + (m||'00')
+          zone += s if s
+          return zone
         end
       end
     end
@@ -356,8 +358,9 @@ module When
       # an optional codeSpace
       #
       # @return [String] anyURI (Optional)
-      attr_reader :code_space
+      attr_accessor :code_space
       alias :codeSpace :code_space
+      private :code_space=
 
       # オブジェクトの生成
       #
@@ -418,24 +421,29 @@ module When
         return nil
       end
 
+      # @private
+      HashProperty = [:label, :names, :link, :access_key, :code_space]
+
       #
-      # When::BasicTypes::M17n に変換する - 何もしないで自身を返す
+      # 代表名
       #
-      # @return [When::BasicTypes::M17n]
+      # @return [String]
       #
-      def to_m17n
-        self
-      end
-      alias :label :to_m17n
+      attr_reader :label
 
       #
-      # _m17n_form のための要素生成 - 何もしないで自身を返す
+      # 名前が意味するもの自体のオブジェクト
+      #
+      # @return [When::BasicTypes::Object]
+      #
+      alias :what :parent
+
       #
-      # @param [Hash] options 未使用
+      # When::BasicTypes::M17n に変換する - 何もしないで自身を返す
       #
       # @return [When::BasicTypes::M17n]
       #
-      def _to_hash_value(options={})
+      def to_m17n
         self
       end
 
@@ -479,7 +487,9 @@ module When
         rest, options = _attributes(args)
         _sequence
 
-        return _copy_all(_pool[@label.to_s]) if _pool[@label.to_s]
+        return _pool[@label.to_s] ?
+          _copy_all(_pool[@label.to_s]) :  # 階層になった Resource の代表ラベルのための生成
+          _copy(options) if @label         # M17n#to_h の出力と書式互換の入力による生成
 
         case rest[0]
         when When::Parts::Resource::ContentLine
@@ -498,20 +508,18 @@ module When
           @names     ||= names.reverse
           @namespace ||= namespace if namespace.kind_of?(Hash)
           @locale    ||= locale.reverse
-          @label       = self
         when nil ;
         else
           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)
+        self[0..-1] = @label = _names(@names, @namespace, @locale)
       end
     end