aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1998-08-29 15:59:01 +0000
committerKarl Heuer1998-08-29 15:59:01 +0000
commit6bd677fa1b7f574b1610fc874ef8117a96b7b3ea (patch)
tree011b04ab87e2e82e30c1f380a6f51b30d84b751b
parentf38d351407f2c700b32fc90f9935c70507b5b14c (diff)
downloademacs-6bd677fa1b7f574b1610fc874ef8117a96b7b3ea.tar.gz
emacs-6bd677fa1b7f574b1610fc874ef8117a96b7b3ea.zip
(chinese-year-cache): Change range of years from
1989-2000 to 1990-2010.
-rw-r--r--lisp/calendar/cal-china.el34
1 files changed, 28 insertions, 6 deletions
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index fbb167fa40b..304d2c28327 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -182,9 +182,7 @@ The Zodiac signs begin when the sun's longitude is a multiple of 30 degrees."
182 (calendar-astro-from-absolute d)))))) 182 (calendar-astro-from-absolute d))))))
183 183
184(defvar chinese-year-cache 184(defvar chinese-year-cache
185 '((1989 (12 726110) (1 726139) (2 726169) (3 726198) (4 726227) (5 726257) 185 '((1990 (12 726464) (1 726494) (2 726523) (3 726553) (4 726582) (5 726611)
186 (6 726286) (7 726316) (8 726345) (9 726375) (10 726404) (11 726434))
187 (1990 (12 726464) (1 726494) (2 726523) (3 726553) (4 726582) (5 726611)
188 (5.5 726641) (6 726670) (7 726699) (8 726729) (9 726758) (10 726788) 186 (5.5 726641) (6 726670) (7 726699) (8 726729) (9 726758) (10 726788)
189 (11 726818)) 187 (11 726818))
190 (1991 (12 726848) (1 726878) (2 726907) (3 726937) (4 726966) (5 726995) 188 (1991 (12 726848) (1 726878) (2 726907) (3 726937) (4 726966) (5 726995)
@@ -209,12 +207,36 @@ The Zodiac signs begin when the sun's longitude is a multiple of 30 degrees."
209 (1999 (12 729771) (1 729801) (2 729831) (3 729860) (4 729889) (5 729919) 207 (1999 (12 729771) (1 729801) (2 729831) (3 729860) (4 729889) (5 729919)
210 (6 729948) (7 729977) (8 730007) (9 730036) (10 730066) (11 730096)) 208 (6 729948) (7 729977) (8 730007) (9 730036) (10 730066) (11 730096))
211 (2000 (12 730126) (1 730155) (2 730185) (3 730215) (4 730244) (5 730273) 209 (2000 (12 730126) (1 730155) (2 730185) (3 730215) (4 730244) (5 730273)
212 (6 730303) (7 730332) (8 730361) (9 730391) (10 730420) (11 730450))) 210 (6 730303) (7 730332) (8 730361) (9 730391) (10 730420) (11 730450))
211 (2001 (12 730480) (1 730509) (2 730539) (3 730569) (4 730598) (4.5 730628)
212 (5 730657) (6 730687) (7 730716) (8 730745) (9 730775) (10 730804)
213 (11 730834))
214 (2002 (12 730863) (1 730893) (2 730923) (3 730953) (4 730982) (5 731012)
215 (6 731041) (7 731071) (8 731100) (9 731129) (10 731159) (11 731188))
216 (2003 (12 731218) (1 731247) (2 731277) (3 731307) (4 731336) (5 731366)
217 (6 731396) (7 731425) (8 731455) (9 731484) (10 731513) (11 731543))
218 (2004 (12 731572) (1 731602) (2 731631) (2.5 731661) (3 731690) (4 731720)
219 (5 731750) (6 731779) (7 731809) (8 731838) (9 731868) (10 731897)
220 (11 731927))
221 (2005 (12 731956) (1 731986) (2 732015) (3 732045) (4 732074) (5 732104)
222 (6 732133) (7 732163) (8 732193) (9 732222) (10 732252) (11 732281))
223 (2006 (12 732311) (1 732340) (2 732370) (3 732399) (4 732429) (5 732458)
224 (6 732488) (7 732517) (7.5 732547) (8 732576) (9 732606) (10 732636)
225 (11 732665))
226 (2007 (12 732695) (1 732725) (2 732754) (3 732783) (4 732813) (5 732842)
227 (6 732871) (7 732901) (8 732930) (9 732960) (10 732990) (11 733020))
228 (2008 (12 733049) (1 733079) (2 733109) (3 733138) (4 733167) (5 733197)
229 (6 733226) (7 733255) (8 733285) (9 733314) (10 733344) (11 733374))
230 (2009 (12 733403) (1 733433) (2 733463) (3 733493) (4 733522) (5 733551)
231 (5.5 733581) (6 733610) (7 733639) (8 733669) (9 733698) (10 733728)
232 (11 733757))
233 (2010 (12 733787) (1 733817) (2 733847) (3 733876) (4 733906) (5 733935)
234 (6 733965) (7 733994) (8 734023) (9 734053) (10 734082) (11 734112)))
213 "An assoc list of Chinese year structures as determined by `chinese-year'. 235 "An assoc list of Chinese year structures as determined by `chinese-year'.
214 236
215Values are computed as needed, but to save time, the initial value consists 237Values are computed as needed, but to save time, the initial value consists
216of the precomputed years 1989-2000. The code works just as well with this 238of the precomputed years 1990-2010. The code works just as well with this
217set to nil initially (which is how the value for 1989-2000 was computed).") 239set to nil initially (which is how the value for 1990-2010 was computed).")
218 240
219(defun chinese-year (y) 241(defun chinese-year (y)
220 "The structure of the Chinese year for Gregorian year Y. 242 "The structure of the Chinese year for Gregorian year Y.