when_exe 0.3.1 → 0.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/when_exe.rb +98 -64
- data/lib/when_exe/basictypes.rb +2 -2
- data/lib/when_exe/calendartypes.rb +5 -2
- data/lib/when_exe/coordinates.rb +11 -1
- data/lib/when_exe/core/duration.rb +38 -0
- data/lib/when_exe/core/extension.rb +17 -4
- data/lib/when_exe/ephemeris.rb +49 -17
- data/lib/when_exe/icalendar.rb +19 -17
- data/lib/when_exe/inspect.rb +16 -4
- data/lib/when_exe/mini_application.rb +42 -4
- data/lib/when_exe/parts/locale.rb +30 -13
- data/lib/when_exe/parts/resource.rb +59 -36
- data/lib/when_exe/parts/timezone.rb +19 -13
- data/lib/when_exe/region/bahai.rb +5 -4
- data/lib/when_exe/region/balinese.rb +2 -2
- data/lib/when_exe/region/chinese.rb +11 -11
- data/lib/when_exe/region/chinese_calendar.rb +37 -79
- data/lib/when_exe/region/chinese_epoch.rb +832 -831
- data/lib/when_exe/region/christian.rb +6 -6
- data/lib/when_exe/region/far_east.rb +104 -104
- data/lib/when_exe/region/french.rb +4 -4
- data/lib/when_exe/region/geologicalage.rb +9 -8
- data/lib/when_exe/region/indian.rb +10 -10
- data/lib/when_exe/region/iranian.rb +3 -3
- data/lib/when_exe/region/islamic.rb +3 -3
- data/lib/when_exe/region/japanese.rb +376 -376
- data/lib/when_exe/region/japanese_notes.rb +60 -60
- data/lib/when_exe/region/javanese.rb +4 -4
- data/lib/when_exe/region/jewish.rb +2 -2
- data/lib/when_exe/region/korean.rb +204 -204
- data/lib/when_exe/region/m17n.rb +1 -1
- data/lib/when_exe/region/martian.rb +2 -2
- data/lib/when_exe/region/mayan.rb +1 -1
- data/lib/when_exe/region/nihon_shoki.rb +43 -43
- data/lib/when_exe/region/pope.rb +271 -271
- data/lib/when_exe/region/roman.rb +13 -12
- data/lib/when_exe/region/ryukyu.rb +47 -47
- data/lib/when_exe/region/shire.rb +4 -4
- data/lib/when_exe/region/thai.rb +2 -2
- data/lib/when_exe/region/tibetan.rb +3 -3
- data/lib/when_exe/region/vietnamese.rb +122 -122
- data/lib/when_exe/region/world.rb +2 -2
- data/lib/when_exe/timestandard.rb +112 -67
- data/lib/when_exe/tmobjects.rb +4 -0
- data/lib/when_exe/tmposition.rb +63 -10
- data/lib/when_exe/tmreference.rb +34 -13
- data/lib/when_exe/version.rb +1 -1
- data/test/test/icalendar.rb +29 -29
- data/test/test/region/m17n.rb +4 -4
- data/test/test/tmobjects.rb +9 -0
- data/test/test/tmposition.rb +3 -3
- data/when_exe.gemspec +1 -1
- metadata +4 -2
|
@@ -20,7 +20,7 @@ module When
|
|
|
20
20
|
"[Ethiopian=en:Ethiopian_calendar, エチオピア暦=en:Ethiopian_calendar]",
|
|
21
21
|
|
|
22
22
|
[self,
|
|
23
|
-
"names:[EgyptianMonth, 月=ja
|
|
23
|
+
"names:[EgyptianMonth, 月=ja:%%<月_(暦)>]",
|
|
24
24
|
"[tut=, トート= ]",
|
|
25
25
|
"[baba=, バーバ= ]",
|
|
26
26
|
"[hatur=, ハートール= ]",
|
|
@@ -37,7 +37,7 @@ module When
|
|
|
37
37
|
],
|
|
38
38
|
|
|
39
39
|
[self,
|
|
40
|
-
"names:[EthiopianMonth, 月=ja
|
|
40
|
+
"names:[EthiopianMonth, 月=ja:%%<月_(暦)>]",
|
|
41
41
|
"[Mäskäräm=, マスカラム= ]",
|
|
42
42
|
"[Ṭəqəmt=, テケルト= ]",
|
|
43
43
|
"[Ḫədar=, ヘダル= ]",
|
|
@@ -60,7 +60,7 @@ module When
|
|
|
60
60
|
Byzantine = [self, [
|
|
61
61
|
"namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
|
|
62
62
|
"locale:[=en:, ja=ja:, alias]",
|
|
63
|
-
"period:[Byzantine=en:Byzantine_calendar, ビザンティン暦=ja
|
|
63
|
+
"period:[Byzantine=en:Byzantine_calendar, ビザンティン暦=ja:%%<世界創造紀元>]",
|
|
64
64
|
["[AM=en:Anno_Mundi, 世界創造紀元, alias:Anno_Mundi]6497.9.1",
|
|
65
65
|
"Calendar Epoch", "989-09-01^Julian?border=[-1,9,1]¬e=RomanNote", "1453=5-29"]
|
|
66
66
|
]]
|
|
@@ -185,7 +185,7 @@ module When
|
|
|
185
185
|
Index.new({:unit =>12,
|
|
186
186
|
:trunk=>m17n('[::_m:CalendarTerms::Month::*]')}),
|
|
187
187
|
|
|
188
|
-
|
|
188
|
+
DefaultDayIndex
|
|
189
189
|
]
|
|
190
190
|
super
|
|
191
191
|
end
|
|
@@ -258,8 +258,8 @@ module When
|
|
|
258
258
|
# @note 太陽暦日の補正も、本メソッドで行う
|
|
259
259
|
#
|
|
260
260
|
def _lunar_equation(year)
|
|
261
|
-
h = +year
|
|
262
|
-
-h + h
|
|
261
|
+
h = +year.div(100)
|
|
262
|
+
-h + h.div(4) + (8*(h+11)).div(25) - 3
|
|
263
263
|
end
|
|
264
264
|
|
|
265
265
|
private
|
|
@@ -29,31 +29,31 @@ module When
|
|
|
29
29
|
"area:[満洲,Manchurian=en:Manchuria]",
|
|
30
30
|
[self,
|
|
31
31
|
"period:[震]",
|
|
32
|
-
["[高王]1", "
|
|
32
|
+
["[高王]1", "@F", "name=[高王];698^Chinese0523", "713"]
|
|
33
33
|
],
|
|
34
34
|
[self,
|
|
35
35
|
"period:[渤海,Balhae]",
|
|
36
|
-
["[高王]1", "
|
|
37
|
-
["[仁安]1", "
|
|
38
|
-
["[大興]1", "
|
|
39
|
-
["[廃王]1", "
|
|
40
|
-
["[中興]1", "
|
|
41
|
-
["[正暦]1", "
|
|
42
|
-
["[永徳]1", "
|
|
43
|
-
["[朱雀]1", "
|
|
44
|
-
["[太始]1", "
|
|
45
|
-
["[建興]1", "
|
|
46
|
-
["[咸和]1", "
|
|
47
|
-
["[虔晃王]1", "
|
|
48
|
-
["[景王]1", "
|
|
49
|
-
["[瑋瑎]1", "
|
|
50
|
-
["[哀王]1", "
|
|
51
|
-
|
|
36
|
+
["[高王]1", "@A", "name=[高王];713^Chinese0523"],
|
|
37
|
+
["[仁安]1", "@A", "name=[武王];719"], # コンサイスでは翌年が元年、以下翌年のものは(*)
|
|
38
|
+
["[大興]1", "@A", "name=[文王];738"],
|
|
39
|
+
["[廃王]1", "@A", "name=[廃王];794"], # 朝鮮史では793?とする
|
|
40
|
+
["[中興]1", "@A", "name=[成王];794"], # 新唐書では786が元年？
|
|
41
|
+
["[正暦]1", "@A", "name=[康王];795"],
|
|
42
|
+
["[永徳]1", "@A", "name=[定王];809"], # コンサイスでは翌年が元年
|
|
43
|
+
["[朱雀]1", "@A", "name=[僖王];813"], # 朝鮮史では817が末年 (*)
|
|
44
|
+
["[太始]1", "@A", "name=[簡王];818"], # 新唐書では前年が元年
|
|
45
|
+
["[建興]1", "@A", "name=[宣王];818"], # コンサイスでは翌年が元年 (*)
|
|
46
|
+
["[咸和]1", "@A", "name=[彝震王];830"], # （以後同様） (*)
|
|
47
|
+
["[虔晃王]1", "@A", "name=[虔晃王];857"], # 新唐書には以後記載なし (*)
|
|
48
|
+
["[景王]1", "@A", "name=[景王];871"], # 朝鮮史は871? (*)
|
|
49
|
+
["[瑋瑎]1", "@A", "name=[瑋瑎];893"], # 朝鮮史では在位不明 (*)
|
|
50
|
+
["[哀王]1", "@A", "name=[哀王];906", #(*)
|
|
51
|
+
"926="]
|
|
52
52
|
],
|
|
53
53
|
[self,
|
|
54
54
|
"period:[満洲国]",
|
|
55
|
-
["[大同]1", "
|
|
56
|
-
["[康徳]1.03.01","",
|
|
55
|
+
["[大同]1", "@F", "name=[溥儀];1932-03-01^Gregorian?note=ChineseNotes"],
|
|
56
|
+
["[康徳]1.03.01","", "1934-03-01", "1945-08-18="]
|
|
57
57
|
],
|
|
58
58
|
]]
|
|
59
59
|
|
|
@@ -64,11 +64,11 @@ module When
|
|
|
64
64
|
"namespace:[ja=http://ja.wikipedia.org/wiki/, en=http://en.wikipedia.org/wiki/]",
|
|
65
65
|
"locale:[=ja:, en=en:, alias]",
|
|
66
66
|
"area:[柔然,Rouran]",
|
|
67
|
-
["[永康]1", "
|
|
68
|
-
["[太平]1", "
|
|
69
|
-
["[太安]1", "
|
|
70
|
-
["[始平]1", "
|
|
71
|
-
["[建昌]1", "
|
|
67
|
+
["[永康]1", "@A", "name=[予成];464^Chinese0445"],
|
|
68
|
+
["[太平]1", "@A", "name=[豆崙];485"],
|
|
69
|
+
["[太安]1", "@A", "name=[那蓋];492"],
|
|
70
|
+
["[始平]1", "@A", "name=[伏図];506"],
|
|
71
|
+
["[建昌]1", "@A", "name=[醜奴];509", "520="]
|
|
72
72
|
]]
|
|
73
73
|
|
|
74
74
|
#
|
|
@@ -78,15 +78,15 @@ module When
|
|
|
78
78
|
"namespace:[ja=http://ja.wikipedia.org/wiki/, en=http://en.wikipedia.org/wiki/]",
|
|
79
79
|
"locale:[=ja:, en=en:, alias]",
|
|
80
80
|
"area:[高昌,Gaochang]",
|
|
81
|
-
["[章和]1", "
|
|
82
|
-
["[永平]1", "
|
|
83
|
-
["[和平]1", "
|
|
84
|
-
["[建昌]1", "
|
|
85
|
-
["[延昌]1", "
|
|
86
|
-
["[延和]1", "
|
|
87
|
-
["[義和]1", "
|
|
88
|
-
["[重光]1", "",
|
|
89
|
-
["[延寿]1", "
|
|
81
|
+
["[章和]1", "@A", "name=[麹堅];531^Chinese0523"],
|
|
82
|
+
["[永平]1", "@A", "name=[麹玄喜];549"],
|
|
83
|
+
["[和平]1", "@A", "name=;551"],
|
|
84
|
+
["[建昌]1", "@A", "name=[麹宝茂];555"],
|
|
85
|
+
["[延昌]1", "@A", "name=[麹乾固];561"],
|
|
86
|
+
["[延和]1", "@A", "name=[麹伯雅];602"],
|
|
87
|
+
["[義和]1", "@A", "name=;614"],
|
|
88
|
+
["[重光]1", "", "name=[麹伯雅];620"],
|
|
89
|
+
["[延寿]1", "@A", "name=[麹文泰];624", "name=[麹智盛];640", "640="]
|
|
90
90
|
]]
|
|
91
91
|
|
|
92
92
|
#
|
|
@@ -98,94 +98,94 @@ module When
|
|
|
98
98
|
"area:[雲南,Yunnan]",
|
|
99
99
|
[self,
|
|
100
100
|
"period:[南詔,Nanzhao]",
|
|
101
|
-
["[閣羅鳳]1", "
|
|
102
|
-
["[賛普金重]1", "
|
|
103
|
-
["[長寿]1", "",
|
|
104
|
-
["[見龍]1", "
|
|
105
|
-
["[上元]1", "",
|
|
106
|
-
["[(上元)]2", "",
|
|
107
|
-
["[応道]1", "
|
|
108
|
-
["[龍興]1", "
|
|
109
|
-
["[全義]1", "
|
|
101
|
+
["[閣羅鳳]1", "@A", "name=[閣羅鳳];748^Chinese0523"],
|
|
102
|
+
["[賛普金重]1", "@A", "name=[賛普金重];752"],
|
|
103
|
+
["[長寿]1", "", "769"],
|
|
104
|
+
["[見龍]1", "@A", "name=[異牟尋];780"],
|
|
105
|
+
["[上元]1", "", "784"],
|
|
106
|
+
["[(上元)]2", "", "785"], # 元封?
|
|
107
|
+
["[応道]1", "@A", "name=[尋閣勧];809"],
|
|
108
|
+
["[龍興]1", "@A", "name=[勧龍晟];810"],
|
|
109
|
+
["[全義]1", "@A", "name=[勧利晟];817"],
|
|
110
110
|
["[大豊]1", "", "820"],
|
|
111
|
-
["[保和]1", "
|
|
111
|
+
["[保和]1", "@A", "name=[晟豊祐];824"],
|
|
112
112
|
["[(保和)]17", "", "840"], # 天啓?
|
|
113
|
-
["[建極]1", "
|
|
114
|
-
["[(建極)]14", "",
|
|
113
|
+
["[建極]1", "@A", "name=[世隆];860"],
|
|
114
|
+
["[(建極)]14", "", "873", "878"] # 法尭?
|
|
115
115
|
],
|
|
116
116
|
[self,
|
|
117
117
|
"period:[大封民]",
|
|
118
|
-
["[貞明]1", "
|
|
119
|
-
["[(貞明)]2", "",
|
|
120
|
-
["[中興]1", "
|
|
118
|
+
["[貞明]1", "@F", "name=[隆舜];878^Chinese0523"],
|
|
119
|
+
["[(貞明)]2", "", "879"], # 承智, 大同, 嵯耶?
|
|
120
|
+
["[中興]1", "@A", "name=[舜化貞];898", "903"]
|
|
121
121
|
],
|
|
122
122
|
[self,
|
|
123
123
|
"period:[大長和]",
|
|
124
|
-
["[安国]1", "
|
|
125
|
-
["[始元]1", "
|
|
126
|
-
["[(始元)]2", "",
|
|
127
|
-
["[天応]1", "
|
|
124
|
+
["[安国]1", "@F", "name=[鄭買嗣];903^Chinese0523"],
|
|
125
|
+
["[始元]1", "@A", "name=[鄭仁旻];910"],
|
|
126
|
+
["[(始元)]2", "", "911"], # 天瑞景星, 安和, 貞祐, 初暦, 孝治?
|
|
127
|
+
["[天応]1", "@A", "name=[鄭隆亶];927", "928"]
|
|
128
128
|
],
|
|
129
129
|
[self,
|
|
130
130
|
"period:[大天興]",
|
|
131
|
-
["[尊聖]1", "
|
|
131
|
+
["[尊聖]1", "@F", "name=[趙善政];928^Chinese0523", "930"]
|
|
132
132
|
],
|
|
133
133
|
[self,
|
|
134
134
|
"period:[大義寧]",
|
|
135
|
-
["[興聖]1", "
|
|
136
|
-
["[大明]1", "",
|
|
135
|
+
["[興聖]1", "@F", "name=[楊宇真];930^Chinese0523"],
|
|
136
|
+
["[大明]1", "", "931", "938="]
|
|
137
137
|
],
|
|
138
138
|
[self,
|
|
139
139
|
"period:[大理,Dali]",
|
|
140
|
-
["[文徳]1", "
|
|
141
|
-
["[(文徳)]2", "",
|
|
142
|
-
["[文経]1", "
|
|
143
|
-
["[至治]1", "
|
|
144
|
-
["[明徳]1", "
|
|
145
|
-
["[(明徳)]2", "",
|
|
146
|
-
["[順徳]1", "",
|
|
147
|
-
["[明政]1", "
|
|
148
|
-
["[広明]1", "
|
|
149
|
-
["[明応]1", "",
|
|
150
|
-
["[(明応)]2", "",
|
|
151
|
-
["[明啓]1", "
|
|
152
|
-
["[明通]1", "
|
|
153
|
-
["[正治]1", "
|
|
154
|
-
["[聖明]1", "
|
|
155
|
-
["[(聖明)]2", "",
|
|
156
|
-
["[保安]1", "
|
|
157
|
-
["[正安]1", "",
|
|
158
|
-
["[(正安)]4", "",
|
|
159
|
-
["[上徳]1", "
|
|
160
|
-
["[広安]1", "",
|
|
161
|
-
["[上明]1", "
|
|
162
|
-
["[保立]1", "
|
|
163
|
-
["[(保立)]2", "",
|
|
164
|
-
["[上治]1", "
|
|
165
|
-
["[天授]1", "
|
|
166
|
-
["[開明]1", "",
|
|
167
|
-
["[天正]1", "",
|
|
168
|
-
["[文安]1", "",
|
|
169
|
-
["[日新]1", "
|
|
170
|
-
["[文治]1", "",
|
|
171
|
-
["[(文治)]10", "",
|
|
172
|
-
["[保天]1", "",
|
|
173
|
-
["[(保天)]9", "",
|
|
174
|
-
["[永貞]1", "
|
|
175
|
-
["[大宝]1", "",
|
|
176
|
-
["[(大宝)]8", "",
|
|
177
|
-
["[利貞]1", "
|
|
178
|
-
["[盛徳]1", "",
|
|
179
|
-
["[嘉会]1", "",
|
|
180
|
-
["[元亨]1", "",
|
|
181
|
-
["[(元亨)]12", "",
|
|
182
|
-
["[鳳暦]1", "
|
|
183
|
-
["[(鳳暦)]2", "",
|
|
184
|
-
["[天開]1", "
|
|
185
|
-
["[天輔]1", "",
|
|
186
|
-
["[(天輔)]2", "",
|
|
187
|
-
["[道隆]1", "
|
|
188
|
-
["[天定]1", "
|
|
140
|
+
["[文徳]1", "@F", "name=[段思平];0938^Chinese0523"],
|
|
141
|
+
["[(文徳)]2", "", "0939"], # 神武?
|
|
142
|
+
["[文経]1", "@A", "name=[段思英];0945"],
|
|
143
|
+
["[至治]1", "@A", "name=[段思良];0946", "0947^Chinese0956", ""],
|
|
144
|
+
["[明徳]1", "@A", "name=[段思聡];0952"],
|
|
145
|
+
["[(明徳)]2", "", "0953"], # 広徳?
|
|
146
|
+
["[順徳]1", "", "0968"],
|
|
147
|
+
["[明政]1", "@A", "name=[段素順];0969"],
|
|
148
|
+
["[広明]1", "@A", "name=[段素英];0986"],
|
|
149
|
+
["[明応]1", "", "1005"],
|
|
150
|
+
["[(明応)]2", "", "1006"], # 明聖, 明徳, 明治?
|
|
151
|
+
["[明啓]1", "@A", "name=[段素廉];1010"],
|
|
152
|
+
["[明通]1", "@A", "name=[段素隆];1023"],
|
|
153
|
+
["[正治]1", "@A", "name=[段素真];1027"],
|
|
154
|
+
["[聖明]1", "@A", "name=[段素興];1042"],
|
|
155
|
+
["[(聖明)]2", "", "1043"], # 天明?
|
|
156
|
+
["[保安]1", "@A", "name=[段思廉];1045"],
|
|
157
|
+
["[正安]1", "", "1053"],
|
|
158
|
+
["[(正安)]4", "", "1056"], # 正徳, 保徳?
|
|
159
|
+
["[上徳]1", "@A", "name=[段連義];1076"],
|
|
160
|
+
["[広安]1", "", "1077"],
|
|
161
|
+
["[上明]1", "@A", "name=[段寿輝];1081"],
|
|
162
|
+
["[保立]1", "@A", "name=[段正明];1082"],
|
|
163
|
+
["[(保立)]2", "", "1083"], # 建安, 天祐?
|
|
164
|
+
["[上治]1", "@A", "name=[高昇泰];1095"],
|
|
165
|
+
["[天授]1", "@A", "name=[段正淳];1096"],
|
|
166
|
+
["[開明]1", "", "1097"],
|
|
167
|
+
["[天正]1", "", "1103"],
|
|
168
|
+
["[文安]1", "", "1105"],
|
|
169
|
+
["[日新]1", "@A", "name=[段正厳];1109"],
|
|
170
|
+
["[文治]1", "", "1110"],
|
|
171
|
+
["[(文治)]10", "", "1119"], # 永嘉?
|
|
172
|
+
["[保天]1", "", "1129"],
|
|
173
|
+
["[(保天)]9", "", "1137"], # 広運?
|
|
174
|
+
["[永貞]1", "@A", "name=[段正興];1148"],
|
|
175
|
+
["[大宝]1", "", "1149"],
|
|
176
|
+
["[(大宝)]8", "", "1156"], # 龍興, 盛明, 建徳?
|
|
177
|
+
["[利貞]1", "@A", "name=[段智興];1172"],
|
|
178
|
+
["[盛徳]1", "", "1176"],
|
|
179
|
+
["[嘉会]1", "", "1181"],
|
|
180
|
+
["[元亨]1", "", "1185"],
|
|
181
|
+
["[(元亨)]12", "", "1196"], # 安定?
|
|
182
|
+
["[鳳暦]1", "@A", "name=[段智廉];1201"],
|
|
183
|
+
["[(鳳暦)]2", "", "1202"], # 元寿?
|
|
184
|
+
["[天開]1", "@A", "name=[段智祥];1205"],
|
|
185
|
+
["[天輔]1", "", "1226"],
|
|
186
|
+
["[(天輔)]2", "", "1227"], # 仁寿?
|
|
187
|
+
["[道隆]1", "@A", "name=[段祥興];1239"],
|
|
188
|
+
["[天定]1", "@A", "name=[段興智];1252", "1254="]
|
|
189
189
|
]
|
|
190
190
|
]]
|
|
191
191
|
end
|
|
@@ -14,7 +14,7 @@ module When
|
|
|
14
14
|
"names:[FrenchTerms]",
|
|
15
15
|
|
|
16
16
|
[self,
|
|
17
|
-
"names:[Month, 月=ja
|
|
17
|
+
"names:[Month, 月=ja:%%<月_(暦)>]",
|
|
18
18
|
"[Vendémiaire, ヴァンデミエール=, 葡萄月=]",
|
|
19
19
|
"[Brumaire, ブリュメール=, 霧月= ]",
|
|
20
20
|
"[Frimaire, フリメール=, 霜月= ]",
|
|
@@ -38,8 +38,8 @@ module When
|
|
|
38
38
|
French = [self, [
|
|
39
39
|
"namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
|
|
40
40
|
"locale:[=en:, ja=ja:, alias]",
|
|
41
|
-
"period:[FrenchRepublican=en:French_Republican_Calendar, フランス共和暦=ja
|
|
42
|
-
["[FRE=en:French_Republican_Calendar, 共和暦=ja
|
|
41
|
+
"period:[FrenchRepublican=en:French_Republican_Calendar, フランス共和暦=ja:%%<フランス革命暦>]",
|
|
42
|
+
["[FRE=en:French_Republican_Calendar, 共和暦=ja:%%<フランス革命暦>, alias:Republican_Era]1.1.1",
|
|
43
43
|
"Calendar Epoch", "1793-01-01^FrenchRepublican", "1806-04-11"],
|
|
44
44
|
]]
|
|
45
45
|
end
|
|
@@ -52,7 +52,7 @@ module When
|
|
|
52
52
|
FrenchRepublican = [YearLengthTableBased, {
|
|
53
53
|
'indices' => [
|
|
54
54
|
When::Coordinates::Index.new({:unit =>13, :trunk=>When.Resource('_m:FrenchTerms::Month::*')}),
|
|
55
|
-
When::Coordinates::
|
|
55
|
+
When::Coordinates::DefaultDayIndex
|
|
56
56
|
],
|
|
57
57
|
'origin_of_MSC' => +1,
|
|
58
58
|
'cycle_offset' => Rational(1,2),
|
|
@@ -10,31 +10,32 @@ module When::TM
|
|
|
10
10
|
#
|
|
11
11
|
# Geological Ages
|
|
12
12
|
#
|
|
13
|
-
GeologicalAge = [OrdinalReferenceSystem,
|
|
13
|
+
GeologicalAge = [OrdinalReferenceSystem, [
|
|
14
14
|
"namespace:[ja=http://ja.wikipedia.org/wiki/, en=http://en.wikipedia.org/wiki/]",
|
|
15
15
|
"locale:[=ja:, en=en:]",
|
|
16
|
+
"*area:[地球,Earth]",
|
|
17
|
+
|
|
16
18
|
[OrdinalEra,
|
|
17
19
|
"*eon:[冥王代,Hadean]",
|
|
18
20
|
"begin:-4_600_000_000-"
|
|
19
21
|
],
|
|
20
22
|
[OrdinalEra,
|
|
21
|
-
"namespace:[root=http://ja.wikipedia.org/wiki
|
|
23
|
+
"namespace:[root=http://ja.wikipedia.org/wiki/%%<始生代>#]",
|
|
22
24
|
"*eon:[始生代,Archean]",
|
|
23
25
|
[OrdinalEra,
|
|
24
|
-
"*era:[原始生代=root
|
|
25
|
-
Eoarchean]",
|
|
26
|
+
"*era:[原始生代=root:%.<原始生代_(Eoarchean)>,Eoarchean]",
|
|
26
27
|
"begin:-4_000_000_000-"
|
|
27
28
|
],
|
|
28
29
|
[OrdinalEra,
|
|
29
|
-
"*era:[古始生代=root
|
|
30
|
+
"*era:[古始生代=root:%.<古始生代_(Paleoarchean)>,Paleoarchean]",
|
|
30
31
|
"begin:-3_600_000_000-"
|
|
31
32
|
],
|
|
32
33
|
[OrdinalEra,
|
|
33
|
-
"*era:[中始生代=root
|
|
34
|
+
"*era:[中始生代=root:%.<中始生代_(Mesoarchean)>,Mesoarchean]",
|
|
34
35
|
"begin:-3_200_000_000-"
|
|
35
36
|
],
|
|
36
37
|
[OrdinalEra,
|
|
37
|
-
"*era:[新始生代=root
|
|
38
|
+
"*era:[新始生代=root:%.<新始生代_(Neoarchean)>,Neoarchean]",
|
|
38
39
|
"begin:-2_800_000_000-"
|
|
39
40
|
]
|
|
40
41
|
],
|
|
@@ -635,5 +636,5 @@ module When::TM
|
|
|
635
636
|
]
|
|
636
637
|
]
|
|
637
638
|
]
|
|
638
|
-
]
|
|
639
|
+
]]
|
|
639
640
|
end
|
|
@@ -13,8 +13,8 @@ module When
|
|
|
13
13
|
"locale:[=en:, ja=ja:, alias]",
|
|
14
14
|
"names:[IndianTerms]",
|
|
15
15
|
"[IndianNationalSolar=en:Indian_national_calendar, インド国定暦]",
|
|
16
|
-
"[HinduSolar=en:Hindu_calendar, インド太陽暦=ja
|
|
17
|
-
"[HinduLuniSolar=en:Hindu_calendar, インド太陰太陽暦=ja
|
|
16
|
+
"[HinduSolar=en:Hindu_calendar, インド太陽暦=ja:%%<ヒンドゥー暦>]",
|
|
17
|
+
"[HinduLuniSolar=en:Hindu_calendar, インド太陰太陽暦=ja:%%<ヒンドゥー暦>]",
|
|
18
18
|
|
|
19
19
|
[self,
|
|
20
20
|
"names:[IntercalaryMonth=en:Intercalation, 閏月]",
|
|
@@ -25,13 +25,13 @@ module When
|
|
|
25
25
|
],
|
|
26
26
|
|
|
27
27
|
[self,
|
|
28
|
-
"names:[IntercalaryDay=en:Intercalation, 閏日=ja
|
|
28
|
+
"names:[IntercalaryDay=en:Intercalation, 閏日=ja:%%<閏>]",
|
|
29
29
|
"[Double %s=, 欠= ]",
|
|
30
30
|
"[Intercalary %s=, 重= ]"
|
|
31
31
|
],
|
|
32
32
|
|
|
33
33
|
[self,
|
|
34
|
-
"names:[LunarMonth=, 太陰月=ja
|
|
34
|
+
"names:[LunarMonth=, 太陰月=ja:%%<月_(暦)>]",
|
|
35
35
|
"[Mārgaśīra=en:Margashirsha, マールガシールシャ=]",
|
|
36
36
|
"[Pauṣa=en:Pausha, パウシャ= ]",
|
|
37
37
|
"[Māgha=en:Maagha, マーガ= ]",
|
|
@@ -47,7 +47,7 @@ module When
|
|
|
47
47
|
],
|
|
48
48
|
|
|
49
49
|
[self,
|
|
50
|
-
"names:[SolarMonth=, 太陽月=ja
|
|
50
|
+
"names:[SolarMonth=, 太陽月=ja:%%<月_(暦)>]",
|
|
51
51
|
"[Maysha=, 白羊宮 ]",
|
|
52
52
|
"[Vrushabha=, 金牛宮 ]",
|
|
53
53
|
"[Mithuna=, 双児宮 ]",
|
|
@@ -543,7 +543,7 @@ module When
|
|
|
543
543
|
'origin_of_LSC' => 1721140,
|
|
544
544
|
'indices' => [
|
|
545
545
|
When::Coordinates::Index.new({:unit =>12, :trunk=>When.Resource('_m:IndianTerms::LunarMonth::*'), :shift=>4}),
|
|
546
|
-
When::Coordinates::
|
|
546
|
+
When::Coordinates::DefaultDayIndex
|
|
547
547
|
],
|
|
548
548
|
'rule_table' => {
|
|
549
549
|
'T' => {'Rule' =>['LC', 'SC', 'SC', 'SC']},
|
|
@@ -602,7 +602,7 @@ module When
|
|
|
602
602
|
@indices ||= [
|
|
603
603
|
Coordinates::Index.new({:trunk=>When.Resource('_m:IndianTerms::SolarMonth::*'),
|
|
604
604
|
:shift=>@start_month-1}),
|
|
605
|
-
Coordinates::
|
|
605
|
+
Coordinates::DefaultDayIndex
|
|
606
606
|
]
|
|
607
607
|
|
|
608
608
|
super
|
|
@@ -733,12 +733,12 @@ module When
|
|
|
733
733
|
@location ||= Location[$1]
|
|
734
734
|
@cycle_offset ||= CycleOffset[$1]
|
|
735
735
|
@origin_of_MSC ||= -YearEpoch[$2]
|
|
736
|
-
@hindu_style
|
|
736
|
+
@hindu_style ||= HinduStyle[$3]
|
|
737
737
|
@epoch_in_CE ||= 0
|
|
738
738
|
@start_month ||= 5 # Chaitra
|
|
739
739
|
@start_month = @start_month.to_i
|
|
740
740
|
@cycle_offset = @cycle_offset.to_f + (@start_month - 5)
|
|
741
|
-
@hindu_style
|
|
741
|
+
@hindu_style = @hindu_style.to_i
|
|
742
742
|
@origin_of_MSC = @origin_of_MSC.to_i
|
|
743
743
|
formula = @formula || Formula[$1]
|
|
744
744
|
if formula.kind_of?(String)
|
|
@@ -795,7 +795,7 @@ module When
|
|
|
795
795
|
"names:[day]",
|
|
796
796
|
|
|
797
797
|
[When::BasicTypes::M17n,
|
|
798
|
-
"names:[tithi=, ティティ=ja
|
|
798
|
+
"names:[tithi=, ティティ=ja:%%<ティティ>]",
|
|
799
799
|
"[Amavasya ]", # 新月
|
|
800
800
|
"[Pratipad=en:Prathama_(day)]", # 1
|
|
801
801
|
"[Dwitiya ]", # 2
|