mhc 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c96c8be0a9d697380b98effb30cb85bf489af611
-  data.tar.gz: 76549b9fb166f1d034923456901740a25126efef
+  metadata.gz: b1c058aa0f117bd28b047082f0bffb7829a65336
+  data.tar.gz: 33e55550fee0eab49840f679b57f703803bc9ac7
 SHA512:
-  metadata.gz: 4e913eca6be7cf2b0a69515ab986767293a4283053410111d6fb2128b1b2dbe1c14a43f106fff29611dc67c6c24673003684f136f06a13209916926ecf3d0ef0
-  data.tar.gz: b07087fce50e126f637a5b3942b0e6cadc1b7d4b5111d111d251f29c88e52bf6f05bafb3606f52cbc3492023afb66d28a6fc3aac190d2d6b24915d235015dace
+  metadata.gz: 59543a84b06f8f386b7f3bd33ad4ba8116479308d69a2079d1a8c30dc03a38a5433119117852168b746e364ccbec43576cb9ac3b15fc11532ce5ea5bc5389097
+  data.tar.gz: 2ba5edb349ac06b2e5cc31891c37fe2bde122db6918c0bfec4d9589f1c4c7ccd667adcdb5f99a678a135e5ae2815d0c90164f5fe6aac0da984cf776ab1b3dfa5

data/README.org

@@ -23,9 +23,12 @@
 # #+LATEX_HEADER: \pagestyle{empty}
 # #+LaTeX: \thispagestyle{empty}
 
