when_exe 0.3.9 → 0.4.0

data/lib/when_exe/region/chinese.rb

@@ -18,50 +18,50 @@ module When
 
       [self,
         "names:[月=ja:%%<月_(暦)>, *Month]",
-        "[正月,   Month 1= ]",
-        "[二月,   Month 2= ]",
-        "[三月,   Month 3= ]",
-        "[四月,   Month 4= ]",
-        "[五月,   Month 5= ]",
-        "[六月,   Month 6= ]",
-        "[七月,   Month 7= ]",
-        "[八月,   Month 8= ]",
-        "[九月,   Month 9= ]",
-        "[十月,   Month 10=]",
-        "[十一月, Month 11=]",
-        "[十二月, Month 12=]"
+        "[正月=ja:%%<1月_(旧暦)>,    Month 1= ]",
+        "[二月=ja:%%<2月_(旧暦)>,    Month 2= ]",
+        "[三月=ja:%%<3月_(旧暦)>,    Month 3= ]",
+        "[四月=ja:%%<4月_(旧暦)>,    Month 4= ]",
+        "[五月=ja:%%<5月_(旧暦)>,    Month 5= ]",
+        "[六月=ja:%%<6月_(旧暦)>,    Month 6= ]",
+        "[七月=ja:%%<7月_(旧暦)>,    Month 7= ]",
+        "[八月=ja:%%<8月_(旧暦)>,    Month 8= ]",
+        "[九月=ja:%%<9月_(旧暦)>,    Month 9= ]",
+        "[十月=ja:%%<10月_(旧暦)>,   Month 10=]",
+        "[十一月=ja:%%<11月_(旧暦)>, Month 11=]",
+        "[十二月=ja:%%<21月_(旧暦)>, Month 12=]"
       ],
 
       [self,
         "names:[月=ja:%%<月_(暦)>, *MonthA=en:Month]",
-        "[一月,   Month 1= ]",
-        "[二月,   Month 2= ]",
-        "[三月,   Month 3= ]",
-        "[四月,   Month 4= ]",
-        "[五月,   Month 5= ]",
-        "[六月,   Month 6= ]",
-        "[七月,   Month 7= ]",
-        "[八月,   Month 8= ]",
-        "[九月,   Month 9= ]",
-        "[十月,   Month 10=]",
-        "[正月,   New Year Month=]",
-        "[臘月,   Month 12=]"
+        "[一月=ja:%%<1月_(旧暦)>,   Month 1= ]",
+        "[二月=ja:%%<2月_(旧暦)>,   Month 2= ]",
+        "[三月=ja:%%<3月_(旧暦)>,   Month 3= ]",
+        "[四月=ja:%%<4月_(旧暦)>,   Month 4= ]",
+        "[五月=ja:%%<5月_(旧暦)>,   Month 5= ]",
+        "[六月=ja:%%<6月_(旧暦)>,   Month 6= ]",
+        "[七月=ja:%%<7月_(旧暦)>,   Month 7= ]",
+        "[八月=ja:%%<8月_(旧暦)>,   Month 8= ]",
+        "[九月=ja:%%<9月_(旧暦)>,   Month 9= ]",
+        "[十月=ja:%%<10月_(旧暦)>,  Month 10=]",
+        "[正月=ja:%%<11月_(旧暦)>,  New Year Month=]",
+        "[臘月=ja:%%<12月_(旧暦)>,  Month 12=]"
       ],
 
       [self,
         "names:[月=ja:%%<月_(暦)>, *MonthB=en:Month]",
-        "[建寅月, Month 3= ]",
-        "[建卯月, Month 4= ]",
-        "[建辰月, Month 5= ]",
-        "[建巳月, Month 6= ]",
-        "[建午月, Month 7= ]",
-        "[建未月, Month 8= ]",
-        "[建申月, Month 9= ]",
-        "[建酉月, Month 10=]",
-        "[建戌月, Month 11=]",
-        "[建亥月, Month 12=]",
-        "[建子月, Month 1= ]",
-        "[建丑月, Month 2= ]"
+        "[建寅月=ja:%%<1月_(旧暦)>,  Month 3= ]",
+        "[建卯月=ja:%%<2月_(旧暦)>,  Month 4= ]",
+        "[建辰月=ja:%%<3月_(旧暦)>,  Month 5= ]",
+        "[建巳月=ja:%%<4月_(旧暦)>,  Month 6= ]",
+        "[建午月=ja:%%<5月_(旧暦)>,  Month 7= ]",
+        "[建未月=ja:%%<6月_(旧暦)>,  Month 8= ]",
+        "[建申月=ja:%%<7月_(旧暦)>,  Month 9= ]",
+        "[建酉月=ja:%%<8月_(旧暦)>,  Month 10=]",
+        "[建戌月=ja:%%<9月_(旧暦)>,  Month 11=]",
+        "[建亥月=ja:%%<10月_(旧暦)>, Month 12=]",
+        "[建子月=ja:%%<11月_(旧暦)>, Month 1= ]",
+        "[建丑月=ja:%%<12月_(旧暦)>, Month 2= ]"
       ]
     ]]
 
@@ -720,10 +720,6 @@ module When
       def _normalize(args=[], options={})
         super
 
-        # 通法
-        @denominator = @year_length.denominator if @year_length.kind_of?(Rational)
-        @denominator = [@denominator||0, @lunation_length.denominator].max if @lunation_length.kind_of?(Rational)
-
         if @formula == '1L'
 
           # 月の位相の計算

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

@@ -266,7 +266,7 @@ module When
 	  ["[昇明]1"	,			"@A"	,	"name=[順帝=ja:%%<順帝_(南朝宋)>];477-07-11", "479-04-23"] # 壬辰
 	],
 	[self,
-	  "period:[南斉=ja:%%<斉_(南朝)>]",
+	  "period:[斉=ja:%%<斉_(南朝)>]",
 	  ["[建元=ja:%%<建元_(南朝斉)>]1",	"@F"	,	"name=[高帝=ja:%%<蕭道成>];479-04-23^Chinese0445"],	# 甲午
 	  ["[永明]1"	,			"@A"	,	"name=[武帝=ja:%%<武帝_(南朝斉)>];483-01-02"],		# 辛亥
 	  ["[隆昌]1"	,			"@A"	,	"name=[欝林王=ja:%%<蕭昭業>];494-01-01"],		# 丁未
@@ -290,7 +290,19 @@ module When
 	  ["[承聖]1"	,			"@A"	,	"name=[元帝=ja:%%<元帝_(南朝梁)>];552-11-12"],		# 丙子 太清に戻した後、ただちに改元
 	  ["[天成=ja:%%<天成_(梁)>]1"	,	"@A"	,	"name=[貞陽侯=ja:%%<蕭淵明>];555-05-27"],		# 丙午
 	  ["[紹泰]1"	,			"@A"	,	"name=[敬帝=ja:%%<敬帝_(南朝梁)>];555-10-02"],		# 己酉
-	  ["[太平=ja:%%<太平_(梁)>]1"	,	""	,	"	     556-09-01", "557-10-10"]			# 壬寅
+	  ["[太平=ja:%%<太平_(梁)>]1"	,	""	,	"	     556-09-01", "557-10-10"],			# 壬寅
+	  [self,
+	    "period:[<臨賀王>=ja:%%<梁_(南朝)>]",
+	    ["[正平=ja:%%<正平_(蕭正徳)>]1",	"@A"	,"name=[臨賀王=ja:%%<蕭正徳>];548-11-01^Chinese0445", "549-03="] # 朔 4989-21
+	  ],
+	  [self,
+	    "period:[<武陵王>=ja:%%<梁_(南朝)>]",
+	    ["[天正=ja:%%<天正_(蕭紀)>]1"	,	"@A"	,"name=[武陵王=ja:%%<蕭紀>];552-04-08^Chinese0445", "553-08-08="] # 乙巳 5084-13
+	  ],
+	  [self,
+	    "period:[<永嘉王>=ja:%%<梁_(南朝)>]",
+	    ["[天啓=ja:%%<天啓_(梁)>]1"	,	"@A"	,"name=[永嘉王=ja:%%<蕭荘>];558-03^Chinese0445", "560-02="]	# 5174-11
+	  ]
 	],
 	[self,
 	  "period:[陳=ja:%%<陳_(南朝)>]",
@@ -302,18 +314,6 @@ module When
 	  ["[至徳=ja:%%<至徳_(陳)>]1"	,	"@A"	,	"name=[後主=ja:%%<後主_(陳)>];583-01-03"],		# 壬寅
 	  ["[禎明]1"	,			""	,	"	     587-01-03", "589-01="]			# 戊寅
 	],
