when_exe 0.3.2 → 0.3.3

data/lib/when_exe/region/chinese_calendar.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 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.
 =end
@@ -517,6 +517,122 @@ module When
       }
     ]
 
+    #
+    # 『唐・日本における進朔に関する研究』(2013-10版)を使用する場合の朔閏表(一部修正あり)
+    #
+    # 隋・唐::       大業暦    618
+    # 唐::           戊寅暦    619 -  664
+    # 唐・周::       麟徳暦    665 -  728 総法 1340(小余の分母)
+    # 唐::           大衍暦    729 -  761 通法 3040(    〃    )
+    # 唐::           五紀暦    762 -  783 通法 1340(    〃    )
+    # 唐::           正元暦    784 -  806
+    # 唐::           観象暦    807 -  821
+    # 唐::           宣明暦    822 -  892 統法 8400(    〃    )
+    # 唐～後梁::     崇玄暦    893 -  907
+    Chinese0618 = [PatternTableBasedLuniSolar, {
+      'origin_of_MSC'=>618, 'origin_of_LSC'=>1946814,
+      'indices'=> _IndicesM1,
+      'rule_table'=> %w(		aBcDeFgHiJkL	ABbcDefGhIJKl	AbCdeFgHiJkL
+	ABcDefGhIjJkL	AbCDefGhIjKl	AbCDeFgHiJkL	aBcDeFGgHiJkL	aBcdEFgHIjKl
+	AbCdeFgHIJkL	aBcCdeFgHIjKL	aBcdEfgHIjKL	AbCdeFghIJkLL	AbCdeFgHiJkL
+	AbCdEfGhIjKl	AbCDeFgHhIjKl	AbCdEFgHiJkL	aBcdEfGHIjKl	AbCddEfGHIjKl
+	AbCdeFghIJKL	aBcDefgHIjKL	AbBcDefgHiJKL	aBCdeFghIjKL	aBCdEfGhIjJkL
+	aBcDEfGhIjKl	AbcDEfGHiJkL	aBcdEfFGhIJkL	aBcdEfGhIJKl	aBcDeFGhIjKl
+	AbCcDeFgHiJKl	AbCdEfGhIjKl	AbCDeFgHiJkLl	AbCdEFgHiJkL	aBcDeFgHiJKl
+
+	AbCdEfGhIiJkL	aBCdEfGhIjKl	AbCdEFgHiJkL	aBcDeEfGhIJkL	aBcDeFgHiJkL
+	aBCdEfGhIjKl	AaBcDEfGhIjKl	AbCdEfGhIJkL	aBcDeFgHiJjKl	ABcDeFgHiJkL
+	aBcDEfGhIjKl	AbCdEfGgHIjKl	AbCdEfGhIjKl	ABcDeFgHiJkL	aBcCDeFgHiJkL
+	AbCdEfgHiJkL	AbCDeFghIjKlL	aBCdEfGhIjKl	AbCdEFgHiJKl	aBcDeFgHIiJKl
+	aBcdEfGHiJKL	abCdeFgHiJKL	aBcDeeFgHiJKL	aBcDefGhIjKL	aBCdEfgHiJkL
+	aBCcDeFgHiJkL	AbcDEfGhIjKL	AbcdEfGHiJkKl	AbcDeFGhIJkL	aBcdEfGhIJKl
+	AbCdeFgGhIJKl	AbCdeFgHiJKl	ABcDefGhIjKL	aBcDEefGhIjKl	AbCDeFgHiJkL
+	aBcDeFGhIjKl	AaBcDeFgHIjKl	AbcDeFgHIJkL	aBcdEfGhIIJkL	aBcdEfgHIjKL
+	AbCdeFghIJKL	aBcDeeFghIJKL	abCdEfGhIjkL	AbCDeFgHiJkL	aBbCdEFgHiJkL
+	abCdEFgHIjKl	AbcDeFgHIJJkl	AbcDeFgHiJKL	aBcdEfgHIJkL	AbCdeFggHiJKL
+
+	aBCdeFghIjKL	aBCdEfGhIjkL	AbCdDEfGhIjkL	aBCdEfGHiJkL	abCdEfGHiJKl
+	AabCdEfGHiJKl	AbcDefGHiJKL	aBcDefGhIiJKL	aBcDefGhIjKL	aBCdEfgHiJkL
+	aBCDeFfgHiJkL	aBCdEfGhIjKl	AbCdEfGHiJkL	AbbcDeFGHiJkL	aBcdEfGHiJKl
+	AbCdeFgHiJKLl	AbcDefGhIJkL	ABcdEfgHiJkL	ABcDeFggHiJkL	ABcDeFghIJkL
+	aBcDEfGhIjKl	AbCdEeFGhIjKl	AbcDeFGhIJkL	aBcdEfGhIJkLL	AbcdEfGhIJkL
+	AbCdeFghIJkL	ABcDefGhiIJkL	AbCDefGhiJkL	aBCdEfGHijKl	AbCdEFfGhIjKl
+	AbCdEfGHiJKl	aBcdEfGHIjKL	abCcdEfGHiJKl	AbCdeFgHiJKL	aBcDefGhIjKKl
+	ABCdeFghIjKL	aBCdEfGhiJkL	aBCdEFgHhiJkL	aBcDEfGHiJkl	AbCdEfGHiJKl
+	AbcDdEfGHiJKl	AbcDefGHiJKL	aBcdEfgHiJKL	aBBcdEfgHiJKl	ABcDeFghIjKl
+	ABCdEfGhiJjKl	ABcDeFGhiJkL	aBcDEfGhIjKl	AbCdEfFGhIJkL	abCdeFGhIJkL
+
+	AbcDefGhIJKl	ABccDefGhIJkL	AbCdEfgHiJkL	ABcDeFghIjKkL	AbCDeFghIjKl
+	AbCDeFGhiJkL	aBcDeFGhHiJkL	aBcDeFgHIjKL	abCdeFgHIJkL	AbcDdeFgHIjKL
+	aBcdeFGhIJkL	AbCdEFghiJkL	AaBCdEfgHiJkL	AbCdEfGhIjKl	AbCDeFgHiJjKl
+	AbCdEfGHiJkL	aBcdEfGHIjKl	AbCdeFfGHiJKl	AbCdefGHiJKL	aBcDefgHiJKL
+	AbCcDefgHiJKL	aBCdeFgHijKL	aBCdEfGhIjKkl	ABcDeFGhIjKl	aBcDEfGhIJkL
+	abCdEfGHhIJkL	abCdEfGhIJKl	AbCdefGhIJKl	ABcDeefGHiJKL	aBcdEfgHiJKl
+	ABcDeFgHijKL	aAbCDeFgHijKl	AbCDeFGhIjKl	AbcDeFGhIJjKl	aBcDeFgHIJkL
+	aBcdeFgHIJKl	AbCdeeFgHIjKL	AbCdefGhIJkL	AbCdEfGhiJkL	AbCDdEfgHiJkL
+	AbCdEFgHijKl	AbCDeFgHIjKll	AbCdEfGHIjKl	aBcDeFgHIjKL	aBcdEfgHHiJKL
+	aBcdeFgHiJKL	aBCdefGhIjKL	AbCdEefGhIjKL	aBCdEfgHiJkL	aBCdEfGhIjKl
+
+	AaBcDEfGhIjKl	AbCdEfGHiJKl	aBCdefGHiJJKl	aBcdEfGhIJKl	AbCdeFgHiJKL
+	aBcDeFfgHiJKl	ABcDefGhIjKl	ABcDEfGhiJkL	aBCcDeFgHiJkL	aBcDEfGhIJkl
+	AbCdEfGHiJKlL	abcDeFGhIJKl	AbcDefGhIJKl	ABcdeFgHhIJKl	AbCdEfgHiJkL
+	ABcDeFghIjKl	ABcDEefGhIjKl	AbCDeFgHiJkL	aBcDeFGhIjKl	AaBcDeFgHIjKL
+	abcDeFgHIJkL	AbcDefGhIJjKL	aBcDefGhIjKL	AbCdEfghIJkL	ABcDeFggHiJkL
+	AbCDefGhIjKl	AbCDeFgHiJkL	aBcCdEFgHiJkL	aBcdEFgHIjKl	AbCdeFgHIjKLl
+	AbCdeFgHiJKL	aBcDefGhIjKL	AbCdEfggHiJKL	aBCdeFgHijKL	aBCdEfGhIjKl
+	AbCdEeFGhIjKl	AbCdEfGHiJkL	aBcdEfGHiJKl	AaBcdEfGhIJKl	AbCdeFgHiJKL
+	aBcDefgHiIJKl	ABcDefgHiJKl	ABcDeFgHijKL	aBCdEfGgHijKL	aBcDeFGhIjKl
+	aBcDEfGhIJkL	aBccDeFGhIJkL	aBcdEfGhIJKl	AbCdefGhIJKkL	AbCdefGhIJkL
+
+	ABcDefgHiJkL	ABcDeFgHhiJkL	AbCDeFgHijKl	AbCDeFgHIjKl	aBcDdEFgHIjKl
+	AbcDeFgHIjKL	aBcdEfgHIJkL	AbBcdeFgHIjKL	AbCdefGhIjKL	AbCdEfgHiJjKL
+	aBCdEfGhiJkL	AbCdEFgHijKl	AbCdEFfGhIJkl	AbCdEfGHiJKl	AbcDeFgHIjKL
+	aBccdEfGHiJKL	aBcdeFgHiJKL	aBCdefGhIjKLl	ABcDeFghIjKL	aBCdEfGhiJkL
+	aBCdEfGhHiJkL	aBcDEfGhIjKl	AbCdEfGHiJKl	aBcDdeFGhIJkL	AbcdEfGhIJKl
+	ABcdeFgHiJKl	ABbCdeFgHiJkL	ABcDeFghIjKl	ABcDEfgHiJjKl	AbCDeFgHiJkL
+	aBcDeFGhIjKl	AbCdEfGgHIjKl	AbCdeFgHIJkL	aBcDefGhIJkL	AbCcDefGhIjKL
+	AbCdEfghIJkL	ABcDefGhIjKkL	AbCdEfGhIjKl	AbCDeFgHiJkL	aBcDeFgHIiJkL
+	aBcdEFghIJKl	AbCdeFgHIjKL	aBcDeeFgHiJKL	aBcDefgHIjKL	AbCdEfghIjKL
+	AaBCdeFgHijKL	aBCdEfGhIjKl	AbCdEFgHiJjKl	AbCdEfGHiJkL	abCdEFgHIjKL
+
+	abCdeFfGHiJKl	AbcDefGHiJKL	aBcDefgHiJKL	aBCdDefgHiJKl	ABcDeFgHijKL
+	aBcDEfGhIjkLl	ABcDeFGhIjKl)
+      }
+    ]
+
+    #
+    # 『唐・日本における進朔に関する研究』(2013-10版)を使用する場合の朔閏表(一部修正あり)
+    #
+    # 唐・周::       麟徳暦    688 -  700 (歳首 建子月)
+    Chinese0618B = [PatternTableBasedLuniSolar, {
+      'origin_of_MSC'=>688, 'origin_of_LSC'=>1972387, 'border'=>'0*11-01',
+      'indices'=> [
+           Coordinates::Index.new({:branch=>{1=>When.Resource('_m:CalendarTerms::閏')},
+                                   :trunk=>When.Resource('_m:ChineseTerms::MonthA::*')}),
+           Coordinates::DefaultDayIndex
+       ],
+      'rule_table'=> %w(		AbcDeFgHIJkL	aBcdEfGhIIJkL	aBcdEfgHIjKL 
+	AbCdeFghIJKL	aBcDeeFghIJKL	abCdEfGhIjkL	AbCDeFgHiJkL	aBbCdEFgHiJkL
+	abCdEFgHIjKl	AbcDeFgHIJJkl	AbcDeFgHiJKL	aBcdEfgHIJkL	AbCdeFggHiJKL)
+      }
+    ]
+
+    #
+    # 『唐・日本における進朔に関する研究』(2013-10版)を使用する場合の朔閏表(一部修正あり)
+    #
+    # 唐::           大衍暦    760-761 (歳首 建子月)
+    # 唐::           五紀暦    762     (歳首 建子月)
+    Chinese0618C = [PatternTableBasedLuniSolar, {
+      'origin_of_MSC'=>760, 'origin_of_LSC'=>1998670, 'border'=>'0*11-01',
+      'indices'=> [
+           Coordinates::Index.new({:branch=>{1=>When.Resource('_m:CalendarTerms::閏')},
+                                   :trunk=>When.Resource('_m:ChineseTerms::MonthB::*')}),
+           Coordinates::DefaultDayIndex
+       ],
+      'rule_table'=> %w(AbcDdeFgHIjKL	aBcdeFGhIJkL	AbCdEFghiJkL)
+      }
+    ]
+
     # 後晋::         調元暦    939 -  943
     # 後晋::         調元暦?   944 -  946
     # 遼::           調元暦    947 -  994

