Mercurial > emacs
annotate lisp/calendar/cal-bahai.el @ 92902:d77fc175bcfc
Re-indent.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 14 Mar 2008 03:10:37 +0000 |
parents | d72b782e6c81 |
children | e6b06f524f2b |
rev | line source |
---|---|
92578
8b2b620788b7
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
1 ;;; cal-bahai.el --- calendar functions for the Bahá'í calendar. |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
2 |
79703 | 3 ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
68721 | 4 ;; Free Software Foundation, Inc. |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
5 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
6 ;; Author: John Wiegley <johnw@gnu.org> |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
7 ;; Keywords: calendar |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
8 ;; Human-Keywords: Bahá'í calendar, Bahá'í, Baha'i, Bahai, calendar, diary |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
9 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
10 ;; This file is part of GNU Emacs. |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
11 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
13 ;; it under the terms of the GNU General Public License as published by |
78216
93e11478c954
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
14 ;; the Free Software Foundation; either version 3, or (at your option) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
15 ;; any later version. |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
16 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
17 ;; GNU Emacs is distributed in the hope that it will be useful, |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
20 ;; GNU General Public License for more details. |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
21 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
22 ;; You should have received a copy of the GNU General Public License |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64085 | 24 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
25 ;; Boston, MA 02110-1301, USA. | |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
26 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
27 ;;; Commentary: |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
28 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
29 ;; This collection of functions implements the features of calendar.el |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
30 ;; and diary.el that deal with the Bahá'í calendar. |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
31 |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
32 ;; The Bahá'í (http://www.bahai.org) calendar system is based on a |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
33 ;; solar cycle of 19 months with 19 days each. The four remaining |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
34 ;; "intercalary" days are called the Ayyám-i-Há (days of Há), and are |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
35 ;; placed between the 18th and 19th months. They are meant as a time |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
36 ;; of festivals preceding the 19th month, which is the month of |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
37 ;; fasting. In Gregorian leap years, there are 5 of these days (Há |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
38 ;; has the numerical value of 5 in the arabic abjad, or |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
39 ;; letter-to-number, reckoning). |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
40 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
41 ;; Each month is named after an attribute of God, as are the 19 days |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
42 ;; -- which have the same names as the months. There is also a name |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
43 ;; for each year in every 19 year cycle. These cycles are called |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
44 ;; Váhids. A cycle of 19 Váhids (361 years) is called a Kullu-Shay, |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
45 ;; which means "all things". |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
46 |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
47 ;; The calendar was named the "Badí` calendar" by its author, the Báb. |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
48 ;; It uses a week of seven days, corresponding to the Gregorian week, |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
49 ;; each of which has its own name, again patterned after the |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
50 ;; attributes of God. |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
51 |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
52 ;; Note: The days of Ayyám-i-Há are encoded as zero and negative |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
53 ;; offsets from the first day of the final month. So, (19 -3 157) is |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
54 ;; the first day of Ayyám-i-Há, in the year 157 BE. |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
55 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
56 ;;; Code: |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
57 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
58 (require 'cal-julian) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
59 |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
60 (defconst calendar-bahai-month-name-array |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
61 ["Bahá" "Jalál" "Jamál" "`Azamat" "Núr" "Rahmat" "Kalimát" "Kamál" |
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
62 "Asmá" "`Izzat" "Mashiyyat" "`Ilm" "Qudrat" "Qawl" "Masá'il" |
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
63 "Sharaf" "Sultán" "Mulk" "`Alá"]) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
64 |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
65 (defconst calendar-bahai-epoch (calendar-absolute-from-gregorian '(3 21 1844)) |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
66 "Absolute date of start of Bahá'í calendar = March 19, 622 A.D. (Julian).") |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
67 |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
68 (defun calendar-bahai-leap-year-p (year) |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
69 "True if YEAR is a leap year on the Bahá'í calendar." |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
70 (calendar-leap-year-p (+ year 1844))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
71 |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
72 (defconst calendar-bahai-leap-base |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
73 (+ (/ 1844 4) (- (/ 1844 100)) (/ 1844 400))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
74 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
75 (defun calendar-absolute-from-bahai (date) |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
76 "Compute absolute date from Bahá'í date DATE. |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
77 The absolute date is the number of days elapsed since the (imaginary) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
78 Gregorian date Sunday, December 31, 1 BC." |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
79 (let* ((month (extract-calendar-month date)) |
92849 | 80 (day (extract-calendar-day date)) |
81 (year (extract-calendar-year date)) | |
82 (prior-years (+ (1- year) 1844)) | |
83 (leap-days (- (+ (/ prior-years 4) ; leap days in prior years | |
84 (- (/ prior-years 100)) | |
85 (/ prior-years 400)) | |
86 calendar-bahai-leap-base))) | |
87 (+ (1- calendar-bahai-epoch) ; days before epoch | |
88 (* 365 (1- year)) ; days in prior years | |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
89 leap-days |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
90 (calendar-sum m 1 (< m month) 19) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
91 (if (= month 19) 4 0) |
92849 | 92 day))) ; days so far this month |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
93 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
94 (defun calendar-bahai-from-absolute (date) |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
95 "Bahá'í year corresponding to the absolute DATE." |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
96 (if (< date calendar-bahai-epoch) |
92652 | 97 (list 0 0 0) ; pre-Bahá'í date |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
98 (let* ((greg (calendar-gregorian-from-absolute date)) |
92849 | 99 (year (+ (- (extract-calendar-year greg) 1844) |
100 (if (or (> (extract-calendar-month greg) 3) | |
101 (and (= (extract-calendar-month greg) 3) | |
102 (>= (extract-calendar-day greg) 21))) | |
103 1 0))) | |
92652 | 104 (month ; search forward from Baha |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
105 (1+ (calendar-sum m 1 |
92849 | 106 (> date |
107 (calendar-absolute-from-bahai | |
108 (list m 19 year))) | |
109 1))) | |
92652 | 110 (day ; calculate the day by subtraction |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
111 (- date |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
112 (1- (calendar-absolute-from-bahai (list month 1 year)))))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
113 (list month day year)))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
114 |
92826
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
115 ;;;###cal-autoload |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
116 (defun calendar-bahai-date-string (&optional date) |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
117 "String of Bahá'í date of Gregorian DATE. |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
118 Defaults to today's date if DATE is not given." |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
119 (let* ((bahai-date (calendar-bahai-from-absolute |
92849 | 120 (calendar-absolute-from-gregorian |
121 (or date (calendar-current-date))))) | |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
122 (y (extract-calendar-year bahai-date)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
123 (m (extract-calendar-month bahai-date)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
124 (d (extract-calendar-day bahai-date))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
125 (let ((monthname |
92849 | 126 (if (and (= m 19) |
127 (<= d 0)) | |
128 "Ayyám-i-Há" | |
129 (aref calendar-bahai-month-name-array (1- m)))) | |
130 (day (int-to-string | |
131 (if (<= d 0) | |
132 (if (calendar-bahai-leap-year-p y) | |
133 (+ d 5) | |
134 (+ d 4)) | |
135 d))) | |
136 (dayname nil) | |
137 (month (int-to-string m)) | |
138 (year (int-to-string y))) | |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
139 (mapconcat 'eval calendar-date-display-form "")))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
140 |
92826
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
141 ;;;###cal-autoload |
84581
96df62307dfc
(mark-bahai-diary-entries): Fix up typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82833
diff
changeset
|
142 (defun calendar-bahai-print-date () |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
143 "Show the Bahá'í calendar equivalent of the selected date." |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
144 (interactive) |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
145 (message "Bahá'í date: %s" |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
146 (calendar-bahai-date-string (calendar-cursor-to-date t)))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
147 |
92826
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
148 ;;;###cal-autoload |
84581
96df62307dfc
(mark-bahai-diary-entries): Fix up typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82833
diff
changeset
|
149 (defun calendar-bahai-goto-date (date &optional noecho) |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
150 "Move cursor to Bahá'í date DATE. |
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
151 Echo Bahá'í date unless NOECHO is t." |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
152 (interactive (calendar-bahai-prompt-for-date)) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
153 (calendar-goto-date (calendar-gregorian-from-absolute |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
154 (calendar-absolute-from-bahai date))) |
84581
96df62307dfc
(mark-bahai-diary-entries): Fix up typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82833
diff
changeset
|
155 (or noecho (calendar-bahai-print-date))) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
156 |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
157 (defun calendar-bahai-prompt-for-date () |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
158 "Ask for a Bahá'í date." |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
159 (let* ((today (calendar-current-date)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
160 (year (calendar-read |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
161 "Bahá'í calendar year (not 0): " |
92615
3dd341aae76d
(calendar-bahai-prompt-for-date, calendar-bahai-mark-date-pattern):
Glenn Morris <rgm@gnu.org>
parents:
92578
diff
changeset
|
162 (lambda (x) (not (zerop x))) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
163 (int-to-string |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
164 (extract-calendar-year |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
165 (calendar-bahai-from-absolute |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
166 (calendar-absolute-from-gregorian today)))))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
167 (completion-ignore-case t) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
168 (month (cdr (assoc |
92849 | 169 (completing-read |
170 "Bahá'í calendar month name: " | |
171 (mapcar 'list | |
172 (append calendar-bahai-month-name-array nil)) | |
173 nil t) | |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
174 (calendar-make-alist calendar-bahai-month-name-array |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
175 1)))) |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
176 (day (calendar-read "Bahá'í calendar day (1-19): " |
92849 | 177 (lambda (x) (and (< 0 x) (<= x 19)))))) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
178 (list (list month day year)))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
179 |
92826
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
180 (defvar displayed-month) |
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
181 (defvar displayed-year) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
182 |
92826
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
183 ;;;###holiday-autoload |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
184 (defun holiday-bahai (month day string) |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
185 "Holiday on MONTH, DAY (Bahá'í) called STRING. |
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
186 If MONTH, DAY (Bahá'í) is visible, the value returned is corresponding |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
187 Gregorian date in the form of the list (((month day year) STRING)). Returns |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
188 nil if it is not visible in the current calendar window." |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
189 (let* ((bahai-date (calendar-bahai-from-absolute |
92849 | 190 (calendar-absolute-from-gregorian |
191 (list displayed-month 15 displayed-year)))) | |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
192 (m (extract-calendar-month bahai-date)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
193 (y (extract-calendar-year bahai-date)) |
92849 | 194 (date)) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
195 (if (< m 1) |
92849 | 196 nil ; Bahá'í calendar doesn't apply |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
197 (increment-calendar-month m y (- 10 month)) |
92849 | 198 (if (> m 7) ; Bahá'í date might be visible |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
199 (let ((date (calendar-gregorian-from-absolute |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
200 (calendar-absolute-from-bahai (list month day y))))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
201 (if (calendar-date-is-visible-p date) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
202 (list (list date string)))))))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
203 |
92826
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
204 (defvar number) |
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
205 (defvar original-date) |
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
206 |
86488
41a473ff321a
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
84590
diff
changeset
|
207 ;; d-b-l-e should be called from diary code. |
41a473ff321a
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
84590
diff
changeset
|
208 (declare-function add-to-diary-list "diary-lib" |
41a473ff321a
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
84590
diff
changeset
|
209 (date string specifier &optional marker globcolor literal)) |
41a473ff321a
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
84590
diff
changeset
|
210 |
92826
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
211 ;;;###diary-autoload |
84581
96df62307dfc
(mark-bahai-diary-entries): Fix up typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82833
diff
changeset
|
212 (defun diary-bahai-list-entries () |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
213 "Add any Bahá'í date entries from the diary file to `diary-entries-list'. |
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
214 Bahá'í date diary entries must be prefaced by an |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
215 `bahai-diary-entry-symbol' (normally a `B'). The same diary date |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
216 forms govern the style of the Bahá'í calendar entries, except that the |
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
217 Bahá'í month names must be given numerically. The Bahá'í months are |
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
218 numbered from 1 to 19 with Bahá being 1 and 19 being `Alá. If a |
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
219 Bahá'í date diary entry begins with a `diary-nonmarking-symbol', the |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
220 entry will appear in the diary listing, but will not be marked in the |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
221 calendar. This function is provided for use with the |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
222 `nongregorian-diary-listing-hook'." |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
223 (if (< 0 number) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
224 (let ((buffer-read-only nil) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
225 (diary-modified (buffer-modified-p)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
226 (gdate original-date) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
227 (mark (regexp-quote diary-nonmarking-symbol))) |
82082
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
228 (dotimes (idummy number) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
229 (let* ((d diary-date-forms) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
230 (bdate (calendar-bahai-from-absolute |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
231 (calendar-absolute-from-gregorian gdate))) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
232 (month (extract-calendar-month bdate)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
233 (day (extract-calendar-day bdate)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
234 (year (extract-calendar-year bdate))) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
235 (while d |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
236 (let* |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
237 ((date-form (if (equal (car (car d)) 'backup) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
238 (cdr (car d)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
239 (car d))) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
240 (backup (equal (car (car d)) 'backup)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
241 (dayname |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
242 (concat |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
243 (calendar-day-name gdate) "\\|" |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
244 (substring (calendar-day-name gdate) 0 3) ".?")) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
245 (calendar-month-name-array |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
246 calendar-bahai-month-name-array) |
82082
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
247 (monthname |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
248 (concat |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
249 "\\*\\|" |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
250 (calendar-month-name month))) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
251 (month (concat "\\*\\|0*" (int-to-string month))) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
252 (day (concat "\\*\\|0*" (int-to-string day))) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
253 (year |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
254 (concat |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
255 "\\*\\|0*" (int-to-string year) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
256 (if abbreviated-calendar-year |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
257 (concat "\\|" (int-to-string (% year 100))) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
258 ""))) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
259 (regexp |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
260 (concat |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
261 "\\(\\`\\|\^M\\|\n\\)" mark "?" |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
262 (regexp-quote bahai-diary-entry-symbol) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
263 "\\(" |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
264 (mapconcat 'eval date-form "\\)\\(") |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
265 "\\)")) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
266 (case-fold-search t)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
267 (goto-char (point-min)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
268 (while (re-search-forward regexp nil t) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
269 (if backup (re-search-backward "\\<" nil t)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
270 (if (and (or (char-equal (preceding-char) ?\^M) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
271 (char-equal (preceding-char) ?\n)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
272 (not (looking-at " \\|\^I"))) |
92652 | 273 ;; Diary entry that consists only of date. |
82082
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
274 (backward-char 1) |
92652 | 275 ;; Found a nonempty diary entry--make it visible and |
276 ;; add it to the list. | |
82082
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
277 (let ((entry-start (point)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
278 (date-start)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
279 (re-search-backward "\^M\\|\n\\|\\`") |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
280 (setq date-start (point)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
281 (re-search-forward "\^M\\|\n" nil t 2) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
282 (while (looking-at " \\|\^I") |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
283 (re-search-forward "\^M\\|\n" nil t)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
284 (backward-char 1) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
285 (subst-char-in-region date-start (point) ?\^M ?\n t) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
286 (add-to-diary-list |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
287 gdate |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
288 (buffer-substring-no-properties entry-start (point)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
289 (buffer-substring-no-properties |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
290 (1+ date-start) (1- entry-start))))))) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
291 (setq d (cdr d)))) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
292 (setq gdate |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
293 (calendar-gregorian-from-absolute |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
294 (1+ (calendar-absolute-from-gregorian gdate))))) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
295 (set-buffer-modified-p diary-modified)) |
62a75b41aa25
(list-bahai-diary-entries): Use dotimes rather than calendar-for-loop.
Glenn Morris <rgm@gnu.org>
parents:
78143
diff
changeset
|
296 (goto-char (point-min)))) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
297 |
86488
41a473ff321a
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
84590
diff
changeset
|
298 (declare-function diary-name-pattern "diary-lib" |
41a473ff321a
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
84590
diff
changeset
|
299 (string-array &optional abbrev-array paren)) |
41a473ff321a
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
84590
diff
changeset
|
300 |
41a473ff321a
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
84590
diff
changeset
|
301 (declare-function mark-calendar-days-named "diary-lib" |
41a473ff321a
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
84590
diff
changeset
|
302 (dayname &optional color)) |
41a473ff321a
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
84590
diff
changeset
|
303 |
92826
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
304 ;;;###diary-autoload |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
305 (defun diary-bahai-mark-entries () |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
306 "Mark days in the calendar window that have Bahá'í date diary entries. |
92659 | 307 Each entry in `diary-file' (or included files) visible in the calendar |
308 window is marked. Bahá'í date entries are prefaced by | |
309 `bahai-diary-entry-symbol' (normally a \"B\"). The same | |
310 `diary-date-forms' govern the style of the Bahá'í calendar entries, | |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
311 except that the Bahá'í month names must be spelled in full. The |
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
312 Bahá'í months are numbered from 1 to 12 with Bahá being 1 and 12 being |
92659 | 313 `Alá. Bahá'í date diary entries that begin with `diary-nonmarking-symbol' |
314 will not be marked in the calendar. This function is provided for use as | |
315 part of `nongregorian-diary-marking-hook'." | |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
316 (let ((d diary-date-forms)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
317 (while d |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
318 (let* |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
319 ((date-form (if (equal (car (car d)) 'backup) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
320 (cdr (car d)) |
92652 | 321 (car d))) ; ignore 'backup directive |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
322 (dayname (diary-name-pattern calendar-day-name-array)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
323 (monthname |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
324 (concat |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
325 (diary-name-pattern calendar-bahai-month-name-array t) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
326 "\\|\\*")) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
327 (month "[0-9]+\\|\\*") |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
328 (day "[0-9]+\\|\\*") |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
329 (year "[0-9]+\\|\\*") |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
330 (l (length date-form)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
331 (d-name-pos (- l (length (memq 'dayname date-form)))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
332 (d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
333 (m-name-pos (- l (length (memq 'monthname date-form)))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
334 (m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
335 (d-pos (- l (length (memq 'day date-form)))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
336 (d-pos (if (/= l d-pos) (+ 2 d-pos))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
337 (m-pos (- l (length (memq 'month date-form)))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
338 (m-pos (if (/= l m-pos) (+ 2 m-pos))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
339 (y-pos (- l (length (memq 'year date-form)))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
340 (y-pos (if (/= l y-pos) (+ 2 y-pos))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
341 (regexp |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
342 (concat |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
343 "\\(\\`\\|\^M\\|\n\\)" |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
344 (regexp-quote bahai-diary-entry-symbol) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
345 "\\(" |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
346 (mapconcat 'eval date-form "\\)\\(") |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
347 "\\)")) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
348 (case-fold-search t)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
349 (goto-char (point-min)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
350 (while (re-search-forward regexp nil t) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
351 (let* ((dd-name |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
352 (if d-name-pos |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
353 (buffer-substring |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
354 (match-beginning d-name-pos) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
355 (match-end d-name-pos)))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
356 (mm-name |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
357 (if m-name-pos |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
358 (buffer-substring |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
359 (match-beginning m-name-pos) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
360 (match-end m-name-pos)))) |
62402
a7e02ef1e3d6
Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62123
diff
changeset
|
361 (mm (string-to-number |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
362 (if m-pos |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
363 (buffer-substring |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
364 (match-beginning m-pos) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
365 (match-end m-pos)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
366 ""))) |
62402
a7e02ef1e3d6
Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62123
diff
changeset
|
367 (dd (string-to-number |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
368 (if d-pos |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
369 (buffer-substring |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
370 (match-beginning d-pos) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
371 (match-end d-pos)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
372 ""))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
373 (y-str (if y-pos |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
374 (buffer-substring |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
375 (match-beginning y-pos) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
376 (match-end y-pos)))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
377 (yy (if (not y-str) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
378 0 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
379 (if (and (= (length y-str) 2) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
380 abbreviated-calendar-year) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
381 (let* ((current-y |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
382 (extract-calendar-year |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
383 (calendar-bahai-from-absolute |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
384 (calendar-absolute-from-gregorian |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
385 (calendar-current-date))))) |
62402
a7e02ef1e3d6
Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62123
diff
changeset
|
386 (y (+ (string-to-number y-str) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
387 (* 100 (/ current-y 100))))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
388 (if (> (- y current-y) 50) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
389 (- y 100) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
390 (if (> (- current-y y) 50) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
391 (+ y 100) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
392 y))) |
62402
a7e02ef1e3d6
Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62123
diff
changeset
|
393 (string-to-number y-str))))) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
394 (if dd-name |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
395 (mark-calendar-days-named |
62123
8c992d4395d2
(mark-bahai-diary-entries): Replace `assoc-ignore-case' by `assoc-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
55461
diff
changeset
|
396 (cdr (assoc-string (substring dd-name 0 3) |
8c992d4395d2
(mark-bahai-diary-entries): Replace `assoc-ignore-case' by `assoc-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
55461
diff
changeset
|
397 (calendar-make-alist |
8c992d4395d2
(mark-bahai-diary-entries): Replace `assoc-ignore-case' by `assoc-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
55461
diff
changeset
|
398 calendar-day-name-array |
8c992d4395d2
(mark-bahai-diary-entries): Replace `assoc-ignore-case' by `assoc-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
55461
diff
changeset
|
399 0 |
92578
8b2b620788b7
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
400 (lambda (x) (substring x 0 3))) |
62123
8c992d4395d2
(mark-bahai-diary-entries): Replace `assoc-ignore-case' by `assoc-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
55461
diff
changeset
|
401 t))) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
402 (if mm-name |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
403 (if (string-equal mm-name "*") |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
404 (setq mm 0) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
405 (setq mm |
62123
8c992d4395d2
(mark-bahai-diary-entries): Replace `assoc-ignore-case' by `assoc-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
55461
diff
changeset
|
406 (cdr (assoc-string |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
407 mm-name |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
408 (calendar-make-alist |
92849 | 409 calendar-bahai-month-name-array) |
62123
8c992d4395d2
(mark-bahai-diary-entries): Replace `assoc-ignore-case' by `assoc-string'.
Juanma Barranquero <lekktu@gmail.com>
parents:
55461
diff
changeset
|
410 t))))) |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
411 (calendar-bahai-mark-date-pattern mm dd yy))))) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
412 (setq d (cdr d))))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
413 |
92826
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
414 ;;;###diary-autoload |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
415 (defun calendar-bahai-mark-date-pattern (month day year) |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
416 "Mark dates in calendar window that conform to Bahá'í date MONTH/DAY/YEAR. |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
417 A value of 0 in any position is a wildcard." |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
418 (save-excursion |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
419 (set-buffer calendar-buffer) |
92615
3dd341aae76d
(calendar-bahai-prompt-for-date, calendar-bahai-mark-date-pattern):
Glenn Morris <rgm@gnu.org>
parents:
92578
diff
changeset
|
420 (if (and (not (zerop month)) (not (zerop day))) |
3dd341aae76d
(calendar-bahai-prompt-for-date, calendar-bahai-mark-date-pattern):
Glenn Morris <rgm@gnu.org>
parents:
92578
diff
changeset
|
421 (if (not (zerop year)) |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
422 ;; Fully specified Bahá'í date. |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
423 (let ((date (calendar-gregorian-from-absolute |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
424 (calendar-absolute-from-bahai |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
425 (list month day year))))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
426 (if (calendar-date-is-visible-p date) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
427 (mark-visible-calendar-date date))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
428 ;; Month and day in any year--this taken from the holiday stuff. |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
429 (let* ((bahai-date (calendar-bahai-from-absolute |
92849 | 430 (calendar-absolute-from-gregorian |
431 (list displayed-month 15 displayed-year)))) | |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
432 (m (extract-calendar-month bahai-date)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
433 (y (extract-calendar-year bahai-date)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
434 (date)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
435 (if (< m 1) |
92849 | 436 nil ; Bahá'í calendar doesn't apply |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
437 (increment-calendar-month m y (- 10 month)) |
92849 | 438 (if (> m 7) ; Bahá'í date might be visible |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
439 (let ((date (calendar-gregorian-from-absolute |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
440 (calendar-absolute-from-bahai |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
441 (list month day y))))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
442 (if (calendar-date-is-visible-p date) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
443 (mark-visible-calendar-date date))))))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
444 ;; Not one of the simple cases--check all visible dates for match. |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
445 ;; Actually, the following code takes care of ALL of the cases, but |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
446 ;; it's much too slow to be used for the simple (common) cases. |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
447 (let ((m displayed-month) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
448 (y displayed-year) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
449 (first-date) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
450 (last-date)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
451 (increment-calendar-month m y -1) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
452 (setq first-date |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
453 (calendar-absolute-from-gregorian |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
454 (list m 1 y))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
455 (increment-calendar-month m y 2) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
456 (setq last-date |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
457 (calendar-absolute-from-gregorian |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
458 (list m (calendar-last-day-of-month m y) y))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
459 (calendar-for-loop date from first-date to last-date do |
92849 | 460 (let* ((b-date (calendar-bahai-from-absolute date)) |
461 (i-month (extract-calendar-month b-date)) | |
462 (i-day (extract-calendar-day b-date)) | |
463 (i-year (extract-calendar-year b-date))) | |
464 (and (or (zerop month) | |
465 (= month i-month)) | |
466 (or (zerop day) | |
467 (= day i-day)) | |
468 (or (zerop year) | |
469 (= year i-year)) | |
470 (mark-visible-calendar-date | |
471 (calendar-gregorian-from-absolute | |
472 date))))))))) | |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
473 |
92826
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
474 ;;;###cal-autoload |
84581
96df62307dfc
(mark-bahai-diary-entries): Fix up typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82833
diff
changeset
|
475 (defun diary-bahai-insert-entry (arg) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
476 "Insert a diary entry. |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
477 For the Bahá'í date corresponding to the date indicated by point. |
92659 | 478 Prefix argument ARG makes the entry nonmarking." |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
479 (interactive "P") |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
480 (let* ((calendar-month-name-array calendar-bahai-month-name-array)) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
481 (make-diary-entry |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
482 (concat |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
483 bahai-diary-entry-symbol |
65141
fad69800a5b0
(date, displayed-month, displayed-year, number, original-date):
Juanma Barranquero <lekktu@gmail.com>
parents:
64085
diff
changeset
|
484 (calendar-date-string |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
485 (calendar-bahai-from-absolute |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
486 (calendar-absolute-from-gregorian |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
487 (calendar-cursor-to-date t))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
488 nil t)) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
489 arg))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
490 |
92826
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
491 ;;;###cal-autoload |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
492 (defun diary-bahai-insert-monthly-entry (arg) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
493 "Insert a monthly diary entry. |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
494 For the day of the Bahá'í month corresponding to the date indicated by point. |
92659 | 495 Prefix argument ARG makes the entry nonmarking." |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
496 (interactive "P") |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
497 (let* ((calendar-date-display-form |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
498 (if european-calendar-style '(day " * ") '("* " day ))) |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
499 (calendar-month-name-array calendar-bahai-month-name-array)) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
500 (make-diary-entry |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
501 (concat |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
502 bahai-diary-entry-symbol |
65141
fad69800a5b0
(date, displayed-month, displayed-year, number, original-date):
Juanma Barranquero <lekktu@gmail.com>
parents:
64085
diff
changeset
|
503 (calendar-date-string |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
504 (calendar-bahai-from-absolute |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
505 (calendar-absolute-from-gregorian |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
506 (calendar-cursor-to-date t))))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
507 arg))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
508 |
92826
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
509 ;;;###cal-autoload |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
510 (defun diary-bahai-insert-yearly-entry (arg) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
511 "Insert an annual diary entry. |
82787
03ac28e9a566
2007-08-23 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
82177
diff
changeset
|
512 For the day of the Bahá'í year corresponding to the date indicated by point. |
92659 | 513 Prefix argument ARG will make the entry nonmarking." |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
514 (interactive "P") |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
515 (let* ((calendar-date-display-form |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
516 (if european-calendar-style |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
517 '(day " " monthname) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
518 '(monthname " " day))) |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
519 (calendar-month-name-array calendar-bahai-month-name-array)) |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
520 (make-diary-entry |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
521 (concat |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
522 bahai-diary-entry-symbol |
65141
fad69800a5b0
(date, displayed-month, displayed-year, number, original-date):
Juanma Barranquero <lekktu@gmail.com>
parents:
64085
diff
changeset
|
523 (calendar-date-string |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
524 (calendar-bahai-from-absolute |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
525 (calendar-absolute-from-gregorian |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
526 (calendar-cursor-to-date t))))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
527 arg))) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
528 |
92826
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
529 (defvar date) |
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
530 |
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
531 ;; To be called from list-sexp-diary-entries, where DATE is bound. |
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
532 ;;;###diary-autoload |
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
533 (defun diary-bahai-date () |
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
534 "Bahá'í calendar equivalent of date diary entry." |
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
535 (format "Bahá'í date: %s" (calendar-bahai-date-string date))) |
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
536 |
416592e7d882
Move variable declarations where they are needed.
Glenn Morris <rgm@gnu.org>
parents:
92659
diff
changeset
|
537 |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
538 ;; Backward compatibility. |
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
539 (define-obsolete-function-alias |
84581
96df62307dfc
(mark-bahai-diary-entries): Fix up typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82833
diff
changeset
|
540 'list-bahai-diary-entries 'diary-bahai-list-entries "23.1") |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
541 (define-obsolete-function-alias |
84581
96df62307dfc
(mark-bahai-diary-entries): Fix up typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82833
diff
changeset
|
542 'mark-bahai-diary-entries 'diary-bahai-mark-entries "23.1") |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
543 (define-obsolete-function-alias |
84581
96df62307dfc
(mark-bahai-diary-entries): Fix up typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82833
diff
changeset
|
544 'insert-bahai-diary-entry 'diary-bahai-insert-entry "23.1") |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
545 (define-obsolete-function-alias |
84590
1cfbc4c30509
Fix typos in aliases in previous change.
Glenn Morris <rgm@gnu.org>
parents:
84581
diff
changeset
|
546 'insert-monthly-bahai-diary-entry 'diary-bahai-insert-monthly-entry "23.1") |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
547 (define-obsolete-function-alias |
84590
1cfbc4c30509
Fix typos in aliases in previous change.
Glenn Morris <rgm@gnu.org>
parents:
84581
diff
changeset
|
548 'insert-yearly-bahai-diary-entry 'diary-bahai-insert-yearly-entry "23.1") |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
549 (define-obsolete-function-alias |
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
550 'mark-bahai-calendar-date-pattern 'calendar-bahai-mark-date-pattern "23.1") |
84581
96df62307dfc
(mark-bahai-diary-entries): Fix up typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82833
diff
changeset
|
551 (define-obsolete-function-alias |
96df62307dfc
(mark-bahai-diary-entries): Fix up typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82833
diff
changeset
|
552 'calendar-goto-bahai-date 'calendar-bahai-goto-date "23.1") |
96df62307dfc
(mark-bahai-diary-entries): Fix up typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82833
diff
changeset
|
553 (define-obsolete-function-alias |
96df62307dfc
(mark-bahai-diary-entries): Fix up typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82833
diff
changeset
|
554 'calendar-print-bahai-date 'calendar-bahai-print-date "23.1") |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
555 |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
556 (provide 'cal-bahai) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
557 |
92578
8b2b620788b7
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
558 ;; Local Variables: |
8b2b620788b7
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
559 ;; coding: utf-8 |
8b2b620788b7
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
560 ;; End: |
8b2b620788b7
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
561 |
82177
f673ee49d36e
(calendar-bahai-month-name-array, calendar-bahai-epoch)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
562 ;; arch-tag: c1cb1d67-862a-4264-a01c-41cb4df01f14 |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
diff
changeset
|
563 ;;; cal-bahai.el ends here |