Mercurial > emacs
annotate lisp/calendar/cal-hebrew.el @ 110682:ba6a1c230532
gnus-html.el (gnus-html-prefetch-images): Adjust regexp to avoid regexp backtrace overflows.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Fri, 01 Oct 2010 13:33:03 +0000 |
parents | 280c8ae2476d |
children | 3684139b9255 |
rev | line source |
---|---|
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
24187
diff
changeset
|
1 ;;; cal-hebrew.el --- calendar functions for the Hebrew calendar |
13050 | 2 |
92611
297952467e34
(mark-hebrew-calendar-date-pattern): Use zerop.
Glenn Morris <rgm@gnu.org>
parents:
92583
diff
changeset
|
3 ;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
106815 | 4 ;; 2008, 2009, 2010 Free Software Foundation, Inc. |
13050 | 5 |
13051
0351b3061992
*** empty log message ***
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13050
diff
changeset
|
6 ;; Author: Nachum Dershowitz <nachum@cs.uiuc.edu> |
93491
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
7 ;; Edward M. Reingold <reingold@cs.uiuc.edu> |
67465
a55ee709ec8d
Update copyright pending Emacs 22.
Glenn Morris <rgm@gnu.org>
parents:
65143
diff
changeset
|
8 ;; Maintainer: Glenn Morris <rgm@gnu.org> |
13050 | 9 ;; Keywords: calendar |
10 ;; Human-Keywords: Hebrew calendar, calendar, diary | |
110015
280c8ae2476d
Add "Package:" file headers to denote built-in packages.
Chong Yidong <cyd@stupidchicken.com>
parents:
107315
diff
changeset
|
11 ;; Package: calendar |
13050 | 12 |
13 ;; This file is part of GNU Emacs. | |
14 | |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94022
diff
changeset
|
15 ;; GNU Emacs is free software: you can redistribute it and/or modify |
13050 | 16 ;; it under the terms of the GNU General Public License as published by |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94022
diff
changeset
|
17 ;; the Free Software Foundation, either version 3 of the License, or |
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94022
diff
changeset
|
18 ;; (at your option) any later version. |
13050 | 19 |
20 ;; GNU Emacs is distributed in the hope that it will be useful, | |
21 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
22 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
23 ;; GNU General Public License for more details. | |
24 | |
25 ;; You should have received a copy of the GNU General Public License | |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94022
diff
changeset
|
26 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
13050 | 27 |
28 ;;; Commentary: | |
29 | |
93469
777bad4c4617
(Commentary): Replace with pointer to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93448
diff
changeset
|
30 ;; See calendar.el. |
20462
d179de7ad92e
Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents:
20267
diff
changeset
|
31 |
13050 | 32 ;;; Code: |
33 | |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
34 (require 'calendar) |
13050 | 35 |
94022
0f09322aedec
Move non-autoloaded define-obsolete-variable-alias calls for
Glenn Morris <rgm@gnu.org>
parents:
93870
diff
changeset
|
36 (define-obsolete-variable-alias 'diary-sabbath-candles-minutes |
0f09322aedec
Move non-autoloaded define-obsolete-variable-alias calls for
Glenn Morris <rgm@gnu.org>
parents:
93870
diff
changeset
|
37 'diary-hebrew-sabbath-candles-minutes "23.1") |
0f09322aedec
Move non-autoloaded define-obsolete-variable-alias calls for
Glenn Morris <rgm@gnu.org>
parents:
93870
diff
changeset
|
38 |
93750
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
39 (defcustom diary-hebrew-sabbath-candles-minutes 18 |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
40 "Number of minutes before sunset for sabbath candle lighting. |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
41 Used by `diary-hebrew-sabbath-candles'." |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
42 :group 'diary |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
43 :type 'integer |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
44 :version "21.1") |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
45 |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
46 ;; End of user options. |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
47 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
48 (defun calendar-hebrew-leap-year-p (year) |
92667 | 49 "Non-nil if YEAR is a Hebrew calendar leap year." |
13050 | 50 (< (% (1+ (* 7 year)) 19) 7)) |
51 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
52 (defun calendar-hebrew-last-month-of-year (year) |
13050 | 53 "The last month of the Hebrew calendar YEAR." |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
54 (if (calendar-hebrew-leap-year-p year) |
13050 | 55 13 |
56 12)) | |
57 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
58 (defun calendar-hebrew-elapsed-days (year) |
93491
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
59 "Days to mean conjunction of Tishri of Hebrew YEAR. |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
60 Measured from Sunday before start of Hebrew calendar." |
13050 | 61 (let* ((months-elapsed |
92658 | 62 (+ (* 235 (/ (1- year) 19)) ; months in complete cycles so far |
63 (* 12 (% (1- year) 19)) ; regular months in this cycle | |
64 (/ (1+ (* 7 (% (1- year) 19))) 19))) ; leap months this cycle | |
13050 | 65 (parts-elapsed (+ 204 (* 793 (% months-elapsed 1080)))) |
66 (hours-elapsed (+ 5 | |
67 (* 12 months-elapsed) | |
68 (* 793 (/ months-elapsed 1080)) | |
69 (/ parts-elapsed 1080))) | |
92852 | 70 (parts ; conjunction parts |
13050 | 71 (+ (* 1080 (% hours-elapsed 24)) (% parts-elapsed 1080))) |
92852 | 72 (day ; conjunction day |
13050 | 73 (+ 1 (* 29 months-elapsed) (/ hours-elapsed 24))) |
74 (alternative-day | |
92658 | 75 (if (or (>= parts 19440) ; if the new moon is at or after midday |
92852 | 76 (and (= (% day 7) 2) ; ...or is on a Tuesday... |
92658 | 77 (>= parts 9924) ; at 9 hours, 204 parts or later... |
92852 | 78 ;; of a common year... |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
79 (not (calendar-hebrew-leap-year-p year))) |
92852 | 80 (and (= (% day 7) 1) ; ...or is on a Monday... |
92658 | 81 (>= parts 16789) ; at 15 hours, 589 parts or later... |
92852 | 82 ;; at the end of a leap year. |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
83 (calendar-hebrew-leap-year-p (1- year)))) |
92852 | 84 ;; Then postpone Rosh HaShanah one day. |
13050 | 85 (1+ day) |
92852 | 86 ;; Else: |
13050 | 87 day))) |
92658 | 88 ;; If Rosh HaShanah would occur on Sunday, Wednesday, or Friday |
89 (if (memq (% alternative-day 7) (list 0 3 5)) | |
92852 | 90 ;; Then postpone it one (more) day and return. |
13050 | 91 (1+ alternative-day) |
92658 | 92 ;; Else return. |
13050 | 93 alternative-day))) |
94 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
95 (defun calendar-hebrew-days-in-year (year) |
13050 | 96 "Number of days in Hebrew YEAR." |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
97 (- (calendar-hebrew-elapsed-days (1+ year)) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
98 (calendar-hebrew-elapsed-days year))) |
13050 | 99 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
100 (defun calendar-hebrew-long-heshvan-p (year) |
92667 | 101 "Non-nil if Heshvan is long in Hebrew YEAR." |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
102 (= (% (calendar-hebrew-days-in-year year) 10) 5)) |
13050 | 103 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
104 (defun calendar-hebrew-short-kislev-p (year) |
92667 | 105 "Non-nil if Kislev is short in Hebrew YEAR." |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
106 (= (% (calendar-hebrew-days-in-year year) 10) 3)) |
13050 | 107 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
108 (defun calendar-hebrew-last-day-of-month (month year) |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
109 "The last day of MONTH in YEAR." |
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
110 (if (or (memq month (list 2 4 6 10 13)) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
111 (and (= month 12) (not (calendar-hebrew-leap-year-p year))) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
112 (and (= month 8) (not (calendar-hebrew-long-heshvan-p year))) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
113 (and (= month 9) (calendar-hebrew-short-kislev-p year))) |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
114 29 |
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
115 30)) |
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
116 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
117 (defun calendar-hebrew-to-absolute (date) |
13050 | 118 "Absolute date of Hebrew DATE. |
119 The absolute date is the number of days elapsed since the (imaginary) | |
120 Gregorian date Sunday, December 31, 1 BC." | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
121 (let ((month (calendar-extract-month date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
122 (day (calendar-extract-day date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
123 (year (calendar-extract-year date))) |
92852 | 124 (+ day ; days so far this month |
125 (if (< month 7) ; before Tishri | |
126 ;; Then add days in prior months this year before and after Nisan. | |
13050 | 127 (+ (calendar-sum |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
128 m 7 (<= m (calendar-hebrew-last-month-of-year year)) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
129 (calendar-hebrew-last-day-of-month m year)) |
13050 | 130 (calendar-sum |
131 m 1 (< m month) | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
132 (calendar-hebrew-last-day-of-month m year))) |
92852 | 133 ;; Else add days in prior months this year. |
13050 | 134 (calendar-sum |
135 m 7 (< m month) | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
136 (calendar-hebrew-last-day-of-month m year))) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
137 (calendar-hebrew-elapsed-days year) ; days in prior years |
92852 | 138 -1373429))) ; days elapsed before absolute date 1 |
13050 | 139 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
140 (define-obsolete-function-alias 'calendar-absolute-from-hebrew |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
141 'calendar-hebrew-to-absolute "23.1") |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
142 |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
143 (defun calendar-hebrew-from-absolute (date) |
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
144 "Compute the Hebrew date (month day year) corresponding to absolute DATE. |
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
145 The absolute date is the number of days elapsed since the (imaginary) |
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
146 Gregorian date Sunday, December 31, 1 BC." |
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
147 (let* ((greg-date (calendar-gregorian-from-absolute date)) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
148 (year (+ 3760 (calendar-extract-year greg-date))) |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
149 (month (aref [9 10 11 12 1 2 3 4 7 7 7 8] |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
150 (1- (calendar-extract-month greg-date)))) |
93491
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
151 (length (progn |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
152 (while (>= date (calendar-hebrew-to-absolute |
93491
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
153 (list 7 1 (1+ year)))) |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
154 (setq year (1+ year))) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
155 (calendar-hebrew-last-month-of-year year))) |
92993
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
156 day) |
93491
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
157 (while (> date |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
158 (calendar-hebrew-to-absolute |
93491
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
159 (list month |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
160 (calendar-hebrew-last-day-of-month month year) |
93491
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
161 year))) |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
162 (setq month (1+ (% month length)))) |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
163 (setq day (1+ |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
164 (- date (calendar-hebrew-to-absolute (list month 1 year))))) |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
165 (list month day year))) |
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
166 |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
167 (defconst calendar-hebrew-month-name-array-common-year |
13050 | 168 ["Nisan" "Iyar" "Sivan" "Tammuz" "Av" "Elul" "Tishri" |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
169 "Heshvan" "Kislev" "Teveth" "Shevat" "Adar"] |
92852 | 170 "Array of strings giving the names of the Hebrew months in a common year.") |
13050 | 171 |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
172 (defconst calendar-hebrew-month-name-array-leap-year |
13050 | 173 ["Nisan" "Iyar" "Sivan" "Tammuz" "Av" "Elul" "Tishri" |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
174 "Heshvan" "Kislev" "Teveth" "Shevat" "Adar I" "Adar II"] |
92852 | 175 "Array of strings giving the names of the Hebrew months in a leap year.") |
13050 | 176 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
177 ;;;###cal-autoload |
13050 | 178 (defun calendar-hebrew-date-string (&optional date) |
179 "String of Hebrew date before sunset of Gregorian DATE. | |
180 Defaults to today's date if DATE is not given. | |
181 Driven by the variable `calendar-date-display-form'." | |
182 (let* ((hebrew-date (calendar-hebrew-from-absolute | |
183 (calendar-absolute-from-gregorian | |
184 (or date (calendar-current-date))))) | |
185 (calendar-month-name-array | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
186 (if (calendar-hebrew-leap-year-p (calendar-extract-year hebrew-date)) |
13050 | 187 calendar-hebrew-month-name-array-leap-year |
188 calendar-hebrew-month-name-array-common-year))) | |
189 (calendar-date-string hebrew-date nil t))) | |
190 | |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
191 ;;;###cal-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
192 (defun calendar-hebrew-print-date () |
13050 | 193 "Show the Hebrew calendar equivalent of the date under the cursor." |
194 (interactive) | |
195 (message "Hebrew date (until sunset): %s" | |
196 (calendar-hebrew-date-string (calendar-cursor-to-date t)))) | |
197 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
198 (define-obsolete-function-alias 'calendar-print-hebrew-date |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
199 'calendar-hebrew-print-date "23.1") |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
200 |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
201 (defun calendar-hebrew-yahrzeit (death-date year) |
13050 | 202 "Absolute date of the anniversary of Hebrew DEATH-DATE in Hebrew YEAR." |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
203 (let ((death-day (calendar-extract-day death-date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
204 (death-month (calendar-extract-month death-date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
205 (death-year (calendar-extract-year death-date))) |
13050 | 206 (cond |
207 ;; If it's Heshvan 30 it depends on the first anniversary; if | |
208 ;; that was not Heshvan 30, use the day before Kislev 1. | |
209 ((and (= death-month 8) | |
210 (= death-day 30) | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
211 (not (calendar-hebrew-long-heshvan-p (1+ death-year)))) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
212 (1- (calendar-hebrew-to-absolute (list 9 1 year)))) |
92658 | 213 ;; If it's Kislev 30 it depends on the first anniversary; if that |
214 ;; was not Kislev 30, use the day before Teveth 1. | |
13050 | 215 ((and (= death-month 9) |
216 (= death-day 30) | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
217 (calendar-hebrew-short-kislev-p (1+ death-year))) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
218 (1- (calendar-hebrew-to-absolute (list 10 1 year)))) |
92658 | 219 ;; If it's Adar II, use the same day in last month of year (Adar |
220 ;; or Adar II). | |
13050 | 221 ((= death-month 13) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
222 (calendar-hebrew-to-absolute |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
223 (list (calendar-hebrew-last-month-of-year year) death-day year))) |
92658 | 224 ;; If it's the 30th in Adar I and year is not a leap year (so |
225 ;; Adar has only 29 days), use the last day in Shevat. | |
13050 | 226 ((and (= death-day 30) |
227 (= death-month 12) | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
228 (not (calendar-hebrew-leap-year-p year))) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
229 (calendar-hebrew-to-absolute (list 11 30 year))) |
13050 | 230 ;; In all other cases, use the normal anniversary of the date of death. |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
231 (t (calendar-hebrew-to-absolute |
13050 | 232 (list death-month death-day year)))))) |
233 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
234 (define-obsolete-function-alias 'hebrew-calendar-yahrzeit |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
235 'calendar-hebrew-yahrzeit "23.1") |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
236 |
93183
6f66ef366e35
(calendar-hebrew-read-date): New name for
Glenn Morris <rgm@gnu.org>
parents:
93025
diff
changeset
|
237 (defun calendar-hebrew-read-date () |
6f66ef366e35
(calendar-hebrew-read-date): New name for
Glenn Morris <rgm@gnu.org>
parents:
93025
diff
changeset
|
238 "Interactively read the arguments for a Hebrew date command. |
6f66ef366e35
(calendar-hebrew-read-date): New name for
Glenn Morris <rgm@gnu.org>
parents:
93025
diff
changeset
|
239 Reads a year, month, and day." |
92993
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
240 (let* ((today (calendar-current-date)) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
241 (year (calendar-read |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
242 "Hebrew calendar year (>3760): " |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
243 (lambda (x) (> x 3760)) |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
244 (number-to-string |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
245 (calendar-extract-year |
92993
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
246 (calendar-hebrew-from-absolute |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
247 (calendar-absolute-from-gregorian today)))))) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
248 (month-array (if (calendar-hebrew-leap-year-p year) |
92993
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
249 calendar-hebrew-month-name-array-leap-year |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
250 calendar-hebrew-month-name-array-common-year)) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
251 (completion-ignore-case t) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
252 (month (cdr (assoc-string |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
253 (completing-read |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
254 "Hebrew calendar month name: " |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
255 (mapcar 'list (append month-array nil)) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
256 (if (= year 3761) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
257 (lambda (x) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
258 (let ((m (cdr |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
259 (assoc-string |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
260 (car x) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
261 (calendar-make-alist month-array) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
262 t)))) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
263 (< 0 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
264 (calendar-hebrew-to-absolute |
92993
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
265 (list m |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
266 (calendar-hebrew-last-day-of-month |
92993
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
267 m year) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
268 year)))))) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
269 t) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
270 (calendar-make-alist month-array 1) t))) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
271 (last (calendar-hebrew-last-day-of-month month year)) |
92993
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
272 (first (if (and (= year 3761) (= month 10)) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
273 18 1)) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
274 (day (calendar-read |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
275 (format "Hebrew calendar day (%d-%d): " |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
276 first last) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
277 (lambda (x) (and (<= first x) (<= x last)))))) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
278 (list (list month day year)))) |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
279 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
280 ;;;###cal-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
281 (defun calendar-hebrew-goto-date (date &optional noecho) |
92918
3f05cbe354c1
(displayed-month, displayed-year, original-date): Move declarations
Glenn Morris <rgm@gnu.org>
parents:
92852
diff
changeset
|
282 "Move cursor to Hebrew DATE; echo Hebrew date unless NOECHO is non-nil." |
93183
6f66ef366e35
(calendar-hebrew-read-date): New name for
Glenn Morris <rgm@gnu.org>
parents:
93025
diff
changeset
|
283 (interactive (calendar-hebrew-read-date)) |
13050 | 284 (calendar-goto-date (calendar-gregorian-from-absolute |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
285 (calendar-hebrew-to-absolute date))) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
286 (or noecho (calendar-hebrew-print-date))) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
287 |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
288 (define-obsolete-function-alias 'calendar-goto-hebrew-date |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
289 'calendar-hebrew-goto-date "23.1") |
13050 | 290 |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
291 (defvar displayed-month) ; from calendar-generate |
92918
3f05cbe354c1
(displayed-month, displayed-year, original-date): Move declarations
Glenn Morris <rgm@gnu.org>
parents:
92852
diff
changeset
|
292 |
93491
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
293 (defun calendar-hebrew-date-is-visible-p (month day) |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
294 "Return non-nil if Hebrew MONTH DAY is visible in the calendar window. |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
295 Returns the corresponding Gregorian date." |
92658 | 296 ;; This test is only to speed things up a bit; it works fine without it. |
297 (if (memq displayed-month | |
93448 | 298 ;; What this is doing is equivalent to +1,2,3,4,5 modulo 12, ie: |
299 ;; (mapcar (lambda (n) (let ((x (mod n 12))) | |
300 ;; (if (zerop x) 12 | |
301 ;; x))) | |
302 ;; (number-sequence (1+ month) (+ 5 month))) | |
303 ;; Ie it makes a list: | |
304 ;; 2 3 4 5 6 when month = 1 | |
305 ;; 3 4 5 6 7 when month = 2 | |
306 ;; ... | |
307 ;; 8 9 10 11 12 when month = 7 | |
308 ;; 9 10 11 12 1 when month = 8 | |
309 ;; ... | |
310 ;; 12 1 2 3 4 when month = 11 | |
311 ;; 1 2 3 4 5 when month = 12 | |
312 ;; This implies that hebrew month N cannot occur outside | |
313 ;; Gregorian months N:N+6 (the calendar shows | |
314 ;; displayed-month +/- 1 at any time). | |
315 ;; So to put it another way: | |
316 ;; (calendar-interval month 1 displayed-month | |
317 ;; (if (> month displayed-month) 2 1)) | |
318 ;; must be >= 1 and <= 5. This could be expanded to: | |
319 ;; (if (> month displayed-month) (+ 12 (- displayed-month month)) | |
320 ;; (- displayed-month month) | |
92658 | 321 (list |
13050 | 322 (if (< 11 month) (- month 11) (+ month 1)) |
323 (if (< 10 month) (- month 10) (+ month 2)) | |
324 (if (< 9 month) (- month 9) (+ month 3)) | |
325 (if (< 8 month) (- month 8) (+ month 4)) | |
326 (if (< 7 month) (- month 7) (+ month 5)))) | |
93495
3851465fdd03
(calendar-hebrew-date-is-visible-p): Use calendar-nongregorian-visible-p.
Glenn Morris <rgm@gnu.org>
parents:
93491
diff
changeset
|
327 (calendar-nongregorian-visible-p |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
328 month day 'calendar-hebrew-to-absolute |
93495
3851465fdd03
(calendar-hebrew-date-is-visible-p): Use calendar-nongregorian-visible-p.
Glenn Morris <rgm@gnu.org>
parents:
93491
diff
changeset
|
329 'calendar-hebrew-from-absolute |
3851465fdd03
(calendar-hebrew-date-is-visible-p): Use calendar-nongregorian-visible-p.
Glenn Morris <rgm@gnu.org>
parents:
93491
diff
changeset
|
330 ;; Hebrew new year is start of month 7. |
3851465fdd03
(calendar-hebrew-date-is-visible-p): Use calendar-nongregorian-visible-p.
Glenn Morris <rgm@gnu.org>
parents:
93491
diff
changeset
|
331 ;; If hmonth >= 7, choose the higher year. |
3851465fdd03
(calendar-hebrew-date-is-visible-p): Use calendar-nongregorian-visible-p.
Glenn Morris <rgm@gnu.org>
parents:
93491
diff
changeset
|
332 (lambda (m) (> m 6))))) |
93491
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
333 |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
334 ;;;###holiday-autoload |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
335 (defun holiday-hebrew (month day string) |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
336 "Holiday on MONTH, DAY (Hebrew) called STRING. |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
337 If MONTH, DAY (Hebrew) is visible, the value returned is corresponding |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
338 Gregorian date in the form of the list (((month day year) STRING)). Returns |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
339 nil if it is not visible in the current calendar window." |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
340 (let ((gdate (calendar-hebrew-date-is-visible-p month day))) |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
341 (if gdate (list (list gdate string))))) |
13050 | 342 |
86489
997f6a0ad183
(holiday-filter-visible-calendar)
Glenn Morris <rgm@gnu.org>
parents:
85510
diff
changeset
|
343 ;; h-r-h-e should be called from holidays code. |
997f6a0ad183
(holiday-filter-visible-calendar)
Glenn Morris <rgm@gnu.org>
parents:
85510
diff
changeset
|
344 (declare-function holiday-filter-visible-calendar "holidays" (l)) |
997f6a0ad183
(holiday-filter-visible-calendar)
Glenn Morris <rgm@gnu.org>
parents:
85510
diff
changeset
|
345 |
93495
3851465fdd03
(calendar-hebrew-date-is-visible-p): Use calendar-nongregorian-visible-p.
Glenn Morris <rgm@gnu.org>
parents:
93491
diff
changeset
|
346 (defvar displayed-year) |
3851465fdd03
(calendar-hebrew-date-is-visible-p): Use calendar-nongregorian-visible-p.
Glenn Morris <rgm@gnu.org>
parents:
93491
diff
changeset
|
347 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
348 ;;;###holiday-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
349 (defun holiday-hebrew-rosh-hashanah (&optional all) |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
350 "List of dates related to Rosh Hashanah, as visible in calendar window. |
93632
d772031482b8
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93575
diff
changeset
|
351 Shows only the major holidays, unless `calendar-hebrew-all-holidays-flag' |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
352 or ALL is non-nil." |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
353 (when (memq displayed-month '(8 9 10 11)) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
354 (let ((abs-r-h (calendar-hebrew-to-absolute |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
355 (list 7 1 (+ displayed-year 3761))))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
356 (holiday-filter-visible-calendar |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
357 (append |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
358 (list |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
359 (list (calendar-gregorian-from-absolute abs-r-h) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
360 (format "Rosh HaShanah %d" (+ 3761 displayed-year))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
361 (list (calendar-gregorian-from-absolute (+ abs-r-h 9)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
362 "Yom Kippur") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
363 (list (calendar-gregorian-from-absolute (+ abs-r-h 14)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
364 "Sukkot") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
365 (list (calendar-gregorian-from-absolute (+ abs-r-h 21)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
366 "Shemini Atzeret") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
367 (list (calendar-gregorian-from-absolute (+ abs-r-h 22)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
368 "Simchat Torah")) |
93632
d772031482b8
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93575
diff
changeset
|
369 (when (or all calendar-hebrew-all-holidays-flag) |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
370 (list |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
371 (list (calendar-gregorian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
372 (calendar-dayname-on-or-before 6 (- abs-r-h 4))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
373 "Selichot (night)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
374 (list (calendar-gregorian-from-absolute (1- abs-r-h)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
375 "Erev Rosh HaShanah") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
376 (list (calendar-gregorian-from-absolute (1+ abs-r-h)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
377 "Rosh HaShanah (second day)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
378 (list (calendar-gregorian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
379 (if (= (% abs-r-h 7) 4) (+ abs-r-h 3) (+ abs-r-h 2))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
380 "Tzom Gedaliah") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
381 (list (calendar-gregorian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
382 (calendar-dayname-on-or-before 6 (+ 7 abs-r-h))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
383 "Shabbat Shuvah") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
384 (list (calendar-gregorian-from-absolute (+ abs-r-h 8)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
385 "Erev Yom Kippur") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
386 (list (calendar-gregorian-from-absolute (+ abs-r-h 13)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
387 "Erev Sukkot") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
388 (list (calendar-gregorian-from-absolute (+ abs-r-h 15)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
389 "Sukkot (second day)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
390 (list (calendar-gregorian-from-absolute (+ abs-r-h 16)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
391 "Hol Hamoed Sukkot (first day)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
392 (list (calendar-gregorian-from-absolute (+ abs-r-h 17)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
393 "Hol Hamoed Sukkot (second day)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
394 (list (calendar-gregorian-from-absolute (+ abs-r-h 18)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
395 "Hol Hamoed Sukkot (third day)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
396 (list (calendar-gregorian-from-absolute (+ abs-r-h 19)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
397 "Hol Hamoed Sukkot (fourth day)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
398 (list (calendar-gregorian-from-absolute (+ abs-r-h 20)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
399 "Hoshanah Rabbah")))))))) |
13050 | 400 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
401 ;;;###holiday-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
402 (define-obsolete-function-alias 'holiday-rosh-hashanah-etc |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
403 'holiday-hebrew-rosh-hashanah "23.1") |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
404 |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
405 ;;;###holiday-autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
406 (defun holiday-hebrew-hanukkah (&optional all) |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
407 "List of dates related to Hanukkah, as visible in calendar window. |
93632
d772031482b8
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93575
diff
changeset
|
408 Shows only Hanukkah, unless `calendar-hebrew-all-holidays-flag' or ALL |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
409 is non-nil." |
92658 | 410 ;; This test is only to speed things up a bit, it works fine without it. |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
411 (when (memq displayed-month '(10 11 12 1 2)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
412 (let* ((m displayed-month) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
413 (y displayed-year) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
414 (h-y (progn |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
415 (calendar-increment-month m y 1) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
416 (calendar-extract-year |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
417 (calendar-hebrew-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
418 (calendar-absolute-from-gregorian |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
419 (list m (calendar-last-day-of-month m y) y)))))) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
420 (abs-h (calendar-hebrew-to-absolute (list 9 25 h-y))) |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
421 (ord ["first" "second" "third" "fourth" "fifth" "sixth" |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
422 "seventh" "eighth"]) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
423 han) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
424 (holiday-filter-visible-calendar |
93632
d772031482b8
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93575
diff
changeset
|
425 (if (or all calendar-hebrew-all-holidays-flag) |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
426 (append |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
427 (list |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
428 (list (calendar-gregorian-from-absolute (1- abs-h)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
429 "Erev Hanukkah")) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
430 (dotimes (i 8 (nreverse han)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
431 (push (list |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
432 (calendar-gregorian-from-absolute (+ abs-h i)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
433 (format "Hanukkah (%s day)" (aref ord i))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
434 han))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
435 (list (list (calendar-gregorian-from-absolute abs-h) "Hanukkah"))))))) |
13050 | 436 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
437 ;;;###holiday-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
438 (define-obsolete-function-alias 'holiday-hanukkah |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
439 'holiday-hebrew-hanukkah "23.1") |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
440 |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
441 ;;;###holiday-autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
442 (defun holiday-hebrew-passover (&optional all) |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
443 "List of dates related to Passover, as visible in calendar window. |
93632
d772031482b8
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93575
diff
changeset
|
444 Shows only the major holidays, unless `calendar-hebrew-all-holidays-flag' |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
445 or ALL is non-nil." |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
446 (when (< displayed-month 8) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
447 (let ((abs-p (calendar-hebrew-to-absolute |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
448 (list 1 15 (+ displayed-year 3760))))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
449 (holiday-filter-visible-calendar |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
450 ;; The first two are out of order when the others are added. |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
451 (append |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
452 (list |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
453 (list (calendar-gregorian-from-absolute abs-p) "Passover") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
454 (list (calendar-gregorian-from-absolute (+ abs-p 50)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
455 "Shavuot")) |
93632
d772031482b8
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93575
diff
changeset
|
456 (when (or all calendar-hebrew-all-holidays-flag) |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
457 (list |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
458 (list (calendar-gregorian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
459 (calendar-dayname-on-or-before 6 (- abs-p 43))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
460 "Shabbat Shekalim") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
461 (list (calendar-gregorian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
462 (calendar-dayname-on-or-before 6 (- abs-p 30))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
463 "Shabbat Zachor") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
464 (list (calendar-gregorian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
465 (if (= (% abs-p 7) 2) (- abs-p 33) (- abs-p 31))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
466 "Fast of Esther") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
467 (list (calendar-gregorian-from-absolute (- abs-p 31)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
468 "Erev Purim") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
469 (list (calendar-gregorian-from-absolute (- abs-p 30)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
470 "Purim") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
471 (list (calendar-gregorian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
472 (if (zerop (% abs-p 7)) (- abs-p 28) (- abs-p 29))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
473 "Shushan Purim") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
474 (list (calendar-gregorian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
475 (- (calendar-dayname-on-or-before 6 (- abs-p 14)) 7)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
476 "Shabbat Parah") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
477 (list (calendar-gregorian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
478 (calendar-dayname-on-or-before 6 (- abs-p 14))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
479 "Shabbat HaHodesh") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
480 (list (calendar-gregorian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
481 (calendar-dayname-on-or-before 6 (1- abs-p))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
482 "Shabbat HaGadol") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
483 (list (calendar-gregorian-from-absolute (1- abs-p)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
484 "Erev Passover") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
485 (list (calendar-gregorian-from-absolute (1+ abs-p)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
486 "Passover (second day)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
487 (list (calendar-gregorian-from-absolute (+ abs-p 2)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
488 "Hol Hamoed Passover (first day)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
489 (list (calendar-gregorian-from-absolute (+ abs-p 3)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
490 "Hol Hamoed Passover (second day)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
491 (list (calendar-gregorian-from-absolute (+ abs-p 4)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
492 "Hol Hamoed Passover (third day)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
493 (list (calendar-gregorian-from-absolute (+ abs-p 5)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
494 "Hol Hamoed Passover (fourth day)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
495 (list (calendar-gregorian-from-absolute (+ abs-p 6)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
496 "Passover (seventh day)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
497 (list (calendar-gregorian-from-absolute (+ abs-p 7)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
498 "Passover (eighth day)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
499 (list (calendar-gregorian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
500 (if (zerop (% (+ abs-p 12) 7)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
501 (+ abs-p 13) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
502 (+ abs-p 12))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
503 "Yom HaShoah") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
504 (list (calendar-gregorian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
505 (if (zerop (% abs-p 7)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
506 (+ abs-p 18) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
507 (if (= (% abs-p 7) 6) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
508 (+ abs-p 19) |
107315
893db3292264
Fix date of Yom HaAtzma'ut holiday.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
509 (if (= (% abs-p 7) 2) |
893db3292264
Fix date of Yom HaAtzma'ut holiday.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
510 (+ abs-p 21) |
893db3292264
Fix date of Yom HaAtzma'ut holiday.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
511 (+ abs-p 20))))) |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
512 "Yom HaAtzma'ut") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
513 (list (calendar-gregorian-from-absolute (+ abs-p 33)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
514 "Lag BaOmer") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
515 (list (calendar-gregorian-from-absolute (+ abs-p 43)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
516 "Yom Yerushalaim") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
517 (list (calendar-gregorian-from-absolute (+ abs-p 49)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
518 "Erev Shavuot") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
519 (list (calendar-gregorian-from-absolute (+ abs-p 51)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
520 "Shavuot (second day)")))))))) |
13050 | 521 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
522 ;;;###holiday-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
523 (define-obsolete-function-alias 'holiday-passover-etc |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
524 'holiday-hebrew-passover "23.1") |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
525 |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
526 ;;;###holiday-autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
527 (defun holiday-hebrew-tisha-b-av () |
13050 | 528 "List of dates around Tisha B'Av, as visible in calendar window." |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
529 (when (memq displayed-month '(5 6 7 8 9)) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
530 (let ((abs-t-a (calendar-hebrew-to-absolute |
92993
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
531 (list 5 9 (+ displayed-year 3760))))) |
84552
eb2c7d456b7a
Rename all filter-visible-calendar-holidays callers to
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
532 (holiday-filter-visible-calendar |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46708
diff
changeset
|
533 (list |
13050 | 534 (list (calendar-gregorian-from-absolute |
535 (if (= (% abs-t-a 7) 6) (- abs-t-a 20) (- abs-t-a 21))) | |
536 "Tzom Tammuz") | |
537 (list (calendar-gregorian-from-absolute | |
538 (calendar-dayname-on-or-before 6 abs-t-a)) | |
539 "Shabbat Hazon") | |
540 (list (calendar-gregorian-from-absolute | |
541 (if (= (% abs-t-a 7) 6) (1+ abs-t-a) abs-t-a)) | |
542 "Tisha B'Av") | |
543 (list (calendar-gregorian-from-absolute | |
544 (calendar-dayname-on-or-before 6 (+ abs-t-a 7))) | |
545 "Shabbat Nahamu")))))) | |
546 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
547 ;;;###holiday-autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
548 (define-obsolete-function-alias 'holiday-tisha-b-av-etc |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
549 'holiday-hebrew-tisha-b-av "23.1") |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
550 |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
551 (autoload 'holiday-julian "cal-julian") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
552 |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
553 ;;;###holiday-autoload |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
554 (defun holiday-hebrew-misc () |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
555 "Miscellaneous Hebrew holidays, if visible in calendar window. |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
556 Includes: Tal Umatar, Tzom Teveth, Tu B'Shevat, Shabbat Shirah, and |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
557 Kiddush HaHamah." |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
558 (let ((m displayed-month) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
559 (y displayed-year) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
560 year h-year s-s) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
561 (append |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
562 (holiday-julian |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
563 11 |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
564 (progn |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
565 (calendar-increment-month m y -1) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
566 (setq year (calendar-extract-year |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
567 (calendar-julian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
568 (calendar-absolute-from-gregorian (list m 1 y))))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
569 (if (zerop (% (1+ year) 4)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
570 22 |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
571 21)) "\"Tal Umatar\" (evening)") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
572 (holiday-hebrew |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
573 10 |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
574 (progn |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
575 (setq h-year (calendar-extract-year |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
576 (calendar-hebrew-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
577 (calendar-absolute-from-gregorian |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
578 (list displayed-month 28 displayed-year))))) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
579 (if (= 6 (% (calendar-hebrew-to-absolute (list 10 10 h-year)) |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
580 7)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
581 11 10)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
582 "Tzom Teveth") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
583 (holiday-hebrew 11 15 "Tu B'Shevat") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
584 (holiday-hebrew |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
585 11 |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
586 (progn |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
587 (setq m displayed-month |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
588 y displayed-year |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
589 h-year (progn |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
590 (calendar-increment-month m y 1) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
591 (calendar-extract-year |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
592 (calendar-hebrew-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
593 (calendar-absolute-from-gregorian |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
594 (list m (calendar-last-day-of-month m y) y))))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
595 s-s |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
596 (calendar-hebrew-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
597 (if (= 6 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
598 (% (calendar-hebrew-to-absolute |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
599 (list 7 1 h-year)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
600 7)) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
601 (calendar-dayname-on-or-before |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
602 6 (calendar-hebrew-to-absolute |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
603 (list 11 17 h-year))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
604 (calendar-dayname-on-or-before |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
605 6 (calendar-hebrew-to-absolute |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
606 (list 11 16 h-year)))))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
607 (calendar-extract-day s-s)) |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
608 "Shabbat Shirah") |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
609 (and (progn |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
610 (setq m displayed-month |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
611 y displayed-year |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
612 year (progn |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
613 (calendar-increment-month m y -1) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
614 (calendar-extract-year |
93575
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
615 (calendar-julian-from-absolute |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
616 (calendar-absolute-from-gregorian (list m 1 y)))))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
617 (= 21 (% year 28))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
618 (holiday-julian 3 26 "Kiddush HaHamah"))))) |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
619 |
7303db4cd998
(holiday-rosh-hashanah-etc, holiday-passover-etc, holiday-hanukkah):
Glenn Morris <rgm@gnu.org>
parents:
93525
diff
changeset
|
620 |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
621 (autoload 'diary-list-entries-1 "diary-lib") |
92701
6a990f964e22
(date, entry, number): Move declarations to where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92667
diff
changeset
|
622 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
623 ;;;###diary-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
624 (defun diary-hebrew-list-entries () |
13050 | 625 "Add any Hebrew date entries from the diary file to `diary-entries-list'. |
93734
0a5160e7009f
Update for rename hebrew-diary-entry-symbol to diary-hebrew-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93632
diff
changeset
|
626 Hebrew date diary entries must be prefaced by `diary-hebrew-entry-symbol' |
92918
3f05cbe354c1
(displayed-month, displayed-year, original-date): Move declarations
Glenn Morris <rgm@gnu.org>
parents:
92852
diff
changeset
|
627 \(normally an `H'). The same diary date forms govern the style |
3f05cbe354c1
(displayed-month, displayed-year, original-date): Move declarations
Glenn Morris <rgm@gnu.org>
parents:
92852
diff
changeset
|
628 of the Hebrew calendar entries, except that the Hebrew month |
93269
da37495d5c85
(list-hebrew-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93183
diff
changeset
|
629 names cannot be abbreviated. The Hebrew months are numbered |
92918
3f05cbe354c1
(displayed-month, displayed-year, original-date): Move declarations
Glenn Morris <rgm@gnu.org>
parents:
92852
diff
changeset
|
630 from 1 to 13 with Nisan being 1, 12 being Adar I and 13 being |
3f05cbe354c1
(displayed-month, displayed-year, original-date): Move declarations
Glenn Morris <rgm@gnu.org>
parents:
92852
diff
changeset
|
631 Adar II; you must use `Adar I' if you want Adar of a common |
3f05cbe354c1
(displayed-month, displayed-year, original-date): Move declarations
Glenn Morris <rgm@gnu.org>
parents:
92852
diff
changeset
|
632 Hebrew year. If a Hebrew date diary entry begins with |
3f05cbe354c1
(displayed-month, displayed-year, original-date): Move declarations
Glenn Morris <rgm@gnu.org>
parents:
92852
diff
changeset
|
633 `diary-nonmarking-symbol', the entry will appear in the diary |
3f05cbe354c1
(displayed-month, displayed-year, original-date): Move declarations
Glenn Morris <rgm@gnu.org>
parents:
92852
diff
changeset
|
634 listing, but will not be marked in the calendar. This function |
93795
a047f634bd60
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93753
diff
changeset
|
635 is provided for use with `diary-nongregorian-listing-hook'." |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
636 (diary-list-entries-1 calendar-hebrew-month-name-array-leap-year |
93734
0a5160e7009f
Update for rename hebrew-diary-entry-symbol to diary-hebrew-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93632
diff
changeset
|
637 diary-hebrew-entry-symbol |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
638 'calendar-hebrew-from-absolute)) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
639 ;;;###diary-autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
640 (define-obsolete-function-alias 'list-hebrew-diary-entries |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
641 'diary-hebrew-list-entries "23.1") |
13050 | 642 |
92993
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
643 (autoload 'calendar-mark-complex "diary-lib") |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
644 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
645 ;;;###diary-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
646 (defun calendar-hebrew-mark-date-pattern (month day year &optional color) |
13050 | 647 "Mark dates in calendar window that conform to Hebrew date MONTH/DAY/YEAR. |
92993
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
648 A value of 0 in any position is a wildcard. Optional argument COLOR is |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
649 passed to `calendar-mark-visible-date' as MARK." |
92993
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
650 ;; FIXME not the same as the Bahai and Islamic cases, so can't use |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
651 ;; calendar-mark-1. |
105829
328150f0cf76
* url-util.el (url-insert-entities-in-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100908
diff
changeset
|
652 (with-current-buffer calendar-buffer |
92611
297952467e34
(mark-hebrew-calendar-date-pattern): Use zerop.
Glenn Morris <rgm@gnu.org>
parents:
92583
diff
changeset
|
653 (if (and (not (zerop month)) (not (zerop day))) |
297952467e34
(mark-hebrew-calendar-date-pattern): Use zerop.
Glenn Morris <rgm@gnu.org>
parents:
92583
diff
changeset
|
654 (if (not (zerop year)) |
13050 | 655 ;; Fully specified Hebrew date. |
656 (let ((date (calendar-gregorian-from-absolute | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
657 (calendar-hebrew-to-absolute |
13050 | 658 (list month day year))))) |
659 (if (calendar-date-is-visible-p date) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
660 (calendar-mark-visible-date date color))) |
93491
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
661 ;; Month and day in any year. |
15b2492faf63
(hebrew-calendar-elapsed-days): Dox fix.
Glenn Morris <rgm@gnu.org>
parents:
93469
diff
changeset
|
662 (let ((gdate (calendar-hebrew-date-is-visible-p month day))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
663 (if gdate (calendar-mark-visible-date gdate color)))) |
92993
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
664 (calendar-mark-complex month day year |
61c2483cb400
(calendar-mark-complex): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92972
diff
changeset
|
665 'calendar-hebrew-from-absolute color)))) |
13050 | 666 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
667 ;;;###diary-autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
668 (define-obsolete-function-alias 'mark-hebrew-calendar-date-pattern |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
669 'calendar-hebrew-mark-date-pattern "23.1") |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
670 |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
671 (autoload 'diary-mark-entries-1 "diary-lib") |
86489
997f6a0ad183
(holiday-filter-visible-calendar)
Glenn Morris <rgm@gnu.org>
parents:
85510
diff
changeset
|
672 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
673 ;;;###diary-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
674 (defun diary-hebrew-mark-entries () |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
675 "Mark days in the calendar window that have Hebrew date diary entries. |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
676 Marks each entry in `diary-file' (or included files) visible in the calendar |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
677 window. See `list-hebrew-diary-entries' for more information." |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
678 (diary-mark-entries-1 'calendar-hebrew-mark-date-pattern |
93469
777bad4c4617
(Commentary): Replace with pointer to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93448
diff
changeset
|
679 calendar-hebrew-month-name-array-leap-year |
93734
0a5160e7009f
Update for rename hebrew-diary-entry-symbol to diary-hebrew-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93632
diff
changeset
|
680 diary-hebrew-entry-symbol |
93469
777bad4c4617
(Commentary): Replace with pointer to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93448
diff
changeset
|
681 'calendar-hebrew-from-absolute)) |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
682 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
683 ;;;###diary-autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
684 (define-obsolete-function-alias 'mark-hebrew-diary-entries |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
685 'diary-hebrew-mark-entries "23.1") |
93378
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
686 |
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
687 (autoload 'diary-insert-entry-1 "diary-lib") |
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
688 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
689 ;;;###cal-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
690 (defun diary-hebrew-insert-entry (arg) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
691 "Insert a diary entry for the Hebrew date at point. |
92667 | 692 Prefix argument ARG makes the entry nonmarking." |
13050 | 693 (interactive "P") |
93378
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
694 (diary-insert-entry-1 nil arg calendar-hebrew-month-name-array-leap-year |
93734
0a5160e7009f
Update for rename hebrew-diary-entry-symbol to diary-hebrew-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93632
diff
changeset
|
695 diary-hebrew-entry-symbol |
93378
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
696 'calendar-hebrew-from-absolute)) |
13050 | 697 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
698 ;;;###diary-autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
699 (define-obsolete-function-alias 'insert-hebrew-diary-entry |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
700 'diary-hebrew-insert-entry "23.1") |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
701 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
702 ;;;###cal-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
703 (defun diary-hebrew-insert-monthly-entry (arg) |
13050 | 704 "Insert a monthly diary entry. |
705 For the day of the Hebrew month corresponding to the date indicated by point. | |
92667 | 706 Prefix argument ARG makes the entry nonmarking." |
13050 | 707 (interactive "P") |
93378
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
708 (diary-insert-entry-1 'monthly arg calendar-hebrew-month-name-array-leap-year |
93734
0a5160e7009f
Update for rename hebrew-diary-entry-symbol to diary-hebrew-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93632
diff
changeset
|
709 diary-hebrew-entry-symbol |
93378
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
710 'calendar-hebrew-from-absolute)) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
711 ;;;###diary-autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
712 (define-obsolete-function-alias 'insert-monthly-hebrew-diary-entry |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
713 'diary-hebrew-insert-monthly-entry "23.1") |
13050 | 714 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
715 ;;;###cal-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
716 (defun diary-hebrew-insert-yearly-entry (arg) |
13050 | 717 "Insert an annual diary entry. |
718 For the day of the Hebrew year corresponding to the date indicated by point. | |
92667 | 719 Prefix argument ARG makes the entry nonmarking." |
13050 | 720 (interactive "P") |
93378
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
721 (diary-insert-entry-1 'yearly arg calendar-hebrew-month-name-array-leap-year |
93734
0a5160e7009f
Update for rename hebrew-diary-entry-symbol to diary-hebrew-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93632
diff
changeset
|
722 diary-hebrew-entry-symbol |
93378
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
723 'calendar-hebrew-from-absolute)) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
724 ;;;###diary-autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
725 (define-obsolete-function-alias 'insert-yearly-hebrew-diary-entry |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
726 'diary-hebrew-insert-yearly-entry "23.1") |
13050 | 727 |
728 ;;;###autoload | |
93870
eaab2dd34967
(calendar-hebrew-list-yahrzeits): Typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93844
diff
changeset
|
729 (defun calendar-hebrew-list-yahrzeits (death-date start-year end-year) |
13050 | 730 "List Yahrzeit dates for *Gregorian* DEATH-DATE from START-YEAR to END-YEAR. |
731 When called interactively from the calendar window, the date of death is taken | |
732 from the cursor position." | |
733 (interactive | |
734 (let* ((death-date | |
735 (if (equal (current-buffer) (get-buffer calendar-buffer)) | |
736 (calendar-cursor-to-date) | |
737 (let* ((today (calendar-current-date)) | |
738 (year (calendar-read | |
739 "Year of death (>0): " | |
92583 | 740 (lambda (x) (> x 0)) |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
741 (number-to-string (calendar-extract-year today)))) |
13050 | 742 (month-array calendar-month-name-array) |
743 (completion-ignore-case t) | |
54074
ae72e69df10d
(calendar-goto-hebrew-date, mark-hebrew-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
744 (month (cdr (assoc-string |
24187
cc07d0f935d4
(calendar-goto-hebrew-date)
Richard M. Stallman <rms@gnu.org>
parents:
22063
diff
changeset
|
745 (completing-read |
cc07d0f935d4
(calendar-goto-hebrew-date)
Richard M. Stallman <rms@gnu.org>
parents:
22063
diff
changeset
|
746 "Month of death (name): " |
cc07d0f935d4
(calendar-goto-hebrew-date)
Richard M. Stallman <rms@gnu.org>
parents:
22063
diff
changeset
|
747 (mapcar 'list (append month-array nil)) |
cc07d0f935d4
(calendar-goto-hebrew-date)
Richard M. Stallman <rms@gnu.org>
parents:
22063
diff
changeset
|
748 nil t) |
54074
ae72e69df10d
(calendar-goto-hebrew-date, mark-hebrew-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
749 (calendar-make-alist month-array 1) t))) |
13050 | 750 (last (calendar-last-day-of-month month year)) |
751 (day (calendar-read | |
752 (format "Day of death (1-%d): " last) | |
92583 | 753 (lambda (x) (and (< 0 x) (<= x last)))))) |
13050 | 754 (list month day year)))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
755 (death-year (calendar-extract-year death-date)) |
13050 | 756 (start-year (calendar-read |
757 (format "Starting year of Yahrzeit table (>%d): " | |
758 death-year) | |
92583 | 759 (lambda (x) (> x death-year)) |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
760 (number-to-string (1+ death-year)))) |
13050 | 761 (end-year (calendar-read |
762 (format "Ending year of Yahrzeit table (>=%d): " | |
763 start-year) | |
92852 | 764 (lambda (x) (>= x start-year))))) |
765 (list death-date start-year end-year))) | |
92667 | 766 (message "Computing Yahrzeits...") |
92817
1b8224570e5f
(list-yahrzeit-dates): Use cal-hebrew-yahrzeit-buffer.
Glenn Morris <rgm@gnu.org>
parents:
92701
diff
changeset
|
767 (let* ((h-date (calendar-hebrew-from-absolute |
13050 | 768 (calendar-absolute-from-gregorian death-date))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
769 (h-month (calendar-extract-month h-date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
770 (h-day (calendar-extract-day h-date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
771 (h-year (calendar-extract-year h-date)) |
93525
26506821c407
(list-yahrzeit-dates): Expand calendar-for-loop call.
Glenn Morris <rgm@gnu.org>
parents:
93495
diff
changeset
|
772 (i (1- start-year))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
773 (calendar-in-read-only-buffer calendar-hebrew-yahrzeit-buffer |
93025
1e3b2cf969d4
(list-yahrzeit-dates): Use calendar-in-read-only-buffer to replace
Glenn Morris <rgm@gnu.org>
parents:
92993
diff
changeset
|
774 (calendar-set-mode-line |
1e3b2cf969d4
(list-yahrzeit-dates): Use calendar-in-read-only-buffer to replace
Glenn Morris <rgm@gnu.org>
parents:
92993
diff
changeset
|
775 (format "Yahrzeit dates for %s = %s" |
1e3b2cf969d4
(list-yahrzeit-dates): Use calendar-in-read-only-buffer to replace
Glenn Morris <rgm@gnu.org>
parents:
92993
diff
changeset
|
776 (calendar-date-string death-date) |
1e3b2cf969d4
(list-yahrzeit-dates): Use calendar-in-read-only-buffer to replace
Glenn Morris <rgm@gnu.org>
parents:
92993
diff
changeset
|
777 (let ((calendar-month-name-array |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
778 (if (calendar-hebrew-leap-year-p h-year) |
93025
1e3b2cf969d4
(list-yahrzeit-dates): Use calendar-in-read-only-buffer to replace
Glenn Morris <rgm@gnu.org>
parents:
92993
diff
changeset
|
779 calendar-hebrew-month-name-array-leap-year |
1e3b2cf969d4
(list-yahrzeit-dates): Use calendar-in-read-only-buffer to replace
Glenn Morris <rgm@gnu.org>
parents:
92993
diff
changeset
|
780 calendar-hebrew-month-name-array-common-year))) |
1e3b2cf969d4
(list-yahrzeit-dates): Use calendar-in-read-only-buffer to replace
Glenn Morris <rgm@gnu.org>
parents:
92993
diff
changeset
|
781 (calendar-date-string h-date nil t)))) |
93525
26506821c407
(list-yahrzeit-dates): Expand calendar-for-loop call.
Glenn Morris <rgm@gnu.org>
parents:
93495
diff
changeset
|
782 (while (<= (setq i (1+ i)) end-year) |
93025
1e3b2cf969d4
(list-yahrzeit-dates): Use calendar-in-read-only-buffer to replace
Glenn Morris <rgm@gnu.org>
parents:
92993
diff
changeset
|
783 (insert |
1e3b2cf969d4
(list-yahrzeit-dates): Use calendar-in-read-only-buffer to replace
Glenn Morris <rgm@gnu.org>
parents:
92993
diff
changeset
|
784 (calendar-date-string |
1e3b2cf969d4
(list-yahrzeit-dates): Use calendar-in-read-only-buffer to replace
Glenn Morris <rgm@gnu.org>
parents:
92993
diff
changeset
|
785 (calendar-gregorian-from-absolute |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
786 (calendar-hebrew-yahrzeit |
93025
1e3b2cf969d4
(list-yahrzeit-dates): Use calendar-in-read-only-buffer to replace
Glenn Morris <rgm@gnu.org>
parents:
92993
diff
changeset
|
787 h-date |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
788 (calendar-extract-year |
93025
1e3b2cf969d4
(list-yahrzeit-dates): Use calendar-in-read-only-buffer to replace
Glenn Morris <rgm@gnu.org>
parents:
92993
diff
changeset
|
789 (calendar-hebrew-from-absolute |
93525
26506821c407
(list-yahrzeit-dates): Expand calendar-for-loop call.
Glenn Morris <rgm@gnu.org>
parents:
93495
diff
changeset
|
790 (calendar-absolute-from-gregorian (list 1 1 i))))))) "\n")))) |
26506821c407
(list-yahrzeit-dates): Expand calendar-for-loop call.
Glenn Morris <rgm@gnu.org>
parents:
93495
diff
changeset
|
791 (message "Computing Yahrzeits...done")) |
13050 | 792 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
793 ;;;###autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
794 (define-obsolete-function-alias 'list-yahrzeit-dates |
93870
eaab2dd34967
(calendar-hebrew-list-yahrzeits): Typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93844
diff
changeset
|
795 'calendar-hebrew-list-yahrzeits "23.1") |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
796 |
92701
6a990f964e22
(date, entry, number): Move declarations to where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92667
diff
changeset
|
797 (defvar date) |
6a990f964e22
(date, entry, number): Move declarations to where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92667
diff
changeset
|
798 |
93795
a047f634bd60
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93753
diff
changeset
|
799 ;; To be called from diary-list-sexp-entries, where DATE is bound. |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
800 ;;;###diary-autoload |
13050 | 801 (defun diary-hebrew-date () |
802 "Hebrew calendar equivalent of date diary entry." | |
803 (format "Hebrew date (until sunset): %s" (calendar-hebrew-date-string date))) | |
804 | |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
805 ;;;###diary-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
806 (defun diary-hebrew-omer (&optional mark) |
13050 | 807 "Omer count diary entry. |
46619
5d2941da3ed1
(diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha, diary-parasha):
Richard M. Stallman <rms@gnu.org>
parents:
44366
diff
changeset
|
808 Entry applies if date is within 50 days after Passover. |
5d2941da3ed1
(diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha, diary-parasha):
Richard M. Stallman <rms@gnu.org>
parents:
44366
diff
changeset
|
809 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46708
diff
changeset
|
810 An optional parameter MARK specifies a face or single-character string to |
46619
5d2941da3ed1
(diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha, diary-parasha):
Richard M. Stallman <rms@gnu.org>
parents:
44366
diff
changeset
|
811 use when highlighting the day in the calendar." |
13050 | 812 (let* ((passover |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
813 (calendar-hebrew-to-absolute |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
814 (list 1 15 (+ (calendar-extract-year date) 3760)))) |
13050 | 815 (omer (- (calendar-absolute-from-gregorian date) passover)) |
816 (week (/ omer 7)) | |
817 (day (% omer 7))) | |
818 (if (and (> omer 0) (< omer 50)) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46708
diff
changeset
|
819 (cons mark |
92852 | 820 (format "Day %d%s of the omer (until sunset)" |
821 omer | |
822 (if (zerop week) | |
823 "" | |
824 (format ", that is, %d week%s%s" | |
825 week | |
826 (if (= week 1) "" "s") | |
827 (if (zerop day) | |
828 "" | |
829 (format " and %d day%s" | |
830 day (if (= day 1) "" "s")))))))))) | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
831 ;;;###diary-autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
832 (define-obsolete-function-alias 'diary-omer 'diary-hebrew-omer "23.1") |
13050 | 833 |
92701
6a990f964e22
(date, entry, number): Move declarations to where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92667
diff
changeset
|
834 (defvar entry) |
6a990f964e22
(date, entry, number): Move declarations to where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92667
diff
changeset
|
835 |
93378
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
836 (autoload 'diary-make-date "diary-lib") |
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
837 |
95302
d63199769a1b
(diary-ordinal-suffix): Declare for compiler.
Glenn Morris <rgm@gnu.org>
parents:
95298
diff
changeset
|
838 (declare-function diary-ordinal-suffix "diary-lib" (n)) |
d63199769a1b
(diary-ordinal-suffix): Declare for compiler.
Glenn Morris <rgm@gnu.org>
parents:
95298
diff
changeset
|
839 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
840 ;;;###diary-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
841 (defun diary-hebrew-yahrzeit (death-month death-day death-year &optional mark) |
92667 | 842 "Yahrzeit diary entry--entry applies if date is Yahrzeit or the day before. |
93378
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
843 Parameters are DEATH-MONTH, DEATH-DAY, DEATH-YEAR; the diary |
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
844 entry is assumed to be the name of the person. Although the date |
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
845 of death is specified by the civil calendar, the proper Hebrew |
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
846 calendar Yahrzeit is determined. |
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
847 |
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
848 The order of the input parameters changes according to `calendar-date-style' |
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
849 \(e.g. to DEATH-DAY, DEATH-MONTH, DEATH-YEAR in the European style). |
46619
5d2941da3ed1
(diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha, diary-parasha):
Richard M. Stallman <rms@gnu.org>
parents:
44366
diff
changeset
|
850 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46708
diff
changeset
|
851 An optional parameter MARK specifies a face or single-character string to |
46619
5d2941da3ed1
(diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha, diary-parasha):
Richard M. Stallman <rms@gnu.org>
parents:
44366
diff
changeset
|
852 use when highlighting the day in the calendar." |
13050 | 853 (let* ((h-date (calendar-hebrew-from-absolute |
854 (calendar-absolute-from-gregorian | |
93378
5fce742bc681
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93269
diff
changeset
|
855 (diary-make-date death-month death-day death-year)))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
856 (h-month (calendar-extract-month h-date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
857 (h-day (calendar-extract-day h-date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
858 (h-year (calendar-extract-year h-date)) |
13050 | 859 (d (calendar-absolute-from-gregorian date)) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
860 (yr (calendar-extract-year (calendar-hebrew-from-absolute d))) |
13050 | 861 (diff (- yr h-year)) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
862 (y (calendar-hebrew-yahrzeit h-date yr))) |
13050 | 863 (if (and (> diff 0) (or (= y d) (= y (1+ d)))) |
46619
5d2941da3ed1
(diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha, diary-parasha):
Richard M. Stallman <rms@gnu.org>
parents:
44366
diff
changeset
|
864 (cons mark |
92852 | 865 (format "Yahrzeit of %s%s: %d%s anniversary" |
866 entry | |
867 (if (= y d) "" " (evening)") | |
868 diff | |
95298
e8ffa14b742c
Ed Reingold <reingold at emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
869 (diary-ordinal-suffix diff)))))) |
e8ffa14b742c
Ed Reingold <reingold at emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
870 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
871 ;;;###diary-autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
872 (define-obsolete-function-alias 'diary-yahrzeit 'diary-hebrew-yahrzeit "23.1") |
13050 | 873 |
92830
669faa35f924
Add calendar-specific autoload cookies.
Glenn Morris <rgm@gnu.org>
parents:
92817
diff
changeset
|
874 ;;;###diary-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
875 (defun diary-hebrew-rosh-hodesh (&optional mark) |
13050 | 876 "Rosh Hodesh diary entry. |
46619
5d2941da3ed1
(diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha, diary-parasha):
Richard M. Stallman <rms@gnu.org>
parents:
44366
diff
changeset
|
877 Entry applies if date is Rosh Hodesh, the day before, or the Saturday before. |
5d2941da3ed1
(diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha, diary-parasha):
Richard M. Stallman <rms@gnu.org>
parents:
44366
diff
changeset
|
878 |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46708
diff
changeset
|
879 An optional parameter MARK specifies a face or single-character string to |
46619
5d2941da3ed1
(diary-omer, diary-yahrzeit, diary-rosh-hodesh, diary-parasha, diary-parasha):
Richard M. Stallman <rms@gnu.org>
parents:
44366
diff
changeset
|
880 use when highlighting the day in the calendar." |
13050 | 881 (let* ((d (calendar-absolute-from-gregorian date)) |
882 (h-date (calendar-hebrew-from-absolute d)) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
883 (h-month (calendar-extract-month h-date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
884 (h-day (calendar-extract-day h-date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
885 (h-year (calendar-extract-year h-date)) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
886 (leap-year (calendar-hebrew-leap-year-p h-year)) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
887 (last-day (calendar-hebrew-last-day-of-month h-month h-year)) |
13050 | 888 (h-month-names |
889 (if leap-year | |
890 calendar-hebrew-month-name-array-leap-year | |
891 calendar-hebrew-month-name-array-common-year)) | |
892 (this-month (aref h-month-names (1- h-month))) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
893 (h-yesterday (calendar-extract-day |
13050 | 894 (calendar-hebrew-from-absolute (1- d))))) |
895 (if (or (= h-day 30) (and (= h-day 1) (/= h-month 7))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46708
diff
changeset
|
896 (cons mark |
92852 | 897 (format |
898 "Rosh Hodesh %s" | |
899 (if (= h-day 30) | |
900 (format | |
901 "%s (first day)" | |
902 ;; Next month must be in the same year since this | |
903 ;; month can't be the last month of the year since | |
904 ;; it has 30 days | |
905 (aref h-month-names h-month)) | |
906 (if (= h-yesterday 30) | |
907 (format "%s (second day)" this-month) | |
908 this-month)))) | |
909 (if (= (% d 7) 6) ; Saturday--check for Shabbat Mevarchim | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46708
diff
changeset
|
910 (cons mark |
92852 | 911 (cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day)) |
912 (format "Mevarchim Rosh Hodesh %s (%s)" | |
913 (aref h-month-names | |
914 (if (= h-month | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
915 (calendar-hebrew-last-month-of-year |
92852 | 916 h-year)) |
917 0 h-month)) | |
918 (aref calendar-day-name-array (- 29 h-day)))) | |
919 ((and (< h-day 30) (> h-day 22) (= 30 last-day)) | |
920 (format "Mevarchim Rosh Hodesh %s (%s-%s)" | |
921 (aref h-month-names h-month) | |
922 (if (= h-day 29) | |
923 "tomorrow" | |
924 (aref calendar-day-name-array (- 29 h-day))) | |
925 (aref calendar-day-name-array | |
926 (% (- 30 h-day) 7)))))) | |
13050 | 927 (if (and (= h-day 29) (/= h-month 6)) |
46708
e82d42ccd30b
(diary-rosh-hodesh): Cons MARK on in the third case.
Richard M. Stallman <rms@gnu.org>
parents:
46619
diff
changeset
|
928 (cons mark |
92852 | 929 (format "Erev Rosh Hodesh %s" |
930 (aref h-month-names | |
931 (if (= h-month | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
932 (calendar-hebrew-last-month-of-year |
92852 | 933 h-year)) |
934 0 h-month))))))))) | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
935 ;;;###diary-autoload |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
936 (define-obsolete-function-alias 'diary-rosh-hodesh |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
937 'diary-hebrew-rosh-hodesh "23.1") |
13050 | 938 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
939 (defconst calendar-hebrew-parashiot-names |
92852 | 940 ["Bereshith" "Noah" "Lech L'cha" "Vayera" "Hayei Sarah" "Toledoth" |
941 "Vayetze" "Vayishlah" "Vayeshev" "Mikketz" "Vayiggash" "Vayhi" | |
942 "Shemoth" "Vaera" "Bo" "Beshallah" "Yithro" "Mishpatim" | |
943 "Terumah" "Tetzavveh" "Ki Tissa" "Vayakhel" "Pekudei" "Vayikra" | |
944 "Tzav" "Shemini" "Tazria" "Metzora" "Aharei Moth" "Kedoshim" | |
945 "Emor" "Behar" "Behukkotai" "Bemidbar" "Naso" "Behaalot'cha" | |
946 "Shelah L'cha" "Korah" "Hukkath" "Balak" "Pinhas" "Mattoth" | |
947 "Masei" "Devarim" "Vaethanan" "Ekev" "Reeh" "Shofetim" | |
948 "Ki Tetze" "Ki Tavo" "Nitzavim" "Vayelech" "Haazinu"] | |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
949 "The names of the parashiot in the Torah.") |
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
950 |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
951 (defun calendar-hebrew-parasha-name (p) |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
952 "Name(s) corresponding to parasha P." |
92852 | 953 (if (arrayp p) ; combined parasha |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
954 (format "%s/%s" |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
955 (aref calendar-hebrew-parashiot-names (aref p 0)) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
956 (aref calendar-hebrew-parashiot-names (aref p 1))) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
957 (aref calendar-hebrew-parashiot-names p))) |
52118
af8f4ec2f255
Reposition some code so defined before used.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
958 |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
959 ;; Following 14 constants are used in diary-parasha (intern). |
92918
3f05cbe354c1
(displayed-month, displayed-year, original-date): Move declarations
Glenn Morris <rgm@gnu.org>
parents:
92852
diff
changeset
|
960 |
92658 | 961 ;; The seven ordinary year types (keviot). |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
962 (defconst calendar-hebrew-year-Saturday-incomplete-Sunday |
13050 | 963 [nil 52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 [21 22] |
92852 | 964 23 24 nil 25 [26 27] [28 29] 30 [31 32] 33 34 35 36 37 38 39 40 [41 42] |
965 43 44 45 46 47 48 49 50] | |
13050 | 966 "The structure of the parashiot. |
967 Hebrew year starts on Saturday, is `incomplete' (Heshvan and Kislev each have | |
968 29 days), and has Passover start on Sunday.") | |
969 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
970 (defconst calendar-hebrew-year-Saturday-complete-Tuesday |
13050 | 971 [nil 52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 [21 22] |
92852 | 972 23 24 nil 25 [26 27] [28 29] 30 [31 32] 33 34 35 36 37 38 39 40 [41 42] |
973 43 44 45 46 47 48 49 [50 51]] | |
13050 | 974 "The structure of the parashiot. |
975 Hebrew year that starts on Saturday, is `complete' (Heshvan and Kislev each | |
976 have 30 days), and has Passover start on Tuesday.") | |
977 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
978 (defconst calendar-hebrew-year-Monday-incomplete-Tuesday |
13050 | 979 [51 52 nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 [21 22] |
92852 | 980 23 24 nil 25 [26 27] [28 29] 30 [31 32] 33 34 35 36 37 38 39 40 [41 42] |
981 43 44 45 46 47 48 49 [50 51]] | |
13050 | 982 "The structure of the parashiot. |
983 Hebrew year that starts on Monday, is `incomplete' (Heshvan and Kislev each | |
984 have 29 days), and has Passover start on Tuesday.") | |
985 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
986 (defconst calendar-hebrew-year-Monday-complete-Thursday |
13050 | 987 [51 52 nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 [21 22] |
92852 | 988 23 24 nil 25 [26 27] [28 29] 30 [31 32] 33 (nil . 34) (34 . 35) (35 . 36) |
989 (36 . 37) (37 . 38) ([38 39] . 39) 40 [41 42] 43 44 45 46 47 48 49 [50 51]] | |
13050 | 990 "The structure of the parashiot. |
991 Hebrew year that starts on Monday, is `complete' (Heshvan and Kislev each have | |
992 30 days), and has Passover start on Thursday.") | |
993 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
994 (defconst calendar-hebrew-year-Tuesday-regular-Thursday |
13050 | 995 [51 52 nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 [21 22] |
92852 | 996 23 24 nil 25 [26 27] [28 29] 30 [31 32] 33 (nil . 34) (34 . 35) (35 . 36) |
997 (36 . 37) (37 . 38) ([38 39] . 39) 40 [41 42] 43 44 45 46 47 48 49 [50 51]] | |
13050 | 998 "The structure of the parashiot. |
999 Hebrew year that starts on Tuesday, is `regular' (Heshvan has 29 days and | |
1000 Kislev has 30 days), and has Passover start on Thursday.") | |
1001 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1002 (defconst calendar-hebrew-year-Thursday-regular-Saturday |
13050 | 1003 [52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 [21 22] 23 |
92852 | 1004 24 nil (nil . 25) (25 . [26 27]) ([26 27] . [28 29]) ([28 29] . 30) |
1005 (30 . 31) ([31 32] . 32) 33 34 35 36 37 38 39 40 [41 42] 43 44 45 46 47 48 | |
1006 49 50] | |
13050 | 1007 "The structure of the parashiot. |
1008 Hebrew year that starts on Thursday, is `regular' (Heshvan has 29 days and | |
1009 Kislev has 30 days), and has Passover start on Saturday.") | |
1010 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1011 (defconst calendar-hebrew-year-Thursday-complete-Sunday |
13050 | 1012 [52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 |
92852 | 1013 23 24 nil 25 [26 27] [28 29] 30 [31 32] 33 34 35 36 37 38 39 40 [41 42] |
1014 43 44 45 46 47 48 49 50] | |
13050 | 1015 "The structure of the parashiot. |
1016 Hebrew year that starts on Thursday, is `complete' (Heshvan and Kislev each | |
1017 have 30 days), and has Passover start on Sunday.") | |
1018 | |
92658 | 1019 ;; The seven leap year types (keviot). |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1020 (defconst calendar-hebrew-year-Saturday-incomplete-Tuesday |
13050 | 1021 [nil 52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 |
92852 | 1022 23 24 25 26 27 nil 28 29 30 31 32 33 34 35 36 37 38 39 40 [41 42] |
1023 43 44 45 46 47 48 49 [50 51]] | |
13050 | 1024 "The structure of the parashiot. |
1025 Hebrew year that starts on Saturday, is `incomplete' (Heshvan and Kislev each | |
1026 have 29 days), and has Passover start on Tuesday.") | |
1027 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1028 (defconst calendar-hebrew-year-Saturday-complete-Thursday |
13050 | 1029 [nil 52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 |
92852 | 1030 23 24 25 26 27 nil 28 29 30 31 32 33 (nil . 34) (34 . 35) (35 . 36) |
1031 (36 . 37) (37 . 38) ([38 39] . 39) 40 [41 42] 43 44 45 46 47 48 49 [50 51]] | |
13050 | 1032 "The structure of the parashiot. |
1033 Hebrew year that starts on Saturday, is `complete' (Heshvan and Kislev each | |
1034 have 30 days), and has Passover start on Thursday.") | |
1035 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1036 (defconst calendar-hebrew-year-Monday-incomplete-Thursday |
13050 | 1037 [51 52 nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 |
92852 | 1038 23 24 25 26 27 nil 28 29 30 31 32 33 (nil . 34) (34 . 35) (35 . 36) |
1039 (36 . 37) (37 . 38) ([38 39] . 39) 40 [41 42] 43 44 45 46 47 48 49 [50 51]] | |
13050 | 1040 "The structure of the parashiot. |
1041 Hebrew year that starts on Monday, is `incomplete' (Heshvan and Kislev each | |
1042 have 29 days), and has Passover start on Thursday.") | |
1043 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1044 (defconst calendar-hebrew-year-Monday-complete-Saturday |
13050 | 1045 [51 52 nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 |
92852 | 1046 23 24 25 26 27 nil (nil . 28) (28 . 29) (29 . 30) (30 . 31) (31 . 32) |
1047 (32 . 33) (33 . 34) (34 . 35) (35 . 36) (36 . 37) (37 . 38) (38 . 39) | |
1048 (39 . 40) (40 . 41) ([41 42] . 42) 43 44 45 46 47 48 49 50] | |
13050 | 1049 "The structure of the parashiot. |
1050 Hebrew year that starts on Monday, is `complete' (Heshvan and Kislev each have | |
1051 30 days), and has Passover start on Saturday.") | |
1052 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1053 (defconst calendar-hebrew-year-Tuesday-regular-Saturday |
13050 | 1054 [51 52 nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 |
92852 | 1055 23 24 25 26 27 nil (nil . 28) (28 . 29) (29 . 30) (30 . 31) (31 . 32) |
1056 (32 . 33) (33 . 34) (34 . 35) (35 . 36) (36 . 37) (37 . 38) (38 . 39) | |
1057 (39 . 40) (40 . 41) ([41 42] . 42) 43 44 45 46 47 48 49 50] | |
13050 | 1058 "The structure of the parashiot. |
1059 Hebrew year that starts on Tuesday, is `regular' (Heshvan has 29 days and | |
1060 Kislev has 30 days), and has Passover start on Saturday.") | |
1061 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1062 (defconst calendar-hebrew-year-Thursday-incomplete-Sunday |
13050 | 1063 [52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 |
92852 | 1064 23 24 25 26 27 28 nil 29 30 31 32 33 34 35 36 37 38 39 40 41 42 |
1065 43 44 45 46 47 48 49 50] | |
13050 | 1066 "The structure of the parashiot. |
1067 Hebrew year that starts on Thursday, is `incomplete' (Heshvan and Kislev both | |
1068 have 29 days), and has Passover start on Sunday.") | |
1069 | |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1070 (defconst calendar-hebrew-year-Thursday-complete-Tuesday |
13050 | 1071 [52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 |
92852 | 1072 23 24 25 26 27 28 nil 29 30 31 32 33 34 35 36 37 38 39 40 41 42 |
1073 43 44 45 46 47 48 49 [50 51]] | |
13050 | 1074 "The structure of the parashiot. |
1075 Hebrew year that starts on Thursday, is `complete' (Heshvan and Kislev both | |
1076 have 30 days), and has Passover start on Tuesday.") | |
1077 | |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1078 ;;;###diary-autoload |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1079 (defun diary-hebrew-parasha (&optional mark) |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1080 "Parasha diary entry--entry applies if date is a Saturday. |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1081 An optional parameter MARK specifies a face or single-character string to |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1082 use when highlighting the day in the calendar." |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1083 (let ((d (calendar-absolute-from-gregorian date))) |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1084 (if (= (% d 7) 6) ; Saturday |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93795
diff
changeset
|
1085 (let* ((h-year (calendar-extract-year |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1086 (calendar-hebrew-from-absolute d))) |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1087 (rosh-hashanah |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1088 (calendar-hebrew-to-absolute (list 7 1 h-year))) |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1089 (passover |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1090 (calendar-hebrew-to-absolute (list 1 15 h-year))) |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1091 (rosh-hashanah-day |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1092 (aref calendar-day-name-array (% rosh-hashanah 7))) |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1093 (passover-day |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1094 (aref calendar-day-name-array (% passover 7))) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1095 (long-h (calendar-hebrew-long-heshvan-p h-year)) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1096 (short-k (calendar-hebrew-short-kislev-p h-year)) |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1097 (type (cond ((and long-h (not short-k)) "complete") |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1098 ((and (not long-h) short-k) "incomplete") |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1099 (t "regular"))) |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1100 (year-format |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1101 (symbol-value |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1102 (intern (format "calendar-hebrew-year-%s-%s-%s" ; keviah |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1103 rosh-hashanah-day type passover-day)))) |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1104 (first-saturday ; of Hebrew year |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1105 (calendar-dayname-on-or-before 6 (+ 6 rosh-hashanah))) |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1106 (saturday ; which Saturday of the Hebrew year |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1107 (/ (- d first-saturday) 7)) |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1108 (parasha (aref year-format saturday))) |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1109 (if parasha |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1110 (cons mark |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1111 (format |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1112 "Parashat %s" |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1113 (if (listp parasha) ; Israel differs from diaspora |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1114 (if (car parasha) |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1115 (format "%s (diaspora), %s (Israel)" |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1116 (calendar-hebrew-parasha-name |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1117 (car parasha)) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1118 (calendar-hebrew-parasha-name |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1119 (cdr parasha))) |
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1120 (format "%s (Israel)" |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1121 (calendar-hebrew-parasha-name |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1122 (cdr parasha)))) |
93738
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1123 (calendar-hebrew-parasha-name parasha))))))))) |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1124 |
0a604bbef4db
(calendar-hebrew-leap-year-p): Rename hebrew-calendar-leap-year-p.
Glenn Morris <rgm@gnu.org>
parents:
93734
diff
changeset
|
1125 (define-obsolete-function-alias 'diary-parasha 'diary-hebrew-parasha "23.1") |
92972
81a28241fa57
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92918
diff
changeset
|
1126 |
93750
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1127 |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1128 (declare-function solar-setup "solar" ()) |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1129 (declare-function solar-sunrise-sunset "solar" (date)) |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1130 (defvar calendar-latitude) |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1131 (defvar calendar-longitude) |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1132 (defvar calendar-time-zone) |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1133 |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1134 |
93795
a047f634bd60
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93753
diff
changeset
|
1135 ;; To be called from diary-list-sexp-entries, where DATE is bound. |
93750
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1136 ;;;###diary-autoload |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1137 (defun diary-hebrew-sabbath-candles (&optional mark) |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1138 "Local time of candle lighting diary entry--applies if date is a Friday. |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1139 No diary entry if there is no sunset on that date. Uses |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1140 `diary-hebrew-sabbath-candles-minutes'. |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1141 |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1142 An optional parameter MARK specifies a face or single-character string to |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1143 use when highlighting the day in the calendar." |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1144 (require 'solar) |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1145 (or (and calendar-latitude calendar-longitude calendar-time-zone) |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1146 (solar-setup)) |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1147 (if (= (% (calendar-absolute-from-gregorian date) 7) 5) ; Friday |
93753
a0a31b0153ed
(diary-hebrew-sabbath-candles): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
93750
diff
changeset
|
1148 (let ((sunset (cadr (solar-sunrise-sunset date)))) |
93750
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1149 (if sunset |
93753
a0a31b0153ed
(diary-hebrew-sabbath-candles): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
93750
diff
changeset
|
1150 (cons mark (format |
a0a31b0153ed
(diary-hebrew-sabbath-candles): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
93750
diff
changeset
|
1151 "%s Sabbath candle lighting" |
a0a31b0153ed
(diary-hebrew-sabbath-candles): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
93750
diff
changeset
|
1152 (apply 'solar-time-string |
a0a31b0153ed
(diary-hebrew-sabbath-candles): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
93750
diff
changeset
|
1153 (cons (- (car sunset) |
a0a31b0153ed
(diary-hebrew-sabbath-candles): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
93750
diff
changeset
|
1154 (/ diary-hebrew-sabbath-candles-minutes |
a0a31b0153ed
(diary-hebrew-sabbath-candles): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
93750
diff
changeset
|
1155 60.0)) |
a0a31b0153ed
(diary-hebrew-sabbath-candles): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
93750
diff
changeset
|
1156 (cdr sunset))))))))) |
93750
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1157 |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1158 ;;;###diary-autoload |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1159 (define-obsolete-function-alias 'diary-sabbath-candles |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1160 'diary-hebrew-sabbath-candles "23.1") |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1161 |
6b7951a8cc36
(diary-hebrew-sabbath-candles-minutes, diary-hebrew-sabbath-candles):
Glenn Morris <rgm@gnu.org>
parents:
93738
diff
changeset
|
1162 |
13050 | 1163 (provide 'cal-hebrew) |
1164 | |
92583 | 1165 ;; arch-tag: aaab6718-7712-42ac-a32d-28fe1f944f3c |
13050 | 1166 ;;; cal-hebrew.el ends here |