when_exe 0.3.1 → 0.3.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (53) hide show
  1. data/lib/when_exe.rb +98 -64
  2. data/lib/when_exe/basictypes.rb +2 -2
  3. data/lib/when_exe/calendartypes.rb +5 -2
  4. data/lib/when_exe/coordinates.rb +11 -1
  5. data/lib/when_exe/core/duration.rb +38 -0
  6. data/lib/when_exe/core/extension.rb +17 -4
  7. data/lib/when_exe/ephemeris.rb +49 -17
  8. data/lib/when_exe/icalendar.rb +19 -17
  9. data/lib/when_exe/inspect.rb +16 -4
  10. data/lib/when_exe/mini_application.rb +42 -4
  11. data/lib/when_exe/parts/locale.rb +30 -13
  12. data/lib/when_exe/parts/resource.rb +59 -36
  13. data/lib/when_exe/parts/timezone.rb +19 -13
  14. data/lib/when_exe/region/bahai.rb +5 -4
  15. data/lib/when_exe/region/balinese.rb +2 -2
  16. data/lib/when_exe/region/chinese.rb +11 -11
  17. data/lib/when_exe/region/chinese_calendar.rb +37 -79
  18. data/lib/when_exe/region/chinese_epoch.rb +832 -831
  19. data/lib/when_exe/region/christian.rb +6 -6
  20. data/lib/when_exe/region/far_east.rb +104 -104
  21. data/lib/when_exe/region/french.rb +4 -4
  22. data/lib/when_exe/region/geologicalage.rb +9 -8
  23. data/lib/when_exe/region/indian.rb +10 -10
  24. data/lib/when_exe/region/iranian.rb +3 -3
  25. data/lib/when_exe/region/islamic.rb +3 -3
  26. data/lib/when_exe/region/japanese.rb +376 -376
  27. data/lib/when_exe/region/japanese_notes.rb +60 -60
  28. data/lib/when_exe/region/javanese.rb +4 -4
  29. data/lib/when_exe/region/jewish.rb +2 -2
  30. data/lib/when_exe/region/korean.rb +204 -204
  31. data/lib/when_exe/region/m17n.rb +1 -1
  32. data/lib/when_exe/region/martian.rb +2 -2
  33. data/lib/when_exe/region/mayan.rb +1 -1
  34. data/lib/when_exe/region/nihon_shoki.rb +43 -43
  35. data/lib/when_exe/region/pope.rb +271 -271
  36. data/lib/when_exe/region/roman.rb +13 -12
  37. data/lib/when_exe/region/ryukyu.rb +47 -47
  38. data/lib/when_exe/region/shire.rb +4 -4
  39. data/lib/when_exe/region/thai.rb +2 -2
  40. data/lib/when_exe/region/tibetan.rb +3 -3
  41. data/lib/when_exe/region/vietnamese.rb +122 -122
  42. data/lib/when_exe/region/world.rb +2 -2
  43. data/lib/when_exe/timestandard.rb +112 -67
  44. data/lib/when_exe/tmobjects.rb +4 -0
  45. data/lib/when_exe/tmposition.rb +63 -10
  46. data/lib/when_exe/tmreference.rb +34 -13
  47. data/lib/when_exe/version.rb +1 -1
  48. data/test/test/icalendar.rb +29 -29
  49. data/test/test/region/m17n.rb +4 -4
  50. data/test/test/tmobjects.rb +9 -0
  51. data/test/test/tmposition.rb +3 -3
  52. data/when_exe.gemspec +1 -1
  53. metadata +4 -2
