when_exe 0.4.6 → 0.5.0

data/lib/when_exe/region/hanke_henry.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2014-2015 Takashi SUGA
+  Copyright (C) 2014-2021 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -40,7 +40,7 @@ module When
     #
     HankeHenry = [CyclicTableBased, {
       'label'         => 'HankeHenry::HankeHenry',
-      'origin_of_LSC' => 1721061,
+      'origin_of_LSC' => 1721062, # 1721061(Sun) -> 1721062(Mon)
       'indices'       => [
         When.Index('HankeHenry::Month'),
         When::Coordinates::DefaultDayIndex
@@ -49,8 +49,8 @@ module When
         'T'  => {'Rule'  =>(2000...2400).to_a.map {|year|
                   [When.tm_pos(year,1,1), When.tm_pos(year,12,31)].map {|date| date.to_i % 7}.include?(3) ? 371 : 364
                 }},
-        364  => {'Length'=>[30,30,31]*4},
-        371  => {'Length'=>[30,30,31]*4 +[7]}
+        364  => {'Length'=>[30,30,31] * 4},
+        371  => {'Length'=>[30,30,31] * 4 + [7]}
       }
     }]
   end

data/lib/when_exe/region/indian.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2019 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -16,6 +16,7 @@ module When
       "[IndianNationalSolar=en:Indian_national_calendar, インド国定暦,                         印度國定曆, era:SE=]",
       "[Nanakshahi=en:Nanakshahi_calendar,               ナーナク暦=,                          拿那克曆=]",
       "[RevisedBengali=en:Bengali_calendar,              改訂ベンガル暦=,                      改变孟加拉曆=]",
+      "[VikramSamvat=en:Vikram_Samvat,                   ヴィクラマ暦,                         维克拉姆历]",
       "[HinduSolar=en:Hindu_calendar,                    インド太陽暦=ja:%%<ヒンドゥー暦>,     印度陽曆=]",
       "[HinduLuniSolar=en:Hindu_calendar,                インド太陰太陽暦=ja:%%<ヒンドゥー暦>, 印度陰陽曆=]",
 
@@ -619,6 +620,74 @@ module When
       }
     }]
 
+    #
+    # Vikram Sambat Solar Calendar defined by Table
+    #
+    VikramSambatSolar = [PatternTableBasedSolar, {
+      'label'   =>   'Indian::VikramSamvat',
+      'indices' => [
+          When.Index('Indian::SolarMonth'),
+          When::Coordinates::DefaultDayIndex
+        ],
+      'origin_of_MSC' => 2002,
+      'origin_of_LSC' => 2431559,
+      'epoch_in_CE'   => 1945,
+      'before'        => 'VikramSamvatSolar',
+      'after'         => 'VikramSamvatSolar',
+      'rule_table'    => %w(112210900900)
+    }]
+
+    #
+    # Vikram Samvat Solar Calendar defined by Epehmeris
+    #
+    class VikramSamvatSolar <  EphemerisBased
+
+      # see https://en.wikipedia.org/wiki/Vikram_Samvat
+
+      MonthLength = [30.950, 31.429, 31.638, 31.463, 31.012, 30.428, 29.879, 29.475, 29.310, 29.457, 29.841, 30.377] # unit : day
+      MonthDiff   = [-0.5,   -1.2,   -1.0,   -6.6,   -0.7,   -0.2,    0.0,   +0.5,   +0.7,   +8.0,   +0.3,   -0.1]   # unit : hour
+      year_length = MonthLength.inject(:+)
+      YearLength  = (1_582_237_828 - 4_320_000) / (4_320_000.0)
+      MonthOffset = [0.0] + (0...11).to_a.map {|i| MonthLength[0..i].inject(:+) / year_length * YearLength}
+      YearOffset  = 2430463.78
+
+      # protected
+
+      # 月初の通日
+      #
+      # @param  [Integer] m 通月
+      #
+      # @return [Integer] 月初の通日
+      #
+      def _new_month_(m)
+        yy, mm = m.divmod(12)
+        (YearOffset + (yy - 1999) * YearLength + @month_offset[mm]).floor
+      end
+
+      private
+
+      # オブジェクトの正規化
+      #
+      #    @month_offset = 月初の日時の補正値の配列 / hour
+      #
+      def _normalize(args=[], options={})
+        @label ||= 'Indian::VikramSamvat'
+        @month_offset = (0...12).to_a.map {|mm| MonthOffset[mm] + ((
+            case @month_offset
+            when nil ; MonthDiff
+            when /,/ ; @month_offset.split(',').map {|offset| offset.to_f}
+            else     ; [@month_offset.to_f] * 12
+            end
+          )[mm] || 0) / 24.0
+        }
+        @indices        ||= [
+          When.Index('Indian::SolarMonth'),
+          When::Coordinates::DefaultDayIndex
+        ]
+        super
+      end
+    end
+
     #
     # Hindu Solar Calendar
     #
