-(defun calendar-read-mayan-haab-date ()
- "Prompt for a Mayan haab date"
- (let* ((completion-ignore-case t)
- (haab-day (calendar-read
- "Haab kin (0-19): "
- '(lambda (x) (and (>= x 0) (< x 20)))))
- (haab-month-list (append calendar-mayan-haab-month-name-array
- (and (< haab-day 5) '("Uayeb"))))
- (haab-month (cdr
- (assoc-string
- (completing-read "Haab uinal: "
- (mapcar 'list haab-month-list)
- nil t)
- (calendar-make-alist haab-month-list 1) t))))
- (cons haab-day haab-month)))
-
-(defun calendar-read-mayan-tzolkin-date ()
- "Prompt for a Mayan tzolkin date"
- (let* ((completion-ignore-case t)
- (tzolkin-count (calendar-read
- "Tzolkin kin (1-13): "
- '(lambda (x) (and (> x 0) (< x 14)))))
- (tzolkin-name-list (append calendar-mayan-tzolkin-names-array nil))
- (tzolkin-name (cdr
- (assoc-string
- (completing-read "Tzolkin uinal: "
- (mapcar 'list tzolkin-name-list)
- nil t)
- (calendar-make-alist tzolkin-name-list 1) t))))
- (cons tzolkin-count tzolkin-name)))
-
-(defun calendar-next-calendar-round-date
- (tzolkin-date haab-date &optional noecho)
- "Move cursor to next instance of Mayan HAAB-DATE TZOLKIN-DATE combination.
-Echo Mayan date if NOECHO is t."
- (interactive (list (calendar-read-mayan-tzolkin-date)
- (calendar-read-mayan-haab-date)))
+;;;###cal-autoload
+(defun calendar-mayan-next-round-date (tzolkin-date haab-date
+ &optional noecho)
+ "Move cursor to next instance of Mayan TZOLKIN-DATE HAAB-DATE combination.
+Echo Mayan date unless NOECHO is non-nil."
+ (interactive (list (calendar-mayan-read-tzolkin-date)
+ (calendar-mayan-read-haab-date)))