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