@@ -650,7 +719,7 @@ module When
       def _normalize(args=[], options={})
         @label ||= 'Indian::HinduSolar'
         @type  ||= 'SBS'
-        raise ArgumentError, "Irregal formula: #{@formula}" unless @type.upcase =~ /\A(M|SS|SB)(V|S|B|H|VZ|SZ|BZ|HZ)\z/
+        raise ArgumentError, "Irregal formula: #{@formula}" unless @type.upcase =~ /\A(M|SS|SB)(V|S|B|H|G|N|K|VZ|SZ|BZ|HZ|GZ|NZ|KZ)\z/
 
         @location      ||=  HinduLuniSolar::Location_E[$2] || HinduLuniSolar::Location_F[$1]
         @cycle_offset  ||=  HinduLuniSolar::CycleOffset[$1]
@@ -684,7 +753,7 @@ module When
       Location_E  = {'B'=>'_co:Indian::Dacca', 'BZ'=>'_co:Indian::Dacca', 'H'=>'_co:Iranian::Tehran', 'HZ'=>'_co:Iranian::Tehran'}
       CycleOffset = {'M'=>+23.25/30, 'SS'=>0.0, 'SB'=>0.0}
       HinduStyle = {'A'=>0, 'P'=>1, 'PX'=>2}
-      YearEpoch   = {'V'=>-58,'VZ'=>-57,'S'=>78, 'SZ'=>79, 'B'=> 593, 'BZ'=>594, 'H'=> 621, 'HZ'=> 622}
+      YearEpoch   = {'V'=>-58,'VZ'=>-57,'S'=>78, 'SZ'=>79, 'G'=>318, 'GZ'=>319, 'B'=> 593, 'BZ'=>594, 'H'=> 621, 'HZ'=> 622, 'N'=>801, 'NZ'=>802, 'K'=>824, 'KZ'=>825}
 
       # White / black  month and leap month identification table
 
@@ -793,7 +862,7 @@ module When
       def _normalize(args=[], options={})
         @label ||= 'Indian::HinduLuniSolar'
         @type  ||= 'SBSA'
-        raise ArgumentError, "Irregal formula: #{@formula}" unless @type.upcase =~ /\A(M|SS|SB)(V|S|B|H|VZ|SZ|BZ|HZ)(A|P|PX)\z/
+        raise ArgumentError, "Irregal formula: #{@formula}" unless @type.upcase =~ /\A(M|SS|SB)(V|S|B|H|G|N|K|VZ|SZ|BZ|HZ|GZ|NZ|KZ)(A|P|PX)\z/
 
         @location      ||=  Location_E[$2] || Location_F[$1]
         @cycle_offset  ||=  CycleOffset[$1]

data/lib/when_exe/region/international_fixed.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2014-2015 Takashi SUGA
+  Copyright (C) 2014-2021 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -87,8 +87,8 @@ module When
          When::Coordinates::DefaultDayIndex
         ],
       'rule_table'       => {
-        365  => {'Length'=>[28]*12 + [29]},
-        366  => {'Length'=>[28]* 5 + [29] + [28] *6 + [29]}
+        365  => {'Length'=>[28] * 12 + [29]},
+        366  => {'Length'=>[28] *  5 + [29] + [28] * 6 + [29]}
       },
       'note'   => 'InternationalFixedWeek'
     }]

data/lib/when_exe/region/japanese.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2016 Takashi SUGA
+  Copyright (C) 2011-2019 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -107,6 +107,8 @@ module When
       "[天皇誕生日,                   The Emperor's Birthday    ]",
       "[みどりの日,                   Greenery Day              ]",
       "[昭和の日,                     Shōwa Day                 ]",
+      "[退位の日=,                    Day of Abdication=]",
+      "[即位の日=,                    Coronation Day of the new Emperor=]",
       "[憲法記念日,                   Constitution Memorial Day ]",
       "[こどもの日,                   Children's Day (Japan)    ]",
       "[七夕節句=ja:%%<七夕>,         Qixi Festival             ]",
