emacs: lisp/calendar/cal-hebrew.el comparison

comparison lisp/calendar/cal-hebrew.el @ 49598:0d8b17d428b5

Trailing whitepace deleted.

author	Juanma Barranquero <lekktu@gmail.com>
date	Tue, 04 Feb 2003 13:24:35 +0000
parents	e82d42ccd30b
children	af8f4ec2f255 d7ddb3e565de

comparison

equal deleted inserted replaced

-:e88404e8f2cf
+:0d8b17d428b5
 (1+ day)
 ;; Else
 day)))
 (if ;; If Rosh HaShanah would occur on Sunday, Wednesday, or Friday
 (memq (% alternative-day 7) (list 0 3 5))
 ;; Then postpone it one (more) day and return
 (1+ alternative-day)
 ;; Else return
 alternative-day)))
 (defun hebrew-calendar-days-in-year (year)
 "Number of days in Hebrew YEAR."
 (- (hebrew-calendar-elapsed-days (1+ year))
 (list (calendar-gregorian-from-absolute (+ abs-r-h 21))
 "Shemini Atzeret")
 (list (calendar-gregorian-from-absolute (+ abs-r-h 22))
 "Simchat Torah")))
 (optional
 (list
 (list (calendar-gregorian-from-absolute
 (calendar-dayname-on-or-before 6 (- abs-r-h 4)))
 "Selichot (night)")
 (list (calendar-gregorian-from-absolute (1- abs-r-h))
 "Erev Rosh HaShanah")
 "Hoshanah Rabbah")))
 (output-list
 (filter-visible-calendar-holidays mandatory)))
 (if all-hebrew-calendar-holidays
 (setq output-list
 (append
 (filter-visible-calendar-holidays optional)
 output-list)))
 output-list)))
 (defun holiday-hanukkah ()
 (list (calendar-gregorian-from-absolute abs-p)
 "Passover")
 (list (calendar-gregorian-from-absolute (+ abs-p 50))
 "Shavuot")))
 (optional
 (list
 (list (calendar-gregorian-from-absolute
 (calendar-dayname-on-or-before 6 (- abs-p 43)))
 "Shabbat Shekalim")
 (list (calendar-gregorian-from-absolute
 (calendar-dayname-on-or-before 6 (- abs-p 30)))
 "Shavuot (second day)")))
 (output-list
 (filter-visible-calendar-holidays mandatory)))
 (if all-hebrew-calendar-holidays
 (setq output-list
 (append
 (filter-visible-calendar-holidays optional)
 output-list)))
 output-list)))
 (defun holiday-tisha-b-av-etc ()
 nil;; None of the dates is visible
 (let* ((abs-t-a (calendar-absolute-from-hebrew
 (list 5 9 (+ displayed-year 3760)))))
 (filter-visible-calendar-holidays
 (list
 (list (calendar-gregorian-from-absolute
 (if (= (% abs-t-a 7) 6) (- abs-t-a 20) (- abs-t-a 21)))
 "Tzom Tammuz")
 (list (calendar-gregorian-from-absolute
 (calendar-dayname-on-or-before 6 abs-t-a))
 (diary-modified (buffer-modified-p))
 (gdate original-date)
 (mark (regexp-quote diary-nonmarking-symbol)))
 (calendar-for-loop i from 1 to number do
 (let* ((d diary-date-forms)
 (hdate (calendar-hebrew-from-absolute
 (calendar-absolute-from-gregorian gdate)))
 (month (extract-calendar-month hdate))
 (day (extract-calendar-day hdate))
 (year (extract-calendar-year hdate)))
 (while d
 (if mm-name
 (if (string-equal mm-name "*")
 (setq mm 0)
 (setq
 mm
 (cdr
 (assoc-ignore-case
 mm-name
 (calendar-make-alist
 calendar-hebrew-month-name-array-leap-year))))))
 (mark-hebrew-calendar-date-pattern mm dd yy)))))
 (let* ((calendar-month-name-array
 calendar-hebrew-month-name-array-leap-year))
 (make-diary-entry
 (concat
 hebrew-diary-entry-symbol
 (calendar-date-string
 (calendar-hebrew-from-absolute
 (calendar-absolute-from-gregorian
 (calendar-cursor-to-date t)))
 nil t))
 arg)))
 (calendar-month-name-array
 calendar-hebrew-month-name-array-leap-year))
 (make-diary-entry
 (concat
 hebrew-diary-entry-symbol
 (calendar-date-string
 (calendar-hebrew-from-absolute
 (calendar-absolute-from-gregorian
 (calendar-cursor-to-date t)))))
 arg)))
 (calendar-month-name-array
 calendar-hebrew-month-name-array-leap-year))
 (make-diary-entry
 (concat
 hebrew-diary-entry-symbol
 (calendar-date-string
 (calendar-hebrew-from-absolute
 (calendar-absolute-from-gregorian
 (calendar-cursor-to-date t)))))
 arg)))
 (defun diary-omer (&optional mark)
 "Omer count diary entry.
 Entry applies if date is within 50 days after Passover.
 An optional parameter MARK specifies a face or single-character string to
 use when highlighting the day in the calendar."
 (let* ((passover
 (calendar-absolute-from-hebrew
 (list 1 15 (+ (extract-calendar-year date) 3760))))
 (omer (- (calendar-absolute-from-gregorian date) passover))
 (week (/ omer 7))
 (day (% omer 7)))
 (if (and (> omer 0) (< omer 50))
 (cons mark
 	      (format "Day %d%s of the omer (until sunset)"
 		      omer
 		      (if (zerop week)
 			  ""
 			(format ", that is, %d week%s%s"
 to be the name of the person.  Date of death is on the *civil* calendar;
 although the date of death is specified by the civil calendar, the proper
 Hebrew calendar yahrzeit is determined.  If `european-calendar-style' is t, the
 order of the parameters is changed to DEATH-DAY, DEATH-MONTH, DEATH-YEAR.
 An optional parameter MARK specifies a face or single-character string to
 use when highlighting the day in the calendar."
 (let* ((h-date (calendar-hebrew-from-absolute
 (calendar-absolute-from-gregorian
 (if european-calendar-style
 (list death-day death-month death-year)
 (defun diary-rosh-hodesh (&optional mark)
 "Rosh Hodesh diary entry.
 Entry applies if date is Rosh Hodesh, the day before, or the Saturday before.
 An optional parameter MARK specifies a face or single-character string to
 use when highlighting the day in the calendar."
 (let* ((d (calendar-absolute-from-gregorian date))
 (h-date (calendar-hebrew-from-absolute d))
 (h-month (extract-calendar-month h-date))
 (h-day (extract-calendar-day h-date))
 calendar-hebrew-month-name-array-common-year))
 (this-month (aref h-month-names (1- h-month)))
 (h-yesterday (extract-calendar-day
 (calendar-hebrew-from-absolute (1- d)))))
 (if (or (= h-day 30) (and (= h-day 1) (/= h-month 7)))
 (cons mark
 	      (format
 	       "Rosh Hodesh %s"
 	       (if (= h-day 30)
 		   (format
 		    "%s (first day)"
 		    (aref h-month-names h-month))
 		 (if (= h-yesterday 30)
 		     (format "%s (second day)" this-month)
 		   this-month))))
 (if (= (% d 7) 6)	;; Saturday--check for Shabbat Mevarchim
 (cons mark
 		(cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day))
 		       (format "Mevarchim Rosh Hodesh %s (%s)"
 			       (aref h-month-names
 				     (if (= h-month
 					    (hebrew-calendar-last-month-of-year
 				    0 h-month)))))))))
 (defun diary-parasha (&optional mark)
 "Parasha diary entry--entry applies if date is a Saturday.
 An optional parameter MARK specifies a face or single-character string to
 use when highlighting the day in the calendar."
 (let ((d (calendar-absolute-from-gregorian date)))
 (if (= (% d 7) 6) ;;  Saturday
 (let*
 ((h-year (extract-calendar-year

Mercurial > emacs

comparison lisp/calendar/cal-hebrew.el @ 49598:0d8b17d428b5