when_exe 0.3.6 → 0.3.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (117) hide show
  1. checksums.yaml +7 -0
  2. data/README.md +171 -0
  3. data/lib/when_exe.rb +78 -47
  4. data/lib/when_exe/basictypes.rb +752 -747
  5. data/lib/when_exe/calendarnote.rb +805 -801
  6. data/lib/when_exe/calendartypes.rb +1583 -1531
  7. data/lib/when_exe/coordinates.rb +16 -15
  8. data/lib/when_exe/core/duration.rb +114 -110
  9. data/lib/when_exe/core/extension.rb +504 -504
  10. data/lib/when_exe/ephemeris.rb +1917 -1913
  11. data/lib/when_exe/ephemeris/moon.rb +333 -333
  12. data/lib/when_exe/ephemeris/notes.rb +389 -387
  13. data/lib/when_exe/ephemeris/planets.rb +585 -585
  14. data/lib/when_exe/ephemeris/sun.rb +214 -214
  15. data/lib/when_exe/googlecalendar.rb +144 -140
  16. data/lib/when_exe/icalendar.rb +1636 -1636
  17. data/lib/when_exe/inspect.rb +46 -22
  18. data/lib/when_exe/locales/akt.rb +176 -176
  19. data/lib/when_exe/locales/encoding_conversion.rb +134 -126
  20. data/lib/when_exe/locales/iast.rb +90 -90
  21. data/lib/when_exe/locales/locale.rb +750 -746
  22. data/lib/when_exe/locales/transliteration_table.rb +62 -62
  23. data/lib/when_exe/mini_application.rb +307 -305
  24. data/lib/when_exe/parts/enumerator.rb +2 -2
  25. data/lib/when_exe/parts/geometric_complex.rb +397 -397
  26. data/lib/when_exe/parts/method_cash.rb +224 -224
  27. data/lib/when_exe/parts/resource.rb +1069 -1071
  28. data/lib/when_exe/parts/timezone.rb +240 -230
  29. data/lib/when_exe/region/armenian.rb +56 -56
  30. data/lib/when_exe/region/babylonian.rb +405 -0
  31. data/lib/when_exe/region/bahai.rb +146 -146
  32. data/lib/when_exe/region/balinese.rb +622 -622
  33. data/lib/when_exe/region/chinese.rb +95 -25
  34. data/lib/when_exe/region/chinese/calendars.rb +1016 -1016
  35. data/lib/when_exe/region/chinese/epochs.rb +1 -1
  36. data/lib/when_exe/region/chinese/twins.rb +803 -795
  37. data/lib/when_exe/region/christian.rb +824 -824
  38. data/lib/when_exe/region/coptic.rb +106 -87
  39. data/lib/when_exe/region/discordian.rb +225 -225
  40. data/lib/when_exe/region/far_east.rb +188 -188
  41. data/lib/when_exe/region/french.rb +56 -56
  42. data/lib/when_exe/region/geologicalage.rb +639 -639
  43. data/lib/when_exe/region/goddess.rb +58 -58
  44. data/lib/when_exe/region/indian.rb +1254 -1251
  45. data/lib/when_exe/region/iranian.rb +8 -8
  46. data/lib/when_exe/region/islamic.rb +3 -3
  47. data/lib/when_exe/region/japanese.rb +93 -99
  48. data/lib/when_exe/region/japanese/calendars.rb +396 -397
  49. data/lib/when_exe/region/japanese/epochs.rb +26 -26
  50. data/lib/when_exe/region/japanese/nihon_shoki.rb +71 -71
  51. data/lib/when_exe/region/japanese/notes.rb +1383 -1386
  52. data/lib/when_exe/region/japanese/residues.rb +1306 -1306
  53. data/lib/when_exe/region/japanese/twins.rb +225 -225
  54. data/lib/when_exe/region/japanese/weeks.rb +112 -0
  55. data/lib/when_exe/region/javanese.rb +230 -230
  56. data/lib/when_exe/region/jewish.rb +126 -126
  57. data/lib/when_exe/region/korean.rb +378 -378
  58. data/lib/when_exe/region/m17n.rb +114 -113
  59. data/lib/when_exe/region/martian.rb +258 -255
  60. data/lib/when_exe/region/mayan.rb +32 -32
  61. data/lib/when_exe/region/residue.rb +89 -89
  62. data/lib/when_exe/region/roman.rb +36 -24
  63. data/lib/when_exe/region/ryukyu.rb +97 -97
  64. data/lib/when_exe/region/shire.rb +240 -240
  65. data/lib/when_exe/region/soviet.rb +209 -0
  66. data/lib/when_exe/region/symmetry.rb +50 -50
  67. data/lib/when_exe/region/thai.rb +336 -335
  68. data/lib/when_exe/region/tibetan.rb +316 -315
  69. data/lib/when_exe/region/vietnamese.rb +440 -439
  70. data/lib/when_exe/region/weekdate.rb +80 -80
  71. data/lib/when_exe/region/world.rb +175 -175
  72. data/lib/when_exe/region/yerm.rb +14 -14
  73. data/lib/when_exe/region/zoroastrian.rb +203 -203
  74. data/lib/when_exe/timestandard.rb +707 -681
  75. data/lib/when_exe/tmduration.rb +338 -330
  76. data/lib/when_exe/tmobjects.rb +1346 -1325
  77. data/lib/when_exe/tmposition.rb +2115 -2072
  78. data/lib/when_exe/tmreference.rb +1693 -1669
  79. data/lib/when_exe/version.rb +1 -1
  80. data/link_to_online_documents +1 -1
  81. data/test/examples/JapanHolidaysRFC6350.ics +1 -1
  82. data/test/test.rb +67 -61
  83. data/test/test/basictypes.rb +409 -409
  84. data/test/test/calendarnote.rb +86 -69
  85. data/test/test/calendartypes.rb +97 -97
  86. data/test/test/coordinates.rb +396 -396
  87. data/test/test/ephemeris.rb +83 -74
  88. data/test/test/ephemeris/moon.rb +14 -14
  89. data/test/test/ephemeris/planets.rb +14 -14
  90. data/test/test/ephemeris/sun.rb +14 -14
  91. data/test/test/googlecalendar.rb +194 -176
  92. data/test/test/icalendar.rb +867 -858
  93. data/test/test/inspect.rb +117 -117
  94. data/test/test/parts.rb +487 -487
  95. data/test/test/region/balinese.rb +34 -0
  96. data/test/test/region/chinese.rb +218 -206
  97. data/test/test/region/christian.rb +245 -245
  98. data/test/test/region/coptic.rb +27 -27
  99. data/test/test/region/french.rb +33 -33
  100. data/test/test/region/geologicalage.rb +17 -17
  101. data/test/test/region/indian.rb +57 -57
  102. data/test/test/region/iran.rb +54 -54
  103. data/test/test/region/islamic.rb +18 -18
  104. data/test/test/region/japanese.rb +237 -219
  105. data/test/test/region/jewish.rb +61 -61
  106. data/test/test/region/m17n.rb +184 -184
  107. data/test/test/region/mayan.rb +195 -195
  108. data/test/test/region/residue.rb +147 -139
  109. data/test/test/region/thai.rb +116 -116
  110. data/test/test/region/tibetan.rb +30 -30
  111. data/test/test/region/vietnamese.rb +102 -102
  112. data/test/test/region/yerm.rb +146 -146
  113. data/test/test/timestandard.rb +81 -81
  114. data/test/test/tmobjects.rb +328 -328
  115. data/test/test/tmposition.rb +397 -284
  116. data/test/test/tmreference.rb +157 -157
  117. metadata +13 -10
data/lib/when_exe/region/mayan.rb CHANGED
@@ -24,26 +24,26 @@ module When
24
24
 