@@ -117,20 +119,21 @@ module When
       "[敬老の日,                     Respect for the Aged Day  ]",
       "[神嘗祭,                       Kan'namesai=              ]",
       "[体育の日,                     Health and Sports Day     ]",
+      "[スポーツの日,                 Sports Day                ]",
       "[春季皇霊祭,                   Vernal Kōreisai=en:K%C5%8Dreisai           ]",
       "[春分の日,                     Vernal Equinox Day                         ]",
       "[秋季皇霊祭,                   Autumnal Kōreisai=en:K%C5%8Dreisai         ]",
       "[秋分の日,                     Autumnal Equinox Day                       ]",
       "[明治節,                       The emperor Maiji's Birthday=en:Culture_Day]",
       "[文化の日,                     Culture Day                                ]",
-      "[大嘗祭,                       Enthronement of the Japanese Emperor       ]",
-      "[大饗第1日,                    Enthronement of the Japanese Emperor       ]",
+      "[大嘗祭,                       Enthronement of the Japanese Emperor=      ]",
+      "[大饗第1日,                    Enthronement of the Japanese Emperor=      ]",
       "[新嘗祭,                       Labor Thanksgiving Day                     ]",
       "[勤労感謝の日,                 Labor Thanksgiving Day                     ]",
       "[振替休日,                     Substitute holiday                         ]",
       "[国民の休日,                   National Day Off=                          ]",
-      "[即位の礼,                     Enthronement of the Japanese Emperor       ]",
-      "[即位の礼正殿の儀,             Enthronement of the Japanese Emperor       ]",
+      "[即位の礼,                     Enthronement of the Japanese Emperor=      ]",
+      "[即位礼正殿の儀,               Enthronement of the Japanese Emperor=]",
       "[神武天皇祭,                   EmperorJimmu's Death anniversary=          ]",
       "[孝明天皇祭=ja:%%<先帝祭>,     Emperor Kōmei's Death anniversary=         ]",
       "[明治天皇祭=ja:%%<先帝祭>,     Emperor Meiji's Death anniversary=         ]",
@@ -139,6 +142,7 @@ module When
       "[弥生節句=ja:%%<上巳>,         Double Third Festival=                     ]",
       "[端午節句=ja:%%<端午>,         Double Fifth Festival=                     ]",
       "[田実節句=ja:%%<八朔>,         Hassaku=                                   ]",
+      "[皇大神宮遷御当日=ja:%%<神宮式年遷宮>,            Rebuilding the Ise Grand Shrine= ]",
       "[皇太子明仁親王の結婚の儀=ja:%%<結婚の儀>,        Prince Akihito's wedding=        ]",
       "[皇太子徳仁親王の結婚の儀=ja:%%<結婚の儀>,        Prince Naruhito's wedding=       ]",
       "[天長節祝日=ja:%%<天皇誕生日>#%.<近世・現代>,     Emperor Taishō's Birth holiday=  ]",

data/lib/when_exe/region/japanese/epochs.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2021 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -335,7 +335,9 @@ module When
       ["[昭和,Shōwa=en:Sh%C5%8Dwa_period,S]1.12.25",    "@A",
 				"name=[昭和天皇,Emperor_Shōwa];1926-12-25"],
       ["[平成,Heisei=en:Heisei_period,H]1.01.08",       "@A",
-				"name=[今上天皇=ja:%%<明仁>,Emperor_Kinjō=en:Akihito];1989-01-08"]
+				"name=[上皇明仁,Emperor_Emeritus_of_Japan=en:Akihito];1989-01-08"],
+      ["[令和,Reiwa,R]1.05.01",       "@A",
+				"name=[今上天皇=ja:%%<徳仁>,Emperor_Kinjō=en:Naruhito];2019-05-01"]
     ]]
 
     #
@@ -403,7 +405,7 @@ module When
       ["[鈴木善幸]1.07.17",				"@A", "1980-07-17"],
       ["[中曽根康弘]1.11.27",				"@A", "1982-11-27"],
       ["[竹下登]1.11.06",				"@A", "1987-11-06",
-      	 "name=[今上天皇=ja:%%<明仁>,Emperor_Kinjō=en:Akihito];1989-01-08", ""],
+      	 "name=[上皇明仁,Emperor_Emeritus_of_Japan=en:Akihito];1989-01-08", ""],
       ["[宇野宗佑]1.06.03",				"@A", "1989-06-03"],
       ["[海部俊樹]1.08.10",				"@A", "1989-08-10"],
       ["[宮沢喜一]1.11.05",				"@A", "1991-11-05"],
