when_exe 0.3.5 → 0.3.6

data/lib/when_exe/region/{japanese_twin.rb → japanese/twins.rb}

@@ -9,11 +9,10 @@ module When
 
   class TM::CalendarEra
 
-    # Japanese Luni-Solar Calendar Series for JapaneseNote
-    JapaneseLuniSolarSeries = [self, [
-      'namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]',
-      'locale:[=en:, ja=ja:, alias]',
-      'area:[JapaneseLuniSolarSeries=, 日本の暦月=]',
+    # Japanese Luni-Solar Calendar Series for Japanese Note
+    JapaneseLuniSolar = [self, [
+      'locale:[ja=ja:, en=en:]',
+      'area:[日本の暦月=, *JapaneseLuniSolar=]',
       ['[平朔儀鳳暦=]-660.01.01',  '@F',  "-660-01-01^JapaneseTwin::平朔儀鳳暦"],
       ['[元嘉暦]454.01.01',        '@CR',  "454-01-01^ChineseTwin::元嘉暦"],
       ['[儀鳳暦]697.01.01',        '@CR',  "697-01-01^ChineseTwin::麟徳暦"],
@@ -29,15 +28,14 @@ module When
       ['[寛政暦]1798.01.01',       '@CR', "1798-01-01^JapaneseTwin::寛政暦"    ], # 京都平均太陽時
       ['[寛政丁亥暦]1827.01.01',   '@CR', "1827-01-01^JapaneseTwin::寛政丁亥暦"], # 京都平均太陽時
       ['[天保暦]1844.01.01',       '@CR', "1844-01-01^JapaneseTwin::天保暦"    ], # 京都真太陽時
-      ['[JLSO=,旧々暦=]1872.12.03','@CR', "1872-12-03^JapaneseTwin::旧々暦"    ], # 東京平均太陽時
-      ['[JLS=,旧暦]1887.11.18',    '@CR', "1887-11-18^JapaneseTwin::旧暦"      ]  # 日本標準時
+      ['[旧々暦=,*JSO=]1872.12.03','@CR', "1872-12-03^JapaneseTwin::旧々暦"    ], # 東京平均太陽時
+      ['[旧暦,*JS=]1887.11.18',    '@CR', "1887-11-18^JapaneseTwin::旧暦"      ]  # 日本標準時
     ]]
 
-    # Japanese Solar Calendar Series for JapaneseNote
-    JapaneseSolarSeries = [self, [
-      'namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]',
-      'locale:[=en:, ja=ja:, alias]',
-      'area:[JapaneseSolarSeries=, 日本の節月=]',
+    # Japanese Solar Calendar Series for Japanese Note
+    JapaneseSolar = [self, [
+      'locale:[ja=ja:, en=en:]',
+      'area:[日本の節月=, *JapaneseSolar=]',
       ['[平朔儀鳳暦=]-661.01.01',  '@F',  "-661-01-01^JapaneseTwin::平朔儀鳳暦(節月)"], # 年の始めに遡って開始(実際は12.22)
       ['[元嘉暦]454.01.12',        '@CR',  "454-01-12^ChineseTwin::元嘉暦(節月)"],
       ['[儀鳳暦]696.12.27',        '@CR',  "696-12-27^ChineseTwin::麟徳暦(節月)"],
@@ -53,8 +51,8 @@ module When
       ['[寛政暦]1798.01.12',       '@CR', "1798-01-12^JapaneseTwin::寛政暦(節月)"    ],
       ['[寛政丁亥暦]1826.12.22',   '@CR', "1826-12-22^JapaneseTwin::寛政丁亥暦(節月)"],
       ['[天保暦]1844.01.14',       '@CR', "1844-01-14^JapaneseTwin::天保暦(節月)"    ], # 京都真太陽時
-      ['[JSO=,旧々暦=]1872.11.26', '@CR', "1872-11-26^JapaneseTwin::旧々暦(節月)"    ], # 東京平均太陽時
-      ['[JS=,旧暦]1887.11.26',     '@CR', "1887-11-26^JapaneseTwin::旧暦(節月)"      ]  # 日本標準時
+      ['[旧々暦=,*JSO=]1872.11.26','@CR', "1872-11-26^JapaneseTwin::旧々暦(節月)"    ], # 東京平均太陽時
+      ['[旧暦,*JS=]1887.11.26',    '@CR', "1887-11-26^JapaneseTwin::旧暦(節月)"      ]  # 日本標準時
     ]]
   end
 
@@ -85,7 +83,6 @@ module When
     }
 
     JapaneseTwin = [{}, When::BasicTypes::M17n, ChineseSolar.twin('JapaneseTwin', [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=ja:, en=en:, alias]",
       "area:[日本,Japan]",
 

data/lib/when_exe/region/javanese.rb

@@ -8,10 +8,9 @@
 module When
   class BasicTypes::M17n
 
-    JavaneseTerms = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+    Javanese = [self, [
       "locale:[=en:, ja=ja:, alias]",
-      "names:[JavaneseTerms=]",
+      "names:[Javanese=]",
       "[JavaneseLunar=, ジャワ・イスラーム暦=]",
       "[Pranatamangsa=, プラノトモンソ=]",
 
@@ -49,11 +48,15 @@ module When
     ]]
   end
 
+  class CalendarNote
+    Javanese = [['Javanese::Windu'], ['_m:Calendar::Month'],
+                     ['Javanese::Pasaran', 'Javanese::Paringkelan', 'Javanese::Week', 'Javanese::Wuku']]
+  end
+
   module Coordinates
 
     # Javanese Residues
     Javanese = [When::BasicTypes::M17n, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
       "names:[Javanese]",
 
@@ -139,7 +142,6 @@ module When
 
     # シャカ紀元
      JavaneseLunar = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
       "period:[JavaneseLunar=, ジャワ・イスラーム暦=]",
       ["[SE=, サカ暦=, alias:Javanese_Saka_Era]1547.1.1", "Calendar Epoch", "1035-01-01^Javanese1547",
@@ -157,7 +159,7 @@ module When
       'origin_of_LSC' =>  2317690,
       'origin_of_MSC' =>     1555-512,
       'indices' => [
-         When::Coordinates::Index.new({:unit =>12, :trunk=>When.Resource('_m:JavaneseTerms::IslamicMonth::*')}),
+         When.Index('Javanese::IslamicMonth', {:unit =>12}),
          When::Coordinates::DefaultDayIndex
       ],
       'rule_table'    => {
@@ -165,7 +167,7 @@ module When
         354   => {'Length'=>[30,29] * 6           },
         355   => {'Length'=>[30,29] * 5 + [30] * 2}
       },
-      'note'  => 'JavaneseNotes'
+      'note'  => 'Javanese'
     }]
 
     #
@@ -175,7 +177,7 @@ module When
       'origin_of_LSC' =>  2360214,
       'origin_of_MSC' =>     1675-512,
       'indices' => [
-         When::Coordinates::Index.new({:unit =>12, :trunk=>When.Resource('_m:JavaneseTerms::IslamicMonth::*')}),
+         When.Index('Javanese::IslamicMonth', {:unit =>12}),
          When::Coordinates::DefaultDayIndex
        ],
       'rule_table'    => {
@@ -183,7 +185,7 @@ module When
         354   => {'Length'=>[30,29] * 6                 },
         355   => {'Length'=>[30,29] * 5 + [30] * 2      }
       },
-      'note'  => 'JavaneseNotes'
+      'note'  => 'Javanese'
     }]
 
     #
@@ -193,7 +195,7 @@ module When
       'origin_of_LSC' =>  2385728,
       'origin_of_MSC' =>     1747-512,
       'indices' => [
-         When::Coordinates::Index.new({:unit =>12, :trunk=>When.Resource('_m:JavaneseTerms::IslamicMonth::*')}),
+         When.Index('Javanese::IslamicMonth', {:unit =>12}),
          When::Coordinates::DefaultDayIndex
        ],
       'rule_table'    => {
@@ -202,19 +204,19 @@ module When
         'D'   => {'Length'=>[30]*2+[29]*3+[29,30]*3+[30]},
         355   => {'Length'=>[30,29] * 5 + [30] * 2      }
       },
-      'note'  => 'JavaneseNotes'
+      'note'  => 'Javanese'
     }]
 
     #
     # Pranatamangsa
     #
     Pranatamangsa =  [CyclicTableBased, {
-      'label'         => When.Resource('_m:JavaneseTerms::Pranatamangsa'),
+      'label'         => 'Javanese::Pranatamangsa',
       'origin_of_LSC' => 1721232,
       'origin_of_MSC' =>   -1854,
       'indices' => [
-         Coordinates::Index.new({:unit =>12, :trunk=>When.Resource('_m:JavaneseTerms::HinduMonth::*'), :shift=>8}),
-         Coordinates::DefaultDayIndex
+         When.Index('Javanese::HinduMonth', {:unit =>12, :shift=>8}),
+         When::Coordinates::DefaultDayIndex
        ],
       'rule_table'     => {
         'T'  => {'Rule'  =>['LC', 'SC', 'SC', 'SC']},

data/lib/when_exe/region/jewish.rb

@@ -8,10 +8,9 @@
 module When
   class BasicTypes::M17n
 
-    JewishTerms = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+    Jewish = [self, [
       "locale:[=en:, ja=ja:, alias]",
-      "names:[JewishTerms=]",
+      "names:[Jewish=]",
       "[Jewish=en:Hebrew_calendar, ユダヤ暦]",
 
       [self,
@@ -44,7 +43,6 @@ module When
     # Anno Mundi epoch
     #
     Jewish = [self, [
-      "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
       "area:[Israel, イスラエル]",
       ["[AnnoMundi=en:Anno_Mundi, ユダヤ紀元, *alias:HY]1.1.1", "Calendar Epoch", "01-01-01^Jewish"],
@@ -58,11 +56,13 @@ module When
     #
     class Jewish < TableBased
 
+      include Lunar
+
       private
 
       # オブジェクトの正規化
       def _normalize(args=[], options={})
-        @label = When.Resource('_m:JewishTerms::Jewish')
+        @label = 'Jewish::Jewish'
 
         # Default Parameters
         Rational
@@ -81,10 +81,9 @@ module When
 
         # Month & Day Index
         @indices ||= [
-          Coordinates::Index.new({:branch=>{-1=>When.Resource('_m:JewishTerms::IntercalaryMonth::*')[0],
-                                             1=>When.Resource('_m:JewishTerms::IntercalaryMonth::*')[1]},
-                                  :trunk=>m17n('[::_m:JewishTerms::Month::*]')}),
-          Coordinates::DefaultDayIndex
+          When.Index('Jewish::Month', {:branch=>{-1=>When.Resource('_m:Jewish::IntercalaryMonth::*')[0],
+                                                  1=>When.Resource('_m:Jewish::IntercalaryMonth::*')[1]}}),
+          When::Coordinates::DefaultDayIndex
         ]
 
         # Month & Day Arrangement

data/lib/when_exe/region/korean.rb

@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2013 Takashi SUGA
+  Copyright (C) 2013-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
 
-require 'when_exe/region/chinese'
-require 'when_exe/region/chinese_calendar'
+require 'when_exe/region/chinese/calendars'
 
 #
-#  朝鮮王位年号一覧表
+#  朝鮮朔閏表および王位年号一覧表
 #
 # （参考文献）
 # 東洋史辞典（東京創元社）
@@ -20,20 +19,132 @@ require 'when_exe/region/chinese_calendar'
 # 観象授時（月刊『言語』1991.12 特集・暦の記号学）
 # 増補改訂中国の天文暦法（平凡社）P156
 # 現代こよみ読み解き事典（柏書房）
+# 韓國年暦大典（嶺南大学校出版部）
+# 三国時代年曆表（Korea Astronomy Observatory）
+# 高麗時代年曆表（Korea Astronomy Observatory）
+# 朝鮮時代年曆表（Korea Astronomy Observatory）
+# 朝鮮における時憲曆の受容過程とその思想的背景(東方學報 京都第84冊(2009) pp.302-281).
 #
 module When
+  module CalendarTypes
+
+    # 正月:A, ２月:B, ３月:C, ４月:D, ５月:E, ６月:F,
+    # ７月:G, ８月:H, ９月:I, 10月:J, 11月:K, 12月:L
+    # 大の月:大文字, 小の月:小文字
+    # 同じアルファベットの連続の後者:閏月
+    # #- は『韓國年暦大典』(1987年版)の中国-朝鮮差分が取り消されたもの
+    # #! は全勇勳「朝鮮における時憲曆の受容過程とその思想的背景」で言及された年(最終的には差分でない)
+
+  Korean = PatternTableBasedLuniSolar.join([
+    PatternTableBasedLuniSolar,
+    {
+      'indices'=>  ChineseIndices,
+      'before' => 'ChineseTwin::太初暦',
+      'after'  => 'ChineseLuniSolar?time_basis=+09',
+      'note'   => 'Chinese',
+    },
+    ['Chinese_103',  -60.. 263],             # 前漢～蜀漢(太初暦・四分暦)
+    ['Chinese0239',  264.. 444],             # 三国・南朝(景初暦)
+    ['Chinese0445',  445.. 589],             # 南朝(元嘉暦・大明暦)
+    ['Chinese0523',  590.. 946],             # 隋・唐～五代前期(大業暦～調元暦)
+    ['Chinese0956',  947..1279],             # 五代後期～南宋(調元暦～本天暦)
+    ['Chinese0939', 1280..1653],             # 元・明・南明(重修大明暦・授時暦・大統暦)
+    ['Chinese1645', 1654..1911]],            # 清(時憲暦)
+    {
+       -26 => {'aB'   => 'Ab'  },            # ベースとする中国暦日表の違い
+       240 => {'Hi'   => 'hI'  },            # 四分・景初・乾象暦いずれにも不一致
+
+       478 => {'bC'   => 'Bc'  },            # 日食記事による見直し(景初・元嘉・三紀・玄始暦いずれにも不一致)
+       502 => {'D'    => 'E'   },            # 中国暦日表を計算による元嘉暦に戻す
+       559 => {'De'   => 'eE'  },            # 日食記事による見直し(元嘉・大明・興和・天保・正光暦いずれにも不一致)
+       575 => {'i'    => 'h'   },            # ベースとする中国暦日表の違い
+
+       592 => {'FgHi' => 'fgHI'},
+       716 => {'lL'   => 'Ll'  },            # ベースとする中国暦日表の違い
+       768 => {'bC'   => 'Bc'  },
+       795 => {'H'    => 'G'   },            # ベースとする中国暦日表の違い
+       935 => {'Kl'   => 'kL'  },            # 宣明暦に一致(崇玄暦とは不一致)
+
+      1022 => {'aB'  => 'Ab'  },             # 宣明暦に一致
+      1025 => {'fG'  => 'Fg'  },             # 宣明・遼の大明暦に一致
+      1032 => {'cD'  => 'Cd'  },
+      1040 => {'dE'  => 'De', 'K'  => 'k' }, # ５月朔は宣明・遼の大明暦に一致
+      1041 => {'a'   => 'A',  'Jk' => 'jK'}, # 12月朔は宣明・遼の大明暦に一致
+      1048 => {'l'   => 'L'   },
+      1049 => {'A'   => 'a',  'Kl' => 'kL'}, # 12月朔は宣明・遼の大明暦に一致
+      1058 => {'l'   => 'L'   },
+      1059 => {'A'   => 'a',  'Kl' => 'kL'}, # 12月朔は宣明・遼の大明暦に一致
+      1067 => {'bC'  => 'aB'  },             # 宣明暦に一致(閏月２か月ずれ)
+      1073 => {'kL'  => 'Kl'  },
+      1078 => {'gHI' => 'GHi' },
+      1079 => {'Ef'  => 'eF'  },
+      1096 => {'bcDefGhIJKl' => 'BCdeFGhijkL' },
+      1114 => {'bC'  => 'Bc'  },
+      1118 => {'dE'  => 'De'  },
+      1149 => {'efG' => 'Efg' },
+      1244 => {'fGH' => 'FGh' },
+      1252 => {'eF'  => 'Ef'  },
+      1253 => {'Hi'  => 'hI'  },             # 重修大明暦に一致(たまたま?宣明暦にも一致)
+      1270 => {'jjK' => 'jKk' },             # 重修大明暦に一致
+      1276 => {'Ab'  => 'aB'  },             # 重修大明暦に一致
+
+      1287 => {'bCD' => 'BCd' },             # ベースとする中国暦日表の違い
+      1300 => {'HIj' => 'hIJ' },
+      1365 => {'aB'  => 'Ab'  },
+      1397 => {'bC'  => 'Bc'  },
+      1399 => {'De'  => 'dE'  },
+      1430 => {'Cd'  => 'cD'  },
+   #- 1437 => {'kL'  => 'Kl'  },
+      1440 => {'kL'  => 'Kl'  },
+      1444 => {'kL'  => 'Kl'  },
+      1462 => {'Jk'  => 'jK'  },
+      1495 => {'fG'  => 'Fg'  },
+      1530 => {'Ab'  => 'aB'  },
+      1581 => {'Ij'  => 'iJ'  },
+      1588 => {'bCD' => 'BCd','Kl' =>'kL'},
+      1597 => {'Hi'  => 'hI'  },
+   #- ,        'L'   =>'l' },
+   #- 1598 => {'a'   => 'A'   },
+      1599 => {'l'   => 'L'   },
+      1600 => {'A'   => 'a'   },
+      1602 => {'hI'  => 'Hi'  },
+      1608 => {'l'   => 'L'   },
+      1609 => {'A'   => 'a'   },
+   #- 1615 => {'Fg'  => 'fG', 'Hh' =>'hH'},
+   #- 1619 => {'L'   => 'l'   },
+   #- 1620 => {'a'   => 'A'   },
+   #- 1642 => {'Fg'  => 'fG'  },
+   #- 1644 => {'fG'  => 'Fg'  },
+   #- 1649 => {'iJ'  => 'Ij'  },
+   #- 1650 => {'kL'  => 'Kl'  },
+      1652 => {'hIJ' => 'HIj' },
+
+   #- 1664 => {'bC'  => 'Bc'  },
+   #- 1674 => {'aB'  => 'Ab'  },
+      1677 => {'iJ'  => 'Ij'  },
+      1698 => {'jK'  => 'Jk'  },
+   #! 1705 => {'Kl'  => 'kL'  },
+      1709 => {'aB'  => 'Ab', 'jK' =>'Jk' },
+      1727 => {'cC'  => 'Cc'  },
+      1730 => {'Cd'  => 'cD'  },
+   #! 1735 => 『英祖實録』巻38 10年4月10日(乙卯) 是以我國明年曆與彼國所同者,只是置閏與月朔大小,而節候則日時皆不同
+      1751 => {'Jk'  => 'jK'  },
+      1778 => {'Cd'  => 'cD'  },
+      1841 => {'kL'  => 'Kl'  }
+    })
+  end
+
   class TM::CalendarEra
 
     #
     # 朝鮮半島
     #
     Korean = [self, [
-      "namespace:[ja=http://ja.wikipedia.org/wiki/, en=http://en.wikipedia.org/wiki/]",
       "locale:[=ja:, en=en:, alias]",
       "area:[朝鮮=ja:%%<元号>#%.<朝鮮半島>,Korea=en:Regnal_year#Korean]",
       [self,
 	"period:[高句麗]",
-	["[東明王]1",	"@F",	"name=[東明王];-36^Chinese_103"],
+	["[東明王]1",	"@F",	"name=[東明王];-36^Korean"],
 	["[瑠璃王]1",	"@A",	"name=[瑠璃王];-18"],
 	["[大武神王]1",	"@A", "name=[大武神王];018"],
 	["[閔中王]1",	"@A",	"name=[閔中王];044"],
@@ -43,7 +154,7 @@ module When
 	["[新大王]1",	"@A",	"name=[新大王];165"],
 	["[故国川王]1",	"@A", "name=[故国川王];179"],
 	["[山上王]1",	"@A",	"name=[山上王];197"],			# 朝鮮史ではこれ以降を実在とする
-	["[東川王]1",	"@A",	"name=[東川王];227", "239^Chinese0239", ""],
+	["[東川王]1",	"@A",	"name=[東川王];227"],
 	["[中川王]1",	"@A",	"name=[中川王];248"],
 	["[西川王]1",	"@A",	"name=[西川王];270"],
 	["[烽上王]1",	"@A",	"name=[烽上王];292"],
@@ -51,28 +162,28 @@ module When
 	["[故国原王]1",	"@A", "name=[故国原王];331"],
 	["[小獣林王]1",	"@A", "name=[小獣林王];371"],
 	["[故国壌王]1",	"@A", "name=[故国壌王];384"],			# 朝鮮史では末年に？
-	["[永楽]1",	"@A",	"name=[広開土];391"],                   # コンサイスでは翌年が元年
-	["[長寿王]1",	"@A",	"name=[長寿王];413.01.01"],             # 朝鮮史では元年に？
-	["[延寿]1",	"",		      "451^Chinese0445"],       # こよみ読み解き事典による
+	["[永楽]1",	"@A",	"name=[広開土];391"],			# コンサイスでは翌年が元年
+	["[長寿王]1",	"@A",	"name=[長寿王];413.01.01"],		# 朝鮮史では元年に？
+	["[延寿]1",	"",		      "445"],			# こよみ読み解き事典による
 	["[文咨王]1",	"@A",	"name=[文咨王];492.01.01"],
 	["[安臧王]1",	"@A",	"name=[安臧王];519"],
 	["[安原王]1",	"@A",	"name=[安原王];531"],
 	["[陽原王]1",	"@A",	"name=[陽原王];545"],
 	["[平原王]1",	"@A",	"name=[平原王];559"],
-	["[嬰陽王]1",	"@A",	"name=[嬰陽王];590^Chinese0523"],
+	["[嬰陽王]1",	"@A",	"name=[嬰陽王];590"],
 	["[栄留王]1",	"@A",	"name=[栄留王];618"],
 	["[宝臧王]1",	"@A",	"name=[宝臧王];642", "668.09.12="],	# 資治通鑑による、癸巳滅亡
      ],
       [self,
 	"period:[百済]",
-	["[温祚王]1",	"@F",	"name=[温祚王];-17^Chinese_103"],
+	["[温祚王]1",	"@F",	"name=[温祚王];-17^Korean"],
 	["[多婁王]1",	"@A",	"name=[多婁王];028"],
 	["[己婁王]1",	"@A",	"name=[己婁王];077"],
 	["[蓋婁王]1",	"@A",	"name=[蓋婁王];128"],			# 朝鮮史では127が末年
 	["[肖古王]1",	"@A",	"name=[肖古王];166"],
 	["[仇首王]1",	"@A",	"name=[仇首王];214"],
 	["[沙伴王]1",	"@A",	"name=[沙伴王];234"],
-	["[古爾王]1",	"@A",	"name=[古爾王];234", "239^Chinese0239", ""],
+	["[古爾王]1",	"@A",	"name=[古爾王];234"],
 	["[責稽王]1",	"@A",	"name=[責稽王];286"],
 	["[汾西王]1",	"@A",	"name=[汾西王];298"],
 	["[比流王]1",	"@A",	"name=[比流王];304"],			# 朝鮮史ではこれ以後を実在とする
@@ -84,14 +195,14 @@ module When
 	["[阿莘王]1",	"@A",	"name=[阿莘王];392"],
 	["[腆支王]1",	"@A",	"name=[腆支王];405"],
 	["[久爾辛王]1",	"@A", "name=[久爾辛王];420"],
-	["[毗有王]1",	"@A",	"name=[毗有王];427", "451^Chinese0445", ""],
+	["[毗有王]1",	"@A",	"name=[毗有王];427"],
 	["[蓋鹵王]1",	"@A",	"name=[蓋鹵王];455"],
 	["[文周王]1",	"@A",	"name=[文周王];475"],
 	["[三斤王]1",	"@A",	"name=[三斤王];477"],			# 朝鮮史では末年に？
 	["[東城王]1",	"@A",	"name=[東城王];479"],
 	["[武寧王]1",	"@A",	"name=[武寧王];501"],
 	["[聖王]1",	"@A",	  "name=[聖王];523.05.07"],		# 武寧王墓誌による
-	["[威徳王]1",	"@A",	"name=[威徳王];554", "590^Chinese0523", ""],
+	["[威徳王]1",	"@A",	"name=[威徳王];554"],
 	["[恵王]1",	"@A",	  "name=[恵王];598"],
 	["[法王]1",	"@A",	  "name=[法王];599"],
 	["[武王]1",	"@A",	  "name=[武王];600"],
@@ -99,7 +210,7 @@ module When
       ],
       [self,
 	"period:[新羅]",
-	["[赫居世]1",	"@F",	"name=[赫居世];-56^^Chinese_103"],
+	["[赫居世]1",	"@F",	"name=[赫居世];-56^^Korean"],
 	["[南解王]1",	"@A",	"name=[南解王];004"],
 	["[儒理王]1",	"@A",	"name=[儒理王];024"],
 	["[脱解王]1",	"@A",	"name=[脱解王];057"],
@@ -109,22 +220,22 @@ module When
 	["[阿達羅王]1",	"@A", "name=[阿達羅王];154"],
 	["[伐休王]1",	"@A",	"name=[伐休王];184"],
 	["[奈解王]1",	"@A",	"name=[奈解王];196"],
-	["[助賁王]1",	"@A",	"name=[助賁王];230", "239^Chinese0239", ""],
+	["[助賁王]1",	"@A",	"name=[助賁王];230"],
 	["[沾解王]1",	"@A",	"name=[沾解王];247"],			# 朝鮮史では261が末年
 	["[味鄒王]1",	"@A",	"name=[味鄒王];262"],
 	["[儒礼王]1",	"@A",	"name=[儒礼王];284"],
 	["[基臨王]1",	"@A",	"name=[基臨王];298"],
 	["[訖解王]1",	"@A",	"name=[訖解王];310"],			# コンサイスはこれ以前の在位を記さない
-	["[奈勿王]1",	"@A",	"name=[奈勿王];356"],                   # 朝鮮史ではこれ以後を実在とする
+	["[奈勿王]1",	"@A",	"name=[奈勿王];356"],			# 朝鮮史ではこれ以後を実在とする
 	["[実聖王]1",	"@A",	"name=[実聖王];402"],
-	["[訥祇王]1",	"@A",	"name=[訥祇王];417", "451^Chinese0445", ""],
+	["[訥祇王]1",	"@A",	"name=[訥祇王];417"],
 	["[慈悲王]1",	"@A",	"name=[慈悲王];458"],
 	["[炤知王]1",	"@A",	"name=[炤知王];479"],
 	["[智証王]1",	"@A",	"name=[智証王];500"],
 	["[法興王]1",	"@A",	"name=[法興王];514"],
 	["[真興王]1",	"@A",	"name=[真興王];540"],
 	["[真智王]1",	"@A",	"name=[真智王];576"],
-	["[真平王]1",	"@A",	"name=[真平王];579", "590^Chinese0523", ""],
+	["[真平王]1",	"@A",	"name=[真平王];579"],
 	["[善徳女王]1",	"@A", "name=[善徳女王];632"],
 	["[真徳女王]1",	"@A", "name=[真徳女王];647"],
 	["[武烈王]1",	"@A",	"name=[武烈王];654"],
@@ -149,34 +260,34 @@ module When
 	["[景文王]1",	"@A",	"name=[景文王];861"],
 	["[憲康王]1",	"@A",	"name=[憲康王];875"],
 	["[定康王]1",	"@A",	"name=[定康王];886"],
-	["[真聖女王]1",	"@A", "name=[真聖女王];887^ChineseTwin::宣明暦"],	# 東洋史辞典のみ１年遅
-	["[孝恭王]1",	"@A",	"name=[孝恭王];897"],                   #        〃
-	["[神徳王]1",	"@A",	"name=[神徳王];912"],                   #        〃
+	["[真聖女王]1",	"@A", "name=[真聖女王];887"],			# 東洋史辞典のみ１年遅
+	["[孝恭王]1",	"@A",	"name=[孝恭王];897"],			#        〃
+	["[神徳王]1",	"@A",	"name=[神徳王];912"],			#        〃
 	["[景明王]1",	"@A",	"name=[景明王];917"],
 	["[景哀王]1",	"@A",	"name=[景哀王];924"],
 	["[敬順王]1",	"@A",	"name=[敬順王];927", "935="],
         [self,
 	  "period:[(年号)]",
-	  ["[建元]1",	"",	"name=[法興王];536^Chinese0445"],
+	  ["[建元]1",	"",	"name=[法興王];536^Korean"],
 	  ["[開国]1",	"",	"name=[真興王];551"],
 	  ["[太昌,alias:大昌]1",	"",   "568"],
 	  ["[鴻済]1",	"",		      "572"],
-	  ["[建福]1",	"",	"name=[真平王];584", "590^Chinese0523", ""],
+	  ["[建福]1",	"",	"name=[真平王];584"],
 	  ["[仁平]1",	"",   "name=[善徳女王];634"],
 	  ["[太和]1",	"@A", "name=[真徳女王];647", "649="]
         ],
         [self,
 	  "period:[長安]",		# １年で滅亡したと仮定
-	  ["[慶雲]1",	"@F",	"name=[金憲昌];822^^Chinese0523", "822="]
+	  ["[慶雲]1",	"@F",	"name=[金憲昌];822^^Korean", "822="]
         ]
       ],
       [self,
 	"period:[後百済]",		# 三国遺事による
-	["[甄萱]1",	"@F",	"name=[甄萱];900^ChineseTwin::宣明暦", "936.09.08="]
+	["[甄萱]1",	"@F",	"name=[甄萱];900^Korean", "936.09.08="]
       ],
       [self,
 	"period:[後高句麗]",
-	["[弓裔]1",	"@F",	"name=[弓裔];901^ChineseTwin::宣明暦"],
+	["[弓裔]1",	"@F",	"name=[弓裔];901^Korean"],
 	["[摩震]1",	"@A",	"name=[武泰];904"],
 	["[聖冊]1",	"",		    "905"],
 	["[泰封]1",	"@A","name=[水徳万歳];911"],
@@ -184,7 +295,7 @@ module When
       ],
       [self,
 	"period:[高麗]",
-	["[天授]1",	"@F",	"name=[太祖];918.06^ChineseTwin::宣明暦"],	# 三国遺事による
+	["[天授]1",	"@F",	"name=[太祖];918.06^Korean"],		# 三国遺事による
 	["[太祖]16",	"",		    "933"],
 	["[恵宗]1",	"@A",	"name=[恵宗];944"],
 	["[定宗]1",	"@A",	"name=[定宗];946"],
@@ -214,7 +325,7 @@ module When
 	["[忠烈王]1",	"@A",	"name=[忠烈王];1275"],
 	["[忠宣王]1",	"@A",	"name=[忠宣王];1298.01"],		# 朝鮮史による
 	["[忠烈王･再]24","@A",	"name=[忠烈王];1298.08"],               #      〃
-	["[忠宣王･再]1","@A",	"name=[忠宣王];1309^Chinese0939"],
+	["[忠宣王･再]1","@A",	"name=[忠宣王];1309"],
 	["[忠粛王]1",	"@A",	"name=[忠粛王];1314"],
 	["[忠恵王]1",	"@A",	"name=[忠恵王];1331"],
 	["[忠粛王･再]1","@A",	"name=[忠粛王];1332"],
@@ -228,7 +339,7 @@ module When
       ],
       [self,
 	"period:[朝鮮]",
-	["[太祖]1.07.17","@F",	"name=[太祖];1392-07-17^Chinese0939"],	# コンサイスによる
+	["[太祖]1.07.17","@F",	"name=[太祖];1392-07-17^Korean"],	# コンサイスによる
 	["[定宗]1",	"@A",	"name=[定宗];1399"],
 	["[太宗]1",	"@A",	"name=[太宗];1401"],
 	["[世宗]1",	"@A",	"name=[世宗];1419"],
@@ -242,9 +353,9 @@ module When
 	["[仁宗]1",	"@A",	"name=[仁宗];1545"],
 	["[明宗]1",	"@A",	"name=[明宗];1546"],
 	["[宣祖]1",	"@A",	"name=[宣祖];1568"],
-	["[光海君]8",	"@A", "name=[光海君];1616"],
+	["[光海君]1",	"@A", "name=[光海君];1609"],
 	["[仁祖]1",	"@A",	"name=[仁祖];1623"],
-	["[孝宗]1",	"@A",	"name=[孝宗];1650", "1653^Chinese1645", ""],
+	["[孝宗]1",	"@A",	"name=[孝宗];1650"],
 	["[顕宗]1",	"@A",	"name=[顕宗];1660"],
 	["[粛宗]1",	"@A",	"name=[粛宗];1675"],
 	["[景宗]1",	"@A",	"name=[景宗];1721"],
@@ -254,12 +365,12 @@ module When
 	["[憲宗]1",	"@A",	"name=[憲宗];1835"],
 	["[哲宗]1",	"@A",	"name=[哲宗];1850"],
 	["[高宗]1",	"@A",	"name=[高宗];1864"],
-	["[建陽]1",	"",		    "1896.01.01^Gregorian?note=ChineseNotes",	# 朝鮮史による
+	["[建陽]1",	"",		    "1896.01.01^Gregorian?note=Chinese",	# 朝鮮史による
 	    "1897.10.01"]
       ],
       [self,
 	"period:[大韓帝国]",
-	["[光武]1",	"@F",	"name=[高宗];1897.10.01^Gregorian?note=ChineseNotes"],
+	["[光武]1",	"@F",	"name=[高宗];1897.10.01^Gregorian?note=Chinese"],
 	["[隆熙]1",	"@A",	"name=[純宗];1907.07.19", "1910.08.22="]
       ]
     ]]