data/lib/when_exe/region/chinese_epoch.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 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.
 =end
@@ -14,10 +14,10 @@ module When
     #
     # 中国の年号
     #
-    Chinese = [self, [
+    Chinese = [{'V'=>{'0618'=>{'A'=>'0618', 'B'=>'0618B', 'C'=>'0618C'}}}, self, [
       "namespace:[ja=http://ja.wikipedia.org/wiki/, en=http://en.wikipedia.org/wiki/]",
       "locale:[=ja:, en=en:]",
-      "area:[中国=ja:%%<元号>#%.<中国>,China=en:Chinese_era_name]",
+      'area:[中国#{?V=A}=ja:%%<元号>#%.<中国>,China#{?V=A}=en:Chinese_era_name]',
       [self,
 	"period:[秦]",
 	["[始皇帝]25*",		"@F"	,	"name=[始皇帝];-221*10-01^Chinese_221"],# 歳首は１０月
@@ -679,7 +679,7 @@ module When
       ],
       [self,
 	"period:[唐]",
-	["[武徳]1"	,	"@F"	,	"name=[高祖];618-05-20^Chinese0523"],	# 甲子 武徳２年から戊寅暦を使用
+	["[武徳]1"	,	"@F"	,	'name=[高祖];618-05-20^Chinese#{A:0523}'], # 甲子 武徳２年から戊寅暦を使用
 	["[貞観]1"	,	"@A"	,	"name=[太宗];627-01-01"],		# 乙酉
 	["[永徽]1"	,	"@A"	,	"name=[高宗];650-01-01"],		# 辛丑
 	["[顕慶]1"	,	""	,	"	     656-01-07"],		# 壬申
@@ -700,10 +700,10 @@ module When
 	["[光宅]1"	,	""	,	"	     684-09-06"],		# 甲寅
 	["[垂拱]1"	,	""	,	"name=[武太后];685-01-01"],		# 丁未
 	["[永昌]1"	,	""	,	"	     689-01-01"],		# 乙卯
-	["[載初]1*11.01",	""	,	"	     690*11-01^Chinese0689", "690-09-09"], # 庚辰 本年から１１月を歳首とする
+	["[載初]1*11.01",	""	,	'	     690*11-01^Chinese#{B:0689}', "690-09-09"], # 庚辰 本年から１１月を歳首とする
 	[self,
 	  "period:[周]",
-	  ["[天授]1*"	,	"@F"	,	"name=[武則天];690-09-09^Chinese0689"],	# 壬午
+	  ["[天授]1*"	,	"@F"	,	'name=[武則天];690-09-09^Chinese#{B:0689}'],	# 壬午
 	  ["[如意]1*"	,	""	,	"	     692-04-01"],		# 丙申
 	  ["[長寿]1*"	,	""	,	"	     692-09-09"],		# 庚子
 	  ["[延載]1*"	,	""	,	"	     694-05-11"],		# 甲午
@@ -714,12 +714,12 @@ module When
 	  ["[神功]1*"	,	""	,	"	     697-08-29"],		# 壬辰 コンサイス世界年表では１年ずれる
 	  ["[聖暦]1*11.01",	""	,	"	     698*11-01"],		# 甲子
 	  ["[久視]1*"	,	""	,	"	     700-05-05",		# 癸丑
-						"	     700-10-01^Chinese0523",""],# 本年で歳首を元にもどす
+						'	     700-10-01^Chinese#{A:0523}',""],# 本年で歳首を元にもどす
 	  ["[大足]1"	,	""	,	"	     701-01-03"],		# 丁丑
 	  ["[長安]1"	,	""	,	"	     701-10-22"],		# 辛酉
 	  ["[神龍]1"	,	""	,	"	     705-01-01", "705-02-04"]	# 壬午
 	],
-	["[神龍]1.02.04",	""	,	"name=[中宗];705-02-04^Chinese0523"],	# 甲寅
+	["[神龍]1.02.04",	""	,	'name=[中宗];705-02-04^Chinese#{A:0523}'],	# 甲寅
 	["[景龍]1"	,	""	,	"	     707-09-05"],		# 庚子
 	["[唐隆]1"	,	"@A"	,	"name=[少帝];710-06-04"],		# 甲申
 	["[景雲]1"	,	""	,	"name=[睿宗];710-07-20"],		# 己巳
@@ -731,8 +731,8 @@ module When
 	["[至徳]1"	,	"@A"	,	"name=[粛宗];756-07-12"],		# 甲子
 	["[乾元]1"	,	""	,	"	     758-02-05"],		# 丁未
 	["[上元]1"	,	""	,	"	     760-04=19"],		# 己卯
-	["[粛宗]1"	,	""	,	"name=[粛宗];761-09-21", "762*11^Chinese0761", ""],	# 壬寅
-	["[宝応]1"	,	"@A"	,	"name=[代宗];762-04-15^Chinese0523"],	# 甲子 本年から五紀暦を使用
+	["[粛宗]1"	,	""	,	"name=[粛宗];761-09-21", '762*11^Chinese#{C:0761}', ""],	# 壬寅
+	["[宝応]1"	,	"@A"	,	'name=[代宗];762-04-15^Chinese#{A:0523}'],	# 甲子 本年から五紀暦を使用
 	["[広徳]1"	,	""	,	"	     763-07-11"],		# 壬子
 	["[永泰]1"	,	""	,	"	     765-01-01"],		# 癸巳
 	["[大暦]1"	,	""	,	"	     766-11-12"],		# 甲子
@@ -1242,5 +1242,60 @@ module When
 				"@F",		"name=;1912-01-01^Gregorian"]
       ]
     ]]
