when_exe 0.4.1 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (96) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +36 -33
  3. data/bin/locales.rb +1 -1
  4. data/bin/make_ttl.rb.config +1 -1
  5. data/lib/when_exe.rb +27 -16
  6. data/lib/when_exe/basictypes.rb +772 -771
  7. data/lib/when_exe/calendartypes.rb +1485 -1453
  8. data/lib/when_exe/coordinates.rb +5 -0
  9. data/lib/when_exe/core/compatibility.rb +1 -1
  10. data/lib/when_exe/core/duration.rb +147 -116
  11. data/lib/when_exe/core/extension.rb +499 -497
  12. data/lib/when_exe/ephemeris.rb +1952 -1951
  13. data/lib/when_exe/ephemeris/eclipse.rb +5 -4
  14. data/lib/when_exe/ephemeris/notes.rb +457 -421
  15. data/lib/when_exe/ephemeris/planets.rb +585 -585
  16. data/lib/when_exe/ephemeris/sun.rb +214 -214
  17. data/lib/when_exe/google_api.rb +153 -0
  18. data/lib/when_exe/icalendar.rb +1640 -1632
  19. data/lib/when_exe/inspect.rb +42 -20
  20. data/lib/when_exe/linkeddata.rb +28 -7
  21. data/lib/when_exe/locales/autoload.rb +2 -1
  22. data/lib/when_exe/locales/locale.rb +35 -15
  23. data/lib/when_exe/locales/zh.rb +77 -0
  24. data/lib/when_exe/mini_application.rb +3 -1
  25. data/lib/when_exe/{googlecalendar.rb → obsolete/googlecalendar.rb} +144 -144
  26. data/lib/when_exe/parts/enumerator.rb +498 -486
  27. data/lib/when_exe/parts/geometric_complex.rb +397 -397
  28. data/lib/when_exe/parts/timezone.rb +246 -241
  29. data/lib/when_exe/region/armenian.rb +55 -56
  30. data/lib/when_exe/region/babylonian.rb +406 -405
  31. data/lib/when_exe/region/bahai.rb +107 -106
  32. data/lib/when_exe/region/balinese.rb +624 -622
  33. data/lib/when_exe/region/chinese.rb +1071 -1026
  34. data/lib/when_exe/region/chinese/epochs.rb +28 -28
  35. data/lib/when_exe/region/chinese/notes.rb +219 -0
  36. data/lib/when_exe/region/chinese/twins.rb +803 -803
  37. data/lib/when_exe/region/christian.rb +21 -15
  38. data/lib/when_exe/region/coptic.rb +107 -106
  39. data/lib/when_exe/region/discordian.rb +218 -218
  40. data/lib/when_exe/region/east_asian.rb +1 -1
  41. data/lib/when_exe/region/french.rb +126 -56
  42. data/lib/when_exe/region/geologicalage.rb +639 -639
  43. data/lib/when_exe/region/goddess.rb +60 -58
  44. data/lib/when_exe/region/hanke_henry.rb +2 -2
  45. data/lib/when_exe/region/indian.rb +1225 -1222
  46. data/lib/when_exe/region/international_fixed.rb +96 -97
  47. data/lib/when_exe/region/iranian.rb +206 -203
  48. data/lib/when_exe/region/islamic.rb +102 -102
  49. data/lib/when_exe/region/japanese.rb +126 -71
  50. data/lib/when_exe/region/japanese/epochs.rb +426 -426
  51. data/lib/when_exe/region/japanese/notes.rb +101 -81
  52. data/lib/when_exe/region/japanese/residues.rb +1345 -1311
  53. data/lib/when_exe/region/japanese/twins.rb +225 -225
  54. data/lib/when_exe/region/japanese/weeks.rb +112 -112
  55. data/lib/when_exe/region/javanese.rb +230 -230
  56. data/lib/when_exe/region/jewish.rb +130 -131
  57. data/lib/when_exe/region/m17n.rb +114 -114
  58. data/lib/when_exe/region/martian.rb +258 -258
  59. data/lib/when_exe/region/mayan.rb +11 -8
  60. data/lib/when_exe/region/pax.rb +4 -5
  61. data/lib/when_exe/region/pope.rb +1 -1
  62. data/lib/when_exe/region/positivist.rb +100 -100
  63. data/lib/when_exe/region/residue.rb +162 -162
  64. data/lib/when_exe/region/roman.rb +333 -333
  65. data/lib/when_exe/region/{soviet.rb → russian.rb} +221 -209
  66. data/lib/when_exe/region/shire.rb +222 -223
  67. data/lib/when_exe/region/symmetry.rb +50 -50
  68. data/lib/when_exe/region/thai.rb +336 -336
  69. data/lib/when_exe/region/tibetan.rb +315 -316
  70. data/lib/when_exe/region/tranquility.rb +207 -208
  71. data/lib/when_exe/region/vanishing_leprechaun.rb +3 -1
  72. data/lib/when_exe/region/vietnamese.rb +449 -440
  73. data/lib/when_exe/region/weekdate.rb +80 -80
  74. data/lib/when_exe/region/world.rb +170 -171
  75. data/lib/when_exe/region/world_season.rb +89 -89
  76. data/lib/when_exe/region/yerm.rb +3 -3
  77. data/lib/when_exe/region/zoroastrian.rb +205 -205
  78. data/lib/when_exe/timestandard.rb +708 -707
  79. data/lib/when_exe/tmduration.rb +338 -338
  80. data/lib/when_exe/tmobjects.rb +1356 -1356
  81. data/lib/when_exe/tmposition.rb +66 -31
  82. data/lib/when_exe/version.rb +16 -2
  83. data/test/examples/Residue.m17n +83 -83
  84. data/test/examples/Terms.m17n +2 -2
  85. data/test/test.rb +2 -2
  86. data/test/test/google_api.rb +65 -0
  87. data/test/test/linkeddata.rb +1 -1
  88. data/test/test/{googlecalendar.rb → obsolete/googlecalendar.rb} +194 -194
  89. data/test/test/region/indian.rb +90 -85
  90. data/test/test/region/m17n.rb +7 -7
  91. data/test/test/region/mayan.rb +195 -195
  92. data/test/test/region/residue.rb +153 -153
  93. data/test/test/tmposition.rb +11 -1
  94. data/when_exe.gemspec +2 -2
  95. metadata +95 -8
  96. data/test/test.rb.config +0 -1
data/lib/when_exe/region/mayan.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  =begin
3
- Copyright (C) 2011-2014 Takashi SUGA
3
+ Copyright (C) 2011-2015 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
@@ -47,7 +47,10 @@ module When
47
47
  ],
48
48
 