25
25
  [Residue,
26
26
  "label:[Haab', ハアブ, Haab]", "divisor:365", 'day:#{Haab:300}', "format:[%2$d%1$s/365=]",
27
- "namespace:[glyph=http://en.wikipedia.org/wiki/File:Maya-]",
28
- [Residue, "label:[Pop =glyph:Pop.jpg, ポプ, Pop ]", "remainder: 0"],
29
- [Residue, "label:[Wo' =glyph:Dresden-wo.jpg, ウオ, Wo ]", "remainder: 20"],
30
- [Residue, "label:[Sip =glyph:Dresden-sip.jpg, シプ, Sip ]", "remainder: 40"],
31
- [Residue, "label:[Sotz' =glyph:Sotz.jpg, ソッツ, Sotz ]", "remainder: 60"],
32
- [Residue, "label:[Sek =glyph:Dresden-Sek.jpg, セック, Sek ]", "remainder: 80"],
33
- [Residue, "label:[Xul =glyph:Xul.png, シュル, Xul ]", "remainder:100"],
34
- [Residue, "label:[Yaxk'in'=glyph:Dresden-Yaxkin.jpg, ヤシュキン, Yaxkin]", "remainder:120"],
35
- [Residue, "label:[Mol =glyph:Mol.png, モル, Mol ]", "remainder:140"],
36
- [Residue, "label:[Ch'en =glyph:Dresden-Chen.jpg, チェン, Chen ]", "remainder:160"],
37
- [Residue, "label:[Yax =glyph:Dresden-Yax.jpg, ヤシュ, Yax ]", "remainder:180"],
38
- [Residue, "label:[Sak' =glyph:Dresden-Sak.jpg, サック, Sak ]", "remainder:200"],
39
- [Residue, "label:[Keh =glyph:Dresden-Keh.jpg, ケフ, Keh ]", "remainder:220"],
40
- [Residue, "label:[Mak =glyph:Dresden-Mak.png, マック, Mak ]", "remainder:240"],
41
- [Residue, "label:[K'ank'in=glyph:Dresden-Kankin.png, カンキン, Kankin]", "remainder:260"],
42
- [Residue, "label:[Muwan' =glyph:Muan.jpg, ムアン, Muwan ]", "remainder:280"],
43
- [Residue, "label:[Pax =glyph:Dresden-pax.jpg, パシュ, Pax ]", "remainder:300"],
44
- [Residue, "label:[K'ayab =glyph:Dresden-Kayab.png, カヤブ, Kayab ]", "remainder:320"],
45
- [Residue, "label:[Kumk'u =glyph:Dresden-kumku.jpg, クムク, Kumku ]", "remainder:340"],
46
- [Residue, "label:[Wayeb' =glyph:Dresden-wayeb.jpg, ウェヤブ, Wayeb ]", "remainder:360"]
27
+ "namespace:[glyph=http://en.wikipedia.org/wiki/File:]",
28
+ [Residue, "label:[Pop =glyph:Maya-Pop.jpg, ポプ, Pop ]", "remainder: 0"],
29
+ [Residue, "label:[Wo' =glyph:Maya-Dresden-wo.jpg, ウオ, Wo ]", "remainder: 20"],
30
+ [Residue, "label:[Sip =glyph:Maya-Dresden-sip.jpg, シプ, Sip ]", "remainder: 40"],
31
+ [Residue, "label:[Sotz' =glyph:Sotz.jpg, ソッツ, Sotz ]", "remainder: 60"],
32
+ [Residue, "label:[Sek =glyph:Maya-Dresden-Sek.jpg, セック, Sek ]", "remainder: 80"],
33
+ [Residue, "label:[Xul =glyph:Maya-Xul.png, シュル, Xul ]", "remainder:100"],
34
+ [Residue, "label:[Yaxk'in'=glyph:Maya-Dresden-Yaxkin.jpg, ヤシュキン=, Yaxkin]", "remainder:120"],
35
+ [Residue, "label:[Mol =glyph:Maya-Mol.png, モル=, Mol ]", "remainder:140"],
36
+ [Residue, "label:[Ch'en =glyph:Maya-Dresden-Chen.jpg, チェン, Chen ]", "remainder:160"],
37
+ [Residue, "label:[Yax =glyph:Maya-Dresden-Yax.jpg, ヤシュ=, Yax ]", "remainder:180"],
38
+ [Residue, "label:[Sak' =glyph:Maya-Dresden-Sak.jpg, サック, Sak ]", "remainder:200"],
39
+ [Residue, "label:[Keh =glyph:Maya-Dresden-Keh.jpg, ケフ, Keh ]", "remainder:220"],
40
+ [Residue, "label:[Mak =glyph:Maya-Dresden-Mak.png, マック=, Mak ]", "remainder:240"],
41
+ [Residue, "label:[K'ank'in=glyph:Maya-Dresden-Kankin.png, カンキン, Kankin]", "remainder:260"],
42
+ [Residue, "label:[Muwan' =glyph:Muan.jpg, ムアン=, Muwan ]", "remainder:280"],
43
+ [Residue, "label:[Pax =glyph:Maya-Dresden-pax.jpg, パシュ=, Pax ]", "remainder:300"],
44
+ [Residue, "label:[K'ayab =glyph:Maya-Dresden-Kayab.png, カヤブ, Kayab ]", "remainder:320"],
45
+ [Residue, "label:[Kumk'u =glyph:Maya-Dresden-kumku.jpg, クムク, Kumku ]", "remainder:340"],
46
+ [Residue, "label:[Wayeb' =glyph:Maya-Dresden-wayeb.jpg, ウェヤブ=, Wayeb ]", "remainder:360"]
47
47
  ],
48
48
 
49
49
  [Residue,
@@ -62,22 +62,22 @@ module When
62
62
  [Residue, "label:[Manik' =glyph:D07-Manik.png, マニク, Manik =glyph:D07-Manik-cdxW.png ]", "remainder: 6"],
63
63
  [Residue, "label:[Lamat =glyph:D08-Lamat.png, ラマト, Lamat =glyph:D08-Lamat-cdxW.png ]", "remainder: 7"],
64
64
  [Residue, "label:[Muluk =glyph:D09-Muluk.png, ムルク, Muluc =glyph:D09-Muluk-cdxW.png ]", "remainder: 8"],
65
- [Residue, "label:[Ok =glyph:D10-Ok.png, オック, Oc =glyph:D10-Ok-cdxW.png ]", "remainder: 9"],
66
- [Residue, "label:[Chuwen =glyph:D11-Chuwen.png, チュエン, Chuen =glyph:D11-Chuwen-cdxW.png ]", "remainder:10"],
67
- [Residue, "label:[Eb' =glyph:D12-Eb.png, エブ, Eb =glyph:D12-Eb-cdxW.png ]", "remainder:11"],
68
- [Residue, "label:[B'en =glyph:D13-Ben.png, ベン, Ben =glyph:D13-Ben-cdxW.png ]", "remainder:12"],
69
- [Residue, "label:[Ix =glyph:D14-Ix.png, イシュ, Ix =glyph:D14-Ix-cdxW.png ]", "remainder:13"],
70
- [Residue, "label:[Men =glyph:D15-Men.png, メン, Men =glyph:D15-Men-cdxW.png ]", "remainder:14"],
71
- [Residue, "label:[Kib' =glyph:D16-Kib.png, キッブ, Cib =glyph:D16-Kib-cdxW.png ]", "remainder:15"],
72
- [Residue, "label:[Kab'an =glyph:D17-Kaban.png, カーバン, Caban =glyph:D17-Kaban-cdxW.png ]", "remainder:16"],
73
- [Residue, "label:[Etz'nab'=glyph:D18-Etznab.png, エツナブ, Etznab =glyph:D18-Etznab-cdxW.png ]", "remainder:17"],
74
- [Residue, "label:[Kawak =glyph:D19-Kawak.png, カワク, Cauac =glyph:D19-Kawak-cdxW.png ]", "remainder:18"],
75
- [Residue, "label:[Ajaw =glyph:D20-Ajaw.png, アハウ, Ahau =glyph:D20-Ajaw-cdxW.png ]", "remainder:19"],
65
+ [Residue, "label:[Ok =glyph:D10-Ok.png, オック=, Oc =glyph:D10-Ok-cdxW.png ]", "remainder: 9"],
66
+ [Residue, "label:[Chuwen =glyph:D11-Chuwen.png, チュエン=, Chuen =glyph:D11-Chuwen-cdxW.png ]", "remainder:10"],
67
+ [Residue, "label:[Eb' =glyph:D12-Eb.png, エブ=, Eb =glyph:D12-Eb-cdxW.png ]", "remainder:11"],
68
+ [Residue, "label:[B'en =glyph:D13-Ben.png, ベン=ja:%%<ベン_(マヤ暦)>, Ben=glyph:D13-Ben-cdxW.png]", "remainder:12"],
69
+ [Residue, "label:[Ix =glyph:D14-Ix.png, イシュ=, Ix =glyph:D14-Ix-cdxW.png ]", "remainder:13"],
70
+ [Residue, "label:[Men =glyph:D15-Men.png, メン=, Men =glyph:D15-Men-cdxW.png ]", "remainder:14"],
71
+ [Residue, "label:[Kib' =glyph:D16-Kib.png, キッブ=, Cib =glyph:D16-Kib-cdxW.png ]", "remainder:15"],
72
+ [Residue, "label:[Kab'an =glyph:D17-Kaban.png, カーバン=, Caban =glyph:D17-Kaban-cdxW.png ]", "remainder:16"],
73
+ [Residue, "label:[Etz'nab'=glyph:D18-Etznab.png, エツナブ=, Etznab =glyph:D18-Etznab-cdxW.png ]", "remainder:17"],
74
+ [Residue, "label:[Kawak =glyph:D19-Kawak.png, カワク=, Cauac =glyph:D19-Kawak-cdxW.png ]", "remainder:18"],
75
+ [Residue, "label:[Ajaw =glyph:D20-Ajaw.png, アハウ=, Ahau =glyph:D20-Ajaw-cdxW.png ]", "remainder:19"],
76
76
  ],
