emacs: lisp/org/org-icalendar.el comparison

comparison lisp/org/org-icalendar.el @ 111506:5cb272c831e8

Install org-mode version 7.3

author	Carsten Dominik <carsten.dominik@gmail.com>
date	Thu, 11 Nov 2010 22:10:19 -0600
parents	a150e8a14679
children	a7740098b594

comparison

equal deleted inserted replaced

-:62aa3653746a
+:5cb272c831e8
 ;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.01
+;; Version: 7.3
 ;;
 ;; This file is part of GNU Emacs.
 ;;
 ;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 This file is created with the command \\[org-export-icalendar-all-agenda-files].
 The file name should be absolute, the file will be overwritten without warning."
 :group 'org-export-icalendar
 :type 'file)
+(defcustom org-icalendar-alarm-time 0
+"Number of minutes for triggering an alarm for exported timed events.
+A zero value (the default) turns off the definition of an alarm trigger
+for timed events.  If non-zero, alarms are created.
+- a single alarm per entry is defined
+- The alarm will go off N minutes before the event
+- only a DISPLAY action is defined."
+:group 'org-export-icalendar
+:type 'integer)
 (defcustom org-icalendar-combined-name "OrgMode"
 "Calendar name for the combined iCalendar representing all agenda files."
 :group 'org-export-icalendar
 :type 'string)
 (defcustom org-icalendar-combined-description nil
-"Calendar description for the combined iCalendar representing all agenda files."
+"Calendar description for the combined iCalendar (all agenda files)."
 :group 'org-export-icalendar
 :type 'string)
 (defcustom org-icalendar-use-plain-timestamp t
 "Non-nil means make an event from every plain time stamp."
 When nil of the empty string, use the abbreviation retrieved from Emacs."
 :group 'org-export-icalendar
 :type '(choice
 	  (const :tag "Unspecified" nil)
 	  (string :tag "Time zone")))
+(defcustom org-icalendar-use-UTC-date-time ()
+"Non-nil force the use of the universal time for iCalendar DATE-TIME.
+The iCalendar DATE-TIME can be expressed with local time or universal Time,
+universal time could be more compatible with some external tools."
+:group 'org-export-icalendar
+:type 'boolean)
 ;;; iCalendar export
 ;;;###autoload
 (defun org-export-icalendar-this-file ()
 	(dts (org-ical-ts-to-string
 	      (format-time-string (cdr org-time-stamp-formats) (current-time))
 	      "DTSTART"))
 	hd ts ts2 state status (inc t) pos b sexp rrule
 	scheduledp deadlinep todo prefix due start
-	tmp pri categories location summary desc uid
+	tmp pri categories location summary desc uid alarm
 	(sexp-buffer (get-buffer-create "*ical-tmp*")))
 (org-refresh-category-properties)
 (save-excursion
 (goto-char (point-min))
 (while (re-search-forward re1 nil t)
 	  (setq pos (match-beginning 0)
 		ts (match-string 0)
 		inc t
 		hd (condition-case nil
 		       (org-icalendar-cleanup-string
-			(org-get-heading))
+			(org-get-heading t))
 		     (error (throw :skip nil)))
 		summary (org-icalendar-cleanup-string
 			 (org-entry-get nil "SUMMARY"))
 		desc (org-icalendar-cleanup-string
 		      (or (org-entry-get nil "DESCRIPTION")
 			  (org-entry-get nil "LOCATION" 'selective))
 		uid (if org-icalendar-store-UID
 			(org-id-get-create)
 		      (or (org-id-get) (org-id-new)))
 		categories (org-export-get-categories)
+		alarm ""
 		deadlinep nil scheduledp nil)
 	  (if (looking-at re2)
 	      (progn
 		(goto-char (match-end 0))
 		(setq ts2 (match-string 1)
 				  '(("d" . "DAILY")("w" . "WEEKLY")
 				    ("m" . "MONTHLY")("y" . "YEARLY"))))
 			    ";INTERVAL=" (match-string 1 ts)))
 	    (setq rrule ""))
 	  (setq summary (or summary hd))
+	  ;; create an alarm entry if the entry is timed.  this is not very general in that:
+	  ;; (a) only one alarm per entry is defined,
+	  ;; (b) only minutes are allowed for the trigger period ahead of the start time, and
+	  ;; (c) only a DISPLAY action is defined.
+	  ;; [ESF]
+	  (let ((t1 (ignore-errors (org-parse-time-string ts 'nodefault))))
+	    (if (and (> org-icalendar-alarm-time 0)
+		     (car t1) (nth 1 t1) (nth 2 t1))
+		(setq alarm (format "\nBEGIN:VALARM\nACTION:DISPLAY\nDESCRIPTION:%s\nTRIGGER:-P0D0H%dM0S\nEND:VALARM" summary org-icalendar-alarm-time))
+	      (setq alarm ""))
+	    )
 	  (if (string-match org-bracket-link-regexp summary)
 	      (setq summary
 		    (replace-match (if (match-end 3)
 				       (match-string 3 summary)
 				     (match-string 1 summary))
 	    (princ (format "BEGIN:VEVENT
 UID: %s
 %s
 %s%s
 SUMMARY:%s%s%s
-CATEGORIES:%s
+CATEGORIES:%s%s
 END:VEVENT\n"
 			   (concat prefix uid)
 			   (org-ical-ts-to-string ts "DTSTART")
 			   (org-ical-ts-to-string ts2 "DTEND" inc)
 			   rrule summary
 			   (if (and desc (string-match "\\S-" desc))
 			       (concat "\nDESCRIPTION: " desc) "")
 			   (if (and location (string-match "\\S-" location))
 			       (concat "\nLOCATION: " location) "")
-			   categories)))))
+			   categories
+			   alarm)))))
 (when (and org-icalendar-include-sexps
 		 (condition-case nil (require 'icalendar) (error nil))
 		 (fboundp 'icalendar-export-region))
 	;; Get all the literal sexps
 	(goto-char (point-min))
 	(kill-buffer sexp-buffer))
 (when org-icalendar-include-todo
 	(setq prefix "TODO-")
 	(goto-char (point-min))
-	(while (re-search-forward org-todo-line-regexp nil t)
+	(while (re-search-forward org-complex-heading-regexp nil t)
 	  (catch :skip
 	    (org-agenda-skip)
 	    (when org-icalendar-verify-function
 	      (unless (save-match-data
 			(funcall org-icalendar-verify-function))
 					   :from 'todo
 					   :to 'done))))))
 			((eq org-icalendar-include-todo t)
 			 ;; include everything that is not done
 			 (member state org-not-done-keywords))))
-	      (setq hd (match-string 3)
+	      (setq hd (match-string 4)
 		    summary (org-icalendar-cleanup-string
 			     (org-entry-get nil "SUMMARY"))
 		    desc (org-icalendar-cleanup-string
 			  (or (org-entry-get nil "DESCRIPTION")
 			      (and org-icalendar-include-body (org-get-entry)))
 	      (if org-agenda-default-appointment-duration
 		  (setq mi (+ org-agenda-default-appointment-duration mi))
 		(setq h (+ 2 h)))
 	    (setq d (1+ d))))
 	(setq time (encode-time s mi h d m y)))
-(setq fmt (if have-time ":%Y%m%dT%H%M%S" ";VALUE=DATE:%Y%m%d"))
+(setq fmt (if have-time (if org-icalendar-use-UTC-date-time
-(concat keyword (format-time-string fmt time)))))
+				  ":%Y%m%dT%H%M%SZ"
+				  ":%Y%m%dT%H%M%S")
+		    ";VALUE=DATE:%Y%m%d"))
+(concat keyword (format-time-string fmt time
+					  (and org-icalendar-use-UTC-date-time
+					       have-time))))))
 (provide 'org-icalendar)
 ;; arch-tag: 2dee2b6e-9211-4aee-8a47-a3c7e5bc30cf
 ;;; org-icalendar.el ends here

Mercurial > emacs

comparison lisp/org/org-icalendar.el @ 111506:5cb272c831e8