when_exe 0.4.2 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (144) hide show
  1. checksums.yaml +5 -5
  2. data/LICENSE.ja.txt +8 -21
  3. data/LICENSE.txt +5 -27
  4. data/README.md +25 -79
  5. data/bin/.pryrc +9 -0
  6. data/bin/make_ttl.rb +3 -2
  7. data/bin/make_ttl.rb.config +3 -3
  8. data/lib/when_exe.rb +101 -5
  9. data/lib/when_exe/basictypes.rb +47 -16
  10. data/lib/when_exe/calendarnote.rb +27 -18
  11. data/lib/when_exe/calendartypes.rb +12 -50
  12. data/lib/when_exe/coordinates.rb +37 -391
  13. data/lib/when_exe/ephemeris.rb +53 -14
  14. data/lib/when_exe/ephemeris/eclipse.rb +8 -8
  15. data/lib/when_exe/ephemeris/moon.rb +333 -333
  16. data/lib/when_exe/ephemeris/notes.rb +29 -17
  17. data/lib/when_exe/ephemeris/phase_table.rb +825 -0
  18. data/lib/when_exe/ephemeris/term_table.rb +603 -0
  19. data/lib/when_exe/events.rb +1888 -0
  20. data/lib/when_exe/google_api.rb +26 -31
  21. data/lib/when_exe/icalendar.rb +129 -12
  22. data/lib/when_exe/inspect.rb +5 -5
  23. data/lib/when_exe/linkeddata.rb +43 -23
  24. data/lib/when_exe/locales/akt.rb +63 -0
  25. data/lib/when_exe/locales/encoding_conversion.rb +134 -134
  26. data/lib/when_exe/locales/iast.rb +90 -90
  27. data/lib/when_exe/locales/locale.rb +88 -18
  28. data/lib/when_exe/locales/transliteration_table.rb +62 -62
  29. data/lib/when_exe/mini_application.rb +14 -8
  30. data/lib/when_exe/namespace.rb +42 -0
  31. data/lib/when_exe/parts/enumerator.rb +16 -5
  32. data/lib/when_exe/parts/geometric_complex.rb +52 -2
  33. data/lib/when_exe/parts/method_cash.rb +229 -224
  34. data/lib/when_exe/parts/resource.rb +65 -35
  35. data/lib/when_exe/parts/timezone.rb +25 -34
  36. data/lib/when_exe/region/balinese.rb +5 -3
  37. data/lib/when_exe/region/chinese.rb +39 -11
  38. data/lib/when_exe/region/chinese/calendars.rb +1016 -1016
  39. data/lib/when_exe/region/chinese/epochs.rb +7 -7
  40. data/lib/when_exe/region/chinese/notes.rb +3 -3
  41. data/lib/when_exe/region/chinese/twins.rb +134 -11
  42. data/lib/when_exe/region/dee.rb +4 -4
  43. data/lib/when_exe/region/discordian.rb +1 -1
  44. data/lib/when_exe/region/geologicalage.rb +139 -128
  45. data/lib/when_exe/region/hanke_henry.rb +4 -4
  46. data/lib/when_exe/region/indian.rb +77 -8
  47. data/lib/when_exe/region/international_fixed.rb +3 -3
  48. data/lib/when_exe/region/islamic.rb +1 -1
  49. data/lib/when_exe/region/japanese.rb +12 -8
  50. data/lib/when_exe/region/japanese/calendars.rb +397 -397
  51. data/lib/when_exe/region/japanese/eclipses.rb +1194 -1194
  52. data/lib/when_exe/region/japanese/epochs.rb +8 -4
  53. data/lib/when_exe/region/japanese/location.rb +93 -0
  54. data/lib/when_exe/region/japanese/nihon_shoki.rb +70 -70
  55. data/lib/when_exe/region/japanese/notes.rb +57 -18
  56. data/lib/when_exe/region/japanese/residues.rb +33 -11
  57. data/lib/when_exe/region/japanese/twins.rb +27 -14
  58. data/lib/when_exe/region/japanese/weeks.rb +7 -7
  59. data/lib/when_exe/region/korean.rb +384 -384
  60. data/lib/when_exe/region/location.rb +40 -0
  61. data/lib/when_exe/region/martian.rb +1 -1
  62. data/lib/when_exe/region/mayan.rb +2 -2
  63. data/lib/when_exe/region/roman.rb +2 -2
  64. data/lib/when_exe/region/ryukyu.rb +101 -101
  65. data/lib/when_exe/region/saudi_arabian.rb +57 -0
  66. data/lib/when_exe/region/shire.rb +1 -1
  67. data/lib/when_exe/region/world.rb +3 -3
  68. data/lib/when_exe/region/zoroastrian.rb +1 -1
  69. data/lib/when_exe/spatial.rb +611 -0
  70. data/lib/when_exe/timestandard.rb +9 -7
  71. data/lib/when_exe/tmobjects.rb +34 -2
  72. data/lib/when_exe/tmposition.rb +225 -1322
  73. data/lib/when_exe/tmptypes.rb +1279 -0
  74. data/lib/when_exe/tmreference.rb +42 -7
  75. data/lib/when_exe/version.rb +3 -3
  76. data/test/events/example-datasets +6 -0
  77. data/test/events/history-dataset.csv +22 -0
  78. data/test/events/japanese-holiday-index.csv +28 -0
  79. data/test/events/japanese-holiday.csv +94 -0
  80. data/test/events/japanese-holiday.ttl +948 -0
  81. data/test/events/make_events_ttl.rb +18 -0
  82. data/test/events/mori_wikichoshi.csv +14 -0
  83. data/test/events/ndl_koyomi.csv +220 -0
  84. data/test/events/ndl_koyomi_index.csv +44 -0
  85. data/test/events/primeminister-dataset.csv +19 -0
  86. data/test/events/shogun-dataset.csv +22 -0
  87. data/test/events/test-history-dataset-edge-sparql.csv +26 -0
  88. data/test/events/test-history-dataset-edge.csv +27 -0
  89. data/test/events/test-history-dataset-sparql.csv +22 -0
  90. data/test/events/test-history-dataset.csv +23 -0
  91. data/test/events/test-history-events-edge.ttl +89 -0
  92. data/test/events/test-history-events.csv +6 -0
  93. data/test/examples/JapanHolidays.ics +2 -2
  94. data/test/examples/JapanHolidaysRFC6350.ics +3 -3
  95. data/test/examples/Residue.m17n +2 -2
  96. data/test/examples/Spatial.m17n +3 -3
  97. data/test/examples/Terms.m17n +3 -3
  98. data/test/scripts/8.ext.rb +6 -6
  99. data/test/scripts/8.rb +6 -6
  100. data/test/scripts/geometric_complex.rb +41 -41
  101. data/test/scripts/korea.rb +59 -59
  102. data/test/scripts/thai.rb +36 -36
  103. data/test/test.rb +6 -0
  104. data/test/test/basictypes.rb +431 -431
  105. data/test/test/calendarnote.rb +86 -86
  106. data/test/test/calendartypes.rb +97 -97
  107. data/test/test/coordinates.rb +399 -397
  108. data/test/test/ephemeris.rb +115 -115
  109. data/test/test/ephemeris/moon.rb +14 -14
  110. data/test/test/ephemeris/planets.rb +14 -14
  111. data/test/test/ephemeris/sun.rb +14 -14
  112. data/test/test/events.rb +32 -0
  113. data/test/test/google_api.rb +45 -32
  114. data/test/test/inspect.rb +153 -153
  115. data/test/test/parts.rb +488 -488
  116. data/test/test/region/armenian.rb +20 -20
  117. data/test/test/region/bahai.rb +58 -58
  118. data/test/test/region/balinese.rb +34 -34
  119. data/test/test/region/chinese.rb +229 -229
  120. data/test/test/region/christian.rb +226 -226
  121. data/test/test/region/coptic.rb +27 -27
  122. data/test/test/region/discordian.rb +20 -20
  123. data/test/test/region/french.rb +33 -33
  124. data/test/test/region/geologicalage.rb +17 -17
  125. data/test/test/region/indian.rb +14 -1
  126. data/test/test/region/iran.rb +54 -54
  127. data/test/test/region/islamic.rb +64 -54
  128. data/test/test/region/japanese.rb +281 -261
  129. data/test/test/region/jewish.rb +63 -63
  130. data/test/test/region/m17n.rb +21 -21
  131. data/test/test/region/mayan.rb +17 -16
  132. data/test/test/region/reforms.rb +2 -2
  133. data/test/test/region/residue.rb +7 -7
  134. data/test/test/region/shire.rb +58 -58
  135. data/test/test/region/swedish.rb +45 -45
  136. data/test/test/region/thai.rb +116 -116
  137. data/test/test/region/tibetan.rb +30 -30
  138. data/test/test/region/vietnamese.rb +102 -102
  139. data/test/test/region/zoroastrian.rb +58 -58
  140. data/test/test/timestandard.rb +81 -81
  141. data/test/test/tmobjects.rb +402 -402
  142. data/test/test/tmposition.rb +66 -4
  143. data/test/test/tmreference.rb +157 -157
  144. metadata +36 -93
