when_exe 0.3.8 → 0.3.9

data/lib/when_exe/region/japanese/twins.rb

@@ -26,7 +26,7 @@ module When
       ['[宝暦暦]1755.01.01',       '@CR', '1755-01-01^JapaneseTwin::宝暦暦'    ],
       ['[修正宝暦暦=]1771.01.01',  '@CR', '1771-01-01^JapaneseTwin::修正宝暦暦'],
       ['[寛政暦]1798.01.01',       '@CR', '1798-01-01^JapaneseTwin::寛政暦'    ], # 京都平均太陽時
-      ['[寛政丁亥暦]1827.01.01',   '@CR', '1827-01-01^JapaneseTwin::寛政丁亥暦'], # 京都平均太陽時
+      ['[寛政丁亥暦=]1827.01.01',  '@CR', '1827-01-01^JapaneseTwin::寛政丁亥暦'], # 京都平均太陽時
       ['[天保暦]1844.01.01',       '@CR', '1844-01-01^JapaneseTwin#{?Clock=Clock}::天保暦'], # 京都真太陽時
       ['[旧々暦=,*JSO=]1872.12.03','@CR', '1872-12-03^JapaneseTwin::旧々暦'    ], # 東京平均太陽時
       ['[旧暦,*JS=]1887.11.18',    '@CR', '1887-11-18^JapaneseTwin::旧暦'      ]  # 日本標準時
@@ -49,7 +49,7 @@ module When
       ['[宝暦暦]1755.01.07',       '@CR', '1755-01-07^JapaneseTwin::宝暦暦(節月)'    ],
       ['[修正宝暦暦=]1771.01.11',  '@CR', '1771-01-11^JapaneseTwin::修正宝暦暦(節月)'],
       ['[寛政暦]1798.01.12',       '@CR', '1798-01-12^JapaneseTwin::寛政暦(節月)'    ],
-      ['[寛政丁亥暦]1826.12.22',   '@CR', '1826-12-22^JapaneseTwin::寛政丁亥暦(節月)'],
+      ['[寛政丁亥暦=]1826.12.22',  '@CR', '1826-12-22^JapaneseTwin::寛政丁亥暦(節月)'],
       ['[天保暦]1844.01.14',       '@CR', '1844-01-14^JapaneseTwin#{?Clock=Clock}::天保暦(節月)'], # 京都真太陽時
       ['[旧々暦=,*JSO=]1872.11.26','@CR', '1872-11-26^JapaneseTwin::旧々暦(節月)'    ], # 東京平均太陽時
       ['[旧暦,*JS=]1887.11.26',    '@CR', '1887-11-26^JapaneseTwin::旧暦(節月)'      ]  # 日本標準時
@@ -197,7 +197,7 @@ module When
       ],
 
       [ChineseLuniSolar,
-        'name:[寛政丁亥暦]',
+        'name:[寛政丁亥暦=]',
         'time_basis:+00,+09:03:01',          # 寛政9天正冬至.107112
          {'formula'=>['ChineseTrueLunation?day_epoch=2377391.107112&year_epoch=1797&year_length=365.242347071&year_delta=-0.217685&year_span=10',
                       'Formula']}

data/lib/when_exe/region/japanese/weeks.rb

@@ -22,13 +22,13 @@ class When::CalendarNote
     #
     Notes = [When::BasicTypes::M17n, [
       "locale:[=en:, ja=ja:, alias]",
-      "names:[Rokuyo]",
+      "names:[Rokuyo=]",
 
       # 日の暦注 ----------------------------
       [When::BasicTypes::M17n,
         "names:[day]",
         [When::BasicTypes::M17n,
-          "names:[Rokuyo, 六曜]",
+          "names:[Rokuyo=, 六曜]",
           [DayOfWeek, "label:[Taian=,      *大安]", {'delta'=>6}],
           [DayOfWeek, "label:[Shakko=,     *赤口]", {'delta'=>6}],
           [DayOfWeek, "label:[Sensho=,     *先勝]", {'delta'=>6}],

data/lib/when_exe/region/jewish.rb

@@ -122,5 +122,10 @@ module When
         return sdn
       end
     end
+
+    #
+    # Hebrew Calendar (alias of Jewish Calendar)
+    #
+    Hebrew = Jewish
   end
 end

data/lib/when_exe/region/korean.rb

@@ -144,234 +144,240 @@ module When
       "area:[朝鮮=ja:%%<元号>#%.<朝鮮半島>,Korea=en:Regnal_year#Korean]",
       [self,
 	"period:[高句麗]",
-	["[東明王]1",	"@F",	"name=[東明王];-36^Korean"],
-	["[瑠璃王]1",	"@A",	"name=[瑠璃王];-18"],
-	["[大武神王]1",	"@A", "name=[大武神王];018"],
-	["[閔中王]1",	"@A",	"name=[閔中王];044"],
-	["[慕本王]1",	"@A",	"name=[慕本王];048"],
-	["[太祖王]1",	"@A",	"name=[太祖王];053"],
-	["[次大王]1",	"@A",	"name=[次大王];146"],
-	["[新大王]1",	"@A",	"name=[新大王];165"],
-	["[故国川王]1",	"@A", "name=[故国川王];179"],
-	["[山上王]1",	"@A",	"name=[山上王];197"],			# 朝鮮史ではこれ以降を実在とする
-	["[東川王]1",	"@A",	"name=[東川王];227"],
-	["[中川王]1",	"@A",	"name=[中川王];248"],
-	["[西川王]1",	"@A",	"name=[西川王];270"],
-	["[烽上王]1",	"@A",	"name=[烽上王];292"],
-	["[美川王]1",	"@A",	"name=[美川王];300"],
-	["[故国原王]1",	"@A", "name=[故国原王];331"],
-	["[小獣林王]1",	"@A", "name=[小獣林王];371"],
-	["[故国壌王]1",	"@A", "name=[故国壌王];384"],			# 朝鮮史では末年に？
-	["[永楽]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"],
-	["[栄留王]1",	"@A",	"name=[栄留王];618"],
-	["[宝臧王]1",	"@A",	"name=[宝臧王];642", "668.09.12="],	# 資治通鑑による、癸巳滅亡
+	["[<東明王>=ja:%%<東明聖王>]1",	"@F",	"name=[東明王=ja:%%<東明聖王>];-36^Korean"],
+	["[<瑠璃王>=ja:%%<瑠璃明王>]1",	"@A",	"name=[瑠璃王=ja:%%<瑠璃明王>];-18"],
+	["[<大武神王>]1",		"@A", "name=[大武神王];018"],
+	["[<閔中王>]1",			"@A",	"name=[閔中王];044"],
+	["[<慕本王>]1",			"@A",	"name=[慕本王];048"],
+	["[<太祖王>=ja:%%<太祖大王>]1",	"@A",	"name=[太祖王=ja:%%<太祖大王>];053"],
+	["[<次大王>]1",			"@A",	"name=[次大王];146"],
+	["[<新大王>]1",			"@A",	"name=[新大王];165"],
+	["[<故国川王>]1",		"@A", "name=[故国川王];179"],
+	["[<山上王>]1",			"@A",	"name=[山上王];197"],						# 朝鮮史ではこれ以降を実在とする
+	["[<東川王>]1",			"@A",	"name=[東川王];227"],
+	["[<中川王>]1",			"@A",	"name=[中川王];248"],
+	["[<西川王>]1",			"@A",	"name=[西川王];270"],
+	["[<烽上王>]1",			"@A",	"name=[烽上王];292"],
+	["[<美川王>]1",			"@A",	"name=[美川王];300"],
+	["[<故国原王>]1",		"@A", "name=[故国原王];331"],
+	["[<小獣林王>]1",		"@A", "name=[小獣林王];371"],
+	["[<故国壌王>]1",		"@A", "name=[故国壌王];384"],						# 朝鮮史では末年に？
+	["[永楽=ja:%%<永楽_(高句麗)>]1","@A",	"name=[広開土王=ja:%%<好太王>];391"],				# コンサイスでは翌年が元年
+	["[<長寿王>]1",			"@A",	"name=[長寿王];413.01.01", "492.01.01"],			# 朝鮮史では元年に？
+	["[延寿=ja:%%<延寿_(高句麗)>]1","",		      "451"],						# Wikipedia
+	["[<文咨王>=ja:%%<文咨明王>]1",	"@A",	"name=[文咨王=ja:%%<文咨明王>];492.01.01"],
+	["[<安臧王>]1",			"@A",	"name=[安臧王];519"],
+	["[<安原王>]1",			"@A",	"name=[安原王];531"],
+	["[<陽原王>]1",			"@A",	"name=[陽原王];545"],
+	["[<平原王>]1",			"@A",	"name=[平原王];559"],
+	["[<嬰陽王>]1",			"@A",	"name=[嬰陽王];590"],
+	["[<栄留王>]1",			"@A",	"name=[栄留王];618"],
+	["[<宝臧王>=ja:%%<宝蔵王>]1","@A","name=[宝臧王=ja:%%<宝蔵王>];642", "668.09.12="],			# 資治通鑑による、癸巳滅亡
      ],
       [self,
 	"period:[百済]",
-	["[温祚王]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"],
-	["[責稽王]1",	"@A",	"name=[責稽王];286"],
-	["[汾西王]1",	"@A",	"name=[汾西王];298"],
-	["[比流王]1",	"@A",	"name=[比流王];304"],			# 朝鮮史ではこれ以後を実在とする
-	["[契王]1",	"@A",	  "name=[契王];344"],
-	["[近肖古王]1",	"@A", "name=[近肖古王];346"],
-	["[近仇首王]1",	"@A", "name=[近仇首王];375"],
-	["[枕流王]1",	"@A",	"name=[枕流王];384"],
-	["[辰斯王]1",	"@A",	"name=[辰斯王];385"],
-	["[阿莘王]1",	"@A",	"name=[阿莘王];392"],
-	["[腆支王]1",	"@A",	"name=[腆支王];405"],
-	["[久爾辛王]1",	"@A", "name=[久爾辛王];420"],
-	["[毗有王]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"],
-	["[恵王]1",	"@A",	  "name=[恵王];598"],
-	["[法王]1",	"@A",	  "name=[法王];599"],
-	["[武王]1",	"@A",	  "name=[武王];600"],
-	["[義慈王]1",	"@A",	"name=[義慈王];641", "660.08="]		# 資治通鑑による
+	["[<温祚王>]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"],
+	["[<古爾王>=ja:%%<古尓王>]1",		"@A",	"name=[古爾王=ja:%%<古尓王>];234"],
+	["[<責稽王>]1",				"@A",	"name=[責稽王];286"],
+	["[<汾西王>]1",				"@A",	"name=[汾西王];298"],
+	["[<比流王>]1",				"@A",	"name=[比流王];304"],					# 朝鮮史ではこれ以後を実在とする
+	["[<契王>]1",				"@A",	  "name=[契王];344"],
+	["[<近肖古王>]1",			"@A", "name=[近肖古王];346"],
+	["[<近仇首王>]1",			"@A", "name=[近仇首王];375"],
+	["[<枕流王>]1",				"@A",	"name=[枕流王];384"],
+	["[<辰斯王>]1",				"@A",	"name=[辰斯王];385"],
+	["[<阿莘王>=ja:%%<阿シン王>]1",		"@A",	"name=[阿莘王=ja:%%<阿シン王>];392"],
+	["[<腆支王>]1",				"@A",	"name=[腆支王];405"],
+	["[<久爾辛王>=ja:%%<久尓辛王>]1",	"@A", "name=[久爾辛王=ja:%%<久尓辛王>];420"],
+	["[<毗有王>=ja:%%<毘有王>]1",		"@A",	"name=[毗有王=ja:%%<毘有王>];427"],
+	["[<蓋鹵王>]1",				"@A",	"name=[蓋鹵王];455"],
+	["[<文周王>]1",				"@A",	"name=[文周王];475"],
+	["[<三斤王>]1",				"@A",	"name=[三斤王];477"],					# 朝鮮史では末年に？
+	["[<東城王>]1",				"@A",	"name=[東城王];479"],
+	["[<武寧王>]1",				"@A",	"name=[武寧王];501"],
+	["[<聖王>=ja:%%<聖王_(百済)>]1",	"@A",	   "name=[聖王=ja:%%<聖王_(百済)];523.05.07"],		# 武寧王墓誌による
+	["[<威徳王>=ja:%%<威徳王_(百済)>]1",	"@A", "name=[威徳王=ja:%%<威徳王_(百済)>];554"],
+	["[<恵王>=ja:%%<恵王_(百済)>]1",	"@A",	  "name=[恵王=ja:%%<恵王_(百済)>];598"],
+	["[<法王>=ja:%%<法王_(百済)>]1",	"@A",	  "name=[法王=ja:%%<法王_(百済)>];599"],
+	["[<武王>=ja:%%<聖王_(百済)>]1",	"@A",	  "name=[武王=ja:%%<武王_(百済)>];600"],
+	["[<義慈王>]1",				"@A",			   "name=[義慈王];641", "660.08="]	# 資治通鑑による
       ],
       [self,
 	"period:[新羅]",
-	["[赫居世]1",	"@F",	"name=[赫居世];-56^^Korean"],
-	["[南解王]1",	"@A",	"name=[南解王];004"],
-	["[儒理王]1",	"@A",	"name=[儒理王];024"],
-	["[脱解王]1",	"@A",	"name=[脱解王];057"],
-	["[婆娑王]1",	"@A",	"name=[婆娑王];080"],
-	["[祇摩王]1",	"@A",	"name=[祇摩王];112"],
-	["[逸聖王]1",	"@A",	"name=[逸聖王];134"],
-	["[阿達羅王]1",	"@A", "name=[阿達羅王];154"],
-	["[伐休王]1",	"@A",	"name=[伐休王];184"],
-	["[奈解王]1",	"@A",	"name=[奈解王];196"],
-	["[助賁王]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=[実聖王];402"],
-	["[訥祇王]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"],
-	["[善徳女王]1",	"@A", "name=[善徳女王];632"],
-	["[真徳女王]1",	"@A", "name=[真徳女王];647"],
-	["[武烈王]1",	"@A",	"name=[武烈王];654"],
-	["[文武王]1",	"@A",	"name=[文武王];661"],
-	["[神文王]1",	"@A",	"name=[神文王];681"],
-	["[孝昭王]1",	"@A",	"name=[孝昭王];692"],
-	["[聖徳王]1",	"@A",	"name=[聖徳王];702"],
-	["[孝成王]1",	"@A",	"name=[孝成王];737"],
-	["[景徳王]1",	"@A",	"name=[景徳王];742"],
-	["[恵恭王]1",	"@A",	"name=[恵恭王];765"],
-	["[宣徳王]1",	"@A",	"name=[宣徳王];780"],
-	["[元聖王]1",	"@A",	"name=[元聖王];785"],
-	["[昭聖王]1",	"@A",	"name=[昭聖王];799.01.01"],
-	["[哀荘王]1",	"@A",	"name=[哀荘王];800"],
-	["[憲徳王]1",	"@A",	"name=[憲徳王];809"],
-	["[興徳王]1",	"@A",	"name=[興徳王];826"],
-	["[僖康王]1",	"@A",	"name=[僖康王];836"],
-	["[閔哀王]1",	"@A",	"name=[閔哀王];838"],
-	["[神武王]1",	"@A",	"name=[神武王];839"],
-	["[文聖王]1",	"@A",	"name=[文聖王];839"],
-	["[憲安王]1",	"@A",	"name=[憲安王];857"],
-	["[景文王]1",	"@A",	"name=[景文王];861"],
-	["[憲康王]1",	"@A",	"name=[憲康王];875"],
-	["[定康王]1",	"@A",	"name=[定康王];886"],
-	["[真聖女王]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="],
+	["[<赫居世>=ja:%%<赫居世居西干>]1",	"@F", "name=[赫居世=ja:%%<赫居世居西干>];-56^^Korean"],
+	["[<南解王>=ja:%%<南解次次雄>]1",	"@A",	"name=[南解王=ja:%%<南解次次雄>];004"],
+	["[<儒理王>=ja:%%<儒理尼師今>]1",	"@A",	"name=[儒理王=ja:%%<儒理尼師今>];024"],
+	["[<脱解王>=ja:%%<脱解尼師今>]1",	"@A",	"name=[脱解王=ja:%%<脱解尼師今>];057"],
+	["[<婆娑王>=ja:%%<婆娑尼師今>]1",	"@A",	"name=[婆娑王=ja:%%<婆娑尼師今>];080"],
+	["[<祇摩王>=ja:%%<祇摩尼師今>]1",	"@A",	"name=[祇摩王=ja:%%<祇摩尼師今>];112"],
+	["[<逸聖王>=ja:%%<逸聖尼師今>]1",	"@A",	"name=[逸聖王=ja:%%<逸聖尼師今>];134"],
+	["[<阿達羅王>=ja:%%<阿達羅尼師今>]1",  "@A","name=[阿達羅王=ja:%%<阿達羅尼師今>];154"],
+	["[<伐休王>=ja:%%<伐休尼師今>]1",	"@A",	"name=[伐休王=ja:%%<伐休尼師今>];184"],
+	["[<奈解王>=ja:%%<奈解尼師今>]1",	"@A",	"name=[奈解王=ja:%%<奈解尼師今>];196"],
+	["[<助賁王>=ja:%%<助賁尼師今>]1",	"@A",	"name=[助賁王=ja:%%<助賁尼師今>];230"],
+	["[<沾解王>=ja:%%<沾解尼師今>]1",	"@A",	"name=[沾解王=ja:%%<沾解尼師今>];247"],			# 朝鮮史では261が末年
+	["[<味鄒王>=ja:%%<味鄒尼師今>]1",	"@A",	"name=[味鄒王=ja:%%<味鄒尼師今>];262"],
+	["[<儒礼王>=ja:%%<儒礼尼師今>]1",	"@A",	"name=[儒礼王=ja:%%<儒礼尼師今>];284"],
+	["[<基臨王>=ja:%%<基臨尼師今>]1",	"@A",	"name=[基臨王=ja:%%<基臨尼師今>];298"],
+	["[<訖解王>=ja:%%<訖解尼師今>]1",	"@A",	"name=[訖解王=ja:%%<訖解尼師今>];310"],			# コンサイスはこれ以前の在位を記さない
+	["[<奈勿王>=ja:%%<奈勿尼師今>]1",	"@A",	"name=[奈勿王=ja:%%<奈勿尼師今>];356"],			# 朝鮮史ではこれ以後を実在とする
+	["[<実聖王>=ja:%%<実聖尼師今>]1",	"@A",	"name=[実聖王=ja:%%<実聖尼師今>];402"],
+	["[<訥祇王>=ja:%%<訥祇麻立干>]1",	"@A",	"name=[訥祇王=ja:%%<訥祇麻立干>];417"],
+	["[<慈悲王>=ja:%%<慈悲麻立干>]1",	"@A",	"name=[慈悲王=ja:%%<慈悲麻立干>];458"],
+	["[<炤知王>=ja:%%<ショウ知麻立干>]1", "@A", "name=[炤知王=ja:%%<ショウ知麻立干>];479"],
+	["[<智証王>=ja:%%<智証麻立干>]1",	"@A",	"name=[智証王=ja:%%<智証麻立干>];500"],
+	["[<法興王>]1",	"@A",	"name=[法興王];514"],
+	["[<真興王>]1",	"@A",	"name=[真興王];540"],
+	["[<真智王>]1",	"@A",	"name=[真智王];576"],
+	["[<真平王>]1",	"@A",	"name=[真平王];579"],
+	["[<善徳女王>]1","@A","name=[善徳女王];632"],
+	["[<真徳女王>]1","@A","name=[真徳女王];647"],
+	["[<武烈王>]1",	"@A",	"name=[武烈王];654"],
+	["[<文武王>]1",	"@A",	"name=[文武王];661"],
+	["[<神文王>]1",	"@A",	"name=[神文王];681"],
+	["[<孝昭王>]1",	"@A",	"name=[孝昭王];692"],
+	["[<聖徳王>]1",	"@A",	"name=[聖徳王];702"],
+	["[<孝成王>=ja:%%<孝成王_(新羅)>]1", "@A", "name=[孝成王=ja:%%<孝成王_(新羅)>];737"],
+	["[<景徳王>]1",	"@A",	"name=[景徳王];742"],
+	["[<恵恭王>]1",	"@A",	"name=[恵恭王];765"],
+	["[<宣徳王>]1",	"@A",	"name=[宣徳王];780"],
+	["[<元聖王>]1",	"@A",	"name=[元聖王];785"],
+	["[<昭聖王>]1",	"@A",	"name=[昭聖王];799.01.01"],
+	["[<哀荘王>]1",	"@A",	"name=[哀荘王];800"],
+	["[<憲徳王>]1",	"@A",	"name=[憲徳王];809"],
+	["[<興徳王>]1",	"@A",	"name=[興徳王];826"],
+	["[<僖康王>]1",	"@A",	"name=[僖康王];836"],
+	["[<閔哀王>]1",	"@A",	"name=[閔哀王];838"],
+	["[<神武王>]1",	"@A",	"name=[神武王];839"],
+	["[<文聖王>]1",	"@A",	"name=[文聖王];839"],
+	["[<憲安王>]1",	"@A",	"name=[憲安王];857"],
+	["[<景文王>]1",	"@A",	"name=[景文王];861"],
+	["[<憲康王>]1",	"@A",	"name=[憲康王];875"],
+	["[<定康王>]1",	"@A",	"name=[定康王];886"],
+	["[<真聖女王>]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^Korean"],
-	  ["[開国]1",	"",	"name=[真興王];551"],
-	  ["[太昌,alias:大昌]1",	"",   "568"],
-	  ["[鴻済]1",	"",		      "572"],
-	  ["[建福]1",	"",	"name=[真平王];584"],
-	  ["[仁平]1",	"",   "name=[善徳女王];634"],
-	  ["[太和]1",	"@A", "name=[真徳女王];647", "649="]
+	  "period:[年号=]",
+	  ["[建元=ja:%%<建元_(新羅)>]1",	"",	"name=[法興王];536^Korean"],
+	  ["[開国=ja:%%<開国_(新羅)>]1",	"",	"name=[真興王];551"],
+	  ["[大昌,alias:太昌=ja:%%<大昌>]1",	"",		      "568"],
+	  ["[鴻済]1",				"",		      "572"],
+	  ["[建福=ja:%%<建福_(新羅)>]1",	"",	"name=[真平王];584"],
+	  ["[仁平=ja:%%<仁平_(新羅)>]1",	"",   "name=[善徳女王];634"],
+	  ["[太和=ja:%%<太和_(新羅)>]1",	"@A", "name=[真徳女王];647", "649="]
         ],
         [self,
-	  "period:[長安]",		# １年で滅亡したと仮定
-	  ["[慶雲]1",	"@F",	"name=[金憲昌];822^^Korean", "822="]
+	  "period:[長安=zh:%%<長安國>]", # １月で滅亡と仮定
+	  ["[慶雲=ja:%%<慶雲_(金憲昌)>]1",	"@F",	"name=[金憲昌=zh:%%<金憲昌>];822.03^^Korean", "822.03="]
         ]
       ],
       [self,
 	"period:[後百済]",		# 三国遺事による
-	["[甄萱]1",	"@F",	"name=[甄萱];900^Korean", "936.09.08="]
+	["[<甄萱>]1",	"@F",			 "name=[甄萱];900^Korean", "936.09.08="]
       ],
       [self,
 	"period:[後高句麗]",
-	["[弓裔]1",	"@F",	"name=[弓裔];901^Korean"],
-	["[摩震]1",	"@A",	"name=[武泰];904"],
-	["[聖冊]1",	"",		    "905"],
-	["[泰封]1",	"@A","name=[水徳万歳];911"],
-	["[政開]1",	"",		    "914", "918.06"]
+	["[<弓裔>=ja:%%<弓裔>]1",	"@F",	 "name=[弓裔];901^Korean", "904"],
+	[self,
+	  "period:[摩震=ja:%%<後高句麗>]",
+	  ["[武泰=ja:%%<武泰_(後高句麗)>]1", "", "name=[弓裔];904^Korean"],
+	  ["[聖冊]1",	"",				     "905", "911"]
+	],
+	[self,
+	  "period:[泰封=ja:%%<後高句麗>]",
+	  ["[水徳万歳]1",		"",	 "name=[弓裔];911^Korean"],
+	  ["[政開]1",			"",		     "914", "918.06"]
+	]
       ],
       [self,
 	"period:[高麗]",
-	["[天授]1",	"@F",	"name=[太祖];918.06^Korean"],		# 三国遺事による
-	["[太祖]16",	"",		    "933"],
-	["[恵宗]1",	"@A",	"name=[恵宗];944"],
-	["[定宗]1",	"@A",	"name=[定宗];946"],
-	["[光徳]1",	"@A",	"name=[光宗];950"],
-	["[峻豊]1",	"@A",		    "962.01.01"],		# こよみ読み解き事典による
-	["[光宗]14",	"@A",		    "963.01.01"],
-	["[景宗]1",	"@A",	"name=[景宗];976"],
-	["[成宗]1",	"@A",	"name=[成宗];982"],
-	["[穆宗]1",	"@A",	"name=[穆宗];998"],
-	["[顕宗]1",	"@A",	"name=[顕宗];1010"],
-	["[徳宗]1",	"@A",	"name=[徳宗];1032"],
-	["[靖宗]1",	"@A",	"name=[靖宗];1035"],
-	["[文宗]1",	"@A",	"name=[文宗];1047"],
-	["[順宗]1",	"@A",	"name=[順宗];1083"],
-	["[宣宗]1",	"@A",	"name=[宣宗];1084"],
-	["[献宗]1",	"@A",	"name=[献宗];1095"],
-	["[粛宗]1",	"@A",	"name=[粛宗];1096"],
-	["[睿宗]1",	"@A",	"name=[睿宗];1106"],
-	["[仁宗]1",	"@A",	"name=[仁宗];1123"],
-	["[毅宗]1",	"@A",	"name=[毅宗];1147"],
-	["[明宗]0",	"@A",	"name=[明宗];1170.08"],			# 朝鮮史による
-	["[神宗]1",	"@A",	"name=[神宗];1198"],
-	["[熙宗]1",	"@A",	"name=[熙宗];1205"],
-	["[康宗]1",	"@A",	"name=[康宗];1212"],
-	["[高宗]1",	"@A",	"name=[高宗];1214"],
-	["[元宗]1",	"@A",	"name=[元宗];1260"],
-	["[忠烈王]1",	"@A",	"name=[忠烈王];1275"],
-	["[忠宣王]1",	"@A",	"name=[忠宣王];1298.01"],		# 朝鮮史による
-	["[忠烈王･再]24","@A",	"name=[忠烈王];1298.08"],               #      〃
-	["[忠宣王･再]1","@A",	"name=[忠宣王];1309"],
-	["[忠粛王]1",	"@A",	"name=[忠粛王];1314"],
-	["[忠恵王]1",	"@A",	"name=[忠恵王];1331"],
-	["[忠粛王･再]1","@A",	"name=[忠粛王];1332"],
-	["[忠恵王･再]1","@A",	"name=[忠恵王];1340"],
-	["[忠穆王]1",	"@A",	"name=[忠穆王];1345"],
-	["[忠定王]1",	"@A",	"name=[忠定王];1349.01.01"],
-	["[恭愍王]1",	"@A",	"name=[恭愍王];1352"],
-	["[禑王]1",	"@A",	  "name=[禑王];1375"],
-	["[昌王]1",	"@A",	  "name=[昌王];1389"],
-	["[恭譲王]1",	"@A",	"name=[恭譲王];1390", "1392.07.17"]	# コンサイスによる
+	["[天授=ja:%%<天授_(高麗)>]1",		"@F",	"name=[太祖=ja:%%<太祖_(高麗王)>];918.06^Korean"],	# 三国遺事による
+	["[<太祖>=ja:%%<太祖_(高麗王)>]16",	"",					 "933"],
+	["[<恵宗>=ja:%%<恵宗_(高麗王)>]1",	"@A",	"name=[恵宗=ja:%%<恵宗_(高麗王)>];944"],
+	["[<定宗>=ja:%%<定宗_(高麗王)>]1",	"@A",	"name=[定宗=ja:%%<定宗_(高麗王)>];946"],
+	["[光徳=ja:%%<光徳_(高麗)>]1",		"@A",	"name=[光宗=ja:%%<光宗_(高麗王)>];950"],
+	["[<光宗>=ja:%%<光宗_(高麗王)>]3",	"@A",					 "952"],
+      # ["[峻豊]1",				"@A",					 "962.01.01"],		# こよみ読み解き事典による Wikipedia で否定
+	["[<景宗>=ja:%%<景宗_(高麗王)>]1",	"@A",	"name=[景宗=ja:%%<景宗_(高麗王)>];976"],
+	["[<成宗>=ja:%%<成宗_(高麗王)>]1",	"@A",	"name=[成宗=ja:%%<成宗_(高麗王)>];982"],
+	["[<穆宗>=ja:%%<穆宗_(高麗王)>]1",	"@A",	"name=[穆宗=ja:%%<穆宗_(高麗王)>];998"],
+	["[<顕宗>=ja:%%<顕宗_(高麗王)>]1",	"@A",	"name=[顕宗=ja:%%<顕宗_(高麗王)>];1010"],
+	["[<徳宗>=ja:%%<徳宗_(高麗王)>]1",	"@A",	"name=[徳宗=ja:%%<徳宗_(高麗王)>];1032"],
+	["[<靖宗>=ja:%%<靖宗_(高麗王)>]1",	"@A",	"name=[靖宗=ja:%%<靖宗_(高麗王)>];1035"],
+	["[<文宗>=ja:%%<文宗_(高麗王)>]1",	"@A",	"name=[文宗=ja:%%<文宗_(高麗王)>];1047"],
+	["[<順宗>=ja:%%<順宗_(高麗王)>]1",	"@A",	"name=[順宗=ja:%%<順宗_(高麗王)>];1083"],
+	["[<宣宗>=ja:%%<宣宗_(高麗王)>]1",	"@A",	"name=[宣宗=ja:%%<宣宗_(高麗王)>];1084"],
+	["[<献宗>=ja:%%<献宗_(高麗王)>]1",	"@A",	"name=[献宗=ja:%%<献宗_(高麗王)>];1095"],
+	["[<粛宗>=ja:%%<粛宗_(高麗王)>]1",	"@A",	"name=[粛宗=ja:%%<粛宗_(高麗王)>];1096"],
+	["[<睿宗>=ja:%%<睿宗_(高麗王)>]1",	"@A",	"name=[睿宗=ja:%%<睿宗_(高麗王)>];1106"],
+	["[<仁宗>=ja:%%<仁宗_(高麗王)>]1",	"@A",	"name=[仁宗=ja:%%<仁宗_(高麗王)>];1123"],
+	["[<毅宗>=ja:%%<毅宗_(高麗王)>]1",	"@A",	"name=[毅宗=ja:%%<毅宗_(高麗王)>];1147"],
+	["[<明宗>=ja:%%<明宗_(高麗王)>]0",	"@A",	"name=[明宗=ja:%%<明宗_(高麗王)>];1170.08"],		# 朝鮮史による
+	["[<神宗>=ja:%%<神宗_(高麗王)>]1",	"@A",	"name=[神宗=ja:%%<神宗_(高麗王)>];1198"],
+	["[<熙宗>=ja:%%<熙宗_(高麗王)>]1",	"@A",	"name=[熙宗=ja:%%<熙宗_(高麗王)>];1205"],
+	["[<康宗>=ja:%%<康宗_(高麗王)>]1",	"@A",	"name=[康宗=ja:%%<康宗_(高麗王)>];1212"],
+	["[<高宗>=ja:%%<高宗_(高麗王)>]1",	"@A",	"name=[高宗=ja:%%<高宗_(高麗王)>];1214"],
+	["[<元宗>=ja:%%<元宗_(高麗王)>]1",	"@A",	"name=[元宗=ja:%%<元宗_(高麗王)>];1260"],
+	["[<忠烈王>]1",				"@A",			   "name=[忠烈王];1275"],
+	["[<忠宣王>]1",				"@A",			   "name=[忠宣王];1298.01"],		# 朝鮮史による
+	["[<忠烈王･再>=ja:%%<忠烈王>]24",	"@A",			   "name=[忠烈王];1298.08"],		#      〃
+	["[<忠宣王･再>=ja:%%<忠宣王>]1",	"@A",			   "name=[忠宣王];1309"],
+	["[<忠粛王>]1",				"@A",			   "name=[忠粛王];1314"],
+	["[<忠恵王>]1",				"@A",			   "name=[忠恵王];1331"],
+	["[<忠粛王･再>=ja:%%<忠粛王>]1",	"@A",			   "name=[忠粛王];1332"],
+	["[<忠恵王･再>=ja:%%<忠恵王>]1",	"@A",			   "name=[忠恵王];1340"],
+	["[<忠穆王>]1",				"@A",			   "name=[忠穆王];1345"],
+	["[<忠定王>]1",				"@A",			   "name=[忠定王];1349.01.01"],
+	["[<恭愍王>]1",				"@A",			   "name=[恭愍王];1352"],
+	["[<禑王>=ja:%%<王ウ_(高麗王)>]1",	"@A",   "name=[禑王=ja:%%<王ウ_(高麗王)>];1375"],
+	["[<昌王>=ja:%%<王昌_(高麗王)>]1",	"@A",   "name=[昌王=ja:%%<王昌_(高麗王)>];1389"],
+	["[<恭譲王>]1",				"@A",		   "name=[恭譲王];1390", "1392.07.17"]		# コンサイスによる
       ],
       [self,
-	"period:[朝鮮]",
-	["[太祖]1.07.17","@F",	"name=[太祖];1392-07-17^Korean"],	# コンサイスによる
-	["[定宗]1",	"@A",	"name=[定宗];1399"],
-	["[太宗]1",	"@A",	"name=[太宗];1401"],
-	["[世宗]1",	"@A",	"name=[世宗];1419"],
-	["[文宗]1",	"@A",	"name=[文宗];1451"],
-	["[端宗]1",	"@A",	"name=[端宗];1453"],
-	["[世祖]1",	"@A",	"name=[世祖];1455"],
-	["[睿宗]1",	"@A",	"name=[睿宗];1469"],
-	["[成宗]1",	"@A",	"name=[成宗];1470"],
-	["[燕山君]1",	"@A", "name=[燕山君];1495"],
-	["[中宗]1",	"@A",	"name=[中宗];1506"],
-	["[仁宗]1",	"@A",	"name=[仁宗];1545"],
-	["[明宗]1",	"@A",	"name=[明宗];1546"],
-	["[宣祖]1",	"@A",	"name=[宣祖];1568"],
-	["[光海君]1",	"@A", "name=[光海君];1609"],
-	["[仁祖]1",	"@A",	"name=[仁祖];1623"],
-	["[孝宗]1",	"@A",	"name=[孝宗];1650"],
-	["[顕宗]1",	"@A",	"name=[顕宗];1660"],
-	["[粛宗]1",	"@A",	"name=[粛宗];1675"],
-	["[景宗]1",	"@A",	"name=[景宗];1721"],
-	["[英祖]1",	"@A",	"name=[英祖];1725"],			# コンサイスでは英宗
-	["[正祖]1",	"@A",	"name=[正祖];1777"],
-	["[純祖]1",	"@A",	"name=[純祖];1801"],
-	["[憲宗]1",	"@A",	"name=[憲宗];1835"],
-	["[哲宗]1",	"@A",	"name=[哲宗];1850"],
-	["[高宗]1",	"@A",	"name=[高宗];1864"],
-	["[建陽]1",	"",		    "1896.01.01^Gregorian?note=Chinese",	# 朝鮮史による
+	"period:[朝鮮=ja:%%<李氏朝鮮>]",
+	["[<太祖>=ja:%%<李成桂>]1.07.17",	"@F",	       "name=[太祖=ja:%%<李成桂>];1392-07-17^Korean"],	# コンサイスによる
+	["[<定宗>=ja:%%<定宗_(朝鮮王)>]1",	"@A",	"name=[定宗=ja:%%<定宗_(朝鮮王)>];1399"],
+	["[<太宗>=ja:%%<太宗_(朝鮮王)>]1",	"@A",	"name=[太宗=ja:%%<太宗_(朝鮮王)>];1401"],
+	["[<世宗>=ja:%%<世宗_(朝鮮王)>]1",	"@A",	"name=[世宗=ja:%%<世宗_(朝鮮王)>];1419"],
+	["[<文宗>=ja:%%<文宗_(朝鮮王)>]1",	"@A",	"name=[文宗=ja:%%<文宗_(朝鮮王)>];1451"],
+	["[<端宗>=ja:%%<端宗_(朝鮮王)>]1",	"@A",	"name=[端宗=ja:%%<端宗_(朝鮮王)>];1453"],
+	["[<世祖>=ja:%%<世祖_(朝鮮王)>]1",	"@A",	"name=[世祖=ja:%%<世祖_(朝鮮王)>];1455"],
+	["[<睿宗>=ja:%%<睿宗_(朝鮮王)>]1",	"@A",	"name=[睿宗=ja:%%<睿宗_(朝鮮王)>];1469"],
+	["[<成宗>=ja:%%<成宗_(朝鮮王)>]1",	"@A",	"name=[成宗=ja:%%<成宗_(朝鮮王)>];1470"],
+	["[<燕山君>]1",				"@A",			   "name=[燕山君];1495"],
+	["[<中宗>=ja:%%<中宗_(朝鮮王)>]1",	"@A",	"name=[中宗=ja:%%<中宗_(朝鮮王)>];1506"],
+	["[<仁宗>=ja:%%<仁宗_(朝鮮王)>]1",	"@A",	"name=[仁宗=ja:%%<仁宗_(朝鮮王)>];1545"],
+	["[<明宗>=ja:%%<明宗_(朝鮮王)>]1",	"@A",	"name=[明宗=ja:%%<明宗_(朝鮮王)>];1546"],
+	["[<宣祖>]1",				"@A",			     "name=[宣祖];1568"],
+	["[<光海君>]1",				"@A",			   "name=[光海君];1609"],
+	["[<仁祖>]1",				"@A",			     "name=[仁祖];1623"],
+	["[<孝宗>=ja:%%<孝宗_(朝鮮王)>]1",	"@A",	"name=[孝宗=ja:%%<孝宗_(朝鮮王)>];1650"],
+	["[<顕宗>=ja:%%<顕宗_(朝鮮王)>]1",	"@A",	"name=[顕宗=ja:%%<顕宗_(朝鮮王)>];1660"],
+	["[<粛宗>=ja:%%<粛宗_(朝鮮王)>]1",	"@A",	"name=[粛宗=ja:%%<粛宗_(朝鮮王)>];1675"],
+	["[<景宗>=ja:%%<景宗_(朝鮮王)>]1",	"@A",	"name=[景宗=ja:%%<景宗_(朝鮮王)>];1721"],
+	["[<英祖>=ja:%%<英祖_(朝鮮王)>]1",	"@A",	"name=[英祖=ja:%%<英祖_(朝鮮王)>];1725"],		# コンサイスでは英宗
+	["[<正祖>]1",				"@A",			     "name=[正祖];1777"],
+	["[<純祖>]1",				"@A",			     "name=[純祖];1801"],
+	["[<憲宗>=ja:%%<憲宗_(朝鮮王)>]1",	"@A",	"name=[憲宗=ja:%%<憲宗_(朝鮮王)>];1835"],
+	["[<哲宗>=ja:%%<哲宗_(朝鮮王)>]1",	"@A",	"name=[哲宗=ja:%%<哲宗_(朝鮮王)>];1850"],
+	["[<高宗>=ja:%%<高宗_(朝鮮王)>]1",	"@A",	"name=[高宗=ja:%%<高宗_(朝鮮王)>];1864"],
+	["[建陽]1",				"",					 "1896.01.01^Gregorian?note=Chinese",	# 朝鮮史による
 	    "1897.10.01"]
       ],
       [self,
 	"period:[大韓帝国]",
-	["[光武]1",	"@F",	"name=[高宗];1897.10.01^Gregorian?note=Chinese"],
-	["[隆熙]1",	"@A",	"name=[純宗];1907.07.19", "1910.08.22="]
+	["[光武=ja:%%<光武_(元号)>]1",	"@F",	"name=[高宗=ja:%%<高宗_(朝鮮王)>];1897.10.01^Gregorian?note=Chinese"],
+	["[隆熙]1",			"@A",	"name=[純宗=ja:%%<純宗_(朝鮮王)>];1907.07.19", "1910.08.29="]
       ]
     ]]
   end