Mercurial > emacs
comparison lisp/calendar/cal-china.el @ 93637:60b7d8c48c07
Update for cal-julian name changes.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 04 Apr 2008 07:05:44 +0000 |
| parents | 851deb208446 |
| children | 14357375e115 |
comparison
equal
deleted
inserted
replaced
| 93636:f5d39ae0db5b | 93637:60b7d8c48c07 |
|---|---|
| 49 | 49 |
| 50 (require 'calendar) | 50 (require 'calendar) |
| 51 (require 'lunar) ; lunar-new-moon-on-or-after | 51 (require 'lunar) ; lunar-new-moon-on-or-after |
| 52 ;; solar-date-next-longitude brought in by lunar. | 52 ;; solar-date-next-longitude brought in by lunar. |
| 53 ;;;(require 'solar) | 53 ;;;(require 'solar) |
| 54 ;; calendar-absolute-from-astro and v versa are cal-autoloads. | 54 ;; calendar-astro-to-absolute and from-absolute are cal-autoloads. |
| 55 ;;;(require 'cal-julian) | 55 ;;;(require 'cal-julian) |
| 56 | 56 |
| 57 | 57 |
| 58 (defgroup chinese-calendar nil | 58 (defgroup chinese-calendar nil |
| 59 "Chinese calendar support." | 59 "Chinese calendar support." |
| 193 (calendar-daylight-savings-starts-time | 193 (calendar-daylight-savings-starts-time |
| 194 chinese-calendar-daylight-savings-starts-time) | 194 chinese-calendar-daylight-savings-starts-time) |
| 195 (calendar-daylight-savings-ends-time | 195 (calendar-daylight-savings-ends-time |
| 196 chinese-calendar-daylight-savings-ends-time)) | 196 chinese-calendar-daylight-savings-ends-time)) |
| 197 (floor | 197 (floor |
| 198 (calendar-absolute-from-astro | 198 (calendar-astro-to-absolute |
| 199 (solar-date-next-longitude (calendar-astro-from-absolute d) 30))))) | 199 (solar-date-next-longitude (calendar-astro-from-absolute d) 30))))) |
| 200 | 200 |
| 201 (defun chinese-new-moon-on-or-after (d) | 201 (defun chinese-new-moon-on-or-after (d) |
| 202 "Absolute date of first new moon on or after absolute date D." | 202 "Absolute date of first new moon on or after absolute date D." |
| 203 (let* ((year (extract-calendar-year (calendar-gregorian-from-absolute d))) | 203 (let* ((year (extract-calendar-year (calendar-gregorian-from-absolute d))) |
| 215 (calendar-daylight-savings-starts-time | 215 (calendar-daylight-savings-starts-time |
| 216 chinese-calendar-daylight-savings-starts-time) | 216 chinese-calendar-daylight-savings-starts-time) |
| 217 (calendar-daylight-savings-ends-time | 217 (calendar-daylight-savings-ends-time |
| 218 chinese-calendar-daylight-savings-ends-time)) | 218 chinese-calendar-daylight-savings-ends-time)) |
| 219 (floor | 219 (floor |
| 220 (calendar-absolute-from-astro | 220 (calendar-astro-to-absolute |
| 221 (lunar-new-moon-on-or-after (calendar-astro-from-absolute d)))))) | 221 (lunar-new-moon-on-or-after (calendar-astro-from-absolute d)))))) |
| 222 | 222 |
| 223 (defun chinese-month-list (start end) | 223 (defun chinese-month-list (start end) |
| 224 "List of starting dates of Chinese months from START to END." | 224 "List of starting dates of Chinese months from START to END." |
| 225 (if (<= start end) | 225 (if (<= start end) |