-	[self,
-	  "period:[梁(臨賀王)=ja:%%<梁_(南朝)>]",
-	  ["[正平=ja:%%<正平_(蕭正徳)>]1",	"@A"	,"name=[臨賀王=ja:%%<蕭正徳>];548-11-01^Chinese0445", "549-03="] # 朔 4989-21
-	],
-	[self,
-	  "period:[梁(武陵王)=ja:%%<梁_(南朝)>]",
-	  ["[天正=ja:%%<天正_(蕭紀)>]1"	,	"@A"	,"name=[武陵王=ja:%%<蕭紀>];552-04-08^Chinese0445", "553-08-08="] # 乙巳 5084-13
-	],
-	[self,
-	  "period:[梁(永嘉王)=ja:%%<梁_(南朝)>]",
-	  ["[天啓=ja:%%<天啓_(梁)>]1"	,	"@A"	,"name=[永嘉王=ja:%%<蕭荘>];558-03^Chinese0445", "560-02="]	# 5174-11
-	],
 	[self,
 	  "period:[後梁=ja:%%<後梁_(南朝)>]",
 	  ["[大定=ja:%%<大定_(南朝後梁)>]1",	"@A"	,	"name=[宣帝=ja:%%<蕭サツ>];555-01-01^Chinese0445"],
@@ -335,20 +335,6 @@ module When
       ],
       [self,
 	"period:[五胡十六国=ja:%%<五胡十六国時代>]",
-	[self,
-	  "period:[前涼]",
-	  ["[建興=ja:%%<建興_(晋)>#%.<明王・張寔>]5",		""	,	"name=;317-03-09^Chinese0239",		# 辛卯 (317.03.09)
-						"name=[張寔];317-12-21", ""],						# 昭公 己亥
-	  ["[永元=ja:%%<建興_(晋)>#%.<成王・張茂>]1"	,	"@A"	,	"name=[張茂];320-06"],			# 成公 2878-9
-	  ["[太元=ja:%%<建興_(晋)>#%.<成王・張駿>]1"	,	"@A"	,	"name=[張駿];324-05-14"],		# 文公 甲申 2922-4
-	  ["[永楽=ja:%%<建興_(晋)>#%.<成王・張重華>]1"	,	"@A"	,	"name=[張重華];346-05-23",		# 桓公 丙戌 3070-7
-										"name=[張耀霊];353-11-18", ""],		# 哀公 丁卯 3136-14
-	  ["[和平=ja:%%<和平_(前涼)>]1"	,			"@A"	,	"name=[張祚];354-01"],			# 威王 3137-1
-	  ["[太始=ja:%%<建興_(晋)>#%.<冲王・張玄靚>]1"	,	"@A"	,	"name=[張玄靚=ja:%%<張玄ケン>];355-09="], # 冲公 この年の閏月は 6 月のはず
-	  ["[建興=ja:%%<建興_(晋)>#%.<冲王・張玄靚>]43"	,	""	,	"	     355-09="],			# 3150-14
-	  ["[升平]5"	,					""	,	"	     361-12", "name=[張天錫];363-08=", "376-08-27="], # 3187-17
-	  ["[太清?=zh:%%<升平>#%.<前凉悼公张天錫>]1"	,	"@A"	,		    "363-08=", "376-08-27="]	# 悼公 3193-8
-	],
 	[self,
 	  "period:[成漢]",
 	  ["[建初=ja:%%<建初_(成漢)>]1"	,	"@F"	,	"name=[李特];303-01^Chinese0239",			# 景帝 2677-1 考異多
@@ -397,6 +383,11 @@ module When
 	  "period:[冉魏]",
 	  ["[永興=ja:%%<永興_(冉魏)>]1"	,	"@A"	,	"name=[冉閔];350-02=^Chinese0239", "352-04="]		# 3102-1 考異あり
 	],
+	[self,
+	  "period:[翟魏=ja:%%<テキ魏>]",
+	  ["[建光=ja:%%<建光_(テキ魏)>]1",	"@F"	,	"name=[翟遼=ja:%%<テキ遼>];388-02^Chinese0239"],	# 3382-3
+	  ["[定鼎,alias:神鼎=ja:%%<定鼎>]1",	"@A"	,	"name=[翟釗=ja:%%<テキショウ>];391-10", "392-6="]	# 3402-17 -3405-9
+	],
 	[self,
 	  "period:[前燕]",
 	  ["[燕元=]0.11.26",			"@F"	,	"name=[慕容儁];348-11-26^Chinese0239"],			# 景昭帝 甲辰 3085-6
@@ -416,11 +407,6 @@ module When
 	  ["[建始=ja:%%<建始_(慕容熙)>]1",	""	,	"	     407-01-01"],				# 辛丑朔 3594-1
 	  ["[正始=ja:%%<正始_(北燕)>]1"	,	"@A"	,	"name=[慕容雲=ja:%%<高雲>];407-07-28", "409-10-13"],	# 恵懿帝 乙丑 3599-14
 	],
-	[self,
-	  "period:[北燕]",
-	  ["[太平=ja:%%<太平_(北燕)>]1"	,	"@F"	,	"name=[馮跋];409-10-13^Chinese0239"],			# 文成帝 戊辰 3621-21
-	  ["[太興]1"	,			"@A"	,	"name=[馮弘];431-01-01", "436-05="]			# 昭成帝 壬午朔 3828-1
-	],
 	[self,
 	  "period:[西燕]",
 	  ["[燕興=ja:%%<更始_(西燕)>]1"	,	"@F"	,	"name=[慕容泓];384-04^Chinese0239"],			# 済北王 3328-14
@@ -437,6 +423,11 @@ module When
 	  ["[建平=ja:%%<建平_(南燕)>]1"	,	""	,	"	     400"],					# 3516-40
 	  ["[太上]1"	,			"@A"	,	"name=[慕容超];405-08-10", "410-02="]			# 己未 3586-17
 	],
+	[self,
+	  "period:[北燕]",
+	  ["[太平=ja:%%<太平_(北燕)>]1"	,	"@F"	,	"name=[馮跋];409-10-13^Chinese0239"],			# 文成帝 戊辰 3621-21
+	  ["[太興]1"	,			"@A"	,	"name=[馮弘];431-01-01", "436-05="]			# 昭成帝 壬午朔 3828-1
+	],
 	[self,
 	  "period:[前秦]",
 	  ["[皇始=ja:%%<皇始_(前秦)>]1"	,	"@F"	,	"name=[苻健];351-01-20^Chinese0239"],			# 明帝 丙辰 3111-2
@@ -465,6 +456,20 @@ module When
 	  ["[建弘]1"	,			""	,	"	     420-01"],					# 3732-2
 	  ["[永弘]1"	,			"@A"	,	"name=[乞伏暮末];428-05", "431-01="]			# 3801-8
 	],
+	[self,
+	  "period:[前涼]",
+	  ["[建興=ja:%%<建興_(晋)>#%.<明王・張寔>]5",		""	,	"name=;317-03-09^Chinese0239",		# 辛卯 (317.03.09)
+						"name=[張寔];317-12-21", ""],						# 昭公 己亥
+	  ["[永元=ja:%%<建興_(晋)>#%.<成王・張茂>]1"	,	"@A"	,	"name=[張茂];320-06"],			# 成公 2878-9
+	  ["[太元=ja:%%<建興_(晋)>#%.<成王・張駿>]1"	,	"@A"	,	"name=[張駿];324-05-14"],		# 文公 甲申 2922-4
+	  ["[永楽=ja:%%<建興_(晋)>#%.<成王・張重華>]1"	,	"@A"	,	"name=[張重華];346-05-23",		# 桓公 丙戌 3070-7
+										"name=[張耀霊];353-11-18", ""],		# 哀公 丁卯 3136-14
+	  ["[和平=ja:%%<和平_(前涼)>]1"	,			"@A"	,	"name=[張祚];354-01"],			# 威王 3137-1
+	  ["[太始=ja:%%<建興_(晋)>#%.<冲王・張玄靚>]1"	,	"@A"	,	"name=[張玄靚=ja:%%<張玄ケン>];355-09="], # 冲公 この年の閏月は 6 月のはず
+	  ["[建興=ja:%%<建興_(晋)>#%.<冲王・張玄靚>]43"	,	""	,	"	     355-09="],			# 3150-14
+	  ["[升平]5"	,					""	,	"	     361-12", "name=[張天錫];363-08=", "376-08-27="], # 3187-17
+	  ["[太清?=zh:%%<升平>#%.<前凉悼公张天錫>]1"	,	"@A"	,		    "363-08=", "376-08-27="]	# 悼公 3193-8
+	],
 	[self,
 	  "period:[後涼]",
 	  ["[太安=ja:%%<太安_(後涼)>]1"	,	"@F"	,	"name=[呂光];386-12^Chinese0239"],			# 懿武帝 3371-51
@@ -603,84 +608,84 @@ module When
 	["[大業]1"	,			"@A"	,	"name=[煬帝];605-01-01", "618-03-10="],			# 壬辰
 	["[皇泰]1"	,			"@A","name=[恭帝=ja:%%<恭帝トウ>];618-05-24^ChineseTwin::大業暦", "619-04-08"],	# 戊辰 5791-26
 	[self,
-	  "period:[鄭(王世充)=ja:%%<王世充>]",
-	  ["[開明=ja:%%<開明_(王世充)>]1"	,"@F"	,"name=[王世充];619-04-08^ChineseTwin::大業暦", "621-05-09="]	# 丙午 5853-45
+	  "period:[鄭<王世充>=ja:%%<王世充>]",
+	  ["[開明=ja:%%<開明_(王世充)>]1"	,"@F"	,"name=[王世充];619-04-08^ChineseTwin::大業暦", "621-05-{丁卯}"]	# 丙午 5853-45, 621-05-09=は丁卯
 	],
 	[self,
-	  "period:[梁(蕭銑)=ja:%%<蕭銑>]",
+	  "period:[梁<蕭銑>=ja:%%<蕭銑>]",
 	  ["[鳳鳴, alias:鳴鳳=ja:%%<鳳鳴>]1",	"@F",	"name=[蕭銑];617-10^ChineseTwin::大業暦", "621-10-21="]		# 5761-17
 	],
 	[self,
-	  "period:[梁(梁師都)=ja:%%<梁師都>]",
+	  "period:[梁<梁師都>=ja:%%<梁師都>]",
 	  ["[永隆=ja:%%<永隆_(梁師都)>]1"	,"@F"	,"name=[梁師都];617-03^ChineseTwin::大業暦", "628-04-26="]	# 5725-9
 	],
 	[self,
-	  "period:[梁(沈法興)=ja:%%<沈法興>]",
+	  "period:[梁<沈法興>=ja:%%<沈法興>]",
 	  ["[延康=ja:%%<延康_(沈法興)>]1"	,"@F"	,"name=[沈法興];619-08^ChineseTwin::大業暦", "620-12="]		# 5863-77
 	],
 	[self,
-	  "period:[元興(操師乞)=ja:%%<操師乞>]",
+	  "period:[元興<操師乞>=ja:%%<操師乞>]",
 	  ["[始興=ja:%%<始興_(操師乞))>,alias:天成=ja:%%<始興_(操師乞))>]1","@F","name=[操師乞];616-12-01^ChineseTwin::大業暦", "616-12="]	# 『隋書』十二月癸未 Wikipedia
 	],
 	[self,
-	  "period:[呉(李子通)=ja:%%<李子通>]",
+	  "period:[呉<李子通>=ja:%%<李子通>]",
 	  ["[明政=ja:%%<明政_(李子通)>]1"	,"@F"	,"name=[李子通];619-08^ChineseTwin::大業暦", "621-11="]		# 5863-77
 	],
 	[self,
-	  "period:[楚(林士弘)=ja:%%<林士弘>]",
+	  "period:[楚<林士弘>=ja:%%<林士弘>]",
 	  ["[太平=ja:%%<太平_(林士弘)>]1"	,"@F"	,"name=[林士弘];616-12-10^ChineseTwin::大業暦", "622-10-21="]	# 壬辰 5712-16
 	],
 	[self,
-	  "period:[楚(朱粲)=ja:%%<朱粲>]",
+	  "period:[楚<朱粲>=ja:%%<朱粲>]",
 	  ["[昌達]1"	,			"@F"	,"name=[朱粲];618-10^ChineseTwin::大業暦", "619-02?"]		# 5817-22
 	],
 	[self,
-	  "period:[夏(竇建徳)=ja:%%<竇建徳>]",
+	  "period:[夏<竇建徳>=ja:%%<竇建徳>]",
 	  ["[丁丑=ja:%%<丁丑_(夏)>]1",	"@F",	"name=[竇建徳];617-01-05^ChineseTwin::大業暦"],				# 丙辰 5718-2
-	  ["[五鳳=ja:%%<五鳳_(夏)>]1",	"",	"	     618-07", "621-05-09="]					# 5805-54
+	  ["[五鳳=ja:%%<五鳳_(夏)>]1",	"",	"	     618-07", "621-05-{丁卯}"]					# 5805-54, 621-05-09=は丁卯
 	],
 	[self,
-	  "period:[漢東(劉黒闥)=ja:%%<劉黒闥>]",
-	  ["[天造]1"	,			"@F"	,"name=[劉黒闥];622-01^ChineseTwin::大業暦", "623-01-03="]	# 5942-1
+	  "period:[漢東<劉黒闥>=ja:%%<劉黒闥>]",
+	  ["[天造]1"	,			"@F"	,"name=[劉黒闥];622-01^ChineseTwin::大業暦", "623-01-{庚辰}"]	# 5942-1, 623-01-03=は庚辰
 	],
 	[self,
-	  "period:[魏(李密)=ja:%%<李密_(隋)>]",
+	  "period:[魏<李密>=ja:%%<李密_(隋)>]",
 	  ["[永平=ja:%%<永平_(李密)>]1"	,	"@F"	,"name=[李密=ja:%%<李密_(隋)>];617-02-19^ChineseTwin::大業暦", "618-09="] # 庚子 5720-7
 	],
 	[self,
-	  "period:[許(宇文化及)=ja:%%<宇文化及>]",
+	  "period:[許<宇文化及>=ja:%%<宇文化及>]",
 	  ["[天寿=ja:%%<天寿_(宇文化及)>]1"	,"@F"	,"name=[宇文化及];618-09^ChineseTwin::大業暦", "619-02?"]	# 5761-17
 	],
 	[self,
-	  "period:[涼(李軌)=ja:%%<李軌>]",
-	  ["[安楽=ja:%%<安楽_(年号)>]1"	,	"@F"	,"name=[李軌];618-11-04^ChineseTwin::大業暦", "619-05-13="]	# 乙巳 5820-28
+	  "period:[涼<李軌>=ja:%%<李軌>]",
+	  ["[安楽=ja:%%<安楽_(年号)>]1"	,	"@F"	,"name=[李軌];618-11-04^ChineseTwin::大業暦", "619-05-{辛巳}"]	# 乙巳 5820-28, 619-05-13=は辛巳
 	],
 	[self,
-	  "period:[燕(高開道)=ja:%%<高開道>]",
-	  ["[始興=ja:%%<始興_(高開道)>]1"	,"@F"	,"name=[高開道];618-12^ChineseTwin::大業暦", "620-10-19="]	# 5833-47
+	  "period:[燕<高開道>=ja:%%<高開道>]",
+	  ["[始興=ja:%%<始興_(高開道)>]1"	,"@F"	,"name=[高開道];618-12^ChineseTwin::大業暦", "620-10-{己酉}"]	# 5833-47, 620-10-19=は己酉
 	],
 	[self,
-	  "period:[乗(高曇晟)=ja:%%<高曇晟>]",
+	  "period:[乗<高曇晟>=ja:%%<高曇晟>]",
 	  ["[法輪=ja:%%<法輪_(高曇晟)>]1"	,"@F"	,"name=[高曇晟];618-12^ChineseTwin::大業暦", "619-02="]		# 5833-47
 	],
 	[self,
-	  "period:[定楊(劉武周)=ja:%%<劉武周>]",
+	  "period:[定楊<劉武周>=ja:%%<劉武周>]",
 	  ["[天興=ja:%%<天興_(劉武周)>]1"	,"@F"	,"name=[劉武周];617-03-17^ChineseTwin::大業暦", "620-04="]	# 丁卯 5725-8
 	],
 	[self,
-	  "period:[西秦(薛挙)=zh:%%<薛舉>]",
+	  "period:[西秦<薛挙>=zh:%%<薛舉>]",
 	  ["[秦興]1"	,			"@F"	,"name=[薛挙=zh:%%<薛舉>];617-04-03^ChineseTwin::大業暦", "618-11-08="]	# 癸未 5725-11
 	],
 	[self,
-	  "period:[永楽(郭子和)=ja:%%<郭子和>]",
+	  "period:[永楽<郭子和>=ja:%%<郭子和>]",
 	  ["[正平=ja:%%<正平_(郭子和)>, alias:丑平=]1","@F","name=[郭子和];617-03^ChineseTwin::大業暦", "618-12="]	# 5725-10
 	],
 	[self,
-	  "period:[曹武徹]",
+	  "period:[<曹武徹>]",
 	  ["[通聖]1"	,			"@F"	,"name=[曹武徹];617-12-11^ChineseTwin::大業暦", "617-12="]	# 隋書による
 	],
 	[self,
-	  "period:[隋(恭帝)=ja:%%<恭帝侑>]",
+	  "period:[隋<恭帝>=ja:%%<恭帝侑>]",
 	  ["[義寧]1"	,			"@A"	,"name=[恭帝ja:%%<恭帝侑>];617-11-15^Chinese0523", "618-05-20"]	# 壬戌
 	]
       ],
@@ -733,7 +738,7 @@ module When
 	["[太極=ja:%%<太極_(唐)>]1"	,	""	,	"	     712-01-19"],				# 己丑
 	["[延和=ja:%%<延和_(唐)>]1"	,	""	,	"	     712-05-13"],				# 辛巳
 	["[先天=ja:%%<先天_(唐)>]1"	,	"@A"	,	"name=[玄宗=ja:%%<玄宗_(唐)>];712-08-07"],		# 甲辰
-	["[開元]1"	,	""	,	"	     713-12-01"],						# 庚寅 開元１７年から大衍暦を使用
+	["[開元]1"	,			""	,	"	     713-12-01"],				# 庚寅 開元１７年から大衍暦を使用
 	["[天宝=ja:%%<天宝_(唐)>]1"	,	""	,	"	     742-01-01"],				# 丁未
 	["[至徳=ja:%%<至徳_(唐)>]1"	,	"@A"	,	"name=[粛宗=ja:%%<粛宗_(唐)>];756-07-12"],		# 甲子
 	["[乾元=ja:%%<乾元_(唐)>]1"	,	""	,	"	     758-02-05"],				# 丁未
@@ -748,7 +753,7 @@ module When
 	["[貞元=ja:%%<貞元_(唐)>]1"	,	""	,	"	     785-01-01"],				# 丁酉
 	["[永貞=ja:%%<永貞_(唐)>]1"	,	"@A"	,	"name=[順宗=ja:%%<順宗_(唐)>];805-08-05"],		# 辛丑
 	["[元和=ja:%%<元和_(唐)>]1"	,	"@A"	,	"name=[憲宗=ja:%%<憲宗_(唐)>];806-01-02"],		# 丁卯 元和２年から観象暦を使用
-	["[長慶]1"	,			"@A"	,	"name=[穆宗=ja:%%<穆宗_(唐)>];821-01-04"],		# 辛丑 長慶２年から宣明暦を使用
+	["[長慶]1"	,			"@A"	,	"name=[穆宗=ja:%%<穆宗_(唐)>];821-01-{辛丑}"],		# 辛丑 長慶２年から宣明暦を使用
 	["[宝暦=ja:%%<宝暦_(唐)>]1"	,	"@A"	,	"name=[敬宗];825-01-07"],				# 辛亥
 	["[大和=ja:%%<大和_(唐)>,alias:太和=ja:%%<大和_(唐)>]1"	,"@A","name=[文宗=ja:%%<文宗_(唐)>];827-02-13"],	# 乙巳
 	["[開成=ja:%%<開成_(唐)>]1"	,	""	,	"	     836-01-01"],				# 辛丑
@@ -808,24 +813,6 @@ module When
 	  ["[宝大]1"	,			""	,	"	     924"],					# 〃
 	  ["[宝正]1"	,			""	,	"	     926", "932-03-28="]
 	],
-	[self,
-	  "period:[前蜀]",
-	  ["[天復=ja:%%<天復_(唐)>]4",		""	,"name=[王建=ja:%%<王建_(前蜀)>];904-04=11^Chinese0523"],	# 乙巳 高祖 4.04=11
-	  ["[武成=ja:%%<武成_(前蜀)>]1"	,	"@F"	,	"	     908-01-09"],				# 辛巳 8688-3
-	  ["[永平=ja:%%<永平_(前蜀)>]1"	,	""	,	"	     911-01-01"],				# 丙戌 8730-37
-	  ["[通正]1"	,			""	,	"	     916-01-01"],				# 丙辰 8799-22
-	  ["[天漢=ja:%%<天漢_(前蜀)>]1"	,	""	,	"	     917-01-01"],				# 辛亥 8808-31
-	  ["[光天=ja:%%<光天_(前蜀)>]1"	,	""	,	"	     918-01-01"],				# 乙亥 8822-14
-	  ["[乾徳=ja:%%<乾徳_(前蜀)>]1"	,	"@A"	,	"name=[王衍];919-01-01"],				# 庚午 後主 8838-34
-	  ["[咸康=ja:%%<咸康_(前蜀)>]1"	,	""	,	"	     925-01-01", "925-11-27="]			# 甲午 8929-75
-	],
-	[self,
-	  "period:[後蜀=ja:%%<後蜀_(十国)>]",
-	  ["[応順]1",				"@F"		,"name=[孟知祥];934-01=^Chinese0523"],			# 高祖 9102-13 1.01=
-	  ["[明徳=ja:%%<明徳_(後蜀)>]1"	,	""	,	"	     934-04-12",				# 辛巳 9117-16
-								"name=[孟昶];934-07-28", ""],				# 後主 丙寅 9123-48
-	  ["[広政]1"	,			""	,	"	     938-01-01", "947-01^Chinese0956", "965-01-07="] # 戊申 9184-53 明徳は多分間違い
-	],
 	[self,
 	  "period:[閩=ja:%%<ビン_(十国)>]",
 	  ["[龍啓]1"	,			"@F"	,	"name=[王延鈞];933-01^Chinese0523"],			# 太宗 以前は五代の年号を使用 9081-2
@@ -848,13 +835,31 @@ module When
 	  ["[乾和]1"	,			""	,	"	     943-11-13", "947-01^Chinese0956", ""],	# 丁亥 9255-28
 	  ["[大宝=ja:%%<大宝_(南漢)>]1"	,	"@A"	,	"name=[劉鋹];958-08-03", "971-02-05="]			# 後主 辛巳 9586-35
 	],
+	[self,
+	  "period:[桀燕]",
+	  ["[応天=ja:%%<応天_(桀燕)>]1"	,	"@F"	,	"name=[劉守光];911-08-13^Chinese0523", "914-01-15="]	# 甲子 8745-15
+	],
 	[self,
 	  "period:[岐]",
 	  ["[天祐=ja:%%<天祐_(唐)>,alias:天佑=ja:%%<天祐_(唐)>]4","@A","name=[李茂貞];907-04-22^Chinese0523", "924-01-14="] # 戊辰 唐滅亡後も、五代を認めず旧年号を使用 4.04.22
 	],
 	[self,
-	  "period:[桀燕]",
-	  ["[応天=ja:%%<応天_(桀燕)>]1"	,	"@F"	,	"name=[劉守光];911-08-13^Chinese0523", "914-01-15="]	# 甲子 8745-15
+	  "period:[前蜀]",
+	  ["[天復=ja:%%<天復_(唐)>]4",		""	,"name=[王建=ja:%%<王建_(前蜀)>];904-04=11^Chinese0523"],	# 乙巳 高祖 4.04=11
+	  ["[武成=ja:%%<武成_(前蜀)>]1"	,	"@F"	,	"	     908-01-09"],				# 辛巳 8688-3
+	  ["[永平=ja:%%<永平_(前蜀)>]1"	,	""	,	"	     911-01-01"],				# 丙戌 8730-37
+	  ["[通正]1"	,			""	,	"	     916-01-01"],				# 丙辰 8799-22
+	  ["[天漢=ja:%%<天漢_(前蜀)>]1"	,	""	,	"	     917-01-01"],				# 辛亥 8808-31
+	  ["[光天=ja:%%<光天_(前蜀)>]1"	,	""	,	"	     918-01-01"],				# 乙亥 8822-14
+	  ["[乾徳=ja:%%<乾徳_(前蜀)>]1"	,	"@A"	,	"name=[王衍];919-01-01"],				# 庚午 後主 8838-34
+	  ["[咸康=ja:%%<咸康_(前蜀)>]1"	,	""	,	"	     925-01-01", "925-11-27="]			# 甲午 8929-75
+	],
+	[self,
+	  "period:[後蜀=ja:%%<後蜀_(十国)>]",
+	  ["[応順]1",				"@F"		,"name=[孟知祥];934-01=^Chinese0523"],			# 高祖 9102-13 1.01=
+	  ["[明徳=ja:%%<明徳_(後蜀)>]1"	,	""	,	"	     934-04-12",				# 辛巳 9117-16
+								"name=[孟昶];934-07-28", ""],				# 後主 丙寅 9123-48
+	  ["[広政]1"	,			""	,	"	     938-01-01", "947-01^Chinese0956", "965-01-07="] # 戊申 9184-53 明徳は多分間違い
 	],
 	[self,
 	  "period:[後梁]",
@@ -1089,7 +1094,7 @@ module When
 	  ["[天元=ja:%%<天元_(北元)>]1"	,	"@A"	,	"name=[天元帝=ja:%%<トグス・テムル>];1379-", "1388="]
 	],
 	[self,
-	  "period:[陳吊眼=zh:%%<陳吊眼>]",
+	  "period:[<陳吊眼>=zh:%%<陳吊眼>]",
 	  ["[昌泰=ja:%%<昌泰_(陳吊眼)>]1",	"@F",	"name=[陳吊眼=zh:%%<陳吊眼>];1281-08=01^Chinese0939", "1281-11-02="] # 鄭所南『元韃攻日本敗北歌並序』（『心史・中興集乙』1933年支那内学院刊本所収）Wikipedia
 	],
 	[self,

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

@@ -14,17 +14,17 @@ module When
       'locale:[=ja:, en=en:]',
       'area:[中国の暦月=, *ChineseLuniSolar=]',
       ['[太初暦]1.01.01',      '@CR',   '1-01-01^ChineseTwin::太初暦'], # 西暦が正になるところから開始(実際は-103.01.01)
-      ['[四分暦]85.01.01',     '@CR',  '85-01-01^ChineseTwin::四分暦'],
-      ['[乾象暦]222.01.01',    '@CR', '222-01-01^ChineseTwin::乾象暦'],
-      ['[景初暦]237.01.01',    '@CR', '237-01-01^ChineseTwin::景初暦'],
+      ['[四分暦]85.01.01',     '@CR',  '85-01-01^ChineseTwin::四分暦', '265'],
+      ['[乾象暦]222.01.01',    '@CR', '222-01-01^ChineseTwin::乾象暦', '281'],
+      ['[景初暦]237.01.01',    '@CR', '237-01-01^ChineseTwin::景初暦', '452'],
       ['[元嘉暦]445.01.01',    '@CR', '445-01-01^ChineseTwin::元嘉暦'],
-      ['[大明暦]510.01.01',    '@CR', '510-01-01^ChineseTwin::大明暦'],
-      ['[三紀暦=]384.01.01',   '@CR', '384-01-01^ChineseTwin::三紀暦'],
-      ['[玄始暦=]412.01.01',   '@CR', '412-01-01^ChineseTwin::玄始暦'],
+      ['[大明暦]510.01.01',    '@CR', '510-01-01^ChineseTwin::大明暦', '590'],
+      ['[三紀暦=]384.01.01',   '@CR', '384-01-01^ChineseTwin::三紀暦', '418'],
+      ['[玄始暦=]412.01.01',   '@CR', '412-01-01^ChineseTwin::玄始暦', '440'],
       ['[玄始暦=]452.01.01',   '@CR', '452-01-01^ChineseTwin::玄始暦'],
-      ['[正光暦=]523.01.01',   '@CR', '523-01-01^ChineseTwin::正光暦'],
+      ['[正光暦=]523.01.01',   '@CR', '523-01-01^ChineseTwin::正光暦', '566'],
       ['[興和暦=]540.01.01',   '@CR', '540-01-01^ChineseTwin::興和暦'],
-      ['[天保暦=]551.01.01',   '@CR', '551-01-01^ChineseTwin::天保暦'],
+      ['[天保暦=]551.01.01',   '@CR', '551-01-01^ChineseTwin::天保暦', '578'],
       ['[天和暦=]566.01.01',   '@CR', '566-01-01^ChineseTwin::天和暦'],
       ['[大象暦=]579.01.01',   '@CR', '579-01-01^ChineseTwin::大象暦'],
       ['[開皇暦=]584.01.01',   '@CR', '584-01-01^ChineseTwin::開皇暦'],
@@ -46,17 +46,17 @@ module When
       'locale:[=ja:, en=en:]',
       'area:[中国の節月=, *ChineseSolar=]',
       ['[太初暦]1.01.01',     '@CR',    '1-01-01^ChineseTwin::太初暦(節月)'], # 西暦が正になるところから開始(実際は-103.01.15)
-      ['[四分暦]85.01.07',    '@CR',   '85-01-07^ChineseTwin::四分暦(節月)'],
-      ['[乾象暦]221.12.23',   '@CR',  '221-12-23^ChineseTwin::乾象暦(節月)'],
-      ['[景初暦]237.01.07',   '@CR',  '237-01-07^ChineseTwin::景初暦(節月)'],
+      ['[四分暦]85.01.07',    '@CR',   '85-01-07^ChineseTwin::四分暦(節月)', '264-12-28'],
+      ['[乾象暦]221.12.23',   '@CR',  '221-12-23^ChineseTwin::乾象暦(節月)', '280-12-31'],
+      ['[景初暦]237.01.07',   '@CR',  '237-01-07^ChineseTwin::景初暦(節月)', '451-12-31'],
       ['[元嘉暦]444.12.22',   '@CR',  '444-12-22^ChineseTwin::元嘉暦(節月)'],
-      ['[大明暦]509.12.23',   '@CR',  '509-12-23^ChineseTwin::大明暦(節月)'],
-      ['[三紀暦=]384.01.02',  '@CR',  '384-01-02^ChineseTwin::三紀暦(節月)'],
-      ['[玄始暦=]411.12.26',  '@CR',  '411-12-26^ChineseTwin::玄始暦(節月)'],
+      ['[大明暦]509.12.23',   '@CR',  '509-12-23^ChineseTwin::大明暦(節月)', '590-01-08'],
+      ['[三紀暦=]384.01.02',  '@CR',  '384-01-02^ChineseTwin::三紀暦(節月)', '418-01-16'],
+      ['[玄始暦=]411.12.26',  '@CR',  '411-12-26^ChineseTwin::玄始暦(節月)', '440-01-15'],
       ['[玄始暦=]452.01.02',  '@CR',  '452-01-02^ChineseTwin::玄始暦(節月)'],
-      ['[正光暦=]522.12.29',  '@CR',  '522-12-29^ChineseTwin::正光暦(節月)'],
+      ['[正光暦=]522.12.29',  '@CR',  '522-12-29^ChineseTwin::正光暦(節月)', '566-01-04'],
       ['[興和暦=]539.12.22',  '@CR',  '539-12-22^ChineseTwin::興和暦(節月)'],
-      ['[天保暦=]550.12.19',  '@CR',  '550-12-19^ChineseTwin::天保暦(節月)'],
+      ['[天保暦=]550.12.19',  '@CR',  '550-12-19^ChineseTwin::天保暦(節月)', '577-12-21'],
       ['[天和暦=]566.01.05',  '@CR',  '566-01-05^ChineseTwin::天和暦(節月)'],
       ['[大象暦=]579.01.11',  '@CR',  '579-01-11^ChineseTwin::大象暦(節月)'],
       ['[開皇暦=]584.01.16',  '@CR',  '584-01-16^ChineseTwin::開皇暦(節月)'],