@@ -420,7 +422,9 @@ module When
       ["[鳩山由紀夫]1.09.16",				"@A", "2009-09-16"],
       ["[菅直人]1.06.08",				"@A", "2010-06-08"],
       ["[野田佳彦]1.09.02",				"@A", "2011-09-02"],
-      ["[安倍晋三･再=ja:%%<安倍晋三>]1.12.26",		"@A", "2012-12-26"]
+      ["[安倍晋三･再=ja:%%<安倍晋三>]1.12.26",		"@A", "2012-12-26",
+        "name=[今上天皇=ja:%%<徳仁>,Emperor_Kinjō=en:Naruhito];2019-05-01", ""],
+      ["[菅義偉]1.09.16",				"@A", "2020-09-16"]
     ]]
   end
 end

data/lib/when_exe/region/japanese/notes.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2012-2016 Takashi SUGA
+  Copyright (C) 2012-2021 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -798,6 +798,7 @@ class When::CalendarNote
       [ 1,29] => [[1873..1873, When.M17n('JapaneseHoliday::神武天皇即位日')]],
       [ 1,30] => [[1874..1912, When.M17n('JapaneseHoliday::孝明天皇祭')]],
       [ 2,11] => [[1874..1948, When.M17n('JapaneseHoliday::紀元節')], [1967..2100, When.M17n('JapaneseHoliday::建国記念の日')]],
+      [ 2,23] => [[2020..2100, When.M17n('JapaneseHoliday::天皇誕生日')]],
       [ 2,24] => [[1989..1989, When.M17n('JapaneseHoliday::昭和天皇の大喪の礼')]],
       [ 3, 3] => [[1868..1872, When.M17n('JapaneseHoliday::弥生節句')]],
       [ 3, 0] => [[1879..1948, When.M17n('JapaneseHoliday::春季皇霊祭')], [1949..2100, When.M17n('JapaneseHoliday::春分の日')]],
@@ -805,6 +806,7 @@ class When::CalendarNote
       [ 4,10] => [[1959..1959, When.M17n('JapaneseHoliday::皇太子明仁親王の結婚の儀')]],
       [ 4,29] => [[1927..1948, When.M17n('JapaneseHoliday::天長節')], [1949..1988, When.M17n('JapaneseHoliday::天皇誕生日')],
                   [1989..2006, When.M17n('JapaneseHoliday::みどりの日')], [2007..2100, When.M17n('JapaneseHoliday::昭和の日')]],
+      [ 5, 1] => [[2019..2019, When.M17n('JapaneseHoliday::即位の日')]],
       [ 5, 3] => [[1949..2100, When.M17n('JapaneseHoliday::憲法記念日')]],
       [ 5, 4] => [[2007..2100, When.M17n('JapaneseHoliday::みどりの日')]],
       [ 5, 5] => [[1868..1872, When.M17n('JapaneseHoliday::端午節句')], [1949..2100, When.M17n('JapaneseHoliday::こどもの日')]],
@@ -812,28 +814,35 @@ class When::CalendarNote
       [ 7, 7] => [[1868..1872, When.M17n('JapaneseHoliday::七夕節句')]],
       [ 7,15] => [[1868..1872, When.M17n('JapaneseHoliday::お盆')]],
       [ 7,20] => [[1996..2002, When.M17n('JapaneseHoliday::海の日')]],
-      [ 7,-3] => [[2003..2100, When.M17n('JapaneseHoliday::海の日')]],
+      [ 7,22] => [[2021..2021, When.M17n('JapaneseHoliday::海の日')]],
+      [ 7,23] => [[2020..2020, When.M17n('JapaneseHoliday::海の日')],[2021..2021, When.M17n('JapaneseHoliday::スポーツの日')]],
+      [ 7,-3] => [[2003..2019, When.M17n('JapaneseHoliday::海の日')],[2022..2100, When.M17n('JapaneseHoliday::海の日')]],
+      [ 7,24] => [[2020..2020, When.M17n('JapaneseHoliday::スポーツの日')]],
       [ 7,30] => [[1913..1926, When.M17n('JapaneseHoliday::明治天皇祭')]],
       [ 8, 1] => [[1868..1872, When.M17n('JapaneseHoliday::田実節句')]],
