mhc 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 43a6efc8f64585aab4b5f556f5d0471ff81d591e
-  data.tar.gz: 4a5661828391b6412649013e15fe6926cdbc2b6f
+SHA256:
+  metadata.gz: ad9980a512d28d67c17e00e216f3bcead9dc3b10496e587a5615393e5202c67a
+  data.tar.gz: acd404cf04e7cad1e67f9ebcb9d729cda9d233c70655dd07428a28facc70e36a
 SHA512:
-  metadata.gz: 66cd2cecb7a8f1bc67082141c843382fb9ed23ab5439f1f6dd0b18417d27a6e523dc783ab73176a4f75bc0d4ebb722f64e646aafa4244fb2024fa0f9363143ab
-  data.tar.gz: bc58466da8bc8c3e648b6bac4d141fb0d076255f7f1f2b16123c4c1f9a5b4f9153ebad79a1697e0a61b4dab7e8bd5181b495d2c246bcccc9f61efccc346ae10c
+  metadata.gz: 1a189e8d02a1fb5a7dce4381dde9bb325f2a7ffc68ebe59a0612aef84fb46c1392e753cb61e6e993244e89435f3c1ae8d34fa5facaa279ddfe7c2c4132a9d79d
+  data.tar.gz: 4b0b1e075b6ddcb3b229459c860437ea4031e7333418c470e30d6670ec325dc031b5c7227d9979e4ecc94f1cd70ca7c088892b0f658e5c9af20d367890198626

data/emacs/Cask

@@ -5,7 +5,7 @@
 (source org)
 (source melpa)
 
-(package "mhc" "1.2.1" "Message Harmonized Calendaring system") ;; MHC_VERSION
+(package "mhc" "1.2.2" "Message Harmonized Calendaring system") ;; MHC_VERSION
 
 (files "mhc.el" "mhc-*.el")
 

data/emacs/mhc-calendar.el

@@ -1071,11 +1071,13 @@ The keys that are defined for mhc-calendar-mode are:
   (format "%4d" yy))
 
 (defun mhc-calendar/inserter-nengo ()
-  (if (> yy 1987)
-      (format "平成%2d年" (- yy 1988))
-    (if (> yy 1924)
-        (format "昭和%2d年" (- yy 1925))
-      "昔々")))
+  (if (or (> yy 2019) (and (= yy 2019) (> mm 4)))
+      (format "令和%2d年" (- yy 2018))
+    (if (> yy 1987)
+        (format "平成%2d年" (- yy 1988))
+      (if (> yy 1924)
+          (format "昭和%2d年" (- yy 1925))
+        "昔々"))))
 
 (defun mhc-calendar/inserter-mm ()
   (format "%d" mm))

data/emacs/mhc-vars.el

@@ -18,7 +18,7 @@
 
 
 ;;; Constants:
-(defconst mhc-version "mhc 1.2.1") ;; MHC_VERSION
+(defconst mhc-version "mhc 1.2.2") ;; MHC_VERSION
 
 
 ;;; Configration Variables:

data/emacs/mhc.el

@@ -3,7 +3,7 @@
 ;; Description: Message Harmonized Calendaring system.
 ;; Author:  Yoshinari Nomura <nom@quickhack.net>
 ;; Created: 1994-07-04
-;; Version: 1.2.1
+;; Version: 1.2.2
 ;; Keywords: calendar
 ;; URL: http://www.quickhack.net/mhc
 ;; Package-Requires: ((calfw "20150703"))

data/lib/mhc/version.rb

@@ -1,4 +1,4 @@
 module Mhc
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
   PRODID = "-//Quickhack.net//MHC #{Mhc::VERSION}//EN"
 end

data/mhc.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "tzinfo",      ">= 1.2.2"
   spec.add_runtime_dependency "tzinfo-data", ">= 1.2015.4"
 
-  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/samples/japanese-holidays.mhcc

@@ -72,12 +72,14 @@ X-SC-Record-Id: 5E03776A-4280-4337-85C0-F1322A3AAE6E
 
 X-SC-Subject: 海の日
 X-SC-Category: Holiday Japanese
+X-SC-Day: !20200720 20200723
 X-SC-Cond: 3rd Mon Jul
 X-SC-Duration: 20030701-
 X-SC-Record-Id: BD4156C2-5546-4146-8297-09CF4210A346
 
 X-SC-Subject: 山の日
 X-SC-Category: Holiday Japanese
+X-SC-Day: 20200810 !20200811
 X-SC-Cond: 11 Aug
 X-SC-Duration: 20160811-
 X-SC-Record-Id: FC7C481B-7BF5-4639-B700-3B60CB99E05D
@@ -103,9 +105,16 @@ X-SC-Record-Id: AFABC42C-2E9D-4093-A4AF-DA12D4D4B9D7
 X-SC-Subject: 体育の日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 2nd Mon Oct
-X-SC-Duration: 20001009-
+X-SC-Duration: 20001009-20191231
 X-SC-Record-Id: C17D9CA5-28AF-4826-AD33-8B75473E5B52
 
+X-SC-Subject: スポーツの日
+X-SC-Category: Holiday Japanese
+X-SC-Day: 20200724 !20201012
+X-SC-Cond: 2nd Mon Oct
+X-SC-Duration: 20200101-
+X-SC-Record-Id: F10B2B18-B0FB-477E-A7D3-A067B31F4736
+
 X-SC-Subject: 文化の日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 3 Nov
@@ -121,9 +130,15 @@ X-SC-Record-Id: 97E6F125-2625-44A9-8D43-A6FCA9670D8D
 X-SC-Subject: 天皇誕生日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 23 Dec
-X-SC-Duration: 19891223-
+X-SC-Duration: 19891223-20190430
 X-SC-Record-Id: 51D42B0D-EF46-4D65-B62A-6ED2F0D1F0B5
 
+X-SC-Subject: 天皇誕生日
+X-SC-Category: Holiday Japanese
+X-SC-Cond: 23 Feb
+X-SC-Duration: 20190501-
+X-SC-Record-Id: 59B83B1E-6161-45F5-9DEC-95E3C1CCA4EE
+
 ## 毎年変わる祝日と振替休日
 
 X-SC-Subject: 即位の日
@@ -131,6 +146,11 @@ X-SC-Day: 20190501
 X-SC-Category: Holiday Japanese
 X-SC-Record-Id: 25C73788-1104-42BE-85F6-570861B0020B
 
+X-SC-Subject: 即位礼正殿の儀
+X-SC-Category: Holiday Japanese
+X-SC-Day: 20191022
+X-SC-Record-Id: 76F9756D-C00F-47D0-9592-67E21909C39D
+
 X-SC-Subject: 春分の日
 X-SC-Day: 19960320 19970320 19980321 19990321 20000320 20010320 20020321
   20030321 20040320 20050320 20060321 20070321 20080320 20090320
@@ -163,14 +183,14 @@ X-SC-Day: 19730430 19730924 19740506 19740916 19741104 19751124
   20050321 20060102 20070212 20070430 20070924 20071224 20080506
   20081124 20090506 20100322 20120102 20120430 20121224 20130506
   20131104 20140506 20141124 20150506 20160321 20170102 20180212
-  20180430 20180924 20181224 20190506 20190812 20191104 20200506
-  20230102 20240212 20240506 20240812 20240923 20241104 20250506
+  20180430 20180924 20181224 20190506 20190812 20191104 20200224 20200506
+  20230102 20240212 20240506 20240812 20240923 20241104 20250224 20250506
   20251124 20260506 20270322 20290212 20290430 20290924 20291224
-  20300506 20300812 20301104 20310506 20311124 20330321 20340102
+  20300506 20300812 20301104 20310224 20310506 20311124 20330321 20340102
   20350212 20350430 20350924 20351224 20360506 20361124 20370506
-  20400102 20400430 20401224 20410506 20410812 20411104 20420506
+  20400102 20400430 20401224 20410506 20410812 20411104 20420224 20420506
   20421124 20430506 20440321 20450102 20460212 20460430 20460924
-  20461224 20470506 20470812 20471104 20480506 20500321
+  20461224 20470506 20470812 20471104 20480224 20480506 20500321
 X-SC-Category: Holiday Japanese
 X-SC-Record-Id: E2D696DF-EB49-44D7-B06C-812B10BD99A2
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mhc
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Yoshinari Nomura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2015.4
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -270,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Message Harmonized Calendaring