when_exe 0.3.7 → 0.3.8

data/lib/when_exe/region/bahai.rb

@@ -78,69 +78,29 @@ module When
 
   module CalendarTypes
 
+    _ID      = '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,18=,19'
+    _Indices = [
+      When.Index({:unit =>19}),
+      When.Index({:unit =>19}),
+      When.Index('Bahai::Month', {:branch=>{+1=>When.Resource('_m:Bahai::Month::*')[19]}}),
+      When::Coordinates::DefaultDayIndex
+    ]
+
     #
     # Bahá'í Calendar
     #
-    class Bahai < TableBased
-
-      # 年初の通日 - グレゴリオ暦の３月21日を春分とする
-      #
-      # @param [Array<Numeric>] date ( 年 )
-      #
-      # @return [Numeric] 年初の通日
-      #
-      def gregorian_equinox(date)
-        @engine._coordinates_to_number(+date[0], 2, 20)
-      end
-
-      # 年初の通日 - 太陽の天文学的な位置による春分に基づく
-      #
-      # @param [Array<Numeric>] date ( 年 )
-      #
-      # @return [Numeric] 年初の通日
-      #
-      def ephemeris_equinox(date)
-        equinox_time = @engine.cn_to_time(+date[0])
-        equinox_date = (equinox_time + 0.5 + @engine.long/360.0).floor
-        sunset_time = @engine.sunset(equinox_date)
-        (sunset_time <= equinox_time) ? equinox_date+1 : equinox_date
-      end
-
-      private
-
-      ID = '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,18=,19'
-
-      #
-      # オブジェクトの正規化
-      #
-      def _normalize(args=[], options={})
-        @label   ||= 'Bahai::Bahai'
-
-        @indices ||= [
-          When.Index({:unit =>19}),
-          When.Index({:unit =>19}),
-          When.Index('Bahai::Month', {:branch=>{+1=>When.Resource('_m:Bahai::Month::*')[19]}}),
-          When::Coordinates::DefaultDayIndex
-        ]
-        @origin_of_MSC ||= -1844 + 19*19
-        @rule_table    ||= {
-          365 => {'Length'=>[19] * 18 + [4, 19], 'IDs'=>ID},
-          366 => {'Length'=>[19] * 18 + [5, 19], 'IDs'=>ID}
-        }
-        @note ||= 'Bahai'
-
-        super
-
-        @engine ||= @location ?
-          When::Ephemeris::Formula.new({:formula=>'1S', :location=>@location}) :
-          When::Gregorian
-
-        case @engine
-        when When::Ephemeris::Formula; instance_eval('class << self; alias :_sdn_ :ephemeris_equinox; end')
-        when When::TM::Calendar      ; instance_eval('class << self; alias :_sdn_ :gregorian_equinox; end')
-        else                         ; raise ArgumentError, 'Engine not specified'
-        end
-      end
-    end
+    Bahai = [TableBasedWithSunset, {
+      'label'           => 'Bahai::Bahai',
+      'indices'         => _Indices,
+      'origin_of_MSC'   => -1844 + 19*19,
+      'diff_to_CE'      =>  0,
+      'engine_month'    =>  3,
+      'engine_day'      => 21,
+      'rule_table'      => {
+        365 => {'Length'=>[19] * 18 + [4, 19], 'IDs'=>_ID},
+        366 => {'Length'=>[19] * 18 + [5, 19], 'IDs'=>_ID}
+      },
+      'note' => 'Bahai'
+    }]
   end
 end

data/lib/when_exe/region/chinese/epochs.rb

@@ -28,11 +28,11 @@ module When
 	["[高祖,alias:高帝]1*",	"@F"	,	"name=[高祖];-205*10^Chinese_221"],	# 顓頊暦で推算
 	["[恵帝]1*",		"@A"	,	"name=[恵帝];-193*10-01"],		# 前年４月甲辰高祖崩ず
 	["[高后]1*",		"@A"	,	"name=[高后];-186*10-01"],		# 前年８月戊寅恵帝崩ず
-	["[前元]1*",		"@A"	,	"name=[文帝];-178*10-01"],		# 前年７月辛巳高后崩ず
-	["[後元]1*",		""	,	"	     -162*10-01"],
-	["[前元]1*",		"@A"	,	"name=[景帝];-155*10-01"],		# 前年６月己亥文帝崩ず
-	["[中元]1*",		""	,	"	     -148*10-01"],
-	["[後元]1*",		""	,	"	     -142*10-01"],
+	["[文帝前元=]1*",	"@A"	,	"name=[文帝];-178*10-01"],		# 前年７月辛巳高后崩ず
+	["[文帝後元=]1*",	""	,	"	     -162*10-01"],
+	["[景帝前元=]1*",	"@A"	,	"name=[景帝];-155*10-01"],		# 前年６月己亥文帝崩ず
+	["[景帝中元=]1*",	""	,	"	     -148*10-01"],
+	["[景帝後元=]1*",	""	,	"	     -142*10-01"],
 	["[建元]1*",		"@A"	,	"name=[武帝];-139*10-01"],		# 前年正月甲子景帝崩ず
 	["[元光]1*",		""	,	"	     -133*10-01"],
 	["[元朔]1*",		""	,	"	     -127*10-01"],