77
77
 
78
78
  [Residue,
79
79
  "namespace:[glyph=http://www.pauahtun.org/G/G]",
80
- "label:[Lords_of_the_Night, 夜の九王]", "divisor:9", 'day:#{LoN:3}', "format:[%s(%d/9)=]",
80
+ "label:[Lords_of_the_Night, 夜の九王=]", "divisor:9", 'day:#{LoN:3}', "format:[%s(%d/9)=]",
81
81
  [Residue, "label:[G9=glyph:9_m.png]", "remainder: 0"],
82
82
  [Residue, "label:[G1=glyph:1_m.png]", "remainder: 1"],
83
83
  [Residue, "label:[G2=glyph:2_m.png]", "remainder: 2"],
data/lib/when_exe/region/residue.rb CHANGED
@@ -37,7 +37,7 @@ module When::Coordinates
37
37
  ],
38
38
 
39
39
  [When::BasicTypes::M17n,
40
- "names:[Abbr_Day, 週日略称]",
40
+ "names:[Abbr_Day=, 週日略称=]",
41
41
  "[Mon, 月, /date/abbr_day_names/1] ",
42
42
  "[Tue, 火, /date/abbr_day_names/2] ",
43
43
  "[Wed, 水, /date/abbr_day_names/3] ",
@@ -49,7 +49,7 @@ module When::Coordinates
49
49
 
50
50
  [Residue,
51
51
  "locale:[=en:, ja=ja:, alias]",
52
- "label:[StarMansion, *宿]", "divisor:28", "day:17", "format:[%s(%02d)=]",
52
+ "label:[LunarMansion=en:Lunar_mansion, *宿=ja:%%<月宿>]", "divisor:28", "day:17", "format:[%s(%02d)=]",
53
53
  [Residue, "label:[Horn=, *角宿, Jiăo= ]", "remainder:0"], # 1 α Vir
54
54
  [Residue, "label:[Neck=, *亢宿, Kàng= ]", "remainder:1"], # 2 κ Vir
55
55
  [Residue, "label:[Root=, *氐宿, Dĭ= ]", "remainder:2"], # 3 α Lib
@@ -60,7 +60,7 @@ module When::Coordinates
60
60
  [Residue, "label:[SouthernDipper=, *斗宿, Dǒu= ]", "remainder:7"], # 8 φ Sgr
61
61
  [Residue, "label:[Ox=, *牛宿, Niú= ]", "remainder:8"], # 9 β Cap
62
62
  [Residue, "label:[Girl=, *女宿, Nǚ= ]", "remainder:9"], # 10 ε Aqr
63
- [Residue, "label:[Emptiness=, *虛宿, Xū= ]", "remainder:10"], # 11 β Aqr
63
+ [Residue, "label:[Emptiness=, *虛宿=ja:%%<虚宿>, Xū= ]", "remainder:10"], # 11 β Aqr
64
64
  [Residue, "label:[Rooftop=, *危宿, Wēi= ]", "remainder:11"], # 12 α Aqr
65
65
  [Residue, "label:[Encampment=, *室宿, Shì= ]", "remainder:12"], # 13 α Peg
66
66
  [Residue, "label:[Wall=, *壁宿, Bì= ]", "remainder:13"], # 14 γ Peg
@@ -70,7 +70,7 @@ module When::Coordinates
70
70
  [Residue, "label:[HairyHead=, *昴宿, Mǎo= ]", "remainder:17"], # 18 17 Tau
71
71
  [Residue, "label:[Net=, *畢宿, Bì= ]", "remainder:18"], # 19 ε Tau
72
72
  [Residue, "label:[TurtleBeak=, *觜宿, Zī= ]", "remainder:19"], # 20 λ Ori
73
- [Residue, "label:[ThreeStars=, *參宿, Shēn= ]", "remainder:20"], # 21 ζ Ori
73
+ [Residue, "label:[ThreeStars=, *參宿=ja:%%<参宿>, Shēn= ]", "remainder:20"], # 21 ζ Ori
74
74
  [Residue, "label:[Well=, *井宿, Jǐng=]", "remainder:21"], # 22 μ Gem
75
75
  [Residue, "label:[Ghost=, *鬼宿, Guǐ= ]", "remainder:22"], # 23 θ Cnc
76
76
  [Residue, "label:[Willow=, *柳宿, Liǔ= ]", "remainder:23"], # 24 δ Hya
@@ -81,97 +81,97 @@ module When::Coordinates
81
81
  ],
82
82
 
83
83
  [Stem,
84
- "label:[Stem, *干]", "divisor:10", "day:11", "year:4",
85
- [Stem, "label:[kinoe, *甲, 甲, 木男, 木公]", "remainder:0"],
86
- [Stem, "label:[kinoto, *乙, 乙, 木女, 木母]", "remainder:1"],
87
- [Stem, "label:[hinoe, *丙, 丙, 火男, 火公]", "remainder:2"],
88
- [Stem, "label:[hinoto, *丁, 丁, 火女, 火母]", "remainder:3"],
89
- [Stem, "label:[tsuchinoe, *戊, 戊, 土男, 土公]", "remainder:4"],
90
- [Stem, "label:[tsuchinoto, *己, 己, 土女, 土母]", "remainder:5"],
91
- [Stem, "label:[kanoe, *庚, 庚, 金男, 銅公]", "remainder:6"],
92
- [Stem, "label:[kanoto, *辛, 辛, 金女, 銅母]", "remainder:7"],
93
- [Stem, "label:[mizunoe, *壬, 壬, 水男, 水公]", "remainder:8"],
94
- [Stem, "label:[mizunoto, *癸, 癸, 水女, 水母]", "remainder:9"]
84
+ "label:[Stem=en:Celestial_stem, *干=ja:%%<十干>]", "divisor:10", "day:11", "year:4",
85
+ [Stem, "label:[kinoe=, *甲, 甲=, 木男=, 木公=]", "remainder:0"],
86
+ [Stem, "label:[kinoto=, *乙, 乙=, 木女=, 木母=]", "remainder:1"],
87
+ [Stem, "label:[hinoe=, *丙, 丙=, 火男=, 火公=]", "remainder:2"],
88
+ [Stem, "label:[hinoto=, *丁, 丁=, 火女=, 火母=]", "remainder:3"],
89
+ [Stem, "label:[tsuchinoe=, *戊, 戊=, 土男=, 土公=]", "remainder:4"],
90
+ [Stem, "label:[tsuchinoto=, *己, 己=, 土女=, 土母=]", "remainder:5"],
91
+ [Stem, "label:[kanoe=, *庚, 庚=, 金男=, 銅公=]", "remainder:6"],
92
+ [Stem, "label:[kanoto=, *辛, 辛=, 金女=, 銅母=]", "remainder:7"],
93
+ [Stem, "label:[mizunoe=, *壬, 壬=, 水男=, 水公=]", "remainder:8"],
94
+ [Stem, "label:[mizunoto=, *癸, 癸=, 水女=, 水母=]", "remainder:9"]
95
95
  ],
96
96
 
97
97
  [Branch,
98
- "label:[Branch, *支]", "divisor:12", "day:11", "year:4",
99
- [Branch, "label:[ne, *子, 子, 鼠, 鼠]", "remainder: 0"],
100
- [Branch, "label:[ushi, *丑, 好, 牛, 牛]", "remainder: 1"],
101
- [Branch, "label:[tora, *寅, 寅, 虎, 虎]", "remainder: 2"],
102
- [Branch, "label:[u, *卯, 栄, 兎, 兎]", "remainder: 3"],
103
- [Branch, "label:[tatsu, *辰, 辰, 龍, 龍]", "remainder: 4"],
104
- [Branch, "label:[mi, *巳, 巳, 蛇, 蛇]", "remainder: 5"],
105
- [Branch, "label:[uma, *午, 午, 馬, 馬]", "remainder: 6"],
106
- [Branch, "label:[hitsuji, *未, 未, 羊, 羊]", "remainder: 7"],
107
- [Branch, "label:[saru, *申, 申, 猴, 猴]", "remainder: 8"],
108
- [Branch, "label:[tori, *酉, 酉, 鷄, 鷄]", "remainder: 9"],
109
- [Branch, "label:[inu, *戌, 戌, 狗, 狗]", "remainder:10"],
110
- [Branch, "label:[i, *亥, 開, 猪, 猪]", "remainder:11"]
98
+ "label:[Branch=en:Earthly_Branches, *支=ja:%%<十二支>]", "divisor:12", "day:11", "year:4",
99
+ [Branch, "label:[ne=, *子, 子=, 鼠=, 鼠=]", "remainder: 0"],
100
+ [Branch, "label:[ushi=, *丑, 好=, 牛=, 牛=]", "remainder: 1"],
101
+ [Branch, "label:[tora=, *寅, 寅=, 虎=, 虎=]", "remainder: 2"],
102
+ [Branch, "label:[u=, *卯, 栄=, 兎=, 兎=]", "remainder: 3"],
103
+ [Branch, "label:[tatsu=, *辰, 辰=, 龍=, 龍=]", "remainder: 4"],
104
+ [Branch, "label:[mi=, *巳, 巳=, 蛇=, 蛇=]", "remainder: 5"],
105
+ [Branch, "label:[uma=, *午, 午=, 馬=, 馬=]", "remainder: 6"],
106
+ [Branch, "label:[hitsuji=, *未, 未=, 羊=, 羊=]", "remainder: 7"],
107
+ [Branch, "label:[saru=, *申, 申=, 猴=, 猴=]", "remainder: 8"],
108
+ [Branch, "label:[tori=, *酉, 酉=, 鷄=, 鷄=]", "remainder: 9"],
109
+ [Branch, "label:[inu=, *戌, 戌=, 狗=, 狗=]", "remainder:10"],
110
+ [Branch, "label:[i=, *亥, 開=, 猪=, 猪=]", "remainder:11"]
111
111
  ],
112
112
 
113
113
  [StemBranch,
114
- "label:[Stem-Branch, *干支]", "divisor:60", "day:11", "year:4", "format:[%s(%02d)=]",
115
- [StemBranch, "label:[kinoe-ne=, *甲子, 甲子, 木男鼠, 木公鼠]", "remainder: 0"],
116
- [StemBranch, "label:[kinoto-ushi=, *乙丑, 乙好, 木女牛, 木母牛]", "remainder: 1"],
117
- [StemBranch, "label:[hinoe-tora=, *丙寅, 丙寅, 火男虎, 火公虎]", "remainder: 2"],
118
- [StemBranch, "label:[hinoto-u=, *丁卯, 丁栄, 火女兎, 火母兎]", "remainder: 3"],
119
- [StemBranch, "label:[tsuchinoe-tatsu=, *戊辰, 戊辰, 土男龍, 土公龍]", "remainder: 4"],
120
- [StemBranch, "label:[tsuchinoto-mi=, *己巳, 己巳, 土女蛇, 土母蛇]", "remainder: 5"],
121
- [StemBranch, "label:[kanoe-uma=, *庚午, 庚午, 金男馬, 銅公馬]", "remainder: 6"],
122
- [StemBranch, "label:[kanoto-hitsuji=, *辛未, 辛未, 金女羊, 銅母羊]", "remainder: 7"],
123
- [StemBranch, "label:[mizunoe-saru=, *壬申, 壬申, 水男猴, 水公猴]", "remainder: 8"],
124
- [StemBranch, "label:[mizunoto-tori=, *癸酉, 癸酉, 水女鷄, 水母鷄]", "remainder: 9"],
125
- [StemBranch, "label:[kinoe-inu=, *甲戌, 甲戌, 木男狗, 木公狗]", "remainder:10"],
126
- [StemBranch, "label:[kinoto-i=, *乙亥, 乙開, 木女猪, 木母猪]", "remainder:11"],
127
- [StemBranch, "label:[hinoe-ne=, *丙子, 丙子, 火男鼠, 火公鼠]", "remainder:12"],
128
- [StemBranch, "label:[hinoto-ushi=, *丁丑, 丁好, 火女牛, 火母牛]", "remainder:13"],
129
- [StemBranch, "label:[tsuchinoe-tora=, *戊寅, 戊寅, 土男虎, 土公虎]", "remainder:14"],
130
- [StemBranch, "label:[tsuchinoto-u=, *己卯, 己栄, 土女兎, 土母兎]", "remainder:15"],
131
- [StemBranch, "label:[kanoe-tatsu=, *庚辰, 庚辰, 金男龍, 銅公龍]", "remainder:16"],
132
- [StemBranch, "label:[kanoto-mi=, *辛巳, 辛巳, 金女蛇, 銅母蛇]", "remainder:17"],
133
- [StemBranch, "label:[mizunoe-uma=, *壬午, 壬午, 水男馬, 水公馬]", "remainder:18"],
134
- [StemBranch, "label:[mizunoto-hitsuji=, *癸未, 癸未, 水女羊, 水母羊]", "remainder:19"],
135
- [StemBranch, "label:[kinoe-saru=, *甲申, 甲申, 木男猴, 木公猴]", "remainder:20"],
136
- [StemBranch, "label:[kinoto-tori=, *乙酉, 乙酉, 木女鷄, 木母鷄]", "remainder:21"],
137
- [StemBranch, "label:[hinoe-inu=, *丙戌, 丙戌, 火男狗, 火公狗]", "remainder:22"],
138
- [StemBranch, "label:[hinoto-i=, *丁亥, 丁開, 火女猪, 火母猪]", "remainder:23"],
139
- [StemBranch, "label:[tsuchinoe-ne=, *戊子, 戊子, 土男鼠, 土公鼠]", "remainder:24"],
140
- [StemBranch, "label:[tsuchinoto-ushi=, *己丑, 己好, 土女牛, 土母牛]", "remainder:25"],
141
- [StemBranch, "label:[kanoe-tora=, *庚寅, 庚寅, 金男虎, 銅公虎]", "remainder:26"],
142
- [StemBranch, "label:[kanoto-u=, *辛卯, 辛栄, 金女兎, 銅母兎]", "remainder:27"],
143
- [StemBranch, "label:[mizunoe-tatsu=, *壬辰, 壬辰, 水男龍, 水公龍]", "remainder:28"],
144
- [StemBranch, "label:[mizunoto-mi=, *癸巳, 癸巳, 水女蛇, 水母蛇]", "remainder:29"],
145
- [StemBranch, "label:[kinoe-uma=, *甲午, 甲午, 木男馬, 木公馬]", "remainder:30"],
146
- [StemBranch, "label:[kinoto-hitsuji=, *乙未, 乙未, 木女羊, 木母羊]", "remainder:31"],
147
- [StemBranch, "label:[hinoe-saru=, *丙申, 丙申, 火男猴, 火公猴]", "remainder:32"],
148
- [StemBranch, "label:[hinoto-tori=, *丁酉, 丁酉, 火女鷄, 火母鷄]", "remainder:33"],
149
- [StemBranch, "label:[tsuchinoe-inu=, *戊戌, 戊戌, 土男狗, 土公狗]", "remainder:34"],
150
- [StemBranch, "label:[tsuchinoto-i=, *己亥, 己開, 土女猪, 土母猪]", "remainder:35"],
151
- [StemBranch, "label:[kanoe-ne=, *庚子, 庚子, 金男鼠, 銅公鼠]", "remainder:36"],
152
- [StemBranch, "label:[kanoto-ushi=, *辛丑, 辛好, 金女牛, 銅母牛]", "remainder:37"],
153
- [StemBranch, "label:[mizunoe-tora=, *壬寅, 壬寅, 水男虎, 水公虎]", "remainder:38"],
154
- [StemBranch, "label:[mizunoto-u=, *癸卯, 癸栄, 水女兎, 水母兎]", "remainder:39"],
155
- [StemBranch, "label:[kinoe-tatsu=, *甲辰, 甲辰, 木男龍, 木公龍]", "remainder:40"],
156
- [StemBranch, "label:[kinoto-mi=, *乙巳, 乙巳, 木女蛇, 木母蛇]", "remainder:41"],
157
- [StemBranch, "label:[hinoe-uma=, *丙午, 丙午, 火男馬, 火公馬]", "remainder:42"],
158
- [StemBranch, "label:[hinoto-hitsuji=, *丁未, 丁未, 火女羊, 火母羊]", "remainder:43"],
159
- [StemBranch, "label:[tsuchinoe-saru=, *戊申, 戊申, 土男猴, 土公猴]", "remainder:44"],
160
- [StemBranch, "label:[tsuchinoto-tori=, *己酉, 己酉, 土女鷄, 土母鷄]", "remainder:45"],
161
- [StemBranch, "label:[kanoe-inu=, *庚戌, 庚戌, 金男狗, 銅公狗]", "remainder:46"],
162
- [StemBranch, "label:[kanoto-i=, *辛亥, 辛開, 金女猪, 銅母猪]", "remainder:47"],
163
- [StemBranch, "label:[mizunoe-ne=, *壬子, 壬子, 水男鼠, 水公鼠]", "remainder:48"],
164
- [StemBranch, "label:[mizunoto-ushi=, *癸丑, 癸好, 水女牛, 水母牛]", "remainder:49"],
165
- [StemBranch, "label:[kinoe-tora=, *甲寅, 甲寅, 木男虎, 木公虎]", "remainder:50"],
166
- [StemBranch, "label:[kinoto-u=, *乙卯, 乙栄, 木女兎, 木母兎]", "remainder:51"],
167
- [StemBranch, "label:[hinoe-tatsu=, *丙辰, 丙辰, 火男龍, 火公龍]", "remainder:52"],
168
- [StemBranch, "label:[hinoto-mi=, *丁巳, 丁巳, 火女蛇, 火母蛇]", "remainder:53"],
169
- [StemBranch, "label:[tsuchinoe-uma=, *戊午, 戊午, 土男馬, 土公馬]", "remainder:54"],
170
- [StemBranch, "label:[tsuchinoto-hitsuji=, *己未, 己未, 土女羊, 土母羊]", "remainder:55"],
171
- [StemBranch, "label:[kanoe-saru=, *庚申, 庚申, 金男猴, 銅公猴]", "remainder:56"],
172
- [StemBranch, "label:[kanoto-tori=, *辛酉, 辛酉, 金女鷄, 銅母鷄]", "remainder:57"],
173
- [StemBranch, "label:[mizunoe-inu=, *壬戌, 壬戌, 水男狗, 水公狗]", "remainder:58"],
174
- [StemBranch, "label:[mizunoto-i=, *癸亥, 癸開, 水女猪, 水母猪]", "remainder:59"]
114
+ "label:[Stem-Branch=en:Sexagenary_cycle, *干支]", "divisor:60", "day:11", "year:4", "format:[%s(%02d)=]",
115
+ [StemBranch, "label:[kinoe-ne=, *甲子, 甲子=, 木男鼠=, 木公鼠=]", "remainder: 0"],
116
+ [StemBranch, "label:[kinoto-ushi=, *乙丑, 乙好=, 木女牛=, 木母牛=]", "remainder: 1"],
117
+ [StemBranch, "label:[hinoe-tora=, *丙寅, 丙寅=, 火男虎=, 火公虎=]", "remainder: 2"],
118
+ [StemBranch, "label:[hinoto-u=, *丁卯, 丁栄=, 火女兎=, 火母兎=]", "remainder: 3"],
119
+ [StemBranch, "label:[tsuchinoe-tatsu=, *戊辰, 戊辰=, 土男龍=, 土公龍=]", "remainder: 4"],
120
+ [StemBranch, "label:[tsuchinoto-mi=, *己巳, 己巳=, 土女蛇=, 土母蛇=]", "remainder: 5"],
121
+ [StemBranch, "label:[kanoe-uma=, *庚午, 庚午=, 金男馬=, 銅公馬=]", "remainder: 6"],
122
+ [StemBranch, "label:[kanoto-hitsuji=, *辛未, 辛未=, 金女羊=, 銅母羊=]", "remainder: 7"],
123
+ [StemBranch, "label:[mizunoe-saru=, *壬申, 壬申=, 水男猴=, 水公猴=]", "remainder: 8"],
124
+ [StemBranch, "label:[mizunoto-tori=, *癸酉, 癸酉=, 水女鷄=, 水母鷄=]", "remainder: 9"],
125
+ [StemBranch, "label:[kinoe-inu=, *甲戌, 甲戌=, 木男狗=, 木公狗=]", "remainder:10"],
126
+ [StemBranch, "label:[kinoto-i=, *乙亥, 乙開=, 木女猪=, 木母猪=]", "remainder:11"],
127
+ [StemBranch, "label:[hinoe-ne=, *丙子, 丙子=, 火男鼠=, 火公鼠=]", "remainder:12"],
128
+ [StemBranch, "label:[hinoto-ushi=, *丁丑, 丁好=, 火女牛=, 火母牛=]", "remainder:13"],
129
+ [StemBranch, "label:[tsuchinoe-tora=, *戊寅, 戊寅=, 土男虎=, 土公虎=]", "remainder:14"],
130
+ [StemBranch, "label:[tsuchinoto-u=, *己卯, 己栄=, 土女兎=, 土母兎=]", "remainder:15"],
131
+ [StemBranch, "label:[kanoe-tatsu=, *庚辰, 庚辰=, 金男龍=, 銅公龍=]", "remainder:16"],
132
+ [StemBranch, "label:[kanoto-mi=, *辛巳, 辛巳=, 金女蛇=, 銅母蛇=]", "remainder:17"],
133
+ [StemBranch, "label:[mizunoe-uma=, *壬午, 壬午=, 水男馬=, 水公馬=]", "remainder:18"],
134
+ [StemBranch, "label:[mizunoto-hitsuji=, *癸未, 癸未=, 水女羊=, 水母羊=]", "remainder:19"],
135
+ [StemBranch, "label:[kinoe-saru=, *甲申, 甲申=, 木男猴=, 木公猴=]", "remainder:20"],
136
+ [StemBranch, "label:[kinoto-tori=, *乙酉, 乙酉=, 木女鷄=, 木母鷄=]", "remainder:21"],
137
+ [StemBranch, "label:[hinoe-inu=, *丙戌, 丙戌=, 火男狗=, 火公狗=]", "remainder:22"],
138
+ [StemBranch, "label:[hinoto-i=, *丁亥, 丁開=, 火女猪=, 火母猪=]", "remainder:23"],
139
+ [StemBranch, "label:[tsuchinoe-ne=, *戊子, 戊子=, 土男鼠=, 土公鼠=]", "remainder:24"],
140
+ [StemBranch, "label:[tsuchinoto-ushi=, *己丑, 己好=, 土女牛=, 土母牛=]", "remainder:25"],
141
+ [StemBranch, "label:[kanoe-tora=, *庚寅, 庚寅=, 金男虎=, 銅公虎=]", "remainder:26"],
142
+ [StemBranch, "label:[kanoto-u=, *辛卯, 辛栄=, 金女兎=, 銅母兎=]", "remainder:27"],
143
+ [StemBranch, "label:[mizunoe-tatsu=, *壬辰, 壬辰=, 水男龍=, 水公龍=]", "remainder:28"],
144
+ [StemBranch, "label:[mizunoto-mi=, *癸巳, 癸巳=, 水女蛇=, 水母蛇=]", "remainder:29"],
145
+ [StemBranch, "label:[kinoe-uma=, *甲午, 甲午=, 木男馬=, 木公馬=]", "remainder:30"],
146
+ [StemBranch, "label:[kinoto-hitsuji=, *乙未, 乙未=, 木女羊=, 木母羊=]", "remainder:31"],
147
+ [StemBranch, "label:[hinoe-saru=, *丙申, 丙申=, 火男猴=, 火公猴=]", "remainder:32"],
148
+ [StemBranch, "label:[hinoto-tori=, *丁酉, 丁酉=, 火女鷄=, 火母鷄=]", "remainder:33"],
149
+ [StemBranch, "label:[tsuchinoe-inu=, *戊戌, 戊戌=, 土男狗=, 土公狗=]", "remainder:34"],
150
+ [StemBranch, "label:[tsuchinoto-i=, *己亥, 己開=, 土女猪=, 土母猪=]", "remainder:35"],
151
+ [StemBranch, "label:[kanoe-ne=, *庚子, 庚子=, 金男鼠=, 銅公鼠=]", "remainder:36"],
152
+ [StemBranch, "label:[kanoto-ushi=, *辛丑, 辛好=, 金女牛=, 銅母牛=]", "remainder:37"],
153
+ [StemBranch, "label:[mizunoe-tora=, *壬寅, 壬寅=, 水男虎=, 水公虎=]", "remainder:38"],
154
+ [StemBranch, "label:[mizunoto-u=, *癸卯, 癸栄=, 水女兎=, 水母兎=]", "remainder:39"],
155
+ [StemBranch, "label:[kinoe-tatsu=, *甲辰, 甲辰=, 木男龍=, 木公龍=]", "remainder:40"],
156
+ [StemBranch, "label:[kinoto-mi=, *乙巳, 乙巳=, 木女蛇=, 木母蛇=]", "remainder:41"],
157
+ [StemBranch, "label:[hinoe-uma=, *丙午, 丙午=, 火男馬=, 火公馬=]", "remainder:42"],
158
+ [StemBranch, "label:[hinoto-hitsuji=, *丁未, 丁未=, 火女羊=, 火母羊=]", "remainder:43"],
159
+ [StemBranch, "label:[tsuchinoe-saru=, *戊申, 戊申=, 土男猴=, 土公猴=]", "remainder:44"],
160
+ [StemBranch, "label:[tsuchinoto-tori=, *己酉, 己酉=, 土女鷄=, 土母鷄=]", "remainder:45"],
161
+ [StemBranch, "label:[kanoe-inu=, *庚戌, 庚戌=, 金男狗=, 銅公狗=]", "remainder:46"],
162
+ [StemBranch, "label:[kanoto-i=, *辛亥, 辛開=, 金女猪=, 銅母猪=]", "remainder:47"],
163
+ [StemBranch, "label:[mizunoe-ne=, *壬子, 壬子=, 水男鼠=, 水公鼠=]", "remainder:48"],
164
+ [StemBranch, "label:[mizunoto-ushi=, *癸丑, 癸好=, 水女牛=, 水母牛=]", "remainder:49"],
165
+ [StemBranch, "label:[kinoe-tora=, *甲寅, 甲寅=, 木男虎=, 木公虎=]", "remainder:50"],
166
+ [StemBranch, "label:[kinoto-u=, *乙卯, 乙栄=, 木女兎=, 木母兎=]", "remainder:51"],
167
+ [StemBranch, "label:[hinoe-tatsu=, *丙辰, 丙辰=, 火男龍=, 火公龍=]", "remainder:52"],
168
+ [StemBranch, "label:[hinoto-mi=, *丁巳, 丁巳=, 火女蛇=, 火母蛇=]", "remainder:53"],
169
+ [StemBranch, "label:[tsuchinoe-uma=, *戊午, 戊午=, 土男馬=, 土公馬=]", "remainder:54"],
170
+ [StemBranch, "label:[tsuchinoto-hitsuji=, *己未, 己未=, 土女羊=, 土母羊=]", "remainder:55"],
171
+ [StemBranch, "label:[kanoe-saru=, *庚申, 庚申=, 金男猴=, 銅公猴=]", "remainder:56"],
172
+ [StemBranch, "label:[kanoto-tori=, *辛酉, 辛酉=, 金女鷄=, 銅母鷄=]", "remainder:57"],
173
+ [StemBranch, "label:[mizunoe-inu=, *壬戌, 壬戌=, 水男狗=, 水公狗=]", "remainder:58"],
174
+ [StemBranch, "label:[mizunoto-i=, *癸亥, 癸開=, 水女猪=, 水母猪=]", "remainder:59"]
175
175
  ],
176
176
 
177
177
  [Kyusei,
data/lib/when_exe/region/roman.rb CHANGED
@@ -13,16 +13,20 @@ module When
13
13
  "locale:[=en:, ja=ja:, alias]",
14
14
  "names:[Roman=]",
15
15
 
16
+ # Remarks
17
+ '[based on Chris Bennett "Roman Dates" (Retrieved 2013-05-13)=http://www.tyndalehouse.com/Egypt/ptolemies/chron/roman/chron_rom_intro_fr.htm,' +
18
+ '典拠 - Chris Bennett "Roman Dates" (2013-05-13 閲覧)=]',
19
+
16
20
  [self, # ..CE-44 / ..BCE45
17
- "names:[MonthA, 月=ja:%%<月_(暦)>]",
21
+ "names:[MonthA=en:Month, 月=ja:%%<月_(暦)>]",
18
22
  "[Ianuarius, 1月]",
19
23
  "[Februarius, 2月]",
20
24
  "[Martius, 3月]",
21
25
  "[Aprilis, 4月]",
22
26
  "[Maius, 5月]",
23
27
  "[Iunius, 6月]",
24
- "[Quintilis, 旧7月]",
25
- "[Sextilis, 旧8月]",
28
+ "[Quintilis, 旧7月=]",
29
+ "[Sextilis, 旧8月=]",
26
30
  "[September, 9月]",
27
31
  "[October, 10月]",
28
32
  "[November, 11月]",
@@ -30,7 +34,7 @@ module When
30
34
  ],
31
35
 
32
36
  [self, # CE-43..CE-8 / BCE44..BCE9
33
- "names:[MonthB, 月=ja:%%<月_(暦)>]",
37
+ "names:[MonthB=en:Month, 月=ja:%%<月_(暦)>]",
34
38
  "[Ianuarius, 1月]",
35
39
  "[Februarius, 2月]",
36
40
  "[Martius, 3月]",
@@ -38,7 +42,7 @@ module When
38
42
  "[Maius, 5月]",
39
43
  "[Iunius, 6月]",
40
44
  "[Iulius, 7月]",
41
- "[Sextilis, 旧8月]",
45
+ "[Sextilis, 旧8月=]",
42
46
  "[September, 9月]",
43
47
  "[October, 10月]",
44
48
  "[November, 11月]",
@@ -62,7 +66,7 @@ module When
62
66
  ],
63
67
 
64
68
  [self, # CE37..CE40
65
- "names:[MonthC, 月=ja:%%<月_(暦)>]",
69
+ "names:[MonthD=en:Month, 月=ja:%%<月_(暦)>]",
66
70
  "[Ianuarius, 1月]",
67
71
  "[Februarius, 2月]",
68
72
  "[Martius, 3月]",
@@ -71,7 +75,7 @@ module When
71
75
  "[Iunius, 6月]",
72
76
  "[Iulius, 7月]",
73
77
  "[Augustus, 8月]",
74
- "[Germanicus, 新9月]",
78
+ "[Germanicus, 新9月=]",
75
79
  "[October, 10月]",
76
80
  "[November, 11月]",
77
81
  "[December, 12月]"
@@ -97,23 +101,23 @@ module When
97
101
  "locale:[=en:, ja=ja:, alias]",
98
102
  "period:[Roman=en:Roman_calendar, ローマ暦]",
99
103
  ["[AUC=en:Ab_urbe_condita, 建国紀元=ja:%%<ローマ建国紀元>, alias:Ab_urbe_condita]709.1.1",
100
- "Calendar Epoch", "-44-01-01^JulianA",
101
- "-7-03-01^JulianB",
102
- "8-01-01^JulianC", "476-09-04"]
104
+ '@CE', "-44-01-01^JulianA",
105
+ "-7-03-01^JulianB",
106
+ "8-01-01^JulianC", "476-09-04"]
103
107
  ]]
