when_exe 0.3.8 → 0.3.9

data/test/test/region/islamic.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011 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.
@@ -10,7 +10,43 @@ module MiniTest
 
   module CalendarTypes
     class Islamic < MiniTest::TestCase
-      def test_nothing
+
+      Sample = [
+        ["1435-01-01", 2456602],["1435-02-01", 2456632],["1435-03-01", 2456661],["1435-04-01", 2456691],
+        ["1435-05-01", 2456720],["1435-06-01", 2456750],["1435-07-01", 2456779],["1435-08-01", 2456809],
+        ["1435-09-01", 2456838],["1435-10-01", 2456868],["1435-11-01", 2456897],["1435-12-01", 2456927],
+
+        ["1436-01-01", 2456956],["1436-02-01", 2456986],["1436-03-01", 2457015],["1436-04-01", 2457045],
+        ["1436-05-01", 2457074],["1436-06-01", 2457104],["1436-07-01", 2457133],["1436-08-01", 2457163],
+        ["1436-09-01", 2457192],["1436-10-01", 2457222],["1436-11-01", 2457251],["1436-12-01", 2457281],
+
+        ["1437-01-01", 2457311],["1437-02-01", 2457341],["1437-03-01", 2457370],["1437-04-01", 2457400],
+        ["1437-05-01", 2457429],["1437-06-01", 2457459],["1437-07-01", 2457488],["1437-08-01", 2457518],
+        ["1437-09-01", 2457547],["1437-10-01", 2457577],["1437-11-01", 2457606],["1437-12-01", 2457636],
+
+
+        ["1435-01-01", 2456602],["1435-02-01", 2456631],["1435-03-01", 2456660],["1435-04-01", 2456690],
+        ["1435-05-01", 2456719],["1435-06-01", 2456749],["1435-07-01", 2456778],["1435-08-01", 2456808],
+        ["1435-09-01", 2456838],["1435-10-01", 2456868],["1435-11-01", 2456898],["1435-12-01", 2456927],
+
+        ["1436-01-01", 2456956],["1436-02-01", 2456986],["1436-03-01", 2457015],["1436-04-01", 2457044],
+        ["1436-05-01", 2457074],["1436-06-01", 2457103],["1436-07-01", 2457133],["1436-08-01", 2457162],
+        ["1436-09-01", 2457192],["1436-10-01", 2457222],["1436-11-01", 2457251],["1436-12-01", 2457281],
+
+        ["1437-01-01", 2457310],["1437-02-01", 2457340],["1437-03-01", 2457370],["1437-04-01", 2457399],
+        ["1437-05-01", 2457429],["1437-06-01", 2457458],["1437-07-01", 2457487],["1437-08-01", 2457517],
+        ["1437-09-01", 2457546],["1437-10-01", 2457576],["1437-11-01", 2457605],["1437-12-01", 2457635],
+      ]
+
+      def test_islamic_date
+        sample = Sample.dup
+        %w(TabularIslamic EphemerisBasedIslamic?long=140.5200E&lat=38.1560N).each do |frame|
+          date = When.when?('1435-1-1', :frame=>frame)
+          36.times do
+            assert_equal(sample.shift, [date.to_s, date.to_i])
+            date += When::P1M
+          end
+        end
       end
     end
   end

data/test/test/region/japanese.rb

@@ -23,7 +23,7 @@ module MiniTest
          ["天平感宝01(0749).04.14"],
          ["天平勝宝01(0749).07.02"],
          ["天平勝宝01(0749).07.02"]]
