zakuro 0.4.0 → 0.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +17 -1
- data/doc/operation/csv/month.csv +21 -0
- data/doc/operation/operation.xlsx +0 -0
- data/lib/zakuro/calculation/cycle/abstract_remainder.rb +0 -13
- data/lib/zakuro/operation/yaml/month.yaml +672 -0
- data/lib/zakuro/version/daien/cycle/remainder.rb +26 -0
- data/lib/zakuro/version/daien/stella/solar/average.rb +2 -2
- data/lib/zakuro/version/genka/const/number.rb +43 -0
- data/lib/zakuro/version/genka/const/remainder.rb +33 -0
- data/lib/zakuro/version/genka/cycle/remainder.rb +92 -0
- data/lib/zakuro/version/genka/cycle/solar_term.rb +34 -0
- data/lib/zakuro/version/genka/genka.rb +19 -2
- data/lib/zakuro/version/genka/monthly/lunar_phase.rb +95 -0
- data/lib/zakuro/version/genka/range/annual_range.rb +77 -0
- data/lib/zakuro/version/genka/stella/origin/first_term.rb +55 -0
- data/lib/zakuro/version/genka/stella/origin/january.rb +49 -0
- data/lib/zakuro/version/genka/stella/solar/average.rb +41 -0
- data/lib/zakuro/version/gihou/cycle/remainder.rb +26 -0
- data/lib/zakuro/version/gihou/stella/solar/average.rb +2 -2
- data/lib/zakuro/version/senmyou/cycle/remainder.rb +26 -0
- data/lib/zakuro/version/senmyou/stella/solar/average.rb +2 -2
- data/lib/zakuro/version/version_class_resolver.rb +4 -0
- data/lib/zakuro/version.rb +1 -1
- metadata +11 -2
|
@@ -1,4 +1,676 @@
|
|
|
1
1
|
---
|
|
2
|
+
- id: 49-1-1
|
|
3
|
+
relation_id: "-"
|
|
4
|
+
parent_id: "-"
|
|
5
|
+
page: '49'
|
|
6
|
+
number: '1'
|
|
7
|
+
japan_date: 欽明天皇 14年 5 大 壬戌 58.5997
|
|
8
|
+
western_date: 553-5-28
|
|
9
|
+
description: "-"
|
|
10
|
+
note: 改変なし（内容転記せず）
|
|
11
|
+
modified: 'false'
|
|
12
|
+
diffs:
|
|
13
|
+
month:
|
|
14
|
+
number:
|
|
15
|
+
calc: "-"
|
|
16
|
+
actual: "-"
|
|
17
|
+
leaped:
|
|
18
|
+
calc: "-"
|
|
19
|
+
actual: "-"
|
|
20
|
+
days:
|
|
21
|
+
calc: "-"
|
|
22
|
+
actual: "-"
|
|
23
|
+
solar_term:
|
|
24
|
+
calc:
|
|
25
|
+
index: "-"
|
|
26
|
+
to: "-"
|
|
27
|
+
zodiac_name: "-"
|
|
28
|
+
actual:
|
|
29
|
+
index: "-"
|
|
30
|
+
from: "-"
|
|
31
|
+
zodiac_name: "-"
|
|
32
|
+
days: "-"
|
|
33
|
+
days: "-"
|
|
34
|
+
- id: 54-1-1
|
|
35
|
+
relation_id: "-"
|
|
36
|
+
parent_id: "-"
|
|
37
|
+
page: '54'
|
|
38
|
+
number: '1'
|
|
39
|
+
japan_date: 欽明天皇 31年 閏4 小 甲申 20.0226
|
|
40
|
+
western_date: 570-5-21
|
|
41
|
+
description: "-"
|
|
42
|
+
note: 改変なし（内容転記せず）
|
|
43
|
+
modified: 'false'
|
|
44
|
+
diffs:
|
|
45
|
+
month:
|
|
46
|
+
number:
|
|
47
|
+
calc: "-"
|
|
48
|
+
actual: "-"
|
|
49
|
+
leaped:
|
|
50
|
+
calc: "-"
|
|
51
|
+
actual: "-"
|
|
52
|
+
days:
|
|
53
|
+
calc: "-"
|
|
54
|
+
actual: "-"
|
|
55
|
+
solar_term:
|
|
56
|
+
calc:
|
|
57
|
+
index: "-"
|
|
58
|
+
to: "-"
|
|
59
|
+
zodiac_name: "-"
|
|
60
|
+
actual:
|
|
61
|
+
index: "-"
|
|
62
|
+
from: "-"
|
|
63
|
+
zodiac_name: "-"
|
|
64
|
+
days: "-"
|
|
65
|
+
days: "-"
|
|
66
|
+
- id: 56-1-1
|
|
67
|
+
relation_id: "-"
|
|
68
|
+
parent_id: "-"
|
|
69
|
+
page: '56'
|
|
70
|
+
number: '1'
|
|
71
|
+
japan_date: 敏達天皇 4年 2 小 丙戌 22.3271
|
|
72
|
+
western_date: 575-2-26
|
|
73
|
+
description: "-"
|
|
74
|
+
note: 改変なし（内容転記せず）
|
|
75
|
+
modified: 'false'
|
|
76
|
+
diffs:
|
|
77
|
+
month:
|
|
78
|
+
number:
|
|
79
|
+
calc: "-"
|
|
80
|
+
actual: "-"
|
|
81
|
+
leaped:
|
|
82
|
+
calc: "-"
|
|
83
|
+
actual: "-"
|
|
84
|
+
days:
|
|
85
|
+
calc: "-"
|
|
86
|
+
actual: "-"
|
|
87
|
+
solar_term:
|
|
88
|
+
calc:
|
|
89
|
+
index: "-"
|
|
90
|
+
to: "-"
|
|
91
|
+
zodiac_name: "-"
|
|
92
|
+
actual:
|
|
93
|
+
index: "-"
|
|
94
|
+
from: "-"
|
|
95
|
+
zodiac_name: "-"
|
|
96
|
+
days: "-"
|
|
97
|
+
days: "-"
|
|
98
|
+
- id: 72-1-1
|
|
99
|
+
relation_id: "-"
|
|
100
|
+
parent_id: "-"
|
|
101
|
+
page: '72'
|
|
102
|
+
number: '1'
|
|
103
|
+
japan_date: 推古天皇 31年 1 大 丁丑 13.9641
|
|
104
|
+
western_date: 623-2-5
|
|
105
|
+
description: "-"
|
|
106
|
+
note: 改変なし（内容転記せず）
|
|
107
|
+
modified: 'false'
|
|
108
|
+
diffs:
|
|
109
|
+
month:
|
|
110
|
+
number:
|
|
111
|
+
calc: "-"
|
|
112
|
+
actual: "-"
|
|
113
|
+
leaped:
|
|
114
|
+
calc: "-"
|
|
115
|
+
actual: "-"
|
|
116
|
+
days:
|
|
117
|
+
calc: "-"
|
|
118
|
+
actual: "-"
|
|
119
|
+
solar_term:
|
|
120
|
+
calc:
|
|
121
|
+
index: "-"
|
|
122
|
+
to: "-"
|
|
123
|
+
zodiac_name: "-"
|
|
124
|
+
actual:
|
|
125
|
+
index: "-"
|
|
126
|
+
from: "-"
|
|
127
|
+
zodiac_name: "-"
|
|
128
|
+
days: "-"
|
|
129
|
+
days: "-"
|
|
130
|
+
- id: 72-1-2
|
|
131
|
+
relation_id: "-"
|
|
132
|
+
parent_id: "-"
|
|
133
|
+
page: '72'
|
|
134
|
+
number: '1'
|
|
135
|
+
japan_date: 推古天皇 32年 1 小 壬申 8.3311
|
|
136
|
+
western_date: 624-1-26
|
|
137
|
+
description: "-"
|
|
138
|
+
note: 改変なし（内容転記せず）
|
|
139
|
+
modified: 'false'
|
|
140
|
+
diffs:
|
|
141
|
+
month:
|
|
142
|
+
number:
|
|
143
|
+
calc: "-"
|
|
144
|
+
actual: "-"
|
|
145
|
+
leaped:
|
|
146
|
+
calc: "-"
|
|
147
|
+
actual: "-"
|
|
148
|
+
days:
|
|
149
|
+
calc: "-"
|
|
150
|
+
actual: "-"
|
|
151
|
+
solar_term:
|
|
152
|
+
calc:
|
|
153
|
+
index: "-"
|
|
154
|
+
to: "-"
|
|
155
|
+
zodiac_name: "-"
|
|
156
|
+
actual:
|
|
157
|
+
index: "-"
|
|
158
|
+
from: "-"
|
|
159
|
+
zodiac_name: "-"
|
|
160
|
+
days: "-"
|
|
161
|
+
days: "-"
|
|
162
|
+
- id: 74-1-1
|
|
163
|
+
relation_id: "-"
|
|
164
|
+
parent_id: "-"
|
|
165
|
+
page: '74'
|
|
166
|
+
number: '1'
|
|
167
|
+
japan_date: 推古天皇 36年 4 小 丁丑 13.4521
|
|
168
|
+
western_date: 628-5-9
|
|
169
|
+
description: "-"
|
|
170
|
+
note: 改変なし（内容転記せず）
|
|
171
|
+
modified: 'false'
|
|
172
|
+
diffs:
|
|
173
|
+
month:
|
|
174
|
+
number:
|
|
175
|
+
calc: "-"
|
|
176
|
+
actual: "-"
|
|
177
|
+
leaped:
|
|
178
|
+
calc: "-"
|
|
179
|
+
actual: "-"
|
|
180
|
+
days:
|
|
181
|
+
calc: "-"
|
|
182
|
+
actual: "-"
|
|
183
|
+
solar_term:
|
|
184
|
+
calc:
|
|
185
|
+
index: "-"
|
|
186
|
+
to: "-"
|
|
187
|
+
zodiac_name: "-"
|
|
188
|
+
actual:
|
|
189
|
+
index: "-"
|
|
190
|
+
from: "-"
|
|
191
|
+
zodiac_name: "-"
|
|
192
|
+
days: "-"
|
|
193
|
+
days: "-"
|
|
194
|
+
- id: 74-2-1
|
|
195
|
+
relation_id: "-"
|
|
196
|
+
parent_id: "-"
|
|
197
|
+
page: '74'
|
|
198
|
+
number: '2'
|
|
199
|
+
japan_date: 推古天皇 36年 9 小 乙巳 41.1051
|
|
200
|
+
western_date: 628-10-4
|
|
201
|
+
description: "-"
|
|
202
|
+
note: 改変なし（内容転記せず）
|
|
203
|
+
modified: 'false'
|
|
204
|
+
diffs:
|
|
205
|
+
month:
|
|
206
|
+
number:
|
|
207
|
+
calc: "-"
|
|
208
|
+
actual: "-"
|
|
209
|
+
leaped:
|
|
210
|
+
calc: "-"
|
|
211
|
+
actual: "-"
|
|
212
|
+
days:
|
|
213
|
+
calc: "-"
|
|
214
|
+
actual: "-"
|
|
215
|
+
solar_term:
|
|
216
|
+
calc:
|
|
217
|
+
index: "-"
|
|
218
|
+
to: "-"
|
|
219
|
+
zodiac_name: "-"
|
|
220
|
+
actual:
|
|
221
|
+
index: "-"
|
|
222
|
+
from: "-"
|
|
223
|
+
zodiac_name: "-"
|
|
224
|
+
days: "-"
|
|
225
|
+
days: "-"
|
|
226
|
+
- id: 81-1-1
|
|
227
|
+
relation_id: "-"
|
|
228
|
+
parent_id: "-"
|
|
229
|
+
page: '81'
|
|
230
|
+
number: '1'
|
|
231
|
+
japan_date: 大化 5年 4 小 乙亥 11.4043
|
|
232
|
+
western_date: 649-5-17
|
|
233
|
+
description: "-"
|
|
234
|
+
note: 改変なし（内容転記せず）
|
|
235
|
+
modified: 'false'
|
|
236
|
+
diffs:
|
|
237
|
+
month:
|
|
238
|
+
number:
|
|
239
|
+
calc: "-"
|
|
240
|
+
actual: "-"
|
|
241
|
+
leaped:
|
|
242
|
+
calc: "-"
|
|
243
|
+
actual: "-"
|
|
244
|
+
days:
|
|
245
|
+
calc: "-"
|
|
246
|
+
actual: "-"
|
|
247
|
+
solar_term:
|
|
248
|
+
calc:
|
|
249
|
+
index: "-"
|
|
250
|
+
to: "-"
|
|
251
|
+
zodiac_name: "-"
|
|
252
|
+
actual:
|
|
253
|
+
index: "-"
|
|
254
|
+
from: "-"
|
|
255
|
+
zodiac_name: "-"
|
|
256
|
+
days: "-"
|
|
257
|
+
days: "-"
|
|
258
|
+
- id: 81-2-1
|
|
259
|
+
relation_id: "-"
|
|
260
|
+
parent_id: "-"
|
|
261
|
+
page: '81'
|
|
262
|
+
number: '2'
|
|
263
|
+
japan_date: 大化 5年 5 大 甲辰 40.9348
|
|
264
|
+
western_date: 649-6-15
|
|
265
|
+
description: "-"
|
|
266
|
+
note: 改変なし（内容転記せず）
|
|
267
|
+
modified: 'false'
|
|
268
|
+
diffs:
|
|
269
|
+
month:
|
|
270
|
+
number:
|
|
271
|
+
calc: "-"
|
|
272
|
+
actual: "-"
|
|
273
|
+
leaped:
|
|
274
|
+
calc: "-"
|
|
275
|
+
actual: "-"
|
|
276
|
+
days:
|
|
277
|
+
calc: "-"
|
|
278
|
+
actual: "-"
|
|
279
|
+
solar_term:
|
|
280
|
+
calc:
|
|
281
|
+
index: "-"
|
|
282
|
+
to: "-"
|
|
283
|
+
zodiac_name: "-"
|
|
284
|
+
actual:
|
|
285
|
+
index: "-"
|
|
286
|
+
from: "-"
|
|
287
|
+
zodiac_name: "-"
|
|
288
|
+
days: "-"
|
|
289
|
+
days: "-"
|
|
290
|
+
- id: 95-1-0
|
|
291
|
+
relation_id: "-"
|
|
292
|
+
parent_id: 95-1-1
|
|
293
|
+
page: '95'
|
|
294
|
+
number: "-"
|
|
295
|
+
japan_date: 持統 6年 10 小 壬戌 58.8590
|
|
296
|
+
western_date: 692-11-14
|
|
297
|
+
description: "-"
|
|
298
|
+
note: "-"
|
|
299
|
+
modified: 'true'
|
|
300
|
+
diffs:
|
|
301
|
+
month:
|
|
302
|
+
number:
|
|
303
|
+
calc: "-"
|
|
304
|
+
actual: "-"
|
|
305
|
+
leaped:
|
|
306
|
+
calc: "-"
|
|
307
|
+
actual: "-"
|
|
308
|
+
days:
|
|
309
|
+
calc: 大
|
|
310
|
+
actual: 小
|
|
311
|
+
solar_term:
|
|
312
|
+
calc:
|
|
313
|
+
index: "-"
|
|
314
|
+
to: "-"
|
|
315
|
+
zodiac_name: "-"
|
|
316
|
+
actual:
|
|
317
|
+
index: "-"
|
|
318
|
+
from: "-"
|
|
319
|
+
zodiac_name: "-"
|
|
320
|
+
days: "-"
|
|
321
|
+
days: "-"
|
|
322
|
+
- id: 95-1-1
|
|
323
|
+
relation_id: "-"
|
|
324
|
+
parent_id: "-"
|
|
325
|
+
page: '95'
|
|
326
|
+
number: '1'
|
|
327
|
+
japan_date: 持統 6年 11 大 辛卯 28.3896
|
|
328
|
+
western_date: 692-12-14
|
|
329
|
+
description: 計算（元嘉暦による）では28壬辰となるが，書紀は11月辛卯朔，したがってユリウス暦は12月13日。
|
|
330
|
+
note: "-"
|
|
331
|
+
modified: 'true'
|
|
332
|
+
diffs:
|
|
333
|
+
month:
|
|
334
|
+
number:
|
|
335
|
+
calc: "-"
|
|
336
|
+
actual: "-"
|
|
337
|
+
leaped:
|
|
338
|
+
calc: "-"
|
|
339
|
+
actual: "-"
|
|
340
|
+
days:
|
|
341
|
+
calc: 小
|
|
342
|
+
actual: 大
|
|
343
|
+
solar_term:
|
|
344
|
+
calc:
|
|
345
|
+
index: "-"
|
|
346
|
+
to: "-"
|
|
347
|
+
zodiac_name: "-"
|
|
348
|
+
actual:
|
|
349
|
+
index: "-"
|
|
350
|
+
from: "-"
|
|
351
|
+
zodiac_name: "-"
|
|
352
|
+
days: "-"
|
|
353
|
+
days: "-1"
|
|
354
|
+
- id: 96-1-0
|
|
355
|
+
relation_id: "-"
|
|
356
|
+
parent_id: 96-1-1
|
|
357
|
+
page: '96'
|
|
358
|
+
number: "-"
|
|
359
|
+
japan_date: 持統 10年 11 大 己亥 35.3893
|
|
360
|
+
western_date: 696-11-30
|
|
361
|
+
description: "-"
|
|
362
|
+
note: "-"
|
|
363
|
+
modified: 'true'
|
|
364
|
+
diffs:
|
|
365
|
+
month:
|
|
366
|
+
number:
|
|
367
|
+
calc: "-"
|
|
368
|
+
actual: "-"
|
|
369
|
+
leaped:
|
|
370
|
+
calc: "-"
|
|
371
|
+
actual: "-"
|
|
372
|
+
days:
|
|
373
|
+
calc: 小
|
|
374
|
+
actual: 大
|
|
375
|
+
solar_term:
|
|
376
|
+
calc:
|
|
377
|
+
index: "-"
|
|
378
|
+
to: "-"
|
|
379
|
+
zodiac_name: "-"
|
|
380
|
+
actual:
|
|
381
|
+
index: "-"
|
|
382
|
+
from: "-"
|
|
383
|
+
zodiac_name: "-"
|
|
384
|
+
days: "-"
|
|
385
|
+
days: "-"
|
|
386
|
+
- id: 96-1-1
|
|
387
|
+
relation_id: "-"
|
|
388
|
+
parent_id: "-"
|
|
389
|
+
page: '96'
|
|
390
|
+
number: '1'
|
|
391
|
+
japan_date: 持統 10年 12 小 己巳 4.9189
|
|
392
|
+
western_date: 696-12-29
|
|
393
|
+
description: 元嘉暦では4戊辰となるが，書紀は12月己巳朔，したがってユリウス暦は12月30日。
|
|
394
|
+
note: "-"
|
|
395
|
+
modified: 'true'
|
|
396
|
+
diffs:
|
|
397
|
+
month:
|
|
398
|
+
number:
|
|
399
|
+
calc: "-"
|
|
400
|
+
actual: "-"
|
|
401
|
+
leaped:
|
|
402
|
+
calc: "-"
|
|
403
|
+
actual: "-"
|
|
404
|
+
days:
|
|
405
|
+
calc: 大
|
|
406
|
+
actual: 小
|
|
407
|
+
solar_term:
|
|
408
|
+
calc:
|
|
409
|
+
index: "-"
|
|
410
|
+
to: "-"
|
|
411
|
+
zodiac_name: "-"
|
|
412
|
+
actual:
|
|
413
|
+
index: "-"
|
|
414
|
+
from: "-"
|
|
415
|
+
zodiac_name: "-"
|
|
416
|
+
days: "-"
|
|
417
|
+
days: '1'
|
|
418
|
+
- id: 97-1-0
|
|
419
|
+
relation_id: "-"
|
|
420
|
+
parent_id: 97-1-1
|
|
421
|
+
page: '97'
|
|
422
|
+
number: "-"
|
|
423
|
+
japan_date: 文武 1年 3 小 丁酉 33.5106
|
|
424
|
+
western_date: 697-3-28
|
|
425
|
+
description: "-"
|
|
426
|
+
note: "-"
|
|
427
|
+
modified: 'true'
|
|
428
|
+
diffs:
|
|
429
|
+
month:
|
|
430
|
+
number:
|
|
431
|
+
calc: "-"
|
|
432
|
+
actual: "-"
|
|
433
|
+
leaped:
|
|
434
|
+
calc: "-"
|
|
435
|
+
actual: "-"
|
|
436
|
+
days:
|
|
437
|
+
calc: 大
|
|
438
|
+
actual: 小
|
|
439
|
+
solar_term:
|
|
440
|
+
calc:
|
|
441
|
+
index: "-"
|
|
442
|
+
to: "-"
|
|
443
|
+
zodiac_name: "-"
|
|
444
|
+
actual:
|
|
445
|
+
index: "-"
|
|
446
|
+
from: "-"
|
|
447
|
+
zodiac_name: "-"
|
|
448
|
+
days: "-"
|
|
449
|
+
days: "-"
|
|
450
|
+
- id: 97-1-1
|
|
451
|
+
relation_id: 97-0-1
|
|
452
|
+
parent_id: "-"
|
|
453
|
+
page: '97'
|
|
454
|
+
number: '1'
|
|
455
|
+
japan_date: 文武 1年 4 大 丙寅 3.0412
|
|
456
|
+
western_date: 697-4-27
|
|
457
|
+
description: 元嘉暦では3丁卯となるが，書紀は4月丙寅朔，したがって4月朔のユリウス暦は4月26日。
|
|
458
|
+
note: "-"
|
|
459
|
+
modified: 'true'
|
|
460
|
+
diffs:
|
|
461
|
+
month:
|
|
462
|
+
number:
|
|
463
|
+
calc: "-"
|
|
464
|
+
actual: "-"
|
|
465
|
+
leaped:
|
|
466
|
+
calc: "-"
|
|
467
|
+
actual: "-"
|
|
468
|
+
days:
|
|
469
|
+
calc: 小
|
|
470
|
+
actual: 大
|
|
471
|
+
solar_term:
|
|
472
|
+
calc:
|
|
473
|
+
index: "-"
|
|
474
|
+
to: "-"
|
|
475
|
+
zodiac_name: "-"
|
|
476
|
+
actual:
|
|
477
|
+
index: "-"
|
|
478
|
+
from: "-"
|
|
479
|
+
zodiac_name: "-"
|
|
480
|
+
days: "-"
|
|
481
|
+
days: "-1"
|
|
482
|
+
- id: 97-2-0
|
|
483
|
+
relation_id: "-"
|
|
484
|
+
parent_id: 97-2-1
|
|
485
|
+
page: '97'
|
|
486
|
+
number: "-"
|
|
487
|
+
japan_date: 文武 1年 7 小 乙未 31.6330
|
|
488
|
+
western_date: 697-7-24
|
|
489
|
+
description: "-"
|
|
490
|
+
note: "-"
|
|
491
|
+
modified: 'true'
|
|
492
|
+
diffs:
|
|
493
|
+
month:
|
|
494
|
+
number:
|
|
495
|
+
calc: "-"
|
|
496
|
+
actual: "-"
|
|
497
|
+
leaped:
|
|
498
|
+
calc: "-"
|
|
499
|
+
actual: "-"
|
|
500
|
+
days:
|
|
501
|
+
calc: 大
|
|
502
|
+
actual: 小
|
|
503
|
+
solar_term:
|
|
504
|
+
calc:
|
|
505
|
+
index: "-"
|
|
506
|
+
to: "-"
|
|
507
|
+
zodiac_name: "-"
|
|
508
|
+
actual:
|
|
509
|
+
index: "-"
|
|
510
|
+
from: "-"
|
|
511
|
+
zodiac_name: "-"
|
|
512
|
+
days: "-"
|
|
513
|
+
days: "-"
|
|
514
|
+
- id: 97-2-1
|
|
515
|
+
relation_id: 97-0-1
|
|
516
|
+
parent_id: "-"
|
|
517
|
+
page: '97'
|
|
518
|
+
number: '2'
|
|
519
|
+
japan_date: 文武 1年 8 大 甲子 1.1636
|
|
520
|
+
western_date: 697-8-23
|
|
521
|
+
description: 元嘉暦では1乙丑，書紀も乙丑朔とあるが，ここは続日本紀にしたがって甲子とする。したがってユリウス暦は8月22日。
|
|
522
|
+
note: "-"
|
|
523
|
+
modified: 'true'
|
|
524
|
+
diffs:
|
|
525
|
+
month:
|
|
526
|
+
number:
|
|
527
|
+
calc: "-"
|
|
528
|
+
actual: "-"
|
|
529
|
+
leaped:
|
|
530
|
+
calc: "-"
|
|
531
|
+
actual: "-"
|
|
532
|
+
days:
|
|
533
|
+
calc: 小
|
|
534
|
+
actual: 大
|
|
535
|
+
solar_term:
|
|
536
|
+
calc:
|
|
537
|
+
index: "-"
|
|
538
|
+
to: "-"
|
|
539
|
+
zodiac_name: "-"
|
|
540
|
+
actual:
|
|
541
|
+
index: "-"
|
|
542
|
+
from: "-"
|
|
543
|
+
zodiac_name: "-"
|
|
544
|
+
days: "-"
|
|
545
|
+
days: "-1"
|
|
546
|
+
- id: 97-3-1
|
|
547
|
+
relation_id: 97-0-1
|
|
548
|
+
parent_id: "-"
|
|
549
|
+
page: '97'
|
|
550
|
+
number: '3'
|
|
551
|
+
japan_date: 文武 1年 閏12 小 癸巳 28.8165
|
|
552
|
+
western_date: 698-1-17
|
|
553
|
+
description: 元嘉暦では28壬辰であるが，続日本紀に閏12月癸巳朔とある。したがってユリウス暦は1月18日となる。
|
|
554
|
+
note: "-"
|
|
555
|
+
modified: 'true'
|
|
556
|
+
diffs:
|
|
557
|
+
month:
|
|
558
|
+
number:
|
|
559
|
+
calc: '12'
|
|
560
|
+
actual: '12'
|
|
561
|
+
leaped:
|
|
562
|
+
calc: 'false'
|
|
563
|
+
actual: 'true'
|
|
564
|
+
days:
|
|
565
|
+
calc: 大
|
|
566
|
+
actual: 小
|
|
567
|
+
solar_term:
|
|
568
|
+
calc:
|
|
569
|
+
index: "-"
|
|
570
|
+
to: "-"
|
|
571
|
+
zodiac_name: "-"
|
|
572
|
+
actual:
|
|
573
|
+
index: "-"
|
|
574
|
+
from: "-"
|
|
575
|
+
zodiac_name: "-"
|
|
576
|
+
days: "-"
|
|
577
|
+
days: '1'
|
|
578
|
+
- id: 97-4-1
|
|
579
|
+
relation_id: 97-0-1
|
|
580
|
+
parent_id: "-"
|
|
581
|
+
page: '97'
|
|
582
|
+
number: '4'
|
|
583
|
+
japan_date: 文武 1年 11 大 癸巳 29.7553
|
|
584
|
+
western_date: 697-11-19
|
|
585
|
+
description: 元嘉暦では閏10月と推算されるが，続日本紀により閏12月。
|
|
586
|
+
note: "-"
|
|
587
|
+
modified: 'true'
|
|
588
|
+
diffs:
|
|
589
|
+
month:
|
|
590
|
+
number:
|
|
591
|
+
calc: '10'
|
|
592
|
+
actual: '11'
|
|
593
|
+
leaped:
|
|
594
|
+
calc: 'true'
|
|
595
|
+
actual: 'false'
|
|
596
|
+
days:
|
|
597
|
+
calc: "-"
|
|
598
|
+
actual: "-"
|
|
599
|
+
solar_term:
|
|
600
|
+
calc:
|
|
601
|
+
index: "-"
|
|
602
|
+
to: "-"
|
|
603
|
+
zodiac_name: "-"
|
|
604
|
+
actual:
|
|
605
|
+
index: "-"
|
|
606
|
+
from: "-"
|
|
607
|
+
zodiac_name: "-"
|
|
608
|
+
days: "-"
|
|
609
|
+
days: "-"
|
|
610
|
+
- id: 97-4-2
|
|
611
|
+
relation_id: 97-0-1
|
|
612
|
+
parent_id: 97-4-1
|
|
613
|
+
page: '97'
|
|
614
|
+
number: '4'
|
|
615
|
+
japan_date: 文武 1年 12 大 癸亥 59.2859
|
|
616
|
+
western_date: 697-12-19
|
|
617
|
+
description: "-"
|
|
618
|
+
note: "-"
|
|
619
|
+
modified: 'true'
|
|
620
|
+
diffs:
|
|
621
|
+
month:
|
|
622
|
+
number:
|
|
623
|
+
calc: '11'
|
|
624
|
+
actual: '12'
|
|
625
|
+
leaped:
|
|
626
|
+
calc: 'false'
|
|
627
|
+
actual: 'false'
|
|
628
|
+
days:
|
|
629
|
+
calc: 小
|
|
630
|
+
actual: 大
|
|
631
|
+
solar_term:
|
|
632
|
+
calc:
|
|
633
|
+
index: "-"
|
|
634
|
+
to: "-"
|
|
635
|
+
zodiac_name: "-"
|
|
636
|
+
actual:
|
|
637
|
+
index: "-"
|
|
638
|
+
from: "-"
|
|
639
|
+
zodiac_name: "-"
|
|
640
|
+
days: "-"
|
|
641
|
+
days: "-"
|
|
642
|
+
- id: 97-0-1
|
|
643
|
+
relation_id: "-"
|
|
644
|
+
parent_id: "-"
|
|
645
|
+
page: '97'
|
|
646
|
+
number: "-"
|
|
647
|
+
japan_date: "-"
|
|
648
|
+
western_date: "-"
|
|
649
|
+
description: 註. 1)〜4)は、儀鳳暦によればすべて合うものである。（儀鳳暦による計算値は本文529頁参照）
|
|
650
|
+
note: "-"
|
|
651
|
+
modified: 'false'
|
|
652
|
+
diffs:
|
|
653
|
+
month:
|
|
654
|
+
number:
|
|
655
|
+
calc: "-"
|
|
656
|
+
actual: "-"
|
|
657
|
+
leaped:
|
|
658
|
+
calc: "-"
|
|
659
|
+
actual: "-"
|
|
660
|
+
days:
|
|
661
|
+
calc: "-"
|
|
662
|
+
actual: "-"
|
|
663
|
+
solar_term:
|
|
664
|
+
calc:
|
|
665
|
+
index: "-"
|
|
666
|
+
to: "-"
|
|
667
|
+
zodiac_name: "-"
|
|
668
|
+
actual:
|
|
669
|
+
index: "-"
|
|
670
|
+
from: "-"
|
|
671
|
+
zodiac_name: "-"
|
|
672
|
+
days: "-"
|
|
673
|
+
days: "-"
|
|
2
674
|
- id: 98-1-1
|
|
3
675
|
relation_id: "-"
|
|
4
676
|
parent_id: "-"
|
|
@@ -32,6 +32,19 @@ module Zakuro
|
|
|
32
32
|
super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
|
|
33
33
|
day: day, minute: minute, second: second, total: total)
|
|
34
34
|
end
|
|
35
|
+
|
|
36
|
+
#
|
|
37
|
+
# 特定の文字フォーマットにして出力する
|
|
38
|
+
#
|
|
39
|
+
# @param [String] form フォーマット（大余、小余、秒それぞれを%dで指定する）
|
|
40
|
+
#
|
|
41
|
+
# @return [String] フォーマットした結果
|
|
42
|
+
#
|
|
43
|
+
def format(form: '%d-%d')
|
|
44
|
+
return '' if invalid?
|
|
45
|
+
|
|
46
|
+
super(form, @day, @minute, @second)
|
|
47
|
+
end
|
|
35
48
|
end
|
|
36
49
|
|
|
37
50
|
#
|
|
@@ -53,6 +66,19 @@ module Zakuro
|
|
|
53
66
|
super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
|
|
54
67
|
day: day, minute: minute, second: second, total: total)
|
|
55
68
|
end
|
|
69
|
+
|
|
70
|
+
#
|
|
71
|
+
# 特定の文字フォーマットにして出力する
|
|
72
|
+
#
|
|
73
|
+
# @param [String] form フォーマット（大余、小余、秒それぞれを%dで指定する）
|
|
74
|
+
#
|
|
75
|
+
# @return [String] フォーマットした結果
|
|
76
|
+
#
|
|
77
|
+
def format(form: '%d-%d')
|
|
78
|
+
return '' if invalid?
|
|
79
|
+
|
|
80
|
+
super(form, @day, @minute, @second)
|
|
81
|
+
end
|
|
56
82
|
end
|
|
57
83
|
end
|
|
58
84
|
end
|
|
@@ -55,7 +55,7 @@ module Zakuro
|
|
|
55
55
|
# 二十四節気（冬至）
|
|
56
56
|
solar_term = Cycle::SolarTerm.new(index: 0, remainder: winter_solstice)
|
|
57
57
|
|
|
58
|
-
first_solar_term_index = Average.
|
|
58
|
+
first_solar_term_index = Average.calc_first_solar_term_index(western_year: western_year)
|
|
59
59
|
|
|
60
60
|
# 対象の二十四節気まで戻す
|
|
61
61
|
solar_term.prev_by_index(first_solar_term_index)
|
|
@@ -77,7 +77,7 @@ module Zakuro
|
|
|
77
77
|
#
|
|
78
78
|
# @return [Integer] 二十四節気番号
|
|
79
79
|
#
|
|
80
|
-
def self.
|
|
80
|
+
def self.calc_first_solar_term_index(western_year:)
|
|
81
81
|
# 天正閏余
|
|
82
82
|
lunar_age = Origin::LunarAge.get(western_year: western_year)
|
|
83
83
|
|