data/lib/when_exe/region/chinese/epochs.rb CHANGED
@@ -610,7 +610,7 @@ module When
610
610
  ["[皇泰]1" , "@A","name=[恭帝=ja:%%<恭帝トウ>];618-05-24^ChineseTwin?note=Chinese::大業暦", "619-04-08"], # 戊辰 5791-26
611
611
  [self,
612
612
  "period:[鄭<王世充>=ja:%%<王世充>]",
613
- ["[開明=ja:%%<開明_(王世充)>]1" ,"@F" ,"name=[王世充];619-04-08^ChineseTwin?note=Chinese::大業暦", "621-05-{丁卯}"] # 丙午 5853-45, 621-05-09=は丁卯
613
+ ["[開明=ja:%%<開明_(王世充)>]1" ,"@F" ,"name=[王世充];619-04-08^ChineseTwin?note=Chinese::大業暦", "621-05-{1丁卯}"] # 丙午 5853-45, 621-05-09=は丁卯
614
614
  ],
615
615
  [self,
616
616
  "period:[梁<蕭銑>=ja:%%<蕭銑>]",
@@ -643,11 +643,11 @@ module When
643
643
  [self,
644
644
  "period:[夏<竇建徳>=ja:%%<竇建徳>]",
645
645
  ["[丁丑=ja:%%<丁丑_(夏)>]1", "@F", "name=[竇建徳];617-01-05^ChineseTwin?note=Chinese::大業暦"], # 丙辰 5718-2
646
- ["[五鳳=ja:%%<五鳳_(夏)>]1", "", " 618-07", "621-05-{丁卯}"] # 5805-54, 621-05-09=は丁卯
646
+ ["[五鳳=ja:%%<五鳳_(夏)>]1", "", " 618-07", "621-05-{1丁卯}"] # 5805-54, 621-05-09=は丁卯
647
647
  ],
648
648
  [self,
649
649
  "period:[漢東<劉黒闥>=ja:%%<劉黒闥>]",
650
- ["[天造]1" , "@F" ,"name=[劉黒闥];622-01^ChineseTwin?note=Chinese::大業暦", "623-01-{庚辰}"] # 5942-1, 623-01-03=は庚辰
650
+ ["[天造]1" , "@F" ,"name=[劉黒闥];622-01^ChineseTwin?note=Chinese::大業暦", "623-01-{1庚辰}"] # 5942-1, 623-01-03=は庚辰
651
651
  ],
652
652
  [self,
653
653
  "period:[魏<李密>=ja:%%<李密_(隋)>]",
@@ -659,11 +659,11 @@ module When
659
659
  ],
660
660
  [self,
661
661
  "period:[涼<李軌>=ja:%%<李軌>]",
662
- ["[安楽=ja:%%<安楽_(年号)>]1" , "@F" ,"name=[李軌];618-11-04^ChineseTwin?note=Chinese::大業暦", "619-05-{辛巳}"] # 乙巳 5820-28, 619-05-13=は辛巳
662
+ ["[安楽=ja:%%<安楽_(年号)>]1" , "@F" ,"name=[李軌];618-11-04^ChineseTwin?note=Chinese::大業暦", "619-05-{1辛巳}"] # 乙巳 5820-28, 619-05-13=は辛巳
663
663
  ],
664
664
  [self,
665
665
  "period:[燕<高開道>=ja:%%<高開道>]",
666
- ["[始興=ja:%%<始興_(高開道)>]1" ,"@F" ,"name=[高開道];618-12^ChineseTwin?note=Chinese::大業暦", "620-10-{己酉}"] # 5833-47, 620-10-19=は己酉
666
+ ["[始興=ja:%%<始興_(高開道)>]1" ,"@F" ,"name=[高開道];618-12^ChineseTwin?note=Chinese::大業暦", "620-10-{1己酉}"] # 5833-47, 620-10-19=は己酉
667
667
  ],
668
668
  [self,
669
669
  "period:[乗<高曇晟>=ja:%%<高曇晟>]",
@@ -744,7 +744,7 @@ module When
744
744
  ["[至徳=ja:%%<至徳_(唐)>]1" , "@A" , "name=[粛宗=ja:%%<粛宗_(唐)>];756-07-12"], # 甲子
745
745
  ["[乾元=ja:%%<乾元_(唐)>]1" , "" , " 758-02-05"], # 丁未
746
746
  ["[粛宗#上元=ja:%%<上元_(唐粛宗)>]1", "" , " 760-04=19"], # 己卯
747
- ["[<粛宗>=http://zh.wikisource.org/wiki/%%<去上元年號大赦文>]1" ,"","name=[粛宗=ja:%%<粛宗_(唐)>];761-09-21", '762*11^Chinese#{C:0761}', ""], # 壬寅
747
+ ["[<粛宗>=https://zh.wikisource.org/wiki/%%<去上元年號大赦文>]1" ,"","name=[粛宗=ja:%%<粛宗_(唐)>];761-09-21", '762*11^Chinese#{C:0761}', ""], # 壬寅
748
748
  ["[宝応]1" , "@A" , 'name=[代宗=ja:%%<代宗_(唐)>];762-04-15^Chinese#{A:0523}'], # 甲子 本年から五紀暦を使用
749
749
  ["[広徳=ja:%%<広徳_(唐)>]1" , "" , " 763-07-11"], # 壬子
750
750
  ["[永泰=ja:%%<永泰_(唐)>]1" , "" , " 765-01-01"], # 癸巳
@@ -754,7 +754,7 @@ module When
754
754
  ["[貞元=ja:%%<貞元_(唐)>]1" , "" , " 785-01-01"], # 丁酉
755
755
  ["[永貞=ja:%%<永貞_(唐)>]1" , "@A" , "name=[順宗=ja:%%<順宗_(唐)>];805-08-05"], # 辛丑
756
756
  ["[元和=ja:%%<元和_(唐)>]1" , "@A" , "name=[憲宗=ja:%%<憲宗_(唐)>];806-01-02"], # 丁卯 元和２年から観象暦を使用
757
- ["[長慶]1" , "@A" , "name=[穆宗=ja:%%<穆宗_(唐)>];821-01-{辛丑}"], # 辛丑 長慶２年から宣明暦を使用
757
+ ["[長慶]1" , "@A" , "name=[穆宗=ja:%%<穆宗_(唐)>];821-01-{1辛丑}"], # 辛丑 長慶２年から宣明暦を使用
758
758
  ["[宝暦=ja:%%<宝暦_(唐)>]1" , "@A" , "name=[敬宗];825-01-07"], # 辛亥
759
759
  ["[大和=ja:%%<大和_(唐)>,alias:太和=ja:%%<大和_(唐)>]1" ,"@A","name=[文宗=ja:%%<文宗_(唐)>];827-02-13"], # 乙巳
760
760
  ["[開成=ja:%%<開成_(唐)>]1" , "" , " 836-01-01"], # 辛丑
data/lib/when_exe/region/chinese/notes.rb CHANGED
@@ -94,7 +94,7 @@ module When
94
94
  # @return [When::Coordinates::Residue] 六十干支
95
95
  #
96
96
  def year(date, options={})
97
- When.Residue('干支')[(date.most_significant_coordinate-4) % 60]
97
+ When.Resource('_co:Common::干支')[(date.most_significant_coordinate-4) % 60]
98
98
  end
99
99
 
100
100
  #
@@ -106,7 +106,7 @@ module When
106
106
  # @return [When::Coordinates::Residue] 七曜
107
107
  #
108
108
  def week(date, options={})
109
- When.Residue('Week')[date.to_i % 7]
109
+ When.Resource('_co:Common::Week')[date.to_i % 7]
110
110
  end
111
111
 
112
112
  #
@@ -118,7 +118,7 @@ module When
118
118
  # @return [When::Coordinates::Residue] 六十干支
119
119
  #
120
120
  def stembranch(date, options={})
121
- When.Residue('干支')[(date.to_i-11) % 60]
121
+ When.Resource('_co:Common::干支')[(date.to_i-11) % 60]
122
122
  end
123
123
 
124
124
  #
data/lib/when_exe/region/chinese/twins.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  =begin
3
- Copyright (C) 2011-2015 Takashi SUGA
3
+ Copyright (C) 2011-2021 Takashi SUGA
4
4
 
5
5
  You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
6
6
  =end
@@ -31,13 +31,14 @@ module When
31
31
  ['[大業暦=]597.01.01', '@CR', '597-01-01^ChineseTwin::大業暦', '619-01-01='],
32
32
  ['[戊寅元暦]619.01.01', '@CR', '619-01-01^ChineseTwin::戊寅元暦'],
33
33
  ['[平朔戊寅暦=]645.01.01','@CR','645-01-01^ChineseTwin::平朔戊寅暦'],
34
- ['[麟徳暦]665.01.01', '@CR', '665-01-01^ChineseTwin::麟徳暦'],
34
+ ['[麟徳暦]666.01.01', '@CR', '666-01-01^ChineseTwin::麟徳暦'],
35
35
  ['[大衍暦]729.01.01', '@CR', '729-01-01^ChineseTwin::大衍暦'],
36
36
  ['[五紀暦]762.01.01', '@CR', '762-01-01^ChineseTwin::五紀暦'],
37
37
  ['[正元暦=]784.01.01', '@CR', '784-01-01^ChineseTwin::正元暦', '807-01-01'],
38
38
  ['[宣明暦]822.01.01', '@CR', '822-01-01^ChineseTwin::宣明暦'],
39
39
  ['[崇玄暦=]893.01.01', '@CR', '893-01-01^ChineseTwin::崇玄暦', '956-01-01'],
40
- ['[授時暦]1281.01.01', '@CR','1281-01-01^ChineseTwin::授時暦'],
40
+ ['[古授時暦=]1281.01.01','@CR','1281-01-01^ChineseTwin::古授時暦'],
41
+ ['[授時暦]1284.01.01', '@CR','1284-01-01^ChineseTwin::授時暦'],
41
42
  ['[大統暦]1368.01.01', '@CR','1368-01-01^ChineseTwin::大統暦', '1645-01-01']
42
43
  ]]