+
+    # Chinese Luni-Solar Calendar Series for ChineseNote
+    ChineseLuniSolarSeries = [self, [
+      'namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]',
+      'locale:[=en:, ja=ja:, alias]',
+      'area:[ChineseLuniSolarSeries=, 中国の暦月=]',
+      ['[太初暦]1.01.01',     '@CR',    '1.01.01^Chinese::太初暦',  '85-01-01'], # 西暦が正になるところから開始(実際は-103.01.01)
+      ['[四分暦]85.01.01',    '@CR',   '85.01.01^Chinese::四分暦', '265-01-01'],
+      ['[乾象暦]222.01.01',   '@CR',  '222.01.01^Chinese::乾象暦', '281-01-01'],
+      ['[景初暦]237.01.01',   '@CR',  '237.01.01^Chinese::景初暦', '452-01-01'],
+      ['[元嘉暦]445.01.01',   '@CR',  '445.01.01^Chinese::元嘉暦', '510-01-01'],
+      ['[大明暦]510.01.01',   '@CR',  '510.01.01^Chinese::大明暦', '590-01-01'],
+      ['[三紀暦]384.01.01',   '@CR',  '384.01.01^Chinese::三紀暦', '418-01-01'],
+      ['[玄始暦]412.01.01',   '@CR',  '412.01.01^Chinese::玄始暦', '440-01-01'],
+      ['[玄始暦]452.01.01',   '@CR',  '452.01.01^Chinese::玄始暦', '523-01-01'],
+      ['[正光暦]523.01.01',   '@CR',  '523.01.01^Chinese::正光暦', '566-01-01'],
+      ['[興和暦]540.01.01',   '@CR',  '540.01.01^Chinese::興和暦', '551-01-01'],
+      ['[天保暦]551.01.01',   '@CR',  '551.01.01^Chinese::天保暦', '578-01-01'],
+      ['[天和暦]566.01.01',   '@CR',  '566.01.01^Chinese::天和暦', '579-01-01'],
+      ['[大象暦]579.01.01',   '@CR',  '579.01.01^Chinese::大象暦', '584-01-01'],
+      ['[開皇暦]584.01.01',   '@CR',  '584.01.01^Chinese::開皇暦', '597-01-01'],
+      ['[大業暦]597.01.01',   '@CR',  '597.01.01^Chinese::大業暦', '619-01-01'],
+      ['[麟徳暦]665.01.01',   '@CR',  '665.01.01^Chinese::麟徳暦', '729-01-01'],
+      ['[大衍暦]729.01.01',   '@CR',  '729.01.01^Chinese::大衍暦', '762-01-01'],
+      ['[五紀暦]762.01.01',   '@CR',  '762.01.01^Chinese::五紀暦', '784-01-01'],
+      ['[宣明暦]822.01.01',   '@CR',  '822.01.01^Chinese::宣明暦', '893-01-01']
+    ]]
+
+    # Chinese Solar Calendar Series for ChineseNote
+    ChineseSolarSeries = [self, [
+      'namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]',
+      'locale:[=en:, ja=ja:, alias]',
+      'area:[ChineseSolarSeries=, 中国の節月=]',
+      ['[太初暦]1.01.01',     '@CR',    '1-01-01^Chinese::太初暦(節月)',  '85-01-06'], # 西暦が正になるところから開始(実際は-103.01.15)
+      ['[四分暦]85.01.07',    '@CR',   '85-01-07^Chinese::四分暦(節月)', '264-12-28'],
+      ['[乾象暦]221.12.23',   '@CR',  '221-12-23^Chinese::乾象暦(節月)', '280-12-31'],
+      ['[景初暦]237.01.07',   '@CR',  '237-01-07^Chinese::景初暦(節月)', '451-12-31'],
+      ['[元嘉暦]444.12.22',   '@CR',  '444-12-22^Chinese::元嘉暦(節月)', '509-12-24'],
+      ['[大明暦]509.12.23',   '@CR',  '509-12-23^Chinese::大明暦(節月)', '590-01-08'],
+      ['[三紀暦]384.01.02',   '@CR',  '384-01-02^Chinese::三紀暦(節月)', '418-01-16'],
+      ['[玄始暦]411.12.26',   '@CR',  '411-12-26^Chinese::玄始暦(節月)', '440-01-15'],
+      ['[玄始暦]452.01.02',   '@CR',  '452-01-02^Chinese::玄始暦(節月)', '522-12-29'],
+      ['[正光暦]522.12.29',   '@CR',  '522-12-29^Chinese::正光暦(節月)', '566-01-05'],
+      ['[興和暦]539.12.22',   '@CR',  '539-12-22^Chinese::興和暦(節月)', '550-12-20'],
+      ['[天保暦]550.12.19',   '@CR',  '550-12-19^Chinese::天保暦(節月)', '577-12-21'],
+      ['[天和暦]566.01.05',   '@CR',  '566-01-05^Chinese::天和暦(節月)', '579-01-11'],
+      ['[大象暦]579.01.11',   '@CR',  '579-01-11^Chinese::大象暦(節月)', '584-01-15'],
+      ['[開皇暦]584.01.16',   '@CR',  '584-01-16^Chinese::開皇暦(節月)', '596-12-23'],
+      ['[大業暦]596.12.22',   '@CR',  '596-12-22^Chinese::大業暦(節月)', '618-12-19'],
+      ['[麟徳暦]664.01.01',   '@CR',  '664-01-01^Chinese::麟徳暦(節月)', '729-01-03'], # 年の始めに遡って開始(実際は12.21)
+      ['[大衍暦]729.01.03',   '@CR',  '729-01-03^Chinese::大衍暦(節月)', '761-12-29'],
+      ['[五紀暦]761.12.29',   '@CR',  '761-12-29^Chinese::五紀暦(節月)', '783-12-26'],
+      ['[正元暦]783.12.26',   '@CR',  '783-12-26^Chinese::正元暦(節月)', '807-01-11'],
+      ['[宣明暦]821.01.01',   '@CR',  '821-01-01^Chinese::宣明暦(節月)', '892-12-22']  # 年の始めに遡って開始(実際は12.27)
+    ]]
   end
 end

