when_exe 0.3.9 → 0.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (18) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +212 -210
  3. data/lib/when_exe.rb +14 -12
  4. data/lib/when_exe/coordinates.rb +11 -9
  5. data/lib/when_exe/ephemeris.rb +5 -0
  6. data/lib/when_exe/locales/transliteration_table.rb +1 -1
  7. data/lib/when_exe/parts/resource.rb +1103 -1101
  8. data/lib/when_exe/region/chinese.rb +36 -40
  9. data/lib/when_exe/region/chinese/epochs.rb +86 -81
  10. data/lib/when_exe/region/chinese/twins.rb +16 -16
  11. data/lib/when_exe/region/japanese.rb +12 -12
  12. data/lib/when_exe/region/japanese/calendars.rb +1 -0
  13. data/lib/when_exe/region/japanese/notes.rb +14 -1
  14. data/lib/when_exe/region/javanese.rb +2 -2
  15. data/lib/when_exe/region/ryukyu.rb +12 -10
  16. data/lib/when_exe/version.rb +1 -1
  17. data/link_to_online_documents +1 -0
  18. metadata +2 -2
data/lib/when_exe/region/chinese.rb CHANGED
@@ -18,50 +18,50 @@ module When
18
18
 
19
19
  [self,
20
20
  "names:[月=ja:%%<月_(暦)>, *Month]",
21
- "[正月, Month 1= ]",
22
- "[二月, Month 2= ]",
23
- "[三月, Month 3= ]",
24
- "[四月, Month 4= ]",
25
- "[五月, Month 5= ]",
26
- "[六月, Month 6= ]",
27
- "[七月, Month 7= ]",
28
- "[八月, Month 8= ]",
29
- "[九月, Month 9= ]",
30
- "[十月, Month 10=]",
31
- "[十一月, Month 11=]",
32
- "[十二月, Month 12=]"
21
+ "[正月=ja:%%<1月_(旧暦)>, Month 1= ]",
22
+ "[二月=ja:%%<2月_(旧暦)>, Month 2= ]",
23
+ "[三月=ja:%%<3月_(旧暦)>, Month 3= ]",
24
+ "[四月=ja:%%<4月_(旧暦)>, Month 4= ]",
25
+ "[五月=ja:%%<5月_(旧暦)>, Month 5= ]",
26
+ "[六月=ja:%%<6月_(旧暦)>, Month 6= ]",
27
+ "[七月=ja:%%<7月_(旧暦)>, Month 7= ]",
28
+ "[八月=ja:%%<8月_(旧暦)>, Month 8= ]",
29
+ "[九月=ja:%%<9月_(旧暦)>, Month 9= ]",
30
+ "[十月=ja:%%<10月_(旧暦)>, Month 10=]",
31
+ "[十一月=ja:%%<11月_(旧暦)>, Month 11=]",
32
+ "[十二月=ja:%%<21月_(旧暦)>, Month 12=]"
33
33
  ],
34
34
 
35
35
  [self,
36
36
  "names:[月=ja:%%<月_(暦)>, *MonthA=en:Month]",
37
- "[一月, Month 1= ]",
38
- "[二月, Month 2= ]",
39
- "[三月, Month 3= ]",
40
- "[四月, Month 4= ]",
41
- "[五月, Month 5= ]",
42
- "[六月, Month 6= ]",
43
- "[七月, Month 7= ]",
44
- "[八月, Month 8= ]",
45
- "[九月, Month 9= ]",
46
- "[十月, Month 10=]",
47
- "[正月, New Year Month=]",
48
- "[臘月, Month 12=]"
37
+ "[一月=ja:%%<1月_(旧暦)>, Month 1= ]",
38
+ "[二月=ja:%%<2月_(旧暦)>, Month 2= ]",
39
+ "[三月=ja:%%<3月_(旧暦)>, Month 3= ]",
40
+ "[四月=ja:%%<4月_(旧暦)>, Month 4= ]",
41
+ "[五月=ja:%%<5月_(旧暦)>, Month 5= ]",
42
+ "[六月=ja:%%<6月_(旧暦)>, Month 6= ]",
43
+ "[七月=ja:%%<7月_(旧暦)>, Month 7= ]",
44
+ "[八月=ja:%%<8月_(旧暦)>, Month 8= ]",
45
+ "[九月=ja:%%<9月_(旧暦)>, Month 9= ]",
46
+ "[十月=ja:%%<10月_(旧暦)>, Month 10=]",
47
+ "[正月=ja:%%<11月_(旧暦)>, New Year Month=]",
48
+ "[臘月=ja:%%<12月_(旧暦)>, Month 12=]"
49
49
  ],
50
50
 