-      ['天平勝宝01.04.13', '天平勝宝01.04.14', '天平勝宝01.07.02'].each do |string|
+         ['天平勝宝01.04.13', '天平勝宝01.04.14', '天平勝宝01.07.02'].each do |string|
         assert_equal(sample.shift, ((When.when?(string) ^ eras).
                                      delete_if {|d| !d.leaf?}).map {|d| d.to_s})
         assert_equal(sample.shift, ((When.when?(string, {:lower=>true}) ^ eras).
@@ -224,7 +224,7 @@ module MiniTest
       assert_raises(RangeError) {When.TemporalPosition("正慶", 2, 11)}
       assert_equal("延元02(1337).01.08",          When.when?("建武4.1.8").to_s)
       assert_equal("延元02(1337).01.08",          When.TemporalPosition("建武", 4, 1, 8, {:invalid=>:non}).to_s)
-      assert_equal("神武03(-657).01.30",          When.when?('神武3.1.30').to_s)    # , {'period'=>/清/})
+      assert_equal("<神武>03(-657).01.30",        When.when?('神武3.1.30').to_s)    # , {'period'=>/清/})
       assert_equal("日本::皇紀2600(1940).01.30",  When.when?('皇紀2600.1.30').to_s) # , {'period'=>/清/})
       assert_equal("応永11(1404).12.10",          When.when?('嘉慶18.12.10').to_s)
       assert_equal("明治01(1868).09.08",          When.when?('明治1(1868).09.08').to_s)

data/test/test/region/vietnamese.rb

@@ -15,9 +15,9 @@ module MiniTest
                %w(嗣徳2.8.1                                1849-09-17 ベトナム::阮朝::嗣徳02(1849).08.01),
                %w(ベトナム?LY=VSL&DN=LDNK::阮朝::嗣徳2.8.1 1849-09-16 ベトナム?LY=VSL&DN=LDNK::阮朝::嗣徳02(1849).08.01),
                %w(ベトナム::後期黎朝::福泰2.7.1            1644-08-02 ベトナム::後期黎朝::福泰02(1644).07.01),
-               %w(ベトナム::広南::阮福瀾10.7.1             1644-08-03 ベトナム::広南::阮福瀾10(1644).07.01),
+               %w(ベトナム::広南::阮福瀾10.7.1             1644-08-03 ベトナム::広南::<阮福瀾>10(1644).07.01),
                %w(ベトナム::後期黎朝::慶徳4.9.1            1652-10-02 ベトナム::後期黎朝::慶徳04(1652).09.01),
-               %w(ベトナム::広南::阮福瀕4.9.1              1652-10-03 ベトナム::広南::阮福瀕04(1652).09.01),
+               %w(ベトナム::広南::阮福瀕4.9.1              1652-10-03 ベトナム::広南::<阮福瀕>04(1652).09.01),
                %w(ベトナム::阮朝::建福1.1.31               1884-02-26 ベトナム::阮朝::建福01(1884).01.31)]
 
     Sample2 = [%w(1659-01- 1659-01-23),

data/test/test/region/yerm.rb

@@ -1,146 +1,156 @@
-# -*- coding: utf-8 -*-
-=begin
-  Copyright (C) 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
-
-module MiniTest
-
-  class Yerm < MiniTest::TestCase
-    Abbrs    = [[], 21, [21,14], [21,14, 5]]
-    Crecents = %w<
-      -1(02(03(04
-      20(02(03(04
-      -1-02(03(04
-      20-02(03(04
-      -1-02(03
-      20-02(03
-      -1-02
-      20-02
-      -1-
-      20-
-      -1
-         02(03(04
-            03(04
-               04
-     04)03)02)-1
-     04)03)02)20
-     04)03)02--1
-     04)03)02-20
-        03)02--1
-        03)02-20
-           02--1
-     04)03)02
-     04)03
-    >
-    Results = [
-      [[], "-1(02(03(04", "-1-02-03-04"],
-      [[], "20(02(03(04", "20-02-03-04"],
-      [[], "-1-02(03(04", "-1-02-03-04"],
-      [[], "20-02(03(04", "20-02-03-04"],
-      [[], "-1-02(03", "-1-02-03"],
-      [[], "20-02(03", "20-02-03"],
-      [[], "-1-02", "-1-02"],
-      [[], "20-02", "20-02"],
-      [[], "-1-", "-1"],
-      [[], "20-", "20"],
-      [[], "-1", "-1"],
-      [[], "02(03(04", :error],
-      [[], "03(04", :error],
-      [[], "04", :error],
-      [[], "04)03)02)-1", "-1-02-03-04"],
-      [[], "04)03)02)20", "20-02-03-04"],
-      [[], "04)03)02--1", "-1-02-03-04"],
-      [[], "04)03)02-20", "20-02-03-04"],
-      [[], "03)02--1", "-1-02-03"],
-      [[], "03)02-20", "20-02-03"],
-      [[], "02--1", "-1-02"],
-      [[], "04)03)02", :error],
-      [[], "04)03", :error],
-      [21, "-1(02(03(04", "-1-02-03-04"],
-      [21, "20(02(03(04", "20-02-03-04"],
-      [21, "-1-02(03(04", "-1-02-03-04"],
-      [21, "20-02(03(04", "20-02-03-04"],
-      [21, "-1-02(03", "-1-02-03"],
-      [21, "20-02(03", "20-02-03"],
-      [21, "-1-02", "-1-02"],
-      [21, "20-02", "20-02"],
-      [21, "-1-", "-1"],
-      [21, "20-", "20"],
-      [21, "-1", "-1"],
-      [21, "02(03(04", "21-02-03-04"],
-      [21, "03(04", :error],
-      [21, "04", :error],
-      [21, "04)03)02)-1", "-1-02-03-04"],
-      [21, "04)03)02)20", "20-02-03-04"],
-      [21, "04)03)02--1", "-1-02-03-04"],
-      [21, "04)03)02-20", "20-02-03-04"],
-      [21, "03)02--1", "-1-02-03"],
-      [21, "03)02-20", "20-02-03"],
-      [21, "02--1", "-1-02"],
-      [21, "04)03)02", "21-02-03-04"],
-      [21, "04)03", :error],
-      [[21, 14], "-1(02(03(04", "-1-02-03-04"],
-      [[21, 14], "20(02(03(04", "20-02-03-04"],
-      [[21, 14], "-1-02(03(04", "-1-02-03-04"],
-      [[21, 14], "20-02(03(04", "20-02-03-04"],
-      [[21, 14], "-1-02(03", "-1-02-03"],
-      [[21, 14], "20-02(03", "20-02-03"],
-      [[21, 14], "-1-02", "-1-02"],
-      [[21, 14], "20-02", "20-02"],
-      [[21, 14], "-1-", "-1"],
-      [[21, 14], "20-", "20"],
-      [[21, 14], "-1", "-1"],
-      [[21, 14], "02(03(04", "21-02-03-04"],
-      [[21, 14], "03(04", "21-14-03-04"],
-      [[21, 14], "04", :error],
-      [[21, 14], "04)03)02)-1", "-1-02-03-04"],
-      [[21, 14], "04)03)02)20", "20-02-03-04"],
-      [[21, 14], "04)03)02--1", "-1-02-03-04"],
-      [[21, 14], "04)03)02-20", "20-02-03-04"],
-      [[21, 14], "03)02--1", "-1-02-03"],
-      [[21, 14], "03)02-20", "20-02-03"],
-      [[21, 14], "02--1", "-1-02"],
-      [[21, 14], "04)03)02", "21-02-03-04"],
-      [[21, 14], "04)03", "21-14-03-04"],
-      [[21, 14, 5], "-1(02(03(04", "-1-02-03-04"],
-      [[21, 14, 5], "20(02(03(04", "20-02-03-04"],
-      [[21, 14, 5], "-1-02(03(04", "-1-02-03-04"],
-      [[21, 14, 5], "20-02(03(04", "20-02-03-04"],
-      [[21, 14, 5], "-1-02(03", "-1-02-03"],
-      [[21, 14, 5], "20-02(03", "20-02-03"],
-      [[21, 14, 5], "-1-02", "-1-02"],
-      [[21, 14, 5], "20-02", "20-02"],
-      [[21, 14, 5], "-1-", "-1"],
-      [[21, 14, 5], "20-", "20"],
-      [[21, 14, 5], "-1", "-1"],
-      [[21, 14, 5], "02(03(04", "21-02-03-04"],
-      [[21, 14, 5], "03(04", "21-14-03-04"],
-      [[21, 14, 5], "04", "21-14-5-04"],
-      [[21, 14, 5], "04)03)02)-1", "-1-02-03-04"],
-      [[21, 14, 5], "04)03)02)20", "20-02-03-04"],
-      [[21, 14, 5], "04)03)02--1", "-1-02-03-04"],
-      [[21, 14, 5], "04)03)02-20", "20-02-03-04"],
-      [[21, 14, 5], "03)02--1", "-1-02-03"],
-      [[21, 14, 5], "03)02-20", "20-02-03"],
-      [[21, 14, 5], "02--1", "-1-02"],
-      [[21, 14, 5], "04)03)02", "21-02-03-04"],
-      [[21, 14, 5], "04)03", "21-14-03-04"]]
-
-    def test__parse_crecents
-      results = []
-      Abbrs.each do |abbr|
-        Crecents.each do |crecent|
-          begin
-            results << [abbr, crecent, When::CalendarTypes::Yerm.parse(crecent, abbr)]
-          rescue
-            results << [abbr, crecent, :error]
-          end
-        end
-      end
-      assert_equal(Results, results)
-    end
-  end
-end
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 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
+
+module MiniTest
+
+  class Yerm < MiniTest::TestCase
+    Abbrs    = [[], 21, [21,14], [21,14, 5]]
+    Crecents = %w<
+      -1(02(03(04
+      20(02(03(04
+      -1-02(03(04
+      20-02(03(04
+      -1-02(03
+      20-02(03
+      -1-02
+      20-02
+      -1-
+      20-
+      -1
+         02(03(04
+            03(04
+               04
+     04)03)02)-1
+     04)03)02)20
+     04)03)02--1
+     04)03)02-20
+        03)02--1
+        03)02-20
+           02--1
+     04)03)02
+     04)03
+     20-23)08)14
+     20-23)08
+    >
+    Results = [
+      [[], "-1(02(03(04", "-1-02-03-04"],
+      [[], "20(02(03(04", "20-02-03-04"],
+      [[], "-1-02(03(04", "-1-02-03-04"],
+      [[], "20-02(03(04", "20-02-03-04"],
+      [[], "-1-02(03", "-1-02-03"],
+      [[], "20-02(03", "20-02-03"],
+      [[], "-1-02", "-1-02"],
+      [[], "20-02", "20-02"],
+      [[], "-1-", "-1"],
+      [[], "20-", "20"],
+      [[], "-1", "-1"],
+      [[], "02(03(04", :error],
+      [[], "03(04", :error],
+      [[], "04", :error],
+      [[], "04)03)02)-1", "-1-02-03-04"],
+      [[], "04)03)02)20", "20-02-03-04"],
+      [[], "04)03)02--1", "-1-02-03-04"],
+      [[], "04)03)02-20", "20-02-03-04"],
+      [[], "03)02--1", "-1-02-03"],
+      [[], "03)02-20", "20-02-03"],
+      [[], "02--1", "-1-02"],
+      [[], "04)03)02", :error],
+      [[], "04)03", :error],
+      [[], "20-23)08)14", "20-14-08-23"],
+      [[], "20-23)08", :error],
+      [21, "-1(02(03(04", "-1-02-03-04"],
+      [21, "20(02(03(04", "20-02-03-04"],
+      [21, "-1-02(03(04", "-1-02-03-04"],
+      [21, "20-02(03(04", "20-02-03-04"],
+      [21, "-1-02(03", "-1-02-03"],
+      [21, "20-02(03", "20-02-03"],
+      [21, "-1-02", "-1-02"],
+      [21, "20-02", "20-02"],
+      [21, "-1-", "-1"],
+      [21, "20-", "20"],
+      [21, "-1", "-1"],
+      [21, "02(03(04", "21-02-03-04"],
+      [21, "03(04", :error],
+      [21, "04", :error],
+      [21, "04)03)02)-1", "-1-02-03-04"],
+      [21, "04)03)02)20", "20-02-03-04"],
+      [21, "04)03)02--1", "-1-02-03-04"],
+      [21, "04)03)02-20", "20-02-03-04"],
+      [21, "03)02--1", "-1-02-03"],
+      [21, "03)02-20", "20-02-03"],
+      [21, "02--1", "-1-02"],
+      [21, "04)03)02", "21-02-03-04"],
+      [21, "04)03", :error],
+      [21, "20-23)08)14", "20-14-08-23"],
+      [21, "20-23)08", :error],
+      [[21, 14], "-1(02(03(04", "-1-02-03-04"],
+      [[21, 14], "20(02(03(04", "20-02-03-04"],
+      [[21, 14], "-1-02(03(04", "-1-02-03-04"],
+      [[21, 14], "20-02(03(04", "20-02-03-04"],
+      [[21, 14], "-1-02(03", "-1-02-03"],
+      [[21, 14], "20-02(03", "20-02-03"],
+      [[21, 14], "-1-02", "-1-02"],
+      [[21, 14], "20-02", "20-02"],
+      [[21, 14], "-1-", "-1"],
+      [[21, 14], "20-", "20"],
+      [[21, 14], "-1", "-1"],
+      [[21, 14], "02(03(04", "21-02-03-04"],
+      [[21, 14], "03(04", "21-14-03-04"],
+      [[21, 14], "04", :error],
+      [[21, 14], "04)03)02)-1", "-1-02-03-04"],
+      [[21, 14], "04)03)02)20", "20-02-03-04"],
+      [[21, 14], "04)03)02--1", "-1-02-03-04"],
+      [[21, 14], "04)03)02-20", "20-02-03-04"],
+      [[21, 14], "03)02--1", "-1-02-03"],
+      [[21, 14], "03)02-20", "20-02-03"],
+      [[21, 14], "02--1", "-1-02"],
+      [[21, 14], "04)03)02", "21-02-03-04"],
+      [[21, 14], "04)03", "21-14-03-04"],
+      [[21, 14], "20-23)08)14", "20-14-08-23"],
+      [[21, 14], "20-23)08", :error],
+      [[21, 14, 5], "-1(02(03(04", "-1-02-03-04"],
+      [[21, 14, 5], "20(02(03(04", "20-02-03-04"],
+      [[21, 14, 5], "-1-02(03(04", "-1-02-03-04"],
+      [[21, 14, 5], "20-02(03(04", "20-02-03-04"],
+      [[21, 14, 5], "-1-02(03", "-1-02-03"],
+      [[21, 14, 5], "20-02(03", "20-02-03"],
+      [[21, 14, 5], "-1-02", "-1-02"],
+      [[21, 14, 5], "20-02", "20-02"],
+      [[21, 14, 5], "-1-", "-1"],
+      [[21, 14, 5], "20-", "20"],
+      [[21, 14, 5], "-1", "-1"],
+      [[21, 14, 5], "02(03(04", "21-02-03-04"],
+      [[21, 14, 5], "03(04", "21-14-03-04"],
+      [[21, 14, 5], "04", "21-14-5-04"],
+      [[21, 14, 5], "04)03)02)-1", "-1-02-03-04"],
+      [[21, 14, 5], "04)03)02)20", "20-02-03-04"],
+      [[21, 14, 5], "04)03)02--1", "-1-02-03-04"],
+      [[21, 14, 5], "04)03)02-20", "20-02-03-04"],
+      [[21, 14, 5], "03)02--1", "-1-02-03"],
+      [[21, 14, 5], "03)02-20", "20-02-03"],
+      [[21, 14, 5], "02--1", "-1-02"],
+      [[21, 14, 5], "04)03)02", "21-02-03-04"],
+      [[21, 14, 5], "04)03", "21-14-03-04"],
+      [[21, 14, 5], "20-23)08)14", "20-14-08-23"],
+      [[21, 14, 5], "20-23)08", :error]]
+
+    def test__parse_crecents
+      results = []
+      Abbrs.each do |abbr|
+        Crecents.each do |crecent|
+          begin
+            results << [abbr, crecent, When::CalendarTypes::Yerm.parse(crecent, abbr)]
+          rescue
+            results << [abbr, crecent, :error]
+          end
+        end
+      end
+      assert_equal(Results, results)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: when_exe
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Takashi SUGA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-14 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies: []
 description: A multicultural and multilingualized calendar library based on ISO 8601,
   ISO 19108, RFC 5545(iCalendar) and RFC6350. This version is a beta version and in