@@ -48,30 +48,30 @@ class When::CalendarTypes::CalendarNote
48
48
  [When::BasicTypes::M17n,
49
49
  "names:[年]",
50
50
  [Notes, "label:[干支]", 'position:共通'], # 干支
51
- # [Notes, "label:[干=ja:%E5%8D%81%E5%B9%B2]",
51
+ # [Notes, "label:[干=ja:%%<十干>]",
52
52
  # 'position:共通'], # 干
53
- # [Notes, "label:[支=ja:%E5%8D%81%E4%BA%8C%E6%94%AF]",
53
+ # [Notes, "label:[支=ja:%%<十二支>]",
54
54
  # 'position:共通'], # 支
55
55
  [Notes, "label:[九星]", 'position:民間'], # 九星
56
56
  [Notes, "label:[大歳壇=]", 'position:暦序'], # 干支
57
57
  [Notes, "label:[納音]", 'position:暦序', 'suffix:是'], # 干支
58
- [Notes, "label:[大歳=ja:%E5%A4%AA%E6%AD%B3%E7%A5%9E]",
58
+ [Notes, "label:[大歳=ja:%%<太歳神>]",
59
59
  'position:暦序', 'suffix:在'], # 干支
60
- [Notes, "label:[大将軍=ja:%E5%A4%A7%E5%B0%86%E8%BB%8D_(%E6%96%B9%E4%BD%8D%E7%A5%9E)]",
60
+ [Notes, "label:[大将軍=ja:%%<大将軍_(方位神)>]",
61
61
  'position:暦序', 'suffix:在'], # 支
62
- [Notes, "label:[大陰=ja:%E5%A4%A7%E9%99%B0]",
62
+ [Notes, "label:[大陰=ja:%%<太陰神>]",
63
63
  'position:暦序', 'suffix:在'], # 支
64
- [Notes, "label:[歳徳=ja:%E6%AD%B3%E5%BE%B3%E7%A5%9E]",
64
+ [Notes, "label:[歳徳=ja:%%<歳徳神>]",
65
65
  'position:暦序', 'suffix:在'], # 干
66
- [Notes, "label:[歳刑=ja:%E6%AD%B3%E5%88%91%E7%A5%9E]",
66
+ [Notes, "label:[歳刑=ja:%%<歳刑神>]",
67
67
  'position:暦序', 'suffix:在'], # 支
68
- [Notes, "label:[歳破=ja:%E6%AD%B3%E7%A0%B4%E7%A5%9E]",
68
+ [Notes, "label:[歳破=ja:%%<歳破神>]",
69
69
  'position:暦序', 'suffix:在'], # 支
70
- [Notes, "label:[歳煞=ja:%E6%AD%B3%E6%AE%BA%E7%A5%9E]",
70
+ [Notes, "label:[歳煞=ja:%%<歳煞神>]",
71
71
  'position:暦序', 'suffix:在'], # 支
72
- [Notes, "label:[黄幡=ja:%E9%BB%84%E5%B9%A1%E7%A5%9E]",
72
+ [Notes, "label:[黄幡=ja:%%<黄幡神>]",
73
73
  'position:暦序', 'suffix:在'], # 支
74
- [Notes, "label:[豹尾=ja:%E8%B1%B9%E5%B0%BE%E7%A5%9E]",
74
+ [Notes, "label:[豹尾=ja:%%<豹尾神>]",
75
75
  'position:暦序', 'suffix:在'], # 支
76
76
  [Notes, "label:[歳次=]", 'position:暦序', 'suffix:-'], # 支
77
77
  [Notes, "label:[金神]", 'position:仮名暦', 'suffix:在'] # 干
@@ -80,12 +80,12 @@ class When::CalendarTypes::CalendarNote
80
80
  # 月の暦注 ----------------------------
81
81
  [When::BasicTypes::M17n,
82
82
  "names:[月]",
83
- [Notes, "label:[月名=ja:%E6%9C%88_(%E6%9A%A6)#.E6.97.A5.E6.9C.AC.E3.81.AE.E5.92.8C.E9.A2.A8.E6.9C.88.E5.90.8D]",
83
+ [Notes, "label:[月名=ja:%%<月_()>#%.<日本の和風月名>]",
84
84
  'position:月建'], # 月の和名
85
85
  # [Notes, "label:[干支]", 'position:共通'], # 干支
86
- # [Notes, "label:[干=ja:%E5%8D%81%E5%B9%B2]",
86
+ # [Notes, "label:[干=ja:%%<十干>]",
87
87
  # 'position:共通'], # 干
88
- # [Notes, "label:[支=ja:%E5%8D%81%E4%BA%8C%E6%94%AF]",
88
+ # [Notes, "label:[支=ja:%%<十二支>]",
89
89
  # 'position:共通'], # 支
90
90
  [Notes, "label:[九星]", 'position:民間'], # 九星
91
91
  [Notes, "label:[月建=]", 'position:月建', 'suffix:-'], # 干支
@@ -98,7 +98,7 @@ class When::CalendarTypes::CalendarNote
98
98
  [Notes, "label:[月空=]", 'position:月建', 'suffix:在'], # 干
99
99
  [Notes, "label:[三鏡=]", 'position:月建'], # 干
100
100
  [Notes, "label:[土府=]", 'position:月建', 'suffix:在'], # 干
101
- [Notes, "label:[土公=ja:%E5%9C%9F%E5%85%AC%E7%A5%9E]",
101
+ [Notes, "label:[土公=ja:%%<土公神>]",
102
102
  'position:月建', 'suffix:在'] # 干
103
103
  ],
104
104
 
@@ -106,147 +106,147 @@ class When::CalendarTypes::CalendarNote
106
106
  [When::BasicTypes::M17n,
107
107
  "names:[日]",
108
108
  [Notes, "label:[干支]", 'position:共通'], # 干支
109
- # [Notes, "label:[干=ja:%E5%8D%81%E5%B9%B2]",
109
+ # [Notes, "label:[干=ja:%%<十干>]",
110
110
  # 'position:共通'], # 干
111
- # [Notes, "label:[支=ja:%E5%8D%81%E4%BA%8C%E6%94%AF]",
111
+ # [Notes, "label:[支=ja:%%<十二支>]",
112
112
  # 'position:共通'], # 支
113
113
  [Notes, "label:[納音]", 'position:共通', 'suffix:是'], # 干支
114
114
  [Notes, "label:[十二直]", 'position:共通'], # 支 節月
115
115
  [Notes, "label:[七曜]", 'position:共通'], # 七曜
116
- [Notes, "label:[廿八宿=ja:%E4%BA%8C%E5%8D%81%E5%85%AB%E5%AE%BF]",
116
+ [Notes, "label:[廿八宿=ja:%%<二十八宿>]",
117
117
  'position:共通'], # 廿八宿
118
- [Notes, "label:[廿七宿=ja:%E4%BA%8C%E5%8D%81%E4%B8%83%E5%AE%BF]",
118
+ [Notes, "label:[廿七宿=ja:%%<二十八宿>]",
119
119
  'position:共通'], # 暦月 暦日
120
120
  [Notes, "label:[九星]", 'position:民間'], # 九星
121
121
  [Notes, "label:[六曜]", 'position:民間'], # 暦月 暦日
122
122
  [Notes, "label:[祝祭日]", 'position:祝祭日'], # 暦月 暦日 (七曜)
123
123
 
124
124
  [Notes, "label:[節中=]", 'position:時候'], # 太陽黄経
125
- [Notes, "label:[廿四節気=ja:%E4%BA%8C%E5%8D%81%E5%9B%9B%E7%AF%80%E6%B0%97]",
125
+ [Notes, "label:[廿四節気=ja:%%<二十四節気>]",
126
126
  'position:時候'], # 太陽黄経
127
127
  [Notes, "label:[七十二候]", 'position:時候'], # 太陽黄経
128
128
  [Notes, "label:[六十卦=]", 'position:時候'], # 太陽黄経
129
129
  [Notes, "label:[入梅]", 'position:雑節'], # 干 太陽黄経
130
130
 
131
- [Notes, "label:[大禍=ja:%E5%A4%A7%E7%A6%8D%E6%97%A5#.E5.A4.A7.E7.A6.8D.E6.97.A5]",
131
+ [Notes, "label:[大禍=ja:%%<暦注下段>#%.<大禍日>]",
132
132
  'position:上段 上段 欄外 欄外', 'suffix:日'], # 支 節月
133
- [Notes, "label:[滅門=ja:%E6%BB%85%E9%96%80%E6%97%A5#.E6.BB.85.E9.96.80.E6.97.A5]",
133
+ [Notes, "label:[滅門=ja:%%<暦注下段>#%.<滅門日>]",
134
134
  'position:上段 上段 欄外 欄外', 'suffix:日'], # 支 節月
135
- [Notes, "label:[狼藉=ja:%E6%9A%A6%E6%B3%A8%E4%B8%8B%E6%AE%B5#.E7.8B.BC.E8.97.89.E6.97.A5]",
135
+ [Notes, "label:[狼藉=ja:%%<暦注下段>#%.<狼藉日>]",
136
136
  'position:上段 上段 欄外 欄外', 'suffix:日'], # 支 節月
137
137
 
138
138
  [Notes, "label:[甘露=]", 'position:上段 上段 上段 上段', 'suffix:日'], # 七曜 廿七宿
139
139
  [Notes, "label:[金剛峯=]", 'position:上段 上段 上段 上段'], # 七曜 廿七宿
140
140
  [Notes, "label:[羅刹=]", 'position:中段 中段 上段 上段'], # 七曜 廿七宿
141
141
 
142
- [Notes, "label:[大将軍=ja:%E5%A4%A7%E5%B0%86%E8%BB%8D_(%E6%96%B9%E4%BD%8D%E7%A5%9E)]",
142
+ [Notes, "label:[大将軍=ja:%%<大将軍_(方位神)>]",
143
143
  'position:上段 上段 上段 上段', 'suffix:-'], # 干支 節年
144
- [Notes, "label:[天一=ja:%E5%A4%A9%E4%B8%80%E7%A5%9E]",
144
+ [Notes, "label:[天一=ja:%%<天一神>]",
145
145
  'position:上段 上段 上段 上段', 'suffix:-'], # 干支
146
- [Notes, "label:[土公=ja:%E5%9C%9F%E5%85%AC%E7%A5%9E]",
146
+ [Notes, "label:[土公=ja:%%<土公神>]",
147
147
  'position:上段 上段 上段 上段'], # 干支
148
- [Notes, "label:[歳下食=ja:%E6%AD%B3%E4%B8%8B%E9%A3%9F#.E6.AD.B3.E4.B8.8B.E9.A3.9F]",
148
+ [Notes, "label:[歳下食=ja:%%<暦注下段>#%.<歳下食>]",
149
149
  'position:上段 上段 上段 上段'], # 干支 節年
150
150
  [Notes, "label:[忌遠行=]", 'position:上段 中段 上段 上段'], # 支 節月
151
151
  [Notes, "label:[忌夜行=]", 'position:上段 中段 上段 上段'], # 支 節月
152
- [Notes, "label:[下食時=ja:%E4%B8%8B%E9%A3%9F%E6%99%82#.E6.99.82.E4.B8.8B.E9.A3.9F]",
152
+ [Notes, "label:[下食時=ja:%%<暦注下段>#%.<時下食>]",
153
153
  'position:上段 上段 上段 上段'], # 支 節月 貞享暦で一部廃止
154
154
  [Notes, "label:[天間=]", 'position:上段 中段 上段 中段上'], # 干支 節月
155
155
  [Notes, "label:[不視病=]", 'position:上段 上段 上段 上段'], # 干
156
156
  [Notes, "label:[不問疾=]", 'position:上段 上段 上段 上段'], # 干
157
157
  [Notes, "label:[不弔人=]", 'position:上段 上段 上段 上段'], # 支
158
- [Notes, "label:[社=ja:%E7%A4%BE%E6%97%A5]",
158
+ [Notes, "label:[社=ja:%%<社日>]",
159
159
  'position:中段 中段 中段 中段', 'suffix:日'], # 干 太陽黄経
160
160
  [Notes, "label:[三伏]", 'position:中段 中段 中段 中段'], # 干 太陽黄経
161
161
  [Notes, "label:[除手足甲=]", 'position:中段 中段 中段 中段'], # 晦(除手足甲)、支(片方のみ), 没滅凶会日×
162
162
  [Notes, "label:[沐浴=]", 'position:中段 中段 中段 中段'], # 支 没滅凶会日×
163
- [Notes, "label:[臘=ja:%E8%87%98%E6%97%A5]",
163
+ [Notes, "label:[臘=ja:%%<臘日>]",
164
164
  'position:中段 中段 中段 中段', 'suffix:日'], # 支 太陽黄経
165
165
  [Notes, "label:[伐=]", 'position:上段 中段 中段 中段上', 'suffix:日'], # 干支
166
- [Notes, "label:[五墓=ja:%E4%BA%94%E5%A2%93%E6%97%A5#.E4.BA.94.E5.A2.93.E6.97.A5]",
166
+ [Notes, "label:[五墓=ja:%%<暦注下段>#%.<五墓日>]",
167
167
  'position:上段 上段 中段 中段下', 'suffix:日'], # 干支
168
168
  [Notes, "label:[九虎=]", 'position:上段 中段 中段 中段上'], # 干支 節月
169
169
  [Notes, "label:[八龍=]", 'position:上段 上段 中段 中段上'], # 干支 節月
170
170
  [Notes, "label:[七鳥=]", 'position:上段 上段 中段 中段上'], # 干支 節月
171
171
  [Notes, "label:[六蛇=]", 'position:上段 上段 中段 中段上'], # 干支 節月
172
172
 
173
- [Notes, "label:[没=ja:%E6%B2%A1%E6%97%A5]",
173
+ [Notes, "label:[没=ja:%%<没日>]",
174
174
  'position:中段 中段 中段 中段', 'suffix:日'], # 太陽黄経
175
175
  [Notes, "label:[日食]", 'position:中段 中段 中段 中段'], # 日食表
176
- [Notes, "label:[滅=ja:%E6%BB%85%E6%97%A5]",
176
+ [Notes, "label:[滅=ja:%%<滅日]",
177
177
  'position:中段 中段 中段 中段', 'suffix:日'], # 月の位相
178
178
  [Notes, "label:[月食]", 'position:中段 中段 中段 中段'], # 月食表
179
179
  [Notes, "label:[月相]", 'position:中段 中段 中段 中段'], # 月の位相
180
- [Notes, "label:[土用事=ja:%E5%9C%9F%E7%94%A8]",
180
+ [Notes, "label:[土用事=ja:%%<土用>]",
181
181
  'position:中段 中段 中段 中段'], # 太陽黄経
182
182
  [Notes, "label:[伏龍=]", 'position:上段 上段 下段 下段', 'suffix:在'], # 太陽黄経
183
183
 
184
- [Notes, "label:[凶会=ja:%E5%87%B6%E4%BC%9A%E6%97%A5#.E5.87.B6.E4.BC.9A.E6.97.A5]",
184
+ [Notes, "label:[凶会=ja:%%<暦注下段>#%.<凶会日>]",
185
185
  'position:下段 下段 下段 下段', 'suffix:日'], # 干支 節月(宣明暦以前)/暦月(貞享暦以降)
186
186
  [Notes, "label:[大小歳=]", 'position:下段 下段 下段 下段'], # 干支 節月
187
- [Notes, "label:[歳徳=ja:%E6%AD%B3%E5%BE%B3%E7%A5%9E]",
187
+ [Notes, "label:[歳徳=ja:%%<歳徳神>]",
188
188
  'position:下段 下段 下段 下段',], # 干 節年 凶会日× ~合も
189
- [Notes, "label:[天恩=ja:%E5%A4%A9%E6%81%A9%E6%97%A5#.E5.A4.A9.E6.81.A9.E6.97.A5]",
189
+ [Notes, "label:[天恩=ja:%%<暦注下段>#%.<天恩日>]",
190
190
  'position:下段 下段 下段 下段', 'suffix:日'], # 干支 節月 凶会日×
191
- [Notes, "label:[天赦=ja:%E6%9A%A6%E6%B3%A8%E4%B8%8B%E6%AE%B5#.E5.A4.A9.E8.B5.A6.E6.97.A5]",
191
+ [Notes, "label:[天赦=ja:%%<暦注下段>#%.<天赦日>]",
192
192
  'position:下段 下段 下段 下段'], # 干支 節月
193
- [Notes, "label:[母倉=ja:%E6%AF%8D%E5%80%89%E6%97%A5#.E6.AF.8D.E5.80.89.E6.97.A5]",
193
+ [Notes, "label:[母倉=ja:%%<暦注下段>#%.<母倉日>]",
194
194
  'position:下段 下段 下段 下段', 'suffix:日'], # 支 節月 凶会日×
195
195
  [Notes, "label:[月徳=]", 'position:下段 下段 下段 下段',], # 干 節月 凶会日× ~合も
196
196
  [Notes, "label:[九坎=]", 'position:下段 下段 下段 下段'], # 支 節月
197
- [Notes, "label:[帰忌=ja:%E5%B8%B0%E5%BF%8C%E6%97%A5#.E5.B8.B0.E5.BF.8C.E6.97.A5]",
197
+ [Notes, "label:[帰忌=ja:%%<暦注下段>#%.<帰忌日>]",
198
198
  'position:下段 下段 下段 下段', 'suffix:日'], # 支 節月
199
- [Notes, "label:[血忌=ja:%E8%A1%80%E5%BF%8C%E6%97%A5#.E8.A1.80.E5.BF.8C.E6.97.A5]",
199
+ [Notes, "label:[血忌=ja:%%<暦注下段>#%.<血忌日>]",
200
200
  'position:下段 下段 下段 下段', 'suffix:日'], # 支 節月
201
201
  [Notes, "label:[無翹=]", 'position:下段 下段 下段 下段'], # 支 節月
202
202
  [Notes, "label:[厭=]", 'position:下段 下段 下段 下段'], # 支 節月
203
- [Notes, "label:[重=ja:%E9%87%8D%E6%97%A5#.E9.87.8D.E6.97.A5]",
203
+ [Notes, "label:[重=ja:%%<暦注下段>#%.<重日>]",
204
204
  'position:下段 下段 下段 下段', 'suffix:日'], # 支
205
- [Notes, "label:[復=ja:%E5%BE%A9%E6%97%A5#.E5.BE.A9.E6.97.A5]",
205
+ [Notes, "label:[復=ja:%%<暦注下段>#%.<復日>]",
206
206
  'position:下段 下段 下段 下段', 'suffix:日'], # 干 節月
207
207
  [Notes, "label:[月煞=]", 'position:下段 下段 下段 下段', 'suffix:在'], # 支 節月
208
- [Notes, "label:[往亡=ja:%E5%BE%80%E4%BA%A1%E6%97%A5#.E5.BE.80.E4.BA.A1.E6.97.A5]",
208
+ [Notes, "label:[往亡=ja:%%<暦注下段>#%.<往亡日>]",
209
209
  'position:下段 下段 下段 下段', 'suffix:日'], # 太陽黄経
210
- [Notes, "label:[日遊=ja:%E6%97%A5%E9%81%8A%E7%A5%9E]",
210
+ [Notes, "label:[日遊=ja:%%<日遊神>]",
211
211
  'position:最下段', 'suffix:在'], # 干支
212
212
 
213
- [Notes, "label:[受死=ja:%E5%8F%97%E6%AD%BB%E6%97%A5#.E5.8F.97.E6.AD.BB.E6.97.A5]",
213
+ [Notes, "label:[受死=ja:%%<暦注下段>#%.<受死日>]",
214
214
  'position:仮名暦', 'suffix:日'], # 支 節月
215
215
  [Notes, "label:[彼岸]", 'position:仮名暦'], # 太陽黄経
216
216
  [Notes, "label:[八専]", 'position:仮名暦'], # 干支
217
- [Notes, "label:[金神間日=ja:%E9%87%91%E7%A5%9E#.E9.87.91.E7.A5.9E.E3.81.AE.E9.81.8A.E8.A1.8C.E3.83.BB.E9.96.93.E6.97.A5]",
217
+ [Notes, "label:[金神間日=ja:%%<金神>#%.<金神の遊行・間日>]",
218
218
  'position:仮名暦'], # 支 節月
219
- [Notes, "label:[天火=ja:%E5%A4%A9%E7%81%AB%E6%97%A5#.E5.A4.A9.E7.81.AB.E6.97.A5]",
219
+ [Notes, "label:[天火=ja:%%<暦注下段>#%.<天火日>]",
220
220
  'position:仮名暦', 'suffix:日'], # 支 節月
221
- [Notes, "label:[地火=ja:%E5%9C%B0%E7%81%AB%E6%97%A5#.E5.9C.B0.E7.81.AB.E6.97.A5]",
221
+ [Notes, "label:[地火=ja:%%<暦注下段>#%.<地火日>]",
222
222
  'position:仮名暦', 'suffix:日'], # 支 節月
223
223
  [Notes, "label:[人火=]", 'position:仮名暦'], # 支 節月
224
224
  [Notes, "label:[雷火=]", 'position:仮名暦'], # 支 節月
225
- [Notes, "label:[赤舌=ja:%E8%B5%A4%E8%88%8C%E6%97%A5]",
225
+ [Notes, "label:[赤舌=ja:%%<赤舌日>]",
226
226
  'position:仮名暦', 'suffix:日'], # 暦月 暦日
227
- [Notes, "label:[十死=ja:%E5%8D%81%E6%AD%BB%E6%97%A5#.E5.8D.81.E6.AD.BB.E6.97.A5]",
227
+ [Notes, "label:[十死=ja:%%<暦注下段>#%.<十死日>]",
228
228
  'position:仮名暦', 'suffix:日'], # 支 節月
229
229
  [Notes, "label:[道虚=]", 'position:仮名暦', 'suffix:日'], # 暦日
230
- [Notes, "label:[大明=ja:%E5%A4%A7%E6%98%8E%E6%97%A5#.E5.A4.A7.E6.98.8E.E6.97.A5]",
230
+ [Notes, "label:[大明=ja:%%<暦注下段>#%.<大明日>]",
231
231
  'position:仮名暦', 'suffix:日'], # 干支
232
- [Notes, "label:[赤口=ja:%E8%B5%A4%E5%8F%A3%E6%97%A5]",
232
+ [Notes, "label:[赤口=ja:%%<赤口日>]",
233
233
  'position:仮名暦', 'suffix:日'], # 暦月 暦日
234
- [Notes, "label:[甲子待=ja:%E7%94%B2%E5%AD%90]",
234
+ [Notes, "label:[甲子待=ja:%%<甲子>]",
235
235
  'position:仮名暦'], # 干支
236
236
  [Notes, "label:[庚申待]", 'position:仮名暦'], # 干支
237
237
  [Notes, "label:[犯土]", 'position:仮名暦'], # 干支
238
238
  [Notes, "label:[十方暮]", 'position:仮名暦'], # 干支
239
- [Notes, "label:[一粒万倍=ja:%E4%B8%80%E7%B2%92%E4%B8%87%E5%80%8D%E6%97%A5]",
239
+ [Notes, "label:[一粒万倍=ja:%%<一粒万倍日>]",
240
240
  'position:仮名暦', 'suffix:日'], # 支 節月
241
241
  [Notes, "label:[天福=]", 'position:仮名暦'], # 支 節月
242
242
  [Notes, "label:[地福=]", 'position:仮名暦'], # 支 節月
243
243
  [Notes, "label:[地五福=]", 'position:仮名暦'], # 支 節月
244
244
  [Notes, "label:[三隣亡]", 'position:仮名暦'], # 支 節月
245
- [Notes, "label:[不成就=ja:%E4%B8%8D%E6%88%90%E5%B0%B1%E6%97%A5]",
245
+ [Notes, "label:[不成就=ja:%%<不成就日>]",
246
246
  'position:仮名暦', 'suffix:日'], # 暦月 暦日/晦日
247
247
 
248
248
  [Notes, "label:[三宝吉=]", 'position:上段 上段 上段 上段'], # 干支 節月(宣明暦以前)/暦月(貞享暦以降)
249
- [Notes, "label:[神吉=ja:%E7%A5%9E%E5%90%89%E6%97%A5#.E7.A5.9E.E5.90.89.E6.97.A5]",
249
+ [Notes, "label:[神吉=ja:%%<暦注下段>#%.<神日>]",
250
250
  'position:上段 上段 中段 中段上', 'suffix:日'], # 干支 節月
251
251
  [Notes, "label:[雑事吉=]", 'position:雑事吉'], # 干支 節月(宣明暦以前)/暦月(貞享暦以降)
252
252
  [Notes, "label:[小字注=]", 'position:下段小字 下段小字 下段小字 下段小字'], # 干支 節月(宣明暦以前)/暦月(貞享暦以降)
@@ -378,7 +378,7 @@ class When::CalendarTypes::CalendarNote
378
378
  root = When.Resource('_co:CommonResidue')
379
379
 
380
380
  # 干支
381
- residue = dates.m_date.most_significant_coordinate-4
381
+ residue = dates.o_date.most_significant_coordinate-4
382
382
  notes_hash['干支'] = root['干支'][residue % 60]
383
383
  notes_hash['干'] = root['干' ][residue % 10]
384
384
  notes_hash['支'] = root['支' ][residue % 12]
@@ -401,7 +401,7 @@ class When::CalendarTypes::CalendarNote
401
401
  root = When.Resource('_co:CommonResidue')
402
402
 
403
403
  # 干支
404
- residue = dates.m_date.most_significant_coordinate*12+(dates.m_date.cal_date[1] * 1)+13
404
+ residue = dates.o_date.most_significant_coordinate*12+(dates.m_date.cal_date[1] * 1)+13
405
405
  notes_hash['干支'] = root['干支'][residue % 60]
406
406
  notes_hash['干'] = root['干' ][residue % 10]
407
407
  notes_hash['支'] = root['支' ][residue % 12]
@@ -674,7 +674,7 @@ class When::CalendarTypes::CalendarNote
674
674
  notes['赤舌' ] ||= d0 == (m * 5 - 3) % 6 + 1 ? '赤舌' : nil
675
675
  notes['赤口' ] ||= d0 == (m * 7 - 4) % 8 + 1 ? '赤口' : nil
676
676
  notes['不成就'] ||= d0 % 8 == [6,3,2,1,4,5][m % 6] || misoka ? '不成就' : nil
677
- notes['六曜' ] ||= Rokuyo[(m + d0) % 6] if dates.year >= 1873 # 明治改暦以降
677
+ notes['六曜' ] ||= Rokuyo[(m + d0) % 6] if dates.year >= 1873 # 明治改暦以降
678
678
  notes
679
679
  end
680
680
  end
@@ -158,7 +158,7 @@ module When
158
158
  'origin_of_MSC' => 1555-512,
159
159
  'indices' => [
160
160
  When::Coordinates::Index.new({:unit =>12, :trunk=>When.Resource('_m:JavaneseTerms::IslamicMonth::*')}),
161
- When::Coordinates::Index.new
161
+ When::Coordinates::DefaultDayIndex
162
162
  ],
163
163
  'rule_table' => {
164
164
  'T' => {'Rule' =>[354, 355, 354, 354, 355, 354, 354, 355]*15, 'Days' => (354*8+3)*15-1},
@@ -176,7 +176,7 @@ module When
176
176
  'origin_of_MSC' => 1675-512,
177
177
  'indices' => [
178
178
  When::Coordinates::Index.new({:unit =>12, :trunk=>When.Resource('_m:JavaneseTerms::IslamicMonth::*')}),
179
- When::Coordinates::Index.new
179
+ When::Coordinates::DefaultDayIndex
180
180
  ],
181
181
  'rule_table' => {
182
182
  'T' => {'Rule' =>[354, 355, 354, 355, 354, 354, 354, 355]*15, 'Days' => (354*8+3)*15-1},
@@ -194,7 +194,7 @@ module When
194
194
  'origin_of_MSC' => 1747-512,
195
195
  'indices' => [
196
196
  When::Coordinates::Index.new({:unit =>12, :trunk=>When.Resource('_m:JavaneseTerms::IslamicMonth::*')}),
197
- When::Coordinates::Index.new
197
+ When::Coordinates::DefaultDayIndex
198
198
  ],
199
199
  'rule_table' => {
200
200
  'T' => {'Rule' =>[354, 355, 354, 355, 'D', 354, 354, 355]*15, 'Days' => (354*8+3)*15-1},
@@ -214,7 +214,7 @@ module When
214
214
  'origin_of_MSC' => -1854,
215
215
  'indices' => [
216
216
  Coordinates::Index.new({:unit =>12, :trunk=>When.Resource('_m:JavaneseTerms::HinduMonth::*'), :shift=>8}),
217
- Coordinates::Index.new
217
+ Coordinates::DefaultDayIndex
218
218
  ],
219
219
  'rule_table' => {
220
220
  'T' => {'Rule' =>['LC', 'SC', 'SC', 'SC']},
@@ -21,7 +21,7 @@ module When
21
21
  ],
22
22
 
23
23
  [self,
24
- "names:[Month, 月=ja:%E6%9C%88_(%E6%9A%A6)]",
24
+ "names:[Month, 月=ja:%%<月_()>]",
25
25
  "[Tishrei, ティシュリー=]",
26
26
  "[Cheshvan, マルヘシュバン=]",
27
27
  "[Kislev, キスレーヴ=]",
@@ -84,7 +84,7 @@ module When
84
84
  Coordinates::Index.new({:branch=>{-1=>When.Resource('_m:JewishTerms::IntercalaryMonth::*')[0],
85
85
  1=>When.Resource('_m:JewishTerms::IntercalaryMonth::*')[1]},
86
86
  :trunk=>m17n('[::_m:JewishTerms::Month::*]')}),
87
- Coordinates::Index.new
87
+ Coordinates::DefaultDayIndex
88
88
  ]
89
89
 
90
90
  # Month & Day Arrangement
@@ -30,237 +30,237 @@ module When
30
30
  Korean = [self, [
31
31
  "namespace:[ja=http://ja.wikipedia.org/wiki/, en=http://en.wikipedia.org/wiki/]",
32
32
  "locale:[=ja:, en=en:, alias]",
33
- "area:[朝鮮,Korea]",
33
+ "area:[朝鮮=ja:%%<元号>#%.<朝鮮半島>,Korea=en:Regnal_year#Korean]",
34
34
  [self,
35
35
  "period:[高句麗]",
36
- ["[東明王]1", "[::_m:EpochEvents::Foundation]", "name=[東明王];-36^Chinese_103"],
37
- ["[瑠璃王]1", "[::_m:EpochEvents::Accession]", "name=[瑠璃王];-18"],
38
- ["[大武神王]1", "[::_m:EpochEvents::Accession]", "name=[大武神王];018"],
39
- ["[閔中王]1", "[::_m:EpochEvents::Accession]", "name=[閔中王];044"],
40
- ["[慕本王]1", "[::_m:EpochEvents::Accession]", "name=[慕本王];048"],
41
- ["[太祖王]1", "[::_m:EpochEvents::Accession]", "name=[太祖王];053"],
42
- ["[次大王]1", "[::_m:EpochEvents::Accession]", "name=[次大王];146"],
43
- ["[新大王]1", "[::_m:EpochEvents::Accession]", "name=[新大王];165"],
44
- ["[故国川王]1", "[::_m:EpochEvents::Accession]", "name=[故国川王];179"],
45
- ["[山上王]1", "[::_m:EpochEvents::Accession]", "name=[山上王];197"], # 朝鮮史ではこれ以降を実在とする
46
- ["[東川王]1", "[::_m:EpochEvents::Accession]", "name=[東川王];227", "239^Chinese0239", ""],
47
- ["[中川王]1", "[::_m:EpochEvents::Accession]", "name=[中川王];248"],
48
- ["[西川王]1", "[::_m:EpochEvents::Accession]", "name=[西川王];270"],
49
- ["[烽上王]1", "[::_m:EpochEvents::Accession]", "name=[烽上王];292"],
50
- ["[美川王]1", "[::_m:EpochEvents::Accession]", "name=[美川王];300"],
51
- ["[故国原王]1", "[::_m:EpochEvents::Accession]", "name=[故国原王];331"],
52
- ["[小獣林王]1", "[::_m:EpochEvents::Accession]", "name=[小獣林王];371"],
53
- ["[故国壌王]1", "[::_m:EpochEvents::Accession]", "name=[故国壌王];384"], # 朝鮮史では末年に?
54
- ["[永楽]1", "[::_m:EpochEvents::Accession]", "name=[広開土];391"], # コンサイスでは翌年が元年
55
- ["[長寿王]1", "[::_m:EpochEvents::Accession]", "name=[長寿王];413.01.01"], # 朝鮮史では元年に?
56
- ["[延寿]1", "", "451^Chinese0445"], # こよみ読み解き事典による
57
- ["[文咨王]1", "[::_m:EpochEvents::Accession]", "name=[文咨王];492.01.01"],
58
- ["[安臧王]1", "[::_m:EpochEvents::Accession]", "name=[安臧王];519"],
59
- ["[安原王]1", "[::_m:EpochEvents::Accession]", "name=[安原王];531"],
60
- ["[陽原王]1", "[::_m:EpochEvents::Accession]", "name=[陽原王];545"],
61
- ["[平原王]1", "[::_m:EpochEvents::Accession]", "name=[平原王];559"],
62
- ["[嬰陽王]1", "[::_m:EpochEvents::Accession]", "name=[嬰陽王];590^Chinese0523"],
63
- ["[栄留王]1", "[::_m:EpochEvents::Accession]", "name=[栄留王];618"],
64
- ["[宝臧王]1", "[::_m:EpochEvents::Accession]", "name=[宝臧王];642", "668.09.12="], # 資治通鑑による、癸巳滅亡
36
+ ["[東明王]1", "@F", "name=[東明王];-36^Chinese_103"],
37
+ ["[瑠璃王]1", "@A", "name=[瑠璃王];-18"],
38
+ ["[大武神王]1", "@A", "name=[大武神王];018"],
39
+ ["[閔中王]1", "@A", "name=[閔中王];044"],
40
+ ["[慕本王]1", "@A", "name=[慕本王];048"],
41
+ ["[太祖王]1", "@A", "name=[太祖王];053"],
42
+ ["[次大王]1", "@A", "name=[次大王];146"],
43
+ ["[新大王]1", "@A", "name=[新大王];165"],
44
+ ["[故国川王]1", "@A", "name=[故国川王];179"],
45
+ ["[山上王]1", "@A", "name=[山上王];197"], # 朝鮮史ではこれ以降を実在とする
46
+ ["[東川王]1", "@A", "name=[東川王];227", "239^Chinese0239", ""],
47
+ ["[中川王]1", "@A", "name=[中川王];248"],
48
+ ["[西川王]1", "@A", "name=[西川王];270"],
49
+ ["[烽上王]1", "@A", "name=[烽上王];292"],
50
+ ["[美川王]1", "@A", "name=[美川王];300"],
51
+ ["[故国原王]1", "@A", "name=[故国原王];331"],
52
+ ["[小獣林王]1", "@A", "name=[小獣林王];371"],
53
+ ["[故国壌王]1", "@A", "name=[故国壌王];384"], # 朝鮮史では末年に?
54
+ ["[永楽]1", "@A", "name=[広開土];391"], # コンサイスでは翌年が元年
55
+ ["[長寿王]1", "@A", "name=[長寿王];413.01.01"], # 朝鮮史では元年に?
56
+ ["[延寿]1", "", "451^Chinese0445"], # こよみ読み解き事典による
57
+ ["[文咨王]1", "@A", "name=[文咨王];492.01.01"],
58
+ ["[安臧王]1", "@A", "name=[安臧王];519"],
59
+ ["[安原王]1", "@A", "name=[安原王];531"],
60
+ ["[陽原王]1", "@A", "name=[陽原王];545"],
61
+ ["[平原王]1", "@A", "name=[平原王];559"],
62
+ ["[嬰陽王]1", "@A", "name=[嬰陽王];590^Chinese0523"],
63
+ ["[栄留王]1", "@A", "name=[栄留王];618"],
64
+ ["[宝臧王]1", "@A", "name=[宝臧王];642", "668.09.12="], # 資治通鑑による、癸巳滅亡
65
65
  ],
66
66
  [self,
67
67
  "period:[百済]",
68
- ["[温祚王]1", "[::_m:EpochEvents::Foundation]", "name=[温祚王];-17^Chinese_103"],
69
- ["[多婁王]1", "[::_m:EpochEvents::Accession]", "name=[多婁王];028"],
70
- ["[己婁王]1", "[::_m:EpochEvents::Accession]", "name=[己婁王];077"],
71
- ["[蓋婁王]1", "[::_m:EpochEvents::Accession]", "name=[蓋婁王];128"], # 朝鮮史では127が末年
72
- ["[肖古王]1", "[::_m:EpochEvents::Accession]", "name=[肖古王];166"],
73
- ["[仇首王]1", "[::_m:EpochEvents::Accession]", "name=[仇首王];214"],
74
- ["[沙伴王]1", "[::_m:EpochEvents::Accession]", "name=[沙伴王];234"],
75
- ["[古爾王]1", "[::_m:EpochEvents::Accession]", "name=[古爾王];234", "239^Chinese0239", ""],
76
- ["[責稽王]1", "[::_m:EpochEvents::Accession]", "name=[責稽王];286"],
77
- ["[汾西王]1", "[::_m:EpochEvents::Accession]", "name=[汾西王];298"],
78
- ["[比流王]1", "[::_m:EpochEvents::Accession]", "name=[比流王];304"], # 朝鮮史ではこれ以後を実在とする
79
- ["[契王]1", "[::_m:EpochEvents::Accession]", "name=[契王];344"],
80
- ["[近肖古王]1", "[::_m:EpochEvents::Accession]", "name=[近肖古王];346"],
81
- ["[近仇首王]1", "[::_m:EpochEvents::Accession]", "name=[近仇首王];375"],
82
- ["[枕流王]1", "[::_m:EpochEvents::Accession]", "name=[枕流王];384"],
83
- ["[辰斯王]1", "[::_m:EpochEvents::Accession]", "name=[辰斯王];385"],
84
- ["[阿莘王]1", "[::_m:EpochEvents::Accession]", "name=[阿莘王];392"],
85
- ["[腆支王]1", "[::_m:EpochEvents::Accession]", "name=[腆支王];405"],
86
- ["[久爾辛王]1", "[::_m:EpochEvents::Accession]", "name=[久爾辛王];420"],
87
- ["[毗有王]1", "[::_m:EpochEvents::Accession]", "name=[毗有王];427", "451^Chinese0445", ""],
88
- ["[蓋鹵王]1", "[::_m:EpochEvents::Accession]", "name=[蓋鹵王];455"],
89
- ["[文周王]1", "[::_m:EpochEvents::Accession]", "name=[文周王];475"],
90
- ["[三斤王]1", "[::_m:EpochEvents::Accession]", "name=[三斤王];477"], # 朝鮮史では末年に?
91
- ["[東城王]1", "[::_m:EpochEvents::Accession]", "name=[東城王];479"],
92
- ["[武寧王]1", "[::_m:EpochEvents::Accession]", "name=[武寧王];501"],
93
- ["[聖王]1", "[::_m:EpochEvents::Accession]", "name=[聖王];523.05.07"], # 武寧王墓誌による
94
- ["[威徳王]1", "[::_m:EpochEvents::Accession]", "name=[威徳王];554", "590^Chinese0523", ""],
95
- ["[恵王]1", "[::_m:EpochEvents::Accession]", "name=[恵王];598"],
96
- ["[法王]1", "[::_m:EpochEvents::Accession]", "name=[法王];599"],
97
- ["[武王]1", "[::_m:EpochEvents::Accession]", "name=[武王];600"],
98
- ["[義慈王]1", "[::_m:EpochEvents::Accession]", "name=[義慈王];641", "660.08="] # 資治通鑑による
68
+ ["[温祚王]1", "@F", "name=[温祚王];-17^Chinese_103"],
69
+ ["[多婁王]1", "@A", "name=[多婁王];028"],
70
+ ["[己婁王]1", "@A", "name=[己婁王];077"],
71
+ ["[蓋婁王]1", "@A", "name=[蓋婁王];128"], # 朝鮮史では127が末年
72
+ ["[肖古王]1", "@A", "name=[肖古王];166"],
73
+ ["[仇首王]1", "@A", "name=[仇首王];214"],
74
+ ["[沙伴王]1", "@A", "name=[沙伴王];234"],
75
+ ["[古爾王]1", "@A", "name=[古爾王];234", "239^Chinese0239", ""],
76
+ ["[責稽王]1", "@A", "name=[責稽王];286"],
77
+ ["[汾西王]1", "@A", "name=[汾西王];298"],
78
+ ["[比流王]1", "@A", "name=[比流王];304"], # 朝鮮史ではこれ以後を実在とする
79
+ ["[契王]1", "@A", "name=[契王];344"],
80
+ ["[近肖古王]1", "@A", "name=[近肖古王];346"],
81
+ ["[近仇首王]1", "@A", "name=[近仇首王];375"],
82
+ ["[枕流王]1", "@A", "name=[枕流王];384"],
83
+ ["[辰斯王]1", "@A", "name=[辰斯王];385"],
84
+ ["[阿莘王]1", "@A", "name=[阿莘王];392"],
85
+ ["[腆支王]1", "@A", "name=[腆支王];405"],
86
+ ["[久爾辛王]1", "@A", "name=[久爾辛王];420"],
87
+ ["[毗有王]1", "@A", "name=[毗有王];427", "451^Chinese0445", ""],
88
+ ["[蓋鹵王]1", "@A", "name=[蓋鹵王];455"],
89
+ ["[文周王]1", "@A", "name=[文周王];475"],
90
+ ["[三斤王]1", "@A", "name=[三斤王];477"], # 朝鮮史では末年に?
91
+ ["[東城王]1", "@A", "name=[東城王];479"],
92
+ ["[武寧王]1", "@A", "name=[武寧王];501"],
93
+ ["[聖王]1", "@A", "name=[聖王];523.05.07"], # 武寧王墓誌による
94
+ ["[威徳王]1", "@A", "name=[威徳王];554", "590^Chinese0523", ""],
95
+ ["[恵王]1", "@A", "name=[恵王];598"],
96
+ ["[法王]1", "@A", "name=[法王];599"],
97
+ ["[武王]1", "@A", "name=[武王];600"],
98
+ ["[義慈王]1", "@A", "name=[義慈王];641", "660.08="] # 資治通鑑による
99
99
  ],
100
100
  [self,
101
101
  "period:[新羅]",
102
- ["[赫居世]1", "[::_m:EpochEvents::Foundation]", "name=[赫居世];-56^^Chinese_103"],
103
- ["[南解王]1", "[::_m:EpochEvents::Accession]", "name=[南解王];004"],
104
- ["[儒理王]1", "[::_m:EpochEvents::Accession]", "name=[儒理王];024"],
105
- ["[脱解王]1", "[::_m:EpochEvents::Accession]", "name=[脱解王];057"],
106
- ["[婆娑王]1", "[::_m:EpochEvents::Accession]", "name=[婆娑王];080"],
107
- ["[祇摩王]1", "[::_m:EpochEvents::Accession]", "name=[祇摩王];112"],
108
- ["[逸聖王]1", "[::_m:EpochEvents::Accession]", "name=[逸聖王];134"],
109
- ["[阿達羅王]1", "[::_m:EpochEvents::Accession]", "name=[阿達羅王];154"],
110
- ["[伐休王]1", "[::_m:EpochEvents::Accession]", "name=[伐休王];184"],
111
- ["[奈解王]1", "[::_m:EpochEvents::Accession]", "name=[奈解王];196"],
112
- ["[助賁王]1", "[::_m:EpochEvents::Accession]", "name=[助賁王];230", "239^Chinese0239", ""],
113
- ["[沾解王]1", "[::_m:EpochEvents::Accession]", "name=[沾解王];247"], # 朝鮮史では261が末年
114
- ["[味鄒王]1", "[::_m:EpochEvents::Accession]", "name=[味鄒王];262"],
115
- ["[儒礼王]1", "[::_m:EpochEvents::Accession]", "name=[儒礼王];284"],
116
- ["[基臨王]1", "[::_m:EpochEvents::Accession]", "name=[基臨王];298"],
117
- ["[訖解王]1", "[::_m:EpochEvents::Accession]", "name=[訖解王];310"], # コンサイスはこれ以前の在位を記さない
118
- ["[奈勿王]1", "[::_m:EpochEvents::Accession]", "name=[奈勿王];356"], # 朝鮮史ではこれ以後を実在とする
119
- ["[実聖王]1", "[::_m:EpochEvents::Accession]", "name=[実聖王];402"],
120
- ["[訥祇王]1", "[::_m:EpochEvents::Accession]", "name=[訥祇王];417", "451^Chinese0445", ""],
121
- ["[慈悲王]1", "[::_m:EpochEvents::Accession]", "name=[慈悲王];458"],
122
- ["[炤知王]1", "[::_m:EpochEvents::Accession]", "name=[炤知王];479"],
123
- ["[智証王]1", "[::_m:EpochEvents::Accession]", "name=[智証王];500"],
124
- ["[法興王]1", "[::_m:EpochEvents::Accession]", "name=[法興王];514"],
125
- ["[真興王]1", "[::_m:EpochEvents::Accession]", "name=[真興王];540"],
126
- ["[真智王]1", "[::_m:EpochEvents::Accession]", "name=[真智王];576"],
127
- ["[真平王]1", "[::_m:EpochEvents::Accession]", "name=[真平王];579", "590^Chinese0523", ""],
128
- ["[善徳女王]1", "[::_m:EpochEvents::Accession]", "name=[善徳女王];632"],
129
- ["[真徳女王]1", "[::_m:EpochEvents::Accession]", "name=[真徳女王];647"],
130
- ["[武烈王]1", "[::_m:EpochEvents::Accession]", "name=[武烈王];654"],
131
- ["[文武王]1", "[::_m:EpochEvents::Accession]", "name=[文武王];661"],
132
- ["[神文王]1", "[::_m:EpochEvents::Accession]", "name=[神文王];681"],
133
- ["[孝昭王]1", "[::_m:EpochEvents::Accession]", "name=[孝昭王];692"],
134
- ["[聖徳王]1", "[::_m:EpochEvents::Accession]", "name=[聖徳王];702"],
135
- ["[孝成王]1", "[::_m:EpochEvents::Accession]", "name=[孝成王];737"],
136
- ["[景徳王]1", "[::_m:EpochEvents::Accession]", "name=[景徳王];742"],
137
- ["[恵恭王]1", "[::_m:EpochEvents::Accession]", "name=[恵恭王];765"],
138
- ["[宣徳王]1", "[::_m:EpochEvents::Accession]", "name=[宣徳王];780"],
139
- ["[元聖王]1", "[::_m:EpochEvents::Accession]", "name=[元聖王];785"],
140
- ["[昭聖王]1", "[::_m:EpochEvents::Accession]", "name=[昭聖王];799.01.01"],
141
- ["[哀荘王]1", "[::_m:EpochEvents::Accession]", "name=[哀荘王];800"],
142
- ["[憲徳王]1", "[::_m:EpochEvents::Accession]", "name=[憲徳王];809"],
143
- ["[興徳王]1", "[::_m:EpochEvents::Accession]", "name=[興徳王];826"],
144
- ["[僖康王]1", "[::_m:EpochEvents::Accession]", "name=[僖康王];836"],
145
- ["[閔哀王]1", "[::_m:EpochEvents::Accession]", "name=[閔哀王];838"],
146
- ["[神武王]1", "[::_m:EpochEvents::Accession]", "name=[神武王];839"],
147
- ["[文聖王]1", "[::_m:EpochEvents::Accession]", "name=[文聖王];839"],
148
- ["[憲安王]1", "[::_m:EpochEvents::Accession]", "name=[憲安王];857"],
149
- ["[景文王]1", "[::_m:EpochEvents::Accession]", "name=[景文王];861"],
150
- ["[憲康王]1", "[::_m:EpochEvents::Accession]", "name=[憲康王];875"],
151
- ["[定康王]1", "[::_m:EpochEvents::Accession]", "name=[定康王];886"],
152
- ["[真聖女王]1", "[::_m:EpochEvents::Accession]", "name=[真聖女王];887^Chinese::宣明暦"], # 東洋史辞典のみ1年遅
153
- ["[孝恭王]1", "[::_m:EpochEvents::Accession]", "name=[孝恭王];897"], # 〃
154
- ["[神徳王]1", "[::_m:EpochEvents::Accession]", "name=[神徳王];912"], # 〃
155
- ["[景明王]1", "[::_m:EpochEvents::Accession]", "name=[景明王];917"],
156
- ["[景哀王]1", "[::_m:EpochEvents::Accession]", "name=[景哀王];924"],
157
- ["[敬順王]1", "[::_m:EpochEvents::Accession]", "name=[敬順王];927", "935="],
102
+ ["[赫居世]1", "@F", "name=[赫居世];-56^^Chinese_103"],
103
+ ["[南解王]1", "@A", "name=[南解王];004"],
104
+ ["[儒理王]1", "@A", "name=[儒理王];024"],
105
+ ["[脱解王]1", "@A", "name=[脱解王];057"],
106
+ ["[婆娑王]1", "@A", "name=[婆娑王];080"],
107
+ ["[祇摩王]1", "@A", "name=[祇摩王];112"],
108
+ ["[逸聖王]1", "@A", "name=[逸聖王];134"],
109
+ ["[阿達羅王]1", "@A", "name=[阿達羅王];154"],
110
+ ["[伐休王]1", "@A", "name=[伐休王];184"],
111
+ ["[奈解王]1", "@A", "name=[奈解王];196"],
112
+ ["[助賁王]1", "@A", "name=[助賁王];230", "239^Chinese0239", ""],
113
+ ["[沾解王]1", "@A", "name=[沾解王];247"], # 朝鮮史では261が末年
114
+ ["[味鄒王]1", "@A", "name=[味鄒王];262"],
115
+ ["[儒礼王]1", "@A", "name=[儒礼王];284"],
116
+ ["[基臨王]1", "@A", "name=[基臨王];298"],
117
+ ["[訖解王]1", "@A", "name=[訖解王];310"], # コンサイスはこれ以前の在位を記さない
118
+ ["[奈勿王]1", "@A", "name=[奈勿王];356"], # 朝鮮史ではこれ以後を実在とする
119
+ ["[実聖王]1", "@A", "name=[実聖王];402"],
120
+ ["[訥祇王]1", "@A", "name=[訥祇王];417", "451^Chinese0445", ""],
121
+ ["[慈悲王]1", "@A", "name=[慈悲王];458"],
122
+ ["[炤知王]1", "@A", "name=[炤知王];479"],
123
+ ["[智証王]1", "@A", "name=[智証王];500"],
124
+ ["[法興王]1", "@A", "name=[法興王];514"],
125
+ ["[真興王]1", "@A", "name=[真興王];540"],
126
+ ["[真智王]1", "@A", "name=[真智王];576"],
127
+ ["[真平王]1", "@A", "name=[真平王];579", "590^Chinese0523", ""],
128
+ ["[善徳女王]1", "@A", "name=[善徳女王];632"],
129
+ ["[真徳女王]1", "@A", "name=[真徳女王];647"],
130
+ ["[武烈王]1", "@A", "name=[武烈王];654"],
131
+ ["[文武王]1", "@A", "name=[文武王];661"],
132
+ ["[神文王]1", "@A", "name=[神文王];681"],
133
+ ["[孝昭王]1", "@A", "name=[孝昭王];692"],
134
+ ["[聖徳王]1", "@A", "name=[聖徳王];702"],
135
+ ["[孝成王]1", "@A", "name=[孝成王];737"],
136
+ ["[景徳王]1", "@A", "name=[景徳王];742"],
137
+ ["[恵恭王]1", "@A", "name=[恵恭王];765"],
138
+ ["[宣徳王]1", "@A", "name=[宣徳王];780"],
139
+ ["[元聖王]1", "@A", "name=[元聖王];785"],
140
+ ["[昭聖王]1", "@A", "name=[昭聖王];799.01.01"],
141
+ ["[哀荘王]1", "@A", "name=[哀荘王];800"],
142
+ ["[憲徳王]1", "@A", "name=[憲徳王];809"],
143
+ ["[興徳王]1", "@A", "name=[興徳王];826"],
144
+ ["[僖康王]1", "@A", "name=[僖康王];836"],
145
+ ["[閔哀王]1", "@A", "name=[閔哀王];838"],
146
+ ["[神武王]1", "@A", "name=[神武王];839"],
147
+ ["[文聖王]1", "@A", "name=[文聖王];839"],
148
+ ["[憲安王]1", "@A", "name=[憲安王];857"],
149
+ ["[景文王]1", "@A", "name=[景文王];861"],
150
+ ["[憲康王]1", "@A", "name=[憲康王];875"],
151
+ ["[定康王]1", "@A", "name=[定康王];886"],
152
+ ["[真聖女王]1", "@A", "name=[真聖女王];887^Chinese::宣明暦"], # 東洋史辞典のみ1年遅
153
+ ["[孝恭王]1", "@A", "name=[孝恭王];897"], # 〃
154
+ ["[神徳王]1", "@A", "name=[神徳王];912"], # 〃
155
+ ["[景明王]1", "@A", "name=[景明王];917"],
156
+ ["[景哀王]1", "@A", "name=[景哀王];924"],
157
+ ["[敬順王]1", "@A", "name=[敬順王];927", "935="],
158
158
  [self,
159
159
  "period:[(年号)]",
160
- ["[建元]1", "", "name=[法興王];536^Chinese0445"],
161
- ["[開国]1", "", "name=[真興王];551"],
162
- ["[太昌,alias:大昌]1", "", "568"],
163
- ["[鴻済]1", "", "572"],
164
- ["[建福]1", "", "name=[真平王];584", "590^Chinese0523", ""],
165
- ["[仁平]1", "", "name=[善徳女王];634"],
166
- ["[太和]1", "[::_m:EpochEvents::Accession]", "name=[真徳女王];647", "649="]
160
+ ["[建元]1", "", "name=[法興王];536^Chinese0445"],
161
+ ["[開国]1", "", "name=[真興王];551"],
162
+ ["[太昌,alias:大昌]1", "", "568"],
163
+ ["[鴻済]1", "", "572"],
164
+ ["[建福]1", "", "name=[真平王];584", "590^Chinese0523", ""],
165
+ ["[仁平]1", "", "name=[善徳女王];634"],
166
+ ["[太和]1", "@A", "name=[真徳女王];647", "649="]
167
167
  ],
168
168
  [self,
169
- "period:[長安]", # 1年で滅亡したと仮定
170
- ["[慶雲]1", "[::_m:EpochEvents::Foundation]", "name=[金憲昌];822^^Chinese0523", "822="]
169
+ "period:[長安]", # 1年で滅亡したと仮定
170
+ ["[慶雲]1", "@F", "name=[金憲昌];822^^Chinese0523", "822="]
171
171
  ]
172
172
  ],
173
173
  [self,
174
- "period:[後百済]", # 三国遺事による
175
- ["[甄萱]1", "[::_m:EpochEvents::Foundation]", "name=[甄萱];900^Chinese::宣明暦", "936.09.08="]
174
+ "period:[後百済]", # 三国遺事による
175
+ ["[甄萱]1", "@F", "name=[甄萱];900^Chinese::宣明暦", "936.09.08="]
176
176
  ],
177
177
  [self,
178
178
  "period:[後高句麗]",
179
- ["[弓裔]1", "[::_m:EpochEvents::Foundation]", "name=[弓裔];901^Chinese::宣明暦"],
180
- ["[摩震]1", "[::_m:EpochEvents::Accession]", "name=[武泰];904"],
181
- ["[聖冊]1", "", "905"],
182
- ["[泰封]1", "[::_m:EpochEvents::Accession]", "name=[水徳万歳];911"],
183
- ["[政開]1", "", "914", "918.06"]
179
+ ["[弓裔]1", "@F", "name=[弓裔];901^Chinese::宣明暦"],
180
+ ["[摩震]1", "@A", "name=[武泰];904"],
181
+ ["[聖冊]1", "", "905"],
182
+ ["[泰封]1", "@A","name=[水徳万歳];911"],
183
+ ["[政開]1", "", "914", "918.06"]
184
184
  ],
185
185
  [self,
186
186
  "period:[高麗]",
187
- ["[天授]1", "[::_m:EpochEvents::Foundation]", "name=[太祖];918.06^Chinese::宣明暦"], # 三国遺事による
188
- ["[太祖]16", "", "933"],
189
- ["[恵宗]1", "[::_m:EpochEvents::Accession]", "name=[恵宗];944"],
190
- ["[定宗]1", "[::_m:EpochEvents::Accession]", "name=[定宗];946"],
191
- ["[光徳]1", "[::_m:EpochEvents::Accession]", "name=[光宗];950"],
192
- ["[峻豊]1", "[::_m:EpochEvents::Accession]", "962.01.01"], # こよみ読み解き事典による
193
- ["[光宗]14", "[::_m:EpochEvents::Accession]", "963.01.01"],
194
- ["[景宗]1", "[::_m:EpochEvents::Accession]", "name=[景宗];976"],
195
- ["[成宗]1", "[::_m:EpochEvents::Accession]", "name=[成宗];982"],
196
- ["[穆宗]1", "[::_m:EpochEvents::Accession]", "name=[穆宗];998"],
197
- ["[顕宗]1", "[::_m:EpochEvents::Accession]", "name=[顕宗];1010"],
198
- ["[徳宗]1", "[::_m:EpochEvents::Accession]", "name=[徳宗];1032"],
199
- ["[靖宗]1", "[::_m:EpochEvents::Accession]", "name=[靖宗];1035"],
200
- ["[文宗]1", "[::_m:EpochEvents::Accession]", "name=[文宗];1047"],
201
- ["[順宗]1", "[::_m:EpochEvents::Accession]", "name=[順宗];1083"],
202
- ["[宣宗]1", "[::_m:EpochEvents::Accession]", "name=[宣宗];1084"],
203
- ["[献宗]1", "[::_m:EpochEvents::Accession]", "name=[献宗];1095"],
204
- ["[粛宗]1", "[::_m:EpochEvents::Accession]", "name=[粛宗];1096"],
205
- ["[睿宗]1", "[::_m:EpochEvents::Accession]", "name=[睿宗];1106"],
206
- ["[仁宗]1", "[::_m:EpochEvents::Accession]", "name=[仁宗];1123"],
207
- ["[毅宗]1", "[::_m:EpochEvents::Accession]", "name=[毅宗];1147"],
208
- ["[明宗]0", "[::_m:EpochEvents::Accession]", "name=[明宗];1170.08"], # 朝鮮史による
209
- ["[神宗]1", "[::_m:EpochEvents::Accession]", "name=[神宗];1198"],
210
- ["[熙宗]1", "[::_m:EpochEvents::Accession]", "name=[熙宗];1205"],
211
- ["[康宗]1", "[::_m:EpochEvents::Accession]", "name=[康宗];1212"],
212
- ["[高宗]1", "[::_m:EpochEvents::Accession]", "name=[高宗];1214"],
213
- ["[元宗]1", "[::_m:EpochEvents::Accession]", "name=[元宗];1260"],
214
- ["[忠烈王]1", "[::_m:EpochEvents::Accession]", "name=[忠烈王];1275"],
215
- ["[忠宣王]1", "[::_m:EpochEvents::Accession]", "name=[忠宣王];1298.01"], # 朝鮮史による
216
- ["[忠烈王・再]24","[::_m:EpochEvents::Accession]", "name=[忠烈王];1298.08"], # 〃
217
- ["[忠宣王・再]1","[::_m:EpochEvents::Accession]", "name=[忠宣王];1309^Chinese0939"],
218
- ["[忠粛王]1", "[::_m:EpochEvents::Accession]", "name=[忠粛王];1314"],
219
- ["[忠恵王]1", "[::_m:EpochEvents::Accession]", "name=[忠恵王];1331"],
220
- ["[忠粛王・再]1","[::_m:EpochEvents::Accession]", "name=[忠粛王];1332"],
221
- ["[忠恵王・再]1","[::_m:EpochEvents::Accession]", "name=[忠恵王];1340"],
222
- ["[忠穆王]1", "[::_m:EpochEvents::Accession]", "name=[忠穆王];1345"],
223
- ["[忠定王]1", "[::_m:EpochEvents::Accession]", "name=[忠定王];1349.01.01"],
224
- ["[恭愍王]1", "[::_m:EpochEvents::Accession]", "name=[恭愍王];1352"],
225
- ["[禑王]1", "[::_m:EpochEvents::Accession]", "name=[禑王];1375"],
226
- ["[昌王]1", "[::_m:EpochEvents::Accession]", "name=[昌王];1389"],
227
- ["[恭譲王]1", "[::_m:EpochEvents::Accession]", "name=[恭譲王];1390", "1392.07.17"] # コンサイスによる
187
+ ["[天授]1", "@F", "name=[太祖];918.06^Chinese::宣明暦"], # 三国遺事による
188
+ ["[太祖]16", "", "933"],
189
+ ["[恵宗]1", "@A", "name=[恵宗];944"],
190
+ ["[定宗]1", "@A", "name=[定宗];946"],
191
+ ["[光徳]1", "@A", "name=[光宗];950"],
192
+ ["[峻豊]1", "@A", "962.01.01"], # こよみ読み解き事典による
193
+ ["[光宗]14", "@A", "963.01.01"],
194
+ ["[景宗]1", "@A", "name=[景宗];976"],
195
+ ["[成宗]1", "@A", "name=[成宗];982"],
196
+ ["[穆宗]1", "@A", "name=[穆宗];998"],
197
+ ["[顕宗]1", "@A", "name=[顕宗];1010"],
198
+ ["[徳宗]1", "@A", "name=[徳宗];1032"],
199
+ ["[靖宗]1", "@A", "name=[靖宗];1035"],
200
+ ["[文宗]1", "@A", "name=[文宗];1047"],
201
+ ["[順宗]1", "@A", "name=[順宗];1083"],
202
+ ["[宣宗]1", "@A", "name=[宣宗];1084"],
203
+ ["[献宗]1", "@A", "name=[献宗];1095"],
204
+ ["[粛宗]1", "@A", "name=[粛宗];1096"],
205
+ ["[睿宗]1", "@A", "name=[睿宗];1106"],
206
+ ["[仁宗]1", "@A", "name=[仁宗];1123"],
207
+ ["[毅宗]1", "@A", "name=[毅宗];1147"],
208
+ ["[明宗]0", "@A", "name=[明宗];1170.08"], # 朝鮮史による
209
+ ["[神宗]1", "@A", "name=[神宗];1198"],
210
+ ["[熙宗]1", "@A", "name=[熙宗];1205"],
211
+ ["[康宗]1", "@A", "name=[康宗];1212"],
212
+ ["[高宗]1", "@A", "name=[高宗];1214"],
213
+ ["[元宗]1", "@A", "name=[元宗];1260"],
214
+ ["[忠烈王]1", "@A", "name=[忠烈王];1275"],
215
+ ["[忠宣王]1", "@A", "name=[忠宣王];1298.01"], # 朝鮮史による
216
+ ["[忠烈王・再]24","@A", "name=[忠烈王];1298.08"], # 〃
217
+ ["[忠宣王・再]1","@A", "name=[忠宣王];1309^Chinese0939"],
218
+ ["[忠粛王]1", "@A", "name=[忠粛王];1314"],
219
+ ["[忠恵王]1", "@A", "name=[忠恵王];1331"],
220
+ ["[忠粛王・再]1","@A", "name=[忠粛王];1332"],
221
+ ["[忠恵王・再]1","@A", "name=[忠恵王];1340"],
222
+ ["[忠穆王]1", "@A", "name=[忠穆王];1345"],
223
+ ["[忠定王]1", "@A", "name=[忠定王];1349.01.01"],
224
+ ["[恭愍王]1", "@A", "name=[恭愍王];1352"],
225
+ ["[禑王]1", "@A", "name=[禑王];1375"],
226
+ ["[昌王]1", "@A", "name=[昌王];1389"],
227
+ ["[恭譲王]1", "@A", "name=[恭譲王];1390", "1392.07.17"] # コンサイスによる
228
228
  ],
229
229
  [self,
230
230
  "period:[朝鮮]",
231
- ["[太祖]1.07.17","[::_m:EpochEvents::Foundation]", "name=[太祖];1392-07-17^Chinese0939"], # コンサイスによる
232
- ["[定宗]1", "[::_m:EpochEvents::Accession]", "name=[定宗];1399"],
233
- ["[太宗]1", "[::_m:EpochEvents::Accession]", "name=[太宗];1401"],
234
- ["[世宗]1", "[::_m:EpochEvents::Accession]", "name=[世宗];1419"],
235
- ["[文宗]1", "[::_m:EpochEvents::Accession]", "name=[文宗];1451"],
236
- ["[端宗]1", "[::_m:EpochEvents::Accession]", "name=[端宗];1453"],
237
- ["[世祖]1", "[::_m:EpochEvents::Accession]", "name=[世祖];1455"],
238
- ["[睿宗]1", "[::_m:EpochEvents::Accession]", "name=[睿宗];1469"],
239
- ["[成宗]1", "[::_m:EpochEvents::Accession]", "name=[成宗];1470"],
240
- ["[燕山君]1", "[::_m:EpochEvents::Accession]", "name=[燕山君];1495"],
241
- ["[中宗]1", "[::_m:EpochEvents::Accession]", "name=[中宗];1506"],
242
- ["[仁宗]1", "[::_m:EpochEvents::Accession]", "name=[仁宗];1545"],
243
- ["[明宗]1", "[::_m:EpochEvents::Accession]", "name=[明宗];1546"],
244
- ["[宣祖]1", "[::_m:EpochEvents::Accession]", "name=[宣祖];1568"],
245
- ["[光海君]8", "[::_m:EpochEvents::Accession]", "name=[光海君];1616"],
246
- ["[仁祖]1", "[::_m:EpochEvents::Accession]", "name=[仁祖];1623"],
247
- ["[孝宗]1", "[::_m:EpochEvents::Accession]", "name=[孝宗];1650", "1653^Chinese0939", ""],
248
- ["[顕宗]1", "[::_m:EpochEvents::Accession]", "name=[顕宗];1660"],
249
- ["[粛宗]1", "[::_m:EpochEvents::Accession]", "name=[粛宗];1675"],
250
- ["[景宗]1", "[::_m:EpochEvents::Accession]", "name=[景宗];1721"],
251
- ["[英祖]1", "[::_m:EpochEvents::Accession]", "name=[英祖];1725"], # コンサイスでは英宗
252
- ["[正祖]1", "[::_m:EpochEvents::Accession]", "name=[正祖];1777"],
253
- ["[純祖]1", "[::_m:EpochEvents::Accession]", "name=[純祖];1801"],
254
- ["[憲宗]1", "[::_m:EpochEvents::Accession]", "name=[憲宗];1835"],
255
- ["[哲宗]1", "[::_m:EpochEvents::Accession]", "name=[哲宗];1850"],
256
- ["[高宗]1", "[::_m:EpochEvents::Accession]", "name=[高宗];1864"],
257
- ["[建陽]1", "", "1896.01.01^Gregorian?note=ChineseNotes", # 朝鮮史による
258
- "1897.10.01"]
231
+ ["[太祖]1.07.17","@F", "name=[太祖];1392-07-17^Chinese0939"], # コンサイスによる
232
+ ["[定宗]1", "@A", "name=[定宗];1399"],
233
+ ["[太宗]1", "@A", "name=[太宗];1401"],
234
+ ["[世宗]1", "@A", "name=[世宗];1419"],
235
+ ["[文宗]1", "@A", "name=[文宗];1451"],
236
+ ["[端宗]1", "@A", "name=[端宗];1453"],
237
+ ["[世祖]1", "@A", "name=[世祖];1455"],
238
+ ["[睿宗]1", "@A", "name=[睿宗];1469"],
239
+ ["[成宗]1", "@A", "name=[成宗];1470"],
240
+ ["[燕山君]1", "@A", "name=[燕山君];1495"],
241
+ ["[中宗]1", "@A", "name=[中宗];1506"],
242
+ ["[仁宗]1", "@A", "name=[仁宗];1545"],
243
+ ["[明宗]1", "@A", "name=[明宗];1546"],
244
+ ["[宣祖]1", "@A", "name=[宣祖];1568"],
245
+ ["[光海君]8", "@A", "name=[光海君];1616"],
246
+ ["[仁祖]1", "@A", "name=[仁祖];1623"],
247
+ ["[孝宗]1", "@A", "name=[孝宗];1650", "1653^Chinese1645", ""],
248
+ ["[顕宗]1", "@A", "name=[顕宗];1660"],
249
+ ["[粛宗]1", "@A", "name=[粛宗];1675"],
250
+ ["[景宗]1", "@A", "name=[景宗];1721"],
251
+ ["[英祖]1", "@A", "name=[英祖];1725"], # コンサイスでは英宗
252
+ ["[正祖]1", "@A", "name=[正祖];1777"],
253
+ ["[純祖]1", "@A", "name=[純祖];1801"],
254
+ ["[憲宗]1", "@A", "name=[憲宗];1835"],
255
+ ["[哲宗]1", "@A", "name=[哲宗];1850"],
256
+ ["[高宗]1", "@A", "name=[高宗];1864"],
257
+ ["[建陽]1", "", "1896.01.01^Gregorian?note=ChineseNotes", # 朝鮮史による
258
+ "1897.10.01"]
259
259
  ],
260
260
  [self,
261
261
  "period:[大韓帝国]",
262
- ["[光武]1", "[::_m:EpochEvents::Foundation]", "name=[高宗];1897.10.01^Gregorian?note=ChineseNotes"],
263
- ["[隆熙]1", "[::_m:EpochEvents::Accession]", "name=[純宗];1907.07.19", "1910.08.22="]
262
+ ["[光武]1", "@F", "name=[高宗];1897.10.01^Gregorian?note=ChineseNotes"],
263
+ ["[隆熙]1", "@A", "name=[純宗];1907.07.19", "1910.08.22="]
264
264
  ]
265
265
  ]]
266
266
  end