43
44
 
@@ -62,13 +63,14 @@ module When
62
63
  ['[開皇暦=]584.01.16', '@CR', '584-01-16^ChineseTwin::開皇暦(節月)', '596.12.22='],
63
64
  ['[大業暦=]596.12.22', '@CR', '596-12-22^ChineseTwin::大業暦(節月)'],
64
65
  ['[戊寅元暦]618.12.19', '@CR', '618-12-19^ChineseTwin::戊寅元暦(節月)'],
65
- ['[麟徳暦]664.12.21', '@CR', '664-12-21^ChineseTwin::麟徳暦(節月)'],
66
+ ['[麟徳暦]666.01.09', '@CR', '666-01-09^ChineseTwin::麟徳暦(節月)'],
66
67
  ['[大衍暦]729.01.03', '@CR', '729-01-03^ChineseTwin::大衍暦(節月)'],
67
68
  ['[五紀暦]761.12.29', '@CR', '761-12-29^ChineseTwin::五紀暦(節月)'],
68
69
  ['[正元暦=]783.12.26', '@CR', '783-12-26^ChineseTwin::正元暦(節月)', '807-01-11'],
69
70
  ['[宣明暦]821.01.01', '@CR', '821-01-01^ChineseTwin::宣明暦(節月)'], # 年の始めに遡って開始(実際は12.27)
70
71
  ['[崇玄暦=]892.12.22', '@CR', '892-12-22^ChineseTwin::崇玄暦(節月)', '956-01-15'],
71
- ['[授時暦]1280.01.01', '@CR', '1280-01-01^ChineseTwin::授時暦(節月)'],
72
+ ['[古授時暦=]1280.01.01','@CR','1280-01-01^ChineseTwin::古授時暦(節月)'],
73
+ ['[授時暦]1283.12.21', '@CR', '1283-12-21^ChineseTwin::授時暦(節月)'],
72
74
  ['[大統暦]1367.12.24', '@CR', '1367-12-24^ChineseTwin::大統暦(節月)', '1644-12-24']
73
75
  ]]
74
76
  end
@@ -103,6 +105,24 @@ module When
103
105
  ]
104
106
  }
105
107
 