+[[file:https://badge.fury.io/rb/mhc.svg]]
+[[http://melpa.org/#/mhc][file:http://melpa.org/packages/mhc-badge.svg]]
+
 * DESCRIPTION
-  MHC is designed to help those who receive most appointments via email.
-  Using MHC, you can easily import schedule articles from emails.
+  MHC is a simple and powerful calendar tool, which consists of
+  a CLI tool written in Ruby (mhc) and a nifty Emacs frontend UI (mhc.el).
 
   You can get the latest version from:
   + https://github.com/yoshinari-nomura/mhc
@@ -33,24 +36,212 @@
 
   MHC has following features:
 
-  + Easy import your schedule from existing buffers.
-    For example, using with Mew/Gnus/Wanderlust (MUAs on Emacs),
-    you can easily compose your schedule items from
-    appoint-emails. MHC will guess the title,
-    date, time and description by scanning the email.
-  + Simple data structure allows you to manipulate stored data in many ways.
-  + Appointments can be made to repeat in flexible ways.
-  + powerful but simple expression of appointments.
+  + Easy import from existing Emacs buffers
+    + MHC will guess the title, date, time and description from the content of buffer.
+
+  + Simple plain-text data format
+    + MHC stores articles in similar format to MH (email); you can manipulate them
+      by many other text-manipulation tools, editors, UNIX command-line tools or your own scripts.
+
+  + Flexible output format
+    + Currently plain-text, iCalendar, S-formula (mhc.el, calfw), org-table, howm, JSON: ([[http://fullcalendar.io/][full-calendar]]) are supported.
 
-  MHC stores schedule articles in the same form of MH; you can manipulate
-  these messages not only by above tools but also by many other MUAs,
-  editors, UNIX commandline tools or your own scripts.
+  + Selective export to Google Calendar  with flexible filters and modifiers.
+    + MHC can export custom-filtered calendars to Google Calendar via CalDaV.
+      Check [[https://github.com/yoshinari-nomura/mhc/blob/master/samples/DOT.mhc-config.yml][mhc-config.yml]] for details.
 
 * SYSTEM REQUIREMENTS
   + Ruby 2.1 or newer
   + Emacs 24 or newer
 
-* Information for Developers
+* INSTALL AND SETUP
+** Ruby CLI (mhc)
+   mhc CLI command can be installed from rubygems.org.
+   #+BEGIN_SRC shell-script
+     $ gem install mhc
+   #+END_SRC
+
+   Or, if you want to install mhc in a sandbox (recommended),
+   Bunlder would help you:
+   #+BEGIN_SRC shell-script
+     $ gem install bundler
+     $ mkdir /path/to/install/mhc
+     $ cd /path/to/install/mhc
+     $ bundle init
+     $ echo 'gem "mhc"' >> Gemfile
+     $ bundle install --path=vendor/bundle --binstubs=bin
+     $ export PATH=/path/to/install/mhc/bin:$PATH
+   #+END_SRC
+
+   Then, initialize config file and spool directory:
+   #+BEGIN_SRC shell-script
+     $ mhc init ~/mhc
+
+     # Read comments in config.yml carefully
+     $ vi ~/.config/mhc/config.yml
+
+     # Add Japanese Holidays if needed.
+     $ cp samples/japanese-holidays.mhcc ~/mhc/presets/
+   #+END_SRC
+
+   Check if mhc is working correctly:
+   #+BEGIN_SRC shell-script
+     $ mhc scan thismonth
+   #+END_SRC
+
+** Emacs UI (mhc.el)
+   *You have to install Ruby CLI before install mhc.el*
+
+   MHC is now available on [[http://melpa.org/][MELPA]]. If you set up packaging system correctly,
+   You can install mhc with package.el (=M-x= =package-install= =mhc=).
+   Check [[https://github.com/milkypostman/melpa#usage][MELPA usage]] for details.
+
+   And then, =M-x mhc=  will show up the monthly calendar.
+
+* USAGE
+** Ruby CLI (mhc)
+   : mhc help
+
+** Emacs UI (mhc.el)
+*** Keybind
+    1) Jump and Show
+
+       =n/p=, =h/j/k/l= would work as expected.
+
+       | Key             | Function                   |
+       |-----------------+----------------------------|
+       | =<=             | Show previous month        |
+       | =P=             | Show previous year         |
+       | =>=             | Show next month            |
+       | =N=             | Show next year             |
+       | =g=             | Go to specific month       |
+       | =v=             | Toggle message window      |
+       | =RET/SPC/./DEL= | Show/scroll message buffer |
+       | =/=             | Search by keyword          |
+
+    2) Manipulate articles
+
+       | Key | Function                                       |
+       |-----+------------------------------------------------|
+       | =E= | Create a new article draft interactively       |
+       | =M= | Open pointed article to edit                   |
+       | =D= | Delete pointed article                         |
+       | =C= | Copy article temporally as a reusable template |
+       | =Y= | Same as =E= but use the template stored by =C= |
+
+    3) Draft Buffer
+
+       | Key      | Function                               |
+       |----------+----------------------------------------|
+       | =C-cC-c= | Finish editing and register to DB      |
+       | =C-cC-q= | Discard editing buffer w/o touching DB |
+
+* Article format
+** Example
+   MHC stores every article in the form of RFC822-like format.
+   Once you open a new article draft in Emacs by typing =E=,
+   You may feel the draft is very similar to email's one.
+   This is an example of MHC article:
+   #+BEGIN_EXAMPLE
+     X-SC-Subject: Home party
+     X-SC-Location: my second house
+     X-SC-Day: 20150715
+     X-SC-Time: 18:00-21:00
+     X-SC-Category: Private Party
+     X-SC-Cond:
+     X-SC-Duration:
+     X-SC-Record-Id: C34D89F5-27FA-4243-AC6C-168D8D243D9A
+     X-SC-Sequence: 0
+
+     This is a sample schedule article about a home party scheduled on
+     20150715 18:00-21:00. MHC schedule articles are similar to RFC822
+     style message like this.  In the header part, you can place any extra
+     headers you want.  if you import an article from existing email, you
+     may want to insert the original email headers such as Subject,
+     From, Date.
+   #+END_EXAMPLE
+
+** Time related headers
+   MHC has four types of headers to specify time/date-range or recurring conditions:
+   + =X-SC-Day=
+   + =X-SC-Time=
+   + =X-SC-Cond=
+   + =X-SC-Duration=
+
+*** X-SC-Day
+    =X-SC-Day:= specifies an enumeration of occurrence dates separated by white space:
+    #+BEGIN_EXAMPLE
+      X-SC-Day: 20150704          ... all-day event
+      X-SC-Day: 20150704-20150705 ... two-days long single event
+      X-SC-Day: 20150704 20150705 ... two all-day events
+    #+END_EXAMPLE
+
+    If =X-SC-Time:= is specified with =X-SC-Day:=,
+    =X-SC-Time:= acts on all enumerated dates in =X-SC-Day:=.
+    So, you cannot set multiple-days value (=20150704-20150705=) with =X-SC-Time:=.
+    You can also put =!= prefix to specify the exception days (See below about =X-SC-Cond:=)
+
+*** X-SC-Time
+    =X-SC-Time:= specifies a time range in a day or a point of time like:
+    #+BEGIN_EXAMPLE
+      X-SC-Time: 10:00-12:00
+      X-SC-Time: 10:00
+    #+END_EXAMPLE
+    You can leave it blank for all-day events.
+
+    With the combination of =X-SC-Day:=, you can specify some particular
+    time-range of a day. Currently, you cannot specify a time-range
+    across the multiple days.
+
+*** X-SC-Cond
+    =X-SC-Cond:= defines a rule of recurrence; weekly, monthly or yearly.
+    You can place these keywords in =X-SC-Cond:= separating by white spaces:
+    | Keyword                    | Purpose               |
+    |----------------------------+-----------------------|
+    | =01/02/.../31=             | Day of month          |
+    | =1st/2nd/3rd/4th/5th/Last= | Week order in a month |
+    | =Sun/Mon/.../Sat=          | Day of week           |
+    | =Jan/Feb/.../Dec=          | Name of month         |
+
+    Example:
+    #+BEGIN_EXAMPLE
+      X-SC-Cond: Fri         ... Every Friday
+      X-SC-Cond: Tue Fri     ... Every Tueday and Friday
+      X-SC-Cond: 31 Aug      ... August 31st every year
+      X-SC-Cond: 1           ... First day on every month
+      X-SC-Cond: 1st 3rd Fri ... First and Third Friday every month
+      X-SC-Cond: Fri 13      ... 13th on every month or every Friday (not Friday 13th)
+    #+END_EXAMPLE
+
+    Sometimes you may want to set a particular date as exception.
+    In such case, you can exclude a date by placing =!YYYYMMDD=
+    in =X-SC-Day:=. For example:
+    #+BEGIN_EXAMPLE
+      X-SC-Day: !20150715 20150716
+      X-SC-Cond: Wed
+      X-SC-Duration: 20150701-20150731
+
+      This article occurs every Wednesday in July 2015 with the exception
+      of 2015-07-15 (Wed) and inclusion of 2015-07-16 (Thu).
+    #+END_EXAMPLE
+
+*** X-SC-Duration
+    =X-SC-Duration:= acts on =X-SC-Cond:= to bounds the recurrence rule
+    in an inclusive manner.
+    Note that, =X-SC-Duration:=  itself does not define any concrete occurrences and
+    does not act on =X-SC-Day:=.
+
+    Example:
+    #+BEGIN_EXAMPLE
+      X-SC-Day: !20150715 20150801
+      X-SC-Cond: Wed
+      X-SC-Duration: 20150701-20150731
+
+      Every Wednesday in July 2015 with the exception
+      of 2015-07-15 (Wed) and inclusion of 2015-08-01 (Sat).
+    #+END_EXAMPLE
+
+* INFORMATION FOR DEVELOPERS
 ** INSTALL for developers:
    1) Install rbenv + ruby-build
       (see https://github.com/sstephenson/rbenv#basic-github-checkout for details)
@@ -186,7 +377,7 @@
       + sync_channels/* :: Sync records of MHC DB.
            If you remove any files under this directory,
            MHC Sync will be DAMAGED.
-* How to convert from the old MHC spool
+* HOW TO CONVERT FROM THE OLD MHC SPOOL
   [[https://gist.github.com/yoshinari-nomura/bb9a197e0e01ad81c883][update-uuid.sh]] would help you.
 
   New format is:

data/Rakefile

@@ -18,11 +18,14 @@ task :build => :check_version
 # Emacs stuffs must have the same version numbers
 # with Mhc::VERSION.
 task :check_version do
-  for file in %w(mhc-vars.el Cask)
+  for file in %w(mhc.el mhc-vars.el Cask)
     path = File.expand_path("../emacs/#{file}", __FILE__)
     raise "File not found #{path}" unless File.exists?(path)
 
-    if /(\d+\.\d+\.\d+).*MHC_VERSION/ !~ File.open(path).read || Mhc::VERSION != $1
+    content = File.open(path).read
+    unless (/^;; Version: (\d+\.\d+\.\d+)$/ =~ content ||
+            /(\d+\.\d+\.\d+).*MHC_VERSION$/ =~ content) &&
+           Mhc::VERSION == $1
       raise "#{path} does not have valid version number (#{$1})."
     end
   end

data/emacs/Cask

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

data/emacs/mhc-calendar.el

@@ -12,6 +12,7 @@
 ;;; Configration Variables:
 
 (require 'mhc-date)
+(require 'mhc-misc)
 (require 'mhc-day)
 (require 'mhc-schedule)
 (require 'mhc-vars)
@@ -635,7 +636,7 @@ The keys that are defined for mhc-calendar-mode are:
 (defun mhc-calendar (&optional date)
   "Display 3-month mini calendar."
   (interactive)
-  (setq date (or date (mhc-current-date) (mhc-calendar-get-date)))
+  (setq date (or date (mhc-summary-current-date) (mhc-calendar-get-date)))
   (when (and (get-buffer mhc-calendar/buffer) (set-buffer mhc-calendar/buffer))
     (setq date (or date mhc-calendar-view-date))
     (unless (mhc-date-yymm= date mhc-calendar-date)
@@ -1530,8 +1531,8 @@ The keys that are defined for mhc-calendar-mode are:
                           mhc-calendar/hnf-ignore-categories))
               (setq lst (cdr lst))))
           (with-temp-buffer
-            (insert-file-contents-as-coding-system
-	     mhc-default-coding-system mhcfile)
+            (mhc-insert-file-contents-as-coding-system
+             mhc-default-coding-system mhcfile)
             (mhc-header-decode-ewords)
             (mhc-header-narrowing
               (setq cats (mhc-header-get-value "x-sc-category"))

data/emacs/mhc-calfw.el

@@ -113,8 +113,8 @@
     (if schedule
         (cfw:details-popup
          (with-temp-buffer
-           (insert-file-contents-as-coding-system
-	    mhc-default-coding-system
+           (mhc-insert-file-contents-as-coding-system
+            mhc-default-coding-system
             (mhc-record-name (mhc-schedule-record schedule)))
            (mhc-calendar/view-file-decode-header)
            (buffer-string)

data/emacs/mhc-date.el

@@ -89,6 +89,13 @@
 (defmacro mhc-time-to-string (time)
   `(mhc-time-let ,time (format "%02d:%02d" hh mm)))
 
+(defun mhc-time-range-to-string (time-range)
+  (let ((time1 (nth 0 time-range))
+        (time2 (nth 1 time-range)))
+    (concat
+     (if time1 (mhc-time-to-string time1))
+     (if time2 (concat "-" (mhc-time-to-string time2))))))
+
 (defsubst mhc-time-to-list (time)
   (list (mhc-time-HH time)
         (mhc-time-MM time)))

data/emacs/mhc-db.el

@@ -32,7 +32,7 @@
 
 (defun mhc-db-search (&rest query)
   (let ((b (mhc-date-new 1970 1 1))
-        (e (mhc-date-yy++ (mhc-date-now))))
+        (e (mhc-date-yy+ (mhc-date-now) 10)))
     (mhc-db-scan b e nil nil (mhc-db/query-to-search-string query))))
 
 (defun mhc-db/quote-string (string)
@@ -42,7 +42,7 @@
   (format "%s" keyword))
 
 (defun mhc-db/query-to-search-string (query)
-  (let ((keywords '(:subject :body :category)) string)
+  (let ((keywords '(:subject :body :category :recurrence_tag)) string)
     (mapconcat 'identity
                (delq nil
                      (mapcar

data/emacs/mhc-draft.el

@@ -68,8 +68,6 @@ these fields are set to the draft after import TEMPLATE."
           (mhc-draft-setup-new)
           (mhc-draft-delete-garbage-headers)
           (mhc-draft-setup-headers preset-fields)
-          ;; remove end of message marker
-          (mhc-draft-remove-tailers)
           (mhc-draft-mode)
         (switch-to-buffer draft-buffer t)
         (goto-char (point-min)))))

data/emacs/mhc-message.el

@@ -30,6 +30,23 @@
 
 (defvar mhc-message-end-of-messge-marker "[End of message]")
 
+(defun mhc-message/remove-overlay (overlay-property)
+  "Remove OVERLAY-PROPERTY from current buffer."
+  (dolist (ovl (overlays-in (point-max) (point-max)))
+    (if (overlay-get ovl overlay-property)
+        (delete-overlay ovl))))
+
+(defun mhc-message/insert-end-mark ()
+  "Insert end of message mark."
+  (let ((end-mark (make-overlay (point-max) (point-max) nil t t))
+        (end-text mhc-message-end-of-messge-marker))
+    ;; Delete any previous markers.
+    (mhc-message/remove-overlay 'mhc-eom-overlay)
+    ;; Add a new marker.
+    (mhc-face-put end-text 'mhc-message-face-eof-marker)
+    (overlay-put end-mark 'mhc-eom-overlay t)
+    (overlay-put end-mark 'after-string end-text)))
+
 (define-derived-mode mhc-message-mode
   text-mode
   "MHC-Msg"
@@ -37,12 +54,8 @@
   (save-excursion
     (mhc-header-decode-ewords)
     (goto-char (point-max))
-    (unless (re-search-backward
-             (regexp-quote mhc-message-end-of-messge-marker)
-             (- (point) (length mhc-message-end-of-messge-marker))
-             t)
-      (unless (bolp) (insert "\n"))
-      (insert mhc-message-end-of-messge-marker))
+    (unless (bolp) (insert "\n"))
+    (mhc-message/insert-end-mark)
     (mhc-highlight-message))
   ;; (setq mhc-message-mode-called-count (1+ mhc-message-mode-called-count))
   ;; (message "mhc-message-mode-called-count: %d" mhc-message-mode-called-count)

data/emacs/mhc-misc.el

@@ -212,6 +212,26 @@
         (sit-for 0)
         pass))))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Window stack
+
+(defvar mhc-misc-window-stack nil)
+
+(defun mhc-misc-window-push ()
+  (interactive)
+  (setq mhc-misc-window-stack
+        (cons (current-window-configuration) mhc-misc-window-stack)))
+
+(defun mhc-misc-window-pop ()
+  (interactive)
+  (if mhc-misc-window-stack
+      (set-window-configuration (car-safe mhc-misc-window-stack)))
+  (setq mhc-misc-window-stack (cdr-safe mhc-misc-window-stack)))
+
+(defalias 'mhc-window-push 'mhc-misc-window-push)
+(defalias 'mhc-window-pop  'mhc-misc-window-pop)
+
+
 (eval-and-compile
   (autoload 'rfc2047-decode-string "rfc2047"))
 (defalias 'mhc-misc-decode-eword-string 'rfc2047-decode-string)

data/emacs/mhc-parse.el

@@ -250,6 +250,13 @@
     (mhc-parse-buffer (mhc-record-new filename))))
 
 
+(defun mhc-parse-string (string)
+  "Parse schedules headers in the file, STRING."
+  (with-current-buffer
+      (mhc-get-buffer-create " *mhc-parse-file*")
+    (delete-region (point-min) (point-max))
+    (insert string)
+    (mhc-parse-buffer)))
 
 (provide 'mhc-parse)
 

data/emacs/mhc-summary.el

@@ -280,8 +280,8 @@ If optional argument FOR-DRAFT is non-nil, Hilight message as draft message."
       (let ((buffer-read-only nil))
         (goto-char (point-min))
         (erase-buffer)
-	(mhc-insert-file-contents-as-coding-system
-	 mhc-default-coding-system file)
+        (mhc-insert-file-contents-as-coding-system
+         mhc-default-coding-system file)
         (mhc-header-narrowing
           (mhc-header-delete-header
            "^\\(Content-.*\\|Mime-Version\\|User-Agent\\):" 'regexp))
@@ -559,8 +559,8 @@ If BANNER is set, it is printed on the horizontal line."
 (defmacro mhc-line-inserter-setup (inserter format alist)
   `(let (byte-compile-warnings)
      (setq ,inserter
-	   (byte-compile
-	    (list 'lambda ()
+           (byte-compile
+            (list 'lambda ()
 		  (mhc-line-parse-format ,format ,alist))))
      (when (get-buffer "*Compile-Log*")
        (bury-buffer "*Compile-Log*"))
@@ -588,8 +588,8 @@ If BANNER is set, it is printed on the horizontal line."
 (defun mhc-summary-line-insert ()
   "Insert summary line."
   (let ((mhc-tmp-day-face (cond
-                           ((mhc-schedule-in-category-p
-                             mhc-tmp-schedule "holiday")
+                           ((mhc-day-holiday
+                             mhc-tmp-dayinfo)
                             'mhc-category-face-holiday)
                            ((eq (mhc-day-day-of-week
                                  mhc-tmp-dayinfo) 0)
@@ -622,7 +622,7 @@ If BANNER is set, it is printed on the horizontal line."
   (define-key mhc-summary-mode-map "P" 'mhc-goto-prev-year)
 
   (define-key mhc-summary-mode-map "s" 'mhc-rescan-month)
-  (define-key mhc-summary-mode-map "d" 'mhc-delete)
+  (define-key mhc-summary-mode-map "D" 'mhc-delete)
   (define-key mhc-summary-mode-map "c" 'mhc-set-default-category)
   (define-key mhc-summary-mode-map "?" 'mhc-calendar)
   (define-key mhc-summary-mode-map "t" 'mhc-calendar-toggle-insert-rectangle)
@@ -658,6 +658,32 @@ If BANNER is set, it is printed on the horizontal line."
   (use-local-map mhc-summary-mode-map)
   (run-hooks 'mhc-summary-mode-hook))
 
+(defun mhc-summary-buffer-p (&optional buffer)
+  (if buffer
+      (set-buffer buffer))
+  mhc-summary-buffer-current-date-month)
+
+(defun mhc-summary-current-date ()
+  (when (mhc-summary-buffer-p)
+    (let ((dayinfo (get-text-property (point) 'mhc-dayinfo)))
+      (or (and dayinfo (mhc-day-date dayinfo))
+          (save-excursion
+            (end-of-line)
+            (while (and (not (bobp))
+                        (null dayinfo))
+              (or (setq dayinfo (get-text-property (point) 'mhc-dayinfo))
+                  (forward-char -1)))
+            (and dayinfo (mhc-day-date dayinfo)))))))
+
+(defvar mhc-summary-buffer-current-date-month nil
+  "Indicate summary buffer's month. It is also used by mhc-summary-buffer-p")
+(make-variable-buffer-local 'mhc-summary-buffer-current-date-month)
+
+(defun mhc-summary-current-date-month ()
+  mhc-summary-buffer-current-date-month)
+(defalias 'mhc-current-date-month 'mhc-summary-current-date-month)
+
+
 (defun mhc-summary-display-message ()
   (interactive)
   (save-selected-window

data/emacs/mhc-vars.el

@@ -17,7 +17,7 @@
 
 
 ;;; Constants:
-(defconst mhc-version "mhc 1.0.3") ;; MHC_VERSION
+(defconst mhc-version "mhc 1.0.4") ;; MHC_VERSION
 
 
 ;;; Configration Variables:

data/emacs/mhc.el

@@ -1,9 +1,12 @@
-;;; mhc.el --- MH Calendar.
+;;; mhc.el --- Message Harmonized Calendaring system.
 
+;; Description: Message Harmonized Calendaring system.
 ;; Author:  Yoshinari Nomura <nom@quickhack.net>
-;;
-;; Created: 1994/07/04
-;; Revised: $Date: 2009/05/31 12:54:50 $
+;; Created: 1994-07-04
+;; Version: 1.0.4
+;; Keywords: calendar
+;; URL: http://www.quickhack.net/mhc
+;; Package-Requires: ((calfw "20150703"))
 
 ;;;
 ;;; Commentary:
@@ -487,10 +490,6 @@ If HIDE-PRIVATE, private schedules are suppressed."
 
 (defvar mhc-face-week-color-paint-thick nil)
 
-(defvar mhc-summary-buffer-current-date-month nil
-  "Indicate summary buffer's month. It is also used by mhc-summary-buffer-p")
-(make-variable-buffer-local 'mhc-summary-buffer-current-date-month)
-
 (defun mhc-expand-date-scope-backward (date scope)
   "Expand date scope backward involving the whole first week of month.
 DATE can be any date of the target month.
@@ -572,6 +571,14 @@ If SUBJECT-ONLY is non-nil, it will search only on X-SC-Subject:"
         (message "No match")
       (mhc-scan match))))
 
+(defun mhc-search-recurrence (recurrence-tag)
+  "Search events by RECURRENCE-TAG."
+  (interactive "sSearch recurrence-tag: ")
+  (let* ((match (mhc-db-search :recurrence_tag recurrence-tag)))
+    (if (null match)
+        (message "No match")
+      (mhc-scan match))))
+
 (defun mhc-scan (events &optional insert-current-buffer clip-from clip-to)
   "Create mhc-summary buffer using EVENTS list.
 If INSERT-CURRENT-BUFFER is non-nil, insert contents in the current buffer.
@@ -607,7 +614,7 @@ Returns t if the importation was succeeded."
        (list (get-buffer (read-buffer "Import buffer: "
                                       (current-buffer))))))
   (let ((draft-buffer (generate-new-buffer mhc-draft-buffer-name))
-        (current-date (or (mhc-current-date) (mhc-calendar-get-date) (mhc-date-now)))
+        (current-date (or (mhc-summary-current-date) (mhc-calendar-get-date) (mhc-date-now)))
         (succeed t)
         msgp date time subject location category recurrence-tag priority alarm)
     (and (called-interactively-p 'interactive)
@@ -632,7 +639,7 @@ Returns t if the importation was succeeded."
     (condition-case ()
         (if import-buffer
             (progn
-              (delete-other-windows)
+              (delete-other-windows-vertically)
               (goto-char (point-min))
               (if (y-or-n-p "Do you want to import this article? ")
                   (let* ((original (with-current-buffer
@@ -762,13 +769,7 @@ Returns t if the importation was succeeded."
                      (mhc-date-format day "%04d%02d%02d" yy mm dd))
                    date " ")
                   "\nX-SC-Time: "
-                  (if time
-                      (let ((begin (car time))
-                            (end (nth 1 time)))
-                        (concat
-                         (if begin (mhc-time-to-string begin) "")
-                         (if end (concat "-" (mhc-time-to-string end)) "")))
-                    "")
+                  (mhc-time-range-to-string time)
                   "\nX-SC-Category: "
                   (mapconcat (function capitalize) category " ")
                   "\nX-SC-Priority: " (if priority
@@ -842,7 +843,7 @@ the default action of this command is changed to the latter."
                   (mhc-record-subject-as-string record)))))
           (mhc-db-add-exception-rule
            record
-           (or (mhc-current-date)
+           (or (mhc-summary-current-date)
                (mhc-calendar-view-date)))
         (mhc-db-delete-file record))
       (or (and (mhc-summary-buffer-p)
@@ -856,12 +857,18 @@ the default action of this command is changed to the latter."
   (let ((date-list (mapconcat
                     (lambda (day)
                       (mhc-date-format day "%04d%02d%02d" yy mm dd))
-                    (mhc-input-day "Date: " (mhc-current-date))
-                    " ")))
+                    (mhc-input-day "Date: " (mhc-summary-current-date))
+                    " "))
+        (time-list (mhc-time-range-to-string
+                    (mhc-input-time "Time: "
+                                    (mhc-schedule-time-as-string
+                                     (car (mhc-record-schedules
+                                           (mhc-parse-string (mhc-draft-template)))))))))
     (mhc-window-push)
     (mhc-draft-new (mhc-draft-template)
                    `(("x-sc-record-id" . ,(mhc-record-create-id))
                      ("x-sc-sequence"  . 0)
+                     ("x-sc-time"  . ,time-list)
                      ("x-sc-day" . ,date-list)))))
 
 (defun mhc-reuse-copy ()
@@ -871,8 +878,8 @@ the default action of this command is changed to the latter."
         (record (mhc-summary-record)))
     (if (and (stringp file) (file-exists-p file))
         (with-temp-buffer
-	  (mhc-insert-file-contents-as-coding-system
-	   mhc-default-coding-system file)
+          (mhc-insert-file-contents-as-coding-system
+           mhc-default-coding-system file)
           (mhc-header-decode-ewords)
           (mhc-draft-store-template
            (buffer-substring-no-properties (point-min) (point-max)))
@@ -926,54 +933,11 @@ the default action of this command is changed to the latter."
     (message "Specified file(%s) does not exist." file)))
 
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Window stack
-;;
-
-(defvar mhc-window-stack       nil)
-
-(defun mhc-window-push ()
-  (interactive)
-  (setq mhc-window-stack
-        (cons (current-window-configuration) mhc-window-stack)))
-
-(defun mhc-window-pop ()
-  (interactive)
-  (if mhc-window-stack
-      (set-window-configuration (car-safe mhc-window-stack)))
-  (setq mhc-window-stack (cdr-safe mhc-window-stack)))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; (Category . (parent-face fg bg))
 ;;
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; manipulate data from mhc-summary-buffer.
-
-(defconst mhc-summary-day-regex  "\\([^|]+| +\\)?[0-9]+/\\([0-9]+\\)")
-
-(defun mhc-summary-buffer-p (&optional buffer)
-  (if buffer
-      (set-buffer buffer))
-  mhc-summary-buffer-current-date-month)
-
-(defun mhc-current-date ()
-  (when (mhc-summary-buffer-p)
-    (let ((dayinfo (get-text-property (point) 'mhc-dayinfo)))
-      (or (and dayinfo (mhc-day-date dayinfo))
-          (save-excursion
-            (end-of-line)
-            (while (and (not (bobp))
-                        (null dayinfo))
-              (or (setq dayinfo (get-text-property (point) 'mhc-dayinfo))
-                  (forward-char -1)))
-            (and dayinfo (mhc-day-date dayinfo)))))))
-
-(defun mhc-current-date-month ()
-  mhc-summary-buffer-current-date-month)
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; misc.
 

data/lib/mhc/event.rb

@@ -95,6 +95,14 @@ module Mhc
       return @categories = categories.parse(string)
     end
 
+    def holiday?
+      in_category?("holiday")
+    end
+
+    def in_category?(category)
+      categories.map{|c| c.to_s.downcase}.member?(category.downcase)
+    end
+
     ## description
     def description
       unless @description

data/lib/mhc/formatter.rb

@@ -77,7 +77,7 @@ module Mhc
 
       def format_header(context); ""; end
       def format_footer(context); ""; end
-      def format_day_header(context, date); ""; end
+      def format_day_header(context, date, is_holiday); ""; end
       def format_day_footer(context, date); ""; end
 
       def format_body(context)
@@ -86,7 +86,7 @@ module Mhc
       end
 
       def format_day(context, date, items)
-        string = format_day_header(context, date)
+        string = format_day_header(context, date, items.any?{|e| e.holiday?})
 
         items = sort_items_in_day(items)
         items.each_with_index do |occurrence, count|
@@ -176,7 +176,7 @@ module Mhc
       def format_header(context);  "(";   end
       def format_footer(context);  "(periods #{@periods}))\n"; end
 
-      def format_day_header(context, date)
+      def format_day_header(context, date, is_holiday)
         date.strftime("((%2m %2d %Y) . (")
       end
 
@@ -218,9 +218,9 @@ module Mhc
       def format_header(context);  "(";   end
       def format_footer(context);  ")\n"; end
 
-      def format_day_header(context, date)
+      def format_day_header(context, date, is_holiday)
         # (DAYS_FROM_EPOC . [year month day wday holiday-p (
-        format("(%d . [%d %d %d %d nil (", date.absolute_from_epoch, date.year, date.month, date.day, date.wday)
+        format("(%d . [%d %d %d %d #{is_holiday ? 't' : 'nil'} (", date.absolute_from_epoch, date.year, date.month, date.day, date.wday)
       end
 
       def format_item(context, date, item)

data/lib/mhc/occurrence.rb

@@ -19,7 +19,8 @@ module Mhc
     :time_range,
     :recurrence_tag,
     :mission_tag,
-    :allday?
+    :allday?,
+    :holiday?
 
     attr_reader :event
 

data/lib/mhc/property_value/date.rb

@@ -44,6 +44,10 @@ module Mhc
 
       def self.parse_range(range_string)
         case range_string
+        # all
+        when /^all$/
+          return self.parse("19700101")..self.today + 365*10 # 10 years ahead
+
         # yyyymmdd-yyyymmdd
         when /^([^+-]+)-([^+-]+)$/
           return parse_relative($1)..parse_relative($2)

data/lib/mhc/version.rb

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

data/mhc.gemspec

@@ -1,5 +1,6 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
+git = File.expand_path('../.git', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mhc/version'
 
@@ -13,7 +14,11 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://www.quickhack.net/mhc"
   spec.license       = "BSD"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = if Dir.exist?(git)
+                         `git ls-files -z`.split("\x0")
+                       else
+                         Dir['**/*']
+                       end
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/samples/japanese-holidays.mhcc

@@ -1,18 +1,19 @@
 ##
 ## Japanese Holidays
 ##
-## Place this as ~/Mail/schedule/presets/japanese-holidays.mhcc
+## Place this as REPOSITORY/presets/japanese-holidays.mhcc
 ##
 
 X-SC-Subject: 元日
 X-SC-Category: Holiday Japanese
+X-SC-Duration: 19480101-
 X-SC-Cond: 1 Jan
 X-SC-Record-Id: E2BAB555-3CEB-4508-96AD-1B59AA24ADC3
 
 X-SC-Subject: 成人の日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 15 Jan
-X-SC-Duration: -19990115
+X-SC-Duration: 19480115-19990115
 X-SC-Record-Id: EA9F4BA5-7D5A-4794-AFB3-6AB68FCA9719
 
 X-SC-Subject: 成人の日
@@ -24,12 +25,19 @@ X-SC-Record-Id: 0BC2CBD0-D81E-4315-B9A8-E112C8E3DC1C
 X-SC-Subject: 建国記念の日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 11 Feb
+X-SC-Duration: 19670211-
 X-SC-Record-Id: AC1B378C-BAFE-4B6E-AF9C-78C2377E8AA4
 
+X-SC-Subject: 天皇誕生日
+X-SC-Category: Holiday Japanese
+X-SC-Cond: 29 Apr
+X-SC-Duration: 19480429-19980429
+X-SC-Record-Id: B78EAAEE-9963-4573-9EC7-0879F8940AEE
+
 X-SC-Subject: みどりの日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 29 Apr
-X-SC-Duration: -20060429
+X-SC-Duration: 19890429-20060429
 X-SC-Record-Id: B78EAAEE-9963-4573-9EC7-0879F8940AEE
 
 X-SC-Subject: 昭和の日
@@ -41,14 +49,9 @@ X-SC-Record-Id: A458E14C-960C-4F01-AF73-8ACB1B51A6A1
 X-SC-Subject: 憲法記念日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 3 May
+X-SC-Duration: 19480503-
 X-SC-Record-Id: BA89778E-E8CC-4588-B5C3-56F86483DEC1
 
-X-SC-Subject: 国民の休日
-X-SC-Category: Holiday Japanese
-X-SC-Cond: 4 May
-X-SC-Duration: -20060504
-X-SC-Record-Id: 46953810-BD72-45DE-BC11-104CBE970CFF
-
 X-SC-Subject: みどりの日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 4 May
@@ -58,12 +61,13 @@ X-SC-Record-Id: 47938EDA-41A5-4E51-BDCB-2D3B60F49D71
 X-SC-Subject: こどもの日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 5 May
+X-SC-Duration: 19480505-
 X-SC-Record-Id: 4AE5568A-2DFE-4B6B-92E5-C4BFADFB2CCF
 
 X-SC-Subject: 海の日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 20 Jul
-X-SC-Duration: -20020720
+X-SC-Duration: 19960720-20020720
 X-SC-Record-Id: 5E03776A-4280-4337-85C0-F1322A3AAE6E
 
 X-SC-Subject: 海の日
@@ -72,22 +76,28 @@ 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-Cond: 11 Aug
+X-SC-Duration: 20160811-
+X-SC-Record-Id: FC7C481B-7BF5-4639-B700-3B60CB99E05D
+
 X-SC-Subject: 敬老の日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 15 Sep
-X-SC-Duration: -20020915
+X-SC-Duration: 19660915-20020915
 X-SC-Record-Id: 29BC6E4E-0D70-4EF8-8AF0-7000254D3CDB
 
 X-SC-Subject: 敬老の日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 3rd Mon Sep
-X-SC-Duration: 20030901-
+X-SC-Duration: 20030915-
 X-SC-Record-Id: F303C1C9-01B0-437C-A2E2-BCD1ADD901F2
 
 X-SC-Subject: 体育の日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 10 Oct
-X-SC-Duration: -19991010
+X-SC-Duration: 19661010-19991010
 X-SC-Record-Id: AFABC42C-2E9D-4093-A4AF-DA12D4D4B9D7
 
 X-SC-Subject: 体育の日
@@ -99,16 +109,19 @@ X-SC-Record-Id: C17D9CA5-28AF-4826-AD33-8B75473E5B52
 X-SC-Subject: 文化の日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 3 Nov
+X-SC-Duration: 19481103-
 X-SC-Record-Id: A76779D2-BB44-4ED5-ACF9-B646E10C7313
 
 X-SC-Subject: 勤労感謝の日
 X-SC-Category: Holiday Japanese
 X-SC-Cond: 23 Nov
+X-SC-Duration: 19481123-
 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-Record-Id: 51D42B0D-EF46-4D65-B62A-6ED2F0D1F0B5
 
 ## 毎年変わる祝日と振替休日
@@ -134,20 +147,36 @@ X-SC-Category: Holiday Japanese
 X-SC-Record-Id: 54A339AD-F7FD-4E56-9B70-2D09F840E94D
 
 X-SC-Subject: 振替休日
-X-SC-Day: 19900212 19900430 19900924 19901224 19910506 19910916 19911104
-  19931011 19950102 19950116 19960212 19960506 19960916 19961104
-  19970721 19971124 19990322 19991011 20010212 20010430 20010924
-  20011224 20020506 20020916 20021104 20031124 20050321 20060102
-  20070212 20070430 20070924 20071224 20080506 20080721 20081124
-  20090506 20090922 20100322 20120102 20120430 20121224 20130506
+X-SC-Day: 19730430 19730924 19740506 19740916 19741104 19751124
+  19761011 19780102 19780116 19790212 19790430 19801124 19810504
+  19820322 19821011 19840102 19840116 19840430 19840924 19850506
+  19850916 19851104 19861124 19870504 19880321 19890102 19890116
+  19900212 19900430 19900924 19901224 19910506 19910916 19911104
+  19920504 19931011 19950102 19950116 19960212 19960506 19960916
+  19961104 19970721 19971124 19980504 19990322 19991011 20010212
+  20010430 20010924 20011224 20020506 20020916 20021104 20031124
+  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 20191104 20200506 20230102
-  20240212 20240506 20240923 20241104 20250506 20251124 20260506
-  20270322 20290212 20290430 20290924 20291224 20300506 20301104
-  20310506 20311124
+  20180430 20180924 20181224 20190506 20190812 20191104 20200506
+  20230102 20240212 20240506 20240812 20240923 20241104 20250506
+  20251124 20260506 20270322 20290212 20290430 20290924 20291224
+  20300506 20300812 20301104 20310506 20311124 20330321 20340102
+  20350212 20350430 20350924 20351224 20360506 20361124 20370506
+  20400102 20400430 20401224 20410506 20410812 20411104 20420506
+  20421124 20430506 20440321 20450102 20460212 20460430 20460924
+  20461224 20470506 20470812 20471104 20480506 20500321
 X-SC-Category: Holiday Japanese
 X-SC-Record-Id: E2D696DF-EB49-44D7-B06C-812B10BD99A2
 
+X-SC-Subject: 国民の休日
+X-SC-Category: Holiday Japanese
+X-SC-Day: 19880504 19890504 19900504 19910504 19930504 19940504 19950504
+  19960504 19990504 20000504 20010504 20020504 20040504 20050504 20060504
+  20090922 20150922 20260922 20320921 20370922 20430922 20490921 20540922
+  20600921 20650922 20710922 20770921 20880921 20940921 20990922
+X-SC-Record-Id: 46953810-BD72-45DE-BC11-104CBE970CFF
+
 ## Make sure you have at least one blank line for each entry (改行で終わる)
 
 ## EOF

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mhc
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Yoshinari Nomura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor