mhc 1.2.1 → 1.2.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 (9) hide show
  1. checksums.yaml +5 -5
  2. data/emacs/Cask +1 -1
  3. data/emacs/mhc-calendar.el +7 -5
  4. data/emacs/mhc-vars.el +1 -1
  5. data/emacs/mhc.el +1 -1
  6. data/lib/mhc/version.rb +1 -1
  7. data/mhc.gemspec +0 -1
  8. data/samples/japanese-holidays.mhcc +27 -7
  9. metadata +3 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 43a6efc8f64585aab4b5f556f5d0471ff81d591e
4
- data.tar.gz: 4a5661828391b6412649013e15fe6926cdbc2b6f
2
+ SHA256:
3
+ metadata.gz: ad9980a512d28d67c17e00e216f3bcead9dc3b10496e587a5615393e5202c67a
4
+ data.tar.gz: acd404cf04e7cad1e67f9ebcb9d729cda9d233c70655dd07428a28facc70e36a
5
5
  SHA512:
6
- metadata.gz: 66cd2cecb7a8f1bc67082141c843382fb9ed23ab5439f1f6dd0b18417d27a6e523dc783ab73176a4f75bc0d4ebb722f64e646aafa4244fb2024fa0f9363143ab
7
- data.tar.gz: bc58466da8bc8c3e648b6bac4d141fb0d076255f7f1f2b16123c4c1f9a5b4f9153ebad79a1697e0a61b4dab7e8bd5181b495d2c246bcccc9f61efccc346ae10c
6
+ metadata.gz: 1a189e8d02a1fb5a7dce4381dde9bb325f2a7ffc68ebe59a0612aef84fb46c1392e753cb61e6e993244e89435f3c1ae8d34fa5facaa279ddfe7c2c4132a9d79d
7
+ data.tar.gz: 4b0b1e075b6ddcb3b229459c860437ea4031e7333418c470e30d6670ec325dc031b5c7227d9979e4ecc94f1cd70ca7c088892b0f658e5c9af20d367890198626
data/emacs/Cask CHANGED
@@ -5,7 +5,7 @@
5
5
  (source org)
6
6
  (source melpa)
7
7
 
8
- (package "mhc" "1.2.1" "Message Harmonized Calendaring system") ;; MHC_VERSION
8
+ (package "mhc" "1.2.2" "Message Harmonized Calendaring system") ;; MHC_VERSION
9
9
 
10
10
  (files "mhc.el" "mhc-*.el")
11
11
 
data/emacs/mhc-calendar.el CHANGED
@@ -1071,11 +1071,13 @@ The keys that are defined for mhc-calendar-mode are:
1071
1071
  (format "%4d" yy))
1072
1072
 
1073
1073
  (defun mhc-calendar/inserter-nengo ()
1074
- (if (> yy 1987)
1075
- (format "平成%2d年" (- yy 1988))
1076
- (if (> yy 1924)
1077
- (format "昭和%2d年" (- yy 1925))
1078
- "昔々")))
1074
+ (if (or (> yy 2019) (and (= yy 2019) (> mm 4)))
1075
+ (format "令和%2d年" (- yy 2018))
1076
+ (if (> yy 1987)
1077
+ (format "平成%2d年" (- yy 1988))
1078
+ (if (> yy 1924)
1079
+ (format "昭和%2d年" (- yy 1925))
1080
+ "昔々"))))
1079
1081
 
1080
1082
  (defun mhc-calendar/inserter-mm ()
1081
1083
  (format "%d" mm))
data/emacs/mhc-vars.el CHANGED
@@ -18,7 +18,7 @@
18
18
 
19
19
 
20
20
  ;;; Constants:
21
- (defconst mhc-version "mhc 1.2.1") ;; MHC_VERSION
21
+ (defconst mhc-version "mhc 1.2.2") ;; MHC_VERSION
22
22
 
23
23
 
24
24
  ;;; Configration Variables:
data/emacs/mhc.el CHANGED
@@ -3,7 +3,7 @@
3
3
  ;; Description: Message Harmonized Calendaring system.
4
4
  ;; Author: Yoshinari Nomura <nom@quickhack.net>
5
5
  ;; Created: 1994-07-04
6
- ;; Version: 1.2.1
6
+ ;; Version: 1.2.2
7
7
  ;; Keywords: calendar
8
8
  ;; URL: http://www.quickhack.net/mhc
9
9
  ;; Package-Requires: ((calfw "20150703"))
data/lib/mhc/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Mhc
2
- VERSION = "1.2.1"
2
+ VERSION = "1.2.2"
3
3
  PRODID = "-//Quickhack.net//MHC #{Mhc::VERSION}//EN"
4
4
  end
data/mhc.gemspec CHANGED
@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
28
28
  spec.add_runtime_dependency "tzinfo", ">= 1.2.2"
29
29
  spec.add_runtime_dependency "tzinfo-data", ">= 1.2015.4"
30
30
 
31
- spec.add_development_dependency "bundler", "~> 1.5"
32
31
  spec.add_development_dependency "rake"
33
32
  spec.add_development_dependency "rspec"
34
33
  end
data/samples/japanese-holidays.mhcc CHANGED
@@ -72,12 +72,14 @@ X-SC-Record-Id: 5E03776A-4280-4337-85C0-F1322A3AAE6E
72
72
 
73
73
  X-SC-Subject: 海の日
74
74
  X-SC-Category: Holiday Japanese
75
+ X-SC-Day: !20200720 20200723
75
76
  X-SC-Cond: 3rd Mon Jul
76
77
  X-SC-Duration: 20030701-
77
78
  X-SC-Record-Id: BD4156C2-5546-4146-8297-09CF4210A346
78
79
 
79
80
  X-SC-Subject: 山の日