104
108
 
105
- # From http://www.tyndalehouse.com/Egypt/ptolemies/chron/roman/chron_rom_intro_fr.htm
109
+ # From Chris Bennett, http://www.tyndalehouse.com/Egypt/ptolemies/chron/roman/chron_rom_intro_fr.htm
106
110
  Roman = [self, [
107
111
  "locale:[=en:, ja=ja:, alias]",
108
112
  "period:[Roman=en:Roman_calendar, ローマ暦]",
109
113
  ["[AUC=en:Ab_urbe_condita, 建国紀元=ja:%%<ローマ建国紀元>, alias:Ab_urbe_condita]492.5.1",
110
- "Calendar Epoch", "-261-05-01^RomanA?border=0-5-1",
111
- "-221-03-01^RomanA?border=0-3-1",
112
- "-152-01-01^RomanA",
113
- "-43-01-01^RomanB",
114
- "-7-01-01^Roman",
115
- "37-01-01^RomanC",
116
- "41-01-01^Roman", "476-09-04"]
114
+ '@CE', "-261-05-01^RomanA?border=0-5-1",
115
+ "-221-03-01^RomanA?border=0-3-1",
116
+ "-152-01-01^RomanA",
117
+ "-43-01-01^RomanB",
118
+ "-7-01-01^RomanC",
119
+ "37-01-01^RomanD",
120
+ "41-01-01^Roman", "476-09-04"]
117
121
  ]]
118
122
 
119
123
  end
@@ -159,7 +163,7 @@ module When
159
163
  #
160
164
  JulianC = [Julian, {
161
165
  'indices' => _Indices12,
162
- 'note' => 'Roman'
166
+ 'note' => 'Roman'
163
167
  }]
164
168
 
165
169
  # From Chris Bennett, http://www.tyndalehouse.com/Egypt/ptolemies/chron/roman/chron_rom_intro_fr.htm
@@ -177,7 +181,9 @@ module When
177
181
  _IndicesA = [When.Index('Roman::MonthA', {:branch=>_Branch}), _Index0]
178
182
  _IndicesB = [When.Index('Roman::MonthB', {:branch=>_Branch}), _Index0]
179
183
  _Indices = [When.Index('Roman::Month', {:branch=>_Branch}), _Index0]
180
- _IndicesC = [When.Index('Roman::MonthC', {:branch=>_Branch}), _Index0]
184
+ _IndicesD = [When.Index('Roman::MonthD', {:branch=>_Branch}), _Index0]
185
+ _remarks = When.M17n('Roman::based on Chris Bennett "Roman Dates" (Retrieved 2013-05-13)')
186
+ # @private
181
187
  Options = {
182
188
  'origin_of_LSC' => 1625698,
183
189
  'origin_of_MSC' => -261,
@@ -200,10 +206,16 @@ module When
200
206
  },