108
+ _chinese_revision ={
109
+ 'lunation_shift' => 20.2050, # 閏應(暦元前経朔から暦元天正冬至までの日数)
110
+ 'anomalistic_month_shift' => 13.0205 # 転應(暦元前近/遠地点通過から暦元天正冬至までの日数)
111
+ }
112
+
113
+ _chinese_uighur ={
114
+ 'day_epoch' => 2182717.1106, # 暦元天正冬至のユリウス日
115
+ 'year_epoch' => 1264, # 暦元の西暦年
116
+ 'year_length' => 365.2436, # 暦元の冬至年 / 日
117
+ 'lunation_length' => 29.5306, # 朔実(朔望月)
118
+ 'lunation_shift' => 12.6549, # 閏應(暦元前経朔から暦元天正冬至までの日数)
119
+ 'anomalistic_month_length' => 27.5546, # 転終(近点月)
120
+ 'anomalistic_month_shift' => 23.2836, # 転終應(暦元雨水前近地点通過から暦元雨水前経朔までの日数)
121
+ 'anomaly_method' => 'u', # (経朔-定朔)の計算方法(u:Chinese-Uighur)
122
+ 'lunar_unit' => 27.5546 / 248, # 太陰遅速計算用招差法定数の時間の単位(限)
123
+ 'solar_weight' => 0, # (経朔-定朔)の計算で用いる実行差での太陽盈縮の重み(0:非考慮,1:考慮)
124
+ }
125
+
106
126
  ChineseTwin = [{}, When::BasicTypes::M17n, ChineseSolar.twin('ChineseTwin', [
107
127
  "locale:[=ja:, en=en:, alias]",
108
128
  "area:[中国,China]",
@@ -320,7 +340,7 @@ module When
320
340
  # 'rissei' => 'B',
321
341
  'method' => '#{Method:A}',
322
342
  's' => [
323
- # 消息總 盈朒積 立成b 立成c
343
+ # 消息總 盈朒積 初率b 別差c
324
344
  [ 0.0, 0, +3.9546, -0.0372], # 冬至
325
345
  [ -722.0, +54, +3.4091, -0.0372], # 小寒
326
346
  [-1340.0, +100, +2.8636, -0.0372], # 大寒
@@ -398,7 +418,7 @@ module When
398
418
  'anomalistic_month_length' => '6701279/243200', # 27.0 +(1685.0+79.0/80)/3040,
399
419
  # 'rissei' => 'C',
400
420
  's' => [
401
- # 先後數 朓朒積 立成b 立成c
421
+ # 先後數 朓朒積 初率b 別差c
402
422
  [ 0.0, 0, +13.4524, -0.1886], # 冬至
403
423
  [-2353.0, +176, +10.5564, -0.1634], # 小寒
404
424
  [-4198.0, +314, +8.0408, -0.1446], # 大寒
@@ -476,7 +496,7 @@ module When
476
496
  'anomalistic_month_length' => '1366156/49580', # 27.0 + (743.0+5.0/37)/1340,
477
497
  # 'rissei' => 'C',
478
498
  's' => [
479
- # 先後數 朓朒積 立成b 立成c
499
+ # 先後數 朓朒積 初率b 別差c
480
500
  [ 0.0, 0, +5.9668, -0.0843], # 冬至
481
501
  [-1037.0, +78, +4.6652, -0.0721], # 小寒
482
502
  [-1850.0, +139, +3.5656, -0.0653], # 大寒
@@ -633,7 +653,7 @@ module When
633
653
  'anomalistic_month_length' => '23145819/840000', # 27.0 + 4658.19 / 8400,
634
654
  # 'rissei' => 'C',
635
655
  's' => [
636
- # 先後數 朓朒数 立成b 立成c
656
+ # 先後數 朓朒数 初率b 別差c
637
657
  [ 0.0, 0, +33.4511, -0.3695], # 冬至
638
658
  [ -6000.0, +449, +28.0389, -0.3606], # 小寒
639
659
  [-11000.0, +823, +22.6998, -0.3519], # 大寒
@@ -776,7 +796,98 @@ module When
776
796
  ],
777
797
 
778
798
  [ChineseLuniSolar,
779
- 'name:[授時暦]',
799
+ 'name:[重修大明暦=]',
800
+ 'time_basis:+00,+#{P:06:30}',
801
+ {'formula'=>['12S', '1L'].map {|f| [
802
+ Ephemeris::ChineseTrueLunation, {
803
+ 'formula' => f,
804
+ 'day_epoch' => -32372914549,
805
+ 'year_length' => '1910224/5230', # 365.0+1274/5230(日法)
806
+ 'lunation_length' => '154445/5230', # 29.0+2775/5230
807
+ 'anomalistic_month_length' => '1441106066/52300000', # 27.0+2900.6066(轉終日)/5230
808
+ 'denominator' => 5230,
809
+ 'rissei' => 'c',
810
+ 's' => [
811
+ # 盈縮分 朓朒積
812
+ [ 0*0.523, 0], # 冬至
813
+ [ -7059*0.523, +276], # 小寒
814
+ [-12979*0.523, +508], # 大寒
815
+ [-17697*0.523, +693], # 立春
816
+ [-21150*0.523, +828], # 雨水
817
+ [-23276*0.523, +911], # 啓蟄
818
+ [-24015*0.523, +940], # 春分
819
+ [-23276*0.523, +911], # 清明
820
+ [-21150*0.523, +828], # 穀雨
821
+ [-17697*0.523, +693], # 立夏
822
+ [-12979*0.523, +508], # 小満
823
+ [ -7059*0.523, +276], # 芒種
824
+ [ 0*0.523, 0], # 夏至
825
+ [ +7059*0.523, -276], # 小暑
826
+ [+12979*0.523, -508], # 大暑
827
+ [+17697*0.523, -693], # 立秋
828
+ [+21150*0.523, -828], # 処暑
829
+ [+23276*0.523, -911], # 白露
830
+ [+24015*0.523, -940], # 秋分
831
+ [+23276*0.523, -911], # 寒露
832
+ [+21150*0.523, -828], # 霜降
833
+ [+17697*0.523, -693], # 立冬
834
+ [+12979*0.523, -508], # 小雪
835
+ [ +7059*0.523, -276], # 大雪
836
+ ],
837
+ 'm' => [
838
+ #(変日差) 損益率
839
+ [ 5230.0, -513], # １日
840
+ [ 5230.0, -469], # ２日
841
+ [ 5230.0, -411], # ３日
842
+ [ 5230.0, -332], # ４日
843
+ [ 5230.0, -343], # ５日
844
+ [ 5230.0, -141], # ６日
845
+ [ 4647.65, -43], # ７日
846
+ [ 582.35, +4], # ７日
847
+ [ 5230.0, +63], # ８日
848
+ [ 5230.0, +164], # ９日
849
+ [ 5230.0, +258], # 10日
850
+ [ 5230.0, +352], # 11日
851
+ [ 5230.0, +427], # 12日
852
+ [ 5230.0, +481], # 13日
853
+ [ 4065.30, +403], # 14日
854
+ [ 1164.70, +117], # 14日
855
+ [ 5230.0, +505], # 15日
856
+ [ 5230.0, +462], # 16日
857
+ [ 5230.0, +395], # 17日
858
+ [ 5230.0, +309], # 18日
859
+ [ 5230.0, +219], # 19日
860
+ [ 5230.0, +117], # 20日
861
+ [ 3482.95, +27], # 21日
862
+ [ 1747.05, -11], # 21日
863
+ [ 5230.0, -86], # 22日
864
+ [ 5230.0, -184], # 23日
865
+ [ 5230.0, -278], # 24日
866
+ [ 5230.0, -368], # 25日
867
+ [ 5230.0, -438], # 26日
868
+ [ 5230.0, -493], # 27日
869
+ [ 2900.6066,-293] # 28日
870
+ ]
871
+ }]
872
+ }
873
+ }
874
+ ],
875
+
876
+ [ChineseLuniSolar,
877
+ 'name:[キタイ暦=https://www2.nao.ac.jp/~mitsurusoma/gendai5/26_suga.pdf]',
878
+ 'time_basis:+00,+#{P:06}',
879
+ {'formula'=>['12S', '1L'].map {|f| [
880
+ Ephemeris::ChineseTrueLunation, _chinese_uighur.merge({
881
+ 'formula' => f,
882
+ 'year_delta' => 0, # 冬至年の変化率 / (10^(-6)日/年)
883
+ 'year_span' => 1 # 冬至年の改訂周期 / 年
884
+ })]
885
+ }
886
+ }
887
+ ],
888
+
889
+ [ChineseLuniSolar,
890
+ 'name:[古授時暦]',
780
891
  {'formula'=>['12S', '1L'].map {|f| [
781
892
  Ephemeris::ChineseTrueLunation, _chinese_common.merge({
782
893
  'formula' => f,
@@ -787,10 +898,22 @@ module When
787
898
  }
788
899
  ],
789
900
 
901
+ [ChineseLuniSolar,
902
+ 'name:[授時暦]',
903
+ {'formula'=>['12S', '1L'].map {|f| [
904
+ Ephemeris::ChineseTrueLunation, _chinese_common.merge(_chinese_revision).merge({
905
+ 'formula' => f,
906
+ 'year_delta' => 1, # 冬至年の変化率 / (10^(-6)日/年)
907
+ 'year_span' => 100 # 冬至年の改訂周期 / 年
908
+ })]
909
+ }
910
+ }
911
+ ],
912
+
790
913
  [ChineseLuniSolar,
791
914
  'name:[大統暦]',
792
915
  {'formula'=>['12S', '1L'].map {|f| [
793
- Ephemeris::ChineseTrueLunation, _chinese_common.merge({
916
+ Ephemeris::ChineseTrueLunation, _chinese_common.merge(_chinese_revision).merge({
794
917
  'formula' => f,
795
918
  'year_delta' => 0, # 冬至年の変化率 / (10^(-6)日/年)
796
919
  'year_span' => 1 # 冬至年の改訂周期 / 年
data/lib/when_exe/region/dee.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  =begin
3
- Copyright (C) 2014 Takashi SUGA
3
+ Copyright (C) 2014-2016 Takashi SUGA
4
4
 
5
5
  You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
6
6
  =end
@@ -10,10 +10,10 @@ module When
10
10
  class BasicTypes::M17n
11
11
 
12
12
  Dee = [self, [
13
- "namespace:[en=http://www.hermetic.ch/cal_stud/]",
13
+ "namespace:[en=http://calendars.wikia.com/wiki/]",
14
14
  "locale:[=en:, ja]",
15
- "names:[Dee=en:dee-cecil-calendar.htm, ディー暦=]",
16
- "[DeeCecil=en:dee-cecil-calendar.htm, ディー-セシル暦=]"
15
+ "names:[Dee=en:Dee_calendar, ディー暦=]",
16
+ "[DeeCecil=en:Dee-Cecil_calendar, ディー-セシル暦=]"
17
17
  ]]
18
18
  end
19
19
 
data/lib/when_exe/region/discordian.rb CHANGED
@@ -25,7 +25,7 @@ module When
25
25
  class CalendarNote::DiscordianWeek < CalendarNote::Week
26
26
 
27
27
  Notes = [When::BasicTypes::M17n, [
28
- "namespace:[en=http://en.wiktionary.org/wiki/]",
28
+ "namespace:[en=https://en.wiktionary.org/wiki/]",
29
29
  "locale:[=en:, ja=ja:]",
30
30
  "names:[Discordian]",
31
31
 
data/lib/when_exe/region/geologicalage.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  =begin
3
- Copyright (C) 2011-2015 Takashi SUGA
3
+ Copyright (C) 2011-2020 Takashi SUGA
4
4
 
5
5
  You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
6
6
  =end
@@ -8,10 +8,10 @@
8
8
  class When::TM::OrdinalReferenceSystem
9
9
 
10
10
  #
11
- # Geological Ages
11
+ # Geological Ages - http://www.stratigraphy.org/ICSchart/ChronostratChart2020-01.pdf
12
12
  #
13
13
  GeologicalAge = [self, [
14
- "locale:[=ja:, en=en:]",
14
+ "locale:[=ja:, *en=en:]",
15
15
  "*area:[地球,Earth]",
16
16
 
17
17
  [When::TM::OrdinalEra,
@@ -19,7 +19,7 @@ class When::TM::OrdinalReferenceSystem
19
19
  "begin:-4_600_000_000-"
20
20
  ],
21
21
  [When::TM::OrdinalEra,
22
- "namespace:[root=http://ja.wikipedia.org/wiki/%%<始生代>#]",
22
+ "namespace:[root=https://ja.wikipedia.org/wiki/%%<始生代>#]",
23
23
  "*eon:[始生代,Archean]",
24
24
  [When::TM::OrdinalEra,
25
25
  "*era:[原始生代=root:%.<原始生代_(Eoarchean)>,Eoarchean]",
@@ -82,10 +82,10 @@ class When::TM::OrdinalReferenceSystem
82
82
  ],
83
83
  [When::TM::OrdinalEra,
84
84
  "*period:[クリオジェニアン,Cryogenian]",
85
- "begin:-850_000_000-"
85
+ "begin:-720_000_000-"
86
86
  ],
87
87
  [When::TM::OrdinalEra,
88
- "*period:[エディアカラ紀,Ediacaran]",
88
+ "*period:[エディアカラン,Ediacaran]",
89
89
  "begin:-635_000_000-"
90
90
  ]
91
91
  ]
@@ -97,55 +97,55 @@ class When::TM::OrdinalReferenceSystem
97
97
  [When::TM::OrdinalEra,
98
98
  "*period:[カンブリア紀,Cambrian]",
99
99
  [When::TM::OrdinalEra,
100
- "*epoch:[テレニュービアン=,Terreneuvian=]",
100
+ "*epoch:[テレニュービアン=,Terreneuvian]",
101
101
  [When::TM::OrdinalEra,
102
- "*age:[フォルツニアン=,Fortunian=]",
103
- "begin:-542_000_000-"
102
+ "*age:[フォルツニアン=,Fortunian]",
103
+ "begin:-541_000_000-"
104
104
  ],
105
105
  [When::TM::OrdinalEra,
106
- "*age:[第2期=,Age_2=]",
107
- "begin:-528_000_000-"
106
+ "*age:[第2期=,Age_2=en_wiki:Cambrian_Stage_2]",
107
+ "begin:-529_000_000-"
108
108
  ]
109
109
  ],
110
110
  [When::TM::OrdinalEra,
111
- "*epoch:[第2世=,Epoch_2=]",
111
+ "*epoch:[第2世=,Epoch_2=en_wiki:Cambrian_Series_2]",
112
112
  [When::TM::OrdinalEra,
113
- "*age:[第3期=,Age_3=]",
113
+ "*age:[第3期=,Age_3=en_wiki:Cambrian_Stage_3]",
114
114
  "begin:-521_000_000-"
115
115
  ],
116
116
  [When::TM::OrdinalEra,
117
- "*age:[第4期=,Age_4=]",
118
- "begin:-515_000_000-"
117
+ "*age:[第4期=,Age_4=en_wiki:Cambrian_Stage_4]",
118
+ "begin:-514_000_000-"
119
119
  ],
120
120
  ],
121
121
  [When::TM::OrdinalEra,
122
- "*epoch:[第3世=,Epoch_3=]",
122
+ "*epoch:[ミャオリンギアン=,Miaolingian]",
123
123
  [When::TM::OrdinalEra,
124
- "*age:[第5期=,Age_5=]",
125
- "begin:-510_000_000-"
124
+ "*age:[ウリウアン=,Wuliuan]",
125
+ "begin:-509_000_000-"
126
126
  ],
127
127
  [When::TM::OrdinalEra,
128
- "*age:[ドルミアン=,Drumian=]",
129
- "begin:-506_500_000-"
128
+ "*age:[ドルミアン=,Drumian]",
129
+ "begin:-504_500_000-"
130
130
  ],
131
131
  [When::TM::OrdinalEra,
132
- "*age:[グザンギアン=,Guzhangian=]",
133
- "begin:-500_300_000-"
132
+ "*age:[グザンギアン=,Guzhangian]",
133
+ "begin:-500_500_000-"
134
134
  ]
135
135
  ],
136
136
  [When::TM::OrdinalEra,
137
137
  "*epoch:[フロンギアン=,Furongian]",
138
138
  [When::TM::OrdinalEra,
139
139
  "*age:[パイビアン=,Paibian]",
140
- "begin:-499_000_000-"
140
+ "begin:-497_000_000-"
141
141
  ],
142
142
  [When::TM::OrdinalEra,
143
- "*age:[第9期=,Age_9=]",
144
- "begin:-496_000_000-"
143
+ "*age:[ジャングシャニアン=,Jiangshanian]",
144
+ "begin:-494_000_000-"
145
145
  ],
146
146
  [When::TM::OrdinalEra,
147
- "*age:[第10期=,Age_10=]",
148
- "begin:-492_000_000-"
147
+ "*age:[第10期=,Age_10=en_wiki:Cambrian_Stage_10]",
148
+ "begin:-489_500_000-"
149
149
  ]
150
150
  ]
151
151
  ],
@@ -155,37 +155,37 @@ class When::TM::OrdinalReferenceSystem
155
155
  "*epoch:[前期=,Early_Ordovician]",
156
156
  [When::TM::OrdinalEra,
157
157
  "*age:[トレマドック=,Tremadocian]",
158
- "begin:-488_300_000-"
158
+ "begin:-485_400_000-"
159
159
  ],
160
160
  [When::TM::OrdinalEra,
161
161
  "*age:[フロイアン=,Floian]",
162
- "begin:-478_600_000-"
162
+ "begin:-477_700_000-"
163
163
  ]
164
164
  ],
165
165
  [When::TM::OrdinalEra,
166
166
  "*epoch:[中期=,Middle_Ordovician]",
167
167
  [When::TM::OrdinalEra,
168
168
  "*age:[ダピンギアン=,Dapingian]",
169
- "begin:-471_800_000-"
169
+ "begin:-470_000_000-"
170
170
  ],
171
171
  [When::TM::OrdinalEra,
172
172
  "*age:[ダーリウィリアン=,Darriwilian]",
173
- "begin:-468_100_000-"
173
+ "begin:-467_300_000-"
174
174
  ]
175
175
  ],
176
176
  [When::TM::OrdinalEra,
177
177
  "*epoch:[後期=,Late_Ordovician]",
178
178
  [When::TM::OrdinalEra,
179
179
  "*age:[サンドビアン=,Sandbian]",
180
- "begin:-460_900_000-"
180
+ "begin:-458_400_000-"
181
181
  ],
182
182
  [When::TM::OrdinalEra,
183
183
  "*age:[カティアン=,Katian]",
184
- "begin:-455_800_000-"
184
+ "begin:-453_000_000-"
185
185
  ],
186
186
  [When::TM::OrdinalEra,
187
187
  "*age:[ヒルナンティアン=,Hirnantian]",
188
- "begin:-445_600_000-"
188
+ "begin:-445_200_000-"
189
189
  ]
190
190
  ]
191
191
  ],
@@ -195,42 +195,42 @@ class When::TM::OrdinalReferenceSystem
195
195
  "*epoch:[ランドベリ=,Llandovery]",
196
196
  [When::TM::OrdinalEra,
197
197
  "*age:[ルダニアン=,Rhuddanian]",
198
- "begin:-443_700_000-"
198
+ "begin:-443_800_000-"
199
199
  ],
200
200
  [When::TM::OrdinalEra,
201
201
  "*age:[アエロニアン=,Aeronian]",
202
- "begin:-439_000_000-"
202
+ "begin:-440_800_000-"
203
203
  ],
204
204
  [When::TM::OrdinalEra,
205
205
  "*age:[テリチアン=,Telychian]",
206
- "begin:-436_000_000-"
206
+ "begin:-438_500_000-"
207
207
  ]
208
208
  ],
209
209
  [When::TM::OrdinalEra,
210
210
  "*epoch:[ウェンロック=,Wenlock]",
211
211
  [When::TM::OrdinalEra,
212
212
  "*age:[シェインウッディアン=,Sheinwoodian]",
213
- "begin:-428_200_000-"
213
+ "begin:-433_400_000-"
214
214
  ],
215
215
  [When::TM::OrdinalEra,
216
216
  "*age:[ホメリアン=,Homerian]",
217
- "begin:-432_620_000-"
217
+ "begin:-430_500_000-"
218
218
  ]
219
219
  ],
220
220
  [When::TM::OrdinalEra,
221
221
  "*epoch:[ラドロウ=,Ludlow]",
222
222
  [When::TM::OrdinalEra,
223
223
  "*age:[ゴースティアン=,Gorstian]",
224
- "begin:-422_900_000-"
224
+ "begin:-427_400_000-"
225
225
  ],
226
226
  [When::TM::OrdinalEra,
227
227
  "*age:[ルドフォーディアン=,Ludfordian]",
228
- "begin:-421_300_000-"
228
+ "begin:-425_600_000-"
229
229
  ]
230
230
  ],
231
231
  [When::TM::OrdinalEra,
232
232
  "*epoch:[プリドリ=,Pridoli=en_wiki:Pridoli_epoch#Pridoli]",
233
- "begin:-418_700_000-"
233
+ "begin:-423_000_000-"
234
234
  ]
235
235
  ],
236
236
  [When::TM::OrdinalEra,
@@ -239,74 +239,74 @@ class When::TM::OrdinalReferenceSystem
239
239
  "*epoch:[前期=,Early_Devonian]",
240
240
  [When::TM::OrdinalEra,
241
241
  "*age:[ロホコビアン=,Lochkovian]",
242
- "begin:-416_000_000-"
242
+ "begin:-419_200_000-"
243
243
  ],
244
244
  [When::TM::OrdinalEra,
245
245
  "*age:[プラーギアン=,Pragian]",
246
- "begin:-411_200_000-"
246
+ "begin:-410_800_000-"
247
247
  ],
248
248
  [When::TM::OrdinalEra,
249
249
  "*age:[エムシアン=,Emsian]",
250
- "begin:-407_000_000-"
250
+ "begin:-407_600_000-"
251
251
  ]
252
252
  ],
253
253
  [When::TM::OrdinalEra,
254
254
  "*epoch:[中期=,Middle_Devonian]",
255
255
  [When::TM::OrdinalEra,
256
256
  "*age:[アイフェリアン=,Eifelian]",
257
- "begin:-397_500_000-"
257
+ "begin:-393_300_000-"
258
258
  ],
259
259
  [When::TM::OrdinalEra,
260
260
  "*age:[ジベーティアン=,Givetian]",
261
- "begin:-391_800_000-"
261
+ "begin:-387_700_000-"
262
262
  ]
263
263
  ],
264
264
  [When::TM::OrdinalEra,
265
265
  "*epoch:[後期=,Late_Devonian]",
266
266
  [When::TM::OrdinalEra,
267
267
  "*age:[フラスニアン=,Frasnian]",
268
- "begin:-385_300_000-"
268
+ "begin:-382_700_000-"
269
269
  ],
270
270
  [When::TM::OrdinalEra,
271
271
  "*age:[ファメニアン=,Famennian]",
272
- "begin:-374_500_000-"
272
+ "begin:-372_200_000-"
273
273
  ]
274
274
  ]
275
275
  ],
276
276
  [When::TM::OrdinalEra,
277
277
  "*period:[石炭紀,Carboniferous]",
278
278
  [When::TM::OrdinalEra,
279
- "*subperiod:[ミシシッピ紀=,Mississippian]",
279
+ "*subperiod:[ミシシッピアン=,Mississippian]",
280
280
  [When::TM::OrdinalEra,
281
281
  "*age:[トゥルネージアン=,Tournaisian]",
282
- "begin:-359_200_000-"
282
+ "begin:-358_900_000-"
283
283
  ],
284
284
  [When::TM::OrdinalEra,
285
285
  "*age:[ヴィゼアン=,Visean]",
286
- "begin:-345_300_000-"
286
+ "begin:-346_700_000-"
287
287
  ],
288
288
  [When::TM::OrdinalEra,
289
289
  "*age:[サープコビアン=,Serpukhovian]",
290
- "begin:-328_300_000-"
290
+ "begin:-330_900_000-"
291
291
  ]
292
292
  ],
293
293
  [When::TM::OrdinalEra,
294
- "*subperiod:[ペンシルバニア紀=,Pennsylvanian]",
294
+ "*subperiod:[ペンシルバニアン=,Pennsylvanian]",
295
295
  [When::TM::OrdinalEra,
296
296
  "*age:[バシュキーリアン=,Bashkirian]",
297
- "begin:-318_100_000-"
297
+ "begin:-323_200_000-"
298
298
  ],
299
299
  [When::TM::OrdinalEra,
300
300
  "*age:[モスコビアン=,Moscovian]",
301
- "begin:-311_700_000-"
301
+ "begin:-315_200_000-"
302
302
  ],
303
303
  [When::TM::OrdinalEra,
304
304
  "*age:[カシモービアン=,Kasimovian]",
305
- "begin:-307_200_000-"
305
+ "begin:-307_000_000-"
306
306
  ],
307
307
  [When::TM::OrdinalEra,
308
308
  "*age:[グゼーリアン=,Gzhelian]",
309
- "begin:-303_400_000-"
309
+ "begin:-303_700_000-"
310
310
  ]
311
311
  ]
312
312
  ],
@@ -316,45 +316,45 @@ class When::TM::OrdinalReferenceSystem
316
316
  "*epoch:[キスラリアン=,Cisuralian]",
317
317
  [When::TM::OrdinalEra,
318
318
  "*age:[アッセリアン=,Asselian]",
319
- "begin:-299_000_000-"
319
+ "begin:-298_900_000-"
320
320
  ],
321
321
  [When::TM::OrdinalEra,
322
322
  "*age:[サクマーリアン=,Sakmarian]",
323
- "begin:-294_600_000-"
323
+ "begin:-293_520_000-"
324
324
  ],
325
325
  [When::TM::OrdinalEra,
326
326
  "*age:[アルチンスキアン=,Artinskian]",
327
- "begin:-284_400_000-"
327
+ "begin:-290_100_000-"
328
328
  ],
329
329
  [When::TM::OrdinalEra,
330
330
  "*age:[クングーリアン=,Kungurian]",
331
- "begin:-275_600_000-"
331
+ "begin:-283_500_000-"
332
332
  ]
333
333
  ],
334
334
  [When::TM::OrdinalEra,
335
335
  "*epoch:[ガダリューピアン=,Guadalupian]",
336
336
  [When::TM::OrdinalEra,
337
337
  "*age:[ローディアン=,Roadian]",
338
- "begin:-270_600_000-"
338
+ "begin:-272_950_000-"
339
339
  ],
340
340
  [When::TM::OrdinalEra,
341
341
  "*age:[ワーディアン=,Wordian]",
342
- "begin:-268_000_000-"
342
+ "begin:-268_800_000-"
343
343
  ],
344
344
  [When::TM::OrdinalEra,
345
345
  "*age:[カピタニアン=,Capitanian]",
346
- "begin:-265_800_000-"
346
+ "begin:-265_100_000-"
347
347
  ]
348
348
  ],
349
349
  [When::TM::OrdinalEra,
350
350
  "*epoch:[ロピンギアン=,Lopingian]",
351
351
  [When::TM::OrdinalEra,
352
352
  "*age:[ウキアピンギアン=,Wuchiapingian]",
353
- "begin:-260_400_000-"
353
+ "begin:-259_100_000-"
354
354
  ],
355
355
  [When::TM::OrdinalEra,
356
356
  "*age:[チャンシンギアン=,Changhsingian]",
357
- "begin:-253_800_000-"
357
+ "begin:-254_140_000-"
358
358
  ]
359
359
  ]
360
360
  ]
@@ -367,37 +367,37 @@ class When::TM::OrdinalReferenceSystem
367
367
  "*epoch:[前期=,Early_Triassic]",
368
368
  [When::TM::OrdinalEra,
369
369
  "*age:[インドゥアン=,Induan]",
370
- "begin:-251_000_000-"
370
+ "begin:-251_902_000-"
371
371
  ],
372
372
  [When::TM::OrdinalEra,
373
373
  "*age:[オレネキアン=,Olenekian]",
374
- "begin:-249_500_000-"
374
+ "begin:-251_200_000-"
375
375
  ]
376
376
  ],
377
377
  [When::TM::OrdinalEra,
378
378
  "*epoch:[中期=,Middle_Triassic]",
379
379
  [When::TM::OrdinalEra,
380
380
  "*age:[アニシアン=,Anisian]",
381
- "begin:-245_900_000-"
381
+ "begin:-247_200_000-"
382
382
  ],
383
383
  [When::TM::OrdinalEra,
384
384
  "*age:[ラディニアン=,Ladinian]",
385
- "begin:-237_000_000-"
385
+ "begin:-242_000_000-"
386
386
  ]
387
387
  ],
388
388
  [When::TM::OrdinalEra,
389
389
  "*epoch:[後期=,Late_Triassic]",
390
390
  [When::TM::OrdinalEra,
391
391
  "*age:[カーニアン=,Carnian]",
392
- "begin:-228_700_000-"
392
+ "begin:-237_000_000-"
393
393
  ],
394
394
  [When::TM::OrdinalEra,
395
395
  "*age:[ノーリアン=,Norian]",
396
- "begin:-216_500_000-"
396
+ "begin:-227_000_000-"
397
397
  ],
398
398
  [When::TM::OrdinalEra,
399
399
  "*age:[レーティアン=,Rhaetian]",
400
- "begin:-203_600_000-"
400
+ "begin:-208_500_000-"
401
401
  ]
402
402
  ]
403
403
  ],
@@ -407,53 +407,53 @@ class When::TM::OrdinalReferenceSystem
407
407
  "*epoch:[前期=,Early_Jurassic]",
408
408
  [When::TM::OrdinalEra,
409
409
  "*age:[ヘッタンジアン=,Hettangian]",
410
- "begin:-199_600_000-"
410
+ "begin:-201_300_000-"
411
411
  ],
412
412
  [When::TM::OrdinalEra,
413
413
  "*age:[シネムーリアン=,Sinemurian]",
414
- "begin:-196_500_000-"
414
+ "begin:-199_300_000-"
415
415
  ],
416
416
  [When::TM::OrdinalEra,
417
417
  "*age:[プリンスバッキアン=,Pliensbachian]",
418
- "begin:-189_600_000-"
418
+ "begin:-190_800_000-"
419
419
  ],
420
420
  [When::TM::OrdinalEra,
421
421
  "*age:[トアルシアン=,Toarcian]",
422
- "begin:-183_000_000-"
422
+ "begin:-182_700_000-"
423
423
  ]
424
424
  ],
425
425
  [When::TM::OrdinalEra,
426
426
  "*epoch:[中期=,Middle_Jurassic]",
427
427
  [When::TM::OrdinalEra,
428
428
  "*age:[アーレニアン=,Aalenian]",
429
- "begin:-175_600_000-"
429
+ "begin:-174_100_000-"
430
430
  ],
431
431
  [When::TM::OrdinalEra,
432
432
  "*age:[バジョシアン=,Bajocian]",
433
- "begin:-171_600_000-"
433
+ "begin:-170_300_000-"
434
434
  ],
435
435
  [When::TM::OrdinalEra,
436
436
  "*age:[バトニアン=,Bathonian]",
437
- "begin:-167_700_000-"
437
+ "begin:-168_300_000-"
438
438
  ],
439
439
  [When::TM::OrdinalEra,
440
440
  "*age:[カロビアン=,Callovian]",
441
- "begin:-164_700_000-"
441
+ "begin:-166_100_000-"
442
442
  ]
443
443
  ],
444
444
  [When::TM::OrdinalEra,
445
445
  "*epoch:[後期=,Late_Jurassic]",
446
446
  [When::TM::OrdinalEra,
447
447
  "*age:[オクスフォーディアン=,Oxfordian]",
448
- "begin:-161_200_000-"
448
+ "begin:-163_500_000-"
449
449
  ],
450
450
  [When::TM::OrdinalEra,
451
451
  "*age:[キンメリッジアン=,Kimmeridgian]",
452
- "begin:-155_600_000-"
452
+ "begin:-157_300_000-"
453
453
  ],
454
454
  [When::TM::OrdinalEra,
455
455
  "*age:[チトニアン=,Tithonian]",
456
- "begin:-150_800_000-"
456
+ "begin:-152_100_000-"
457
457
  ]
458
458
  ]
459
459
  ],
@@ -462,55 +462,55 @@ class When::TM::OrdinalReferenceSystem
462
462
  [When::TM::OrdinalEra,
463
463
  "*epoch:[前期= ,Early_Cretaceous]",
464
464
  [When::TM::OrdinalEra,
465
- "*age:[ベリアシアン=,Berriasian]",
466
- "begin:-145_500_000-"
465
+ "*age:[ベリアシアン,Berriasian]",
466
+ "begin:-145_000_000-"
467
467
  ],
468
468
  [When::TM::OrdinalEra,
469
- "*age:[バランギニアン=,Valanginian]",
470
- "begin:-140_200_000-"
469
+ "*age:[バランギニアン,Valanginian]",
470
+ "begin:-139_800_000-"
471
471
  ],
472
472
  [When::TM::OrdinalEra,
473
- "*age:[オーテリビアン=,Hauterivian]",
474
- "begin:-133_900_000-"
473
+ "*age:[オーテリビアン,Hauterivian]",
474
+ "begin:-132_600_000-"
475
475
  ],
476
476
  [When::TM::OrdinalEra,
477
- "*age:[バレミアン=,Barremian]",
478
- "begin:-130_000_000-"
477
+ "*age:[バレミアン,Barremian]",
478
+ "begin:-129_400_000-"
479
479
  ],
480
480
  [When::TM::OrdinalEra,
481
- "*age:[アプチアン=,Aptian]",
481
+ "*age:[アプチアン,Aptian]",
482
482
  "begin:-125_000_000-"
483
483
  ],
484
484
  [When::TM::OrdinalEra,
485
- "*age:[アルビアン=,Albian]",
486
- "begin:-112_000_000-"
485
+ "*age:[アルビアン,Albian]",
486
+ "begin:-113_000_000-"
487
487
  ]
488
488
  ],
489
489
  [When::TM::OrdinalEra,
490
490
  "*epoch:[後期=,Late_Cretaceous]",
491
491
  [When::TM::OrdinalEra,
492
- "*age:[セノマニアン=,Cenomanian]",
493
- "begin:-99_600_000-"
492
+ "*age:[セノマニアン=Cenomanian]",
493
+ "begin:-100_500_000-"
494
494
  ],
495
495
  [When::TM::OrdinalEra,
496
- "*age:[チューロニアン=,Turonian]",
497
- "begin:-93_600_000-"
496
+ "*age:[チューロニアン,Turonian]",
497
+ "begin:-93_900_000-"
498
498
  ],
499
499
  [When::TM::OrdinalEra,
500
- "*age:[コニアシアン=,Coniacian]",
501
- "begin:-88_600_000-"
500
+ "*age:[コニアシアン,Coniacian]",
501
+ "begin:-89_800_000-"
502
502
  ],
503
503
  [When::TM::OrdinalEra,
504
- "*age:[サントニアン=,Santonian]",
505
- "begin:-85_800_000-"
504
+ "*age:[サントニアン,Santonian]",
505
+ "begin:-86_300_000-"
506
506
  ],
507
507
  [When::TM::OrdinalEra,
508
508
  "*age:[カンパニアン,Campanian]",
509
- "begin:-83_500_000-"
509
+ "begin:-83_600_000-"
510
510
  ],
511
511
  [When::TM::OrdinalEra,
512
- "*age:[マストリヒシアン,Maastrichtian]",
513
- "begin:-70_600_000-"
512
+ "*age:[マーストリヒチアン,Maastrichtian]",
513
+ "begin:-72_100_000-"
514
514
  ]
515
515
  ]
516
516
  ]
@@ -523,34 +523,34 @@ class When::TM::OrdinalReferenceSystem
523
523
  "*epoch:[暁新世,Paleocene]",
524
524
  [When::TM::OrdinalEra,
525
525
  "*age:[ダニアン,Danian]",
526
- "begin:-65_500_000-"
526
+ "begin:-66_000_000-"
527
527
  ],
528
528
  [When::TM::OrdinalEra,
529
529
  "*age:[セランディアン,Selandian]",
530
- "begin:-61_100_000-"
530
+ "begin:-61_600_000-"
531
531
  ],
532
532
  [When::TM::OrdinalEra,
533
533
  "*age:[サネティアン,Thanetian]",
534
- "begin:-58_700_000-"
534
+ "begin:-59_200_000-"
535
535
  ]
536
536
  ],
537
537
  [When::TM::OrdinalEra,
538
538
  "*epoch:[始新世,Eocene]",
539
539
  [When::TM::OrdinalEra,
540
540
  "*age:[ヤプレシアン,Ypresian]",
541
- "begin:-55_800_000-"
541
+ "begin:-56_000_000-"
542
542
  ],
543
543
  [When::TM::OrdinalEra,
544
544
  "*age:[ルテシアン,Lutetian]",
545
- "begin:-48_600_000-"
545
+ "begin:-47_800_000-"
546
546
  ],
547
547
  [When::TM::OrdinalEra,
548
548
  "*age:[バートニアン,Bartonian]",
549
- "begin:-40_400_000-"
549
+ "begin:-41_200_000-"
550
550
  ],
551
551
  [When::TM::OrdinalEra,
552
552
  "*age:[プリアボニアン,Priabonian]",
553
- "begin:-37_200_000-"
553
+ "begin:-37_710_000-"
554
554
  ]
555
555
  ],
556
556
  [When::TM::OrdinalEra,
@@ -561,7 +561,7 @@ class When::TM::OrdinalReferenceSystem
561
561
  ],
562
562
  [When::TM::OrdinalEra,
563
563
  "*age:[チャッティアン,Chattian]",
564
- "begin:-28_400_000-"
564
+ "begin:-27_820_000-"
565
565
  ]
566
566
  ]
567
567
  ],
@@ -575,7 +575,7 @@ class When::TM::OrdinalReferenceSystem
575
575
  ],
576
576
  [When::TM::OrdinalEra,
577
577
  "*age:[バーディガリアン,Burdigalian]",
578
- "begin:-20_430_000-"
578
+ "begin:-20_440_000-"
579
579
  ],
580
580
  [When::TM::OrdinalEra,
581
581
  "*age:[ランギアン,Langhian]",
@@ -587,7 +587,7 @@ class When::TM::OrdinalReferenceSystem
587
587
  ],
588
588
  [When::TM::OrdinalEra,
589
589
  "*age:[トートニアン,Tortonian]",
590
- "begin:-11_606_000-"
590
+ "begin:-11_630_000-"
591
591
  ],
592
592
  [When::TM::OrdinalEra,
593
593
  "*age:[メッシニアン,Messinian]",
@@ -598,7 +598,7 @@ class When::TM::OrdinalReferenceSystem
598
598
  "*epoch:[鮮新世,Pliocene]",
599
599
  [When::TM::OrdinalEra,
600
600
  "*age:[ザンクリアン,Zanclean]",
601
- "begin:-5_330_000-"
601
+ "begin:-5_331_000-"
602
602
  ],
603
603
  [When::TM::OrdinalEra,
604
604
  "*age:[ピアセンジアン,Piacenzian]",
@@ -611,26 +611,37 @@ class When::TM::OrdinalReferenceSystem
611
611
  [When::TM::OrdinalEra,
612
612
  "*epoch:[更新世,Pleistocene]",
613
613
  [When::TM::OrdinalEra,
614
- "*age:[ゲラシアン,Gelasian]",
615
- "begin:-2_586_000-"
614
+ "*age:[ジェラシアン,Gelasian]",
615
+ "begin:-2_578_000-"
616
616
  ],
617
617
  [When::TM::OrdinalEra,
618
- "*age:[カラブリアン=,Calabrian]",
619
- "begin:-1_804_000-"
618
+ "*age:[カラブリアン,Calabrian]",
619
+ "begin:-1_798_000-"
620
620
  ],
621
621
  [When::TM::OrdinalEra,
622
- "*age:[イオニアン=,Ionian=en_wiki:Middle_Pleistocene]",
623
- "begin:-779_000-"
622
+ "*age:[チバニアン,Chibanian]",
623
+ "begin:-772_000-"
624
624
  ],
625
625
  [When::TM::OrdinalEra,
626
- "*age:[タランティアン=,Tarantian=en_wiki:Late_Pleistocene]",
627
- "begin:-124_000-"
626
+ "*age:[後期更新世,Late_Pleistocene]",
627
+ "begin:-127_000-"
628
628
  ]
629
629
  ],
630
630
  [When::TM::OrdinalEra,
631
631
  "*epoch:[完新世,Holocene]",
632
- "begin:-9_700-",
633
- "end:+Infinity"
632
+ [When::TM::OrdinalEra,
633
+ "*age:[グリーンランディアン,Greenlandian]",
634
+ "begin:-9_700-",
635
+ ],
636
+ [When::TM::OrdinalEra,
637
+ "*age:[ノースグリッピアン,Northgrippian]",
638
+ "begin:-6_200-",
639
+ ],
640
+ [When::TM::OrdinalEra,
641
+ "*age:[メーガーラヤン,Meghalayan]",
642
+ "begin:-2_200-",
643
+ "end:+Infinity"
644
+ ]
634
645
  ]
635
646
  ]
636
647
  ]