80
81
  X-SC-Category: Holiday Japanese
82
+ X-SC-Day: 20200810 !20200811
81
83
  X-SC-Cond: 11 Aug
82
84
  X-SC-Duration: 20160811-
83
85
  X-SC-Record-Id: FC7C481B-7BF5-4639-B700-3B60CB99E05D
@@ -103,9 +105,16 @@ X-SC-Record-Id: AFABC42C-2E9D-4093-A4AF-DA12D4D4B9D7
103
105
  X-SC-Subject: 体育の日
104
106
  X-SC-Category: Holiday Japanese
105
107
  X-SC-Cond: 2nd Mon Oct
106
- X-SC-Duration: 20001009-
108
+ X-SC-Duration: 20001009-20191231
107
109
  X-SC-Record-Id: C17D9CA5-28AF-4826-AD33-8B75473E5B52
108
110
 
111
+ X-SC-Subject: スポーツの日
112
+ X-SC-Category: Holiday Japanese
113
+ X-SC-Day: 20200724 !20201012
114
+ X-SC-Cond: 2nd Mon Oct
115
+ X-SC-Duration: 20200101-
116
+ X-SC-Record-Id: F10B2B18-B0FB-477E-A7D3-A067B31F4736
117
+
109
118
  X-SC-Subject: 文化の日
110
119
  X-SC-Category: Holiday Japanese
111
120
  X-SC-Cond: 3 Nov
@@ -121,9 +130,15 @@ X-SC-Record-Id: 97E6F125-2625-44A9-8D43-A6FCA9670D8D
121
130
  X-SC-Subject: 天皇誕生日
122
131
  X-SC-Category: Holiday Japanese
123
132
  X-SC-Cond: 23 Dec
124
- X-SC-Duration: 19891223-
133
+ X-SC-Duration: 19891223-20190430
125
134
  X-SC-Record-Id: 51D42B0D-EF46-4D65-B62A-6ED2F0D1F0B5
126
135
 
136
+ X-SC-Subject: 天皇誕生日
137
+ X-SC-Category: Holiday Japanese
138
+ X-SC-Cond: 23 Feb
139
+ X-SC-Duration: 20190501-
140
+ X-SC-Record-Id: 59B83B1E-6161-45F5-9DEC-95E3C1CCA4EE
141
+
127
142
  ## 毎年変わる祝日と振替休日
128
143
 
129
144
  X-SC-Subject: 即位の日
@@ -131,6 +146,11 @@ X-SC-Day: 20190501
131
146
  X-SC-Category: Holiday Japanese
132
147
  X-SC-Record-Id: 25C73788-1104-42BE-85F6-570861B0020B
133
148
 
149
+ X-SC-Subject: 即位礼正殿の儀
150
+ X-SC-Category: Holiday Japanese
151
+ X-SC-Day: 20191022
152
+ X-SC-Record-Id: 76F9756D-C00F-47D0-9592-67E21909C39D
153
+
134
154
  X-SC-Subject: 春分の日
135
155
  X-SC-Day: 19960320 19970320 19980321 19990321 20000320 20010320 20020321
136
156
  20030321 20040320 20050320 20060321 20070321 20080320 20090320
@@ -163,14 +183,14 @@ X-SC-Day: 19730430 19730924 19740506 19740916 19741104 19751124
163
183
  20050321 20060102 20070212 20070430 20070924 20071224 20080506
164
184
  20081124 20090506 20100322 20120102 20120430 20121224 20130506
165
185
  20131104 20140506 20141124 20150506 20160321 20170102 20180212
166
- 20180430 20180924 20181224 20190506 20190812 20191104 20200506
167
- 20230102 20240212 20240506 20240812 20240923 20241104 20250506
186
+ 20180430 20180924 20181224 20190506 20190812 20191104 20200224 20200506
187
+ 20230102 20240212 20240506 20240812 20240923 20241104 20250224 20250506
168
188
  20251124 20260506 20270322 20290212 20290430 20290924 20291224
169
- 20300506 20300812 20301104 20310506 20311124 20330321 20340102
189
+ 20300506 20300812 20301104 20310224 20310506 20311124 20330321 20340102
170
190
  20350212 20350430 20350924 20351224 20360506 20361124 20370506
171
- 20400102 20400430 20401224 20410506 20410812 20411104 20420506
191
+ 20400102 20400430 20401224 20410506 20410812 20411104 20420224 20420506
172
192
  20421124 20430506 20440321 20450102 20460212 20460430 20460924
173
- 20461224 20470506 20470812 20471104 20480506 20500321
193
+ 20461224 20470506 20470812 20471104 20480224 20480506 20500321
174
194
  X-SC-Category: Holiday Japanese
175
195
  X-SC-Record-Id: E2D696DF-EB49-44D7-B06C-812B10BD99A2
176
196
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mhc
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 1.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yoshinari Nomura
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-01-17 00:00:00.000000000 Z
11
+ date: 2019-05-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -66,20 +66,6 @@ dependencies:
66
66
  - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: 1.2015.4
69
- - !ruby/object:Gem::Dependency
70
- name: bundler
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - "~>"
74
- - !ruby/object:Gem::Version
75
- version: '1.5'
76
- type: :development
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - "~>"
81
- - !ruby/object:Gem::Version
82
- version: '1.5'
83
69
  - !ruby/object:Gem::Dependency
84
70
  name: rake
85
71
  requirement: !ruby/object:Gem::Requirement
@@ -270,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
270
256
  version: '0'
271
257
  requirements: []
272
258
  rubyforge_project:
273
- rubygems_version: 2.5.2.2
259
+ rubygems_version: 2.7.6
274
260
  signing_key:
275
261
  specification_version: 4
276
262
  summary: Message Harmonized Calendaring