49
49
  [Residue,
50
- "label:[Trecena, トレセナ=, Trecena]", "divisor:13", 'day:#{Trecena:8}', "format:[%1$s(%3$d/13)=]"
50
+ "label:[Tzolk'in, ツォルキン, *Trecena]", "divisor:13",
51
+ [Residue,
52
+ "label:[Trecena, トレセナ=, Trecena]", "divisor:13", 'day:#{Trecena:8}', "format:[%1$s(%3$d/13)=]"
53
+ ],
51
54
  ],
52
55
 
53
56
  [Residue,
@@ -92,7 +95,7 @@ module When
92
95
  end
93
96
 
94
97
  class CalendarNote
95
- Mayan = [{},['Mayan#{?Epoch=Epoch}::Trecena', 'Mayan#{?Epoch=Epoch}::Tzolk\'in',
98
+ Mayan = [{},['Mayan#{?Epoch=Epoch}::Trecena::Trecena', 'Mayan#{?Epoch=Epoch}::Tzolk\'in',
96
99
  'Mayan#{?Epoch=Epoch}::Lords_of_the_Night', 'Mayan#{?Epoch=Epoch}::Haab\'']]
97
100
  end
98
101
 
@@ -102,11 +105,11 @@ module When
102
105
  # Mayan Long Count
103
106
  #
104
107
  LongCount = [{}, self, [
105
- "locale:[=en:, ja=ja:, alias]",
106
- 'area:[LongCount#{?Epoch=Epoch}=en:Mesoamerican_Long_Count_calendar, マヤ長期暦=ja:%%<長期暦>]',
107
- ["[PHLC=, 先史時代=, PreHistoricLongCount=]0.0.0.0.0", "[Pre Historic=]", '-13.0.0.0.0^LongCount#{?Epoch=Epoch}'],
108
- ["[HLC=, 歴史時代=, HistoricLongCount=]0.0.0.0.1", "[Historic Age=]", "0.0.0.0.1"],
109
- ["[NLC=, 新時代=, NewLongCount=]0.0.0.0.1", "[New Age=]", "13.0.0.0.1", "26.0.0.0.1"]
108
+ "locale:[=en:, ja=ja:, zh=zh:, alias]",
109
+ 'area:[LongCount#{?Epoch=Epoch}=en:Mesoamerican_Long_Count_calendar, マヤ長期暦=ja:%%<長期暦>, 瑪雅長紀曆=zh:%%<長紀曆>]',
110
+ ["[PHLC=, 先史時代=, 史前時代=, PreHistoricLongCount=]0.0.0.0.0", "[Pre Historic=]", '-13.0.0.0.0^LongCount#{?Epoch=Epoch}'],
111
+ ["[HLC=, 歴史時代=, 信史時代=, HistoricLongCount=]0.0.0.0.1", "[Historic Age=]", "0.0.0.0.1"],
112
+ ["[NLC=, 新時代=, 新時代=, NewLongCount=]0.0.0.0.1", "[New Age=]", "13.0.0.0.1", "26.0.0.0.1"]
110
113
  ]]
111
114
  end
112
115
 
data/lib/when_exe/region/pax.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  =begin
3
- Copyright (C) 2014 Takashi SUGA
3
+ Copyright (C) 2014-2015 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,9 +10,8 @@ module When
10
10
  class BasicTypes::M17n
11
11
 
12
12
  Pax = [self, [
13
- "locale:[=en:, ja]",
14
- "names:[Pax=]",
15
- "[Pax=en:Pax_Calendar, パックス暦=ja:%%<13の月の暦>#%.<パックス暦>]",
13
+ "locale:[=en:, ja, zh]",
14
+ "names:[Pax=en:Pax_Calendar, パックス暦=ja:%%<13の月の暦>#%.<パックス暦>, 十三月曆]",
16
15
 
17
16
  # %0s は“閏”の表記を抑制する指定となっている
18
17
  [self,
@@ -41,7 +40,7 @@ module When
41
40
  # Pax Calendar
42
41
  #
43
42
  Pax = [CyclicTableBased, {
44
- 'label' => 'Pax::Pax',
43
+ 'label' => 'Pax',
45
44
  'origin_of_LSC' => 1721061,
46
45
  'indices' => [
47
46
  When.Index('Pax::Month', {:branch=>{+1=>When.Resource('_m:Pax::Month::*')[13]}}),
data/lib/when_exe/region/pope.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  =begin
3
- Copyright (C) 2013 Takashi SUGA
3
+ Copyright (C) 2013-2015 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
data/lib/when_exe/region/positivist.rb CHANGED
@@ -1,100 +1,100 @@
1
- # -*- coding: utf-8 -*-
2
- =begin
3
- Copyright (C) 2014 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
- module When
9
-
10
- class BasicTypes::M17n
11
-
12
- Positivist = [self, [
13
- "locale:[=en:, ja=ja:, alias]",
14
- "names:[Positivist=]",
15
- "[Positivist=en:Positivist_calendar, オーギュスト・コントの暦=ja:%%<13の月の暦>#%.<実証暦>]"
16
- ]]
17
- end
18
-
19
- #
20
- # Positivist Week
21
- #
22
- class CalendarNote::PositivistWeek < CalendarNote::Week
23
-
24
- #
25
- # Positivist Note
26
- #
27
- Notes = [When::BasicTypes::M17n, [
28
- "locale:[=en:, ja=ja:, alias]",
29
- "names:[Positivist]",
30
-
31
- # Notes for year ----------------------------
32
- [When::BasicTypes::M17n,
33
- "names:[year]"
34
- ],
35
-
36
- # Notes for month ----------------------------
37
- [When::BasicTypes::M17n,
38
- "names:[month]",
39
- [When::BasicTypes::M17n,
40
- "names:[Month]",
41
- "[Moses, モーセ ]",
42
- "[Homer, ホメーロス ]",
43
- "[Aristotle, アリストテレス ]",
44
- "[Archimedes, アルキメデス ]",
45
- "[Caesar=en:Julius_Caesar, カエサル=ja:%%<ガイウス・ユリウス・カエサル> ]",
46
- "[Saint Paul=en:Paul_of_Tarsus, パウロ ]",
47
- "[Charlemagne, シャルルマーニュ=ja:%%<カール大帝> ]",
48
- "[Dante=en:Dante_Alighieri, ダンテ=ja:%%<ダンテ・アリギエーリ> ]",
49
- "[Gutenberg=en:Johann_Gutenberg, グーテンベルク=ja:%%<ヨハネス・グーテンベルク> ]",
50
- "[Shakespeare=en:William_Shakespeare, シェイクスピア=ja:%%<ウィリアム・シェイクスピア> ]",
51
- "[Descartes=en:%%<René_Descartes>, デカルト=ja:%%<ルネ・デカルト> ]",
52
- "[Frederick=en:Frederick_II_of_Prussia, フリードリヒ=ja:%%<フリードリヒ2世 (プロイセン王)> ]",
53
- "[Bichat=en:%%<Marie_François_Xavier Bichat>, ビシャ=ja:%%<マリー・フランソワ・クサヴィエ・ビシャ>]"
54
- ]
55
- ],
56
-
57
- # Notes for day ----------------------------
58
- [When::BasicTypes::M17n,
59
- "names:[day]",
60
- [When::BasicTypes::M17n,
61
- "names:[Week]",
62
- [DayOfWeek, "label:[Monday, 月曜日, /date/day_names/1]", {'delta'=> 7}],
63
- [DayOfWeek, "label:[Tuesday, 火曜日, /date/day_names/2]", {'delta'=> 7}],
64
- [DayOfWeek, "label:[Wednesday, 水曜日, /date/day_names/3]", {'delta'=> 7}],
65
- [DayOfWeek, "label:[Thursday, 木曜日, /date/day_names/4]", {'delta'=> 7}],
66
- [DayOfWeek, "label:[Friday, 金曜日, /date/day_names/5]", {'delta'=> 7}],
67
- [DayOfWeek, "label:[Saturday, 土曜日, /date/day_names/6]", {'delta'=> 7}],
68
- [DayOfWeek, "label:[Sunday, 日曜日, /date/day_names/0]", {'delta'=> 7}],
69
- [DayOfWeek, "label:[Festival_of_the_Dead, 祖先の祭=]", {'delta'=> 366}],
70
- [DayOfWeek, "label:[Festival_of_Holy_Women=, 聖女の祭=]", {'delta'=>1461}]
71
- ],
72
-
73
- "[Common_Week=]"
74
- ]
75
- ]]
76
-
77
- fixed_week_definitions
78
-
79
- end
80
-
81
- module CalendarTypes
82
- #
83
- # Positivist calendar based on Gregorian calendar
84
- #
85
- Positivist = [SolarYearTableBased, {
86
- 'label' => 'Positivist::Positivist',
87
- 'indices' => [
88
- When.Index('PositivistWeekNotes::month::Month', {:unit =>13}),
89
- When::Coordinates::DefaultDayIndex
90
- ],
91
- 'origin_of_MSC' => -1788,
92
- 'diff_to_CE' => 0,
93
- 'rule_table' => {
94
- 365 => {'Length'=>[28]*12 + [29]},
95
- 366 => {'Length'=>[28]*12 + [30]}
96
- },
97
- 'note' => 'PositivistWeek'
98
- }]
99
- end
100
- end
1
+ # -*- coding: utf-8 -*-
2
+ =begin
3
+ Copyright (C) 2014-2015 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
+ module When
9
+
10
+ class BasicTypes::M17n
11
+
12
+ Positivist = [self, [
13
+ "locale:[=en:, ja=ja:, alias]",
14
+ "names:[Positivist=]",
15
+ "[Positivist=en:Positivist_calendar, オーギュスト・コントの暦=ja:%%<13の月の暦>#%.<実証暦>]"
16
+ ]]
17
+ end
18
+
19
+ #
20
+ # Positivist Week
21
+ #
22
+ class CalendarNote::PositivistWeek < CalendarNote::Week
23
+
24
+ #
25
+ # Positivist Note
26
+ #
27
+ Notes = [When::BasicTypes::M17n, [
28
+ "locale:[=en:, ja=ja:, alias]",
29
+ "names:[Positivist]",
30
+
31
+ # Notes for year ----------------------------
32
+ [When::BasicTypes::M17n,
33
+ "names:[note for year=, 年の暦注=, *year]"
34
+ ],
35
+
36
+ # Notes for month ----------------------------
37
+ [When::BasicTypes::M17n,
38
+ "names:[note for month=, 月の暦注=, *month]",
39
+ [When::BasicTypes::M17n,
40
+ "names:[month name=en:Month, 月の名前=ja:%%<月_(暦)>, zh:該月的名稱=, *alias:Month=]",
41
+ "[Moses, モーセ ]",
42
+ "[Homer, ホメーロス ]",
43
+ "[Aristotle, アリストテレス ]",
44
+ "[Archimedes, アルキメデス ]",
45
+ "[Caesar=en:Julius_Caesar, カエサル=ja:%%<ガイウス・ユリウス・カエサル> ]",
46
+ "[Saint Paul=en:Paul_of_Tarsus, パウロ ]",
47
+ "[Charlemagne, シャルルマーニュ=ja:%%<カール大帝> ]",
48
+ "[Dante=en:Dante_Alighieri, ダンテ=ja:%%<ダンテ・アリギエーリ> ]",
49
+ "[Gutenberg=en:Johann_Gutenberg, グーテンベルク=ja:%%<ヨハネス・グーテンベルク> ]",
50
+ "[Shakespeare=en:William_Shakespeare, シェイクスピア=ja:%%<ウィリアム・シェイクスピア> ]",
51
+ "[Descartes=en:%%<René_Descartes>, デカルト=ja:%%<ルネ・デカルト> ]",
52
+ "[Frederick=en:Frederick_II_of_Prussia, フリードリヒ=ja:%%<フリードリヒ2世 (プロイセン王)> ]",
53
+ "[Bichat=en:%%<Marie_François_Xavier Bichat>, ビシャ=ja:%%<マリー・フランソワ・クサヴィエ・ビシャ>]"
54
+ ]
55
+ ],
56
+
57
+ # Notes for day ----------------------------
58
+ [When::BasicTypes::M17n,
59
+ "names:[note for day=, 日の暦注=, *day]",
60
+ [When::BasicTypes::M17n,
61
+ "names:[Week, 週, zh:星期]",
62
+ [DayOfWeek, "label:[Monday, 月曜日, /date/day_names/1]", {'delta'=> 7}],
63
+ [DayOfWeek, "label:[Tuesday, 火曜日, /date/day_names/2]", {'delta'=> 7}],
64
+ [DayOfWeek, "label:[Wednesday, 水曜日, /date/day_names/3]", {'delta'=> 7}],
65
+ [DayOfWeek, "label:[Thursday, 木曜日, /date/day_names/4]", {'delta'=> 7}],
66
+ [DayOfWeek, "label:[Friday, 金曜日, /date/day_names/5]", {'delta'=> 7}],
67
+ [DayOfWeek, "label:[Saturday, 土曜日, /date/day_names/6]", {'delta'=> 7}],
68
+ [DayOfWeek, "label:[Sunday, 日曜日, /date/day_names/0]", {'delta'=> 7}],
69
+ [DayOfWeek, "label:[Festival_of_the_Dead, 祖先の祭=]", {'delta'=> 366}],
70
+ [DayOfWeek, "label:[Festival_of_Holy_Women=, 聖女の祭=]", {'delta'=>1461}]
71
+ ],
72
+
73
+ "[Common_Week=]"
74
+ ]
75
+ ]]
76
+
77
+ fixed_week_definitions
78
+
79
+ end
80
+
81
+ module CalendarTypes
82
+ #
83
+ # Positivist calendar based on Gregorian calendar
84
+ #
85
+ Positivist = [SolarYearTableBased, {
86
+ 'label' => 'Positivist::Positivist',
87
+ 'indices' => [
88
+ When.Index('PositivistWeekNotes::month::Month', {:unit =>13}),
89
+ When::Coordinates::DefaultDayIndex
90
+ ],
91
+ 'origin_of_MSC' => -1788,
92
+ 'diff_to_CE' => 0,
93
+ 'rule_table' => {
94
+ 365 => {'Length'=>[28]*12 + [29]},
95
+ 366 => {'Length'=>[28]*12 + [30]}
96
+ },
97
+ 'note' => 'PositivistWeek'
98
+ }]
99
+ end
100
+ end
data/lib/when_exe/region/residue.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  =begin
3
- Copyright (C) 2011-2014 Takashi SUGA
3
+ Copyright (C) 2011-2015 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
@@ -20,13 +20,13 @@ module When::Coordinates
20
20
  class Kyusei < Residue; end
21
21
 
22
22
  # Common Residue
23
- Common = [{'V'=>{'0618'=>{'A'=>'awakening_of_insects=,*啓蟄',
24
- 'B'=>'rain_water=,*雨水'}}}, When::BasicTypes::M17n, [
25
- "locale:[=en:, ja=ja:, tenreki, tibetan, yi, alias]",
23
+ Common = [{'V'=>{'0618'=>{'A'=>'Awakening Of Insects=en:Jingzhe, *啓蟄,驚蟄',
24
+ 'B'=>'Rain Water=en:Yushui_(solar_term),*雨水,雨水'}}}, When::BasicTypes::M17n, [
25
+ "locale:[=en:, ja=ja:, zh=zh:, tenreki, tibetan, yi, alias]",
26
26
  "names:[Common]",
27
27
 
28
28
  [Residue,
29
- "label:[Week, 週]", "divisor:7", "day:0",
29
+ "label:[Week, 週]", "divisor:7", "day:0", "format:[%1$s(%2$d)=, ar:(%2$d)%1$s=]",
30
30
  [Residue, "label:[Monday, 月曜日, /date/day_names/1]", "remainder:0"],
31
31
  [Residue, "label:[Tuesday, 火曜日, /date/day_names/2]", "remainder:1"],
32
32
  [Residue, "label:[Wednesday, 水曜日, /date/day_names/3]", "remainder:2"],
@@ -48,182 +48,182 @@ module When::Coordinates
48
48
  ],
49
49
 
50
50
  [Residue,
51
- "locale:[=en:, ja=ja:, alias]",
51
+ "locale:[=en:, ja=ja:, zh=zh:, alias]",
52
52
  "label:[LunarMansion=en:Lunar_mansion, *宿=ja:%%<月宿>]", "divisor:28", "day:17", "format:[%s(%02d)=]",
53
- [Residue, "label:[Horn=, *角宿, Jiăo= ]", "remainder:0"], # 1 α Vir
54
- [Residue, "label:[Neck=, *亢宿, Kàng= ]", "remainder:1"], # 2 κ Vir
55
- [Residue, "label:[Root=, *氐宿, Dĭ= ]", "remainder:2"], # 3 α Lib
56
- [Residue, "label:[Room=, *房宿, Fáng= ]", "remainder:3"], # 4 π Sco
57
- [Residue, "label:[Heart=, *心宿, Xīn= ]", "remainder:4"], # 5 σ Sco
58
- [Residue, "label:[Tail=, *尾宿, Wěi= ]", "remainder:5"], # 6 μ Sco
59
- [Residue, "label:[WinnowingBasket=, *箕宿, Jī= ]", "remainder:6"], # 7 γ Sgr
60
- [Residue, "label:[SouthernDipper=, *斗宿, Dǒu= ]", "remainder:7"], # 8 φ Sgr
61
- [Residue, "label:[Ox=, *牛宿, Niú= ]", "remainder:8"], # 9 β Cap
62
- [Residue, "label:[Girl=, *女宿, Nǚ= ]", "remainder:9"], # 10 ε Aqr
63
- [Residue, "label:[Emptiness=, *虛宿=ja:%%<虚宿>, Xū= ]", "remainder:10"], # 11 β Aqr
64
- [Residue, "label:[Rooftop=, *危宿, Wēi= ]", "remainder:11"], # 12 α Aqr
65
- [Residue, "label:[Encampment=, *室宿, Shì= ]", "remainder:12"], # 13 α Peg
66
- [Residue, "label:[Wall=, *壁宿, Bì= ]", "remainder:13"], # 14 γ Peg
67
- [Residue, "label:[Legs=, *奎宿, Kuí= ]", "remainder:14"], # 15 η And
68
- [Residue, "label:[Bond=, *婁宿, Lóu= ]", "remainder:15"], # 16 β Ari
69
- [Residue, "label:[Stomach=, *胃宿, Wèi= ]", "remainder:16"], # 17 35 Ari
70
- [Residue, "label:[HairyHead=, *昴宿, Mǎo= ]", "remainder:17"], # 18 17 Tau
71
- [Residue, "label:[Net=, *畢宿, Bì= ]", "remainder:18"], # 19 ε Tau
72
- [Residue, "label:[TurtleBeak=, *觜宿, Zī= ]", "remainder:19"], # 20 λ Ori
73
- [Residue, "label:[ThreeStars=, *參宿=ja:%%<参宿>, Shēn= ]", "remainder:20"], # 21 ζ Ori
74
- [Residue, "label:[Well=, *井宿, Jǐng=]", "remainder:21"], # 22 μ Gem
75
- [Residue, "label:[Ghost=, *鬼宿, Guǐ= ]", "remainder:22"], # 23 θ Cnc
76
- [Residue, "label:[Willow=, *柳宿, Liǔ= ]", "remainder:23"], # 24 δ Hya
77
- [Residue, "label:[Star=, *星宿, Xīng= ]", "remainder:24"], # 25 α Hya
78
- [Residue, "label:[ExtendedNet=, *張宿, Zhāng=]", "remainder:25"], # 26 υ¹ Hya
79
- [Residue, "label:[Wings=, *翼宿, Yì= ]", "remainder:26"], # 27 α Crt
80
- [Residue, "label:[Chariot=, *軫宿, Zhěn= ]", "remainder:27"] # 28 γ Crv
53
+ [Residue, "label:[Horn=, *角宿, 角宿, Jiăo= ]", "remainder:0"], # 1 α Vir
54
+ [Residue, "label:[Neck=, *亢宿, 亢宿, Kàng= ]", "remainder:1"], # 2 κ Vir
55
+ [Residue, "label:[Root=, *氐宿, 氐宿, Dĭ= ]", "remainder:2"], # 3 α Lib
56
+ [Residue, "label:[Room=, *房宿, 房宿, Fáng= ]", "remainder:3"], # 4 π Sco
57
+ [Residue, "label:[Heart=, *心宿, 心宿, Xīn= ]", "remainder:4"], # 5 σ Sco
58
+ [Residue, "label:[Tail=, *尾宿, 尾宿, Wěi= ]", "remainder:5"], # 6 μ Sco
59
+ [Residue, "label:[WinnowingBasket=, *箕宿, 箕宿, Jī= ]", "remainder:6"], # 7 γ Sgr
60
+ [Residue, "label:[SouthernDipper=, *斗宿, 斗宿, Dǒu= ]", "remainder:7"], # 8 φ Sgr
61
+ [Residue, "label:[Ox=, *牛宿, 牛宿, Niú= ]", "remainder:8"], # 9 β Cap
62
+ [Residue, "label:[Girl=, *女宿, 女宿, Nǚ= ]", "remainder:9"], # 10 ε Aqr
63
+ [Residue, "label:[Emptiness=, *虛宿=ja:%%<虚宿>,虚宿,Xū=]", "remainder:10"], # 11 β Aqr
64
+ [Residue, "label:[Rooftop=, *危宿, 危宿, Wēi= ]", "remainder:11"], # 12 α Aqr
65
+ [Residue, "label:[Encampment=, *室宿, 室宿, Shì= ]", "remainder:12"], # 13 α Peg
66
+ [Residue, "label:[Wall=, *壁宿, 壁宿, Bì= ]", "remainder:13"], # 14 γ Peg
67
+ [Residue, "label:[Legs=, *奎宿, 奎宿, Kuí= ]", "remainder:14"], # 15 η And
68
+ [Residue, "label:[Bond=, *婁宿, 婁宿, Lóu= ]", "remainder:15"], # 16 β Ari
69
+ [Residue, "label:[Stomach=, *胃宿, 胃宿, Wèi= ]", "remainder:16"], # 17 35 Ari
70
+ [Residue, "label:[HairyHead=, *昴宿, 昴宿, Mǎo= ]", "remainder:17"], # 18 17 Tau
71
+ [Residue, "label:[Net=, *畢宿, 畢宿, Bì= ]", "remainder:18"], # 19 ε Tau
72
+ [Residue, "label:[TurtleBeak=, *觜宿, 觜宿, Zī= ]", "remainder:19"], # 20 λ Ori
73
+ [Residue, "label:[ThreeStars=,*參宿=ja:%%<参宿>,参宿,Shēn=]","remainder:20"],# 21 ζ Ori
74
+ [Residue, "label:[Well=, *井宿, 井宿, Jǐng=]", "remainder:21"], # 22 μ Gem
75
+ [Residue, "label:[Ghost=, *鬼宿, 鬼宿, Guǐ= ]", "remainder:22"], # 23 θ Cnc
76
+ [Residue, "label:[Willow=, *柳宿, 柳宿, Liǔ= ]", "remainder:23"], # 24 δ Hya
77
+ [Residue, "label:[Star=, *星宿, 星宿, Xīng= ]", "remainder:24"], # 25 α Hya
78
+ [Residue, "label:[ExtendedNet=, *張宿, 張宿, Zhāng=]", "remainder:25"], # 26 υ¹ Hya
79
+ [Residue, "label:[Wings=, *翼宿, 翼宿, Yì= ]", "remainder:26"], # 27 α Crt
80
+ [Residue, "label:[Chariot=, *軫宿, 軫宿, Zhěn= ]", "remainder:27"] # 28 γ Crv
81
81
  ],
82
82
 
83
83
  [Stem,
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"]
84
+ "label:[Stem=en:Celestial_stem, *干=ja:%%<十干>, 天干]", "divisor:10", "day:11", "year:4",
85
+ [Stem, "label:[Wood-yang=, *甲, 甲, 甲=, 木男=, 木公=]", "remainder:0"],
86
+ [Stem, "label:[Wood-yin=, *乙, 乙, 乙=, 木女=, 木母=]", "remainder:1"],
87
+ [Stem, "label:[Fire-yang=, *丙, 丙, 丙=, 火男=, 火公=]", "remainder:2"],
88
+ [Stem, "label:[Fire-yin=, *丁, 丁, 丁=, 火女=, 火母=]", "remainder:3"],
89
+ [Stem, "label:[Erath-yang=, *戊, 戊, 戊=, 土男=, 土公=]", "remainder:4"],
90
+ [Stem, "label:[Erath-yin=, *己, 己, 己=, 土女=, 土母=]", "remainder:5"],
91
+ [Stem, "label:[Metal-yang=, *庚, 庚, 庚=, 金男=, 銅公=]", "remainder:6"],
92
+ [Stem, "label:[Metal-yin=, *辛, 辛, 辛=, 金女=, 銅母=]", "remainder:7"],
93
+ [Stem, "label:[Water-yang=, *壬, 壬, 壬=, 水男=, 水公=]", "remainder:8"],
94
+ [Stem, "label:[Water-yin=, *癸, 癸, 癸=, 水女=, 水母=]", "remainder:9"]
95
95
  ],
96
96
 
97
97
  [Branch,
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"]
98
+ "label:[Branch=en:Earthly_Branches, *支=ja:%%<十二支>, 地支]", "divisor:12", "day:11", "year:4",
99
+ [Branch, "label:[Rat=, *子, 子, 子=, 鼠=, 鼠=]", "remainder: 0"],
100
+ [Branch, "label:[Ox=, *丑, 丑, 好=, 牛=, 牛=]", "remainder: 1"],
101
+ [Branch, "label:[Tiger=, *寅, 寅, 寅=, 虎=, 虎=]", "remainder: 2"],
102
+ [Branch, "label:[Rabbit=, *卯, 卯, 栄=, 兎=, 兎=]", "remainder: 3"],
103
+ [Branch, "label:[Dragon=, *辰, 辰, 辰=, 龍=, 龍=]", "remainder: 4"],
104
+ [Branch, "label:[Snake=, *巳, 巳, 巳=, 蛇=, 蛇=]", "remainder: 5"],
105
+ [Branch, "label:[Horse=, *午, 午, 午=, 馬=, 馬=]", "remainder: 6"],
106
+ [Branch, "label:[Goat=, *未, 未, 未=, 羊=, 羊=]", "remainder: 7"],
107
+ [Branch, "label:[Monkey=, *申, 申, 申=, 猴=, 猴=]", "remainder: 8"],
108
+ [Branch, "label:[Rooster=, *酉, 酉, 酉=, 鷄=, 鷄=]", "remainder: 9"],
109
+ [Branch, "label:[Dog=, *戌, 戌, 戌=, 狗=, 狗=]", "remainder:10"],
110
+ [Branch, "label:[Pig=, *亥, 亥, 開=, 猪=, 猪=]", "remainder:11"]
111
111
  ],
112
112
 
113
113
  [StemBranch,
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"]
114
+ "label:[Stem-Branch=en:Sexagenary_cycle, *干支, 干支]", "divisor:60", "day:11", "year:4", "format:[%s(%02d)=]",
115
+ [StemBranch, "label:[Wood-yang-Rat=, *甲子, 甲子, 甲子=, 木男鼠=, 木公鼠=]", "remainder: 0"],
116
+ [StemBranch, "label:[Wood-yin-Ox=, *乙丑, 乙丑, 乙好=, 木女牛=, 木母牛=]", "remainder: 1"],
117
+ [StemBranch, "label:[Fire-yang-Tiger=, *丙寅, 丙寅, 丙寅=, 火男虎=, 火公虎=]", "remainder: 2"],
118
+ [StemBranch, "label:[Fire-yin-Rabbit=, *丁卯, 丁卯, 丁栄=, 火女兎=, 火母兎=]", "remainder: 3"],
119
+ [StemBranch, "label:[Erath-yang-Dragon=, *戊辰, 戊辰, 戊辰=, 土男龍=, 土公龍=]", "remainder: 4"],
120
+ [StemBranch, "label:[Erath-yin-Snake=, *己巳, 己巳, 己巳=, 土女蛇=, 土母蛇=]", "remainder: 5"],
121
+ [StemBranch, "label:[Metal-yang-Horse=, *庚午, 庚午, 庚午=, 金男馬=, 銅公馬=]", "remainder: 6"],
122
+ [StemBranch, "label:[Metal-yin-Goat=, *辛未, 辛未, 辛未=, 金女羊=, 銅母羊=]", "remainder: 7"],
123
+ [StemBranch, "label:[Water-yang-Monkey=, *壬申, 壬申, 壬申=, 水男猴=, 水公猴=]", "remainder: 8"],
124
+ [StemBranch, "label:[Water-yin-Rooster=, *癸酉, 癸酉, 癸酉=, 水女鷄=, 水母鷄=]", "remainder: 9"],
125
+ [StemBranch, "label:[Wood-yang-Dog=, *甲戌, 甲戌, 甲戌=, 木男狗=, 木公狗=]", "remainder:10"],
126
+ [StemBranch, "label:[Wood-yin-Pig=, *乙亥, 乙亥, 乙開=, 木女猪=, 木母猪=]", "remainder:11"],
127
+ [StemBranch, "label:[Fire-yang-Rat=, *丙子, 丙子, 丙子=, 火男鼠=, 火公鼠=]", "remainder:12"],
128
+ [StemBranch, "label:[Fire-yin-Ox=, *丁丑, 丁丑, 丁好=, 火女牛=, 火母牛=]", "remainder:13"],
129
+ [StemBranch, "label:[Erath-yang-Tiger=, *戊寅, 戊寅, 戊寅=, 土男虎=, 土公虎=]", "remainder:14"],
130
+ [StemBranch, "label:[Erath-yin-Rabbit=, *己卯, 己卯, 己栄=, 土女兎=, 土母兎=]", "remainder:15"],
131
+ [StemBranch, "label:[Metal-yang-Dragon=, *庚辰, 庚辰, 庚辰=, 金男龍=, 銅公龍=]", "remainder:16"],
132
+ [StemBranch, "label:[Metal-yin-Snake=, *辛巳, 辛巳, 辛巳=, 金女蛇=, 銅母蛇=]", "remainder:17"],
133
+ [StemBranch, "label:[Water-yang-Horse=, *壬午, 壬午, 壬午=, 水男馬=, 水公馬=]", "remainder:18"],
134
+ [StemBranch, "label:[Water-yin-Goat=, *癸未, 癸未, 癸未=, 水女羊=, 水母羊=]", "remainder:19"],
135
+ [StemBranch, "label:[Wood-yang-Monkey=, *甲申, 甲申, 甲申=, 木男猴=, 木公猴=]", "remainder:20"],
136
+ [StemBranch, "label:[Wood-yin-Rooster=, *乙酉, 乙酉, 乙酉=, 木女鷄=, 木母鷄=]", "remainder:21"],
137
+ [StemBranch, "label:[Fire-yang-Dog=, *丙戌, 丙戌, 丙戌=, 火男狗=, 火公狗=]", "remainder:22"],
138
+ [StemBranch, "label:[Fire-yin-Pig=, *丁亥, 丁亥, 丁開=, 火女猪=, 火母猪=]", "remainder:23"],
139
+ [StemBranch, "label:[Erath-yang-Rat=, *戊子, 戊子, 戊子=, 土男鼠=, 土公鼠=]", "remainder:24"],
140
+ [StemBranch, "label:[Erath-yin-Ox=, *己丑, 己丑, 己好=, 土女牛=, 土母牛=]", "remainder:25"],
141
+ [StemBranch, "label:[Metal-yang-Tiger=, *庚寅, 庚寅, 庚寅=, 金男虎=, 銅公虎=]", "remainder:26"],
142
+ [StemBranch, "label:[Metal-yin-Rabbit=, *辛卯, 辛卯, 辛栄=, 金女兎=, 銅母兎=]", "remainder:27"],
143
+ [StemBranch, "label:[Water-yang-Dragon=, *壬辰, 壬辰, 壬辰=, 水男龍=, 水公龍=]", "remainder:28"],
144
+ [StemBranch, "label:[Water-yin-Snake=, *癸巳, 癸巳, 癸巳=, 水女蛇=, 水母蛇=]", "remainder:29"],
145
+ [StemBranch, "label:[Wood-yang-Horse=, *甲午, 甲午, 甲午=, 木男馬=, 木公馬=]", "remainder:30"],
146
+ [StemBranch, "label:[Wood-yin-Goat=, *乙未, 乙未, 乙未=, 木女羊=, 木母羊=]", "remainder:31"],
147
+ [StemBranch, "label:[Fire-yang-Monkey=, *丙申, 丙申, 丙申=, 火男猴=, 火公猴=]", "remainder:32"],
148
+ [StemBranch, "label:[Fire-yin-Rooster=, *丁酉, 丁酉, 丁酉=, 火女鷄=, 火母鷄=]", "remainder:33"],
149
+ [StemBranch, "label:[Erath-yang-Dog=, *戊戌, 戊戌, 戊戌=, 土男狗=, 土公狗=]", "remainder:34"],
150
+ [StemBranch, "label:[Erath-yin-Pig=, *己亥, 己亥, 己開=, 土女猪=, 土母猪=]", "remainder:35"],
151
+ [StemBranch, "label:[Metal-yang-Rat=, *庚子, 庚子, 庚子=, 金男鼠=, 銅公鼠=]", "remainder:36"],
152
+ [StemBranch, "label:[Metal-yin-Ox=, *辛丑, 辛丑, 辛好=, 金女牛=, 銅母牛=]", "remainder:37"],
153
+ [StemBranch, "label:[Water-yang-Tiger=, *壬寅, 壬寅, 壬寅=, 水男虎=, 水公虎=]", "remainder:38"],
154
+ [StemBranch, "label:[Water-yin-Rabbit=, *癸卯, 癸卯, 癸栄=, 水女兎=, 水母兎=]", "remainder:39"],
155
+ [StemBranch, "label:[Wood-yang-Dragon=, *甲辰, 甲辰, 甲辰=, 木男龍=, 木公龍=]", "remainder:40"],
156
+ [StemBranch, "label:[Wood-yin-Snake=, *乙巳, 乙巳, 乙巳=, 木女蛇=, 木母蛇=]", "remainder:41"],
157
+ [StemBranch, "label:[Fire-yang-Horse=, *丙午, 丙午, 丙午=, 火男馬=, 火公馬=]", "remainder:42"],
158
+ [StemBranch, "label:[Fire-yin-Goat=, *丁未, 丁未, 丁未=, 火女羊=, 火母羊=]", "remainder:43"],
159
+ [StemBranch, "label:[Erath-yang-Monkey=, *戊申, 戊申, 戊申=, 土男猴=, 土公猴=]", "remainder:44"],
160
+ [StemBranch, "label:[Erath-yin-Rooster=, *己酉, 己酉, 己酉=, 土女鷄=, 土母鷄=]", "remainder:45"],
161
+ [StemBranch, "label:[Metal-yang-Dog=, *庚戌, 庚戌, 庚戌=, 金男狗=, 銅公狗=]", "remainder:46"],
162
+ [StemBranch, "label:[Metal-yin-Pig=, *辛亥, 辛亥, 辛開=, 金女猪=, 銅母猪=]", "remainder:47"],
163
+ [StemBranch, "label:[Water-yang-Rat=, *壬子, 壬子, 壬子=, 水男鼠=, 水公鼠=]", "remainder:48"],
164
+ [StemBranch, "label:[Water-yin-Ox=, *癸丑, 癸丑, 癸好=, 水女牛=, 水母牛=]", "remainder:49"],
165
+ [StemBranch, "label:[Wood-yang-Tiger=, *甲寅, 甲寅, 甲寅=, 木男虎=, 木公虎=]", "remainder:50"],
166
+ [StemBranch, "label:[Wood-yin-Rabbit=, *乙卯, 乙卯, 乙栄=, 木女兎=, 木母兎=]", "remainder:51"],
167
+ [StemBranch, "label:[Fire-yang-Dragon=, *丙辰, 丙辰, 丙辰=, 火男龍=, 火公龍=]", "remainder:52"],
168
+ [StemBranch, "label:[Fire-yin-Snake=, *丁巳, 丁巳, 丁巳=, 火女蛇=, 火母蛇=]", "remainder:53"],
169
+ [StemBranch, "label:[Erath-yang-Horse=, *戊午, 戊午, 戊午=, 土男馬=, 土公馬=]", "remainder:54"],
170
+ [StemBranch, "label:[Erath-yin-Goat=, *己未, 己未, 己未=, 土女羊=, 土母羊=]", "remainder:55"],
171
+ [StemBranch, "label:[Metal-yang-Monkey=, *庚申, 庚申, 庚申=, 金男猴=, 銅公猴=]", "remainder:56"],
172
+ [StemBranch, "label:[Metal-yin-Rooster=, *辛酉, 辛酉, 辛酉=, 金女鷄=, 銅母鷄=]", "remainder:57"],
173
+ [StemBranch, "label:[Water-yang-Dog=, *壬戌, 壬戌, 壬戌=, 水男狗=, 水公狗=]", "remainder:58"],
174
+ [StemBranch, "label:[Water-yin-Pig=, *癸亥, 癸亥, 癸開=, 水女猪=, 水母猪=]", "remainder:59"]
175
175
  ],
176
176
 
177
177
  [Kyusei,
178
- "locale:[=en:, ja=ja:]",
179
- "label:[Kyusei=, *九星]", "divisor:9", "year:7",
180
- [Kyusei, "label:[KyuushiKasei=, *九紫火星]", "remainder:0"],
181
- [Kyusei, "label:[HappakuDosei=, *八白土星]", "remainder:1"],
182
- [Kyusei, "label:[SichisekiKinsei=, *七赤金星]", "remainder:2"],
183
- [Kyusei, "label:[RoppakuKinsei=, *六白金星]", "remainder:3"],
184
- [Kyusei, "label:[GoouDosei=, *五黄土星]", "remainder:4"],
185
- [Kyusei, "label:[ShirokuMokusei=, *四緑木星]", "remainder:5"],
186
- [Kyusei, "label:[SampekiMokusei=, *三碧木星]", "remainder:6"],
187
- [Kyusei, "label:[JikokuDosei=, *二黒土星]", "remainder:7"],
188
- [Kyusei, "label:[IppakuSuisei=, *一白水星]", "remainder:8"]
178
+ "locale:[=en:, ja=ja:, zh=ja:]",
179
+ "label:[Kyusei=, *九星, 九星]", "divisor:9", "year:7",
180
+ [Kyusei, "label:[9-Purple-Fire=, *九紫火星, 九紫火星]", "remainder:0"],
181
+ [Kyusei, "label:[8-White-Earth=, *八白土星, 八白土星]", "remainder:1"],
182
+ [Kyusei, "label:[7-Red-Metal=, *七赤金星, 七赤金星]", "remainder:2"],
183
+ [Kyusei, "label:[6-White-Metal=, *六白金星, 六白金星]", "remainder:3"],
184
+ [Kyusei, "label:[5-Yellow-Earth=, *五黄土星, 五黄土星]", "remainder:4"],
185
+ [Kyusei, "label:[4-Green-Wood=, *四緑木星, 四緑木星]", "remainder:5"],
186
+ [Kyusei, "label:[3-Blue-Wood=, *三碧木星, 三碧木星]", "remainder:6"],
187
+ [Kyusei, "label:[2-Black-Earth=, *二黒土星, 二黒土星]", "remainder:7"],
188
+ [Kyusei, "label:[1-White-Water=, *一白水星, 一白水星]", "remainder:8"]
189
189
  ],
190
190
 
191
191
  [Residue,
192
- "locale:[=en:, ja=ja:, alias]",
193
- "label:[SolarTerm=en:Solar_term, *二十四節気]", "divisor:360",
194
- [Residue, "label:[vernal_equinox=, *春分, 二月中=] ", "remainder:0" ],
195
- [Residue, "label:[clear_and_bright=, *清明, 三月節=] ", "remainder:15" ],
196
- [Residue, "label:[grain_rain=, *穀雨, 三月中=] ", "remainder:30" ],
197
- [Residue, "label:[start_of_summer=, *立夏, 四月節=] ", "remainder:45" ],
198
- [Residue, "label:[grain_full=, *小満, 四月中=] ", "remainder:60" ],
199
- [Residue, "label:[grain_in_ear=, *芒種, 五月節=] ", "remainder:75" ],
200
- [Residue, "label:[summer_solstice=, *夏至, 五月中=] ", "remainder:90" ],
201
- [Residue, "label:[minor_heat=, *小暑, 六月節=] ", "remainder:105"],
202
- [Residue, "label:[major_heat=, *大暑, 六月中=] ", "remainder:120"],
203
- [Residue, "label:[start_of_autumn=, *立秋, 七月節=] ", "remainder:135"],
204
- [Residue, "label:[limit_of_heat=, *処暑, 七月中=] ", "remainder:150"],
205
- [Residue, "label:[white_dew=, *白露, 八月節=] ", "remainder:165"],
206
- [Residue, "label:[autumnal_equinox=, *秋分, 八月中=] ", "remainder:180"],
207
- [Residue, "label:[cold_dew=, *寒露, 九月節=] ", "remainder:195"],
208
- [Residue, "label:[frost_descent=, *霜降, 九月中=] ", "remainder:210"],
209
- [Residue, "label:[start_of_winter=, *立冬, 十月節=] ", "remainder:225"],
210
- [Residue, "label:[minor_snow=, *小雪, 十月中=] ", "remainder:240"],
211
- [Residue, "label:[major_snow=, *大雪, 十一月節=]", "remainder:255"],
212
- [Residue, "label:[winter_solstice=, *冬至, 十一月中=]", "remainder:270"],
213
- [Residue, "label:[minor_cold=, *小寒, 十二月節=]", "remainder:285"],
214
- [Residue, "label:[major_cold=, *大寒, 十二月中=]", "remainder:300"],
215
- [Residue, "label:[start_of_spring=, *立春, 正月節=] ", "remainder:315"],
216
- [Residue, 'label:[#{A:rain_water=, *雨水},正月中=] ', "remainder:330"], # 戊寅・儀鳳暦では啓蟄
217
- [Residue, 'label:[#{B:awakening_of_insects=,*啓蟄},二月節=] ', "remainder:345"] # 戊寅・儀鳳暦では雨水
192
+ "locale:[=en:, ja=ja:, zh=zh:, alias]",
193
+ "label:[SolarTerm=en:Solar_term, *二十四節気, 節気=zh:%%<节气>]", "divisor:360",
194
+ [Residue, "label:[Vernal Equinox=en:Chunfen, *春分, 春分, 二月中=] ", "remainder:0" ],
195
+ [Residue, "label:[Clear And Bright=en:Qingming, *清明, 清明, 三月節=] ", "remainder:15" ],
196
+ [Residue, "label:[Grain Rain=en:Guyu, *穀雨, 穀雨, 三月中=] ", "remainder:30" ],
197
+ [Residue, "label:[Start Of Summer=en:Lixia, *立夏, 立夏, 四月節=] ", "remainder:45" ],
198
+ [Residue, "label:[Grain Full=en:Xiaoman, *小満, 小満, 四月中=] ", "remainder:60" ],
199
+ [Residue, "label:[Grain In Ear=en:Mangzhong, *芒種, 芒種, 五月節=] ", "remainder:75" ],
200
+ [Residue, "label:[Summer Solstice=en:Xiazhi, *夏至, 夏至, 五月中=] ", "remainder:90" ],
201
+ [Residue, "label:[Minor Heat=en:Xiaoshu, *小暑, 小暑, 六月節=] ", "remainder:105"],
202
+ [Residue, "label:[Major Heat=en:Dashu, *大暑, 大暑, 六月中=] ", "remainder:120"],
203
+ [Residue, "label:[Start Of Autumn=en:Liqiu, *立秋, 立秋, 七月節=] ", "remainder:135"],
204
+ [Residue, "label:[Limit Of Heat=en:Chushu, *処暑, 処暑=zh:%%<处暑>,七月中=] ", "remainder:150"],
205
+ [Residue, "label:[White Dew=en:Bailu, *白露, 白露, 八月節=] ", "remainder:165"],
206
+ [Residue, "label:[Autumnal Equinox=en:Qiufen, *秋分, 秋分, 八月中=] ", "remainder:180"],
207
+ [Residue, "label:[Cold Dew=en:Hanlu, *寒露, 寒露, 九月節=] ", "remainder:195"],
208
+ [Residue, "label:[Frost Descent=en:Shuangjiang_(solar_term), *霜降, 霜降, 九月中=] ", "remainder:210"],
209
+ [Residue, "label:[Start Of Winter=en:Lidong, *立冬, 立冬, 十月節=] ", "remainder:225"],
210
+ [Residue, "label:[Minor Snow=en:Xiaoxue, *小雪, 小雪, 十月中=] ", "remainder:240"],
211
+ [Residue, "label:[Major Snow=en:Daxue_(solar_term), *大雪, 大雪, 十一月節=]", "remainder:255"],
212
+ [Residue, "label:[Winter Solstice=en:Dongzhi_(solar_term), *冬至, 冬至, 十一月中=]", "remainder:270"],
213
+ [Residue, "label:[Minor Cold=en:Xiaohan, *小寒, 小寒, 十二月節=]", "remainder:285"],
214
+ [Residue, "label:[Major Cold=en:Dahan_(solar_term), *大寒, 大寒, 十二月中=]", "remainder:300"],
215
+ [Residue, "label:[Start Of Spring=en:Lichun, *立春, 立春, 正月節=] ", "remainder:315"],
216
+ [Residue, 'label:[#{A:Rain Water=en:Yushui_(solar_term), *雨水, 雨水},正月中=] ', "remainder:330"], # 戊寅・儀鳳暦では啓蟄
217
+ [Residue, 'label:[#{B:Awakening Of Insects=en:Jingzhe, *啓蟄, 驚蟄},二月節=] ', "remainder:345"] # 戊寅・儀鳳暦では雨水
218
218
  ],
219
219
 
220
220
  [Residue,
221
- "locale:[=en:, ja=ja:]",
222
- "label:[LunarPhase=en:Lunar_phase, *月相]", "divisor:360",
223
- [Residue, "label:[New_moon=, *朔 ]", "remainder:0" ],
224
- [Residue, "label:[First_quarter_moon=, *上弦]", "remainder:90" ],
225
- [Residue, "label:[Full_moon=, *望 ]", "remainder:180"],
226
- [Residue, "label:[Third_quarter_moon=, *下弦]", "remainder:270"]
221
+ "locale:[=en:, ja=ja:, zh=zh:]",
222
+ "label:[LunarPhase=en:Lunar_phase, *月相, 月相]", "divisor:360",
223
+ [Residue, "label:[New_moon=, *朔, 朔 ]", "remainder:0" ],
224
+ [Residue, "label:[First_quarter_moon=, *上弦, 上弦月]", "remainder:90" ],
225
+ [Residue, "label:[Full_moon=, *望, 望 ]", "remainder:180"],
226
+ [Residue, "label:[Third_quarter_moon=, *下弦, 下弦月]", "remainder:270"]
227
227
  ]
228
228
  ]]
229
229
  end