X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/991a760232de757d71d8dbbed47ee12d81e29d53..0cce3623b169732a51f055a86fc926313b11a5ee:/lisp/calendar/cal-coptic.el?ds=sidebyside diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el index b5cf96949c..54a1fe9bff 100644 --- a/lisp/calendar/cal-coptic.el +++ b/lisp/calendar/cal-coptic.el @@ -1,19 +1,19 @@ ;;; cal-coptic.el --- calendar functions for the Coptic/Ethiopic calendars -;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1997, 2001-2014 Free Software Foundation, Inc. ;; Author: Edward M. Reingold ;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: Coptic calendar, Ethiopic calendar, calendar, diary +;; Package: calendar ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,89 +21,90 @@ ;; 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, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: -;; This collection of functions implements the features of calendar.el and -;; diary.el that deal with the Coptic and Ethiopic calendars. - -;; Technical details of all the calendrical calculations can be found in -;; ``Calendrical Calculations: The Millennium Edition'' by Edward M. Reingold -;; and Nachum Dershowitz, Cambridge University Press (2001). +;; See calendar.el. ;;; Code: -(defvar date) +(require 'calendar) -(require 'cal-julian) +;; Not constants because they get let-bound. -(defvar coptic-calendar-month-name-array +(defvar calendar-coptic-month-name-array ["Tut" "Babah" "Hatur" "Kiyahk" "Tubah" "Amshir" "Baramhat" "Barmundah" - "Bashans" "Baunah" "Abib" "Misra" "al-Nasi"]) + "Bashans" "Baunah" "Abib" "Misra" "al-Nasi"] + "Array of the month names in the Coptic calendar.") -(defvar coptic-calendar-epoch (calendar-absolute-from-julian '(8 29 284)) - "Absolute date of start of Coptic calendar = August 29, 284 A.D. (Julian).") +(eval-and-compile + (autoload 'calendar-julian-to-absolute "cal-julian")) -(defvar coptic-name "Coptic") +(defvar calendar-coptic-epoch + (eval-when-compile (calendar-julian-to-absolute '(8 29 284))) + "Absolute date of start of Coptic calendar = August 29, 284 AD (Julian).") -(defun coptic-calendar-leap-year-p (year) +(defvar calendar-coptic-name "Coptic" + "Used in some message strings.") + +(defun calendar-coptic-leap-year-p (year) "True if YEAR is a leap year on the Coptic calendar." (zerop (mod (1+ year) 4))) -(defun coptic-calendar-last-day-of-month (month year) +(defun calendar-coptic-last-day-of-month (month year) "Return last day of MONTH, YEAR on the Coptic calendar. The 13th month is not really a month, but the 5 (6 in leap years) day period of -Nisi (Kebus) at the end of the year." +Nisi (Kebus) at the end of the year." (if (< month 13) 30 - (if (coptic-calendar-leap-year-p year) + (if (calendar-coptic-leap-year-p year) 6 5))) -(defun calendar-absolute-from-coptic (date) +(defun calendar-coptic-to-absolute (date) "Compute absolute date from Coptic date 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))) - (+ (1- coptic-calendar-epoch);; Days before start of calendar - (* 365 (1- year)) ;; Days in prior years - (/ year 4) ;; Leap days in prior years - (* 30 (1- month)) ;; Days in prior months this year - day))) ;; Days so far this month - + (let ((month (calendar-extract-month date)) + (day (calendar-extract-day date)) + (year (calendar-extract-year date))) + (+ (1- calendar-coptic-epoch) ; days before start of calendar + (* 365 (1- year)) ; days in prior years + (/ year 4) ; leap days in prior years + (* 30 (1- month)) ; days in prior months this year + day))) ; days so far this month (defun calendar-coptic-from-absolute (date) "Compute the Coptic equivalent for absolute date DATE. The result is a list of the form (MONTH DAY YEAR). The absolute date is the number of days elapsed since the imaginary Gregorian date Sunday, December 31, 1 BC." - (if (< date coptic-calendar-epoch) - (list 0 0 0);; pre-Coptic date - (let* ((approx (/ (- date coptic-calendar-epoch) - 366)) ;; Approximation from below. - (year ;; Search forward from the approximation. + (if (< date calendar-coptic-epoch) + (list 0 0 0) ; pre-Coptic date + (let* ((approx (/ (- date calendar-coptic-epoch) + 366)) ; approximation from below + (year ; search forward from the approximation (+ approx (calendar-sum y approx - (>= date (calendar-absolute-from-coptic (list 1 1 (1+ y)))) - 1))) - (month ;; Search forward from Tot. + (>= date (calendar-coptic-to-absolute + (list 1 1 (1+ y)))) + 1))) + (month ; search forward from Tot (1+ (calendar-sum m 1 - (> date - (calendar-absolute-from-coptic - (list m - (coptic-calendar-last-day-of-month m year) - year))) - 1))) - (day ;; Calculate the day by subtraction. + (> date + (calendar-coptic-to-absolute + (list m + (calendar-coptic-last-day-of-month m + year) + year))) + 1))) + (day ; calculate the day by subtraction (- date - (1- (calendar-absolute-from-coptic (list month 1 year)))))) - (list month day year)))) + (1- (calendar-coptic-to-absolute (list month 1 year)))))) + (list month day year)))) +;;;###cal-autoload (defun calendar-coptic-date-string (&optional date) "String of Coptic date of Gregorian DATE. Returns the empty string if DATE is pre-Coptic calendar. @@ -111,126 +112,140 @@ Defaults to today's date if DATE is not given." (let* ((coptic-date (calendar-coptic-from-absolute (calendar-absolute-from-gregorian (or date (calendar-current-date))))) - (y (extract-calendar-year coptic-date)) - (m (extract-calendar-month coptic-date))) + (y (calendar-extract-year coptic-date)) + (m (calendar-extract-month coptic-date))) (if (< y 1) "" - (let ((monthname (aref coptic-calendar-month-name-array (1- m))) - (day (int-to-string (extract-calendar-day coptic-date))) + (let ((monthname (aref calendar-coptic-month-name-array (1- m))) + (day (number-to-string (calendar-extract-day coptic-date))) (dayname nil) - (month (int-to-string m)) - (year (int-to-string y))) + (month (number-to-string m)) + (year (number-to-string y))) (mapconcat 'eval calendar-date-display-form ""))))) -(defun calendar-print-coptic-date () +;;;###cal-autoload +(defun calendar-coptic-print-date () "Show the Coptic calendar equivalent of the selected date." (interactive) (let ((f (calendar-coptic-date-string (calendar-cursor-to-date t)))) (if (string-equal f "") - (message "Date is pre-%s calendar" coptic-name) - (message "%s date: %s" coptic-name f)))) - -(defun calendar-goto-coptic-date (date &optional noecho) - "Move cursor to Coptic date DATE. -Echo Coptic date unless NOECHO is t." - (interactive (coptic-prompt-for-date)) - (calendar-goto-date (calendar-gregorian-from-absolute - (calendar-absolute-from-coptic date))) - (or noecho (calendar-print-coptic-date))) + (message "Date is pre-%s calendar" calendar-coptic-name) + (message "%s date: %s" calendar-coptic-name f)))) -(defun coptic-prompt-for-date () - "Ask for a Coptic date." +(defun calendar-coptic-read-date () + "Interactively read the arguments for a Coptic date command. +Reads a year, month, and day." (let* ((today (calendar-current-date)) (year (calendar-read - (format "%s calendar year (>0): " coptic-name) - '(lambda (x) (> x 0)) - (int-to-string - (extract-calendar-year + (format "%s calendar year (>0): " calendar-coptic-name) + (lambda (x) (> x 0)) + (number-to-string + (calendar-extract-year (calendar-coptic-from-absolute (calendar-absolute-from-gregorian today)))))) (completion-ignore-case t) (month (cdr (assoc-string (completing-read - (format "%s calendar month name: " coptic-name) + (format "%s calendar month name: " calendar-coptic-name) (mapcar 'list - (append coptic-calendar-month-name-array nil)) + (append calendar-coptic-month-name-array nil)) nil t) - (calendar-make-alist coptic-calendar-month-name-array + (calendar-make-alist calendar-coptic-month-name-array 1) t))) - (last (coptic-calendar-last-day-of-month month year)) + (last (calendar-coptic-last-day-of-month month year)) (day (calendar-read - (format "%s calendar day (1-%d): " coptic-name last) - '(lambda (x) (and (< 0 x) (<= x last)))))) + (format "%s calendar day (1-%d): " calendar-coptic-name last) + (lambda (x) (and (< 0 x) (<= x last)))))) (list (list month day year)))) +;;;###cal-autoload +(defun calendar-coptic-goto-date (date &optional noecho) + "Move cursor to Coptic date DATE. +Echo Coptic date unless NOECHO is t." + (interactive (calendar-coptic-read-date)) + (calendar-goto-date (calendar-gregorian-from-absolute + (calendar-coptic-to-absolute date))) + (or noecho (calendar-coptic-print-date))) + + +(defvar date) + +;; To be called from diary-list-sexp-entries, where DATE is bound. +;;;###diary-autoload (defun diary-coptic-date () "Coptic calendar equivalent of date diary entry." (let ((f (calendar-coptic-date-string date))) (if (string-equal f "") - (format "Date is pre-%s calendar" coptic-name) - (format "%s date: %s" coptic-name f)))) + (format "Date is pre-%s calendar" calendar-coptic-name) + (format "%s date: %s" calendar-coptic-name f)))) -(defconst ethiopic-calendar-month-name-array +(defconst calendar-ethiopic-month-name-array ["Maskaram" "Teqemt" "Khedar" "Takhsas" "Ter" "Yakatit" "Magabit" "Miyazya" - "Genbot" "Sane" "Hamle" "Nahas" "Paguem"]) + "Genbot" "Sane" "Hamle" "Nahas" "Paguem"] + "Array of the month names in the Ethiopic calendar.") -(defconst ethiopic-calendar-epoch 2796 +(defconst calendar-ethiopic-epoch 2796 "Absolute date of start of Ethiopic calendar = August 29, 8 C.E. (Julian).") -(defconst ethiopic-name "Ethiopic") +(defconst calendar-ethiopic-name "Ethiopic" + "Used in some message strings.") -(defun calendar-absolute-from-ethiopic (date) +(defun calendar-ethiopic-to-absolute (date) "Compute absolute date from Ethiopic date DATE. The absolute date is the number of days elapsed since the (imaginary) Gregorian date Sunday, December 31, 1 BC." - (let ((coptic-calendar-epoch ethiopic-calendar-epoch)) - (calendar-absolute-from-coptic date))) + (let ((calendar-coptic-epoch calendar-ethiopic-epoch)) + (calendar-coptic-to-absolute date))) (defun calendar-ethiopic-from-absolute (date) "Compute the Ethiopic equivalent for absolute date DATE. The result is a list of the form (MONTH DAY YEAR). The absolute date is the number of days elapsed since the imaginary Gregorian date Sunday, December 31, 1 BC." - (let ((coptic-calendar-epoch ethiopic-calendar-epoch)) + (let ((calendar-coptic-epoch calendar-ethiopic-epoch)) (calendar-coptic-from-absolute date))) +;;;###cal-autoload (defun calendar-ethiopic-date-string (&optional date) "String of Ethiopic date of Gregorian DATE. Returns the empty string if DATE is pre-Ethiopic calendar. Defaults to today's date if DATE is not given." - (let ((coptic-calendar-epoch ethiopic-calendar-epoch) - (coptic-name ethiopic-name) - (coptic-calendar-month-name-array ethiopic-calendar-month-name-array)) + (let ((calendar-coptic-epoch calendar-ethiopic-epoch) + (calendar-coptic-name calendar-ethiopic-name) + (calendar-coptic-month-name-array calendar-ethiopic-month-name-array)) (calendar-coptic-date-string date))) -(defun calendar-print-ethiopic-date () +;;;###cal-autoload +(defun calendar-ethiopic-print-date () "Show the Ethiopic calendar equivalent of the selected date." (interactive) - (let ((coptic-calendar-epoch ethiopic-calendar-epoch) - (coptic-name ethiopic-name) - (coptic-calendar-month-name-array ethiopic-calendar-month-name-array)) - (call-interactively 'calendar-print-coptic-date))) + (let ((calendar-coptic-epoch calendar-ethiopic-epoch) + (calendar-coptic-name calendar-ethiopic-name) + (calendar-coptic-month-name-array calendar-ethiopic-month-name-array)) + (call-interactively 'calendar-coptic-print-date))) -(defun calendar-goto-ethiopic-date (date &optional noecho) +;;;###cal-autoload +(defun calendar-ethiopic-goto-date (date &optional noecho) "Move cursor to Ethiopic date DATE. Echo Ethiopic date unless NOECHO is t." (interactive - (let ((coptic-calendar-epoch ethiopic-calendar-epoch) - (coptic-name ethiopic-name) - (coptic-calendar-month-name-array ethiopic-calendar-month-name-array)) - (coptic-prompt-for-date))) + (let ((calendar-coptic-epoch calendar-ethiopic-epoch) + (calendar-coptic-name calendar-ethiopic-name) + (calendar-coptic-month-name-array calendar-ethiopic-month-name-array)) + (calendar-coptic-read-date))) (calendar-goto-date (calendar-gregorian-from-absolute - (calendar-absolute-from-ethiopic date))) - (or noecho (calendar-print-ethiopic-date))) + (calendar-ethiopic-to-absolute date))) + (or noecho (calendar-ethiopic-print-date))) +;; To be called from diary-list-sexp-entries, where DATE is bound. +;;;###diary-autoload (defun diary-ethiopic-date () "Ethiopic calendar equivalent of date diary entry." - (let ((coptic-calendar-epoch ethiopic-calendar-epoch) - (coptic-name ethiopic-name) - (coptic-calendar-month-name-array ethiopic-calendar-month-name-array)) + (let ((calendar-coptic-epoch calendar-ethiopic-epoch) + (calendar-coptic-name calendar-ethiopic-name) + (calendar-coptic-month-name-array calendar-ethiopic-month-name-array)) (diary-coptic-date))) (provide 'cal-coptic) -;;; arch-tag: 72d49161-25df-4072-9312-b182cdca7627 ;;; cal-coptic.el ends here