-      [ 8,11] => [[2016..2100, When.M17n('JapaneseHoliday::山の日')]],
+      [ 8, 8] => [[2021..2021, When.M17n('JapaneseHoliday::山の日')]],
+      [ 8,10] => [[2020..2020, When.M17n('JapaneseHoliday::山の日')]],
+      [ 8,11] => [[2016..2019, When.M17n('JapaneseHoliday::山の日')],[2022..2100, When.M17n('JapaneseHoliday::山の日')]],
       [ 8,31] => [[1913..1926, When.M17n('JapaneseHoliday::天長節')]],
       [ 9, 9] => [[1868..1872, When.M17n('JapaneseHoliday::重陽節句')]],
       [ 9,15] => [[1966..2002, When.M17n('JapaneseHoliday::敬老の日')]],
       [ 9,-3] => [[2003..2100, When.M17n('JapaneseHoliday::敬老の日')]],
       [ 9,17] => [[1874..1878, When.M17n('JapaneseHoliday::神嘗祭')]],
       [ 9, 0] => [[1878..1947, When.M17n('JapaneseHoliday::秋季皇霊祭')], [1948..2100, When.M17n('JapaneseHoliday::秋分の日')]],
+      [10, 2] => [[1929..1929, When.M17n('JapaneseHoliday::皇大神宮遷御当日')]],
       [10,10] => [[1966..1999, When.M17n('JapaneseHoliday::体育の日')]],
-      [10,-2] => [[2000..2100, When.M17n('JapaneseHoliday::体育の日')]],
+      [10,-2] => [[2000..2019, When.M17n('JapaneseHoliday::体育の日')],[2022..2100, When.M17n('JapaneseHoliday::スポーツの日')]],
       [10,17] => [[1879..1947, When.M17n('JapaneseHoliday::神嘗祭')]],
+      [10,22] => [[2019..2019, When.M17n('JapaneseHoliday::即位礼正殿の儀')]],
       [10,31] => [[1913..1926, When.M17n('JapaneseHoliday::天長節祝日')]],
       [11, 3] => [[1873..1911, When.M17n('JapaneseHoliday::天長節')], [1927..1947, When.M17n('JapaneseHoliday::明治節')],
                   [1948..2100, When.M17n('JapaneseHoliday::文化の日')]],
       [11,10] => [[1915..1915, When.M17n('JapaneseHoliday::即位の礼')], [1928..1928, When.M17n('JapaneseHoliday::即位の礼')]],
-      [11,12] => [[1990..1990, When.M17n('JapaneseHoliday::即位の礼正殿の儀')]],
+      [11,12] => [[1990..1990, When.M17n('JapaneseHoliday::即位礼正殿の儀')]],
       [11,14] => [[1915..1915, When.M17n('JapaneseHoliday::大嘗祭')], [1928..1928, When.M17n('JapaneseHoliday::大嘗祭')]],
       [11,16] => [[1915..1915, When.M17n('JapaneseHoliday::大饗第1日')], [1928..1928, When.M17n('JapaneseHoliday::大饗第1日')]],
       [11,23] => [[1873..1947, When.M17n('JapaneseHoliday::新嘗祭')], [1948..2100, When.M17n('JapaneseHoliday::勤労感謝の日')]],
-      [12,23] => [[1989..2100, When.M17n('JapaneseHoliday::天皇誕生日')]],
+      [12,23] => [[1989..2018, When.M17n('JapaneseHoliday::天皇誕生日')]],
       [12,25] => [[1927..1947, When.M17n('JapaneseHoliday::大正天皇祭')]]
     }
 
@@ -1274,7 +1283,16 @@ class When::CalendarNote
       2397584 => [ 16.0, 0], # 嘉永05(1852).02=16 [ 15.0, 1] 清明 (計算誤差の補正)
 
       2451110 => [210.0, 1], # 平成10(1998).10.23 [209.0, 0] 没
