# HG changeset patch # User Glenn Morris # Date 1207422484 0 # Node ID 144a6495a5a4148c5b64f6832c7cff5d24d44b54 # Parent ee9df91aaacb340875d0adcbfc557ea6728e8d79 (calendar-coptic-month-name-array): Rename coptic-calendar-month-name-array. Update callers. (calendar-coptic-epoch): Rename coptic-calendar-epoch. Update callers. (calendar-coptic-name): Rename coptic-name. Update callers. (calendar-coptic-leap-year-p): Rename coptic-calendar-leap-year-p. Update callers. (calendar-coptic-last-day-of-month): Rename coptic-calendar-last-day-of-month. Update callers. (calendar-coptic-to-absolute): Rename calendar-absolute-from-coptic. Keep old name as alias, update callers. (calendar-coptic-print-date): Rename calendar-print-coptic-date. Keep old name as alias, update callers. (calendar-coptic-goto-date): Rename calendar-goto-coptic-date. Keep old name as alias, update callers. (calendar-ethiopic-month-name-array): Rename ethiopic-calendar-month-name-array. Update callers. (calendar-ethiopic-epoch): Rename ethiopic-calendar-epoch. Update callers. (calendar-ethiopic-name): Rename ethiopic-name. Update callers. (calendar-ethiopic-to-absolute): Rename calendar-absolute-from-ethiopic. Keep old name as alias, update callers. (calendar-ethiopic-print-date): Rename calendar-print-ethiopic-date. Keep old name as alias, update callers. (calendar-ethiopic-goto-date): Rename calendar-goto-ethiopic-date. Keep old name as alias, update callers. diff -r ee9df91aaacb -r 144a6495a5a4 lisp/calendar/cal-coptic.el --- a/lisp/calendar/cal-coptic.el Sat Apr 05 18:55:09 2008 +0000 +++ b/lisp/calendar/cal-coptic.el Sat Apr 05 19:08:04 2008 +0000 @@ -35,7 +35,7 @@ ;; 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"] "Array of the month names in the Coptic calendar.") @@ -43,67 +43,70 @@ (eval-and-compile (autoload 'calendar-julian-to-absolute "cal-julian")) -(defvar coptic-calendar-epoch +(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).") -(defvar coptic-name "Coptic" +(defvar calendar-coptic-name "Coptic" "Used in some message strings.") -(defun coptic-calendar-leap-year-p (year) +(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." (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 + (+ (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 +(define-obsolete-function-alias 'calendar-absolute-from-coptic + 'calendar-coptic-to-absolute "23.1") + (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) + (if (< date calendar-coptic-epoch) (list 0 0 0) ; pre-Coptic date - (let* ((approx (/ (- date coptic-calendar-epoch) + (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 + (>= 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 + (calendar-coptic-to-absolute (list m - (coptic-calendar-last-day-of-month 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)))))) + (1- (calendar-coptic-to-absolute (list month 1 year)))))) (list month day year)))) ;;;###cal-autoload @@ -118,7 +121,7 @@ (m (extract-calendar-month coptic-date))) (if (< y 1) "" - (let ((monthname (aref coptic-calendar-month-name-array (1- m))) + (let ((monthname (aref calendar-coptic-month-name-array (1- m))) (day (int-to-string (extract-calendar-day coptic-date))) (dayname nil) (month (int-to-string m)) @@ -126,20 +129,23 @@ (mapconcat 'eval calendar-date-display-form ""))))) ;;;###cal-autoload -(defun calendar-print-coptic-date () +(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)))) + (message "Date is pre-%s calendar" calendar-coptic-name) + (message "%s date: %s" calendar-coptic-name f)))) + +(define-obsolete-function-alias 'calendar-print-coptic-date + 'calendar-coptic-print-date "23.1") (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) + (format "%s calendar year (>0): " calendar-coptic-name) (lambda (x) (> x 0)) (int-to-string (extract-calendar-year @@ -148,29 +154,32 @@ (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) + (format "%s calendar day (1-%d): " calendar-coptic-name last) (lambda (x) (and (< 0 x) (<= x last)))))) (list (list month day year)))) -(define-obsolete-function-alias - 'coptic-prompt-for-date 'calendar-coptic-read-date "23.1") +(define-obsolete-function-alias 'coptic-prompt-for-date + 'calendar-coptic-read-date "23.1") ;;;###cal-autoload -(defun calendar-goto-coptic-date (date &optional noecho) +(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-absolute-from-coptic date))) - (or noecho (calendar-print-coptic-date))) + (calendar-coptic-to-absolute date))) + (or noecho (calendar-coptic-print-date))) + +(define-obsolete-function-alias 'calendar-goto-coptic-date + 'calendar-coptic-goto-date "23.1") (defvar date) @@ -180,33 +189,36 @@ "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"] "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))) + +(define-obsolete-function-alias 'calendar-absolute-from-ethiopic + 'calendar-ethiopic-to-absolute "23.1") (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 @@ -214,40 +226,46 @@ "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))) ;;;###cal-autoload -(defun calendar-print-ethiopic-date () +(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))) + +(define-obsolete-function-alias 'calendar-print-ethiopic-date + 'calendar-ethiopic-print-date "23.1") ;;;###cal-autoload -(defun calendar-goto-ethiopic-date (date &optional noecho) +(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)) + (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))) + +(define-obsolete-function-alias 'calendar-goto-ethiopic-date + 'calendar-ethiopic-goto-date "23.1") ;; To be called from list-sexp-diary-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)