when_exe 0.3.5 → 0.3.6

data/bin/irb.rc

@@ -3,3 +3,4 @@ require 'when_exe'
 require 'when_exe/core/extension'
 require 'when_exe/mini_application'
 include When
+IRB.conf[:EVAL_HISTORY] = 100

data/bin/locales.rb

@@ -19,8 +19,8 @@ HEADER = <<HEADER
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-module When::BasicTypes
-  class M17n
+module When
+  module Locale
 HEADER
 
 if "1".respond_to?(:force_encoding)
@@ -42,7 +42,7 @@ site.get('/svenfuchs/rails-i18n/tree/master/rails/locale').body.scan(/>([^> ]+?)
       locale = source.read
     end
   rescue Errno::ENOENT
-    http = Net::HTTP.new('raw.github.com', '443')
+    http = Net::HTTP.new('raw.githubusercontent.com', '443')
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     sleep(1)
@@ -59,12 +59,13 @@ site.get('/svenfuchs/rails-i18n/tree/master/rails/locale').body.scan(/>([^> ]+?)
   yamls[code.sub(/-/,'_')] = {'date'=>yaml[code]['date'], 'time'=>yaml[code]['time'], 'datetime'=>yaml[code]['datetime']}
 end
 
-open("locales/locales/locales.rb", 'w') do |script|
+open("locales/locales/autoload.rb", 'w') do |script|
   script.puts HEADER
   yamls.each_key do |key|
     script.puts "    autoload :Locale_%-8s 'when_exe/locales/%s'" % [key + ',', key]
   end
-  script.puts "  end\nend"
+  script.puts "  end"
+  script.puts "end"
 end
 
 yamls.each_pair do |key, value|
@@ -73,6 +74,7 @@ yamls.each_pair do |key, value|
     script.puts "\n    # from https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/#{key.sub(/_/,'-')}.yml"
     script.puts "\n    Locale_#{key} ="
     script.write(value.pretty_inspect)
-    script.puts "  end\nend"
+    script.puts "  end"
+    script.puts "end"
   end
 end

data/bin/when.rb

@@ -13,4 +13,4 @@ args   = ARGV.map {|arg| arg.encode('UTF-8')}
 config = When.config
 server, port = config['?']
 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
+pp When::Locale.translate(result, config['!']) if result

data/lib/when_exe.rb

@@ -55,6 +55,7 @@ module When
     # @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 [String]                      :namespaces   名前空間定義の省略時に名前空間生成に用いる書式
     # @option options [Hash{String=>String}]        :unification  漢字の包摂パターン            ({ 包摂前の文字列=>包摂後の文字列 })
     # @option options [Array<String>]               :order        CalendarEra の検索順序        ([ IRI of When::TM::CalendarEra ])
     # @option options [Hash{String=>Array, String}] :format       strftime で用いる記号の定義   ({ 記号=>[ 書式,項目名 ] or 記号列 })
@@ -77,7 +78,7 @@ module When
       @multi_thread = options[:multi_thread]
       Parts::MethodCash._setup_(options)
       Parts::Resource._setup_(options)
-      Parts::Locale._setup_(options)
+      Locale._setup_(options)
       Coordinates::Spatial._setup_(options[:location])
       TM::CalendarEra._setup_(options[:order])
       TM::Calendar._setup_
@@ -97,7 +98,7 @@ module When
       {:multi_thread => @multi_thread}.
       update(Parts::MethodCash._setup_info).
       update(Parts::Resource._setup_info).
-      update(Parts::Locale._setup_info).
+      update(Locale._setup_info).
       update(Coordinates::Spatial._setup_info).
       update(TM::CalendarEra._setup_info).
       update(TM::Clock._setup_info).
@@ -105,6 +106,36 @@ module When
       update(V::Event._setup_info).
       update(TimeStandard._setup_info)
     end
+
+    #
+    # When 直下に定数として定義する時法・暦法(明示的的追加)
+    #
+    # @private
+    def _define_common_calendar_types(list=%w(UTC Gregorian Julian Civil))
+      list.each do |calendar|
+        resource = Parts::Resource._instance(calendar, '_c:')
+        Parts::Resource.synchronize do
+          Parts::Resource::ConstList << calendar
+          const_set(calendar, resource)
+        end
+      end
+    end
+
+    alias :_const_missing :const_missing
+
+    #
+    # When 直下に定数として定義する時法・暦法など(暗黙的追加)
+    #
+    def const_missing(constant)
+      iri = Parts::Resource._abbreviation_to_iri(constant)
+      return _const_missing(constant) unless iri
+      resource = Parts::Resource._instance(iri)
+      return const_get(constant) if const_defined?(constant)
+      Parts::Resource.synchronize do
+        Parts::Resource::ConstList << constant
+        const_set(constant, resource)
+      end
+    end
   end
 
   #
@@ -118,16 +149,15 @@ module When
   RootDir   = File.dirname(__FILE__).sub(/\/[^\/]*$/,'')
 
   require 'when_exe/version'
+  require 'when_exe/locales/locale'
+  require 'when_exe/locales/autoload'
   require 'when_exe/parts/enumerator'
-  require 'when_exe/parts/locale'
   require 'when_exe/parts/resource'
   require 'when_exe/parts/geometric_complex'
   require 'when_exe/parts/timezone'
-  require 'when_exe/parts/method_cash'
   require 'when_exe/core/compatibility'
   require 'when_exe/basictypes'
   require 'when_exe/ephemeris'
-  require 'when_exe/tmduration'
   require 'when_exe/coordinates'
   require 'when_exe/icalendar'
   require 'when_exe/tmobjects'
@@ -136,21 +166,22 @@ module When
   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'
-  require 'when_exe/region/christian'
   require 'when_exe/inspect'
 
   #
   # Module Constants
   #
 
-  DurationP1D = TM::PeriodDuration.new([0,0,1])
-  DurationP1W = TM::PeriodDuration.new([0,0,7])
-  DurationP1M = TM::PeriodDuration.new([0,1,0])
-  DurationP1Y = TM::PeriodDuration.new([1,0,0])
-  TimeValue   = TM::IndeterminateValue
+  PT1S = TM::PeriodDuration.new(nil,[0,0,0,1])
+  PT1M = TM::PeriodDuration.new(nil,[0,0,1,0])
+  PT1H = TM::PeriodDuration.new(nil,[0,1,0,0])
+  P1D  = TM::PeriodDuration.new([0,0,1])
+  P1W  = TM::PeriodDuration.new([0,0,7])
+  P1M  = TM::PeriodDuration.new([0,1,0])
+  P1Y  = TM::PeriodDuration.new([1,0,0])
+  TimeValue = TM::IndeterminateValue
 
   PlusInfinity  = TM::TemporalPosition.new({:indeterminated_position=>TimeValue::Max})
   MinusInfinity = TM::TemporalPosition.new({:indeterminated_position=>TimeValue::Min})
@@ -160,57 +191,90 @@ module When
   EUCJP = '.eucJP'
 
   class BasicTypes::M17n
-    autoload :JapaneseTerms,         'when_exe/region/japanese'
-    autoload :ChineseTerms,          'when_exe/region/chinese'
-    autoload :YiTerms,               'when_exe/region/chinese'
-    autoload :TibetanTerms,          'when_exe/region/tibetan'
-    autoload :ThaiTerms,             'when_exe/region/thai'
-    autoload :BalineseTerms,         'when_exe/region/balinese'
-    autoload :JavaneseTerms,         'when_exe/region/javanese'
-    autoload :IndianTerms,           'when_exe/region/indian'
-    autoload :IranianTerms,          'when_exe/region/iranian'
-    autoload :IslamicTerms,          'when_exe/region/islamic'
-    autoload :JewishTerms,           'when_exe/region/jewish'
-    autoload :RomanTerms,            'when_exe/region/roman'
-    autoload :CopticTerms,           'when_exe/region/coptic'
-    autoload :FrenchTerms,           'when_exe/region/french'
-    autoload :WorldTerms,            'when_exe/region/world'
-    autoload :ShireTerms,            'when_exe/region/shire'
-    autoload :MartianTerms,          'when_exe/region/martian'
-    autoload :WikipediaLinks,        'when_exe/locales/links'
+    autoload :Japanese,                'when_exe/region/japanese'
+    autoload :Chinese,                 'when_exe/region/chinese'
+    autoload :Yi,                      'when_exe/region/chinese'
+    autoload :Tibetan,                 'when_exe/region/tibetan'
+    autoload :Thai,                    'when_exe/region/thai'
+    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 :Islamic,                 'when_exe/region/islamic'
+    autoload :Jewish,                  'when_exe/region/jewish'
+    autoload :Armenian,                'when_exe/region/Armenian'
+    autoload :Roman,                   'when_exe/region/roman'
+    autoload :Coptic,                  'when_exe/region/coptic'
+    autoload :French,                  'when_exe/region/french'
+    autoload :World,                   'when_exe/region/world'
+    autoload :Shire,                   'when_exe/region/shire'
+    autoload :Yerm,                    'when_exe/region/yerm'
+    autoload :Martian,                 'when_exe/region/martian'
+    autoload :WeekDate,                'when_exe/region/weekdate'
+  end
+
+  module Locale
+    autoload :WikipediaLinks,          'when_exe/locales/links'
+    autoload :IAST,                    'when_exe/locales/iast'
+    autoload :IASTR,                   'when_exe/locales/iast'
+    autoload :AKT,                     'when_exe/locales/akt'
   end
 
   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 :Yi,                    'when_exe/region/chinese'
-    autoload :Tibetan,               'when_exe/region/tibetan'
-    autoload :ThaiB,                 'when_exe/region/thai'
-    autoload :ThaiC,                 'when_exe/region/thai'
-    autoload :Tenganan,              'when_exe/region/balinese'
-    autoload :Pranatamangsa,         'when_exe/region/javanese'
-    autoload :IndianNationalSolar,   'when_exe/region/indian'
-    autoload :HinduSolar,            'when_exe/region/indian'
-    autoload :HinduLuniSolar,        'when_exe/region/indian'
-    autoload :SolarHejri,            'when_exe/region/iranian'
-    autoload :Bahai,                 'when_exe/region/bahai'
-    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'
-    autoload :Roman,                 'when_exe/region/roman'
-    autoload :FrenchRepublican,      'when_exe/region/french'
-    autoload :World,                 'when_exe/region/world'
-    autoload :LongCount,             'when_exe/region/mayan'
-    autoload :Shire,                 'when_exe/region/shire'
-    autoload :ShireG,                'when_exe/region/shire'
-    autoload :Darian,                'when_exe/region/martian'
+    autoload :Japanese,                'when_exe/region/japanese/calendars'
+    autoload :JapaneseTwin,            'when_exe/region/japanese/twins'
+    autoload :ChineseTwin,             'when_exe/region/chinese/twins'
+    autoload :ChineseSolar,            'when_exe/region/chinese'
+    autoload :ChineseLuniSolar,        'when_exe/region/chinese'
+    autoload :Yi,                      'when_exe/region/chinese'
+    autoload :Korean,                  'when_exe/region/korean'
+    autoload :Tibetan,                 'when_exe/region/tibetan'
+    autoload :Thai,                    'when_exe/region/thai'
+    autoload :ThaiP,                   'when_exe/region/thai'
+    autoload :ThaiC,                   'when_exe/region/thai'
+    autoload :ThaiT,                   'when_exe/region/thai'
+    autoload :Tenganan,                'when_exe/region/balinese'
+    autoload :Pranatamangsa,           'when_exe/region/javanese'
+    autoload :IndianNationalSolar,     'when_exe/region/indian'
+    autoload :Nanakshahi,              'when_exe/region/indian'
+    autoload :RevisedBengali,          'when_exe/region/indian'
+    autoload :HinduLuniSolar,          'when_exe/region/indian'
+    autoload :HinduSolar,              'when_exe/region/indian'
+    autoload :Jalali,                  'when_exe/region/iranian'
+    autoload :TableBasedJalali,        'when_exe/region/iranian'
+    autoload :Borji,                   'when_exe/region/iranian'
+    autoload :TableBasedBorji,         'when_exe/region/iranian'
+    autoload :SolarHijri,              'when_exe/region/iranian'
+    autoload :SolarHijriAlgorithmic,   'when_exe/region/iranian'
+    autoload :Zoroastrian,             'when_exe/region/zoroastrian'
+    autoload :Qadimi,                  'when_exe/region/zoroastrian'
+    autoload :Shahanshahi,             'when_exe/region/zoroastrian'
+    autoload :Fasli,                   'when_exe/region/zoroastrian'
+    autoload :Bahai,                   'when_exe/region/bahai'
+    autoload :TabularIslamic,          'when_exe/region/islamic'
+    autoload :EphemerisBasedIslamic,   'when_exe/region/islamic'
+    autoload :Jewish,                  'when_exe/region/jewish'
+    autoload :Armenian,                'when_exe/region/armenian'
+    autoload :Coptic,                  'when_exe/region/coptic'
+    autoload :JulianA,                 'when_exe/region/roman'
+    autoload :JulianB,                 'when_exe/region/roman'
+    autoload :JulianC,                 'when_exe/region/roman'
+    autoload :Roman,                   'when_exe/region/roman'
+    autoload :Gregorian,               'when_exe/region/christian'
+    autoload :FrenchRepublican,        'when_exe/region/french'
+    autoload :World,                   'when_exe/region/world'
+    autoload :LongCount,               'when_exe/region/mayan'
+    autoload :Discordian,              'when_exe/region/discordian'
+    autoload :Shire,                   'when_exe/region/shire'
+    autoload :ShireG,                  'when_exe/region/shire'
+    autoload :Sym454,                  'when_exe/region/symmetry'
+    autoload :Sym010,                  'when_exe/region/symmetry'
+    autoload :Yerm,                    'when_exe/region/yerm'
+    autoload :Dee,                     'when_exe/region/dee'
+    autoload :DeeCecil,                'when_exe/region/dee'
+    autoload :Goddess,                 'when_exe/region/goddess'
+    autoload :Darian,                  'when_exe/region/martian'
+    autoload :WeekDate,                'when_exe/region/weekdate'
 
     _time_systems = {
       'LMT' => nil,                       # Local Mean Time
@@ -225,99 +289,97 @@ 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'
-    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\'']]
+    autoload :SolarTerms,              'when_exe/ephemeris/notes'
+    autoload :LunarPhases,             'when_exe/ephemeris/notes'
+    autoload :Ephemeris,               'when_exe/ephemeris/notes'
+    autoload :Japanese,                'when_exe/region/japanese/notes'
+    autoload :Yis,                     'when_exe/region/chinese'
+    autoload :Balinese,                'when_exe/region/balinese'
+    autoload :Javanese,                'when_exe/region/javanese'
+    autoload :Tibetan,                 'when_exe/region/tibetan'
+    autoload :Bahai,                   'when_exe/region/bahai'
+    autoload :Roman,                   'when_exe/region/roman'
+    autoload :Mayan,                   'when_exe/region/mayan'
+    autoload :Discordian,              'when_exe/region/discordian'
+  # autoload :Yerm,                    'when_exe/region/yerm'
+    autoload :WorldWeek,               'when_exe/region/world'
+    autoload :ShireWeek,               'when_exe/region/shire'
+
+    Default   = [['_m:Calendar::Month'], ['Common::Week']]
+    JulianDay = [['Common::Week', 'Common::干支']]
+    Chinese   = [['Common::干支'], ['_m:Calendar::Month'], ['Common::Week', 'Common::干支']]
   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'
-    autoload :Bahai,                 'when_exe/region/bahai'
-    autoload :Roman,                 'when_exe/region/roman'
-    autoload :Mayan,                 'when_exe/region/mayan'
+    autoload :Tibetan,                 'when_exe/region/tibetan'
+    autoload :Yi,                      'when_exe/region/chinese'
+    autoload :Javanese,                'when_exe/region/javanese'
+    autoload :Indian,                  'when_exe/region/indian'
+    autoload :Iranian,                 'when_exe/region/iranian'
+    autoload :Bahai,                   'when_exe/region/bahai'
+    autoload :Roman,                   'when_exe/region/roman'
+    autoload :Mayan,                   'when_exe/region/mayan'
 
     # default index for day coordinate
-    DefaultDayIndex = Coordinates::Index.new
+    DefaultDayIndex = Index.new
 
     # default indices for date coordinates
     DefaultDateIndices = [
-      Coordinates::Index.new({:unit=>12}),
+      Index.new(When::Parts::Resource._instance('_m:Calendar::Month'), {:unit =>12}),
       DefaultDayIndex
     ]
 
     # default indices for time coordinates
     DefaultTimeIndices = [
-      Coordinates::Index.new({:base=>0, :unit=>24}),
-      Coordinates::Index.new({:base=>0, :unit=>60}),
-      Coordinates::Index.new({:base=>0, :unit=>60})
+      Index.new({:base=>0, :unit=>24}),
+      Index.new({:base=>0, :unit=>60}),
+      Index.new({:base=>0, :unit=>60})
     ]
   end
 
   module TM
     class OrdinalReferenceSystem
-      autoload :GeologicalAge,           'when_exe/region/geologicalage'
+      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 :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_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'
-      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'
+      autoload :Japanese,              'when_exe/region/japanese/epochs'
+      autoload :JapanesePrimeMinister, 'when_exe/region/japanese/epochs'
+      autoload :NihonKoki,             'when_exe/region/japanese/nihon_shoki'
+      autoload :NihonShoki,            'when_exe/region/japanese/nihon_shoki'
+      autoload :JapaneseSolar,         'when_exe/region/japanese/twins'
+      autoload :JapaneseLuniSolar,     'when_exe/region/japanese/twins'
+      autoload :Chinese,               'when_exe/region/chinese/epochs'
+      autoload :ChineseSolar,          'when_exe/region/chinese/twins'
+      autoload :ChineseLuniSolar,      'when_exe/region/chinese/twins'
+      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 :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 :LongCount,             'when_exe/region/mayan'
 
       # Defualt search path for Epochs and Eras
       DefaultEpochs = ['Common',     'ModernJapanese',
-                       'IndianNationalSolar',  'Iranian',   'Hijra', 'Jewish',
-                       'Roman',      'Byzantine', 'French', 'World', 'LongCount',
+                       'Hijra',      'Jewish', 'Iranian',
+                       'Roman',      'Byzantine', 'LongCount',
                        'BalineseLuniSolar',  'JavaneseLunar',
                        'Japanese',   'JapanesePrimeMinister', 'NihonKoki', 'NihonShoki',
                        'Chinese',    'Ryukyu',  'Vietnamese', 'Korean',
-                       'JapaneseSolarSeries', 'JapaneseLuniSolarSeries',
-                       'ChineseSolarSeries',  'ChineseLuniSolarSeries',
+                       'JapaneseSolar', 'JapaneseLuniSolar',
+                       'ChineseSolar',  'ChineseLuniSolar',
                        'Manchurian', 'Rouran',  'Gaochang',   'Yunnan', # 'Tibetan',
                        'Pope' ]
 
@@ -333,7 +395,6 @@ module When
 
       # Common Era
       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'],
@@ -342,9 +403,8 @@ module When
 
       # 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:[ModernJapanese]',
-        ['[M=,alias:明=ja:明治]6.01.01', '@CR', '1873-01-01^Gregorian?note=DefaultNotes'],
+        ['[M=,alias:明=ja:明治]6.01.01', '@CR', '1873-01-01^Gregorian?note=Default'],
         ['[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']
@@ -379,7 +439,7 @@ module When
     when /^today$/i   ; today(options)
     when /^now$/i     ; now(options)
     when /[\n\r]+/    ; when?(specification.split(/[\n\r]+/), options)
-    when String       ; TM::TemporalPosition._instance(specification, options)
+    when String       ; TM::TemporalPosition._instance(EncodingConversion.to_internal_encoding(specification), options)
     when Numeric      ; TM::JulianDate.new(+specification, TM::TemporalPosition._options(options))
     else              ; Calendar(options[:frame] || 'Gregorian').jul_trans(specification, options)
     end
@@ -410,7 +470,13 @@ module When
     options  = TM::TemporalPosition._options(options)
     options[:frame]  ||= 'Gregorian'
     options[:frame]    = Resource(options[:frame], '_c:') if options[:frame].kind_of?(String)
-    options[:era_name] = args.shift if args[0].kind_of?(String) || args[0].kind_of?(Array)
+    case args[0]
+    when String
+      options[:era_name]    = EncodingConversion.to_internal_encoding(args.shift)
+    when Array
+      options[:era_name]    = args.shift
+      options[:era_name][0] = EncodingConversion.to_internal_encoding(options[:era_name][0])
+    end
 
     # 時間位置の生成
     date = Array.new(options[:frame].indices.length+1) {args.shift}
@@ -441,6 +507,9 @@ module When
     return position
   end
 
+  alias :tm_pos :TemporalPosition
+  module_function :tm_pos
+
   # 指定日時に対応する When::TM::TemporalPosition の生成
   # (When::TM::DateAndTime of specified Time)
   #
@@ -549,12 +618,12 @@ module When
 
   # When::CalendarNote の生成/参照
   #
-  # @param [String] notes 暦注リストを表す文字列
+  # @param [String] note 暦注リストを表す文字列
   #
-  # @return [When::CalendarNote] notes に対応する When::CalendarNote オブジェクト
+  # @return [When::CalendarNote] note に対応する When::CalendarNote オブジェクト
   #
-  def CalendarNote(notes)
-    Parts::Resource._instance(notes, '_n:')
+  def CalendarNote(note)
+    Parts::Resource._instance(note, '_n:')
   end
 
   # When::TM::CalendarEra の生成/参照
@@ -598,7 +667,7 @@ module When
   def Clock(clock)
     case clock
     when Parts::Timezone::Base            ; return clock
-    when 'Z', 0                           ; return utc
+    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 String                           ;
@@ -614,14 +683,6 @@ module When
     Parts::Resource._instance(iri)
   end
 
-  # When::CalendarTypes::UTC の生成/参照
-  #
-  # @return [When::CalendarTypes::UTC]
-  #
-  def utc
-    Parts::Resource._instance("_c:UTC")
-  end
-
   # When::Coordinates::Spatial の生成/参照
   #
   # @overload Location(location)
@@ -722,6 +783,7 @@ module When
     when Array            ; BasicTypes::M17n.new(source, namespace, locale, options)
     when BasicTypes::M17n ; source
     when String
+      source = EncodingConversion.to_internal_encoding(source)
       return self[$1] if source =~ /^\s*\[((\.{1,2}|::)+[^\]]+)\]/ && self.kind_of?(When::Parts::Resource)
       return Parts::Resource[$1] if source =~ /^\s*\[::([^\]]+)\]/
       BasicTypes::M17n.new(source, namespace, locale, options)
@@ -734,7 +796,7 @@ module When
   # @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 [Numeric, nil] :interval Wikipedia サイトへのアクセス制御(デフォルト When::Locale.wikipedia_interval)
   # @option options [Object]       :その他   キャッシュファイルへの追加書き出し要素
   #
   # @return [When::BasicTypes::M17n] 項目に対応する多言語対応文字列
@@ -744,9 +806,10 @@ module When
   #
   def Wikipedia(title, options={})
     locale = options.delete(:locale) || 'en'
+    title  = EncodingConversion.to_internal_encoding(title)
     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?
+    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
@@ -764,6 +827,24 @@ module When
   end
   alias :IRI :Resource
 
+  # When::Coordinates::Index の生成
+  #
+  # @overload Index(terms=nil, name='Month', options)
+  #   @param [String] terms trunk の用語空間名
+  #   @param [String] name  trunk の要素配列名
+  #   @param [Hash] options
+  #   @option options [Array]   :trunk  幹の要素(省略時は使用しない)
+  #   @option options [Hash]    :branch 枝の要素(省略時は使用しない)
+  #   @option options [Integer] :unit   要素の数(省略時は不定)
+  #   @option options [Integer] :base   要素の最初の添え字(0 or 1(デフォルト))
+  #   @option options [Integer] :shift  幹の要素のローテート数(省略時はローテートしない)
+  #
+  # @return [When::Coordinates::Index]
+  #
+  def Index(*args)
+    Coordinates::Index.new(*args)
+  end
+
   # When::Coordinates::Pair の生成
   #
   # @param [Numeric, String] trunk  幹の要素
@@ -775,4 +856,8 @@ module When
   def Pair(trunk, branch=nil)
     Coordinates::Pair._force_pair(trunk, branch)
   end
+
+  # When 直下に定数として時法・暦法を定義する
+  _define_common_calendar_types
+
 end