-;;; calendar.el --- Calendar functions.
+;;; calendar.el --- calendar functions
-;;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994 Free Software
-;;; Foundation, Inc.
+;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997,
+;; 2000, 2001, 2003 Free Software Foundation, Inc.
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
;; Keywords: calendar
-;; Human-Keywords: calendar, Gregorian calendar, Julian calendar,
-;; Hebrew calendar, Islamic calendar, ISO calendar, Julian day number,
-;; diary, holidays
+;; Human-Keywords: calendar, Gregorian calendar, diary, holidays
;; This file is part of GNU Emacs.
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
;;; Commentary:
-;; This collection of functions implements a calendar window. It
-;; generates a calendar for the current month, together with the previous
-;; and coming months, or for any other three-month period. The calendar
-;; can be scrolled forward and backward in the window to show months in
-;; the past or future; the cursor can move forward and backward by days,
-;; weeks, or months, making it possible, for instance, to jump to the
-;; date a specified number of days, weeks, or months from the date under
-;; the cursor. The user can display a list of holidays and other notable
-;; days for the period shown; the notable days can be marked on the
-;; calendar, if desired. The user can also specify that dates having
-;; corresponding diary entries (in a file that the user specifies) be
-;; marked; the diary entries for any date can be viewed in a separate
-;; window. The diary and the notable days can be viewed independently of
-;; the calendar. Dates can be translated from the (usual) Gregorian
-;; calendar to the day of the year/days remaining in year, to the ISO
-;; commercial calendar, to the Julian (old style) calendar, to the Hebrew
-;; calendar, to the Islamic calendar, to the French Revolutionary calendar,
-;; to the Mayan calendar, and to the astronomical (Julian) day number.
-;; When floating point is available, times of sunrise/sunset can be displayed,
-;; as can the phases of the moon. Appointment notification for diary entries
-;; is available.
+;; This collection of functions implements a calendar window. It generates a
+;; calendar for the current month, together with the previous and coming
+;; months, or for any other three-month period. The calendar can be scrolled
+;; forward and backward in the window to show months in the past or future;
+;; the cursor can move forward and backward by days, weeks, or months, making
+;; it possible, for instance, to jump to the date a specified number of days,
+;; weeks, or months from the date under the cursor. The user can display a
+;; list of holidays and other notable days for the period shown; the notable
+;; days can be marked on the calendar, if desired. The user can also specify
+;; that dates having corresponding diary entries (in a file that the user
+;; specifies) be marked; the diary entries for any date can be viewed in a
+;; separate window. The diary and the notable days can be viewed
+;; independently of the calendar. Dates can be translated from the (usual)
+;; Gregorian calendar to the day of the year/days remaining in year, to the
+;; ISO commercial calendar, to the Julian (old style) calendar, to the Hebrew
+;; calendar, to the Islamic calendar, to the French Revolutionary calendar, to
+;; the Mayan calendar, to the Chinese calendar, to the Coptic calendar, to the
+;; Ethiopic calendar, and to the astronomical (Julian) day number. When
+;; floating point is available, times of sunrise/sunset can be displayed, as
+;; can the phases of the moon. Appointment notification for diary entries is
+;; available. Calendar printing via LaTeX is available.
;; The following files are part of the calendar/diary code:
+;; appt.el Appointment notification
+;; cal-china.el Chinese calendar
+;; cal-coptic.el Coptic/Ethiopic calendars
+;; cal-dst.el Daylight savings time rules
+;; cal-hebrew.el Hebrew calendar
+;; cal-islam.el Islamic calendar
+;; cal-iso.el ISO calendar
+;; cal-julian.el Julian/astronomical calendars
+;; cal-mayan.el Mayan calendars
;; cal-menu.el Menu support
-;; diary-lib.el, diary-ins.el Diary functions
+;; cal-move.el Movement in the calendar
+;; cal-persia.el Persian calendar
+;; cal-tex.el Calendars in LaTeX
+;; cal-x.el X-windows dedicated frame functions
+;; diary-lib.el Diary functions
;; holidays.el Holiday functions
-;; cal-french.el French Revolutionary calendar
-;; cal-mayan.el Mayan calendars
-;; cal-dst.el Daylight savings time rules
-;; solar.el Sunrise/sunset, equinoxes/solstices
;; lunar.el Phases of the moon
-;; appt.el Appointment notification
-
-;; Comments, corrections, and improvements should be sent to
-;; Edward M. Reingold Department of Computer Science
-;; (217) 333-6733 University of Illinois at Urbana-Champaign
-;; reingold@cs.uiuc.edu 1304 West Springfield Avenue
-;; Urbana, Illinois 61801
-
-;; GNU Emacs users too numerous to list pointed out a variety of problems
-;; with earlier forms of the `infinite' sliding calendar and suggested some
-;; of the features included in this package. Especially significant in this
-;; regard was the suggestion of mark-diary-entries and view-diary-entries,
-;; together ideas for their implementation, by
-;; Michael S. Littman Cognitive Science Research Group
-;; (201) 829-5155 Bell Communications Research
-;; mlittman@wind.bellcore.com 445 South St. Box 1961 (2L-331)
-;; Morristown, NJ 07960
-
-;; The algorithms for the Hebrew calendar are those of the Rambam (Rabbi Moses
-;; Maimonides), from his Mishneh Torah, as implemented by
-;; Nachum Dershowitz Department of Computer Science
-;; (217) 333-4219 University of Illinois at Urbana-Champaign
-;; nachum@cs.uiuc.edu 1304 West Springfield Avenue
-;; Urbana, Illinois 61801
+;; solar.el Sunrise/sunset, equinoxes/solstices
;; Technical details of all the calendrical calculations can be found in
+;; ``Calendrical Calculations'' by Nachum Dershowitz and Edward M. Reingold,
+;; Cambridge University Press (1997).
+;; An earlier version of the technical details appeared in
;; ``Calendrical Calculations'' by Nachum Dershowitz and Edward M. Reingold,
;; Software--Practice and Experience, Volume 20, Number 9 (September, 1990),
;; pages 899-928. ``Calendrical Calculations, Part II: Three Historical
;; reingold@cs.uiuc.edu with the SUBJECT "send-paper-cal" (no quotes) and
;; the message BODY containing your mailing address (snail).
+;; Comments, corrections, and improvements should be sent to
+;; Edward M. Reingold Department of Computer Science
+;; (217) 333-6733 University of Illinois at Urbana-Champaign
+;; reingold@cs.uiuc.edu 1304 West Springfield Avenue
+;; Urbana, Illinois 61801
+
;;; Code:
+(eval-when-compile
+ (defvar displayed-month)
+ (defvar displayed-year)
+ (defvar calendar-month-name-array)
+ (defvar calendar-starred-day))
+
(defun calendar-version ()
(interactive)
- (message "Version 5.3, January 25, 1994"))
+ (message "Version 6, October 12, 1995"))
+
+(defgroup calendar nil
+ "Calendar and time management support."
+ :group 'applications)
+
+(defgroup diary nil
+ "Emacs diary."
+ :group 'calendar)
+
+(defgroup appt nil
+ "Appointment notification."
+ :group 'calendar)
+
+(defgroup holidays nil
+ "Holidays support in calendar."
+ :group 'calendar
+ :prefix "calendar-"
+ :group 'local)
+
+(defgroup chinese-calendar nil
+ "Chinese calendar support."
+ :group 'calendar)
+
+(defgroup calendar-tex nil
+ "Options for printing calendar with LaTeX."
+ :prefix "cal-tex-"
+ :group 'calendar)
+
+(defgroup calendar-hooks nil
+ "Calendar hooks."
+ :prefix "calendar-"
+ :group 'calendar)
+
;;;###autoload
-(defvar calendar-week-start-day 0
+(defcustom calendar-week-start-day 0
"*The day of the week on which a week in the calendar begins.
-0 means Sunday (default), 1 means Monday, and so on.")
+0 means Sunday (default), 1 means Monday, and so on."
+ :type 'integer
+ :group 'calendar)
;;;###autoload
-(defvar calendar-offset 0
+(defcustom calendar-offset 0
"*The offset of the principal month from the center of the calendar window.
0 means the principal month is in the center (default), -1 means on the left,
+1 means on the right. Larger (or smaller) values push the principal month off
-the screen.")
+the screen."
+ :type 'integer
+ :group 'calendar)
;;;###autoload
-(defvar view-diary-entries-initially nil
+(defcustom view-diary-entries-initially nil
"*Non-nil means display current date's diary entries on entry.
The diary is displayed in another window when the calendar is first displayed,
if the current date is visible. The number of days of diary entries displayed
-is governed by the variable `number-of-diary-entries'.")
+is governed by the variable `number-of-diary-entries'."
+ :type 'boolean
+ :group 'diary)
;;;###autoload
-(defvar number-of-diary-entries 1
+(defcustom number-of-diary-entries 1
"*Specifies how many days of diary entries are to be displayed initially.
-This variable affects the diary display when the command M-x diary is used,
+This variable affects the diary display when the command \\[diary] is used,
or if the value of the variable `view-diary-entries-initially' is t. For
example, if the default value 1 is used, then only the current day's diary
entries will be displayed. If the value 2 is used, then both the current
This variable does not affect the diary display with the `d' command
from the calendar; in that case, the prefix argument controls the
-number of days of diary entries displayed.")
+number of days of diary entries displayed."
+ :type '(choice (integer :tag "Entries")
+ (vector :value [0 0 0 0 0 0 0]
+ (integer :tag "Sunday")
+ (integer :tag "Monday")
+ (integer :tag "Tuesday")
+ (integer :tag "Wednesday")
+ (integer :tag "Thursday")
+ (integer :tag "Friday")
+ (integer :tag "Saturday")))
+ :group 'diary)
;;;###autoload
-(defvar mark-diary-entries-in-calendar nil
+(defcustom mark-diary-entries-in-calendar nil
"*Non-nil means mark dates with diary entries, in the calendar window.
-The marking symbol is specified by the variable `diary-entry-marker'.")
+The marking symbol is specified by the variable `diary-entry-marker'."
+ :type 'boolean
+ :group 'diary)
-(defvar diary-entry-marker
- (if (not window-system)
+;;;###autoload
+(defcustom calendar-remove-frame-by-deleting nil
+ "*Determine how the calendar mode removes a frame no longer needed.
+If nil, make an icon of the frame. If non-nil, delete the frame."
+ :type 'boolean
+ :group 'view)
+
+(defvar diary-face 'diary-face
+ "Face name to use for diary entries.")
+(defface diary-face
+ '((((class color) (background light))
+ :foreground "red")
+ (((class color) (background dark))
+ :foreground "yellow")
+ (t
+ :weight bold))
+ "Face for highlighting diary entries."
+ :group 'diary)
+
+(defface calendar-today-face
+ '((t (:underline t)))
+ "Face for indicating today's date."
+ :group 'diary)
+
+(defface holiday-face
+ '((((class color) (background light))
+ :background "pink")
+ (((class color) (background dark))
+ :background "chocolate4")
+ (t
+ :inverse-video t))
+ "Face for indicating dates that have holidays."
+ :group 'diary)
+
+(eval-after-load "facemenu"
+ '(progn
+ (add-to-list 'facemenu-unlisted-faces 'diary-face)
+ (add-to-list 'facemenu-unlisted-faces 'calendar-today-face)
+ (add-to-list 'facemenu-unlisted-faces 'holiday-face)))
+
+(defcustom diary-entry-marker
+ (if (not (display-color-p))
"+"
- (require 'faces)
- (make-face 'diary-face)
- (if (x-display-color-p)
- (set-face-foreground 'diary-face "red")
- (copy-face 'bold 'diary-face))
'diary-face)
- "*Used to mark dates that have diary entries.
-Can be either a single-character string or a face.")
+ "*How to mark dates that have diary entries.
+The value can be either a single-character string or a face."
+ :type '(choice string face)
+ :group 'diary)
-(defvar calendar-today-marker
- (if (not window-system)
+(defcustom calendar-today-marker
+ (if (not (display-color-p))
"="
- (require 'faces)
- (make-face 'calendar-today-face)
- (set-face-underline-p 'calendar-today-face t)
'calendar-today-face)
- "*Used to mark today's date.
-Can be either a single-character string or a face.")
-
-(defvar calendar-holiday-marker
- (if (not window-system)
+ "*How to mark today's date in the calendar.
+The value can be either a single-character string or a face.
+Marking today's date is done only if you set up `today-visible-calendar-hook'
+to request that."
+ :type '(choice string face)
+ :group 'calendar)
+
+(defcustom calendar-holiday-marker
+ (if (not (display-color-p))
"*"
- (require 'faces)
- (make-face 'holiday-face)
- (if (x-display-color-p)
- (set-face-background 'holiday-face "pink")
- (copy-face 'highlight 'holiday-face))
'holiday-face)
- "*Used to mark notable dates in the calendar.
-Can be either a single-character string or a face.")
+ "*How to mark notable dates in the calendar.
+The value can be either a single-character string or a face."
+ :type '(choice string face)
+ :group 'calendar)
;;;###autoload
-(defvar view-calendar-holidays-initially nil
+(defcustom view-calendar-holidays-initially nil
"*Non-nil means display holidays for current three month period on entry.
The holidays are displayed in another window when the calendar is first
-displayed.")
+displayed."
+ :type 'boolean
+ :group 'holidays)
;;;###autoload
-(defvar mark-holidays-in-calendar nil
+(defcustom mark-holidays-in-calendar nil
"*Non-nil means mark dates of holidays in the calendar window.
-The marking symbol is specified by the variable `calendar-holiday-marker'.")
+The marking symbol is specified by the variable `calendar-holiday-marker'."
+ :type 'boolean
+ :group 'holidays)
;;;###autoload
-(defvar all-hebrew-calendar-holidays nil
+(defcustom all-hebrew-calendar-holidays nil
"*If nil, show only major holidays from the Hebrew calendar.
This means only those Jewish holidays that appear on secular calendars.
-If t, show all the holidays that would appear in a complete Hebrew calendar.")
+If t, show all the holidays that would appear in a complete Hebrew calendar."
+ :type 'boolean
+ :group 'holidays)
;;;###autoload
-(defvar all-christian-calendar-holidays nil
+(defcustom all-christian-calendar-holidays nil
"*If nil, show only major holidays from the Christian calendar.
This means only those Christian holidays that appear on secular calendars.
If t, show all the holidays that would appear in a complete Christian
-calendar.")
+calendar."
+ :type 'boolean
+ :group 'holidays)
;;;###autoload
-(defvar all-islamic-calendar-holidays nil
+(defcustom all-islamic-calendar-holidays nil
"*If nil, show only major holidays from the Islamic calendar.
This means only those Islamic holidays that appear on secular calendars.
If t, show all the holidays that would appear in a complete Islamic
-calendar.")
+calendar."
+ :type 'boolean
+ :group 'holidays)
+
+(defcustom diary-file-name-prefix-function (function (lambda (str) str))
+ "*The function that will take a diary file name and return the desired prefix."
+ :type 'function
+ :group 'diary)
;;;###autoload
-(defvar calendar-load-hook nil
+(defcustom calendar-load-hook nil
"*List of functions to be called after the calendar is first loaded.
-This is the place to add key bindings to `calendar-mode-map'.")
+This is the place to add key bindings to `calendar-mode-map'."
+ :type 'hook
+ :group 'calendar-hooks)
;;;###autoload
-(defvar initial-calendar-window-hook nil
+(defcustom initial-calendar-window-hook nil
"*List of functions to be called when the calendar window is first opened.
The functions invoked are called after the calendar window is opened, but
once opened is never called again. Leaving the calendar with the `q' command
-and reentering it will cause these functions to be called again.")
+and reentering it will cause these functions to be called again."
+ :type 'hook
+ :group 'calendar-hooks)
;;;###autoload
-(defvar today-visible-calendar-hook nil
+(defcustom today-visible-calendar-hook nil
"*List of functions called whenever the current date is visible.
This can be used, for example, to replace today's date with asterisks; a
function `calendar-star-date' is included for this purpose:
Other than the use of the provided functions, the changing of any
characters in the calendar buffer by the hooks may cause the failure of the
-functions that move by days and weeks.")
+functions that move by days and weeks."
+ :type 'hook
+ :group 'calendar-hooks)
;;;###autoload
-(defvar today-invisible-calendar-hook nil
+(defcustom today-invisible-calendar-hook nil
"*List of functions called whenever the current date is not visible.
The corresponding variable `today-visible-calendar-hook' is the list of
Other than the use of the provided functions, the changing of any
characters in the calendar buffer by the hooks may cause the failure of the
-functions that move by days and weeks.")
+functions that move by days and weeks."
+ :type 'hook
+ :group 'calendar-hooks)
+
+;;;###autoload
+(defcustom calendar-move-hook nil
+ "*List of functions called whenever the cursor moves in the calendar.
+
+For example,
+
+ (add-hook 'calendar-move-hook (lambda () (view-diary-entries 1)))
+
+redisplays the diary for whatever date the cursor is moved to."
+ :type 'hook
+ :group 'calendar-hooks)
;;;###autoload
-(defvar diary-file "~/diary"
+(defcustom diary-file "~/diary"
"*Name of the file in which one's personal diary of dates is kept.
-The file's entries are lines in any of the forms
+The file's entries are lines beginning with any of the forms
+specified by the variable `american-date-diary-pattern', by default:
MONTH/DAY
MONTH/DAY/YEAR
MONTHNAME DAY, YEAR
DAYNAME
-at the beginning of the line; the remainder of the line is the diary entry
-string for that date. MONTH and DAY are one or two digit numbers, YEAR is
-a number and may be written in full or abbreviated to the final two digits.
-If the date does not contain a year, it is generic and applies to any year.
-DAYNAME entries apply to any date on which is on that day of the week.
-MONTHNAME and DAYNAME can be spelled in full, abbreviated to three
-characters (with or without a period), capitalized or not. Any of DAY,
-MONTH, or MONTHNAME, YEAR can be `*' which matches any day, month, or year,
-respectively.
-
-The European style (in which the day precedes the month) can be used
-instead, if you execute `european-calendar' when in the calendar, or set
-`european-calendar-style' to t in your .emacs file. The European forms are
+with the remainder of the line being the diary entry string for
+that date. MONTH and DAY are one or two digit numbers, YEAR is a
+number and may be written in full or abbreviated to the final two
+digits (if `abbreviated-calendar-year' is non-nil). MONTHNAME
+and DAYNAME can be spelled in full (as specified by the variables
+`calendar-month-name-array' and `calendar-day-name-array'),
+abbreviated (as specified by `calendar-month-abbrev-array' and
+`calendar-day-abbrev-array') with or without a period,
+capitalized or not. Any of DAY, MONTH, or MONTHNAME, YEAR can be
+`*' which matches any day, month, or year, respectively. If the
+date does not contain a year, it is generic and applies to any
+year. A DAYNAME entry applies to the appropriate day of the week
+in every week.
+
+The European style (in which the day precedes the month) can be
+used instead, if you execute `european-calendar' when in the
+calendar, or set `european-calendar-style' to t in your .emacs
+file. The European forms (see `european-date-diary-pattern') are
DAY/MONTH
DAY/MONTH/YEAR
10, 1990. Other functions available are `diary-float', `diary-anniversary',
`diary-cyclic', `diary-day-of-year', `diary-iso-date', `diary-french-date',
`diary-hebrew-date', `diary-islamic-date', `diary-mayan-date',
-`diary-yahrzeit', `diary-sunrise-sunset', `diary-phases-of-moon',
-`diary-parasha', `diary-omer', `diary-rosh-hodesh', and
-`diary-sabbath-candles'. See the documentation for the function
+`diary-chinese-date', `diary-coptic-date', `diary-ethiopic-date',
+`diary-persian-date', `diary-yahrzeit', `diary-sunrise-sunset',
+`diary-phases-of-moon', `diary-parasha', `diary-omer', `diary-rosh-hodesh',
+and `diary-sabbath-candles'. See the documentation for the function
`list-sexp-diary-entries' for more details.
Diary entries based on the Hebrew and/or the Islamic calendar are also
for these functions for details.
Diary files can contain directives to include the contents of other files; for
-details, see the documentation for the variable `list-diary-entries-hook'.")
+details, see the documentation for the variable `list-diary-entries-hook'."
+ :type 'file
+ :group 'diary)
;;;###autoload
-(defvar diary-nonmarking-symbol "&"
- "*Symbol indicating that a diary entry is not to be marked in the calendar.")
+(defcustom diary-nonmarking-symbol "&"
+ "*Symbol indicating that a diary entry is not to be marked in the calendar."
+ :type 'string
+ :group 'diary)
;;;###autoload
-(defvar hebrew-diary-entry-symbol "H"
- "*Symbol indicating a diary entry according to the Hebrew calendar.")
+(defcustom hebrew-diary-entry-symbol "H"
+ "*Symbol indicating a diary entry according to the Hebrew calendar."
+ :type 'string
+ :group 'diary)
;;;###autoload
-(defvar islamic-diary-entry-symbol "I"
- "*Symbol indicating a diary entry according to the Islamic calendar.")
+(defcustom islamic-diary-entry-symbol "I"
+ "*Symbol indicating a diary entry according to the Islamic calendar."
+ :type 'string
+ :group 'diary)
;;;###autoload
-(defvar diary-include-string "#include"
+(defcustom diary-include-string "#include"
"*The string indicating inclusion of another file of diary entries.
-See the documentation for the function `include-other-diary-files'.")
+See the documentation for the function `include-other-diary-files'."
+ :type 'string
+ :group 'diary)
+
+(defcustom diary-glob-file-regexp-prefix "^\\#"
+ "*The regular expression that gets pre-pended to each of the attribute-regexp's for file-wide specifiers."
+ :type 'regexp
+ :group 'diary)
+
+(defcustom diary-face-attrs
+ '((" *\\[foreground:\\([-a-z]+\\)\\]$" 1 :foreground string)
+ (" *\\[background:\\([-a-z]+\\)\\]$" 1 :background string)
+ (" *\\[width:\\([-a-z]+\\)\\]$" 1 :width symbol)
+ (" *\\[height:\\([-0-9a-z]+\\)\\]$" 1 :height int)
+ (" *\\[weight:\\([-a-z]+\\)\\]$" 1 :weight symbol)
+ (" *\\[slant:\\([-a-z]+\\)\\]$" 1 :slant symbol)
+ (" *\\[underline:\\([-a-z]+\\)\\]$" 1 :underline stringtnil)
+ (" *\\[overline:\\([-a-z]+\\)\\]$" 1 :overline stringtnil)
+ (" *\\[strike-through:\\([-a-z]+\\)\\]$" 1 :strike-through stringtnil)
+ (" *\\[inverse-video:\\([-a-z]+\\)\\]$" 1 :inverse-video tnil)
+ (" *\\[face:\\([-0-9a-z]+\\)\\]$" 1 :face string)
+ (" *\\[font:\\([-a-z0-9]+\\)\\]$" 1 :font string)
+ ;; Unsupported.
+;;; (" *\\[box:\\([-a-z]+\\)\\]$" 1 :box)
+;;; (" *\\[stipple:\\([-a-z]+\\)\\]$" 1 :stipple)
+ )
+ "*A list of (regexp regnum attr attrtype) lists where the
+regexp says how to find the tag, the regnum says which
+parenthetical sub-regexp this regexp looks for, and the attr says
+which attribute of the face (or that this _is_ a face) is being
+modified."
+ :type 'sexp
+ :group 'diary)
+
+(defcustom diary-file-name-prefix nil
+ "If non-nil each diary entry is prefixed with the name of the file where it is defined."
+ :type 'boolean
+ :group 'diary)
;;;###autoload
-(defvar sexp-diary-entry-symbol "%%"
- "*The string used to indicate a sexp diary entry in diary-file.
-See the documentation for the function `list-sexp-diary-entries'.")
+(defcustom sexp-diary-entry-symbol "%%"
+ "*The string used to indicate a sexp diary entry in `diary-file'.
+See the documentation for the function `list-sexp-diary-entries'."
+ :type 'string
+ :group 'diary)
;;;###autoload
-(defvar abbreviated-calendar-year t
+(defcustom abbreviated-calendar-year t
"*Interpret a two-digit year DD in a diary entry as either 19DD or 20DD.
For the Gregorian calendar; similarly for the Hebrew and Islamic calendars.
-If this variable is nil, years must be written in full.")
+If this variable is nil, years must be written in full."
+ :type 'boolean
+ :group 'diary)
;;;###autoload
-(defvar european-calendar-style nil
+(defcustom european-calendar-style nil
"*Use the European style of dates in the diary and in any displays.
If this variable is t, a date 1/2/1990 would be interpreted as February 1,
-1990. The accepted European date styles are
+1990. The default European date styles (see `european-date-diary-pattern')
+are
DAY/MONTH
DAY/MONTH/YEAR
DAY MONTHNAME YEAR
DAYNAME
-Names can be capitalized or not, written in full, or abbreviated to three
-characters with or without a period.")
+Names can be capitalized or not, written in full (as specified by the
+variable `calendar-day-name-array'), or abbreviated (as specified by
+`calendar-day-abbrev-array') with or without a period."
+ :type 'boolean
+ :group 'diary)
;;;###autoload
-(defvar american-date-diary-pattern
+(defcustom american-date-diary-pattern
'((month "/" day "[^/0-9]")
(month "/" day "/" year "[^0-9]")
(monthname " *" day "[^,0-9]")
(monthname " *" day ", *" year "[^0-9]")
(dayname "\\W"))
"*List of pseudo-patterns describing the American patterns of date used.
-See the documentation of `diary-date-forms' for an explanation.")
+See the documentation of `diary-date-forms' for an explanation."
+ :type '(repeat (choice (cons :tag "Backup"
+ :value (backup . nil)
+ (const backup)
+ (repeat (list :inline t :format "%v"
+ (symbol :tag "Keyword")
+ (choice symbol regexp))))
+ (repeat (list :inline t :format "%v"
+ (symbol :tag "Keyword")
+ (choice symbol regexp)))))
+ :group 'diary)
;;;###autoload
-(defvar european-date-diary-pattern
+(defcustom european-date-diary-pattern
'((day "/" month "[^/0-9]")
(day "/" month "/" year "[^0-9]")
- (backup day " *" monthname "\\W+\\<[^*0-9]")
+ (backup day " *" monthname "\\W+\\<\\([^*0-9]\\|\\([0-9]+[:aApP]\\)\\)")
(day " *" monthname " *" year "[^0-9]")
(dayname "\\W"))
"*List of pseudo-patterns describing the European patterns of date used.
-See the documentation of `diary-date-forms' for an explanation.")
-
-(defvar diary-date-forms
+See the documentation of `diary-date-forms' for an explanation."
+ :type '(repeat (choice (cons :tag "Backup"
+ :value (backup . nil)
+ (const backup)
+ (repeat (list :inline t :format "%v"
+ (symbol :tag "Keyword")
+ (choice symbol regexp))))
+ (repeat (list :inline t :format "%v"
+ (symbol :tag "Keyword")
+ (choice symbol regexp)))))
+ :group 'diary)
+
+(defcustom diary-date-forms
(if european-calendar-style
european-date-diary-pattern
american-date-diary-pattern)
"*List of pseudo-patterns describing the forms of date used in the diary.
-The patterns on the list must be MUTUALLY EXCLUSIVE and must should not match
+The patterns on the list must be MUTUALLY EXCLUSIVE and should not match
any portion of the diary entry itself, just the date component.
A pseudo-pattern is a list of regular expressions and the keywords `month',
`day', `year', `monthname', and `dayname'. The keyword `monthname' will
-match the name of the month, capitalized or not, or its three-letter
-abbreviation, followed by a period or not; it will also match `*'.
-Similarly, `dayname' will match the name of the day, capitalized or not, or
-its three-letter abbreviation, followed by a period or not. The keywords
-`month', `day', and `year' will match those numerical values, preceded by
-arbitrarily many zeros; they will also match `*'.
+match the name of the month (see `calendar-month-name-array'), capitalized
+or not, or its user-specified abbreviation (see `calendar-month-abbrev-array'),
+followed by a period or not; it will also match `*'. Similarly, `dayname'
+will match the name of the day (see `calendar-day-name-array'), capitalized or
+not, or its user-specified abbreviation (see `calendar-day-abbrev-array'),
+followed by a period or not. The keywords `month', `day', and `year' will
+match those numerical values, preceded by arbitrarily many zeros; they will
+also match `*'.
The matching of the diary entries with the date forms is done with the
standard syntax table from Fundamental mode, but with the `*' changed so
diary entry itself, the first element of the pattern MUST be `backup'. This
directive causes the date recognizer to back up to the beginning of the
current word of the diary entry, so in no case can the pattern match more than
-a portion of the first word of the diary entry.")
+a portion of the first word of the diary entry."
+ :type '(repeat (choice (cons :tag "Backup"
+ :value (backup . nil)
+ (const backup)
+ (repeat (list :inline t :format "%v"
+ (symbol :tag "Keyword")
+ (choice symbol regexp))))
+ (repeat (list :inline t :format "%v"
+ (symbol :tag "Keyword")
+ (choice symbol regexp)))))
+ :group 'diary)
;;;###autoload
-(defvar european-calendar-display-form
+(defcustom european-calendar-display-form
'((if dayname (concat dayname ", ")) day " " monthname " " year)
"*Pseudo-pattern governing the way a date appears in the European style.
-See the documentation of calendar-date-display-form for an explanation.")
+See the documentation of `calendar-date-display-form' for an explanation."
+ :type 'sexp
+ :group 'calendar)
;;;###autoload
-(defvar american-calendar-display-form
+(defcustom american-calendar-display-form
'((if dayname (concat dayname ", ")) monthname " " day ", " year)
"*Pseudo-pattern governing the way a date appears in the American style.
-See the documentation of `calendar-date-display-form' for an explanation.")
+See the documentation of `calendar-date-display-form' for an explanation."
+ :type 'sexp
+ :group 'calendar)
-(defvar calendar-date-display-form
+(defcustom calendar-date-display-form
(if european-calendar-style
european-calendar-display-form
american-calendar-display-form)
would give the usual American style in fixed-length fields.
-See the documentation of the function `calendar-date-string'.")
+See the documentation of the function `calendar-date-string'."
+ :type 'sexp
+ :group 'calendar)
(defun european-calendar ()
"Set the interpretation and display of dates to the European style."
(update-calendar-mode-line))
;;;###autoload
-(defvar print-diary-entries-hook 'lpr-buffer
+(defcustom print-diary-entries-hook 'lpr-buffer
"*List of functions called after a temporary diary buffer is prepared.
The buffer shows only the diary entries currently visible in the diary
buffer. The default just does the printing. Other uses might include, for
example, rearranging the lines into order by day and time, saving the buffer
-instead of deleting it, or changing the function used to do the printing.")
+instead of deleting it, or changing the function used to do the printing."
+ :type 'hook
+ :group 'diary)
;;;###autoload
-(defvar list-diary-entries-hook nil
+(defcustom list-diary-entries-hook nil
"*List of functions called after diary file is culled for relevant entries.
It is to be used for diary entries that are not found in the diary file.
in your `.emacs' file to cause the fancy diary buffer to be displayed with
diary entries from various included files, each day's entries sorted into
-lexicographic order.")
+lexicographic order."
+ :type 'hook
+ :group 'diary)
;;;###autoload
-(defvar diary-hook nil
+(defcustom diary-hook nil
"*List of functions called after the display of the diary.
-Can be used for appointment notification.")
+Can be used for appointment notification."
+ :type 'hook
+ :group 'diary)
;;;###autoload
-(defvar diary-display-hook nil
+(defcustom diary-display-hook nil
"*List of functions that handle the display of the diary.
If nil (the default), `simple-diary-display' is used. Use `ignore' for no
diary display.
variable `holidays-in-diary-buffer' is set to nil. Ordinarily, the fancy
diary buffer will not show days for which there are no diary entries, even
if that day is a holiday; if you want such days to be shown in the fancy
-diary buffer, set the variable `diary-list-include-blanks' to t.")
+diary buffer, set the variable `diary-list-include-blanks' to t."
+ :type 'hook
+ :group 'diary)
;;;###autoload
-(defvar nongregorian-diary-listing-hook nil
+(defcustom nongregorian-diary-listing-hook nil
"*List of functions called for listing diary file and included files.
As the files are processed for diary entries, these functions are used to cull
relevant entries. You can use either or both of `list-hebrew-diary-entries'
and `list-islamic-diary-entries'. The documentation for these functions
-describes the style of such diary entries.")
+describes the style of such diary entries."
+ :type 'hook
+ :group 'diary)
;;;###autoload
-(defvar mark-diary-entries-hook nil
+(defcustom mark-diary-entries-hook nil
"*List of functions called after marking diary entries in the calendar.
A function `mark-included-diary-files' is also provided for use as the
-mark-diary-entries-hook; it enables you to use shared diary files together
+`mark-diary-entries-hook'; it enables you to use shared diary files together
with your own. The files included are specified in the diary file by lines
of the form
#include \"filename\"
obeyed. You can change the \"#include\" to some other string by changing the
variable `diary-include-string'. When you use `mark-included-diary-files' as
part of the mark-diary-entries-hook, you will probably also want to use the
-function `include-other-diary-files' as part of `list-diary-entries-hook'.")
+function `include-other-diary-files' as part of `list-diary-entries-hook'."
+ :type 'hook
+ :group 'diary)
;;;###autoload
-(defvar nongregorian-diary-marking-hook nil
+(defcustom nongregorian-diary-marking-hook nil
"*List of functions called for marking diary file and included files.
As the files are processed for diary entries, these functions are used to cull
relevant entries. You can use either or both of `mark-hebrew-diary-entries'
and `mark-islamic-diary-entries'. The documentation for these functions
-describes the style of such diary entries.")
+describes the style of such diary entries."
+ :type 'hook
+ :group 'diary)
;;;###autoload
-(defvar diary-list-include-blanks nil
+(defcustom diary-list-include-blanks nil
"*If nil, do not include days with no diary entry in the list of diary entries.
-Such days will then not be shown in the the fancy diary buffer, even if they
-are holidays.")
+Such days will then not be shown in the fancy diary buffer, even if they
+are holidays."
+ :type 'boolean
+ :group 'diary)
;;;###autoload
-(defvar holidays-in-diary-buffer t
+(defcustom holidays-in-diary-buffer t
"*Non-nil means include holidays in the diary display.
The holidays appear in the mode line of the diary buffer, or in the
fancy diary buffer next to the date. This slows down the diary functions
-somewhat; setting it to nil makes the diary display faster.")
+somewhat; setting it to nil makes the diary display faster."
+ :type 'boolean
+ :group 'holidays)
(defvar calendar-mark-ring nil)
;;;###autoload
(put 'general-holidays 'risky-local-variable t)
;;;###autoload
-(defvar general-holidays
+(defcustom general-holidays
'((holiday-fixed 1 1 "New Year's Day")
(holiday-float 1 1 3 "Martin Luther King Day")
- (holiday-fixed 2 2 "Ground Hog Day")
+ (holiday-fixed 2 2 "Groundhog Day")
(holiday-fixed 2 14 "Valentine's Day")
(holiday-float 2 1 3 "President's Day")
(holiday-fixed 3 17 "St. Patrick's Day")
- (holiday-fixed 4 1 "April Fool's Day")
+ (holiday-fixed 4 1 "April Fools' Day")
(holiday-float 5 0 2 "Mother's Day")
(holiday-float 5 1 -1 "Memorial Day")
(holiday-fixed 6 14 "Flag Day")
(holiday-fixed 11 11 "Veteran's Day")
(holiday-float 11 4 4 "Thanksgiving"))
"*General holidays. Default value is for the United States.
-See the documentation for `calendar-holidays' for details.")
+See the documentation for `calendar-holidays' for details."
+ :type 'sexp
+ :group 'holidays)
+
+;;;###autoload
+(put 'oriental-holidays 'risky-local-variable t)
+;;;###autoload
+(defcustom oriental-holidays
+ '((if (fboundp 'atan)
+ (holiday-chinese-new-year)))
+ "*Oriental holidays.
+See the documentation for `calendar-holidays' for details."
+ :type 'sexp
+ :group 'holidays)
;;;###autoload
(put 'local-holidays 'risky-local-variable t)
;;;###autoload
-(defvar local-holidays nil
+(defcustom local-holidays nil
"*Local holidays.
-See the documentation for `calendar-holidays' for details.")
+See the documentation for `calendar-holidays' for details."
+ :type 'sexp
+ :group 'holidays)
;;;###autoload
(put 'other-holidays 'risky-local-variable t)
;;;###autoload
-(defvar other-holidays nil
+(defcustom other-holidays nil
"*User defined holidays.
-See the documentation for `calendar-holidays' for details.")
+See the documentation for `calendar-holidays' for details."
+ :type 'sexp
+ :group 'holidays)
;;;###autoload
(put 'hebrew-holidays-1 'risky-local-variable t)
;;;###autoload
(put 'hebrew-holidays 'risky-local-variable t)
;;;###autoload
-(defvar hebrew-holidays (append hebrew-holidays-1 hebrew-holidays-2
+(defcustom hebrew-holidays (append hebrew-holidays-1 hebrew-holidays-2
hebrew-holidays-3 hebrew-holidays-4)
"*Jewish holidays.
-See the documentation for `calendar-holidays' for details.")
+See the documentation for `calendar-holidays' for details."
+ :type 'sexp
+ :group 'holidays)
;;;###autoload
(put 'christian-holidays 'risky-local-variable t)
;;;###autoload
-(defvar christian-holidays
+(defcustom christian-holidays
'((if all-christian-calendar-holidays
(holiday-fixed 1 6 "Epiphany"))
(holiday-easter-etc)
(if all-christian-calendar-holidays
(holiday-julian 12 25 "Eastern Orthodox Christmas")))
"*Christian holidays.
-See the documentation for `calendar-holidays' for details.")
+See the documentation for `calendar-holidays' for details."
+ :type 'sexp
+ :group 'holidays)
;;;###autoload
(put 'islamic-holidays 'risky-local-variable t)
;;;###autoload
-(defvar islamic-holidays
+(defcustom islamic-holidays
'((holiday-islamic
1 1
(format "Islamic New Year %d"
(if all-islamic-calendar-holidays
(holiday-islamic 12 10 "Id-al-Adha")))
"*Islamic holidays.
-See the documentation for `calendar-holidays' for details.")
+See the documentation for `calendar-holidays' for details."
+ :type 'sexp
+ :group 'holidays)
;;;###autoload
(put 'solar-holidays 'risky-local-variable t)
;;;###autoload
-(defvar solar-holidays
+(defcustom solar-holidays
'((if (fboundp 'atan)
(solar-equinoxes-solstices))
(if (progn
calendar-daylight-time-zone-name)
""))))
"*Sun-related holidays.
-See the documentation for `calendar-holidays' for details.")
+See the documentation for `calendar-holidays' for details."
+ :type 'sexp
+ :group 'holidays)
;;;###autoload
(put 'calendar-holidays 'risky-local-variable t)
-(defvar calendar-holidays
+(defcustom calendar-holidays
(append general-holidays local-holidays other-holidays
christian-holidays hebrew-holidays islamic-holidays
- solar-holidays)
- "*List of notable days for the command M-x holidays.
+ oriental-holidays solar-holidays)
+ "*List of notable days for the command \\[holidays].
Additional holidays are easy to add to the list, just put them in the list
`other-holidays' in your .emacs file. Similarly, by setting any of
`general-holidays', `local-holidays' `christian-holidays', `hebrew-holidays',
-`islamic-holidays', or `solar-holidays' to nil in your .emacs file, you can
-eliminate unwanted categories of holidays. The intention is that (in the US)
-`local-holidays' be set in site-init.el and `other-holidays' be set by the
-user.
+`islamic-holidays', `oriental-holidays', or `solar-holidays' to nil in your
+.emacs file, you can eliminate unwanted categories of holidays. The intention
+is that (in the US) `local-holidays' be set in site-init.el and
+`other-holidays' be set by the user.
Entries on the list are expressions that return (possibly empty) lists of
items of the form ((month day year) string) of a holiday in the in the
(holiday-float MONTH DAYNAME K STRING &optional day) is the Kth DAYNAME in
MONTH on the Gregorian calendar (0 for Sunday,
etc.); K<0 means count back from the end of the
- month. An optional parameter DAY means the Kth
+ month. An optional parameter DAY means the Kth
DAYNAME after/before MONTH DAY.
(holiday-hebrew MONTH DAY STRING) a fixed date on the Hebrew calendar
(holiday-islamic MONTH DAY STRING) a fixed date on the Islamic calendar
you've written to return a (possibly empty) list of the relevant VISIBLE dates
with descriptive strings such as
- (((2 6 1989) \"New Moon\") ((2 12 1989) \"First Quarter Moon\") ... ).")
+ (((2 6 1989) \"New Moon\") ((2 12 1989) \"First Quarter Moon\") ... )."
+ :type 'sexp
+ :group 'holidays)
(defconst calendar-buffer "*Calendar*"
"Name of the buffer used for the calendar.")
(defconst fancy-diary-buffer "*Fancy Diary Entries*"
"Name of the buffer used for the optional fancy display of the diary.")
+(defconst other-calendars-buffer "*Other Calendars*"
+ "Name of the buffer used for the display of date on other calendars.")
+
(defconst lunar-phases-buffer "*Phases of Moon*"
"Name of the buffer used for the lunar phases.")
(defmacro increment-calendar-month (mon yr n)
"Move the variables MON and YR to the month and year by N months.
Forward if N is positive or backward if N is negative."
- (` (let (( macro-y (+ (* (, yr) 12) (, mon) -1 (, n) )))
- (setq (, mon) (1+ (% macro-y 12) ))
- (setq (, yr) (/ macro-y 12)))))
+ `(let ((macro-y (+ (* ,yr 12) ,mon -1 ,n)))
+ (setq ,mon (1+ (% macro-y 12)))
+ (setq ,yr (/ macro-y 12))))
(defmacro calendar-for-loop (var from init to final do &rest body)
"Execute a for loop."
- (` (let (( (, var) (1- (, init)) ))
- (while (>= (, final) (setq (, var) (1+ (, var))))
- (,@ body)))))
+ `(let ((,var (1- ,init)))
+ (while (>= ,final (setq ,var (1+ ,var)))
+ ,@body)))
(defmacro calendar-sum (index initial condition expression)
"For INDEX = INITIAL et seq, as long as CONDITION holds, sum EXPRESSION."
- (` (let (( (, index) (, initial))
- (sum 0))
- (while (, condition)
- (setq sum (+ sum (, expression) ))
- (setq (, index) (1+ (, index))))
- sum)))
+ `(let ((,index ,initial)
+ (sum 0))
+ (while ,condition
+ (setq sum (+ sum ,expression))
+ (setq ,index (1+ ,index)))
+ sum))
;; The following are in-line for speed; they can be called thousands of times
;; when looking up holidays or processing the diary. Here, for example, are
(car (cdr (cdr date))))
(defsubst calendar-leap-year-p (year)
- "Returns t if YEAR is a Gregorian leap year."
+ "Return t if YEAR is a Gregorian leap year."
(and (zerop (% year 4))
(or (not (zerop (% year 100)))
(zerop (% year 400)))))
(- (/ prior-years 100));; - century years
(/ prior-years 400))));; + Gregorian leap years
+(autoload 'calendar-goto-today "cal-move"
+ "Reposition the calendar window so the current date is visible."
+ t)
+
+(autoload 'calendar-forward-month "cal-move"
+ "Move the cursor forward ARG months."
+ t)
+
+(autoload 'calendar-forward-year "cal-move"
+ "Move the cursor forward by ARG years."
+ t)
+
+(autoload 'calendar-backward-month "cal-move"
+ "Move the cursor backward by ARG months."
+ t)
+
+(autoload 'calendar-backward-year "cal-move"
+ "Move the cursor backward ARG years."
+ t)
+
+(autoload 'scroll-calendar-left "cal-move"
+ "Scroll the displayed calendar left by ARG months."
+ t)
+
+(autoload 'scroll-calendar-right "cal-move"
+ "Scroll the displayed calendar window right by ARG months."
+ t)
+
+(autoload 'scroll-calendar-left-three-months "cal-move"
+ "Scroll the displayed calendar window left by 3*ARG months."
+ t)
+
+(autoload 'scroll-calendar-right-three-months "cal-move"
+ "Scroll the displayed calendar window right by 3*ARG months."
+ t)
+
+(autoload 'calendar-cursor-to-nearest-date "cal-move"
+ "Move the cursor to the closest date."
+ t)
+
+(autoload 'calendar-forward-day "cal-move"
+ "Move the cursor forward ARG days."
+ t)
+
+(autoload 'calendar-backward-day "cal-move"
+ "Move the cursor back ARG days."
+ t)
+
+(autoload 'calendar-forward-week "cal-move"
+ "Move the cursor forward ARG weeks."
+ t)
+
+(autoload 'calendar-backward-week "cal-move"
+ "Move the cursor back ARG weeks."
+ t)
+
+(autoload 'calendar-beginning-of-week "cal-move"
+ "Move the cursor back ARG calendar-week-start-day's."
+ t)
+
+(autoload 'calendar-end-of-week "cal-move"
+ "Move the cursor forward ARG calendar-week-start-day+6's."
+ t)
+
+(autoload 'calendar-beginning-of-month "cal-move"
+ "Move the cursor backward ARG month beginnings."
+ t)
+
+(autoload 'calendar-end-of-month "cal-move"
+ "Move the cursor forward ARG month ends."
+ t)
+
+(autoload 'calendar-beginning-of-year "cal-move"
+ "Move the cursor backward ARG year beginnings."
+ t)
+
+(autoload 'calendar-end-of-year "cal-move"
+ "Move the cursor forward ARG year beginnings."
+ t)
+
+(autoload 'calendar-cursor-to-visible-date "cal-move"
+ "Move the cursor to DATE that is on the screen."
+ t)
+
+(autoload 'calendar-goto-date "cal-move"
+ "Move cursor to DATE."
+ t)
+
+(autoload 'calendar-only-one-frame-setup "cal-x"
+ "Start calendar and display it in a dedicated frame.")
+
+(autoload 'calendar-one-frame-setup "cal-x"
+ "Start calendar and display it in a dedicated frame together with the diary.")
+
+(autoload 'calendar-two-frame-setup "cal-x"
+ "Start calendar and diary in separate, dedicated frames.")
+
+;;;###autoload
+(defvar calendar-setup nil
+ "The frame set up of the calendar.
+The choices are `one-frame' (calendar and diary together in one separate,
+dedicated frame), `two-frames' (calendar and diary in separate, dedicated
+frames), `calendar-only' (calendar in a separate, dedicated frame); with
+any other value the current frame is used.")
+
;;;###autoload
(defun calendar (&optional arg)
+ "Choose between the one frame, two frame, or basic calendar displays.
+If called with an optional prefix argument, prompts for month and year.
+
+The original function `calendar' has been renamed `calendar-basic-setup'.
+See the documentation of that function for more information."
+ (interactive "P")
+ (cond ((equal calendar-setup 'one-frame) (calendar-one-frame-setup arg))
+ ((equal calendar-setup 'two-frames) (calendar-two-frame-setup arg))
+ ((equal calendar-setup 'calendar-only)
+ (calendar-only-one-frame-setup arg))
+ (t (calendar-basic-setup arg))))
+
+(defun calendar-basic-setup (&optional arg)
"Display a three-month calendar in another window.
The three months appear side by side, with the current month in the middle
surrounded by the previous and next months. The cursor is put on today's date.
`number-of-diary-entries' controls the number of days of diary entries
displayed upon initial display of the calendar.
-An optional prefix argument ARG causes the calendar displayed to be ARG
-months in the future if ARG is positive or in the past if ARG is negative;
-in this case the cursor goes on the first day of the month.
-
Once in the calendar window, future or past months can be moved into view.
Arbitrary months can be displayed, or the calendar can be scrolled forward
or backward.
Diary entries can be marked on the calendar or displayed in another window.
-Use M-x describe-mode for details of the key bindings in the calendar window.
+Use \\[describe-mode] for details of the key bindings in the calendar window.
The Gregorian calendar is assumed.
After loading the calendar, the hooks given by the variable
-`calendar-load-hook' are run. This the place to add key bindings to the
+`calendar-load-hook' are run. This is the place to add key bindings to the
calendar-mode-map.
After preparing the calendar window initially, the hooks given by the variable
`initial-calendar-window-hook' are run.
The hooks given by the variable `today-visible-calendar-hook' are run
-everytime the calendar window gets scrolled, if the current date is visible
+every time the calendar window gets scrolled, if the current date is visible
in the window. If it is not visible, the hooks given by the variable
`today-invisible-calendar-hook' are run. Thus, for example, setting
`today-visible-calendar-hook' to 'calendar-star-date will cause today's date
t)
(autoload 'calendar-french-date-string "cal-french"
- "String of French Revolutionary date of Gregorian DATE."
+ "String of French Revolutionary date of Gregorian date."
t)
(autoload 'calendar-mayan-date-string "cal-mayan"
- "String of Mayan date of Gregorian DATE."
+ "String of Mayan date of Gregorian date."
t)
(autoload 'calendar-print-mayan-date "cal-mayan"
t)
(autoload 'calendar-next-calendar-round-date "cal-mayan"
- "Move cursor to next instance of Mayan Haab/Tzoklin combination."
+ "Move cursor to next instance of Mayan Haab/Tzolkin combination."
t)
(autoload 'calendar-previous-calendar-round-date "cal-mayan"
- "Move cursor to previous instance of Mayan Haab/Tzoklin combination."
+ "Move cursor to previous instance of Mayan Haab/Tzolkin combination."
+ t)
+
+(autoload 'calendar-goto-chinese-date "cal-china"
+ "Move cursor to Chinese date."
+ t)
+
+(autoload 'calendar-print-chinese-date "cal-china"
+ "Show the Chinese date equivalents of date."
+ t)
+
+(autoload 'calendar-chinese-date-string "cal-china"
+ "String of Chinese date of Gregorian date."
+ t)
+
+(autoload 'calendar-absolute-from-astro "cal-julian"
+ "Absolute date of astronomical (Julian) day number D."
+ t )
+
+(autoload 'calendar-astro-from-absolute "cal-julian"
+ "Astronomical (Julian) day number of absolute date D.")
+
+(autoload 'calendar-astro-date-string "cal-julian"
+ "String of astronomical (Julian) day number of Gregorian date."
+ t)
+
+(autoload 'calendar-goto-astro-day-number "cal-julian"
+ "Move cursor to astronomical (Julian) day number."
+ t)
+
+(autoload 'calendar-print-astro-day-number "cal-julian"
+ "Show the astro date equivalents of date."
+ t)
+
+(autoload 'calendar-julian-from-absolute "cal-julian"
+ "Compute the Julian (month day year) corresponding to the absolute DATE.
+The absolute date is the number of days elapsed since the (imaginary)
+Gregorian date Sunday, December 31, 1 BC.")
+
+(autoload 'calendar-goto-julian-date "cal-julian"
+ "Move cursor to Julian DATE; echo Julian date unless NOECHO is t."
+ t)
+
+(autoload 'calendar-print-julian-date "cal-julian"
+ "Show the Julian calendar equivalent of the date under the cursor."
+ t)
+
+(autoload 'calendar-julian-date-string "cal-julian"
+ "String of Julian date of Gregorian DATE.
+Defaults to today's date if DATE is not given.
+Driven by the variable `calendar-date-display-form'.")
+
+(autoload 'calendar-goto-iso-date "cal-iso"
+ "Move cursor to ISO date."
+ t)
+
+(autoload 'calendar-print-iso-date "cal-iso"
+ "Show the ISO date equivalents of date."
+ t)
+
+(autoload 'calendar-iso-date-string "cal-iso"
+ "String of ISO date of Gregorian date."
+ t)
+
+(autoload 'calendar-goto-islamic-date "cal-islam"
+ "Move cursor to Islamic date."
+ t)
+
+(autoload 'calendar-print-islamic-date "cal-islam"
+ "Show the Islamic date equivalents of date."
+ t)
+
+(autoload 'calendar-islamic-date-string "cal-islam"
+ "String of Islamic date of Gregorian date."
+ t)
+
+(autoload 'calendar-goto-hebrew-date "cal-hebrew"
+ "Move cursor to Hebrew date date."
+ t)
+
+(autoload 'calendar-print-hebrew-date "cal-hebrew"
+ "Show the Hebrew date equivalents of date."
+ t)
+
+(autoload 'calendar-hebrew-date-string "cal-hebrew"
+ "String of Hebrew date of Gregorian date."
+ t)
+
+(autoload 'calendar-goto-coptic-date "cal-coptic"
+ "Move cursor to Coptic date date."
+ t)
+
+(autoload 'calendar-print-coptic-date "cal-coptic"
+ "Show the Coptic date equivalents of date."
+ t)
+
+(autoload 'calendar-coptic-date-string "cal-coptic"
+ "String of Coptic date of Gregorian date."
+ t)
+
+(autoload 'calendar-goto-ethiopic-date "cal-coptic"
+ "Move cursor to Ethiopic date date."
+ t)
+
+(autoload 'calendar-print-ethiopic-date "cal-coptic"
+ "Show the Ethiopic date equivalents of date."
+ t)
+
+(autoload 'calendar-ethiopic-date-string "cal-coptic"
+ "String of Ethiopic date of Gregorian date."
+ t)
+
+(autoload 'calendar-goto-persian-date "cal-persia"
+ "Move cursor to Persian date date."
+ t)
+
+(autoload 'calendar-print-persian-date "cal-persia"
+ "Show the Persian date equivalents of date."
+ t)
+
+(autoload 'calendar-persian-date-string "cal-persia"
+ "String of Persian date of Gregorian date."
t)
(autoload 'show-all-diary-entries "diary-lib"
Each entry in diary file visible in the calendar window is marked."
t)
-(autoload 'insert-diary-entry "diary-ins"
+(autoload 'make-diary-entry "diary-lib"
+ "Insert a diary entry STRING which may be NONMARKING in FILE."
+ t)
+
+(autoload 'insert-diary-entry "diary-lib"
"Insert a diary entry for the date indicated by point."
t)
-(autoload 'insert-weekly-diary-entry "diary-ins"
+(autoload 'insert-weekly-diary-entry "diary-lib"
"Insert a weekly diary entry for the day of the week indicated by point."
t)
-(autoload 'insert-monthly-diary-entry "diary-ins"
+(autoload 'insert-monthly-diary-entry "diary-lib"
"Insert a monthly diary entry for the day of the month indicated by point."
t)
-(autoload 'insert-yearly-diary-entry "diary-ins"
+(autoload 'insert-yearly-diary-entry "diary-lib"
"Insert an annual diary entry for the day of the year indicated by point."
t)
-(autoload 'insert-anniversary-diary-entry "diary-ins"
+(autoload 'insert-anniversary-diary-entry "diary-lib"
"Insert an anniversary diary entry for the date indicated by point."
t)
-(autoload 'insert-block-diary-entry "diary-ins"
+(autoload 'insert-block-diary-entry "diary-lib"
"Insert a block diary entry for the dates indicated by point and mark."
t)
-(autoload 'insert-cyclic-diary-entry "diary-ins"
+(autoload 'insert-cyclic-diary-entry "diary-lib"
"Insert a cyclic diary entry starting at the date indicated by point."
t)
-(autoload 'insert-hebrew-diary-entry "diary-ins"
+(autoload 'insert-hebrew-diary-entry "cal-hebrew"
"Insert a diary entry for the Hebrew date corresponding to the date
indicated by point."
t)
-(autoload 'insert-monthly-hebrew-diary-entry "diary-ins"
+(autoload 'insert-monthly-hebrew-diary-entry "cal-hebrew"
"Insert a monthly diary entry for the day of the Hebrew month corresponding
to the date indicated by point."
t)
-(autoload 'insert-yearly-hebrew-diary-entry "diary-ins"
+(autoload 'insert-yearly-hebrew-diary-entry "cal-hebrew"
"Insert an annual diary entry for the day of the Hebrew year corresponding
to the date indicated by point."
t)
-(autoload 'insert-islamic-diary-entry "diary-ins"
+(autoload 'insert-islamic-diary-entry "cal-islam"
"Insert a diary entry for the Islamic date corresponding to the date
indicated by point."
t)
-(autoload 'insert-monthly-islamic-diary-entry "diary-ins"
+(autoload 'insert-monthly-islamic-diary-entry "cal-islam"
"Insert a monthly diary entry for the day of the Islamic month corresponding
to the date indicated by point."
t)
-(autoload 'insert-yearly-islamic-diary-entry "diary-ins"
+(autoload 'insert-yearly-islamic-diary-entry "cal-islam"
"Insert an annual diary entry for the day of the Islamic year corresponding
to the date indicated by point."
t)
holidays are found, nil if not."
t)
+(autoload 'cal-tex-cursor-month "cal-tex"
+ "Make a buffer with LaTeX commands for the month cursor is on.
+Optional prefix argument specifies number of months to be produced.
+Calendar is condensed onto one page.")
+
+(autoload 'cal-tex-cursor-month-landscape "cal-tex"
+ "Make a buffer with LaTeX commands for the month cursor is on.
+Optional prefix argument specifies number of months to be produced.")
+
+(autoload 'cal-tex-cursor-day "cal-tex"
+ "Make a buffer with LaTeX commands for the day cursor is on.")
+
+(autoload 'cal-tex-cursor-week "cal-tex"
+ "Make a buffer with LaTeX commands for a two-page one-week calendar.
+It applies to the week that point is in.
+Optional prefix argument specifies number of weeks.
+Holidays are included if `cal-tex-holidays' is t.")
+
+(autoload 'cal-tex-cursor-week2 "cal-tex"
+ "Make a buffer with LaTeX commands for a two-page one-week calendar.
+It applies to the week that point is in.
+Optional prefix argument specifies number of weeks.
+Holidays are included if `cal-tex-holidays' is t.")
+
+(autoload 'cal-tex-cursor-week-iso "cal-tex"
+ "Make a buffer with LaTeX commands for a one page ISO-style weekly calendar.
+Optional prefix argument specifies number of weeks.
+Diary entries are included if `cal-tex-diary' is t.
+Holidays are included if `cal-tex-holidays' is t.")
+
+(autoload 'cal-tex-cursor-week-monday "cal-tex"
+ "Make a buffer with LaTeX commands for a two-page one-week calendar.
+It applies to the week that point is in, and starts on Monday.
+Optional prefix argument specifies number of weeks.
+Holidays are included if `cal-tex-holidays' is t.")
+
+(autoload 'cal-tex-cursor-filofax-2week "cal-tex"
+ "Two-weeks-at-a-glance Filofax style calendar for week indicated by cursor.
+Optional prefix argument specifies number of weeks.
+Diary entries are included if cal-tex-diary is t.
+Holidays are included if `cal-tex-holidays' is t.")
+
+(autoload 'cal-tex-cursor-filofax-week "cal-tex"
+ "One-week-at-a-glance Filofax style calendar for week indicated by cursor.
+Optional prefix argument specifies number of weeks.
+Weeks start on Monday.
+Diary entries are included if cal-tex-diary is t.
+Holidays are included if `cal-tex-holidays' is t.")
+
+(autoload 'cal-tex-cursor-filofax-daily "cal-tex"
+ "Day-per-page Filofax style calendar for week indicated by cursor.
+Optional prefix argument specifies number of weeks. Weeks start on Monday.
+Diary entries are included if `cal-tex-diary' is t.
+Holidays are included if `cal-tex-holidays' is t.")
+
+(autoload 'cal-tex-cursor-year "cal-tex"
+ "Make a buffer with LaTeX commands for a year's calendar.
+Optional prefix argument specifies number of years.")
+
+(autoload 'cal-tex-cursor-year-landscape "cal-tex"
+ "Make a buffer with LaTeX commands for a year's calendar (landscape).
+Optional prefix argument specifies number of years.")
+
+(autoload 'cal-tex-cursor-filofax-year "cal-tex"
+ "Make a buffer with LaTeX commands for a year's calendar (Filofax).
+Optional prefix argument specifies number of years.")
+
(autoload 'mark-calendar-holidays "holidays"
"Mark notable days in the calendar window."
t)
(calendar-cursor-to-visible-date
(if today-visible today (list displayed-month 1 displayed-year)))
(set-buffer-modified-p nil)
- (or (one-window-p t)
- (/= (frame-width) (window-width))
- (shrink-window (- (window-height) 9)))
+ (if (or (one-window-p t) (/= (frame-width) (window-width)))
+ ;; Don't mess with the window size, but ensure that the first
+ ;; line is fully visible
+ (set-window-vscroll nil 0)
+ ;; Adjust the window to exactly fit the displayed calendar
+ (fit-window-to-buffer))
(sit-for 0)
+ (if (and (boundp 'font-lock-mode)
+ font-lock-mode)
+ (font-lock-fontify-buffer))
(and mark-holidays-in-calendar
(mark-calendar-holidays)
(sit-for 0))
(defun generate-calendar (month year)
"Generate a three-month Gregorian calendar centered around MONTH, YEAR."
(if (< (+ month (* 12 (1- year))) 2)
- (error "Months before February, 1 AD are not available."))
+ (error "Months before February, 1 AD are not available"))
(setq displayed-month month)
(setq displayed-year year)
(erase-buffer)
(defun generate-calendar-month (month year indent)
"Produce a calendar for MONTH, YEAR on the Gregorian calendar.
-The calendar is inserted in the buffer starting at the line on which point
-is currently located, but indented INDENT spaces. The indentation is done
-from the first character on the line and does not disturb the first INDENT
-characters on the line."
+The calendar is inserted at the top of the buffer in which point is currently
+located, but indented INDENT spaces. The indentation is done from the first
+character on the line and does not disturb the first INDENT characters on the
+line."
(let* ((blank-days;; at start of month
(mod
(- (calendar-day-of-week (list month 1 year))
(goto-char (point-min))
(calendar-insert-indented
(calendar-string-spread
- (list "" (format "%s %d" (calendar-month-name month) year) "") ? 20)
+ (list (format "%s %d" (calendar-month-name month) year)) ? 20)
indent t)
(calendar-insert-indented "" indent);; Go to proper spot
+ ;; Use the first two characters of each day to head the columns.
(calendar-for-loop i from 0 to 6 do
- (insert (substring (aref calendar-day-name-array
- (mod (+ calendar-week-start-day i) 7))
- 0 2))
- (insert " "))
+ (insert
+ (let ((string
+ (calendar-day-name (mod (+ calendar-week-start-day i) 7) nil t)))
+ (if enable-multibyte-characters
+ (truncate-string-to-width string 2)
+ (substring string 0 2)))
+ " "))
(calendar-insert-indented "" 0 t);; Force onto following line
(calendar-insert-indented "" indent);; Go to proper spot
;; Add blank days before the first of the month
;; Put in the days of the month
(calendar-for-loop i from 1 to last do
(insert (format "%2d " i))
- (put-text-property (- (point) (if (< i 10) 2 3)) (1- (point))
- 'mouse-face 'highlight)
+ (add-text-properties
+ (- (point) 3) (1- (point))
+ '(mouse-face highlight
+ help-echo "mouse-2: menu of operations for this date"))
(and (zerop (mod (+ i blank-days) 7))
(/= i last)
(calendar-insert-indented "" 0 t) ;; Force onto following line
(defun redraw-calendar ()
"Redraw the calendar display."
(interactive)
- (let ((cursor-date (calendar-cursor-to-date)))
+ (let ((cursor-date (calendar-cursor-to-nearest-date)))
(generate-calendar-window displayed-month displayed-year)
(calendar-cursor-to-visible-date cursor-date)))
-(defvar calendar-debug-sexp nil
- "*Turn debugging on when evaluating a sexp in the diary or holiday list.")
+(defcustom calendar-debug-sexp nil
+ "*Turn debugging on when evaluating a sexp in the diary or holiday list."
+ :type 'boolean
+ :group 'calendar)
(defvar calendar-mode-map nil)
(if calendar-mode-map
nil
(setq calendar-mode-map (make-sparse-keymap))
- (if window-system (require 'cal-menu))
+ (require 'cal-menu)
(calendar-for-loop i from 0 to 9 do
(define-key calendar-mode-map (int-to-string i) 'digit-argument))
- ;; kill-region and copy-region-as-kill are omitted from this list
- ;; because they cause an ugly second pane in the Edit menu.
(let ((l (list 'narrow-to-region 'mark-word 'mark-sexp 'mark-paragraph
'mark-defun 'mark-whole-buffer 'mark-page
- 'downcase-region 'upcase-region
- 'capitalize-region 'write-region)))
-
+ 'downcase-region 'upcase-region 'kill-region
+ 'copy-region-as-kill 'capitalize-region 'write-region)))
(while l
(substitute-key-definition (car l) 'calendar-not-implemented
calendar-mode-map global-map)
(define-key calendar-mode-map "\e>" 'calendar-end-of-year)
(define-key calendar-mode-map "\C-@" 'calendar-set-mark)
;; Many people are used to typing C-SPC and getting C-@.
- (define-key calendar-mode-map [?\C-\ ] 'calendar-set-mark)
+ (define-key calendar-mode-map [?\C- ] 'calendar-set-mark)
(define-key calendar-mode-map "\C-x\C-x" 'calendar-exchange-point-and-mark)
(define-key calendar-mode-map "\e=" 'calendar-count-days-region)
(define-key calendar-mode-map "gd" 'calendar-goto-date)
(define-key calendar-mode-map "ga" 'calendar-goto-astro-day-number)
(define-key calendar-mode-map "gh" 'calendar-goto-hebrew-date)
(define-key calendar-mode-map "gi" 'calendar-goto-islamic-date)
+ (define-key calendar-mode-map "gC" 'calendar-goto-chinese-date)
+ (define-key calendar-mode-map "gk" 'calendar-goto-coptic-date)
+ (define-key calendar-mode-map "ge" 'calendar-goto-ethiopic-date)
+ (define-key calendar-mode-map "gp" 'calendar-goto-persian-date)
(define-key calendar-mode-map "gc" 'calendar-goto-iso-date)
(define-key calendar-mode-map "gf" 'calendar-goto-french-date)
(define-key calendar-mode-map "gml" 'calendar-goto-mayan-long-count-date)
(define-key calendar-mode-map "gmnh" 'calendar-next-haab-date)
(define-key calendar-mode-map "gmpt" 'calendar-previous-tzolkin-date)
(define-key calendar-mode-map "gmnt" 'calendar-next-tzolkin-date)
+ (define-key calendar-mode-map "Aa" 'appt-add)
+ (define-key calendar-mode-map "Ad" 'appt-delete)
(define-key calendar-mode-map "S" 'calendar-sunrise-sunset)
(define-key calendar-mode-map "M" 'calendar-phases-of-moon)
(define-key calendar-mode-map " " 'scroll-other-window)
(define-key calendar-mode-map "u" 'calendar-unmark)
(define-key calendar-mode-map "m" 'mark-diary-entries)
(define-key calendar-mode-map "d" 'view-diary-entries)
+ (define-key calendar-mode-map "D" 'view-other-diary-entries)
(define-key calendar-mode-map "s" 'show-all-diary-entries)
(define-key calendar-mode-map "pd" 'calendar-print-day-of-year)
+ (define-key calendar-mode-map "pC" 'calendar-print-chinese-date)
+ (define-key calendar-mode-map "pk" 'calendar-print-coptic-date)
+ (define-key calendar-mode-map "pe" 'calendar-print-ethiopic-date)
+ (define-key calendar-mode-map "pp" 'calendar-print-persian-date)
(define-key calendar-mode-map "pc" 'calendar-print-iso-date)
(define-key calendar-mode-map "pj" 'calendar-print-julian-date)
(define-key calendar-mode-map "pa" 'calendar-print-astro-day-number)
(define-key calendar-mode-map "pi" 'calendar-print-islamic-date)
(define-key calendar-mode-map "pf" 'calendar-print-french-date)
(define-key calendar-mode-map "pm" 'calendar-print-mayan-date)
+ (define-key calendar-mode-map "po" 'calendar-print-other-dates)
(define-key calendar-mode-map "id" 'insert-diary-entry)
(define-key calendar-mode-map "iw" 'insert-weekly-diary-entry)
(define-key calendar-mode-map "im" 'insert-monthly-diary-entry)
(define-key calendar-mode-map "iid" 'insert-islamic-diary-entry)
(define-key calendar-mode-map "iim" 'insert-monthly-islamic-diary-entry)
(define-key calendar-mode-map "iiy" 'insert-yearly-islamic-diary-entry)
- (define-key calendar-mode-map "?" 'calendar-goto-info-node))
+ (define-key calendar-mode-map "?" 'calendar-goto-info-node)
+ (define-key calendar-mode-map "tm" 'cal-tex-cursor-month)
+ (define-key calendar-mode-map "tM" 'cal-tex-cursor-month-landscape)
+ (define-key calendar-mode-map "td" 'cal-tex-cursor-day)
+ (define-key calendar-mode-map "tw1" 'cal-tex-cursor-week)
+ (define-key calendar-mode-map "tw2" 'cal-tex-cursor-week2)
+ (define-key calendar-mode-map "tw3" 'cal-tex-cursor-week-iso)
+ (define-key calendar-mode-map "tw4" 'cal-tex-cursor-week-monday)
+ (define-key calendar-mode-map "tfd" 'cal-tex-cursor-filofax-daily)
+ (define-key calendar-mode-map "tfw" 'cal-tex-cursor-filofax-2week)
+ (define-key calendar-mode-map "tfW" 'cal-tex-cursor-filofax-week)
+ (define-key calendar-mode-map "tfy" 'cal-tex-cursor-filofax-year)
+ (define-key calendar-mode-map "ty" 'cal-tex-cursor-year)
+ (define-key calendar-mode-map "tY" 'cal-tex-cursor-year-landscape))
(defun describe-calendar-mode ()
- "Create a help buffer with a brief description of the calendar-mode."
+ "Create a help buffer with a brief description of the `calendar-mode'."
(interactive)
(with-output-to-temp-buffer "*Help*"
(princ
(substitute-command-keys
"\\<calendar-mode-map>\\[describe-mode] from within the calendar")
(substitute-command-keys "\\{calendar-mode-map}")))
+ (save-excursion
+ (set-buffer standard-output)
+ (help-mode))
(print-help-return-message)))
;; Calendar mode is suitable only for specially formatted data.
(defvar calendar-mode-line-format
(list
- (substitute-command-keys "\\<calendar-mode-map>\\[scroll-calendar-left]")
+ (propertize (substitute-command-keys
+ "\\<calendar-mode-map>\\[scroll-calendar-left]")
+ 'help-echo "mouse-2: scroll left"
+ 'keymap (make-mode-line-mouse-map 'mouse-2
+ 'mouse-scroll-calendar-left))
"Calendar"
- (substitute-command-keys "\\<calendar-mode-map>\\[calendar-goto-info-node] info/\\[calendar-other-month] other/\\[calendar-goto-today] today")
+ (concat
+ (propertize
+ (substitute-command-keys
+ "\\<calendar-mode-map>\\[calendar-goto-info-node] info")
+ 'help-echo "mouse-2: read Info on Calendar"
+ 'keymap (make-mode-line-mouse-map 'mouse-2 'calendar-goto-info-node))
+ "/"
+ (propertize
+ (substitute-command-keys
+ "\\<calendar-mode-map>\\[calendar-other-month] other")
+ 'help-echo "mouse-2: choose another month"
+ 'keymap (make-mode-line-mouse-map
+ 'mouse-2 'mouse-calendar-other-month))
+ "/"
+ (propertize
+ (substitute-command-keys
+ "\\<calendar-mode-map>\\[calendar-goto-today] today")
+ 'help-echo "mouse-2: go to today's date"
+ 'keymap (make-mode-line-mouse-map 'mouse-2 #'calendar-goto-today)))
'(calendar-date-string (calendar-current-date) t)
- (substitute-command-keys "\\<calendar-mode-map>\\[scroll-calendar-right]"))
- "The mode line of the calendar buffer.")
+ (propertize (substitute-command-keys
+ "\\<calendar-mode-map>\\[scroll-calendar-right]")
+ 'help-echo "mouse-2: scroll right"
+ 'keymap (make-mode-line-mouse-map
+ 'mouse-2 'mouse-scroll-calendar-right)))
+ "The mode line of the calendar buffer.
+
+This must be a list of items that evaluate to strings--those strings are
+evaluated and concatenated together, evenly separated by blanks. The variable
+`date' is available for use as the date under (or near) the cursor; `date'
+defaults to the current date if it is otherwise undefined. Here is an example
+value that has the Hebrew date, the day number/days remaining in the year,
+and the ISO week/year numbers in the mode. When calendar-move-hook is set to
+'update-calendar-mode-line, these mode line shows these values for the date
+under the cursor:
+
+ (list
+ \"\"
+ '(calendar-hebrew-date-string date)
+ '(let* ((year (extract-calendar-year date))
+ (d (calendar-day-number date))
+ (days-remaining
+ (- (calendar-day-number (list 12 31 year)) d)))
+ (format \"%d/%d\" d days-remaining))
+ '(let* ((d (calendar-absolute-from-gregorian date))
+ (iso-date (calendar-iso-from-absolute d)))
+ (format \"ISO week %d of %d\"
+ (extract-calendar-month iso-date)
+ (extract-calendar-year iso-date)))
+ \"\"))
+")
+
+(defun mouse-scroll-calendar-left (event)
+ "Scroll the displayed calendar left by one month.
+Maintains the relative position of the cursor
+with respect to the calendar as well as possible."
+ (interactive "e")
+ (save-selected-window
+ (select-window (posn-window (event-start event)))
+ (scroll-calendar-left 1)))
+
+(defun mouse-scroll-calendar-right (event)
+ "Scroll the displayed calendar right by one month.
+Maintains the relative position of the cursor
+with respect to the calendar as well as possible."
+ (interactive "e")
+ (save-selected-window
+ (select-window (posn-window (event-start event)))
+ (scroll-calendar-right 1)))
+
+(defun mouse-calendar-other-month (event)
+ "Display a three-month calendar centered around a specified month and year."
+ (interactive "e")
+ (save-selected-window
+ (select-window (posn-window (event-start event)))
+ (call-interactively 'calendar-other-month)))
(defun calendar-goto-info-node ()
"Go to the info node for the calendar."
(interactive)
(require 'info)
- (let ((where (Info-find-emacs-command-nodes 'calendar)))
+ (let ((where (save-window-excursion
+ (Info-find-emacs-command-nodes 'calendar))))
(if (not where)
- (error "Couldn't find documentation for the calendar.")
- (save-window-excursion (info))
- (pop-to-buffer "*info*")
+ (error "Couldn't find documentation for the calendar")
+ (let (same-window-buffer-names)
+ (info))
(Info-find-node (car (car where)) (car (cdr (car where)))))))
+
+
(defun calendar-mode ()
"A major mode for the calendar window.
(setq buffer-read-only t)
(setq indent-tabs-mode nil)
(update-calendar-mode-line)
+ (add-hook 'activate-menubar-hook 'cal-menu-update nil t)
(make-local-variable 'calendar-mark-ring)
(make-local-variable 'displayed-month);; Month in middle of window.
- (make-local-variable 'displayed-year));; Year in middle of window.
+ (make-local-variable 'displayed-year) ;; Year in middle of window.
+ (set (make-local-variable 'font-lock-defaults)
+ '(calendar-font-lock-keywords t)))
(defun calendar-string-spread (strings char length)
- "Concatenate list of STRINGS separated with copies of CHAR to fill LENGTH
-There must be at least 2 strings. The effect is like mapconcat but the
-separating pieces are as balanced as possible. Each item of STRINGS is
-evaluated before concatenation so it can actually be an expression that
-evaluates to a string. If LENGTH is too short, the STRINGS are just
-concatenated and the result truncated."
+ "Concatenate list of STRINGS separated with copies of CHAR to fill LENGTH.
+The effect is like mapconcat but the separating pieces are as balanced as
+possible. Each item of STRINGS is evaluated before concatenation so it can
+actually be an expression that evaluates to a string. If LENGTH is too short,
+the STRINGS are just concatenated and the result truncated."
;; The algorithm is based on equation (3.25) on page 85 of Concrete
;; Mathematics by Ronald L. Graham, Donald E. Knuth, and Oren Patashnik,
;; Addison-Wesley, Reading, MA, 1989
- (let* ((strings (mapcar 'eval strings))
+ (let* ((strings (mapcar 'eval
+ (if (< (length strings) 2)
+ (append (list "") strings (list ""))
+ strings)))
(n (- length (length (apply 'concat strings))))
(m (1- (length strings)))
(s (car strings))
(set-buffer calendar-buffer)
(setq mode-line-format
(calendar-string-spread
- calendar-mode-line-format ? (frame-width))))))
+ (let ((date (condition-case nil
+ (calendar-cursor-to-nearest-date)
+ (error (calendar-current-date)))))
+ (mapcar 'eval calendar-mode-line-format))
+ ? (frame-width)))
+ (force-mode-line-update))))
(defun calendar-window-list ()
"List of all calendar-related windows."
(let ((calendar-buffers (calendar-buffer-list))
list)
- (walk-windows '(lambda (w)
- (if (memq (window-buffer w) calendar-buffers)
- (setq list (cons w list))))
+ (walk-windows (lambda (w)
+ (if (memq (window-buffer w) calendar-buffers)
+ (setq list (cons w list))))
nil t)
list))
"List of all calendar-related buffers."
(let* ((diary-buffer (get-file-buffer diary-file))
(buffers (list "*Yahrzeits*" lunar-phases-buffer holiday-buffer
- fancy-diary-buffer diary-buffer calendar-buffer))
+ fancy-diary-buffer diary-buffer calendar-buffer
+ other-calendars-buffer))
(buffer-list nil)
b)
(while buffers
"Get out of the calendar window and hide it and related buffers."
(interactive)
(let* ((diary-buffer (get-file-buffer diary-file)))
- (if (and diary-buffer (buffer-modified-p diary-buffer)
- (not
- (yes-or-no-p
- "Diary modified; do you really want to exit the calendar? ")))
- (error)
+ (if (or (not diary-buffer)
+ (not (buffer-modified-p diary-buffer))
+ (yes-or-no-p
+ "Diary modified; do you really want to exit the calendar? "))
;; Need to do this multiple times because one time can replace some
;; calendar-related buffers with other calendar-related buffers
(mapcar (lambda (x)
(let ((buffer (if (window-live-p window) (window-buffer window))))
(if (memq buffer (calendar-buffer-list))
(cond
- ((and window-system
+ ((and (display-multi-frame-p)
(eq 'icon (cdr (assoc 'visibility
(frame-parameters
(window-frame window))))))
nil)
- ((and window-system (window-dedicated-p window))
- (iconify-frame (window-frame window)))
+ ((and (display-multi-frame-p) (window-dedicated-p window))
+ (if calendar-remove-frame-by-deleting
+ (delete-frame (window-frame window))
+ (iconify-frame (window-frame window))))
((not (and (select-window window) (one-window-p window)))
(delete-window window))
(t (set-buffer buffer)
(bury-buffer))))))
-(defun calendar-goto-today ()
- "Reposition the calendar window so the current date is visible."
- (interactive)
- (let ((today (calendar-current-date)));; The date might have changed.
- (if (not (calendar-date-is-visible-p today))
- (generate-calendar-window)
- (update-calendar-mode-line)
- (calendar-cursor-to-visible-date today))))
-
-(defun calendar-forward-month (arg)
- "Move the cursor forward ARG months.
-Movement is backward if ARG is negative."
- (interactive "p")
- (calendar-cursor-to-nearest-date)
- (let* ((cursor-date (calendar-cursor-to-date t))
- (month (extract-calendar-month cursor-date))
- (day (extract-calendar-day cursor-date))
- (year (extract-calendar-year cursor-date)))
- (increment-calendar-month month year arg)
- (let ((last (calendar-last-day-of-month month year)))
- (if (< last day)
- (setq day last)))
- ;; Put the new month on the screen, if needed, and go to the new date.
- (let ((new-cursor-date (list month day year)))
- (if (not (calendar-date-is-visible-p new-cursor-date))
- (calendar-other-month month year))
- (calendar-cursor-to-visible-date new-cursor-date))))
-
-(defun calendar-forward-year (arg)
- "Move the cursor forward by ARG years.
-Movement is backward if ARG is negative."
- (interactive "p")
- (calendar-forward-month (* 12 arg)))
-
-(defun calendar-backward-month (arg)
- "Move the cursor backward by ARG months.
-Movement is forward if ARG is negative."
- (interactive "p")
- (calendar-forward-month (- arg)))
-
-(defun calendar-backward-year (arg)
- "Move the cursor backward ARG years.
-Movement is forward is ARG is negative."
- (interactive "p")
- (calendar-forward-month (* -12 arg)))
-
-(defun scroll-calendar-left (arg)
- "Scroll the displayed calendar left by ARG months.
-If ARG is negative the calendar is scrolled right. Maintains the relative
-position of the cursor with respect to the calendar as well as possible."
- (interactive "p")
- (calendar-cursor-to-nearest-date)
- (let ((old-date (calendar-cursor-to-date))
- (today (calendar-current-date)))
- (if (/= arg 0)
- (progn
- (increment-calendar-month displayed-month displayed-year arg)
- (generate-calendar-window displayed-month displayed-year)
- (calendar-cursor-to-visible-date
- (cond
- ((calendar-date-is-visible-p old-date) old-date)
- ((calendar-date-is-visible-p today) today)
- (t (list displayed-month 1 displayed-year))))))))
-
-(defun scroll-calendar-right (arg)
- "Scroll the displayed calendar window right by ARG months.
-If ARG is negative the calendar is scrolled left. Maintains the relative
-position of the cursor with respect to the calendar as well as possible."
- (interactive "p")
- (scroll-calendar-left (- arg)))
-
-(defun scroll-calendar-left-three-months (arg)
- "Scroll the displayed calendar window left by 3*ARG months.
-If ARG is negative the calendar is scrolled right. Maintains the relative
-position of the cursor with respect to the calendar as well as possible."
- (interactive "p")
- (scroll-calendar-left (* 3 arg)))
-
-(defun scroll-calendar-right-three-months (arg)
- "Scroll the displayed calendar window right by 3*ARG months.
-If ARG is negative the calendar is scrolled left. Maintains the relative
-position of the cursor with respect to the calendar as well as possible."
- (interactive "p")
- (scroll-calendar-left (* -3 arg)))
-
(defun calendar-current-date ()
- "Returns the current date in a list (month day year)."
- (let ((s (current-time-string)))
- (list (length (member (substring s 4 7)
- '("Dec" "Nov" "Oct" "Sep" "Aug" "Jul"
- "Jun" "May" "Apr" "Mar" "Feb" "Jan")))
- (string-to-number (substring s 8 10))
- (string-to-number (substring s 20 24)))))
+ "Return the current date in a list (month day year)."
+ (let ((now (decode-time)))
+ (list (nth 4 now) (nth 3 now) (nth 5 now))))
(defun calendar-cursor-to-date (&optional error)
- "Returns a list (month day year) of current cursor position.
+ "Return a list (month day year) of current cursor position.
If cursor is not on a specific date, signals an error if optional parameter
ERROR is t, otherwise just returns nil."
(let* ((segment (/ (current-column) 25))
((and (= 12 month) (= segment 0)) (1- displayed-year))
((and (= 1 month) (= segment 2)) (1+ displayed-year))
(t displayed-year))))
- (if (and (looking-at "[0-9]")
+ (if (and (looking-at "[ 0-9]?[0-9][^0-9]")
(< 2 (count-lines (point-min) (point))))
(save-excursion
- (re-search-backward "[^0-9]")
+ (if (not (looking-at " "))
+ (re-search-backward "[^0-9]"))
(list month
(string-to-int (buffer-substring (1+ (point)) (+ 4 (point))))
year))
(if error (error "Not on a date!"))))
(if error (error "Not on a date!"))))))
-(defun calendar-cursor-to-nearest-date ()
- "Move the cursor to the closest date.
-The position of the cursor is unchanged if it is already on a date.
-Returns the list (month day year) giving the cursor position."
- (let ((date (calendar-cursor-to-date))
- (column (current-column)))
- (if date
- date
- (if (> 3 (count-lines (point-min) (point)))
- (progn
- (goto-line 3)
- (move-to-column column)))
- (if (not (looking-at "[0-9]"))
- (if (and (not (looking-at " *$"))
- (or (< column 25)
- (and (> column 27)
- (< column 50))
- (and (> column 52)
- (< column 75))))
- (progn
- (re-search-forward "[0-9]" nil t)
- (backward-char 1))
- (re-search-backward "[0-9]" nil t)))
- (calendar-cursor-to-date))))
-
-(defun calendar-forward-day (arg)
- "Move the cursor forward ARG days.
-Moves backward if ARG is negative."
- (interactive "p")
- (if (/= 0 arg)
- (let*
- ((cursor-date (calendar-cursor-to-date))
- (cursor-date (if cursor-date
- cursor-date
- (if (> arg 0) (setq arg (1- arg)))
- (calendar-cursor-to-nearest-date)))
- (new-cursor-date
- (calendar-gregorian-from-absolute
- (+ (calendar-absolute-from-gregorian cursor-date) arg)))
- (new-display-month (extract-calendar-month new-cursor-date))
- (new-display-year (extract-calendar-year new-cursor-date)))
- ;; Put the new month on the screen, if needed, and go to the new date.
- (if (not (calendar-date-is-visible-p new-cursor-date))
- (calendar-other-month new-display-month new-display-year))
- (calendar-cursor-to-visible-date new-cursor-date))))
-
-(defun calendar-backward-day (arg)
- "Move the cursor back ARG days.
-Moves forward if ARG is negative."
- (interactive "p")
- (calendar-forward-day (- arg)))
-
-(defun calendar-forward-week (arg)
- "Move the cursor forward ARG weeks.
-Moves backward if ARG is negative."
- (interactive "p")
- (calendar-forward-day (* arg 7)))
-
-(defun calendar-backward-week (arg)
- "Move the cursor back ARG weeks.
-Moves forward if ARG is negative."
- (interactive "p")
- (calendar-forward-day (* arg -7)))
-
-(defun calendar-beginning-of-week (arg)
- "Move the cursor back ARG calendar-week-start-day's."
- (interactive "p")
- (calendar-cursor-to-nearest-date)
- (let ((day (calendar-day-of-week (calendar-cursor-to-date))))
- (calendar-backward-day
- (if (= day calendar-week-start-day)
- (* 7 arg)
- (+ (mod (- day calendar-week-start-day) 7)
- (* 7 (1- arg)))))))
-
-(defun calendar-end-of-week (arg)
- "Move the cursor forward ARG calendar-week-start-day+6's."
- (interactive "p")
- (calendar-cursor-to-nearest-date)
- (let ((day (calendar-day-of-week (calendar-cursor-to-date))))
- (calendar-forward-day
- (if (= day (mod (1- calendar-week-start-day) 7))
- (* 7 arg)
- (+ (- 6 (mod (- day calendar-week-start-day) 7))
- (* 7 (1- arg)))))))
-
-(defun calendar-beginning-of-month (arg)
- "Move the cursor backward ARG month beginnings."
- (interactive "p")
- (calendar-cursor-to-nearest-date)
- (let* ((date (calendar-cursor-to-date))
- (month (extract-calendar-month date))
- (day (extract-calendar-day date))
- (year (extract-calendar-year date)))
- (if (= day 1)
- (calendar-backward-month arg)
- (calendar-cursor-to-visible-date (list month 1 year))
- (calendar-backward-month (1- arg)))))
-
-(defun calendar-end-of-month (arg)
- "Move the cursor forward ARG month ends."
- (interactive "p")
- (calendar-cursor-to-nearest-date)
- (let* ((date (calendar-cursor-to-date))
- (month (extract-calendar-month date))
- (day (extract-calendar-day date))
- (year (extract-calendar-year date))
- (last-day (calendar-last-day-of-month month year)))
- (if (/= day last-day)
- (progn
- (calendar-cursor-to-visible-date (list month last-day year))
- (setq arg (1- arg))))
- (increment-calendar-month month year arg)
- (let ((last-day (list
- month
- (calendar-last-day-of-month month year)
- year)))
- (if (not (calendar-date-is-visible-p last-day))
- (calendar-other-month month year)
- (calendar-cursor-to-visible-date last-day)))))
-
-(defun calendar-beginning-of-year (arg)
- "Move the cursor backward ARG year beginnings."
- (interactive "p")
- (calendar-cursor-to-nearest-date)
- (let* ((date (calendar-cursor-to-date))
- (month (extract-calendar-month date))
- (day (extract-calendar-day date))
- (year (extract-calendar-year date))
- (jan-first (list 1 1 year)))
- (if (and (= day 1) (= 1 month))
- (calendar-backward-month (* 12 arg))
- (if (and (= arg 1)
- (calendar-date-is-visible-p jan-first))
- (calendar-cursor-to-visible-date jan-first)
- (calendar-other-month 1 (- year (1- arg)))))))
-
-(defun calendar-end-of-year (arg)
- "Move the cursor forward ARG year beginnings."
- (interactive "p")
- (calendar-cursor-to-nearest-date)
- (let* ((date (calendar-cursor-to-date))
- (month (extract-calendar-month date))
- (day (extract-calendar-day date))
- (year (extract-calendar-year date))
- (dec-31 (list 12 31 year)))
- (if (and (= day 31) (= 12 month))
- (calendar-forward-month (* 12 arg))
- (if (and (= arg 1)
- (calendar-date-is-visible-p dec-31))
- (calendar-cursor-to-visible-date dec-31)
- (calendar-other-month 12 (- year (1- arg)))
- (calendar-cursor-to-visible-date (list 12 31 displayed-year))))))
-
;; The following version of calendar-gregorian-from-absolute is preferred for
;; reasons of clarity, BUT it's much slower than the version that follows it.
(setq month (1+ month)))
(list month day year)))))
-(defun calendar-cursor-to-visible-date (date)
- "Move the cursor to DATE that is on the screen."
- (let* ((month (extract-calendar-month date))
- (day (extract-calendar-day date))
- (year (extract-calendar-year date))
- (first-of-month-weekday (calendar-day-of-week (list month 1 year))))
- (goto-line (+ 3
- (/ (+ day -1
- (mod
- (- (calendar-day-of-week (list month 1 year))
- calendar-week-start-day)
- 7))
- 7)))
- (move-to-column (+ 6
- (* 25
- (1+ (calendar-interval
- displayed-month displayed-year month year)))
- (* 3 (mod
- (- (calendar-day-of-week date)
- calendar-week-start-day)
- 7))))))
-
(defun calendar-other-month (month year)
"Display a three-month calendar centered around MONTH and YEAR."
(interactive (calendar-read-date 'noday))
value))
(defun calendar-read-date (&optional noday)
- "Prompt for Gregorian date. Returns a list (month day year).
+ "Prompt for Gregorian date. Return a list (month day year).
If optional NODAY is t, does not ask for day, but just returns
-(month nil year); if NODAY is any other non-nil value the value returned is
-(month year) "
+\(month nil year); if NODAY is any other non-nil value the value returned is
+\(month year)"
(let* ((year (calendar-read
"Year (>0): "
- '(lambda (x) (> x 0))
+ (lambda (x) (> x 0))
(int-to-string (extract-calendar-year
(calendar-current-date)))))
(month-array calendar-month-name-array)
(completion-ignore-case t)
- (month (cdr (assoc
- (capitalize
+ (month (cdr (assoc-ignore-case
(completing-read
"Month name: "
(mapcar 'list (append month-array nil))
- nil t))
- (calendar-make-alist month-array 1 'capitalize))))
+ nil t)
+ (calendar-make-alist month-array 1))))
(last (calendar-last-day-of-month month year)))
(if noday
(if (eq noday t)
(list month year))
(list month
(calendar-read (format "Day (1-%d): " last)
- '(lambda (x) (and (< 0 x) (<= x last))))
+ (lambda (x) (and (< 0 x) (<= x last))))
year))))
-(defun calendar-goto-date (date)
- "Move cursor to DATE."
- (interactive (list (calendar-read-date)))
- (let ((month (extract-calendar-month date))
- (year (extract-calendar-year date)))
- (if (not (calendar-date-is-visible-p date))
- (calendar-other-month
- (if (and (= month 1) (= year 1))
- 2
- month)
- year)))
- (calendar-cursor-to-visible-date date))
-
-(defun calendar-goto-julian-date (date &optional noecho)
- "Move cursor to Julian DATE; echo Julian date unless NOECHO is t."
- (interactive
- (let* ((today (calendar-current-date))
- (year (calendar-read
- "Julian calendar year (>0): "
- '(lambda (x) (> x 0))
- (int-to-string
- (extract-calendar-year
- (calendar-julian-from-absolute
- (calendar-absolute-from-gregorian
- today))))))
- (month-array calendar-month-name-array)
- (completion-ignore-case t)
- (month (cdr (assoc
- (capitalize
- (completing-read
- "Julian calendar month name: "
- (mapcar 'list (append month-array nil))
- nil t))
- (calendar-make-alist month-array 1 'capitalize))))
- (last
- (if (and (zerop (% year 4)) (= month 2))
- 29
- (aref [31 28 31 30 31 30 31 31 30 31 30 31] (1- month))))
- (day (calendar-read
- (format "Julian calendar day (%d-%d): "
- (if (and (= year 1) (= month 1)) 3 1) last)
- '(lambda (x)
- (and (< (if (and (= year 1) (= month 1)) 2 0) x)
- (<= x last))))))
- (list (list month day year))))
- (calendar-goto-date (calendar-gregorian-from-absolute
- (calendar-absolute-from-julian date)))
- (or noecho (calendar-print-julian-date)))
-
-(defun calendar-goto-hebrew-date (date &optional noecho)
- "Move cursor to Hebrew DATE; echo Hebrew date unless NOECHO is t."
- (interactive
- (let* ((today (calendar-current-date))
- (year (calendar-read
- "Hebrew calendar year (>3760): "
- '(lambda (x) (> x 3760))
- (int-to-string
- (extract-calendar-year
- (calendar-hebrew-from-absolute
- (calendar-absolute-from-gregorian today))))))
- (month-array (if (hebrew-calendar-leap-year-p year)
- calendar-hebrew-month-name-array-leap-year
- calendar-hebrew-month-name-array-common-year))
- (completion-ignore-case t)
- (month (cdr (assoc
- (capitalize
- (completing-read
- "Hebrew calendar month name: "
- (mapcar 'list (append month-array nil))
- (if (= year 3761)
- '(lambda (x)
- (let ((m (cdr
- (assoc
- (car x)
- (calendar-make-alist
- month-array)))))
- (< 0
- (calendar-absolute-from-hebrew
- (list m
- (hebrew-calendar-last-day-of-month
- m year)
- year))))))
-
- t))
- (calendar-make-alist month-array 1 'capitalize))))
- (last (hebrew-calendar-last-day-of-month month year))
- (first (if (and (= year 3761) (= month 10))
- 18 1))
- (day (calendar-read
- (format "Hebrew calendar day (%d-%d): "
- first last)
- '(lambda (x) (and (<= first x) (<= x last))))))
- (list (list month day year))))
- (calendar-goto-date (calendar-gregorian-from-absolute
- (calendar-absolute-from-hebrew date)))
- (or noecho (calendar-print-hebrew-date)))
-
-(defun calendar-goto-islamic-date (date &optional noecho)
- "Move cursor to Islamic DATE; echo Islamic date unless NOECHO is t."
- (interactive
- (let* ((today (calendar-current-date))
- (year (calendar-read
- "Islamic calendar year (>0): "
- '(lambda (x) (> x 0))
- (int-to-string
- (extract-calendar-year
- (calendar-islamic-from-absolute
- (calendar-absolute-from-gregorian today))))))
- (month-array calendar-islamic-month-name-array)
- (completion-ignore-case t)
- (month (cdr (assoc
- (capitalize
- (completing-read
- "Islamic calendar month name: "
- (mapcar 'list (append month-array nil))
- nil t))
- (calendar-make-alist month-array 1 'capitalize))))
- (last (islamic-calendar-last-day-of-month month year))
- (day (calendar-read
- (format "Islamic calendar day (1-%d): " last)
- '(lambda (x) (and (< 0 x) (<= x last))))))
- (list (list month day year))))
- (calendar-goto-date (calendar-gregorian-from-absolute
- (calendar-absolute-from-islamic date)))
- (or noecho (calendar-print-islamic-date)))
-
-(defun calendar-goto-iso-date (date &optional noecho)
- "Move cursor to ISO DATE; echo ISO date unless NOECHO is t."
- (interactive
- (let* ((today (calendar-current-date))
- (year (calendar-read
- "ISO calendar year (>0): "
- '(lambda (x) (> x 0))
- (int-to-string (extract-calendar-year today))))
- (no-weeks (extract-calendar-month
- (calendar-iso-from-absolute
- (1-
- (calendar-dayname-on-or-before
- 1 (calendar-absolute-from-gregorian
- (list 1 4 (1+ year))))))))
- (week (calendar-read
- (format "ISO calendar week (1-%d): " no-weeks)
- '(lambda (x) (and (> x 0) (<= x no-weeks)))))
- (day (calendar-read
- "ISO day (1-7): "
- '(lambda (x) (and (<= 1 x) (<= x 7))))))
- (list (list week day year))))
- (calendar-goto-date (calendar-gregorian-from-absolute
- (calendar-absolute-from-iso date)))
- (or noecho (calendar-print-iso-date)))
-
(defun calendar-interval (mon1 yr1 mon2 yr2)
"The number of months difference between MON1, YR1 and MON2, YR2."
(+ (* 12 (- yr2 yr1))
(- mon2 mon1)))
-(defun calendar-day-name (date)
- "Returns a string with the name of the day of the week of DATE."
- (aref calendar-day-name-array (calendar-day-of-week date)))
+(defvar calendar-abbrev-length 3
+ "*Length of abbreviations to be used for day and month names.
+See also `calendar-day-abbrev-array' and `calendar-month-abbrev-array'.")
(defvar calendar-day-name-array
- ["Sunday" "Monday" "Tuesday" "Wednesday" "Thursday" "Friday" "Saturday"])
+ ["Sunday" "Monday" "Tuesday" "Wednesday" "Thursday" "Friday" "Saturday"]
+ "*Array of capitalized strings giving, in order, the day names.
+The first two characters of each string will be used to head the
+day columns in the calendar. See also the variable
+`calendar-day-abbrev-array'.")
+
+(defvar calendar-day-abbrev-array
+ [nil nil nil nil nil nil nil]
+ "*Array of capitalized strings giving the abbreviated day names.
+The order should be the same as that of the full names specified
+in `calendar-day-name-array'. These abbreviations may be used
+instead of the full names in the diary file. Do not include a
+trailing `.' in the strings specified in this variable, though
+you may use such in the diary file. If any element of this array
+is nil, then the abbreviation will be constructed as the first
+`calendar-abbrev-length' characters of the corresponding full name.")
(defvar calendar-month-name-array
["January" "February" "March" "April" "May" "June"
- "July" "August" "September" "October" "November" "December"])
-
-(defun calendar-make-alist (sequence &optional start-index filter)
+ "July" "August" "September" "October" "November" "December"]
+ "*Array of capitalized strings giving, in order, the month names.
+See also the variable `calendar-month-abbrev-array'.")
+
+(defvar calendar-month-abbrev-array
+ [nil nil nil nil nil nil nil nil nil nil nil nil]
+ "*Array of capitalized strings giving the abbreviated month names.
+The order should be the same as that of the full names specified
+in `calendar-month-name-array'. These abbreviations are used in
+the calendar menu entries, and can also be used in the diary
+file. Do not include a trailing `.' in the strings specified in
+this variable, though you may use such in the diary file. If any
+element of this array is nil, then the abbreviation will be
+constructed as the first `calendar-abbrev-length' characters of the
+corresponding full name.")
+
+(defun calendar-abbrev-construct (abbrev full &optional period)
+ "Internal calendar function to return a complete abbreviation array.
+ABBREV is an array of abbreviations, FULL the corresponding array
+of full names. The return value is the ABBREV array, with any nil
+elements replaced by the first three characters taken from the
+corresponding element of FULL. If optional argument PERIOD is non-nil,
+each element returned has a final `.' character."
+ (let (elem array)
+ (dotimes (i (length full))
+ (setq elem (or (aref abbrev i)
+ (substring (aref full i) 0 calendar-abbrev-length))
+ elem (format "%s%s" elem (if period "." ""))
+ array (append array (list elem))))
+ (vconcat array)))
+
+(defvar calendar-font-lock-keywords
+ `((,(concat (regexp-opt (mapcar 'identity calendar-month-name-array) t)
+ " -?[0-9]+")
+ . font-lock-function-name-face) ; month and year
+ (,(regexp-opt
+ (list (substring (aref calendar-day-name-array 6) 0 2)
+ (substring (aref calendar-day-name-array 0) 0 2)))
+ ;; Saturdays and Sundays are hilited differently.
+ . font-lock-comment-face)
+ ;; First two chars of each day are used in the calendar.
+ (,(regexp-opt (mapcar (lambda (x) (substring x 0 2)) calendar-day-name-array))
+ . font-lock-reference-face))
+ "Default keywords to highlight in Calendar mode.")
+
+(defun calendar-day-name (date &optional abbrev absolute)
+ "Return a string with the name of the day of the week of DATE.
+DATE should be a list in the format (MONTH DAY YEAR), unless the
+optional argument ABSOLUTE is non-nil, in which case DATE should
+be an integer in the range 0 to 6 corresponding to the day of the
+week. Day names are taken from the variable `calendar-day-name-array',
+unless the optional argument ABBREV is non-nil, in which case
+the variable `calendar-day-abbrev-array' is used."
+ (aref (if abbrev
+ (calendar-abbrev-construct calendar-day-abbrev-array
+ calendar-day-name-array)
+ calendar-day-name-array)
+ (if absolute date (calendar-day-of-week date))))
+
+(defun calendar-make-alist (sequence &optional start-index filter abbrevs)
"Make an assoc list corresponding to SEQUENCE.
-Start at index 1, unless optional START-INDEX is provided.
-If FILTER is provided, apply it to each item in the list."
- (let ((index (if start-index (1- start-index) 0)))
- (mapcar
- '(lambda (x)
- (setq index (1+ index))
- (cons (if filter (funcall filter x) x)
- index))
- (append sequence nil))))
-
-(defun calendar-month-name (month)
- "The name of MONTH."
- (aref calendar-month-name-array (1- month)))
+Each element of sequence will be associated with an integer, starting
+from 1, or from START-INDEX if that is non-nil. If a sequence ABBREVS
+is supplied, the function `calendar-abbrev-construct' is used to
+construct abbreviations corresponding to the elements in SEQUENCE.
+Each abbreviation is entered into the alist with the same
+association index as the full name it represents.
+If FILTER is provided, apply it to each key in the alist."
+ (let ((index 0)
+ (offset (or start-index 1))
+ (aseq (if abbrevs (calendar-abbrev-construct abbrevs sequence)))
+ (aseqp (if abbrevs (calendar-abbrev-construct abbrevs sequence
+ 'period)))
+ alist elem)
+ (dotimes (i (1- (length sequence)) (reverse alist))
+ (setq index (+ i offset)
+ elem (elt sequence i)
+ alist
+ (cons (cons (if filter (funcall filter elem) elem) index) alist))
+ (if aseq
+ (setq elem (elt aseq i)
+ alist (cons (cons (if filter (funcall filter elem) elem)
+ index) alist)))
+ (if aseqp
+ (setq elem (elt aseqp i)
+ alist (cons (cons (if filter (funcall filter elem) elem)
+ index) alist))))))
+
+(defun calendar-month-name (month &optional abbrev)
+ "Return a string with the name of month number MONTH.
+Months are numbered from one. Month names are taken from the
+variable `calendar-month-name-array', unless the optional
+argument ABBREV is non-nil, in which case
+`calendar-month-abbrev-array' is used."
+ (aref (if abbrev
+ (calendar-abbrev-construct calendar-month-abbrev-array
+ calendar-month-name-array)
+ calendar-month-name-array)
+ (1- month)))
(defun calendar-day-of-week (date)
- "Returns the day-of-the-week index of DATE, 0 for Sunday, 1 for Monday, etc."
+ "Return the day-of-the-week index of DATE, 0 for Sunday, 1 for Monday, etc."
(% (calendar-absolute-from-gregorian date) 7))
(defun calendar-unmark ()
(redraw-calendar))
(defun calendar-date-is-visible-p (date)
- "Returns t if DATE is legal and is visible in the calendar window."
+ "Return t if DATE is legal and is visible in the calendar window."
(let ((gap (calendar-interval
displayed-month displayed-year
(extract-calendar-month date) (extract-calendar-year date))))
(and (calendar-date-is-legal-p date) (> 2 gap) (< -2 gap))))
(defun calendar-date-is-legal-p (date)
- "Returns t if DATE is a legal date."
+ "Return t if DATE is a legal date."
(let ((month (extract-calendar-month date))
(day (extract-calendar-day date))
(year (extract-calendar-year date)))
(<= 1 year))))
(defun calendar-date-equal (date1 date2)
- "Returns t if the DATE1 and DATE2 are the same."
+ "Return t if the DATE1 and DATE2 are the same."
(and
(= (extract-calendar-month date1) (extract-calendar-month date2))
(= (extract-calendar-day date1) (extract-calendar-day date2))
(defun mark-visible-calendar-date (date &optional mark)
"Mark DATE in the calendar window with MARK.
-MARK is either a single-character string or a face.
-MARK defaults to diary-entry-marker."
+MARK is a single-character string, a list of face attributes/values, or a face.
+MARK defaults to `diary-entry-marker'."
(if (calendar-date-is-legal-p date)
(save-excursion
(set-buffer calendar-buffer)
(calendar-cursor-to-visible-date date)
- (let ((mark (or mark diary-entry-marker)))
- (if (stringp mark)
- (let ((buffer-read-only nil))
- (forward-char 1)
- (delete-char 1)
- (insert mark)
- (forward-char -2))
- (overlay-put
- (make-overlay (1-(point)) (1+ (point))) 'face mark))))))
+ (let ((mark (or (and (stringp mark) (= (length mark) 1) mark) ; single-char
+ (and (listp mark) (> (length mark) 0) mark) ; attr list
+ (and (facep mark) mark) ; face-name
+ diary-entry-marker)))
+ (if (facep mark)
+ (progn ; face or an attr-list that contained a face
+ (overlay-put
+ (make-overlay (1- (point)) (1+ (point))) 'face mark))
+ (if (and (stringp mark)
+ (= (length mark) 1)) ; single-char
+ (let ((buffer-read-only nil))
+ (forward-char 1)
+ (delete-char 1)
+ (insert mark)
+ (forward-char -2))
+ (progn ; attr list
+ (setq temp-face
+ (make-symbol (apply 'concat "temp-face-"
+ (mapcar '(lambda (sym)
+ (cond ((symbolp sym) (symbol-name sym))
+ ((numberp sym) (int-to-string sym))
+ (t sym))) mark))))
+ (make-face temp-face)
+ ;; Remove :face info from the mark, copy the face info into temp-face
+ (setq faceinfo mark)
+ (while (setq faceinfo (memq :face faceinfo))
+ (copy-face (read (nth 1 faceinfo)) temp-face)
+ (setcar faceinfo nil)
+ (setcar (cdr faceinfo) nil))
+ (setq mark (delq nil mark))
+ ;; Apply the font aspects
+ (apply 'set-face-attribute temp-face nil mark)
+ (overlay-put
+ (make-overlay (1- (point)) (1+ (point))) 'face temp-face))))))))
(defun calendar-star-date ()
"Replace the date under the cursor in the calendar window with asterisks.
-This function can be used with the today-visible-calendar-hook run after the
+This function can be used with the `today-visible-calendar-hook' run after the
calendar window has been prepared."
- (let ((buffer-read-only nil))
- (make-variable-buffer-local 'calendar-starred-day)
+ (let ((inhibit-read-only t))
+ (make-local-variable 'calendar-starred-day)
(forward-char 1)
(setq calendar-starred-day
(string-to-int
(defun calendar-mark-today ()
"Mark the date under the cursor in the calendar window.
-The date is marked with calendar-today-marker. This function can be used with
-the today-visible-calendar-hook run after the calendar window has been
+The date is marked with `calendar-today-marker'. This function can be used with
+the `today-visible-calendar-hook' run after the calendar window has been
prepared."
(mark-visible-calendar-date
(calendar-cursor-to-date)
calendar-today-marker))
(defun calendar-date-compare (date1 date2)
- "Returns t if DATE1 is before DATE2, nil otherwise.
+ "Return t if DATE1 is before DATE2, nil otherwise.
The actual dates are in the car of DATE1 and DATE2."
(< (calendar-absolute-from-gregorian (car date1))
(calendar-absolute-from-gregorian (car date2))))
(defun calendar-date-string (date &optional abbreviate nodayname)
"A string form of DATE, driven by the variable `calendar-date-display-form'.
-An optional parameter ABBREVIATE, when t, causes the month and day names to be
-abbreviated to three characters. An optional parameter NODAYNAME, when t,
-omits the name of the day of the week."
+An optional parameter ABBREVIATE, when non-nil, causes the month
+and day names to be abbreviated as specified by
+`calendar-month-abbrev-array' and `calendar-day-abbrev-array',
+respectively. An optional parameter NODAYNAME, when t, omits the
+name of the day of the week."
(let* ((dayname
- (if nodayname
- nil
- (if abbreviate
- (substring (calendar-day-name date) 0 3)
- (calendar-day-name date))))
+ (unless nodayname
+ (calendar-day-name date abbreviate)))
(month (extract-calendar-month date))
- (monthname
- (if abbreviate
- (substring
- (calendar-month-name month) 0 3)
- (calendar-month-name month)))
+ (monthname (calendar-month-name month abbreviate))
(day (int-to-string (extract-calendar-day date)))
(month (int-to-string month))
(year (int-to-string (extract-calendar-year date))))
(mapconcat 'eval calendar-date-display-form "")))
(defun calendar-dayname-on-or-before (dayname date)
- "Returns the absolute date of the DAYNAME on or before absolute DATE.
+ "Return the absolute date of the DAYNAME on or before absolute DATE.
DAYNAME=0 means Sunday, DAYNAME=1 means Monday, and so on.
Note: Applying this function to d+6 gives us the DAYNAME on or after an
(format "Day %d of %d; %d day%s remaining in the year"
day year days-remaining (if (= days-remaining 1) "" "s"))))
+(defun calendar-print-other-dates ()
+ "Show dates on other calendars for date under the cursor."
+ (interactive)
+ (let* ((date (calendar-cursor-to-date t)))
+ (save-excursion
+ (set-buffer (get-buffer-create other-calendars-buffer))
+ (setq buffer-read-only nil)
+ (calendar-set-mode-line
+ (concat (calendar-date-string date) " (Gregorian)"))
+ (erase-buffer)
+ (insert
+ (mapconcat 'identity
+ (list (calendar-day-of-year-string date)
+ (format "ISO date: %s" (calendar-iso-date-string date))
+ (format "Julian date: %s"
+ (calendar-julian-date-string date))
+ (format
+ "Astronomical (Julian) day number (at noon UTC): %s.0"
+ (calendar-astro-date-string date))
+ (format "Fixed (RD) date: %s"
+ (calendar-absolute-from-gregorian date))
+ (format "Hebrew date (before sunset): %s"
+ (calendar-hebrew-date-string date))
+ (format "Persian date: %s"
+ (calendar-persian-date-string date))
+ (let ((i (calendar-islamic-date-string date)))
+ (if (not (string-equal i ""))
+ (format "Islamic date (before sunset): %s" i)))
+ (format "Chinese date: %s"
+ (calendar-chinese-date-string date))
+ (let ((c (calendar-coptic-date-string date)))
+ (if (not (string-equal c ""))
+ (format "Coptic date: %s" c)))
+ (let ((e (calendar-ethiopic-date-string date)))
+ (if (not (string-equal e ""))
+ (format "Ethiopic date: %s" e)))
+ (let ((f (calendar-french-date-string date)))
+ (if (not (string-equal f ""))
+ (format "French Revolutionary date: %s" f)))
+ (format "Mayan date: %s"
+ (calendar-mayan-date-string date)))
+ "\n"))
+ (goto-char (point-min))
+ (set-buffer-modified-p nil)
+ (setq buffer-read-only t)
+ (display-buffer other-calendars-buffer))))
+
(defun calendar-print-day-of-year ()
"Show day number in year/days remaining in year for date under the cursor."
(interactive)
(message (calendar-day-of-year-string (calendar-cursor-to-date t))))
-(defun calendar-absolute-from-iso (date)
- "The number of days elapsed between the Gregorian date 12/31/1 BC and DATE.
-The `ISO year' corresponds approximately to the Gregorian year, but
-weeks start on Monday and end on Sunday. The first week of the ISO year is
-the first such week in which at least 4 days are in a year. The ISO
-commercial DATE has the form (week day year) in which week is in the range
-1..52 and day is in the range 0..6 (1 = Monday, 2 = Tuesday, ..., 0 =
-Sunday). The Gregorian date Sunday, December 31, 1 BC is imaginary."
- (let* ((week (extract-calendar-month date))
- (day (extract-calendar-day date))
- (year (extract-calendar-year date)))
- (+ (calendar-dayname-on-or-before
- 1 (+ 3 (calendar-absolute-from-gregorian (list 1 1 year))))
- (* 7 (1- week))
- (if (= day 0) 6 (1- day)))))
-
-(defun calendar-iso-from-absolute (date)
- "Compute the `ISO commercial date' corresponding to the absolute DATE.
-The ISO year corresponds approximately to the Gregorian year, but weeks
-start on Monday and end on Sunday. The first week of the ISO year is the
-first such week in which at least 4 days are in a year. The ISO commercial
-date has the form (week day year) in which week is in the range 1..52 and
-day is in the range 0..6 (1 = Monday, 2 = Tuesday, ..., 0 = Sunday). The
-absolute date is the number of days elapsed since the (imaginary) Gregorian
-date Sunday, December 31, 1 BC."
- (let* ((approx (extract-calendar-year
- (calendar-gregorian-from-absolute (- date 3))))
- (year (+ approx
- (calendar-sum y approx
- (>= date (calendar-absolute-from-iso (list 1 1 (1+ y))))
- 1))))
- (list
- (1+ (/ (- date (calendar-absolute-from-iso (list 1 1 year))) 7))
- (% date 7)
- year)))
-
-(defun calendar-iso-date-string (&optional date)
- "String of ISO date of Gregorian DATE.
-Defaults to today's date if DATE is not given."
- (let* ((d (calendar-absolute-from-gregorian
- (or date (calendar-current-date))))
- (day (% d 7))
- (iso-date (calendar-iso-from-absolute d)))
- (format "Day %s of week %d of %d"
- (if (zerop day) 7 day)
- (extract-calendar-month iso-date)
- (extract-calendar-year iso-date))))
-
-(defun calendar-print-iso-date ()
- "Show equivalent ISO date for the date under the cursor."
- (interactive)
- (message "ISO date: %s"
- (calendar-iso-date-string (calendar-cursor-to-date t))))
-
-(defun calendar-julian-from-absolute (date)
- "Compute the Julian (month day year) corresponding to the absolute DATE.
-The absolute date is the number of days elapsed since the (imaginary)
-Gregorian date Sunday, December 31, 1 BC."
- (let* ((approx (/ (+ date 2) 366));; Approximation from below.
- (year ;; Search forward from the approximation.
- (+ approx
- (calendar-sum y approx
- (>= date (calendar-absolute-from-julian (list 1 1 (1+ y))))
- 1)))
- (month ;; Search forward from January.
- (1+ (calendar-sum m 1
- (> date
- (calendar-absolute-from-julian
- (list m
- (if (and (= m 2) (= (% year 4) 0))
- 29
- (aref [31 28 31 30 31 30 31 31 30 31 30 31]
- (1- m)))
- year)))
- 1)))
- (day ;; Calculate the day by subtraction.
- (- date (1- (calendar-absolute-from-julian (list month 1 year))))))
- (list month day year)))
-
-(defun calendar-absolute-from-julian (date)
- "The number of days elapsed between the Gregorian date 12/31/1 BC and DATE.
-The Gregorian date Sunday, December 31, 1 BC is imaginary."
- (let ((month (extract-calendar-month date))
- (day (extract-calendar-day date))
- (year (extract-calendar-year date)))
- (+ (calendar-day-number date)
- (if (and (= (% year 100) 0)
- (/= (% year 400) 0)
- (> month 2))
- 1 0);; Correct for Julian but not Gregorian leap year.
- (* 365 (1- year))
- (/ (1- year) 4)
- -2)))
-
-(defun calendar-julian-date-string (&optional date)
- "String of Julian date of Gregorian DATE.
-Defaults to today's date if DATE is not given.
-Driven by the variable `calendar-date-display-form'."
- (calendar-date-string
- (calendar-julian-from-absolute
- (calendar-absolute-from-gregorian
- (or date (calendar-current-date))))
- nil t))
-
-(defun calendar-print-julian-date ()
- "Show the Julian calendar equivalent of the date under the cursor."
- (interactive)
- (message "Julian date: %s"
- (calendar-julian-date-string (calendar-cursor-to-date t))))
-
-(defun islamic-calendar-leap-year-p (year)
- "Returns t if YEAR is a leap year on the Islamic calendar."
- (memq (% year 30)
- (list 2 5 7 10 13 16 18 21 24 26 29)))
-
-(defun islamic-calendar-last-day-of-month (month year)
- "The last day in MONTH during YEAR on the Islamic calendar."
- (cond
- ((memq month (list 1 3 5 7 9 11)) 30)
- ((memq month (list 2 4 6 8 10)) 29)
- (t (if (islamic-calendar-leap-year-p year) 30 29))))
-
-(defun islamic-calendar-day-number (date)
- "Return the day number within the year of the Islamic date DATE."
- (let* ((month (extract-calendar-month date))
- (day (extract-calendar-day date)))
- (+ (* 30 (/ month 2))
- (* 29 (/ (1- month) 2))
- day)))
-
-(defun calendar-absolute-from-islamic (date)
- "Absolute date of Islamic DATE.
-The absolute date is the number of days elapsed since the (imaginary)
-Gregorian date Sunday, December 31, 1 BC."
- (let* ((month (extract-calendar-month date))
- (day (extract-calendar-day date))
- (year (extract-calendar-year date))
- (y (% year 30))
- (leap-years-in-cycle
- (cond
- ((< y 3) 0) ((< y 6) 1) ((< y 8) 2) ((< y 11) 3) ((< y 14) 4)
- ((< y 17) 5) ((< y 19) 6) ((< y 22) 7) ((< y 25) 8) ((< y 27) 9)
- (t 10))))
- (+ (islamic-calendar-day-number date);; days so far this year
- (* (1- year) 354) ;; days in all non-leap years
- (* 11 (/ year 30)) ;; leap days in complete cycles
- leap-years-in-cycle ;; leap days this cycle
- 227014))) ;; days before start of calendar
-
-(defun calendar-islamic-from-absolute (date)
- "Compute the Islamic date (month day year) corresponding to absolute DATE.
-The absolute date is the number of days elapsed since the (imaginary)
-Gregorian date Sunday, December 31, 1 BC."
- (if (< date 227015)
- (list 0 0 0);; pre-Islamic date
- (let* ((approx (/ (- date 227014) 355));; Approximation from below.
- (year ;; Search forward from the approximation.
- (+ approx
- (calendar-sum y approx
- (>= date (calendar-absolute-from-islamic
- (list 1 1 (1+ y))))
- 1)))
- (month ;; Search forward from Muharram.
- (1+ (calendar-sum m 1
- (> date
- (calendar-absolute-from-islamic
- (list m
- (islamic-calendar-last-day-of-month
- m year)
- year)))
- 1)))
- (day ;; Calculate the day by subtraction.
- (- date
- (1- (calendar-absolute-from-islamic (list month 1 year))))))
- (list month day year))))
-
-(defvar calendar-islamic-month-name-array
- ["Muharram" "Safar" "Rabi I" "Rabi II" "Jumada I" "Jumada II"
- "Rajab" "Sha'ban" "Ramadan" "Shawwal" "Dhu al-Qada" "Dhu al-Hijjah"])
-
-(defun calendar-islamic-date-string (&optional date)
- "String of Islamic date before sunset of Gregorian DATE.
-Returns the empty string if DATE is pre-Islamic.
-Defaults to today's date if DATE is not given.
-Driven by the variable `calendar-date-display-form'."
- (let ((calendar-month-name-array calendar-islamic-month-name-array)
- (islamic-date (calendar-islamic-from-absolute
- (calendar-absolute-from-gregorian
- (or date (calendar-current-date))))))
- (if (< (extract-calendar-year islamic-date) 1)
- ""
- (calendar-date-string islamic-date nil t))))
-
-(defun calendar-print-islamic-date ()
- "Show the Islamic calendar equivalent of the date under the cursor."
- (interactive)
- (let ((i (calendar-islamic-date-string (calendar-cursor-to-date t))))
- (if (string-equal i "")
- (message "Date is pre-Islamic")
- (message "Islamic date (until sunset): %s" i))))
-
-(defun calendar-hebrew-from-absolute (date)
- "Compute the Hebrew date (month day year) corresponding to absolute DATE.
-The absolute date is the number of days elapsed since the (imaginary)
-Gregorian date Sunday, December 31, 1 BC."
- (let* ((greg-date (calendar-gregorian-from-absolute date))
- (month (aref [9 10 11 12 1 2 3 4 7 7 7 8]
- (1- (extract-calendar-month greg-date))))
- (day)
- (year (+ 3760 (extract-calendar-year greg-date))))
- (while (>= date (calendar-absolute-from-hebrew (list 7 1 (1+ year))))
- (setq year (1+ year)))
- (let ((length (hebrew-calendar-last-month-of-year year)))
- (while (> date
- (calendar-absolute-from-hebrew
- (list month
- (hebrew-calendar-last-day-of-month month year)
- year)))
- (setq month (1+ (% month length)))))
- (setq day (1+
- (- date (calendar-absolute-from-hebrew (list month 1 year)))))
- (list month day year)))
-
-(defun hebrew-calendar-leap-year-p (year)
- "t if YEAR is a Hebrew calendar leap year."
- (< (% (1+ (* 7 year)) 19) 7))
-
-(defun hebrew-calendar-last-month-of-year (year)
- "The last month of the Hebrew calendar YEAR."
- (if (hebrew-calendar-leap-year-p year)
- 13
- 12))
-
-(defun hebrew-calendar-last-day-of-month (month year)
- "The last day of MONTH in YEAR."
- (if (or (memq month (list 2 4 6 10 13))
- (and (= month 12) (not (hebrew-calendar-leap-year-p year)))
- (and (= month 8) (not (hebrew-calendar-long-heshvan-p year)))
- (and (= month 9) (hebrew-calendar-short-kislev-p year)))
- 29
- 30))
-
-(defun hebrew-calendar-elapsed-days (year)
- "Days from Sun. prior to start of Hebrew calendar to mean conjunction of Tishri of Hebrew YEAR."
- (let* ((months-elapsed
- (+ (* 235 (/ (1- year) 19));; Months in complete cycles so far.
- (* 12 (% (1- year) 19)) ;; Regular months in this cycle
- (/ (1+ (* 7 (% (1- year) 19))) 19)));; Leap months this cycle
- (parts-elapsed (+ 204 (* 793 (% months-elapsed 1080))))
- (hours-elapsed (+ 5
- (* 12 months-elapsed)
- (* 793 (/ months-elapsed 1080))
- (/ parts-elapsed 1080)))
- (parts ;; Conjunction parts
- (+ (* 1080 (% hours-elapsed 24)) (% parts-elapsed 1080)))
- (day ;; Conjunction day
- (+ 1 (* 29 months-elapsed) (/ hours-elapsed 24)))
- (alternative-day
- (if (or (>= parts 19440) ;; If the new moon is at or after midday,
- (and (= (% day 7) 2);; ...or is on a Tuesday...
- (>= parts 9924) ;; at 9 hours, 204 parts or later...
- (not (hebrew-calendar-leap-year-p year)));; of a
- ;; common year,
- (and (= (% day 7) 1);; ...or is on a Monday...
- (>= parts 16789) ;; at 15 hours, 589 parts or later...
- (hebrew-calendar-leap-year-p (1- year))));; at the end
- ;; of a leap year
- ;; Then postpone Rosh HaShanah one day
- (1+ day)
- ;; Else
- day)))
- (if ;; If Rosh HaShanah would occur on Sunday, Wednesday, or Friday
- (memq (% alternative-day 7) (list 0 3 5))
- ;; Then postpone it one (more) day and return
- (1+ alternative-day)
- ;; Else return
- alternative-day)))
-
-(defun hebrew-calendar-days-in-year (year)
- "Number of days in Hebrew YEAR."
- (- (hebrew-calendar-elapsed-days (1+ year))
- (hebrew-calendar-elapsed-days year)))
-
-(defun hebrew-calendar-long-heshvan-p (year)
- "t if Heshvan is long in Hebrew YEAR."
- (= (% (hebrew-calendar-days-in-year year) 10) 5))
-
-(defun hebrew-calendar-short-kislev-p (year)
- "t if Kislev is short in Hebrew YEAR."
- (= (% (hebrew-calendar-days-in-year year) 10) 3))
-
-(defun calendar-absolute-from-hebrew (date)
- "Absolute date of Hebrew DATE.
-The absolute date is the number of days elapsed since the (imaginary)
-Gregorian date Sunday, December 31, 1 BC."
- (let* ((month (extract-calendar-month date))
- (day (extract-calendar-day date))
- (year (extract-calendar-year date)))
- (+ day ;; Days so far this month.
- (if (< month 7);; before Tishri
- ;; Then add days in prior months this year before and after Nisan
- (+ (calendar-sum
- m 7 (<= m (hebrew-calendar-last-month-of-year year))
- (hebrew-calendar-last-day-of-month m year))
- (calendar-sum
- m 1 (< m month)
- (hebrew-calendar-last-day-of-month m year)))
- ;; Else add days in prior months this year
- (calendar-sum
- m 7 (< m month)
- (hebrew-calendar-last-day-of-month m year)))
- (hebrew-calendar-elapsed-days year);; Days in prior years.
- -1373429))) ;; Days elapsed before absolute date 1.
-
-(defvar calendar-hebrew-month-name-array-common-year
- ["Nisan" "Iyar" "Sivan" "Tammuz" "Av" "Elul" "Tishri"
- "Heshvan" "Kislev" "Teveth" "Shevat" "Adar"])
-
-(defvar calendar-hebrew-month-name-array-leap-year
- ["Nisan" "Iyar" "Sivan" "Tammuz" "Av" "Elul" "Tishri"
- "Heshvan" "Kislev" "Teveth" "Shevat" "Adar I" "Adar II"])
-
-(defun calendar-hebrew-date-string (&optional date)
- "String of Hebrew date before sunset of Gregorian DATE.
-Defaults to today's date if DATE is not given.
-Driven by the variable `calendar-date-display-form'."
- (let* ((hebrew-date (calendar-hebrew-from-absolute
- (calendar-absolute-from-gregorian
- (or date (calendar-current-date)))))
- (calendar-month-name-array
- (if (hebrew-calendar-leap-year-p (extract-calendar-year hebrew-date))
- calendar-hebrew-month-name-array-leap-year
- calendar-hebrew-month-name-array-common-year)))
- (calendar-date-string hebrew-date nil t)))
-
-(defun calendar-print-hebrew-date ()
- "Show the Hebrew calendar equivalent of the date under the cursor."
- (interactive)
- (message "Hebrew date (until sunset): %s"
- (calendar-hebrew-date-string (calendar-cursor-to-date t))))
-
-(defun hebrew-calendar-yahrzeit (death-date year)
- "Absolute date of the anniversary of Hebrew DEATH-DATE in Hebrew YEAR."
- (let* ((death-day (extract-calendar-day death-date))
- (death-month (extract-calendar-month death-date))
- (death-year (extract-calendar-year death-date)))
- (cond
- ;; If it's Heshvan 30 it depends on the first anniversary; if
- ;; that was not Heshvan 30, use the day before Kislev 1.
- ((and (= death-month 8)
- (= death-day 30)
- (not (hebrew-calendar-long-heshvan-p (1+ death-year))))
- (1- (calendar-absolute-from-hebrew (list 9 1 year))))
- ;; If it's Kislev 30 it depends on the first anniversary; if
- ;; that was not Kislev 30, use the day before Teveth 1.
- ((and (= death-month 9)
- (= death-day 30)
- (hebrew-calendar-short-kislev-p (1+ death-year)))
- (1- (calendar-absolute-from-hebrew (list 10 1 year))))
- ;; If it's Adar II, use the same day in last month of
- ;; year (Adar or Adar II).
- ((= death-month 13)
- (calendar-absolute-from-hebrew
- (list (hebrew-calendar-last-month-of-year year) death-day year)))
- ;; If it's the 30th in Adar I and year is not a leap year
- ;; (so Adar has only 29 days), use the last day in Shevat.
- ((and (= death-day 30)
- (= death-month 12)
- (not (hebrew-calendar-leap-year-p year)))
- (calendar-absolute-from-hebrew (list 11 30 year)))
- ;; In all other cases, use the normal anniversary of the date of death.
- (t (calendar-absolute-from-hebrew
- (list death-month death-day year))))))
-
(defun calendar-set-mode-line (str)
"Set mode line to STR, centered, surrounded by dashes."
(setq mode-line-format
- (calendar-string-spread (list "" str "") ?- (frame-width))))
-
-;;;###autoload
-(defun list-yahrzeit-dates (death-date start-year end-year)
- "List Yahrzeit dates for *Gregorian* DEATH-DATE from START-YEAR to END-YEAR.
-When called interactively from the calendar window, the date of death is taken
-from the cursor position."
- (interactive
- (let* ((death-date
- (if (equal (current-buffer) (get-buffer calendar-buffer))
- (calendar-cursor-to-date)
- (let* ((today (calendar-current-date))
- (year (calendar-read
- "Year of death (>0): "
- '(lambda (x) (> x 0))
- (int-to-string (extract-calendar-year today))))
- (month-array calendar-month-name-array)
- (completion-ignore-case t)
- (month (cdr (assoc
- (capitalize
- (completing-read
- "Month of death (name): "
- (mapcar 'list (append month-array nil))
- nil t))
- (calendar-make-alist
- month-array 1 'capitalize))))
- (last (calendar-last-day-of-month month year))
- (day (calendar-read
- (format "Day of death (1-%d): " last)
- '(lambda (x) (and (< 0 x) (<= x last))))))
- (list month day year))))
- (death-year (extract-calendar-year death-date))
- (start-year (calendar-read
- (format "Starting year of Yahrzeit table (>%d): "
- death-year)
- '(lambda (x) (> x death-year))
- (int-to-string (1+ death-year))))
- (end-year (calendar-read
- (format "Ending year of Yahrzeit table (>=%d): "
- start-year)
- '(lambda (x) (>= x start-year)))))
- (list death-date start-year end-year)))
- (message "Computing yahrzeits...")
- (let* ((yahrzeit-buffer "*Yahrzeits*")
- (h-date (calendar-hebrew-from-absolute
- (calendar-absolute-from-gregorian death-date)))
- (h-month (extract-calendar-month h-date))
- (h-day (extract-calendar-day h-date))
- (h-year (extract-calendar-year h-date)))
- (set-buffer (get-buffer-create yahrzeit-buffer))
- (setq buffer-read-only nil)
- (calendar-set-mode-line
- (format "Yahrzeit dates for %s = %s"
- (calendar-date-string death-date)
- (let ((calendar-month-name-array
- (if (hebrew-calendar-leap-year-p h-year)
- calendar-hebrew-month-name-array-leap-year
- calendar-hebrew-month-name-array-common-year)))
- (calendar-date-string h-date nil t))))
- (erase-buffer)
- (goto-char (point-min))
- (calendar-for-loop i from start-year to end-year do
- (insert
- (calendar-date-string
- (calendar-gregorian-from-absolute
- (hebrew-calendar-yahrzeit
- h-date
- (extract-calendar-year
- (calendar-hebrew-from-absolute
- (calendar-absolute-from-gregorian (list 1 1 i))))))) "\n"))
- (goto-char (point-min))
- (set-buffer-modified-p nil)
- (setq buffer-read-only t)
- (display-buffer yahrzeit-buffer)
- (message "Computing yahrzeits...done")))
+ (calendar-string-spread (list str) ?- (frame-width))))
-(defun calendar-astro-date-string (&optional date)
- "String of astronomical (Julian) day number of afternoon of Gregorian DATE.
-Defaults to today's date if DATE is not given."
- (int-to-string
- (+ 1721425 (calendar-absolute-from-gregorian
- (or date (calendar-current-date))))))
-
-(defun calendar-print-astro-day-number ()
- "Show astronomical (Julian) day number of afternoon on date shown by cursor."
- (interactive)
- (message
- "Astronomical (Julian) day number after noon UTC: %s"
- (calendar-astro-date-string (calendar-cursor-to-date t))))
-
-(defun calendar-goto-astro-day-number (daynumber &optional noecho)
- "Move cursor to astronomical (Julian) DAYNUMBER.
-Echo astronomical (Julian) day number unless NOECHO is t."
- (interactive (list (calendar-read
- "Astronomical (Julian) day number (>1721425): "
- '(lambda (x) (> x 1721425)))))
- (calendar-goto-date (calendar-gregorian-from-absolute (- daynumber 1721425)))
- (or noecho (calendar-print-astro-day-number)))
+(defun calendar-mod (m n)
+ "Non-negative remainder of M/N with N instead of 0."
+ (1+ (mod (1- m) n)))
(run-hooks 'calendar-load-hook)
(provide 'calendar)
+;;; Local variables:
+;;; byte-compile-dynamic: t
+;;; End:
+
;;; calendar.el ends here