data/lib/when_exe/region/christian.rb

@@ -367,6 +367,7 @@ module When
       #   @past        = グレゴリオ暦への改暦前の暦法
       #   @reform_date = 改暦日付(月日は 1 オリジンで指定し、0 オリジンに直して保持)
       #   @reform_jdn  = 改暦日付のユリウス通日
+      #   @reform      = reform_date か reform_jdn を内容で判別し、どちらかに反映する
       #   @the_easter  = グレゴリオ暦の復活祭計算の適用を始める年
       #   @the_length  = 通常と異なる日付となる年月の情報({[年,月]=>[スキップした日数, スキップし始める日, 月の日数]})
       #
@@ -379,6 +380,13 @@ module When
         @indices   ||= @past.indices
 
         # 改暦日付 (0 オリジン)
+        @reform = When::Coordinates::Pair._en_pair_date_time(@reform) if @reform.kind_of?(String)
+        case @reform.length
+        when 0 ;
+        when 1 ; @reform_jdn  = @reform[0]
+        else   ; @reform_date = @reform
+        end if @reform.kind_of?(Array)
+
         if @reform_date
           @reform_date  = When::Coordinates::Pair._en_pair_date_time(@reform_date) if @reform_date.kind_of?(String)
           @reform_date  = @reform_date.map {|c| c.to_i}