51
51
  [self,
52
52
  "names:[月=ja:%%<月_(暦)>, *MonthB=en:Month]",
53
- "[建寅月, Month 3= ]",
54
- "[建卯月, Month 4= ]",
55
- "[建辰月, Month 5= ]",
56
- "[建巳月, Month 6= ]",
57
- "[建午月, Month 7= ]",
58
- "[建未月, Month 8= ]",
59
- "[建申月, Month 9= ]",
60
- "[建酉月, Month 10=]",
61
- "[建戌月, Month 11=]",
62
- "[建亥月, Month 12=]",
63
- "[建子月, Month 1= ]",
64
- "[建丑月, Month 2= ]"
53
+ "[建寅月=ja:%%<1月_(旧暦)>, Month 3= ]",
54
+ "[建卯月=ja:%%<2月_(旧暦)>, Month 4= ]",
55
+ "[建辰月=ja:%%<3月_(旧暦)>, Month 5= ]",
56
+ "[建巳月=ja:%%<4月_(旧暦)>, Month 6= ]",
57
+ "[建午月=ja:%%<5月_(旧暦)>, Month 7= ]",
58
+ "[建未月=ja:%%<6月_(旧暦)>, Month 8= ]",
59
+ "[建申月=ja:%%<7月_(旧暦)>, Month 9= ]",
60
+ "[建酉月=ja:%%<8月_(旧暦)>, Month 10=]",
61
+ "[建戌月=ja:%%<9月_(旧暦)>, Month 11=]",
62
+ "[建亥月=ja:%%<10月_(旧暦)>, Month 12=]",
63
+ "[建子月=ja:%%<11月_(旧暦)>, Month 1= ]",
64
+ "[建丑月=ja:%%<12月_(旧暦)>, Month 2= ]"
65
65
  ]
66
66
  ]]
67
67
 
@@ -720,10 +720,6 @@ module When
720
720
  def _normalize(args=[], options={})
721
721
  super
722
722
 
723
- # 通法
724
- @denominator = @year_length.denominator if @year_length.kind_of?(Rational)
725
- @denominator = [@denominator||0, @lunation_length.denominator].max if @lunation_length.kind_of?(Rational)
726
-
727
723
  if @formula == '1L'
728
724
 
729
725
  # 月の位相の計算
data/lib/when_exe/region/chinese/epochs.rb CHANGED
@@ -266,7 +266,7 @@ module When
266
266
  ["[昇明]1" , "@A" , "name=[順帝=ja:%%<順帝_(南朝宋)>];477-07-11", "479-04-23"] # 壬辰
267
267
  ],
268
268
  [self,
269
- "period:[南斉=ja:%%<斉_(南朝)>]",
269
+ "period:[斉=ja:%%<斉_(南朝)>]",
270
270
  ["[建元=ja:%%<建元_(南朝斉)>]1", "@F" , "name=[高帝=ja:%%<蕭道成>];479-04-23^Chinese0445"], # 甲午
271
271
  ["[永明]1" , "@A" , "name=[武帝=ja:%%<武帝_(南朝斉)>];483-01-02"], # 辛亥
272
272
  ["[隆昌]1" , "@A" , "name=[欝林王=ja:%%<蕭昭業>];494-01-01"], # 丁未
@@ -290,7 +290,19 @@ module When
290
290
  ["[承聖]1" , "@A" , "name=[元帝=ja:%%<元帝_(南朝梁)>];552-11-12"], # 丙子 太清に戻した後、ただちに改元
291
291
  ["[天成=ja:%%<天成_(梁)>]1" , "@A" , "name=[貞陽侯=ja:%%<蕭淵明>];555-05-27"], # 丙午
292
292
  ["[紹泰]1" , "@A" , "name=[敬帝=ja:%%<敬帝_(南朝梁)>];555-10-02"], # 己酉
293
- ["[太平=ja:%%<太平_(梁)>]1" , "" , " 556-09-01", "557-10-10"] # 壬寅
293
+ ["[太平=ja:%%<太平_(梁)>]1" , "" , " 556-09-01", "557-10-10"], # 壬寅
294
+ [self,
295
+ "period:[<臨賀王>=ja:%%<梁_(南朝)>]",
296
+ ["[正平=ja:%%<正平_(蕭正徳)>]1", "@A" ,"name=[臨賀王=ja:%%<蕭正徳>];548-11-01^Chinese0445", "549-03="] # 朔 4989-21
297
+ ],
298
+ [self,
299
+ "period:[<武陵王>=ja:%%<梁_(南朝)>]",
300
+ ["[天正=ja:%%<天正_(蕭紀)>]1" , "@A" ,"name=[武陵王=ja:%%<蕭紀>];552-04-08^Chinese0445", "553-08-08="] # 乙巳 5084-13
301
+ ],
302
+ [self,
303
+ "period:[<永嘉王>=ja:%%<梁_(南朝)>]",
304
+ ["[天啓=ja:%%<天啓_(梁)>]1" , "@A" ,"name=[永嘉王=ja:%%<蕭荘>];558-03^Chinese0445", "560-02="] # 5174-11
305
+ ]
294
306
  ],
295
307
  [self,
296
308
  "period:[陳=ja:%%<陳_(南朝)>]",
@@ -302,18 +314,6 @@ module When
302
314
  ["[至徳=ja:%%<至徳_(陳)>]1" , "@A" , "name=[後主=ja:%%<後主_(陳)>];583-01-03"], # 壬寅
303
315
  ["[禎明]1" , "" , " 587-01-03", "589-01="] # 戊寅
304
316
  ],
305
- [self,
306
- "period:[梁(臨賀王)=ja:%%<梁_(南朝)>]",
307
- ["[正平=ja:%%<正平_(蕭正徳)>]1", "@A" ,"name=[臨賀王=ja:%%<蕭正徳>];548-11-01^Chinese0445", "549-03="] # 朔 4989-21
308
- ],
309
- [self,
310
- "period:[梁(武陵王)=ja:%%<梁_(南朝)>]",
311
- ["[天正=ja:%%<天正_(蕭紀)>]1" , "@A" ,"name=[武陵王=ja:%%<蕭紀>];552-04-08^Chinese0445", "553-08-08="] # 乙巳 5084-13
312
- ],
313
- [self,
314
- "period:[梁(永嘉王)=ja:%%<梁_(南朝)>]",
315
- ["[天啓=ja:%%<天啓_(梁)>]1" , "@A" ,"name=[永嘉王=ja:%%<蕭荘>];558-03^Chinese0445", "560-02="] # 5174-11
316
- ],
317
317
  [self,
318
318
  "period:[後梁=ja:%%<後梁_(南朝)>]",
319
319
  ["[大定=ja:%%<大定_(南朝後梁)>]1", "@A" , "name=[宣帝=ja:%%<蕭サツ>];555-01-01^Chinese0445"],
@@ -335,20 +335,6 @@ module When
335
335
  ],
336
336
  [self,
337
337
  "period:[五胡十六国=ja:%%<五胡十六国時代>]",
338
- [self,
339
- "period:[前涼]",
340
- ["[建興=ja:%%<建興_(晋)>#%.<明王・張寔>]5", "" , "name=;317-03-09^Chinese0239", # 辛卯 (317.03.09)
341
- "name=[張寔];317-12-21", ""], # 昭公 己亥
342
- ["[永元=ja:%%<建興_(晋)>#%.<成王・張茂>]1" , "@A" , "name=[張茂];320-06"], # 成公 2878-9
343
- ["[太元=ja:%%<建興_(晋)>#%.<成王・張駿>]1" , "@A" , "name=[張駿];324-05-14"], # 文公 甲申 2922-4
344
- ["[永楽=ja:%%<建興_(晋)>#%.<成王・張重華>]1" , "@A" , "name=[張重華];346-05-23", # 桓公 丙戌 3070-7
345
- "name=[張耀霊];353-11-18", ""], # 哀公 丁卯 3136-14
346
- ["[和平=ja:%%<和平_(前涼)>]1" , "@A" , "name=[張祚];354-01"], # 威王 3137-1
347
- ["[太始=ja:%%<建興_(晋)>#%.<冲王・張玄靚>]1" , "@A" , "name=[張玄靚=ja:%%<張玄ケン>];355-09="], # 冲公 この年の閏月は 6 月のはず
348
- ["[建興=ja:%%<建興_(晋)>#%.<冲王・張玄靚>]43" , "" , " 355-09="], # 3150-14
349
- ["[升平]5" , "" , " 361-12", "name=[張天錫];363-08=", "376-08-27="], # 3187-17
350
- ["[太清?=zh:%%<升平>#%.<前凉悼公张天錫>]1" , "@A" , "363-08=", "376-08-27="] # 悼公 3193-8
351
- ],
352
338
  [self,
353
339
  "period:[成漢]",
354
340
  ["[建初=ja:%%<建初_(成漢)>]1" , "@F" , "name=[李特];303-01^Chinese0239", # 景帝 2677-1 考異多
@@ -397,6 +383,11 @@ module When
397
383
  "period:[冉魏]",
398
384
  ["[永興=ja:%%<永興_(冉魏)>]1" , "@A" , "name=[冉閔];350-02=^Chinese0239", "352-04="] # 3102-1 考異あり
399
385
  ],
386
+ [self,
387
+ "period:[翟魏=ja:%%<テキ魏>]",
388
+ ["[建光=ja:%%<建光_(テキ魏)>]1", "@F" , "name=[翟遼=ja:%%<テキ遼>];388-02^Chinese0239"], # 3382-3
389
+ ["[定鼎,alias:神鼎=ja:%%<定鼎>]1", "@A" , "name=[翟釗=ja:%%<テキショウ>];391-10", "392-6="] # 3402-17 -3405-9
390
+ ],
400
391
  [self,
401
392
  "period:[前燕]",
402
393
  ["[燕元=]0.11.26", "@F" , "name=[慕容儁];348-11-26^Chinese0239"], # 景昭帝 甲辰 3085-6
@@ -416,11 +407,6 @@ module When
416
407
  ["[建始=ja:%%<建始_(慕容熙)>]1", "" , " 407-01-01"], # 辛丑朔 3594-1
417
408
  ["[正始=ja:%%<正始_(北燕)>]1" , "@A" , "name=[慕容雲=ja:%%<高雲>];407-07-28", "409-10-13"], # 恵懿帝 乙丑 3599-14
418
409
  ],
419
- [self,
420
- "period:[北燕]",
421
- ["[太平=ja:%%<太平_(北燕)>]1" , "@F" , "name=[馮跋];409-10-13^Chinese0239"], # 文成帝 戊辰 3621-21
422
- ["[太興]1" , "@A" , "name=[馮弘];431-01-01", "436-05="] # 昭成帝 壬午朔 3828-1
423
- ],
424
410
  [self,
425
411
  "period:[西燕]",
426
412
  ["[燕興=ja:%%<更始_(西燕)>]1" , "@F" , "name=[慕容泓];384-04^Chinese0239"], # 済北王 3328-14
@@ -437,6 +423,11 @@ module When
437
423
  ["[建平=ja:%%<建平_(南燕)>]1" , "" , " 400"], # 3516-40
438
424
  ["[太上]1" , "@A" , "name=[慕容超];405-08-10", "410-02="] # 己未 3586-17
439
425
  ],
426
+ [self,
427
+ "period:[北燕]",
428
+ ["[太平=ja:%%<太平_(北燕)>]1" , "@F" , "name=[馮跋];409-10-13^Chinese0239"], # 文成帝 戊辰 3621-21
429
+ ["[太興]1" , "@A" , "name=[馮弘];431-01-01", "436-05="] # 昭成帝 壬午朔 3828-1
430
+ ],
440
431
  [self,
441
432
  "period:[前秦]",
442
433
  ["[皇始=ja:%%<皇始_(前秦)>]1" , "@F" , "name=[苻健];351-01-20^Chinese0239"], # 明帝 丙辰 3111-2
@@ -465,6 +456,20 @@ module When
465
456
  ["[建弘]1" , "" , " 420-01"], # 3732-2
466
457
  ["[永弘]1" , "@A" , "name=[乞伏暮末];428-05", "431-01="] # 3801-8
467
458
  ],
459
+ [self,
460
+ "period:[前涼]",
461
+ ["[建興=ja:%%<建興_(晋)>#%.<明王・張寔>]5", "" , "name=;317-03-09^Chinese0239", # 辛卯 (317.03.09)
462
+ "name=[張寔];317-12-21", ""], # 昭公 己亥
463
+ ["[永元=ja:%%<建興_(晋)>#%.<成王・張茂>]1" , "@A" , "name=[張茂];320-06"], # 成公 2878-9
464
+ ["[太元=ja:%%<建興_(晋)>#%.<成王・張駿>]1" , "@A" , "name=[張駿];324-05-14"], # 文公 甲申 2922-4
465
+ ["[永楽=ja:%%<建興_(晋)>#%.<成王・張重華>]1" , "@A" , "name=[張重華];346-05-23", # 桓公 丙戌 3070-7
466
+ "name=[張耀霊];353-11-18", ""], # 哀公 丁卯 3136-14
467
+ ["[和平=ja:%%<和平_(前涼)>]1" , "@A" , "name=[張祚];354-01"], # 威王 3137-1
468
+ ["[太始=ja:%%<建興_(晋)>#%.<冲王・張玄靚>]1" , "@A" , "name=[張玄靚=ja:%%<張玄ケン>];355-09="], # 冲公 この年の閏月は 6 月のはず
469
+ ["[建興=ja:%%<建興_(晋)>#%.<冲王・張玄靚>]43" , "" , " 355-09="], # 3150-14
470
+ ["[升平]5" , "" , " 361-12", "name=[張天錫];363-08=", "376-08-27="], # 3187-17
471
+ ["[太清?=zh:%%<升平>#%.<前凉悼公张天錫>]1" , "@A" , "363-08=", "376-08-27="] # 悼公 3193-8
472
+ ],
468
473
  [self,
469
474
  "period:[後涼]",
470
475
  ["[太安=ja:%%<太安_(後涼)>]1" , "@F" , "name=[呂光];386-12^Chinese0239"], # 懿武帝 3371-51
@@ -603,84 +608,84 @@ module When
603
608
  ["[大業]1" , "@A" , "name=[煬帝];605-01-01", "618-03-10="], # 壬辰
604
609
  ["[皇泰]1" , "@A","name=[恭帝=ja:%%<恭帝トウ>];618-05-24^ChineseTwin::大業暦", "619-04-08"], # 戊辰 5791-26
605
610
  [self,
606
- "period:[鄭(王世充)=ja:%%<王世充>]",
607
- ["[開明=ja:%%<開明_(王世充)>]1" ,"@F" ,"name=[王世充];619-04-08^ChineseTwin::大業暦", "621-05-09="] # 丙午 5853-45
611
+ "period:[鄭<王世充>=ja:%%<王世充>]",
612
+ ["[開明=ja:%%<開明_(王世充)>]1" ,"@F" ,"name=[王世充];619-04-08^ChineseTwin::大業暦", "621-05-{丁卯}"] # 丙午 5853-45, 621-05-09=は丁卯
608
613
  ],
609
614
  [self,
610
- "period:[梁(蕭銑)=ja:%%<蕭銑>]",
615
+ "period:[梁<蕭銑>=ja:%%<蕭銑>]",
611
616
  ["[鳳鳴, alias:鳴鳳=ja:%%<鳳鳴>]1", "@F", "name=[蕭銑];617-10^ChineseTwin::大業暦", "621-10-21="] # 5761-17
612
617
  ],
613
618
  [self,
614
- "period:[梁(梁師都)=ja:%%<梁師都>]",
619
+ "period:[梁<梁師都>=ja:%%<梁師都>]",
615
620
  ["[永隆=ja:%%<永隆_(梁師都)>]1" ,"@F" ,"name=[梁師都];617-03^ChineseTwin::大業暦", "628-04-26="] # 5725-9
616
621
  ],
617
622
  [self,
618
- "period:[梁(沈法興)=ja:%%<沈法興>]",
623
+ "period:[梁<沈法興>=ja:%%<沈法興>]",
619
624
  ["[延康=ja:%%<延康_(沈法興)>]1" ,"@F" ,"name=[沈法興];619-08^ChineseTwin::大業暦", "620-12="] # 5863-77
620
625
  ],
621
626
  [self,
622
- "period:[元興(操師乞)=ja:%%<操師乞>]",
627
+ "period:[元興<操師乞>=ja:%%<操師乞>]",
623
628
  ["[始興=ja:%%<始興_(操師乞))>,alias:天成=ja:%%<始興_(操師乞))>]1","@F","name=[操師乞];616-12-01^ChineseTwin::大業暦", "616-12="] # 『隋書』十二月癸未 Wikipedia
624
629
  ],
625
630
  [self,
626
- "period:[呉(李子通)=ja:%%<李子通>]",
631
+ "period:[呉<李子通>=ja:%%<李子通>]",
627
632
  ["[明政=ja:%%<明政_(李子通)>]1" ,"@F" ,"name=[李子通];619-08^ChineseTwin::大業暦", "621-11="] # 5863-77
628
633
  ],
629
634
  [self,
630
- "period:[楚(林士弘)=ja:%%<林士弘>]",
635
+ "period:[楚<林士弘>=ja:%%<林士弘>]",
631
636
  ["[太平=ja:%%<太平_(林士弘)>]1" ,"@F" ,"name=[林士弘];616-12-10^ChineseTwin::大業暦", "622-10-21="] # 壬辰 5712-16
632
637
  ],
633
638
  [self,
634
- "period:[楚(朱粲)=ja:%%<朱粲>]",
639
+ "period:[楚<朱粲>=ja:%%<朱粲>]",
635
640
  ["[昌達]1" , "@F" ,"name=[朱粲];618-10^ChineseTwin::大業暦", "619-02?"] # 5817-22
636
641
  ],
637
642
  [self,
638
- "period:[夏(竇建徳)=ja:%%<竇建徳>]",
643
+ "period:[夏<竇建徳>=ja:%%<竇建徳>]",
639
644
  ["[丁丑=ja:%%<丁丑_(夏)>]1", "@F", "name=[竇建徳];617-01-05^ChineseTwin::大業暦"], # 丙辰 5718-2
640
- ["[五鳳=ja:%%<五鳳_(夏)>]1", "", " 618-07", "621-05-09="] # 5805-54
645
+ ["[五鳳=ja:%%<五鳳_(夏)>]1", "", " 618-07", "621-05-{丁卯}"] # 5805-54, 621-05-09=は丁卯
641
646
  ],
642
647
  [self,
643
- "period:[漢東(劉黒闥)=ja:%%<劉黒闥>]",
644
- ["[天造]1" , "@F" ,"name=[劉黒闥];622-01^ChineseTwin::大業暦", "623-01-03="] # 5942-1
648
+ "period:[漢東<劉黒闥>=ja:%%<劉黒闥>]",
649
+ ["[天造]1" , "@F" ,"name=[劉黒闥];622-01^ChineseTwin::大業暦", "623-01-{庚辰}"] # 5942-1, 623-01-03=は庚辰
645
650
  ],
646
651
  [self,
647
- "period:[魏(李密)=ja:%%<李密_(隋)>]",
652
+ "period:[魏<李密>=ja:%%<李密_(隋)>]",
648
653
  ["[永平=ja:%%<永平_(李密)>]1" , "@F" ,"name=[李密=ja:%%<李密_(隋)>];617-02-19^ChineseTwin::大業暦", "618-09="] # 庚子 5720-7
649
654
  ],
650
655
  [self,
651
- "period:[許(宇文化及)=ja:%%<宇文化及>]",
656
+ "period:[許<宇文化及>=ja:%%<宇文化及>]",
652
657
  ["[天寿=ja:%%<天寿_(宇文化及)>]1" ,"@F" ,"name=[宇文化及];618-09^ChineseTwin::大業暦", "619-02?"] # 5761-17
653
658
  ],
654
659
  [self,
655
- "period:[涼(李軌)=ja:%%<李軌>]",
656
- ["[安楽=ja:%%<安楽_(年号)>]1" , "@F" ,"name=[李軌];618-11-04^ChineseTwin::大業暦", "619-05-13="] # 乙巳 5820-28
660
+ "period:[涼<李軌>=ja:%%<李軌>]",
661
+ ["[安楽=ja:%%<安楽_(年号)>]1" , "@F" ,"name=[李軌];618-11-04^ChineseTwin::大業暦", "619-05-{辛巳}"] # 乙巳 5820-28, 619-05-13=は辛巳
657
662
  ],
658
663
  [self,
659
- "period:[燕(高開道)=ja:%%<高開道>]",
660
- ["[始興=ja:%%<始興_(高開道)>]1" ,"@F" ,"name=[高開道];618-12^ChineseTwin::大業暦", "620-10-19="] # 5833-47
664
+ "period:[燕<高開道>=ja:%%<高開道>]",
665
+ ["[始興=ja:%%<始興_(高開道)>]1" ,"@F" ,"name=[高開道];618-12^ChineseTwin::大業暦", "620-10-{己酉}"] # 5833-47, 620-10-19=は己酉
661
666
  ],
662
667
  [self,
663
- "period:[乗(高曇晟)=ja:%%<高曇晟>]",
668
+ "period:[乗<高曇晟>=ja:%%<高曇晟>]",
664
669
  ["[法輪=ja:%%<法輪_(高曇晟)>]1" ,"@F" ,"name=[高曇晟];618-12^ChineseTwin::大業暦", "619-02="] # 5833-47
665
670
  ],
666
671
  [self,
667
- "period:[定楊(劉武周)=ja:%%<劉武周>]",
672
+ "period:[定楊<劉武周>=ja:%%<劉武周>]",
668
673
  ["[天興=ja:%%<天興_(劉武周)>]1" ,"@F" ,"name=[劉武周];617-03-17^ChineseTwin::大業暦", "620-04="] # 丁卯 5725-8
669
674
  ],
670
675
  [self,
671
- "period:[西秦(薛挙)=zh:%%<薛舉>]",
676
+ "period:[西秦<薛挙>=zh:%%<薛舉>]",
672
677
  ["[秦興]1" , "@F" ,"name=[薛挙=zh:%%<薛舉>];617-04-03^ChineseTwin::大業暦", "618-11-08="] # 癸未 5725-11
673
678
  ],
674
679
  [self,
675
- "period:[永楽(郭子和)=ja:%%<郭子和>]",
680
+ "period:[永楽<郭子和>=ja:%%<郭子和>]",
676
681
  ["[正平=ja:%%<正平_(郭子和)>, alias:丑平=]1","@F","name=[郭子和];617-03^ChineseTwin::大業暦", "618-12="] # 5725-10
677
682
  ],
678
683
  [self,
679
- "period:[曹武徹]",
684
+ "period:[<曹武徹>]",
680
685
  ["[通聖]1" , "@F" ,"name=[曹武徹];617-12-11^ChineseTwin::大業暦", "617-12="] # 隋書による
681
686
  ],
682
687
  [self,
683
- "period:[隋(恭帝)=ja:%%<恭帝侑>]",
688
+ "period:[隋<恭帝>=ja:%%<恭帝侑>]",
684
689
  ["[義寧]1" , "@A" ,"name=[恭帝ja:%%<恭帝侑>];617-11-15^Chinese0523", "618-05-20"] # 壬戌
685
690
  ]
686
691
  ],
@@ -733,7 +738,7 @@ module When
733
738
  ["[太極=ja:%%<太極_(唐)>]1" , "" , " 712-01-19"], # 己丑
734
739
  ["[延和=ja:%%<延和_(唐)>]1" , "" , " 712-05-13"], # 辛巳
735
740
  ["[先天=ja:%%<先天_(唐)>]1" , "@A" , "name=[玄宗=ja:%%<玄宗_(唐)>];712-08-07"], # 甲辰
736
- ["[開元]1" , "" , " 713-12-01"], # 庚寅 開元１７年から大衍暦を使用
741
+ ["[開元]1" , "" , " 713-12-01"], # 庚寅 開元１７年から大衍暦を使用
737
742
  ["[天宝=ja:%%<天宝_(唐)>]1" , "" , " 742-01-01"], # 丁未
738
743
  ["[至徳=ja:%%<至徳_(唐)>]1" , "@A" , "name=[粛宗=ja:%%<粛宗_(唐)>];756-07-12"], # 甲子
739
744
  ["[乾元=ja:%%<乾元_(唐)>]1" , "" , " 758-02-05"], # 丁未
@@ -748,7 +753,7 @@ module When
748
753
  ["[貞元=ja:%%<貞元_(唐)>]1" , "" , " 785-01-01"], # 丁酉
749
754
  ["[永貞=ja:%%<永貞_(唐)>]1" , "@A" , "name=[順宗=ja:%%<順宗_(唐)>];805-08-05"], # 辛丑
750
755
  ["[元和=ja:%%<元和_(唐)>]1" , "@A" , "name=[憲宗=ja:%%<憲宗_(唐)>];806-01-02"], # 丁卯 元和２年から観象暦を使用
751
- ["[長慶]1" , "@A" , "name=[穆宗=ja:%%<穆宗_(唐)>];821-01-04"], # 辛丑 長慶２年から宣明暦を使用
756
+ ["[長慶]1" , "@A" , "name=[穆宗=ja:%%<穆宗_(唐)>];821-01-{辛丑}"], # 辛丑 長慶２年から宣明暦を使用
752
757
  ["[宝暦=ja:%%<宝暦_(唐)>]1" , "@A" , "name=[敬宗];825-01-07"], # 辛亥
753
758
  ["[大和=ja:%%<大和_(唐)>,alias:太和=ja:%%<大和_(唐)>]1" ,"@A","name=[文宗=ja:%%<文宗_(唐)>];827-02-13"], # 乙巳
754
759
  ["[開成=ja:%%<開成_(唐)>]1" , "" , " 836-01-01"], # 辛丑
@@ -808,24 +813,6 @@ module When
808
813
  ["[宝大]1" , "" , " 924"], # 〃
809
814
  ["[宝正]1" , "" , " 926", "932-03-28="]
810
815
  ],
811
- [self,
812
- "period:[前蜀]",
813
- ["[天復=ja:%%<天復_(唐)>]4", "" ,"name=[王建=ja:%%<王建_(前蜀)>];904-04=11^Chinese0523"], # 乙巳 高祖 4.04=11
814
- ["[武成=ja:%%<武成_(前蜀)>]1" , "@F" , " 908-01-09"], # 辛巳 8688-3
815
- ["[永平=ja:%%<永平_(前蜀)>]1" , "" , " 911-01-01"], # 丙戌 8730-37
816
- ["[通正]1" , "" , " 916-01-01"], # 丙辰 8799-22
817
- ["[天漢=ja:%%<天漢_(前蜀)>]1" , "" , " 917-01-01"], # 辛亥 8808-31
818
- ["[光天=ja:%%<光天_(前蜀)>]1" , "" , " 918-01-01"], # 乙亥 8822-14
819
- ["[乾徳=ja:%%<乾徳_(前蜀)>]1" , "@A" , "name=[王衍];919-01-01"], # 庚午 後主 8838-34
820
- ["[咸康=ja:%%<咸康_(前蜀)>]1" , "" , " 925-01-01", "925-11-27="] # 甲午 8929-75
821
- ],
822
- [self,
823
- "period:[後蜀=ja:%%<後蜀_(十国)>]",
824
- ["[応順]1", "@F" ,"name=[孟知祥];934-01=^Chinese0523"], # 高祖 9102-13 1.01=
825
- ["[明徳=ja:%%<明徳_(後蜀)>]1" , "" , " 934-04-12", # 辛巳 9117-16
826
- "name=[孟昶];934-07-28", ""], # 後主 丙寅 9123-48
827
- ["[広政]1" , "" , " 938-01-01", "947-01^Chinese0956", "965-01-07="] # 戊申 9184-53 明徳は多分間違い
828
- ],
829
816
  [self,
830
817
  "period:[閩=ja:%%<ビン_(十国)>]",
831
818
  ["[龍啓]1" , "@F" , "name=[王延鈞];933-01^Chinese0523"], # 太宗 以前は五代の年号を使用 9081-2
@@ -848,13 +835,31 @@ module When
848
835
  ["[乾和]1" , "" , " 943-11-13", "947-01^Chinese0956", ""], # 丁亥 9255-28
849
836
  ["[大宝=ja:%%<大宝_(南漢)>]1" , "@A" , "name=[劉鋹];958-08-03", "971-02-05="] # 後主 辛巳 9586-35
850
837
  ],
838
+ [self,
839
+ "period:[桀燕]",
840
+ ["[応天=ja:%%<応天_(桀燕)>]1" , "@F" , "name=[劉守光];911-08-13^Chinese0523", "914-01-15="] # 甲子 8745-15
841
+ ],
851
842
  [self,
852
843
  "period:[岐]",
853
844
  ["[天祐=ja:%%<天祐_(唐)>,alias:天佑=ja:%%<天祐_(唐)>]4","@A","name=[李茂貞];907-04-22^Chinese0523", "924-01-14="] # 戊辰 唐滅亡後も、五代を認めず旧年号を使用 4.04.22
854
845
  ],
855
846
  [self,
856
- "period:[桀燕]",
857
- ["[応天=ja:%%<応天_(桀燕)>]1" , "@F" , "name=[劉守光];911-08-13^Chinese0523", "914-01-15="] # 甲子 8745-15
847
+ "period:[前蜀]",
848
+ ["[天復=ja:%%<天復_(唐)>]4", "" ,"name=[王建=ja:%%<王建_(前蜀)>];904-04=11^Chinese0523"], # 乙巳 高祖 4.04=11
849
+ ["[武成=ja:%%<武成_(前蜀)>]1" , "@F" , " 908-01-09"], # 辛巳 8688-3
850
+ ["[永平=ja:%%<永平_(前蜀)>]1" , "" , " 911-01-01"], # 丙戌 8730-37
851
+ ["[通正]1" , "" , " 916-01-01"], # 丙辰 8799-22
852
+ ["[天漢=ja:%%<天漢_(前蜀)>]1" , "" , " 917-01-01"], # 辛亥 8808-31
853
+ ["[光天=ja:%%<光天_(前蜀)>]1" , "" , " 918-01-01"], # 乙亥 8822-14
854
+ ["[乾徳=ja:%%<乾徳_(前蜀)>]1" , "@A" , "name=[王衍];919-01-01"], # 庚午 後主 8838-34
855
+ ["[咸康=ja:%%<咸康_(前蜀)>]1" , "" , " 925-01-01", "925-11-27="] # 甲午 8929-75
856
+ ],
857
+ [self,
858
+ "period:[後蜀=ja:%%<後蜀_(十国)>]",
859
+ ["[応順]1", "@F" ,"name=[孟知祥];934-01=^Chinese0523"], # 高祖 9102-13 1.01=
860
+ ["[明徳=ja:%%<明徳_(後蜀)>]1" , "" , " 934-04-12", # 辛巳 9117-16
861
+ "name=[孟昶];934-07-28", ""], # 後主 丙寅 9123-48
862
+ ["[広政]1" , "" , " 938-01-01", "947-01^Chinese0956", "965-01-07="] # 戊申 9184-53 明徳は多分間違い
858
863
  ],
859
864
  [self,
860
865
  "period:[後梁]",
@@ -1089,7 +1094,7 @@ module When
1089
1094
  ["[天元=ja:%%<天元_(北元)>]1" , "@A" , "name=[天元帝=ja:%%<トグス・テムル>];1379-", "1388="]
1090
1095
  ],
1091
1096
  [self,
1092
- "period:[陳吊眼=zh:%%<陳吊眼>]",
1097
+ "period:[<陳吊眼>=zh:%%<陳吊眼>]",
1093
1098
  ["[昌泰=ja:%%<昌泰_(陳吊眼)>]1", "@F", "name=[陳吊眼=zh:%%<陳吊眼>];1281-08=01^Chinese0939", "1281-11-02="] # 鄭所南『元韃攻日本敗北歌並序』（『心史・中興集乙』1933年支那内学院刊本所収）Wikipedia
1094
1099
  ],
1095
1100
  [self,
data/lib/when_exe/region/chinese/twins.rb CHANGED
@@ -14,17 +14,17 @@ module When
14
14
  'locale:[=ja:, en=en:]',
15
15
  'area:[中国の暦月=, *ChineseLuniSolar=]',
16
16
  ['[太初暦]1.01.01', '@CR', '1-01-01^ChineseTwin::太初暦'], # 西暦が正になるところから開始(実際は-103.01.01)
17
- ['[四分暦]85.01.01', '@CR', '85-01-01^ChineseTwin::四分暦'],
18
- ['[乾象暦]222.01.01', '@CR', '222-01-01^ChineseTwin::乾象暦'],
19
- ['[景初暦]237.01.01', '@CR', '237-01-01^ChineseTwin::景初暦'],
17
+ ['[四分暦]85.01.01', '@CR', '85-01-01^ChineseTwin::四分暦', '265'],
18
+ ['[乾象暦]222.01.01', '@CR', '222-01-01^ChineseTwin::乾象暦', '281'],
19
+ ['[景初暦]237.01.01', '@CR', '237-01-01^ChineseTwin::景初暦', '452'],
20
20
  ['[元嘉暦]445.01.01', '@CR', '445-01-01^ChineseTwin::元嘉暦'],
21
- ['[大明暦]510.01.01', '@CR', '510-01-01^ChineseTwin::大明暦'],
22
- ['[三紀暦=]384.01.01', '@CR', '384-01-01^ChineseTwin::三紀暦'],
23
- ['[玄始暦=]412.01.01', '@CR', '412-01-01^ChineseTwin::玄始暦'],
21
+ ['[大明暦]510.01.01', '@CR', '510-01-01^ChineseTwin::大明暦', '590'],
22
+ ['[三紀暦=]384.01.01', '@CR', '384-01-01^ChineseTwin::三紀暦', '418'],
23
+ ['[玄始暦=]412.01.01', '@CR', '412-01-01^ChineseTwin::玄始暦', '440'],
24
24
  ['[玄始暦=]452.01.01', '@CR', '452-01-01^ChineseTwin::玄始暦'],
25
- ['[正光暦=]523.01.01', '@CR', '523-01-01^ChineseTwin::正光暦'],
25
+ ['[正光暦=]523.01.01', '@CR', '523-01-01^ChineseTwin::正光暦', '566'],
26
26
  ['[興和暦=]540.01.01', '@CR', '540-01-01^ChineseTwin::興和暦'],
27
- ['[天保暦=]551.01.01', '@CR', '551-01-01^ChineseTwin::天保暦'],
27
+ ['[天保暦=]551.01.01', '@CR', '551-01-01^ChineseTwin::天保暦', '578'],
28
28
  ['[天和暦=]566.01.01', '@CR', '566-01-01^ChineseTwin::天和暦'],
29
29
  ['[大象暦=]579.01.01', '@CR', '579-01-01^ChineseTwin::大象暦'],
30
30
  ['[開皇暦=]584.01.01', '@CR', '584-01-01^ChineseTwin::開皇暦'],
@@ -46,17 +46,17 @@ module When
46
46
  'locale:[=ja:, en=en:]',
47
47
  'area:[中国の節月=, *ChineseSolar=]',
48
48
  ['[太初暦]1.01.01', '@CR', '1-01-01^ChineseTwin::太初暦(節月)'], # 西暦が正になるところから開始(実際は-103.01.15)
49
- ['[四分暦]85.01.07', '@CR', '85-01-07^ChineseTwin::四分暦(節月)'],
50
- ['[乾象暦]221.12.23', '@CR', '221-12-23^ChineseTwin::乾象暦(節月)'],
51
- ['[景初暦]237.01.07', '@CR', '237-01-07^ChineseTwin::景初暦(節月)'],
49
+ ['[四分暦]85.01.07', '@CR', '85-01-07^ChineseTwin::四分暦(節月)', '264-12-28'],
50
+ ['[乾象暦]221.12.23', '@CR', '221-12-23^ChineseTwin::乾象暦(節月)', '280-12-31'],
51
+ ['[景初暦]237.01.07', '@CR', '237-01-07^ChineseTwin::景初暦(節月)', '451-12-31'],
52
52
  ['[元嘉暦]444.12.22', '@CR', '444-12-22^ChineseTwin::元嘉暦(節月)'],
53
- ['[大明暦]509.12.23', '@CR', '509-12-23^ChineseTwin::大明暦(節月)'],
54
- ['[三紀暦=]384.01.02', '@CR', '384-01-02^ChineseTwin::三紀暦(節月)'],
55
- ['[玄始暦=]411.12.26', '@CR', '411-12-26^ChineseTwin::玄始暦(節月)'],
53
+ ['[大明暦]509.12.23', '@CR', '509-12-23^ChineseTwin::大明暦(節月)', '590-01-08'],
54
+ ['[三紀暦=]384.01.02', '@CR', '384-01-02^ChineseTwin::三紀暦(節月)', '418-01-16'],
55
+ ['[玄始暦=]411.12.26', '@CR', '411-12-26^ChineseTwin::玄始暦(節月)', '440-01-15'],
56
56
  ['[玄始暦=]452.01.02', '@CR', '452-01-02^ChineseTwin::玄始暦(節月)'],
57
- ['[正光暦=]522.12.29', '@CR', '522-12-29^ChineseTwin::正光暦(節月)'],
57
+ ['[正光暦=]522.12.29', '@CR', '522-12-29^ChineseTwin::正光暦(節月)', '566-01-04'],
58
58
  ['[興和暦=]539.12.22', '@CR', '539-12-22^ChineseTwin::興和暦(節月)'],
59
- ['[天保暦=]550.12.19', '@CR', '550-12-19^ChineseTwin::天保暦(節月)'],
59
+ ['[天保暦=]550.12.19', '@CR', '550-12-19^ChineseTwin::天保暦(節月)', '577-12-21'],
60
60
  ['[天和暦=]566.01.05', '@CR', '566-01-05^ChineseTwin::天和暦(節月)'],
61
61
  ['[大象暦=]579.01.11', '@CR', '579-01-11^ChineseTwin::大象暦(節月)'],
62
62
  ['[開皇暦=]584.01.16', '@CR', '584-01-16^ChineseTwin::開皇暦(節月)'],