mhc 1.1.1 → 1.2.4

data/emacs/mhc-minibuf.el

@@ -189,7 +189,7 @@
         (if (not (pos-visible-in-window-p b))
             (recenter))
         (if (not non-minibuf)
-            (pop-to-buffer (window-buffer (minibuffer-window))))
+            (select-window (minibuffer-window)))
         ;; in minibuffer
         (if non-minibuf
             ()
@@ -254,12 +254,17 @@
                  (mhc-date-format default
                                   "%04d/%02d/%02d" yy mm dd))
                 ((listp default)
-                 (mapconcat
-                  (lambda (date)
-                    (mhc-date-format date
-                                     "%04d/%02d/%02d" yy mm dd))
-                  default
-                  " "))
+                 (let ((sep " ") (datelist default))
+                   (if (null (cdr (last default)))
+                       ()
+                     (setq sep "-")
+                     (setq datelist (list (car default) (cdr default))))
+                   (mapconcat
+                    (lambda (date)
+                      (mhc-date-format date
+                                       "%04d/%02d/%02d" yy mm dd))
+                    datelist
+                    sep)))
                 (t
                  nil)))
              (current-buffer)

data/emacs/mhc-parse.el

@@ -291,4 +291,4 @@
 ;; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 ;; OF THE POSSIBILITY OF SUCH DAMAGE.
 
-;;; mhc-parse.el ends here.
+;;; mhc-parse.el ends here

data/emacs/mhc-process.el