@@ -479,11 +487,70 @@ module When
         # 日の暦注 ----------------------------
         [When::BasicTypes::M17n,
           "names:[day]",
-          [When::BasicTypes::M17n, "names:[Easter,    復活祭]"    ],
-          [When::BasicTypes::M17n, "names:[Christmas, クリスマス]"]
+          [When::BasicTypes::M17n, "names:[Easter,         復活祭]"    ],
+          [When::BasicTypes::M17n, "names:[Christmas,      クリスマス]"],
+          [When::BasicTypes::M17n, "names:[Fixed_feast=,   固定祝日=]" ],
+          [When::BasicTypes::M17n, "names:[Moveable_feast, 移動祝日]"  ]
         ]
       ]]
 
+      # 固定祝日
+      Fixed_feasts = {
+        [ 1,  6] => "Epiphany",
+        [ 3,  1] => "St.David's Day",
+        [ 3, 17] => "St.Patrick's Day",
+        [ 3, 25] => "Annunciation-Lady Day",
+        [ 4, 23] => "St.George's Day",
+        [ 6, 24] => "Midsummer Day",
+        [ 9, 14] => "Holy Cross Day",
+        [ 9, 29] => "Michaelmas Day",
+        [11, 30] => "St.Andrew's Day",
+        [12, 13] => "St.Lucia's Day",
+        [12, 21] => "St.Thomas's Day",
+      # [12, 25] => "Christmas Day"
+      }
+
+      # 移動祝日 (日付と曜日による)
+      moveable_feasts = {}
+      [[[ 9, 15, 2], "III Quatember"],
+       [[11, 27, 6], "Advent Sunday"],
+       [[12, 14, 2], "IV Quatember" ]].each do |pair|
+        date, name = pair
+        7.times do
+          moveable_feasts[date.dup] = name
+          date[1] += 1
+          if date[1] > 30
+            date[0] += 1
+            date[1]  = 1
+          end
+        end
+      end
+
+      # 移動祝日
+      Moveable_feasts = {
+        # 復活祭からの日数による
+        -63 => "Septuagesima Sunday",
+        -56 => "Sexagesima Sunday",
+        -49 => "Quinquagesima Sunday",
+        -46 => "Ash Wednesday",
+        -42 => "Quadragesima Sunday",
+        -40 => "I Quatember",
+        -35 => "Reminizer Sunday",
+        -28 => "Oculi Sunday",
+        -21 => "Laetare Sunday",
+        -14 => "Judica Sunday",
+         -7 => "Palmarum",
+         -2 => "Good Friday",
+      #   0 => "Easter Day",
+          7 => "Low Sunday",
+         35 => "Rogation Sunday",
+         39 => "Ascension Day",
+         49 => "Whitsunday",
+         53 => "II Quatember",
+         56 => "Trinity Sunday",
+         60 => "Corpus Christi",
+      }.update(moveable_feasts) 
+
       # 週日補正フラグ
       # @return [Integer]
       attr_reader :w
@@ -572,6 +639,34 @@ module When
       # @private
       alias :easter_delta    :_delta
 
+      # 固定祝日
+      #
+      # @param [When::TM::TemporalPosition] date
+      # @param [When::TM::ReferenceSystem] frame 使用する暦法(デフォルトは When.Resource('_c:Gregorian'))
+      #
+      # @return [String] 祝日の名称
+      # @return [nil]    祝日に該当しない
+      #
+      def fixed_feast(date, frame=nil)
+        date = When.Calendar(frame||'Gregorian') ^ date unless date.frame.kind_of?(When::CalendarTypes::Julian)
+        Fixed_feasts[date.cal_date[-2..-1]]
+      end
+
+      # 移動祝日
+      #
+      # @param [When::TM::TemporalPosition] date
+      # @param [When::TM::ReferenceSystem] frame 使用する暦法(デフォルトは When.Resource('_c:Gregorian'))
+      #
+      # @return [String] 祝日の名称
+      # @return [nil]    祝日に該当しない
+      #
+      def moveable_feast(date, frame=nil)
+        result = Moveable_feasts[date.to_i - easter(date, frame).to_i]
+        return result if result
+        date = When.Calendar(frame||'Gregorian') ^ date unless date.frame.kind_of?(When::CalendarTypes::Julian)
+        Moveable_feasts[date.cal_date[-2..-1] + [date.to_i % 7]]
+      end
+
       private
 
       # オブジェクトの正規化

data/lib/when_exe/region/ephemeric_notes.rb