-      2451111 => [211.0, 0]  # 平成10(1998).10.24 [210.0, 1] 霜降 (計算誤差の補正)
+      2451111 => [211.0, 0], # 平成10(1998).10.24 [210.0, 1] 霜降 (計算誤差の補正)
+
+      2459950 => [284.0, 0], # 令和05(2023).01.05 [285.0, 1] 小寒 (計算誤差の補正)
+      2459951 => [285.0, 1], # 令和05(2023).01.06 [285.0, 0] 没
+
+      2460651 => [254.0, 0], # 令和06(2024).12.06 [255.0, 1] 大雪 (計算誤差の補正)
+      2460652 => [255.0, 1], # 令和06(2024).12.07 [255.0, 0] 没
+
+      2461031 => [269.0, 0], # 令和07(2025).12.21 [270.0, 1] 冬至 (計算誤差の補正)
+      2461032 => [270.0, 1]  # 令和07(2025).12.22 [270.0, 0] 没
     }
 
     class << self

data/lib/when_exe/region/japanese/residues.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2012-2014 Takashi SUGA
+  Copyright (C) 2012-2016 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -14,6 +14,8 @@ module When::Coordinates
 
     StartOfSequence = {-1=>'九星陽遁始め', +1=>'九星陰遁始め'}
 
+    Patch = {2421371=>2421431, 2429771=>2429831, 2463251=>2463191, 2475851=>2475791}
+
     class << self
 
       #
@@ -48,6 +50,7 @@ module When::Coordinates
       #
       def day(date, s_terms)
         thres, delta, sign = _parameters(date, s_terms)
+        delta += 3 if thres == 30
         delta = 8 - delta if sign < 0
         return delta % 9
       end
@@ -79,15 +82,34 @@ module When::Coordinates
       def _parameters(date, s_terms)
         date = When.when?(date.to_cal_date.to_s, {:frame=>date.frame, :clock=>date.frame.time_basis})
 
-        [+90,-90,-270].each do |deg|
-          prev   = s_terms.term(date, [deg,180])                     # 直後および直前の冬至または夏至
-          sign   = s_terms.position(prev)[0] == 270 ? -1 : +1        # 陽遁か?(冬至:-1, 夏至:+1)
-          base   = prev.to_i                                         # 当該の冬至または夏至のユリウス日
-          kanshi = (base + 17) % 60 - 28                             # 最も近い甲子との日数差
-          base  -= kanshi                                            # 当該陰陽遁の始め
-          delta  = date.to_i - base                                  # 始めからの日数
-          thres  = kanshi >= 29 ? 30 : 0                             # 区間の始めの delta (甲午の前後1日以内は甲午折り返し)
-          return [thres, delta, sign] if thres <= delta              # 区間に入れば確定
+        bases = [+450,+270,+90,-90,-270,-450].map { |deg|
+          prev   = s_terms.term(date, [deg,180])              # 直後および直前の冬至または夏至
+          sign   = s_terms.position(prev)[0] == 270 ? -1 : +1 # 陽遁か?(冬至:-1, 夏至:+1)
+          base   = prev.to_i                                  # 当該の冬至または夏至のユリウス日
+          kanshi = (base + 17) % 60 - 28                      # 最も近い甲子との日数差
+          base  -= kanshi                                     # 当該陰陽遁の始めの甲子
+          [(Patch[base] || base), sign]                       # 『暦日大鑑』に合わせる
+        }
+
+        (1...bases.size).each do |i|                          # 区間が短くなりすぎる場合は次と繋げる
+          next unless bases[i-1][0] - bases[i][0] == 120
+          bases[i-1][0] += 60
+          break
+        end
+
+        bases.size.times do |i|
+          base, sign = bases[i]
+          delta  = date.to_i - base                           # 始めからの日数
+          next if delta < 0
+          case (bases[i-1][0] - base)
+          when 180
+            return [ 0, delta, sign]                          # 通常
+          when 240
+            return [30, delta,      sign] if delta >= 30      # 甲午以降
+            return [ 0, delta+180, -sign]                     # 甲午より前
+          else
+            raise ArgumentError, "Invalid solstice interval: #{bases[i-1][0] - base}"
+          end
        end
        raise ArgumentError, "can't find any solstice."
       end