@@ -168,7 +168,7 @@ files:
 - lib/when_exe/region/coptic.rb
 - lib/when_exe/region/dee.rb
 - lib/when_exe/region/discordian.rb
-- lib/when_exe/region/far_east.rb
+- lib/when_exe/region/east_asian.rb
 - lib/when_exe/region/french.rb
 - lib/when_exe/region/geologicalage.rb
 - lib/when_exe/region/goddess.rb

data/lib/when_exe/region/far_east.rb

@@ -1,188 +0,0 @@
-# -*- coding: utf-8 -*-
-=begin
-  Copyright (C) 2013 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
-
-require 'when_exe/region/chinese'
-require 'when_exe/region/chinese/calendars'
-
-#
-#  王位年号一覧表
-#
-# （参考文献）
-# 東洋史辞典（東京創元社）
-# コンサイス世界年表（三省堂）
-# 朝鮮史（山川出版社）
-# 歴代紀元編（台湾中華書局）に引用される新唐書
-#
-module When
-  class TM::CalendarEra
-
-    #
-    # 満洲
-    #
-    Manchurian = [self, [
-      "locale:[=ja:, en=en:, alias]",
-      "area:[満洲,Manchurian=en:Manchuria]",
-      [self,
-	"period:[震]",
-	["[高王]1",	"@F",	"name=[高王];698^Chinese0523", "713"]
-      ],
-      [self,
-	"period:[渤海,Balhae]",
-	["[高王]1",	"@A",	"name=[高王];713^Chinese0523"],
-	["[仁安]1",	"@A",	"name=[武王];719"],		# コンサイスでは翌年が元年、以下翌年のものは(*)
-	["[大興]1",	"@A",	"name=[文王];738"],
-	["[廃王]1",	"@A",	"name=[廃王];794"],		# 朝鮮史では793?とする
-	["[中興]1",	"@A",	"name=[成王];794"],		# 新唐書では786が元年？
-	["[正暦]1",	"@A",	"name=[康王];795"],
-	["[永徳]1",	"@A",	"name=[定王];809"],		# コンサイスでは翌年が元年
-	["[朱雀]1",	"@A",	"name=[僖王];813"],		# 朝鮮史では817が末年		(*)
-	["[太始]1",	"@A",	"name=[簡王];818"],		# 新唐書では前年が元年
-	["[建興]1",	"@A",	"name=[宣王];818"],		# コンサイスでは翌年が元年	(*)
-	["[咸和]1",	"@A", "name=[彝震王];830"],		# （以後同様）			(*)
-	["[虔晃王]1",	"@A", "name=[虔晃王];857"],		# 新唐書には以後記載なし	(*)
-	["[景王]1",	"@A",	"name=[景王];871"],		# 朝鮮史は871?			(*)
-	["[瑋瑎]1",	"@A",	"name=[瑋瑎];893"],		# 朝鮮史では在位不明		(*)
-	["[哀王]1",	"@A",	"name=[哀王];906",		#(*)
-	    "926="]
-      ],
-      [self,
-	"period:[満洲国]",
-	["[大同]1",	"@F",	"name=[溥儀];1932-03-01^Gregorian?note=Chinese"],
-	["[康徳]1.03.01","",		    "1934-03-01", "1945-08-18="]
-      ],
-    ]]
-
-    #
-    # 柔然
-    #
-    Rouran = [self, [
-      "locale:[=ja:, en=en:, alias]",
-      "area:[柔然,Rouran]",
-      ["[永康]1",	"@A",	"name=[予成];464^Chinese0445"],
-      ["[太平]1",	"@A",	"name=[豆崙];485"],
-      ["[太安]1",	"@A",	"name=[那蓋];492"],
-      ["[始平]1",	"@A",	"name=[伏図];506"],
-      ["[建昌]1",	"@A",	"name=[醜奴];509", "520="]
-    ]]
-
-    #
-    # 高昌
-    #
-    Gaochang = [self, [
-      "locale:[=ja:, en=en:, alias]",
-      "area:[高昌,Gaochang]",
-      ["[章和]1",	"@A",	  "name=[麹堅];531^Chinese0523"],
-      ["[永平]1",	"@A",	"name=[麹玄喜];549"],
-      ["[和平]1",	"@A",		"name=;551"],
-      ["[建昌]1",	"@A",	"name=[麹宝茂];555"],
-      ["[延昌]1",	"@A",	"name=[麹乾固];561"],
-      ["[延和]1",	"@A",	"name=[麹伯雅];602"],
-      ["[義和]1",	"@A",		"name=;614"],
-      ["[重光]1",	"",	"name=[麹伯雅];620"],
-      ["[延寿]1",	"@A",	"name=[麹文泰];624", "name=[麹智盛];640", "640="]
-    ]]
-
-    #
-    # 雲南
-    #
-    Yunnan = [self, [
-      "locale:[=ja:, en=en:, alias]",
-      "area:[雲南,Yunnan]",
-      [self,
-	"period:[南詔,Nanzhao]",
-	["[閣羅鳳]1",	"@A",	"name=[閣羅鳳];748^Chinese0523"],
-	["[賛普金重]1",	"@A", "name=[賛普金重];752"],
-	["[長寿]1",	"",		      "769"],
-	["[見龍]1",	"@A",	"name=[異牟尋];780"],
-	["[上元]1",	"",		      "784"],
-	["[(上元)]2",	"",		      "785"],		# 元封?
-	["[応道]1",	"@A",	"name=[尋閣勧];809"],
-	["[龍興]1",	"@A",	"name=[勧龍晟];810"],
-	["[全義]1",	"@A",	"name=[勧利晟];817"],
-	["[大豊]1",	"",		      "820"],
-	["[保和]1",	"@A",	"name=[晟豊祐];824"],
-	["[(保和)]17",	"",		      "840"],		# 天啓?
-	["[建極]1",	"@A",	  "name=[世隆];860"],
-	["[(建極)]14",	"",		      "873", "878"]	# 法尭?
-      ],
-      [self,
-	"period:[大封民]",
-	["[貞明]1",	"@F",	  "name=[隆舜];878^Chinese0523"],
-	["[(貞明)]2",	"",		      "879"],		# 承智, 大同, 嵯耶?
-	["[中興]1",	"@A",	"name=[舜化貞];898", "903"]
-      ],
-      [self,
-	"period:[大長和]",
-	["[安国]1",	"@F",	"name=[鄭買嗣];903^Chinese0523"],
-	["[始元]1",	"@A",	"name=[鄭仁旻];910"],
-	["[(始元)]2",	"",		      "911"],		# 天瑞景星, 安和, 貞祐, 初暦, 孝治?
-	["[天応]1",	"@A",	"name=[鄭隆亶];927", "928"]
-      ],
-      [self,
-	"period:[大天興]",
-	["[尊聖]1",	"@F",	"name=[趙善政];928^Chinese0523", "930"]
-      ],
-      [self,
-	"period:[大義寧]",
-	["[興聖]1",	"@F",	"name=[楊宇真];930^Chinese0523"],
-	["[大明]1",	"",		      "931", "938="]
-      ],
-      [self,
-	"period:[大理,Dali]",
-	["[文徳]1",	"@F",	"name=[段思平];0938^Chinese0523"],
-	["[(文徳)]2",	"",		      "0939"],	# 神武?
-	["[文経]1",	"@A",	"name=[段思英];0945"],
-	["[至治]1",	"@A",	"name=[段思良];0946", "0947^Chinese0956", ""],
-	["[明徳]1",	"@A",	"name=[段思聡];0952"],
-	["[(明徳)]2",	"",		      "0953"],	# 広徳?
-	["[順徳]1",	"",		      "0968"],
-	["[明政]1",	"@A",	"name=[段素順];0969"],
-	["[広明]1",	"@A",	"name=[段素英];0986"],
-	["[明応]1",	"",		      "1005"],
-	["[(明応)]2",	"",		      "1006"],	# 明聖, 明徳, 明治?
-	["[明啓]1",	"@A",	"name=[段素廉];1010"],
-	["[明通]1",	"@A",	"name=[段素隆];1023"],
-	["[正治]1",	"@A",	"name=[段素真];1027"],
-	["[聖明]1",	"@A",	"name=[段素興];1042"],
-	["[(聖明)]2",	"",		      "1043"],	# 天明?
-	["[保安]1",	"@A",	"name=[段思廉];1045"],
-	["[正安]1",	"",		      "1053"],
-	["[(正安)]4",	"",		      "1056"],	# 正徳, 保徳?
-	["[上徳]1",	"@A",	"name=[段連義];1076"],
-	["[広安]1",	"",		      "1077"],
-	["[上明]1",	"@A",	"name=[段寿輝];1081"],
-	["[保立]1",	"@A",	"name=[段正明];1082"],
-	["[(保立)]2",	"",		      "1083"],	# 建安, 天祐?
-	["[上治]1",	"@A",	"name=[高昇泰];1095"],
-	["[天授]1",	"@A",	"name=[段正淳];1096"],
-	["[開明]1",	"",		      "1097"],
-	["[天正]1",	"",		      "1103"],
-	["[文安]1",	"",		      "1105"],
-	["[日新]1",	"@A",	"name=[段正厳];1109"],
-	["[文治]1",	"",		      "1110"],
-	["[(文治)]10",	"",		      "1119"],	# 永嘉?
-	["[保天]1",	"",		      "1129"],
-	["[(保天)]9",	"",		      "1137"],	# 広運?
-	["[永貞]1",	"@A",	"name=[段正興];1148"],
-	["[大宝]1",	"",		      "1149"],
-	["[(大宝)]8",	"",		      "1156"],	# 龍興, 盛明, 建徳?
-	["[利貞]1",	"@A",	"name=[段智興];1172"],
-	["[盛徳]1",	"",		      "1176"],
-	["[嘉会]1",	"",		      "1181"],
-	["[元亨]1",	"",		      "1185"],
-	["[(元亨)]12",	"",		      "1196"],	# 安定?
-	["[鳳暦]1",	"@A",	"name=[段智廉];1201"],
-	["[(鳳暦)]2",	"",		      "1202"],	# 元寿?
-	["[天開]1",	"@A",	"name=[段智祥];1205"],
-	["[天輔]1",	"",		      "1226"],
-	["[(天輔)]2",	"",		      "1227"],	# 仁寿?
-	["[道隆]1",	"@A",	"name=[段祥興];1239"],
-	["[天定]1",	"@A",	"name=[段興智];1252", "1254="]
-      ]
-    ]]
-  end
-end