@@ -0,0 +1,353 @@
+# -*- coding: utf-8 -*-
+=begin
+  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.
+=end
+
+#
+# Ephemeris を用いる暦注
+#
+module When::CalendarTypes
+
+  class CalendarNote
+    #
+    # 太陽と月の位置によるイベント
+    #
+    class LuniSolarPositions < self
+
+      # 座標の分子
+      #
+      # @return [Numeric]
+      #
+      attr_reader :num
+
+      # 座標の分母
+      #
+      # @return [Numeric]
+      #
+      attr_reader :den
+
+      # 計算アルゴリズム
+      #
+      # @return [When::Ephemeris::Formula]
+      #
+      attr_reader :formula
+
+      # enumerator の周期
+      #
+      # @return [Numeric]
+      #
+      attr_reader :delta
+
+      # 没滅計算用の補正
+      #
+      # @return [Numeric]
+      #
+      attr_reader :margin
+
+      # イベントの日時
+      #
+      # @param [When::TM::TemporalPosition] date イベントを探す基準とする日時
+      # @param [Array<Numeric>] parameter 座標の分子と分母( num, den)
+      #
+      #   num 座標の分子 (デフォルト @num)
+      #
+      #   den 座標の分母 (デフォルト @den)
+      #
+      # @param [String] parameter  座標の分子と分母("#{ num }/#{ den }" の形式)
+      # @param [Integer] precision 取得したい時間位置の分解能(デフォルト date の分解能)
+      #
+      # @return [When::TM::CalDate] date またはその直後のイベントの日時
+      #
+      def term(date, parameter=nil, precision=date.precision)
+        precision = nil if precision == When::SYSTEM
+        num, den  = parameter.kind_of?(String) ? parameter.split(/\//, 2) : parameter
+        num = (num || @num).to_f
+        den = (den || @den).to_f
+        date      = date.floor(precision) if precision
+        options   = date._attr
+        quot, mod = (@formula.time_to_cn(date)*30.0).divmod(den)
+        cycle     = quot * den + num
+        cycle    += den if mod > (num % den)
+        time      = When::TM::JulianDate._d_to_t(@formula.cn_to_time(cycle/30.0))
+        time      = date.time_standard.from_dynamical_time(time) if @formula.is_dynamical
+        date      = date.frame.jul_trans(When::TM::JulianDate.universal_time(time), options)
+        precision ? date.floor(precision) : date
+      end
+
+      # 日付に対応する座標
+      #
+      # @param [When::TM::TemporalPosition] date 日付
+      # @param [Numeric] delta 周期の補正(土用の時刻の補正に使用,デフォルト 0)
+      #
+      # @return [Array<Integer>] Array< Integer, 0 or 1 or 2 >
+      #
+      #   [Integer]     対応する座標
+      #
+      #   [0 or 1 or 2] 座標の進み(0 なら 没, 2 なら滅)
+      #
+      def position(date, delta=0)
+        date   = date.floor
+        p0, p1 = [date, date.succ].map {|d| (30.0 * @formula.time_to_cn(d) - @margin + delta).floor}
+        [p1 % @den, p1 - p0]
+      end
+
+      #
+      # イベントの標準的な間隔を返す
+      #
+      # @param [String] parameter 座標の分子と分母("#{ num }/#{ den }" の形式)
+      #
+      # @return [When::TM::IntervalLength]
+      def term_delta(parameter=nil)
+        return @delta unless parameter
+        num, den = parameter.split(/\//, 2)
+        When::TM::IntervalLength.new([(den || @den).to_f-1,1].max, 'day')
+      end
+    end
+
+    #
+    # 二十四節気
+    #
+    class SolarTerms < LuniSolarPositions
+
+      private
+
+      # オブジェクトの正規化
+      #   num     - 太陽黄経/度の分子 (デフォルト   0 - 春分)
+      #   den     - 太陽黄経/度の分母 (デフォルト 360 - 1年)
+      #   formula - 計算アルゴリズム(デフォルト '_ep:Formula?formula=12S')
+      #   delta   - enumerator の周期 (デフォルト (den/360)年)
+      #   margin  - 没滅計算用の補正  (デフォルト 1E-8)
+      def _normalize(args=[], options={})
+        num, den, formula, delta, margin = args
+        @num     = (num || @num  ||   0).to_f
+        @den     = (den || @den  || 360).to_f
+        @formula = When.Resource(formula || @formula ||'Formula?formula=12S', '_ep:')
+        @delta   = When.Duration(delta   || @delta   || When::TM::IntervalLength.new(@den/360, 'year'))
+        @margin  = (margin || @margin    || 1E-8).to_f
+        super
+      end
+    end
+
+    #
+    # 月の位相
+    #
+    class LunarPhases < LuniSolarPositions
+
+      private
+
+      # オブジェクトの正規化
+      #   num     - 月の位相/12度の分子 (デフォルト  0 - 朔)
+      #   den     - 月の位相/12度の分母 (デフォルト 30 - 1月)
+      #   formula - 計算アルゴリズム(デフォルト '_ep:Formula?formula=1L')
+      #   delta   - enumerator の周期 (デフォルト (den/30)月)
+      #   margin  - 没滅計算用の補正  (デフォルト 1E-8)
+      def _normalize(args=[], options={})
+        num, den, formula, delta, margin = args
+        @num     = (num || @num  ||  0).to_f
+        @den     = (den || @den  || 30).to_f
+        @formula = When.Resource(formula || @formula ||'Formula?formula=1L', '_ep:')
+        @delta   = When.Duration(delta   || @delta   || When::TM::IntervalLength.new(@den/30, 'month'))
+        @margin  = (margin || @margin    || 1E-8).to_f
+        super
+      end
+    end
+
+    #
+    # 天体暦の暦注
+    #
+    class EphemericNote < self
+
+      NoteObjects = [When::BasicTypes::M17n, [
+        "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
+        "locale:[=en:, ja=ja:, alias=ja:]",
+        "names:[Ephemeric]",
+
+        # 年の暦注 ----------------------------
+        [When::BasicTypes::M17n,
+          "names:[year]"
+        ],
+
+        # 月の暦注 ----------------------------
+        [When::BasicTypes::M17n,
+          "names:[month]",
+          [When::BasicTypes::M17n,
+            "names:[Month]"
+          ]
+        ],
+
+        # 日の暦注 ----------------------------
+        [When::BasicTypes::M17n,
+          "names:[day]",
+            "[Sunrise,   日の出          ]", # 日の出
+            "[Sunset,    日の入り        ]", # 日の入り
+            [When::Coordinates::Residue,
+              "label:[Moon_Age=, 正午月齢=ja:%%<月齢>]",
+              "divisor:60",
+              "format:[%s(%4.1f)]"
+            ],
+            "[Moonrise,  月の出          ]", # 月の出
+            "[Moonset=,  月の入り        ]", # 月の入り
+            [When::BasicTypes::M17n,
+              "names:[Tide, 潮汐]",            # 満潮干潮日時
+              "[High_Tide=en:Tide, 満潮=ja:%%<潮汐>]",
+              "[Low_Tide=en:Tide,  干潮=ja:%%<潮汐>]"
+            ]
+        ]
+      ]]
+
+      #
+      # 日の出
+      #
+      # @param [When::TM::TemporalPosition] date
+      # @param [Hash] options dummy
+      #
+      # @return [When::TM::TemporalPosition] 日の出の時刻をイベント時刻とする
+      #
+      def sunrise(date, options={})
+        event = formula(date.location.iri).sunrise(date)
+        event.events = [@root['Sunrise']]
+        event
+      rescue
+        nil
+      end
+
+      #
+      # 日の入り
+      #
+      # @param [When::TM::TemporalPosition] date
+      # @param [Hash] options dummy
+      #
+      # @return [When::TM::TemporalPosition] 日の入りの時刻をイベント時刻とする
+      #
+      def sunset(date, options={})
+        event = formula(date.location.iri).sunset(date)
+        event.events = [@root['Sunset']]
+        event
+      rescue
+        nil
+      end
+
+      #
+      # 正午月齢
+      #
+      # @param [When::TM::TemporalPosition] date
+      # @param [Hash] options dummy
+      #
+      # @return [Numeric] 正午における朔からの経過日数
+      #
+      def moon_age(date, options={})
+        @phase ||= When.CalendarNote('LunarPhases')
+        noon = date.floor(When::DAY,When::SYSTEM) + 0.5
+        @root['Moon_Age'][noon.to_f - @phase.term(noon, [-30.0,30.0]).to_f]
+      end
+
+      #
+      # 月の出
+      #
+      # @param [When::TM::TemporalPosition] date
+      # @param [Hash] options dummy
+      #
+      # @return [When::TM::TemporalPosition] 月の出の時刻をイベント時刻とする
+      #
+      def moonrise(date, options={})
+        event = formula(date.location.iri).moonrise(date)
+        event.events = [@root['Moonrise']]
+        event
+      rescue
+        nil
+      end
+
+      #
+      # 月の入り
+      #
+      # @param [When::TM::TemporalPosition] date
+      # @param [Hash] options dummy
+      #
+      # @return [When::TM::TemporalPosition] 月の入りの時刻をイベント時刻とする
+      #
+      def moonset(date, options={})
+        event = formula(date.location.iri).moonset(date)
+        event.events = [@root['Moonset']]
+        event
+      rescue
+        nil
+      end
+
+      # 干潮・満潮の日時
+      #
+      # @param [When::TM::TemporalPosition] date
+      # @param [Hash] options
+      # @option options [String] tide 潮汐計算方式 'Horizontal' - 地平高度基準, 'Equatorial' - 子午線通過基準(デフォルト)
+      #
+      # @return [Array<Array<Integer, When::TM::TemporalPosotion>>] 干潮・満潮の日時の Array
+      #
+      #   [Integer] +1:満潮, -1:干潮
+      #
+      #   [When::TM::TemporalPosotion] 干潮・満潮の日時
+      #
+      #
+      def tide(date, options={})
+        return nil unless @interval
+        @target  ||= When.Resource('_ep:Moon')
+        events     = @root['Tide']
+        form       = formula(date.location.iri)
+        type       = options[:tide] =~ /^horizon/i ? nil : 0
+
+        now        = +date
+        high_tides = []
+        5.times do |i|
+          high_tide = form.day_event(now + i - 2, type, @target) + @interval
+          high_tides << high_tide if high_tides.size == 0 || high_tide > high_tides[-1] + 0.5
+        end
+        tides = []
+
+        (high_tides.size-1).times do |i|
+          tides << [0, high_tides[i]]
+          tides << [1, 0.75*high_tides[i] + 0.25*high_tides[i+1]]
+          tides << [0, 0.50*high_tides[i] + 0.50*high_tides[i+1]]
+          tides << [1, 0.25*high_tides[i] + 0.75*high_tides[i+1]]
+        end
+        tides << [0, high_tides[-1]]
+
+        today = +date.floor(When::DAY)...+date.ceil(When::DAY)
+        seed  = date._attr
+        seed[:clock] ||= When::TM::Clock.local_time
+        tides.select {|x| today.include?(x[1])}.map {|x|
+          d = form._to_seed_type(x[1], seed)
+          d.events = [events[x[0]]]
+          d
+        }
+      rescue
+        nil
+      end
+
+      private
+
+      # オブジェクトの正規化
+      #   long     - 計算に用いる経度 / 度
+      #   lat      - 計算に用いる緯度 / 度
+      #   alt      - 計算に用いる高度 / m
+      #   interval - 高潮間隔(月の子午線通過から満潮までの時間) / 時間
+      def _normalize(args=[], options={})
+        if @location
+          @location = When.Resource(@location)
+          @formula  = When.Resource(@formula || "Formula?location=(#{@location.iri})", '_ep:')
+        else
+          @formula  = {}
+        end
+        @interval  = @interval.sub('@','.').to_f / 24 if @interval
+        @root      = When.CalendarNote('EphemericNote/NoteObjects::day')
+        @prime   ||= [%w(Month), %w(Sunrise Sunset Moon_Age)]
+        super
+      end
+
+      # 計算に用いる Ephemeris
+      def formula(location)
+        return @formula unless @formula.kind_of?(Hash)
+        @formula[location] ||= When.Resource("Formula?location=(#{location})", '_ep:')
+      end
+    end
+  end
+end