data/lib/when_exe/region/japanese/weeks.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2014 Takashi SUGA
+  Copyright (C) 2014-2017 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -29,12 +29,12 @@ class When::CalendarNote
         "names:[day]",
         [When::BasicTypes::M17n,
           "names:[Rokuyo=, 六曜, 六曜=zh:%%<六曜>]",
-          [DayOfWeek, "label:[Taian=,      *大安, 大安]", {'delta'=>6}],
-          [DayOfWeek, "label:[Shakko=,     *赤口, 赤口]", {'delta'=>6}],
-          [DayOfWeek, "label:[Sensho=,     *先勝, 先勝]", {'delta'=>6}],
-          [DayOfWeek, "label:[Tomobiki=,   *友引, 友引]", {'delta'=>6}],
-          [DayOfWeek, "label:[Sembu=,      *先負, 先負]", {'delta'=>6}],
-          [DayOfWeek, "label:[Butsumetsu=, *仏滅, 仏滅]", {'delta'=>6}]
+          [DayOfWeek, "label:[Taian=,      *大安=ja:%%<六曜>#%.<大安>, 大安=ja:%%<六曜>#%.<大安>]", {'delta'=>6}],
+          [DayOfWeek, "label:[Shakko=,     *赤口=ja:%%<六曜>#%.<赤口>, 赤口=ja:%%<六曜>#%.<赤口>]", {'delta'=>6}],
+          [DayOfWeek, "label:[Sensho=,     *先勝=ja:%%<六曜>#%.<先勝>, 先勝=ja:%%<六曜>#%.<先勝>]", {'delta'=>6}],
+          [DayOfWeek, "label:[Tomobiki=,   *友引=ja:%%<六曜>#%.<友引>, 友引=ja:%%<六曜>#%.<友引>]", {'delta'=>6}],
+          [DayOfWeek, "label:[Sembu=,      *先負=ja:%%<六曜>#%.<先負>, 先負=ja:%%<六曜>#%.<先負>]", {'delta'=>6}],
+          [DayOfWeek, "label:[Butsumetsu=, *仏滅=ja:%%<六曜>#%.<仏滅>, 仏滅=zh:%%<佛滅日>]", {'delta'=>6}]
         ]
       ]
     ]]

data/lib/when_exe/region/korean.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2013-2014 Takashi SUGA
+  Copyright (C) 2013-2021 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -35,22 +35,22 @@ module When
     # #- は『韓國年暦大典』(1987年版)の中国-朝鮮差分が取り消されたもの
     # #! は全勇勳「朝鮮における時憲曆の受容過程とその思想的背景」で言及された年(最終的には差分でない)
 
-  Korean = PatternTableBasedLuniSolar.join([
-    PatternTableBasedLuniSolar,
-    {
-      'indices'=>  ChineseIndices,
-      'before' => 'ChineseTwin::太初暦',
-      'after'  => 'ChineseLuniSolar?time_basis=+09',
-      'note'   => 'Chinese',
-    },
-    ['Chinese_103',  -60.. 263],             # 前漢～蜀漢(太初暦・四分暦)
-    ['Chinese0239',  264.. 444],             # 三国・南朝(景初暦)
-    ['Chinese0445',  445.. 589],             # 南朝(元嘉暦・大明暦)
-    ['Chinese0523',  590.. 946],             # 隋・唐～五代前期(大業暦～調元暦)
-    ['Chinese0956',  947..1279],             # 五代後期～南宋(調元暦～本天暦)
-    ['Chinese0939', 1280..1653],             # 元・明・南明(重修大明暦・授時暦・大統暦)
-    ['Chinese1645', 1654..1911]],            # 清(時憲暦)
-    {
+    Korean = PatternTableBasedLuniSolar.join([
+      PatternTableBasedLuniSolar,
+      {
+        'indices'=>  ChineseIndices,
+        'before' => 'ChineseTwin::太初暦',
+        'after'  => 'ChineseLuniSolar?time_basis=+09',
+        'note'   => 'Chinese',
+      },
+      ['Chinese_103',  -60.. 263],             # 前漢～蜀漢(太初暦・四分暦)
+      ['Chinese0239',  264.. 444],             # 三国・南朝(景初暦)
+      ['Chinese0445',  445.. 589],             # 南朝(元嘉暦・大明暦)
+      ['Chinese0523',  590.. 946],             # 隋・唐～五代前期(大業暦～調元暦)
+      ['Chinese0956',  947..1279],             # 五代後期～南宋(調元暦～本天暦)
+      ['Chinese0939', 1280..1653],             # 元・明・南明(重修大明暦・授時暦・大統暦)
+      ['Chinese1645', 1654..1911]],            # 清(時憲暦)
+      {
        -26 => {'aB'   => 'Ab'  },            # ベースとする中国暦日表の違い
        240 => {'Hi'   => 'hI'  },            # 四分・景初・乾象暦いずれにも不一致