201
207
  'note' => 'Roman'
202
208
  }
203
- RomanA = [CyclicTableBased, Options.merge({'indices' => _IndicesA})]
204
- RomanB = [CyclicTableBased, Options.merge({'indices' => _IndicesB})]
209
+ # @private
210
+ RomanA = [CyclicTableBased, Options.merge({'remarks'=>_remarks, 'indices' => _IndicesA})]
211
+ # @private
212
+ RomanB = [CyclicTableBased, Options.merge({'remarks'=>_remarks, 'indices' => _IndicesB})]
213
+ # @private
214
+ RomanC = [CyclicTableBased, Options.merge({'remarks'=>_remarks })]
215
+ # @private
216
+ RomanD = [CyclicTableBased, Options.merge({'remarks'=>_remarks, 'indices' => _IndicesD})]
217
+ # @private
205
218
  Roman = [CyclicTableBased, Options]
206
- RomanC = [CyclicTableBased, Options.merge({'indices' => _IndicesC})]
207
219
  end
208
220
 
209
221
  #
@@ -316,7 +328,7 @@ module When
316
328
  def _abbr_of_month(month)
317
329
  name = month.name('month').to_s
318
330
  return name.sub(/ (..).*/, ' \1.') if name.sub!(/Intercalaris(.*)?/, 'Int.\1')
319
- name.size <= 3 ? name : name[/^...[^caeiou]*/] + '.'
331
+ name.size <= 3 ? name : name[/\A...[^caeiou]*/] + '.'
320
332
  end
321
333
  end
322
334
  end
data/lib/when_exe/region/ryukyu.rb CHANGED
@@ -1,97 +1,97 @@
1
- # -*- coding: utf-8 -*-
2
- =begin
3
- Copyright (C) 2013 Takashi SUGA
4
-
5
- You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
6
- =end
7
-
8
- require 'when_exe/region/japanese/calendars'
9
- require 'when_exe/region/chinese/calendars'
10
-
11
- #
12
- # 琉球王位一覧表
13
- #
14
- # （参考文献）
15
- # 沖縄県の歴史（山川出版社）巻末年表など
16
- # 沖縄の歴史と文化（中公新書）
17
- # コンサイス世界年表（三省堂）
18
- #
19
- module When
20
- class TM::CalendarEra
21
-
22
- #
23
- # 琉球王朝
24
- #
25
- Ryukyu = [self, [
26
- "locale:[=ja:, en=en:, alias]",
27
- "area:[琉球,Ryukyu]",
28
- [self,
29
- "period:[舜天王統]", # 嗣 ～ 没 or 譲位
30
- ["[舜天]1", "@F", "name=[舜天];1187^Chinese0956"], # 文治 3～嘉禎 3(1237) 72歳
31
- ["[舜馬順熙]1", "@A", "name=[舜馬順熙];1238"], # 嘉禎 4～宝治 2(1248) 64歳
32
- ["[義本]1", "@A", "name=[義本];1249" , "1259"] # 宝治 3～正嘉 3(1259) 英祖に譲位
33
- ],
34
- [self,
35
- "period:[英祖王統]",
36
- ["[英祖]0", "@F", "name=[英祖];1259^Chinese0939"], # 正元 2～正安 元(1299) 8 5 71歳
37
- ["[大成]0", "@A", "name=[大成];1299-08-05"], # 正安 2～延慶 元(1308) 12 8 62歳
38
- ["[英慈]0", "@A", "name=[英慈];1308-12-08"], # 延慶 2～正和 2(1313) 9 20 46歳
39
- ["[玉城]0", "@A", "name=[玉城];1313-09-20"], # 正和 3～延元 元(1336) 3 11 41歳
40
- ["[西威]0", "@A", "name=[西威];1336-03-11", "1349-04-13"] # 延元 2～貞和 5(1349) 4 13 22歳
41
- ],
42
- [self,
43
- "period:[中山王国]",
44
- ["[察度]0", "@A", "name=[察度];1349-04-13^Chinese0939"], # 貞和 6～応永 2(1395) 10 5 75歳
45
- ["[武寧]0", "@A", "name=[武寧];1395-10-05", "1406"] # 応永 3～応永 13(1406) 尚巴志が滅ぼす
46
- ],
47
- [self,
48
- "period:[山北王国]",
49
- ["[怕尼芝]1", "@A", "name=[怕尼芝];1322^Chinese0939"], # 1383年初めて明に朝貢
50
- ["[珉]0", "@A", "name=[珉];1395"],
51
- ["[攀安知]0", "@A", "name=[攀安知];1400", "1416="] # 永楽元年(1403)衣冠束帯を乞う 尚巴志が滅ぼす
52
- ],
53
- [self,
54
- "period:[山南王国]",
55
- ["[承察度]1", "@A", "name=[承察度];1337^Chinese0939"], # 1380年初めて明に朝貢
56
- ["[汪英紫]1", "@A", "name=[汪英紫];1388"],
57
- ["[汪応祖]0", "@A", "name=[汪応祖];1402"], # 承察度の従弟 明永楽２年(1404)冊封
58
- ["[他魯毎]0", "@A", "name=[他魯毎];1413", "1429="] # 汪応祖の子 永楽14年(1416)冊封 尚巴志が滅ぼす
59
- ],
60
- [self,
61
- "period:[第一尚氏]",
62
- ["[尚思紹王]1", "@F", "name=[尚思紹王];1406^Chinese0939"], # 応永 13～応永 28(1421)
63
- ["[尚巴志王]0", "@A", "name=[尚巴志王];1421"], # 応永 29～永享 11(1439) 4 20 68歳
64
- ["[尚忠王]0", "@A", "name=[尚忠王];1439-04-20"], # 永享 12～文安 元(1444) 10 24 54歳
65
- ["[尚思達王]0", "@A", "name=[尚思達王];1444-10-24"], # 文安 2～宝徳 元(1449) 10 13 42歳
66
- ["[尚金福王]0", "@A", "name=[尚金福王];1449-10-13"], # 宝徳 2～享徳 2(1453) 4 29 56歳
67
- ["[尚泰久王]0", "@A", "name=[尚泰久王];1453-04-29"], # 享徳 3～長禄 4(1460) 6 5 46歳
68
- ["[尚徳王]0", "@A", "name=[尚徳王];1460-06-05","1469-04-23"]# 寛正 2～応仁 3(1469) 4 22 29歳
69
- ],
70
- [self,
71
- "period:[第二尚氏]",
72
- ["[尚円王]0", "@F", "name=[尚円王];1469-04-23^Chinese0939"],# 文明 2～文明 8(1476) 7 28 62歳
73
- ["[尚宣威王]0", "@A", "name=[尚宣威王];1476-07-28"], # 文明 9～同年 (1477) 8 4 48歳 没
74
- ["[尚真王]1", "@A", "name=[尚真王];1477-08-05"], # 文明 9～大永 6(1526) 12 11 62歳
75
- ["[尚清王]0", "@A", "name=[尚清王];1526-12-12"], # 大永 7～天文 24(1555) 6 25 59歳
76
- ["[尚元王]0", "@A", "name=[尚元王];1555-06-25"], # 弘治 2～元亀 3(1572) 4 1 45歳
77
- ["[尚永王]0", "@A", "name=[尚永王];1572-04-01"], # 天正 元～天正 16(1588) 11 25 30歳
78
- ["[尚寧王]0", "@A", "name=[尚寧王];1588-11-25", # 天正 17～元和 6(1620) 9 19 57歳
79
- "1609-04-05^Japanese?note=Chinese", ""], # 慶長 14(1609) 4 5 尚寧、島津と和議
80
- ["[尚豊王]0", "@A", "name=[尚豊王];1620-09-19"], # 元和 7～寛永 17(1640) 5 4 51歳
81
- ["[尚賢王]0", "@A", "name=[尚賢王];1640-05-04"], # 寛永 18～正保 4(1647) 9 22 23歳
82
- ["[尚質王]0", "@A", "name=[尚質王];1647-09-22"], # 慶安 元～寛文 8(1668) 11 17 40歳
83
- ["[尚貞王]0", "@A", "name=[尚貞王];1668-11-17"], # 寛文 9～宝永 6(1709) 7 13 65歳
84
- ["[尚益王]0", "@A", "name=[尚益王];1709-07-13"], # 宝永 7～正徳 2(1712) 7 15 35歳
85
- ["[尚敬王]0", "@A", "name=[尚敬王];1712-07-15"], # 正徳 3～寛延 4(1751) 1 29 52歳
86
- ["[尚穆王]0", "@A", "name=[尚穆王];1751-01-29"], # 宝暦 2～寛政 6(1794) 4 8 56歳
87
- ["[尚温王]0", "@A", "name=[尚温王];1794-04-08"], # 寛政 7～享和 2(1802) 7 11 19歳
88
- ["[尚成王]0", "@A", "name=[尚成王];1802-07-11"], # 享和 3～同年 (1803) 12 26 4歳
89
- ["[尚灝王]0", "@A", "name=[尚灝王];1803-12-26"], # 文化 元～文政 10(1827) 出家
90
- ["[尚育摂位=]0","", "name=[尚育王];1827"], # 文政 11(1828) 摂位
91
- ["[尚育王]7", "@A", "name=[尚育王];1834-05-29"], # 天保 6～弘化 4(1847) 9 17 35歳
92
- ["[尚泰王]0", "@A", "name=[尚泰王];1847-09-17", # 弘化 5～明治 12(1879) 3 31 琉球処分
93
- "1873-01-01^Gregorian", "1879-03-31="] # 明治 34(1901) 8 19 59歳 没
94
- ]
95
- ]]
96
- end
97
- end
1
+ # -*- coding: utf-8 -*-
2
+ =begin
3
+ Copyright (C) 2013 Takashi SUGA
4
+
5
+ You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
6
+ =end
7
+
8
+ require 'when_exe/region/japanese/calendars'
9
+ require 'when_exe/region/chinese/calendars'
10
+
11
+ #
12
+ # 琉球王位一覧表
13
+ #
14
+ # （参考文献）
15
+ # 沖縄県の歴史（山川出版社）巻末年表など
16
+ # 沖縄の歴史と文化（中公新書）
17
+ # コンサイス世界年表（三省堂）
18
+ #
19
+ module When
20
+ class TM::CalendarEra
21
+
22
+ #
23
+ # 琉球王朝
24
+ #
25
+ Ryukyu = [self, [
26
+ "locale:[=ja:, en=en:, alias]",
27
+ "area:[琉球,Ryukyu]",
28
+ [self,
29
+ "period:[舜天王統]", # 嗣 ～ 没 or 譲位
30
+ ["[舜天]1", "@F", "name=[舜天];1187^Chinese0956"], # 文治 3～嘉禎 3(1237) 72歳
31
+ ["[舜馬順熙]1", "@A", "name=[舜馬順熙];1238"], # 嘉禎 4～宝治 2(1248) 64歳
32
+ ["[義本]1", "@A", "name=[義本];1249" , "1259"] # 宝治 3～正嘉 3(1259) 英祖に譲位
33
+ ],
34
+ [self,
35
+ "period:[英祖王統]",
36
+ ["[英祖]0", "@F", "name=[英祖];1259^Chinese0939"], # 正元 2～正安 元(1299) 8 5 71歳
37
+ ["[大成]0", "@A", "name=[大成];1299-08-05"], # 正安 2～延慶 元(1308) 12 8 62歳
38
+ ["[英慈]0", "@A", "name=[英慈];1308-12-08"], # 延慶 2～正和 2(1313) 9 20 46歳
39
+ ["[玉城]0", "@A", "name=[玉城];1313-09-20"], # 正和 3～延元 元(1336) 3 11 41歳
40
+ ["[西威]0", "@A", "name=[西威];1336-03-11", "1349-04-13"] # 延元 2～貞和 5(1349) 4 13 22歳
41
+ ],
42
+ [self,
43
+ "period:[中山王国]",
44
+ ["[察度]0", "@A", "name=[察度];1349-04-13^Chinese0939"], # 貞和 6～応永 2(1395) 10 5 75歳
45
+ ["[武寧]0", "@A", "name=[武寧];1395-10-05", "1406"] # 応永 3～応永 13(1406) 尚巴志が滅ぼす
46
+ ],
47
+ [self,
48
+ "period:[山北王国]",
49
+ ["[怕尼芝]1", "@A", "name=[怕尼芝];1322^Chinese0939"], # 1383年初めて明に朝貢
50
+ ["[珉]0", "@A", "name=[珉];1395"],
51
+ ["[攀安知]0", "@A", "name=[攀安知];1400", "1416="] # 永楽元年(1403)衣冠束帯を乞う 尚巴志が滅ぼす
52
+ ],
53
+ [self,
54
+ "period:[山南王国]",
55
+ ["[承察度]1", "@A", "name=[承察度];1337^Chinese0939"], # 1380年初めて明に朝貢
56
+ ["[汪英紫]1", "@A", "name=[汪英紫];1388"],
57
+ ["[汪応祖]0", "@A", "name=[汪応祖];1402"], # 承察度の従弟 明永楽２年(1404)冊封
58
+ ["[他魯毎]0", "@A", "name=[他魯毎];1413", "1429="] # 汪応祖の子 永楽14年(1416)冊封 尚巴志が滅ぼす
59
+ ],
60
+ [self,
61
+ "period:[第一尚氏]",
62
+ ["[尚思紹王]1", "@F", "name=[尚思紹王];1406^Chinese0939"], # 応永 13～応永 28(1421)
63
+ ["[尚巴志王]0", "@A", "name=[尚巴志王];1421"], # 応永 29～永享 11(1439) 4 20 68歳
64
+ ["[尚忠王]0", "@A", "name=[尚忠王];1439-04-20"], # 永享 12～文安 元(1444) 10 24 54歳
65
+ ["[尚思達王]0", "@A", "name=[尚思達王];1444-10-24"], # 文安 2～宝徳 元(1449) 10 13 42歳
66
+ ["[尚金福王]0", "@A", "name=[尚金福王];1449-10-13"], # 宝徳 2～享徳 2(1453) 4 29 56歳
67
+ ["[尚泰久王]0", "@A", "name=[尚泰久王];1453-04-29"], # 享徳 3～長禄 4(1460) 6 5 46歳
68
+ ["[尚徳王]0", "@A", "name=[尚徳王];1460-06-05","1469-04-23"]# 寛正 2～応仁 3(1469) 4 22 29歳
69
+ ],
70
+ [self,
71
+ "period:[第二尚氏]",
72
+ ["[尚円王]0", "@F", "name=[尚円王];1469-04-23^Chinese0939"],# 文明 2～文明 8(1476) 7 28 62歳
73
+ ["[尚宣威王]0", "@A", "name=[尚宣威王];1476-07-28"], # 文明 9～同年 (1477) 8 4 48歳 没
74
+ ["[尚真王]1", "@A", "name=[尚真王];1477-08-05"], # 文明 9～大永 6(1526) 12 11 62歳
75
+ ["[尚清王]0", "@A", "name=[尚清王];1526-12-12"], # 大永 7～天文 24(1555) 6 25 59歳
76
+ ["[尚元王]0", "@A", "name=[尚元王];1555-06-25"], # 弘治 2～元亀 3(1572) 4 1 45歳
77
+ ["[尚永王]0", "@A", "name=[尚永王];1572-04-01"], # 天正 元～天正 16(1588) 11 25 30歳
78
+ ["[尚寧王]0", "@A", "name=[尚寧王];1588-11-25", # 天正 17～元和 6(1620) 9 19 57歳
79
+ "1609-04-05^Japanese?note=Chinese", ""], # 慶長 14(1609) 4 5 尚寧、島津と和議
80
+ ["[尚豊王]0", "@A", "name=[尚豊王];1620-09-19"], # 元和 7～寛永 17(1640) 5 4 51歳
81
+ ["[尚賢王]0", "@A", "name=[尚賢王];1640-05-04"], # 寛永 18～正保 4(1647) 9 22 23歳
82
+ ["[尚質王]0", "@A", "name=[尚質王];1647-09-22"], # 慶安 元～寛文 8(1668) 11 17 40歳
83
+ ["[尚貞王]0", "@A", "name=[尚貞王];1668-11-17"], # 寛文 9～宝永 6(1709) 7 13 65歳
84
+ ["[尚益王]0", "@A", "name=[尚益王];1709-07-13"], # 宝永 7～正徳 2(1712) 7 15 35歳
85
+ ["[尚敬王]0", "@A", "name=[尚敬王];1712-07-15"], # 正徳 3～寛延 4(1751) 1 29 52歳
86
+ ["[尚穆王]0", "@A", "name=[尚穆王];1751-01-29"], # 宝暦 2～寛政 6(1794) 4 8 56歳
87
+ ["[尚温王]0", "@A", "name=[尚温王];1794-04-08"], # 寛政 7～享和 2(1802) 7 11 19歳
88
+ ["[尚成王]0", "@A", "name=[尚成王];1802-07-11"], # 享和 3～同年 (1803) 12 26 4歳
89
+ ["[尚灝王]0", "@A", "name=[尚灝王];1803-12-26"], # 文化 元～文政 10(1827) 出家
90
+ ["[尚育摂位=]0","", "name=[尚育王];1827"], # 文政 11(1828) 摂位
91
+ ["[尚育王]7", "@A", "name=[尚育王];1834-05-29"], # 天保 6～弘化 4(1847) 9 17 35歳
92
+ ["[尚泰王]0", "@A", "name=[尚泰王];1847-09-17", # 弘化 5～明治 12(1879) 3 31 琉球処分
93
+ "1873-01-01^Gregorian", "1879-03-31="] # 明治 34(1901) 8 19 59歳 没
94
+ ]
95
+ ]]
96
+ end
97
+ end