comparison lisp/calendar/cal-hebrew.el @ 54074:ae72e69df10d

(calendar-goto-hebrew-date, mark-hebrew-diary-entries) (list-yahrzeit-dates): Use assoc-string instead of assoc-ignore-case.

54073:8061b3e9df12

                    (calendar-absolute-from-gregorian today))))))
          (month-array (if (hebrew-calendar-leap-year-p year)
                           calendar-hebrew-month-name-array-leap-year
                         calendar-hebrew-month-name-array-common-year))
          (completion-ignore-case t)
          (month (cdr (assoc-ignore-case
                       (completing-read
                        "Hebrew calendar month name: "
                        (mapcar 'list (append month-array nil))
                        (if (= year 3761)
                            '(lambda (x)
                               (let ((m (cdr
                                         (assoc-ignore-case
                                          (car x)
                                          (calendar-make-alist
                                           month-array)))))
                                 (< 0
                                    (calendar-absolute-from-hebrew
                                     (list m
                                           (hebrew-calendar-last-day-of-month
                                            m year)
                                           year))))))
                        t)
                       (calendar-make-alist month-array 1))))
          (last (hebrew-calendar-last-day-of-month month year))
          (first (if (and (= year 3761) (= month 10))
                     18 1))
          (day (calendar-read
                (format "Hebrew calendar day (%d-%d): "

                                   (+ y 100)
                                 y)))
                         (string-to-int y-str)))))
            (if dd-name
                (mark-calendar-days-named
                 (cdr (assoc-ignore-case dd-name
                                         (calendar-make-alist
                                          calendar-day-name-array
                                          0 nil calendar-day-abbrev-array))))
              (if mm-name
                  (setq mm
                        (if (string-equal mm-name "*") 0
                          (cdr
                           (assoc-ignore-case
                            mm-name
                            (calendar-make-alist
                             calendar-hebrew-month-name-array-leap-year))))))
              (mark-hebrew-calendar-date-pattern mm dd yy)))))
      (setq d (cdr d)))))

(defun insert-hebrew-diary-entry (arg)
  "Insert a diary entry.

                           "Year of death (>0): "
                           '(lambda (x) (> x 0))
                           (int-to-string (extract-calendar-year today))))
                    (month-array calendar-month-name-array)
                    (completion-ignore-case t)
                    (month (cdr (assoc-ignore-case
                                 (completing-read
                                  "Month of death (name): "
                                  (mapcar 'list (append month-array nil))
                                  nil t)
                                 (calendar-make-alist month-array 1))))
                    (last (calendar-last-day-of-month month year))
                    (day (calendar-read
                          (format "Day of death (1-%d): " last)
                          '(lambda (x) (and (< 0 x) (<= x last))))))
               (list month day year))))

54074:ae72e69df10d

                    (calendar-absolute-from-gregorian today))))))
          (month-array (if (hebrew-calendar-leap-year-p year)
                           calendar-hebrew-month-name-array-leap-year
                         calendar-hebrew-month-name-array-common-year))
          (completion-ignore-case t)
          (month (cdr (assoc-string
                       (completing-read
                        "Hebrew calendar month name: "
                        (mapcar 'list (append month-array nil))
                        (if (= year 3761)
                            '(lambda (x)
                               (let ((m (cdr
                                         (assoc-string
                                          (car x)
                                          (calendar-make-alist month-array)
                                          t))))
                                 (< 0
                                    (calendar-absolute-from-hebrew
                                     (list m
                                           (hebrew-calendar-last-day-of-month
                                            m year)
                                           year))))))
                        t)
                       (calendar-make-alist month-array 1) t)))
          (last (hebrew-calendar-last-day-of-month month year))
          (first (if (and (= year 3761) (= month 10))
                     18 1))
          (day (calendar-read
                (format "Hebrew calendar day (%d-%d): "

                                   (+ y 100)
                                 y)))
                         (string-to-int y-str)))))
            (if dd-name
                (mark-calendar-days-named
                 (cdr (assoc-string dd-name
                                         (calendar-make-alist
                                          calendar-day-name-array
                                          0 nil calendar-day-abbrev-array) t)))
              (if mm-name
                  (setq mm
                        (if (string-equal mm-name "*") 0
                          (cdr
                           (assoc-string
                            mm-name
                            (calendar-make-alist
                             calendar-hebrew-month-name-array-leap-year) t)))))
              (mark-hebrew-calendar-date-pattern mm dd yy)))))
      (setq d (cdr d)))))

(defun insert-hebrew-diary-entry (arg)
  "Insert a diary entry.

                           "Year of death (>0): "
                           '(lambda (x) (> x 0))
                           (int-to-string (extract-calendar-year today))))
                    (month-array calendar-month-name-array)
                    (completion-ignore-case t)
                    (month (cdr (assoc-string
                                 (completing-read
                                  "Month of death (name): "
                                  (mapcar 'list (append month-array nil))
                                  nil t)
                                 (calendar-make-alist month-array 1) t)))
                    (last (calendar-last-day-of-month month year))
                    (day (calendar-read
                          (format "Day of death (1-%d): " last)
                          '(lambda (x) (and (< 0 x) (<= x last))))))
               (list month day year))))