@@ -45,7 +45,7 @@ module When
 	["[天漢]1"	,	""	,	"	     -99-01-01"],
 	["[太始]1"	,	""	,	"	     -95-01-01"],
 	["[征和]1"	,	""	,	"	     -91-01-01"],
-	["[後元]1"	,	""	,	"	     -87-01-01"],
+	["[後元武帝=]1"	,	""	,	"	     -87-01-01"],
 	["[始元]1"	,	"@A"	,	"name=[昭帝];-85-01-01"],		# 前年２月丁卯武帝崩ず
 	["[元鳳]1"	,	""	,	"	     -79-08"],
 	["[元平]1"	,	""	,	"	     -73-01-01"],
@@ -161,15 +161,15 @@ module When
 	  ["[赤烏]1"	,	""	,	"	     238-08"],			# 2338-8
 	  ["[太元]1"	,	""	,	"	     251-05"],			# 2391-6
 	  ["[神鳳]1"	,	""	,	"	     252-02"],			# 2394-4 これは大帝の年号
-	  ["[建興]1"	,	"@A"	,	"name=[会稽王];252-04"],		# 孫亮 2394-4
+	  ["[建興]1"	,	"@A"	,	"name=[会稽王=ja:%%<孫亮>];252-04"],	# 孫亮 2394-4
 	  ["[五鳳]1"	,	""	,	"	     254-01-01"],		# 三国志 1152
 	  ["[太平]1"	,	""	,	"	     256-10-06"],		# 乙酉 2434-10
 	  ["[永安]1"	,	"@A"	,	"name=[景帝];258-10-18"],		# 孫休 三国志 1155 通鑑 2447-8 戊午変
-	  ["[元興]1"	,	"@A"	,	"name=[烏程公];264-07-25"],		# 孫皓 癸未 2487-15
+	  ["[元興]1"	,	"@A"	,	"name=[烏程公=ja:%%<孫皓>];264-07-25"],	# 孫皓 癸未 2487-15
 	  ["[甘露]1"	,	""	,	"	     265-04"],			# 2491-2
 	  ["[宝鼎]1"	,	""	,	"	     266-08"],			# 2498-11
 	  ["[建衡]1"	,	""	,	"	     269-10"],			# 2510-8
-	  ["[鳳皇]1"	,	""	,	"	     272-01-01"],		# 2518-20
+	  ["[鳳凰=ja:%%<鳳凰_(呉)>]1","",	"	     272-01-01"],		# 2518-20
 	  ["[天冊]1"	,	""	,	"	     275-01"],			# 2541-2
 	  ["[天璽]1"	,	""	,	"	     276-07"],			# 2542-3
 	  ["[天紀]1"	,	""	,	"	     277-01-01", "280-04-16="]	# 三国志 1171
@@ -185,7 +185,7 @@ module When
 	  ["[青龍]1"	,	""	,	"	     233-02-06"],		# 丁酉
 	  ["[景初]1*"	,	""	,	"name=[明帝];237-03^Chinese0237",	# 改元と同時に景初暦使用、１２月を歳首とする
 						"name=[明帝];239-12-01^Chinese0239",""],# 正月を歳首にもどす
-	  ["[正始]1"	,	"@A"	,	"name=[斉王];240-01-01"],		# 辛亥
+	  ["[正始]1"	,	"@A"	,	"name=[斉王=ja:%%<曹芳>];240-01-01"],	# 辛亥
 	  ["[嘉平]1"	,	""	,	"	     249-04-08"],		# 乙丑
 	  ["[正元]1"	,	"@A"	,	"name=[高貴郷公];254-10-28"],		# 癸丑
 	  ["[甘露]1"	,	""	,	"	     256-06-01"],		# 丙午
@@ -232,7 +232,7 @@ module When
 	  ["[咸安]1"	,	"@A"	,	"name=[簡文帝];371-11-15"],		# 己酉
 	  ["[寧康]1"	,	"@A"	,	"name=[孝武帝];373-01-01"],		# 己丑
 	  ["[太元]1"	,	""	,	"	     376-01-03"],		# 甲辰
-	  ["[崇安]1"	,	""	,	"name=[安帝];397-01-01"],
+	  ["[崇安=]1"	,	""	,	"name=[安帝];397-01-01"],
 	  ["[隆安]1"	,	"@A"	,	"	     397-01-01"],		# 己亥
 	  ["[元興]1"	,	""	,	"	     402-01-01"],		# 庚午
 	  ["[隆安]6.03.04",	""	,	"	     402-03-04"],		# 壬寅