@@ -1,34 +1,51 @@
-(defvar mhc-process nil)
+(require 'mhc-vars)
 
-(add-to-list 'process-coding-system-alist '("^mhc$" . utf-8))
+(defvar mhc-process nil)
 
 (defun mhc-process-send-command (command)
   (unless (and (processp mhc-process)
                (eq (process-status mhc-process) 'run))
     (mhc-start-process))
-  (message "COMMAND: %s" command)
   (with-current-buffer (process-buffer mhc-process)
     (delete-region (point-min) (point-max))
     (process-send-string mhc-process (concat command "\n"))
     (let ((i 1))
       (while (not (and (> (point-max) 1)
                        (eq (char-after (1- (point-max))) ?\n)))
-        (message (format "Waiting mhc process...%d" i))
+        (if (< 2 i) (message (format "Waiting mhc process...%d" i)))
         (setq i (1+ i))
         (accept-process-output mhc-process 0.5)))
     (read (buffer-substring (point-min) (1- (point-max))))))
 
+(defun mhc-process-send-command-with-buffer (command buffer)
+  "Send COMMAND to mhc process with BUFFER via temporal file."
+  (let ((temp-file (make-temp-file "mhc")))
+    (unwind-protect
+        (with-current-buffer buffer
+          (mhc-write-region-as-coding-system
+           mhc-default-coding-system
+           (point-min)
+           (point-max)
+           temp-file
+           nil 'nomsg)
+          (mhc-process-send-command
+           (format "%s %s" command temp-file)))
+      (delete-file temp-file))))
+
 (defun mhc-start-process ()
   (interactive)
   (let ((process-connection-type nil)) ;; use PIPE not tty
     (if (and (processp mhc-process)
              (eq (process-status mhc-process) 'run))
         (kill-process mhc-process))
-    (setq mhc-process (start-process
-                       "mhc"
-                       (get-buffer-create " *mhc-scan-process*")
-                       "mhc"
-                       "server"))
+    (setq mhc-process
+	  (apply 'start-process
+		 (delq nil `("mhc"
+			     ,(get-buffer-create " *mhc-scan-process*")
+			     ,mhc-ruby-program-name
+			     ,mhc-program-name
+			     "server"))))
+    (set-process-coding-system mhc-process 'utf-8 'utf-8)
     (set-process-query-on-exit-flag mhc-process nil)
     mhc-process))
 

data/emacs/mhc-ps.el

@@ -1171,4 +1171,4 @@ showpage
 ;; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 ;; OF THE POSSIBILITY OF SUCH DAMAGE.
 
-;;; mhc-ps.el ends here.
+;;; mhc-ps.el ends here

data/emacs/mhc-record.el

@@ -54,7 +54,7 @@
 
 (defun mhc-record-create-id ()
   "Return unique ID string."
-  (org-id-new))
+  (upcase (org-id-new)))
 
 (defun mhc-record-new (name &optional id schedules sexp)
   "Constructer of MHC-RECORD structure."

data/emacs/mhc-schedule.el

@@ -142,7 +142,10 @@
 
 
 (defun mhc-schedule-subject-as-string (schedule)
-  (or (mhc-schedule-subject schedule) "(none)"))
+  (let ((subject (mhc-schedule-subject schedule)))
+    (if (eq (length subject) 0)
+        "(no subject)"
+      subject)))
 
 
 (defun mhc-schedule-categories-as-string (schedule)
@@ -199,4 +202,4 @@
 ;; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 ;; OF THE POSSIBILITY OF SUCH DAMAGE.
 
-;;; mhc-schedule.el ends here.
+;;; mhc-schedule.el ends here

data/emacs/mhc-summary.el

@@ -171,6 +171,8 @@ which are replaced by the given information:
         'face mhc-tmp-day-face)
     (?/ (if mhc-tmp-first "/" " ")
         'face mhc-tmp-day-face)
+    (?- (if mhc-tmp-first "-" " ")
+        'face mhc-tmp-day-face)
     (?S " " 'face mhc-tmp-day-face)
     (?M (mhc-summary/line-month-string)
         'face mhc-tmp-day-face)
@@ -182,7 +184,8 @@ which are replaced by the given information:
             (make-string 5 ? )
           (format "%02d:%02d" (/ mhc-tmp-begin 60) (% mhc-tmp-begin 60)))
         'face 'mhc-summary-face-time)
-    (?e (if (null mhc-tmp-end)
+    (?e (if (or (null mhc-tmp-end)
+                (and mhc-tmp-begin (= mhc-tmp-end mhc-tmp-begin)))
             (make-string 6 ? )
           (format "-%02d:%02d" (/ mhc-tmp-end 60) (% mhc-tmp-end 60)))
         'face 'mhc-summary-face-time)
@@ -286,15 +289,15 @@ If optional argument FOR-DRAFT is non-nil, Hilight message as draft message."
           (mhc-header-delete-header
            "^\\(Content-.*\\|Mime-Version\\|User-Agent\\):" 'regexp))
         (mhc-header-delete-empty-header
-         "^X-SC-.*:" 'regexp)
-        (mhc-message-mode)
-        (mhc-message-set-file-name file))
+         "^X-SC-.*:" 'regexp))
       ;; (setq view-exit-action 'mhc-calendar-view-exit-action)
       (set-visited-file-name nil)
       ;; (rename-buffer (file-name-nondirectory file) 'unique)
       ;; (run-hooks 'mhc-calendar-view-file-hook)
       (set-buffer-modified-p nil)
       (setq buffer-read-only t)
+      (mhc-message-mode)
+      (mhc-message-set-file-name file)
       )))
 
 
@@ -353,7 +356,8 @@ message and cdr keeps a visible message."
                 (or (null (setq dayinfo
                                 (get-text-property (point) 'mhc-dayinfo)))
                     (not (eq (mhc-day-date dayinfo) date))))
-      (goto-char (next-single-property-change (point) 'mhc-dayinfo)))))
+      (goto-char (or (next-single-property-change (point) 'mhc-dayinfo)
+                     (point-min))))))
 
 (defun mhc-summary-record (&optional mailer)
   "Return record on current line."
@@ -498,10 +502,10 @@ If BANNER is set, it is printed on the horizontal line."
 
 
 (defun mhc-summary/line-subject-string ()
-  (if mhc-tmp-private
-      (and mhc-tmp-schedule mhc-summary-string-secret)
-    (or (mhc-schedule-subject mhc-tmp-schedule) "")))
-
+  (if mhc-tmp-schedule
+      (if mhc-tmp-private
+          mhc-summary-string-secret
+        (mhc-schedule-subject-as-string mhc-tmp-schedule))))
 
 (defun mhc-summary/line-location-string ()
   (let ((location (mhc-schedule-location mhc-tmp-schedule)))
@@ -661,20 +665,36 @@ If BANNER is set, it is printed on the horizontal line."
 (defun mhc-summary-buffer-p (&optional buffer)
   (if buffer
       (set-buffer buffer))
-  mhc-summary-buffer-current-date-month)
+  (eq major-mode 'mhc-summary-mode))
 
-(defun mhc-summary-current-date ()
+(defun mhc-summary-current-date (&optional p)
   (when (mhc-summary-buffer-p)
-    (let ((dayinfo (get-text-property (point) 'mhc-dayinfo)))
+    (let* ((pos (or p (point)))
+           (dayinfo (get-text-property pos 'mhc-dayinfo)))
       (or (and dayinfo (mhc-day-date dayinfo))
           (save-excursion
             (end-of-line)
-            (while (and (not (bobp))
+            (while (and (>= pos (point-min))
                         (null dayinfo))
-              (or (setq dayinfo (get-text-property (point) 'mhc-dayinfo))
-                  (forward-char -1)))
+              (or (setq dayinfo (get-text-property pos 'mhc-dayinfo))
+                  (setq pos (- pos 1))))
             (and dayinfo (mhc-day-date dayinfo)))))))
 
+(defun mhc-summary-region-date ()
+  (when (region-active-p)
+    (let* ((p (region-beginning))
+           dayinfo
+           (datelist ()))
+      (progn
+        (while (<= p (region-end))
+          (and (setq dayinfo (mhc-summary-current-date p))
+               (setq datelist (cons dayinfo datelist)))
+          (setq p (next-single-property-change p 'mhc-dayinfo)))
+        (setq datelist (reverse (delete-dups datelist)))
+        (if (< 1 (length datelist))
+             (cons (car datelist) (car (last datelist)))
+          (car datelist))))))
+
 (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)
@@ -782,4 +802,4 @@ If BANNER is set, it is printed on the horizontal line."
 ;; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 ;; OF THE POSSIBILITY OF SUCH DAMAGE.
 
-;;; mhc-summary.el ends here.
+;;; mhc-summary.el ends here

data/emacs/mhc-vars.el

@@ -13,11 +13,12 @@
 
 ;;; Code:
 (require 'mhc-compat)
-(require 'mhc-process)
+
+(autoload 'mhc-process-send-command "mhc-process")
 
 
 ;;; Constants:
-(defconst mhc-version "mhc 1.1.1") ;; MHC_VERSION
+(defconst mhc-version "mhc 1.2.4") ;; MHC_VERSION
 
 
 ;;; Configration Variables:
@@ -25,6 +26,18 @@
   "Various sorts of MH Calender."
   :group 'mail)
 
+(defcustom mhc-program-name "mhc"
+  "Program name of MHC."
+  :group 'mhc
+  :type 'string)
+
+(defcustom mhc-ruby-program-name (when (eq system-type 'windows-nt) "ruby")
+  "When non-nil, specify ruby program name.
+Nil means MHC script is called directly."
+  :group 'mhc
+  :type '(choice (const :tag "Call script directly" nil)
+		 string))
+
 (defcustom mhc-start-day-of-week 0
   "*Day of the week as the start of the week."
   :group 'mhc

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.1.1
+;; Version: 1.2.4
 ;; Keywords: calendar
 ;; URL: http://www.quickhack.net/mhc
 ;; Package-Requires: ((calfw "20150703"))
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
 
 ;; For Mule 2.3
 (eval-and-compile
@@ -190,8 +190,8 @@
    Field names using by MHC.
 
    X-SC-Category:
-   Space-seperated Keywords. You can set default category to scan.
-   You can also indicate keywords by typing '\\[mhc-rescan-month]', '\\[mhc-goto-this-month]', '\\[mhc-goto-month]', '\\[mhc-goto-date]' with C-u.
+   Space-seperated Keywords.  You can set default category to scan.
+   You can also indicate keywords by typing '\\[mhc-rescan-month]', '\\[mhc-goto-this-month]', '\\[mhc-goto-month]', '\\[mhc-goto-date]' with \\[universal-argument].
 "
   (interactive "P")
   (make-local-variable 'mhc-mode)
@@ -371,10 +371,15 @@ If HIDE-PRIVATE, priavate schedules are suppressed."
     (if mhc-default-hide-private-schedules
         (not current-prefix-arg)
       current-prefix-arg)))
-  (mhc-scan-month date
-                  'mhc-mua
-                  mhc-default-category-predicate-sexp
-                  hide-private))
+  (let ((name (if (and (mhc-summary-buffer-p)
+                       (not (string-match
+                             "^[0-9][0-9][0-9][0-9]-[0-9][0-9]$" (buffer-name))))
+                  (buffer-name))))
+    (mhc-scan-month date
+                    'mhc-mua
+                    mhc-default-category-predicate-sexp
+                    hide-private
+                    name)))
 
 (defvar mhc-goto-date-func 'mhc-goto-date-calendar)
                                         ; or mhc-goto-date-summary
@@ -524,21 +529,22 @@ SCOPE is one of:
    ((eq scope 'wide)
     (mhc-date-ww-last (mhc-date++ edge-date) mhc-start-day-of-week)))))
 
-(defun mhc-scan-month (date mailer category-predicate secret)
+(defun mhc-scan-month (date mailer category-predicate secret &optional name)
   "Make summary buffer for a month indicated by DATE.
 DATE can be any date of the target month.
 If MAILER is 'direct, insert scanned result into current buffer.
 CATEGORY-PREDICATE must be a function that can take one mhc-schedule
 argument and return a boolean value indicates opacity of the article.
 If SECRET is non-nil, hide articles those categories are
-listed in ``mhc-category-as-private''."
+listed in ``mhc-category-as-private''.
+If optional NAME is non-nil, created smmary buffer has the name."
   (let* ((from (mhc-date-mm-first date))
          (to (mhc-date-mm-last date))
          (today (mhc-date-now))
          ;; need three months for mini-calendar
          (dayinfo-list (mhc-db-scan (mhc-date-mm-- from) (mhc-date-mm++ to))))
     (unless (eq 'direct mailer)
-      (mhc-summary-generate-buffer date)
+      (mhc-summary-generate-buffer (or name date))
       (setq mhc-summary-buffer-current-date-month
             (mhc-date-mm-first date)))
     (when mhc-use-wide-scope
@@ -614,7 +620,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-summary-current-date) (mhc-calendar-get-date) (mhc-date-now)))
+        (current-date (or (mhc-summary-region-date) (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)
@@ -629,9 +635,9 @@ Returns t if the importation was succeeded."
           (mhc-header-narrowing
             (setq msgp (or (mhc-header-get-value "from")
                            (mhc-header-get-value "x-sc-subject")))
-            (mhc-header-delete-header
+            (mhc-header-distill-header
              (concat "^\\("
-                     (mhc-regexp-opt mhc-draft-unuse-hdr-list)
+                     (mhc-regexp-opt mhc-draft-import-header-list)
                      "\\)")
              'regexp))
           (mhc-highlight-message)
@@ -808,15 +814,35 @@ the default action of this command is changed to the latter."
     (mhc-window-pop)))
 
 (defun mhc-import-from-region (beg end)
-  "Import a schedule from region BEG END."
+  "Create new schedule draft from region BEG END."
   (interactive "r")
-  (save-restriction
-    (narrow-to-region beg end)
-    (let ((str (buffer-substring beg end)))
-      (mhc-import)
-      (goto-char (point-max))
-      (insert str)
-      (goto-char (point-min)))))
+  (mhc-import-from-string (buffer-substring beg end)))
+
+(defun mhc-import-from-clipboard ()
+  "Create new schedule draft from clipboard text."
+  (interactive)
+  (mhc-import-from-string (current-kill 0)))
+
+(defun mhc-import-from-string (string)
+  "Create new schedule draft from STRING."
+  (with-temp-buffer
+    (yank 1)
+    (goto-char (point-min))
+    (insert "X-SC-Subject: \n"
+            "X-SC-Location: \n"
+            "X-SC-Day: \n"
+            "X-SC-Time: \n"
+            "X-SC-Category: \n"
+            "X-SC-Priority: \n"
+            "X-SC-Recurrence-Tag: \n"
+            "X-SC-Cond: \n"
+            "X-SC-Duration: \n"
+            "X-SC-Alarm: \n"
+            "X-SC-Record-Id: \n"
+            "X-SC-Sequence: 0\n"
+            "\n"
+            string)
+    (mhc-import)))
 
 (defun mhc-delete ()
   "Delete the current schedule."
@@ -871,11 +897,11 @@ the default action of this command is changed to the latter."
                      ("x-sc-time"  . ,time-list)
                      ("x-sc-day" . ,date-list)))))
 
-(defun mhc-reuse-copy ()
+(defun mhc-reuse-copy (&optional filename)
   "Copy current schedule to template."
   (interactive)
-  (let ((file (mhc-summary-filename))
-        (record (mhc-summary-record)))
+  (let* ((file (or filename (mhc-summary-filename)))
+         (record (mhc-parse-file file)))
     (if (and (stringp file) (file-exists-p file))
         (with-temp-buffer
           (mhc-insert-file-contents-as-coding-system

data/lib/mhc.rb

@@ -5,7 +5,7 @@ require "kconv"
 ## Monkey patch to the original RiCal https://github.com/rubyredrick/ri_cal
 ## delived from:
 ##   git clone https://github.com/yoshinari-nomura/ri_cal.git
-##   git diff 369a4ee..dc740e7
+##   git diff 369a4ee..cdb1f75
 ##
 module RiCal
   class Component #:nodoc:
@@ -47,6 +47,8 @@ module RiCal
           result = {"VALUE" => "DATE"}.merge(params)
         when DateTime
           result = {"VALUE" => "DATE-TIME"}.merge(params)
+        when Period
+          result = {"VALUE" => "PERIOD"}.merge(params)
         end
 
         if has_local_timezone?