@@ -266,7 +266,7 @@ module When
 	  "period:[南斉]",
 	  ["[建元]1"	,	"@F"	,	"name=[高帝];479-04-23^Chinese0445"],	# 甲午
 	  ["[永明]1"	,	"@A"	,	"name=[武帝];483-01-02"],		# 辛亥
-	  ["[隆昌]1"	,	"@A"	,	"name=[欝林王];494-01-01"],		# 丁未
+	  ["[隆昌]1"	,	"@A"	,	"name=[欝林王=ja:%%<蕭昭業>];494-01-01"],# 丁未
 	  ["[延興]1"	,	"@A"	,	"name=[海陵王];494-07-25"],		# 丁酉
 	  ["[建武]1"	,	"@A"	,	"name=[明帝];494-10-22"],		# 癸亥
 	  ["[永泰]1"	,	""	,	"	     498-04-03"],		# 甲寅
@@ -283,7 +283,7 @@ module When
 	  ["[中大同]1"	,	""	,	"	     546-04-14"],		# 丙戌
 	  ["[太清]1"	,	""	,	"	     547-04-21"],		# 丁亥
 	  ["[大宝]1"	,	"@A"	,	"name=[簡文帝];550-01-01"],		# 辛亥
-	  ["[天正]1"	,	"@A"	,	"name=[豫章王];551-08-21"],		# 壬戌 5072-29
+	  ["[天正]1"	,	"@A"	,	"name=[豫章王=ja:%%<蕭棟>];551-08-21"],	# 壬戌 5072-29
 	  ["[承聖]1"	,	"@A"	,	"name=[元帝];552-11-12"],		# 丙子 太清に戻した後、ただちに改元
 	  ["[天成]1"	,	"@A"	,	"name=[貞陽侯];555-05-27"],		# 丙午
 	  ["[紹泰]1"	,	"@A"	,	"name=[敬帝];555-10-02"],		# 己酉
@@ -300,16 +300,16 @@ module When
 	  ["[禎明]1"	,	""	,	"	     587-01-03", "589-01="]	# 戊寅
 	],
 	[self,
-	  "period:[梁(臨賀王)]",
-	  ["[正平]1"	,	"@A"	,	"name=[臨賀王];548-11-01^Chinese0445", "549-03="]    # 朔 4989-21
+	  "period:[梁(臨賀王)=ja:%%<梁_(南朝)>]",
+	  ["[正平]1"	,	"@A"	,"name=[臨賀王=ja:%%<蕭正徳>];548-11-01^Chinese0445", "549-03="]    # 朔 4989-21
 	],
 	[self,
-	  "period:[梁(武陵王)]",
-	  ["[天正]1"	,	"@A"	,	"name=[武陵王];552-04-08^Chinese0445", "553-08-08="] # 乙巳 5084-13
+	  "period:[梁(武陵王)=ja:%%<梁_(南朝)>]",
+	  ["[天正]1"	,	"@A"	,"name=[武陵王=ja:%%<蕭紀>];552-04-08^Chinese0445", "553-08-08="] # 乙巳 5084-13
 	],
 	[self,
-	  "period:[梁(永嘉王)]",
-	  ["[天啓]1"	,	"@A"	,	"name=[永嘉王];558-03^Chinese0445", "560-02="]	# 5174-11
+	  "period:[梁(永嘉王)=ja:%%<梁_(南朝)>]",
+	  ["[天啓]1"	,	"@A"	,"name=[永嘉王=ja:%%<蕭荘>];558-03^Chinese0445", "560-02="]	# 5174-11
 	],
 	[self,
 	  "period:[後梁]",
@@ -319,7 +319,7 @@ module When
 	],
 	[self,
 	  "period:[蜀]",
-	  ["[泰始]1"	,	"@F"	,	"name=[程道養];432-09^Chinese0239", "437-04="]	# 3841-20
+	  ["[泰始=ja:%%<泰始_(程道養)>]1","@F"	,"name=[程道養=];432-09^Chinese0239", "437-04="]	# 3841-20
 	],
 	[self,
 	  "period:[秦]",
@@ -372,7 +372,7 @@ module When
 	  ["[麟嘉]1"	,	""	,	"	     316-11-18"],		# 壬寅 2835-12
 	  ["[漢昌]1"	,	"@A"	,	"name=[劉粲];318-07-20"],		# 隠帝 甲子 2861-18
 	  ["[光初]1"	,	"@A"	,	"name=[劉曜];318-10",			# 2862-18
-						"name=[劉熙];328-12-25", "329-09="]	# 己亥 2965-11
+						"name=[劉熙=ja:%%<劉煕>];328-12-25", "329-09="]	# 己亥 2965-11
 	],
 	[self,
 	  "period:[後趙]",
@@ -420,7 +420,7 @@ module When
 	[self,
 	  "period:[西燕]",
 	  ["[燕興]1"	,	"@F"	,	"name=[慕容泓];384-04^Chinese0239"],	# 済北王 3328-14
-	  ["[更始]1"	,	"@A"	,	"name=[慕容冲];385-01"],		# 威帝 3339-2
+	  ["[更始]1"	,	"@A"	,	"name=[慕容冲=ja:%%<慕容沖>];385-01"],	# 威帝 3339-2
 	  ["[昌平]1"	,	"@A"	,	"name=[段隨];386-02"],			# 3359-8
 	  ["[建明]1"	,	"@A"	,	"name=[慕容顗];386-03"],		# 3363-15
 	  ["[建平]1"	,	"@A"	,	"name=[慕容瑶];386-03"],		# 3363-15
@@ -457,9 +457,9 @@ module When
 	  ["[建義]1"	,	"@F"	,	"name=[乞伏国仁];385-09^Chinese0239"],	# 宣烈王 3354-38
 	  ["[太初]1"	,	"@A"	,	"name=[乞伏乾帰];388-06", "400-08="],	# 武元王 3384-13
 	  ["[更始]1"	,	""	,	"	     409-07"],			# 3619-14
-	  ["[永康]1"	,	"@A"	,	"name=[乞伏熾盤];412-08"],		# 文昭王 3651-8
+	  ["[永康]1"	,	"@A"	,	"name=[乞伏熾磐];412-08"],		# 文昭王 3651-8
 	  ["[建弘]1"	,	""	,	"	     420-01"],			# 3732-2
-	  ["[永弘]1"	,	"@A"	,	"name=[乞伏慕末];428-05", "431-01="]	# 3801-8
+	  ["[永弘]1"	,	"@A"	,	"name=[乞伏暮末];428-05", "431-01="]	# 3801-8
 	],
 	[self,
 	  "period:[後涼]",
@@ -472,9 +472,9 @@ module When
 	],
 	[self,
 	"period:[南涼]",
-	  ["[太初]1"	,	"@F"	,	"name=[禿髪鳥孤];397-01^Chinese0239"],	# 武王 3439-4
+	  ["[太初]1"	,	"@F"	,	"name=[禿髪烏孤];397-01^Chinese0239"],	# 武王 3439-4
 	  ["[建和]1"	,	"@A"	,	"name=[禿髪利鹿孤];400-01"],		# 康王 3507-5
-	  ["[弘昌]1"	,	"@A"	,	"name=[禿髪人辱檀];402-03"],		# 景王 3542-15
+	  ["[弘昌]1"	,	"@A"	,	"name=[禿髪人辱檀=];402-03"],		# 景王 3542-15
 	  ["[嘉平]1"	,	""	,	"	     408-11", "414-06="]	# 3609-15
 	],
 	[self,
@@ -496,7 +496,7 @@ module When
 	],
 	[self,
 	  "period:[夏]",
-	  ["[龍升,alias:龍昇]1.06","@F"	,	"name=[赫連勃勃];407-06^Chinese0239"],	# 武烈帝 3598-10
+	  ["[龍昇,alias:龍升]1.06","@F"	,	"name=[赫連勃勃];407-06^Chinese0239"],	# 武烈帝 3598-10
 	  ["[鳳翔]1"	,	""	,	"	     413-03"],			# 3658-7
 	  ["[昌武]1"	,	""	,	"	     418-11"],			# 3723-16
 	  ["[真興]1"	,	""	,	"	     419-02"],			# 3726-9
@@ -505,7 +505,7 @@ module When
 	],
 	[self,
 	  "period:[代]",
-	  ["[建国]1"	,	"@F"	,	"name=[什翼犍];338-11^Chinese0239", "376-12="]	# 昭成帝 3025-11
+	  ["[建国]1"	,	"@F","name=[什翼犍=ja:%%<拓跋什翼ケン>];338-11^Chinese0239", "376-12="]	# 昭成帝 3025-11
 	]
       ],
       [self,
@@ -520,7 +520,7 @@ module When
 	  ["[神瑞]1"	,	""	,	"	     414-01-01"],		# 辛酉
 	  ["[泰常]1"	,	""	,	"	     416-04-05"],		# 壬子
 	  ["[始光]1"	,	"@A"	,	"name=[太武帝];424-01"],
-	  ["[神䴥]1"	,	""	,	"	     428-02"],			#
+	  ["[神䴥=ja:%%<神カ>]1",""	,	"	     428-02"],			#
 	  ["[延和]1"	,	""	,	"	     432-01-01"],		# 丙午
 	  ["[太延]1"	,	""	,	"	     435-01-26"],		# 甲申
 	  ["[太平真君]1"	,	""	,	"	     440-06-21"],	# 丁丑
@@ -599,81 +599,81 @@ module When
 	["[大業]1"	,	"@A"	,	"name=[煬帝];605-01-01", "618-03-10="],	# 壬辰
 	["[皇泰]1"	,	"@A"	,	"name=[恭帝];618-05-24^ChineseTwin::大業暦", "619-04-08"],	# 戊辰 5791-26
 	[self,
-	  "period:[鄭(王世充)]",
+	  "period:[鄭(王世充)=ja:%%<王世充>]",
 	  ["[開明]1"	,	"@F"	,	"name=[王世充];619-04-08^ChineseTwin::大業暦", "621-05-09="]	# 丙午 5853-45
 	],
 	[self,
-	  "period:[梁(蕭銑)]",
-	  ["[鳴鳳]1"	,	"@F"	,	"name=[蕭銑];617-10^ChineseTwin::大業暦", "621-10-21="]	# 5761-17
+	  "period:[梁(蕭銑)=ja:%%<蕭銑>]",
+	  ["[鳳鳴, alias:鳴鳳=]1",	"@F",	"name=[蕭銑];617-10^ChineseTwin::大業暦", "621-10-21="]	# 5761-17
 	],
 	[self,
-	  "period:[梁(梁師都)]",
+	  "period:[梁(梁師都)=ja:%%<梁師都>]",
 	  ["[永隆]1"	,	"@F"	,	"name=[梁師都];617-03^ChineseTwin::大業暦", "628-04-26="] # 5725-9
 	],
 	[self,
-	  "period:[梁(沈法興)]",
+	  "period:[梁(沈法興)=ja:%%<沈法興>]",
 	  ["[延康]1"	,	"@F"	,	"name=[沈法興];619-08^ChineseTwin::大業暦", "620-12="]	# 5863-77
 	],
 	[self,
-	  "period:[呉(李子通)]",
+	  "period:[呉(李子通)=ja:%%<李子通>]",
 	  ["[明政]1"	,	"@F"	,	"name=[李子通];619-08^ChineseTwin::大業暦", "621-11="]	# 5863-77
 	],
 	[self,
-	  "period:[楚(林士弘)]",
+	  "period:[楚(林士弘)=ja:%%<林士弘>]",
 	  ["[太平]1"	,	"@F"	,	"name=[林士弘];616-12-10^ChineseTwin::大業暦", "622-10-21="]	# 壬辰 5712-16
 	],
 	[self,
-	  "period:[楚(朱粲)]",
+	  "period:[楚(朱粲)=ja:%%<朱粲>]",
 	  ["[昌達]1"	,	"@F"	,	"name=[朱粲];618-10^ChineseTwin::大業暦", "619-02?"]	# 5817-22
 	],
 	[self,
-	  "period:[夏(竇建徳)]",
-	  ["[丁丑]1"	,	"@F"	,	"name=[竇建徳];617-01-05^ChineseTwin::大業暦"],		# 丙辰 5718-2
-	  ["[五鳳]1"	,	""	,	"	     618-07", "621-05-09="]		# 5805-54
+	  "period:[夏(竇建徳)=ja:%%<竇建徳>]",
+	  ["[丁丑=ja:%%<丁丑_(夏)>]1",	"@F",	"name=[竇建徳];617-01-05^ChineseTwin::大業暦"],		# 丙辰 5718-2
+	  ["[五鳳=ja:%%<五鳳_(夏)>]1",	"",	"	     618-07", "621-05-09="]		# 5805-54
 	],
 	[self,
-	  "period:[漢東(劉黒闥)]",
+	  "period:[漢東(劉黒闥)=ja:%%<劉黒闥>]",
 	  ["[天造]1"	,	"@F"	,	"name=[劉黒闥];622-01^ChineseTwin::大業暦", "623-01-03="] # 5942-1
 	],
 	[self,
-	  "period:[魏(李密)]",
-	  ["[永平]1"	,	"@F"	,	"name=[李密];617-02-19^ChineseTwin::大業暦", "618-09="]	# 庚子 5720-7
+	  "period:[魏(李密)=ja:%%<李密_(隋)>]",
+	  ["[永平]1"	,	"@F"	,	"name=[李密=ja:%%<李密_(隋)>];617-02-19^ChineseTwin::大業暦", "618-09="] # 庚子 5720-7
 	],
 	[self,
-	  "period:[許(宇文化及)]",
+	  "period:[許(宇文化及)=ja:%%<宇文化及>]",
 	  ["[天寿]1"	,	"@F"	,	"name=[宇文化及];618-09^ChineseTwin::大業暦", "619-02?"] # 5761-17
 	],
 	[self,
-	  "period:[涼(李軌)]",
+	  "period:[涼(李軌)=ja:%%<李軌>]",
 	  ["[安楽]1"	,	"@F"	,	"name=[李軌];618-11-04^ChineseTwin::大業暦", "619-05-13="] # 乙巳 5820-28
 	],
 	[self,
-	  "period:[燕(高開道)]",
+	  "period:[燕(高開道)=ja:%%<高開道>]",
 	  ["[始興]1"	,	"@F"	,	"name=[高開道];618-12^ChineseTwin::大業暦", "620-10-19="] # 5833-47
 	],
 	[self,
-	  "period:[乗(高曇晟)]",
+	  "period:[乗(高曇晟)=ja:%%<高曇晟>]",
 	  ["[法輪]1"	,	"@F"	,	"name=[高曇晟];618-12^ChineseTwin::大業暦", "619-02="]	# 5833-47
 	],
 	[self,
-	  "period:[定楊(劉武周)]",
+	  "period:[定楊(劉武周)=ja:%%<劉武周>]",
 	  ["[天興]1"	,	"@F"	,	"name=[劉武周];617-03-17^ChineseTwin::大業暦", "620-04="] # 丁卯 5725-8
 	],
 	[self,
-	  "period:[西秦(薛挙)]",
-	  ["[秦興]1"	,	"@F"	,	"name=[薛挙];617-04-03^ChineseTwin::大業暦", "618-11-08="] # 癸未 5725-11
+	  "period:[西秦(薛挙)=zh:%%<薛舉>]",
+	  ["[秦興]1"	,	"@F"	,	"name=[薛挙=zh:%%<薛舉>];617-04-03^ChineseTwin::大業暦", "618-11-08="] # 癸未 5725-11
 	],
 	[self,
-	  "period:[永楽(郭子和)]",
-	  ["[丑平]1"	,	"@F"	,	"name=[郭子和];617-03^ChineseTwin::大業暦", "618-12="]	# 5725-10
+	  "period:[永楽(郭子和)=ja:%%<郭子和>]",
+	  ["[正平=ja:%%<正平_郭子和>, alias:丑平=]1","@F","name=[郭子和];617-03^ChineseTwin::大業暦", "618-12="] # 5725-10
 	],
 	[self,
-	  "period:[(曹武徹)]",
-	  ["[通聖]1"	,	"@F"	,	"name=[曹武徹];618-^ChineseTwin::大業暦", "618-12="]	# 紀元編による
+	  "period:[曹武徹]",
+	  ["[通聖]1"	,	"@F"	,	"name=[曹武徹];617-12-11^ChineseTwin::大業暦", "617-12="]	# 隋書による
 	],
 	[self,
-	  "period:[隋(恭帝)]",
-	  ["[義寧]1"	,	"@A"	,	"name=[恭帝];617-11-15^Chinese0523", "618-05-20"] # 壬戌
+	  "period:[隋(恭帝)=ja:%%<恭帝侑>]",
+	  ["[義寧]1"	,	"@A"	,	"name=[恭帝ja:%%<恭帝侑>];617-11-15^Chinese0523", "618-05-20"] # 壬戌
 	]
       ],
       [self,
@@ -697,7 +697,7 @@ module When
 	["[嗣聖]1"	,	"@A"	,	"name=[中宗];684-01-01"],		# 甲申
 	["[文明]1"	,	"@A"	,	"name=[睿宗];684-02-07"],		# 己未 戊午中宗を廃する、旧唐書己未改元
 	["[光宅]1"	,	""	,	"	     684-09-06"],		# 甲寅
-	["[垂拱]1"	,	""	,	"name=[武太后];685-01-01"],		# 丁未
+	["[垂拱]1"	,	""	,	"name=[武太后=ja:%%<武則天>];685-01-01"], # 丁未
 	["[永昌]1"	,	""	,	"	     689-01-01"],		# 乙卯
 	["[載初]1*11.01",	""	,	'	     690*11-01^Chinese#{B:0689}', "690-09-09"], # 庚辰 本年から１１月を歳首とする
 	[self,
@@ -824,19 +824,19 @@ module When
 	  ["[龍啓]1"	,	"@F"	,	"name=[王延鈞];933-01^Chinese0523"],	# 太宗 以前は五代の年号を使用 9081-2
 	  ["[永和]1"	,	""	,	"	     935-01-01"],		# 丙申朔 9127-1
 	  ["[通文]1"	,	"@A"	,	"name=[王昶];936-03"],			# 康宗 9140-7
-	  ["[永隆]1"	,	"@A"	,	"name=[王曦];939-07", "943-02"]		# 景宗 9206-27
+	  ["[永隆]1"	,	"@A"	,	"name=[王曦=ja:%%<王延羲>];939-07", "943-02"] # 景宗 9206-27
 	],
 	[self,
 	  "period:[殷]",
 	  ["[天徳]1"	,	"@A"	,	"name=[王延政];943-02^Chinese0523", "945-01"]	# 9247-4
 	],
 	[self,
-	  "period:[閩(王延政)]",
+	  "period:[閩(王延政)=ja:%%<王延政>]",
 	  ["[天徳]3.01",		""	,	"	     945-01^Chinese0523", "945-08-24="]	# 9283-4
 	],
 	[self,
 	  "period:[南漢]",
-	  ["[乾亨]1"	,	"@F"	,	"name=[劉巖];917-07^Chinese0523"],	# 高祖 8817-4
+	  ["[乾亨]1"	,	"@F"	,	"name=[劉巖=ja:%%<劉ゲン>];917-07^Chinese0523"],	# 高祖 8817-4
 	  ["[白龍]1"	,	""	,	"	     925"],
 	  ["[大有]1"	,	""	,	"	     928"],
 	  ["[光天]1"	,	"@A"	,	"name=[劉玢];942-04"],			# 殤帝 9236-11
@@ -854,10 +854,10 @@ module When
 	],
 	[self,
 	  "period:[後梁]",
-	  ["[開平]1"	,	"@F"	,	"name=[太祖];907-04-22^Chinese0523"],	# 前月27日甲辰唐帝退位,18日甲子即位,戊辰改元
+	  ["[開平]1"	,	"@F"	,	"name=[太祖=ja:%%<朱全忠>];907-04-22^Chinese0523"],	# 前月27日甲辰唐帝退位,18日甲子即位,戊辰改元
 	  ["[乾化]1"	,	""	,	"	     911-05-01"],		# 甲申
-	  ["[鳳暦]1"	,	"@A"	,	"name=[郢王];913-01-21"],		# 甲子 8765-2
-	  ["[乾化]3.02.17",	"@A"	,	"name=[末帝];913-02-17"],		# 庚寅 8767-6
+	  ["[鳳暦]1"	,	"@A"	,	"name=[郢王=ja:%%<朱友珪>];913-01-21"],		# 甲子 8765-2
+	  ["[乾化]3.02.17",	"@A"	,	"name=[末帝=ja:%%<朱友貞>];913-02-17"],		# 庚寅 8767-6
 	  ["[貞明]1"	,	""	,	"	     915-11-09"],		# 乙丑
 	  ["[龍徳]1"	,	""	,	"	     921-05-01", "923-10-08="]	# 丙戌, 戊寅
 	],
@@ -888,10 +888,10 @@ module When
 	],
 	[self,
 	  "period:[北漢]",
-	  ["[乾祐]4.01.16",	""	,	"name=[劉旻];951-01-16^Chinese0956",	# 世祖 戊寅 9453-13
+	  ["[乾祐]4.01.16",	""	,	"name=[劉旻=ja:%%<劉崇>];951-01-16^Chinese0956", # 世祖 戊寅 9453-13
 						"name=[劉鈞];954-11", ""],		# 睿宗 9520-15
 	  ["[天会]1"	,	""	,	"	     957-07",			# 9571-20 ?
-						"name=[劉継思];968-07-27",		# 廃帝 戊申 115-30
+						"name=[劉継恩];968-07-27",		# 廃帝 戊申 115-30
 						"name=[劉継元];968-09", ""],		# 英武帝 116-38
 	  ["[広運]1"	,	""	,	"	     974-01", "979-05-06="]	# 178-3
 	],
@@ -945,10 +945,10 @@ module When
 	],
 	[self,
 	  "period:[蜀]",
-	  ["[応運]1"	,	"@F"	,	"name=[李順];994-01-16^Chinese0956", "994-05-25="]   # 己巳  399-3
+	  ["[応運]1"	,	"@F"	,	"name=[李順=ja:%%<応運>];994-01-16^Chinese0956", "994-05-25="]   # 己巳  399-3
 	],
 	[self,
-	  "period:[聖公]",
+	  "period:[聖公=ja:%%<方臘の乱>]",
 	  ["[永楽]1*11.01",	"@F"	,	"name=[方臘];1121*11-01^Chinese1119", "1121-08-24="] # 戊戌朔 2425-47
 	],
 	[self,
@@ -958,8 +958,8 @@ module When
 	],
 	[self,
 	  "period:[楚]",
-	  ["[天載]1"	,	"@F"	,	"name=[鐘相];1130-02^Chinese0956"],	 # 2821-25
-	  ["[大聖天王]1",	"@A"	,	"name=[楊ノム];1133-04^Chinese0956", "1136-06="] # 2970-43
+	  ["[天載]1"	,	"@F"	,	"name=[鐘相=zh:%%<钟相>];1130-02^Chinese0956"],	 # 2821-25
+	  ["[大聖天王]1",	"@A"	,	"name=[楊麼=zh:%%<岳飛剿滅楊幺>];1133-04^Chinese0956", "1136-06="] # 2970-43
 	],
 	[self,
 	  "period:[南宋]",
@@ -990,7 +990,7 @@ module When
       [self,
 	"period:[遼]",
 	[self,
-	  "period:[契丹(五代十国)]",
+	  "period:[契丹(五代十国)=ja:%%<契丹>]",
 	  ["[太祖]1"	,	"@F"	,	"name=[太祖];907-^Chinese0523"],
 	  ["[神冊]1"	,	""	,	"	     916-12"],
 	  ["[天賛]1"	,	""	,	"	     922-02"],
@@ -1023,10 +1023,10 @@ module When
 	  "period:[西遼]",
 	  ["[延慶]1"	,	"@A"	,	"name=[徳宗];1125-02-05^Chinese0939"], # 2483-12
 	  ["[康国]1"	,	""	,	"	     1127"],
-	  ["[咸清]1"	,	"@A"	,	"name=[感天后];1136"],
+	  ["[咸清]1"	,	"@A"	,	"name=[感天后=zh:%%<蕭塔不煙>];1136"],
 	  ["[紹興]1"	,	"@A"	,	"name=[仁宗];1142"],
-	  ["[崇福]1"	,	"@A"	,	"name=[承天后];1154"],
-	  ["[天禧]1"	,	"@A"	,	"name=[末主];1168", "1211-12="]
+	  ["[崇福]1"	,	"@A"	,	"name=[承天后=ja:%%<プスワン>];1154"],
+	  ["[天禧]1"	,	"@A"	,	"name=[末主=ja:%%<耶律直魯古>];1168", "1211-12="]
 	]
       ],
       [self,
@@ -1083,12 +1083,12 @@ module When
 	["[貞祐]1"	,	"@A"	,	"name=[宣宗];1213-09-15"],		# 壬子
 	["[興定]1"	,	""	,	"	     1217-09-08"],		# 壬午
 	["[元光]1"	,	""	,	"	     1222-08-09"],		# 甲申
-	["[正大]1"	,	"@A"	,	"name=[哀宗];1224-01-01"],		# 戊戌
+	["[正大]1"	,	"@A"	,	"name=[哀宗=ja:%%<哀宗_(金)>];1224-01-01"],		# 戊戌
 	["[開興]1"	,	""	,	"	     1232-01"],
 	["[天興]1"	,	""	,	"	     1232-04-14", "1234-01="],	# 甲子
 	[self,
-	  "period:[大真]",
-	  ["[天泰]1"	,	"@F"	,	"name=[富鮮万努];1215-10^Chinese0939", "1233-09="] # 4352-46
+	  "period:[大真=ja:%%<大真国>]",
+	  ["[天泰]1"	,	"@F"	,	"name=[蒲鮮万奴, alias:富鮮万努=];1215-10^Chinese0939", "1233-09="] # 4352-46
 	]
       ],
       [self,
@@ -1103,7 +1103,7 @@ module When
 	  ["[中統]1"	,	""	,	"	     1260-05-19"],		# 丙戌
 	  ["[至元]1"	,	""	,	"	     1264-08-16", "1271-11-15"] # 丁巳
 	],
-	["[至元(世祖)]8.11.15",	""	,	"name=[世祖];1271-11-15^Chinese0939"],	# 乙亥 至元１８年から授時暦を使用
+	["[至元(世祖)=ja:%%<至元_(元世祖)>]8.11.15","","name=[世祖];1271-11-15^Chinese0939"],	# 乙亥 至元１８年から授時暦を使用
 	["[元貞]1"	,	"@A"	,	"name=[成宗];1295-01-01"],		# 丙午
 	["[大徳]1"	,	""	,	"	     1297-02-27"],		# 庚申
 	["[至大]1"	,	"@A"	,	"name=[武宗];1308-01-01"],		# 辛酉
@@ -1131,7 +1131,7 @@ module When
       [self,
 	"period:[明]",
 	[self,
-	  "period:[天完]",
+	  "period:[天完=ja:%%<徐寿輝>]",
 	  ["[治平]1"	,	"@F"	,	"name=[徐寿輝];1351-10^Chinese0939", "1360-05=03"]	# 5723-36
 	],
 	[self,
@@ -1176,14 +1176,14 @@ module When
 	["[崇禎]1"	,	"@A"	,	"name=[思宗];1628-01-01", "1644-03-19="],
 	[self,
 	  "period:[南明]",
-	  ["[崇禎]17.05.15",	""	,	"name=[福王];1644-05-15^Chinese0939"],	# 陳舜臣 444 コンサイスでは７月
+	  ["[崇禎]17.05.15",	""	,	"name=[福王=ja:%%<弘光帝>];1644-05-15^Chinese0939"],	# 陳舜臣 444 コンサイスでは７月
 	  ["[弘光]1"	,	"@A"	,	"	     1645-01-01"],		# 前年３月崇禎帝が李自成に殺される
-	  ["[隆武]1"	,	"@A"	,	"name=[唐王];1645-06="],
+	  ["[隆武]1"	,	"@A"	,	"name=[唐王=ja:%%<隆武帝>];1645-06="],
 	  ["[紹武]1"	,	""	,	"	     1646-11"],
 	  ["[永暦]1"	,	"@A"	,	"name=[永明王];1647-01-01",
 						"name=[鄭成功];1662-04^Chinese1645",	# 陳舜臣 471
 						"name=[鄭経];1662-05",			# 陳舜臣 471
-						"name=[鄭克土爽];1681-01", "1683-08="]	# 陳舜臣 482
+						"name=[鄭克塽=ja:%%<鄭克ソウ>];1681-01", "1683-08="]	# 陳舜臣 482
 	],
 	[self,
 	  "period:[順]",