annotate lisp/calendar/cal-china.el @ 93739:14357375e115

(calendar-chinese): Rename custom group from chinese-calendar. Update users. (calendar-chinese-time-zone): Rename chinese-calendar-time-zone. Keep old name as alias, update users. (calendar-chinese-location-name): Rename chinese-calendar-location-name. Keep old name as alias. (calendar-chinese-daylight-time-offset): Rename chinese-calendar-daylight-time-offset. Keep old name as alias, update users. (calendar-chinese-standard-time-zone-name): Rename chinese-calendar-standard-time-zone-name. Keep old name as alias, update users. (calendar-chinese-daylight-saving-start): Rename chinese-calendar-daylight-savings-starts. Keep old name as alias, update users. (calendar-chinese-daylight-saving-end): Rename chinese-calendar-daylight-savings-ends. Keep old name as alias, update users. (calendar-chinese-daylight-saving-start-time): Rename chinese-calendar-daylight-savings-starts-time. Keep old name as alias, update users. (calendar-chinese-daylight-saving-end-time): Rename chinese-calendar-daylight-savings-ends-time. Keep old name as alias, update users. (calendar-chinese-celestial-stem): Rename calendar-chinese-celestial-stem. Keep old name as alias, update users. (calendar-chinese-terrestrial-branch): Rename calendar-chinese-terrestrial-branch. Keep old name as alias, update users. (calendar-chinese-zodiac-sign-on-or-after): Rename chinese-zodiac-sign-on-or-after. Update callers. (calendar-chinese-new-moon-on-or-after): Rename chinese-new-moon-on-or-after. Update callers. (calendar-chinese-month-list): Rename chinese-month-list. Update callers. (calendar-chinese-number-months): Rename number-chinese-months. Update callers. (calendar-chinese-compute-year): Rename compute-chinese-year. Update callers. (calendar-chinese-year-cache): Rename chinese-year-cache. Update users. (calendar-chinese-year): Rename chinese-year. Update callers. (calendar-chinese-year-cache-init): Rename chinese-year-cache-init. (calendar-chinese-to-absolute): Rename calendar-absolute-from-chinese. Keep old name as alias, update callers. (calendar-chinese-print-date): Rename calendar-print-chinese-date. Keep old name as alias, update callers. (calendar-chinese-months-to-alist): Rename make-chinese-month-assoc-list. Update callers. (calendar-chinese-months): Rename chinese-months. Update callers. (calendar-chinese-goto-date): Rename calendar-goto-chinese-date. Keep old name as alias, update callers.
author Glenn Morris <rgm@gnu.org>
date Sat, 05 Apr 2008 20:57:47 +0000
parents 60b7d8c48c07
children 089c13c26a10
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38422
7a94f1c588c4 Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 23143
diff changeset
1 ;;; cal-china.el --- calendar functions for the Chinese calendar
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
2
92642
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
3 ;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
4 ;; 2008 Free Software Foundation, Inc.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
5
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
6 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
67465
a55ee709ec8d Update copyright pending Emacs 22.
Glenn Morris <rgm@gnu.org>
parents: 65142
diff changeset
7 ;; Maintainer: Glenn Morris <rgm@gnu.org>
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
8 ;; Keywords: calendar
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
9 ;; Human-Keywords: Chinese calendar, calendar, holidays, diary
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
10
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
11 ;; This file is part of GNU Emacs.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
12
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
13 ;; GNU Emacs is free software; you can redistribute it and/or modify
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
14 ;; it under the terms of the GNU General Public License as published by
78216
93e11478c954 Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents: 77279
diff changeset
15 ;; the Free Software Foundation; either version 3, or (at your option)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
16 ;; any later version.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
17
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
18 ;; GNU Emacs is distributed in the hope that it will be useful,
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
21 ;; GNU General Public License for more details.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
22
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
23 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13675
diff changeset
24 ;; along with GNU Emacs; see the file COPYING. If not, write to the
64085
18a818a2ee7c Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 61148
diff changeset
25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18a818a2ee7c Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 61148
diff changeset
26 ;; Boston, MA 02110-1301, USA.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
27
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
28 ;;; Commentary:
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
29
93477
92c1edaba777 (Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents: 93454
diff changeset
30 ;; See calendar.el.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
31
93477
92c1edaba777 (Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents: 93454
diff changeset
32 ;; The rules used for the Chinese calendar are those of Baolin Liu
92c1edaba777 (Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents: 93454
diff changeset
33 ;; (see L. E. Doggett's article "Calendars" in the Explanatory
92c1edaba777 (Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents: 93454
diff changeset
34 ;; Supplement to the Astronomical Almanac, second edition, 1992) for
92c1edaba777 (Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents: 93454
diff changeset
35 ;; the calendar as revised at the beginning of the Qing dynasty in
92c1edaba777 (Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents: 93454
diff changeset
36 ;; 1644. The nature of the astronomical calculations is such that
92c1edaba777 (Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents: 93454
diff changeset
37 ;; precise calculations cannot be made without great expense in time,
92c1edaba777 (Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents: 93454
diff changeset
38 ;; so that the calendars produced may not agree perfectly with
92c1edaba777 (Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents: 93454
diff changeset
39 ;; published tables--but no two pairs of published tables agree
92c1edaba777 (Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents: 93454
diff changeset
40 ;; perfectly either! Liu's rules produce a calendar for 2033 which is
92c1edaba777 (Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents: 93454
diff changeset
41 ;; not accepted by all authorities. The date of Chinese New Year is
92c1edaba777 (Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents: 93454
diff changeset
42 ;; correct from 1644-2051.
20462
d179de7ad92e Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents: 20215
diff changeset
43
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
44 ;; Note to maintainers:
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
45 ;; Use `chinese-year-cache-init' every few years to recenter the default
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
46 ;; value of `chinese-year-cache'.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
47
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
48 ;;; Code:
52112
e7d0572ccca5 (displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents: 49598
diff changeset
49
93220
f59ab0cdc9ba Explicitly require calendar.
Glenn Morris <rgm@gnu.org>
parents: 93090
diff changeset
50 (require 'calendar)
f59ab0cdc9ba Explicitly require calendar.
Glenn Morris <rgm@gnu.org>
parents: 93090
diff changeset
51 (require 'lunar) ; lunar-new-moon-on-or-after
f59ab0cdc9ba Explicitly require calendar.
Glenn Morris <rgm@gnu.org>
parents: 93090
diff changeset
52 ;; solar-date-next-longitude brought in by lunar.
f59ab0cdc9ba Explicitly require calendar.
Glenn Morris <rgm@gnu.org>
parents: 93090
diff changeset
53 ;;;(require 'solar)
93637
60b7d8c48c07 Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents: 93533
diff changeset
54 ;; calendar-astro-to-absolute and from-absolute are cal-autoloads.
93220
f59ab0cdc9ba Explicitly require calendar.
Glenn Morris <rgm@gnu.org>
parents: 93090
diff changeset
55 ;;;(require 'cal-julian)
f59ab0cdc9ba Explicitly require calendar.
Glenn Morris <rgm@gnu.org>
parents: 93090
diff changeset
56
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
57
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
58 (defgroup calendar-chinese nil
92579
8ddfb879916b Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 92546
diff changeset
59 "Chinese calendar support."
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
60 :prefix "calendar-chinese-"
92579
8ddfb879916b Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 92546
diff changeset
61 :group 'calendar)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
62
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
63 (defcustom calendar-chinese-time-zone
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
64 '(if (< year 1928)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
65 (+ 465 (/ 40.0 60.0))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
66 480)
92660
e64439fb46dc (chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
Glenn Morris <rgm@gnu.org>
parents: 92642
diff changeset
67 "Minutes difference between local standard time for Chinese calendar and UTC.
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
68 Default is for Beijing. This is an expression in `year' since it changed at
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
69 1928-01-01 00:00:00 from UT+7:45:40 to UT+8."
19903
bfd7fbd77e8a (chinese-calendar-time-zone): Likewise.
Richard M. Stallman <rms@gnu.org>
parents: 17624
diff changeset
70 :type 'sexp
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
71 :group 'calendar-chinese)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
72
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
73 (define-obsolete-variable-alias 'chinese-calendar-time-zone
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
74 'calendar-chinese-time-zone "23.1")
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
75
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
76 ;; FIXME unused.
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
77 (defcustom calendar-chinese-location-name "Beijing"
92546
0ef74aab4b13 Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
78 "Name of location used for calculation of Chinese calendar."
17624
7634c31da26e Add defgroup and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 14685
diff changeset
79 :type 'string
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
80 :group 'calendar-chinese)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
81
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
82 (define-obsolete-variable-alias 'chinese-calendar-location-name
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
83 'calendar-chinese-location-name "23.1")
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
84
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
85 (defcustom calendar-chinese-daylight-time-offset 0
92642
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
86 ;; The correct value is as follows, but the Chinese calendrical
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
87 ;; authorities do NOT use DST in determining astronomical events:
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
88 ;; 60
92660
e64439fb46dc (chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
Glenn Morris <rgm@gnu.org>
parents: 92642
diff changeset
89 "Minutes difference between daylight saving and standard time.
e64439fb46dc (chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
Glenn Morris <rgm@gnu.org>
parents: 92642
diff changeset
90 Default is for no daylight saving time."
17624
7634c31da26e Add defgroup and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 14685
diff changeset
91 :type 'integer
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
92 :group 'calendar-chinese)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
93
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
94 (define-obsolete-variable-alias 'chinese-calendar-daylight-time-offset
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
95 'calendar-chinese-daylight-time-offset "23.1")
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
96
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
97 (defcustom calendar-chinese-standard-time-zone-name
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
98 '(if (< year 1928)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
99 "PMT"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
100 "CST")
92546
0ef74aab4b13 Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
101 "Abbreviated name of standard time zone used for Chinese calendar.
19903
bfd7fbd77e8a (chinese-calendar-time-zone): Likewise.
Richard M. Stallman <rms@gnu.org>
parents: 17624
diff changeset
102 This is an expression depending on `year' because it changed
bfd7fbd77e8a (chinese-calendar-time-zone): Likewise.
Richard M. Stallman <rms@gnu.org>
parents: 17624
diff changeset
103 at 1928-01-01 00:00:00 from `PMT' to `CST'."
bfd7fbd77e8a (chinese-calendar-time-zone): Likewise.
Richard M. Stallman <rms@gnu.org>
parents: 17624
diff changeset
104 :type 'sexp
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
105 :group 'calendar-chinese)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
106
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
107 (define-obsolete-variable-alias 'chinese-calendar-standard-time-zone-name
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
108 'calendar-chinese-standard-time-zone-name "23.1")
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
109
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
110 (defcustom calendar-chinese-daylight-time-zone-name "CDT"
92546
0ef74aab4b13 Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
111 "Abbreviated name of daylight saving time zone used for Chinese calendar."
17624
7634c31da26e Add defgroup and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 14685
diff changeset
112 :type 'string
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
113 :group 'calendar-chinese)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
114
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
115 (define-obsolete-variable-alias 'chinese-calendar-daylight-time-zone-name
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
116 'calendar-chinese-daylight-time-zone-name "23.1")
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
117
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
118 (defcustom calendar-chinese-daylight-saving-start nil
92642
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
119 ;; The correct value is as follows, but the Chinese calendrical
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
120 ;; authorities do NOT use DST in determining astronomical events:
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
121 ;; '(cond ((< 1986 year) (calendar-nth-named-day 1 0 4 year 10))
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
122 ;; ((= 1986 year) '(5 4 1986))
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
123 ;; (t nil))
92660
e64439fb46dc (chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
Glenn Morris <rgm@gnu.org>
parents: 92642
diff changeset
124 "Sexp giving the date on which daylight saving time starts.
e64439fb46dc (chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
Glenn Morris <rgm@gnu.org>
parents: 92642
diff changeset
125 Default is for no daylight saving time. See documentation of
17624
7634c31da26e Add defgroup and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 14685
diff changeset
126 `calendar-daylight-savings-starts'."
7634c31da26e Add defgroup and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 14685
diff changeset
127 :type 'sexp
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
128 :group 'calendar-chinese)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
129
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
130 (define-obsolete-variable-alias 'chinese-calendar-daylight-savings-starts
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
131 'calendar-chinese-daylight-saving-start "23.1")
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
132
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
133 (defcustom calendar-chinese-daylight-saving-end nil
92642
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
134 ;; The correct value is as follows, but the Chinese calendrical
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
135 ;; authorities do NOT use DST in determining astronomical events:
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
136 ;; '(if (<= 1986 year) (calendar-nth-named-day 1 0 9 year 11))
92660
e64439fb46dc (chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
Glenn Morris <rgm@gnu.org>
parents: 92642
diff changeset
137 "Sexp giving the date on which daylight saving time ends.
e64439fb46dc (chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
Glenn Morris <rgm@gnu.org>
parents: 92642
diff changeset
138 Default is for no daylight saving time. See documentation of
17624
7634c31da26e Add defgroup and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 14685
diff changeset
139 `calendar-daylight-savings-ends'."
7634c31da26e Add defgroup and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 14685
diff changeset
140 :type 'sexp
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
141 :group 'calendar-chinese)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
142
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
143 (define-obsolete-variable-alias 'chinese-calendar-daylight-savings-ends
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
144 'calendar-chinese-daylight-saving-end "23.1")
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
145
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
146 (defcustom calendar-chinese-daylight-saving-start-time 0
92660
e64439fb46dc (chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
Glenn Morris <rgm@gnu.org>
parents: 92642
diff changeset
147 "Number of minutes after midnight that daylight saving time starts.
e64439fb46dc (chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
Glenn Morris <rgm@gnu.org>
parents: 92642
diff changeset
148 Default is for no daylight saving time."
17624
7634c31da26e Add defgroup and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 14685
diff changeset
149 :type 'integer
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
150 :group 'calendar-chinese)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
151
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
152 (define-obsolete-variable-alias 'chinese-calendar-daylight-savings-starts-time
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
153 'calendar-chinese-daylight-saving-start-time "23.1")
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
154
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
155 (defcustom calendar-chinese-daylight-saving-end-time 0
92660
e64439fb46dc (chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
Glenn Morris <rgm@gnu.org>
parents: 92642
diff changeset
156 "Number of minutes after midnight that daylight saving time ends.
e64439fb46dc (chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
Glenn Morris <rgm@gnu.org>
parents: 92642
diff changeset
157 Default is for no daylight saving time."
17624
7634c31da26e Add defgroup and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 14685
diff changeset
158 :type 'integer
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
159 :group 'calendar-chinese)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
160
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
161 (define-obsolete-variable-alias 'chinese-calendar-daylight-savings-ends-time
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
162 'calendar-chinese-daylight-saving-end-time "23.1")
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
163
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
164 (defcustom calendar-chinese-celestial-stem
93090
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
165 ["Jia" "Yi" "Bing" "Ding" "Wu" "Ji" "Geng" "Xin" "Ren" "Gui"]
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
166 "Prefixes used by `calendar-chinese-sexagesimal-name'."
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
167 :group 'calendar-chinese
93090
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
168 :type '(vector (string :tag "Jia")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
169 (string :tag "Yi")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
170 (string :tag "Bing")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
171 (string :tag "Ding")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
172 (string :tag "Wu")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
173 (string :tag "Ji")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
174 (string :tag "Geng")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
175 (string :tag "Xin")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
176 (string :tag "Ren")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
177 (string :tag "Gui")))
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
178
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
179 (define-obsolete-variable-alias 'chinese-calendar-celestial-stem
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
180 'calendar-chinese-celestial-stem "23.1")
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
181
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
182 (defcustom calendar-chinese-terrestrial-branch
93090
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
183 ["Zi" "Chou" "Yin" "Mao" "Chen" "Si" "Wu" "Wei" "Shen" "You" "Xu" "Hai"]
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
184 "Suffixes used by `calendar-chinese-sexagesimal-name'."
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
185 :group 'calendar-chinese
93090
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
186 :type '(vector (string :tag "Zi")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
187 (string :tag "Chou")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
188 (string :tag "Yin")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
189 (string :tag "Mao")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
190 (string :tag "Chen")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
191 (string :tag "Si")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
192 (string :tag "Wu")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
193 (string :tag "Wei")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
194 (string :tag "Shen")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
195 (string :tag "You")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
196 (string :tag "Xu")
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
197 (string :tag "Hai")))
9144c487a567 (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Glenn Morris <rgm@gnu.org>
parents: 92989
diff changeset
198
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
199 (define-obsolete-variable-alias 'chinese-calendar-terrestrial-branch
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
200 'calendar-chinese-terrestrial-branch "23.1")
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
201
92579
8ddfb879916b Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 92546
diff changeset
202 ;;; End of user options.
8ddfb879916b Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 92546
diff changeset
203
8ddfb879916b Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 92546
diff changeset
204
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
205 (defun calendar-chinese-sexagesimal-name (n)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
206 "The N-th name of the Chinese sexagesimal cycle.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
207 N congruent to 1 gives the first name, N congruent to 2 gives the second name,
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
208 ..., N congruent to 60 gives the sixtieth name."
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
209 (format "%s-%s"
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
210 (aref calendar-chinese-celestial-stem (% (1- n) 10))
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
211 (aref calendar-chinese-terrestrial-branch (% (1- n) 12))))
92579
8ddfb879916b Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 92546
diff changeset
212
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
213 (defun calendar-chinese-zodiac-sign-on-or-after (d)
92660
e64439fb46dc (chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
Glenn Morris <rgm@gnu.org>
parents: 92642
diff changeset
214 "Absolute date of first new Zodiac sign on or after absolute date D.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
215 The Zodiac signs begin when the sun's longitude is a multiple of 30 degrees."
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
216 (let* ((year (extract-calendar-year (calendar-gregorian-from-absolute d)))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
217 (calendar-time-zone (eval calendar-chinese-time-zone)) ; uses year
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
218 (calendar-daylight-time-offset
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
219 calendar-chinese-daylight-time-offset)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
220 (calendar-standard-time-zone-name
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
221 calendar-chinese-standard-time-zone-name)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
222 (calendar-daylight-time-zone-name
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
223 calendar-chinese-daylight-time-zone-name)
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
224 (calendar-daylight-savings-starts
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
225 calendar-chinese-daylight-saving-start)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
226 (calendar-daylight-savings-ends
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
227 calendar-chinese-daylight-saving-end)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
228 (calendar-daylight-savings-starts-time
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
229 calendar-chinese-daylight-saving-start-time)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
230 (calendar-daylight-savings-ends-time
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
231 calendar-chinese-daylight-saving-end-time))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
232 (floor
93637
60b7d8c48c07 Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents: 93533
diff changeset
233 (calendar-astro-to-absolute
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
234 (solar-date-next-longitude (calendar-astro-from-absolute d) 30)))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
235
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
236 (defun calendar-chinese-new-moon-on-or-after (d)
92660
e64439fb46dc (chinese-calendar-time-zone, chinese-calendar-daylight-time-offset)
Glenn Morris <rgm@gnu.org>
parents: 92642
diff changeset
237 "Absolute date of first new moon on or after absolute date D."
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
238 (let* ((year (extract-calendar-year (calendar-gregorian-from-absolute d)))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
239 (calendar-time-zone (eval calendar-chinese-time-zone))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
240 (calendar-daylight-time-offset
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
241 calendar-chinese-daylight-time-offset)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
242 (calendar-standard-time-zone-name
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
243 calendar-chinese-standard-time-zone-name)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
244 (calendar-daylight-time-zone-name
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
245 calendar-chinese-daylight-time-zone-name)
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
246 (calendar-daylight-savings-starts
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
247 calendar-chinese-daylight-saving-start)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
248 (calendar-daylight-savings-ends
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
249 calendar-chinese-daylight-saving-end)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
250 (calendar-daylight-savings-starts-time
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
251 calendar-chinese-daylight-saving-start-time)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
252 (calendar-daylight-savings-ends-time
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
253 calendar-chinese-daylight-saving-end-time))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
254 (floor
93637
60b7d8c48c07 Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents: 93533
diff changeset
255 (calendar-astro-to-absolute
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
256 (lunar-new-moon-on-or-after (calendar-astro-from-absolute d))))))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
257
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
258 (defun calendar-chinese-month-list (start end)
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
259 "List of starting dates of Chinese months from START to END."
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
260 (if (<= start end)
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
261 (let ((new-moon (calendar-chinese-new-moon-on-or-after start)))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
262 (if (<= new-moon end)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
263 (cons new-moon
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
264 (calendar-chinese-month-list (1+ new-moon) end))))))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
265
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
266 (defun calendar-chinese-number-months (list start)
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
267 "Assign month numbers to the lunar months in LIST, starting with START.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
268 Numbers are assigned sequentially, START, START+1, ..., 11, with
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
269 half numbers used for leap months. First and last months of list
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
270 are never leap months."
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
271 (when list
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
272 (cons (list start (car list)) ; first month
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
273 ;; Remaining months.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
274 (if (zerop (- 12 start (length list)))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
275 ;; List is too short for a leap month.
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
276 (calendar-chinese-number-months (cdr list) (1+ start))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
277 (if (and (cddr list) ; at least two more months...
92967
4151ef80cb37 (number-chinese-months, calendar-chinese-from-absolute): Use nth, caar.
Glenn Morris <rgm@gnu.org>
parents: 92900
diff changeset
278 (<= (nth 2 list)
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
279 (calendar-chinese-zodiac-sign-on-or-after
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
280 (cadr list))))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
281 ;; Next month is a leap month.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
282 (cons (list (+ start 0.5) (cadr list))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
283 (calendar-chinese-number-months (cddr list) (1+ start)))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
284 ;; Next month is not a leap month.
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
285 (calendar-chinese-number-months (cdr list) (1+ start)))))))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
286
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
287 (defun calendar-chinese-compute-year (y)
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
288 "Compute the structure of the Chinese year for Gregorian year Y.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
289 The result is a list of pairs (i d), where month i begins on absolute date d,
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
290 of the Chinese months from the Chinese month following the solstice in
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
291 Gregorian year Y-1 to the Chinese month of the solstice of Gregorian year Y."
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
292 (let* ((next-solstice (calendar-chinese-zodiac-sign-on-or-after
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
293 (calendar-absolute-from-gregorian
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
294 (list 12 15 y))))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
295 (list (calendar-chinese-month-list
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
296 (1+ (calendar-chinese-zodiac-sign-on-or-after
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
297 (calendar-absolute-from-gregorian
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
298 (list 12 15 (1- y)))))
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
299 next-solstice))
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
300 (next-sign (calendar-chinese-zodiac-sign-on-or-after (car list))))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
301 (if (= (length list) 12)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
302 ;; No room for a leap month, just number them 12, 1, 2, ..., 11.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
303 (cons (list 12 (car list))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
304 (calendar-chinese-number-months (cdr list) 1))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
305 ;; Now we can assign numbers to the list for y.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
306 ;; The first month or two are special.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
307 (if (or (> (car list) next-sign) (>= next-sign (cadr list)))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
308 ;; First month on list is a leap month, second is not.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
309 (append (list (list 11.5 (car list))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
310 (list 12 (cadr list)))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
311 (calendar-chinese-number-months (cddr list) 1))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
312 ;; First month on list is not a leap month.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
313 (append (list (list 12 (car list)))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
314 (if (>= (calendar-chinese-zodiac-sign-on-or-after (cadr list))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
315 (nth 2 list))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
316 ;; Second month on list is a leap month.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
317 (cons (list 12.5 (cadr list))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
318 (calendar-chinese-number-months (cddr list) 1))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
319 ;; Second month on list is not a leap month.
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
320 (calendar-chinese-number-months (cdr list) 1)))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
321
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
322 (defvar calendar-chinese-year-cache
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
323 ;; Maintainers: delete existing value, position point at start of
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
324 ;; empty line, then call M-: (calendar-chinese-year-cache-init N)
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
325 '((2000 (12 730126) (1 730155) (2 730185) (3 730215) (4 730244) (5 730273)
23143
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
326 (6 730303) (7 730332) (8 730361) (9 730391) (10 730420) (11 730450))
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
327 (2001 (12 730480) (1 730509) (2 730539) (3 730569) (4 730598) (4.5 730628)
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
328 (5 730657) (6 730687) (7 730716) (8 730745) (9 730775) (10 730804)
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
329 (11 730834))
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
330 (2002 (12 730863) (1 730893) (2 730923) (3 730953) (4 730982) (5 731012)
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
331 (6 731041) (7 731071) (8 731100) (9 731129) (10 731159) (11 731188))
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
332 (2003 (12 731218) (1 731247) (2 731277) (3 731307) (4 731336) (5 731366)
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
333 (6 731396) (7 731425) (8 731455) (9 731484) (10 731513) (11 731543))
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
334 (2004 (12 731572) (1 731602) (2 731631) (2.5 731661) (3 731690) (4 731720)
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
335 (5 731750) (6 731779) (7 731809) (8 731838) (9 731868) (10 731897)
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
336 (11 731927))
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
337 (2005 (12 731956) (1 731986) (2 732015) (3 732045) (4 732074) (5 732104)
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
338 (6 732133) (7 732163) (8 732193) (9 732222) (10 732252) (11 732281))
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
339 (2006 (12 732311) (1 732340) (2 732370) (3 732399) (4 732429) (5 732458)
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
340 (6 732488) (7 732517) (7.5 732547) (8 732576) (9 732606) (10 732636)
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
341 (11 732665))
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
342 (2007 (12 732695) (1 732725) (2 732754) (3 732783) (4 732813) (5 732842)
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
343 (6 732871) (7 732901) (8 732930) (9 732960) (10 732990) (11 733020))
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
344 (2008 (12 733049) (1 733079) (2 733109) (3 733138) (4 733167) (5 733197)
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
345 (6 733226) (7 733255) (8 733285) (9 733314) (10 733344) (11 733374))
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
346 (2009 (12 733403) (1 733433) (2 733463) (3 733493) (4 733522) (5 733551)
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
347 (5.5 733581) (6 733610) (7 733639) (8 733669) (9 733698) (10 733728)
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
348 (11 733757))
cbd4013c57ab (chinese-year-cache): Change range of years from
Karl Heuer <kwzh@gnu.org>
parents: 20462
diff changeset
349 (2010 (12 733787) (1 733817) (2 733847) (3 733876) (4 733906) (5 733935)
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
350 (6 733965) (7 733994) (8 734023) (9 734053) (10 734082) (11 734112))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
351 (2011 (12 734141) (1 734171) (2 734201) (3 734230) (4 734260) (5 734290)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
352 (6 734319) (7 734349) (8 734378) (9 734407) (10 734437) (11 734466))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
353 (2012 (12 734496) (1 734525) (2 734555) (3 734584) (4 734614) (4.5 734644)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
354 (5 734673) (6 734703) (7 734732) (8 734762) (9 734791) (10 734821)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
355 (11 734850))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
356 (2013 (12 734880) (1 734909) (2 734939) (3 734968) (4 734998) (5 735027)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
357 (6 735057) (7 735087) (8 735116) (9 735146) (10 735175) (11 735205))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
358 (2014 (12 735234) (1 735264) (2 735293) (3 735323) (4 735352) (5 735382)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
359 (6 735411) (7 735441) (8 735470) (9 735500) (9.5 735530) (10 735559)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
360 (11 735589))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
361 (2015 (12 735618) (1 735648) (2 735677) (3 735707) (4 735736) (5 735765)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
362 (6 735795) (7 735824) (8 735854) (9 735884) (10 735914) (11 735943))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
363 (2016 (12 735973) (1 736002) (2 736032) (3 736061) (4 736091) (5 736120)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
364 (6 736149) (7 736179) (8 736208) (9 736238) (10 736268) (11 736297))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
365 (2017 (12 736327) (1 736357) (2 736386) (3 736416) (4 736445) (5 736475)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
366 (6 736504) (6.5 736533) (7 736563) (8 736592) (9 736622) (10 736651)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
367 (11 736681))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
368 (2018 (12 736711) (1 736741) (2 736770) (3 736800) (4 736829) (5 736859)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
369 (6 736888) (7 736917) (8 736947) (9 736976) (10 737006) (11 737035))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
370 (2019 (12 737065) (1 737095) (2 737125) (3 737154) (4 737184) (5 737213)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
371 (6 737243) (7 737272) (8 737301) (9 737331) (10 737360) (11 737389))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
372 (2020 (12 737419) (1 737449) (2 737478) (3 737508) (4 737538) (4.5 737568)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
373 (5 737597) (6 737627) (7 737656) (8 737685) (9 737715) (10 737744)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
374 (11 737774)))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
375 "Alist of Chinese year structures as determined by `chinese-year'.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
376 The default can be nil, but some values are precomputed for efficiency.")
13281
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
377
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
378 (defun calendar-chinese-year (y)
13281
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
379 "The structure of the Chinese year for Gregorian year Y.
13574
c5d4269e17d9 Minor fixes.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13306
diff changeset
380 The result is a list of pairs (i d), where month i begins on absolute date d,
13281
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
381 of the Chinese months from the Chinese month following the solstice in
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
382 Gregorian year Y-1 to the Chinese month of the solstice of Gregorian year Y.
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
383 The list is cached in `calendar-chinese-year-cache' for further use."
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
384 (let ((list (cdr (assoc y calendar-chinese-year-cache))))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
385 (or list
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
386 (setq list (calendar-chinese-compute-year y)
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
387 calendar-chinese-year-cache (append calendar-chinese-year-cache
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
388 (list (cons y list)))))
13281
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
389 list))
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
390
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
391 ;; Maintainer use.
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
392 (defun calendar-chinese-year-cache-init (year)
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
393 "Insert an initialization value for `calendar-chinese-year-cache' after point.
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
394 Computes values for 10 years either side of YEAR."
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
395 (setq year (- year 10))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
396 (let (calendar-chinese-year-cache end)
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
397 (save-excursion
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
398 (insert "'(")
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
399 (dotimes (n 21)
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
400 (princ (cons year (calendar-chinese-compute-year year))
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
401 (current-buffer))
93533
851deb208446 Whitespace only.
Glenn Morris <rgm@gnu.org>
parents: 93523
diff changeset
402 (insert (if (= n 20) ")" "\n"))
851deb208446 Whitespace only.
Glenn Morris <rgm@gnu.org>
parents: 93523
diff changeset
403 (setq year (1+ year)))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
404 (setq end (point)))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
405 (save-excursion
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
406 ;; fill-column -/+ 5.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
407 (while (and (< (point) end)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
408 (re-search-forward "^.\\{65,75\\})" end t))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
409 (delete-char 1)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
410 (insert "\n")))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
411 (indent-region (point) end)))
13281
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
412
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
413 (defun calendar-chinese-to-absolute (date)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
414 "The number of days elapsed between the Gregorian date 12/31/1 BC and DATE.
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
415 DATE is a Chinese date (cycle year month day). The Gregorian date
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
416 Sunday, December 31, 1 BC is imaginary."
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
417 (let* ((cycle (car date))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
418 (year (cadr date))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
419 (month (nth 2 date))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
420 (day (nth 3 date))
92642
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
421 (g-year (+ (* (1- cycle) 60) ; years in prior cycles
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
422 (1- year) ; prior years this cycle
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
423 -2636))) ; years before absolute date 0
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
424 (+ (1- day) ; prior days this month
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
425 (cadr ; absolute date of start of this month
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
426 (assoc month (append (memq (assoc 1 (calendar-chinese-year g-year))
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
427 (calendar-chinese-year g-year))
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
428 (calendar-chinese-year (1+ g-year))))))))
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
429
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
430 (define-obsolete-function-alias 'calendar-absolute-from-chinese
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
431 'calendar-chinese-to-absolute "23.1")
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
432
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
433 (defun calendar-chinese-from-absolute (date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
434 "Compute Chinese date (cycle year month day) corresponding to absolute DATE.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
435 The absolute date is the number of days elapsed since the (imaginary)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
436 Gregorian date Sunday, December 31, 1 BC."
13281
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
437 (let* ((g-year (extract-calendar-year
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
438 (calendar-gregorian-from-absolute date)))
13574
c5d4269e17d9 Minor fixes.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13306
diff changeset
439 (c-year (+ g-year 2695))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
440 (list (append (calendar-chinese-year (1- g-year))
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
441 (calendar-chinese-year g-year)
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
442 (calendar-chinese-year (1+ g-year)))))
92967
4151ef80cb37 (number-chinese-months, calendar-chinese-from-absolute): Use nth, caar.
Glenn Morris <rgm@gnu.org>
parents: 92900
diff changeset
443 (while (<= (cadr (cadr list)) date)
92642
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
444 ;; The first month on the list is in Chinese year c-year.
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
445 ;; Date is on or after start of second month on list...
92967
4151ef80cb37 (number-chinese-months, calendar-chinese-from-absolute): Use nth, caar.
Glenn Morris <rgm@gnu.org>
parents: 92900
diff changeset
446 (if (= 1 (caar (cdr list)))
92642
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
447 ;; Second month on list is a new Chinese year...
13574
c5d4269e17d9 Minor fixes.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13306
diff changeset
448 (setq c-year (1+ c-year)))
92642
b3055031d5ea Formatting changes only.
Glenn Morris <rgm@gnu.org>
parents: 92614
diff changeset
449 ;; ...so first month on list is of no interest.
13281
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
450 (setq list (cdr list)))
13574
c5d4269e17d9 Minor fixes.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13306
diff changeset
451 (list (/ (1- c-year) 60)
92989
130c0da046a4 (calendar-chinese-from-absolute, calendar-chinese-date-string): Expand
Glenn Morris <rgm@gnu.org>
parents: 92967
diff changeset
452 ;; Remainder of c-year/60 with 60 instead of 0.
130c0da046a4 (calendar-chinese-from-absolute, calendar-chinese-date-string): Expand
Glenn Morris <rgm@gnu.org>
parents: 92967
diff changeset
453 (1+ (mod (1- c-year) 60))
92967
4151ef80cb37 (number-chinese-months, calendar-chinese-from-absolute): Use nth, caar.
Glenn Morris <rgm@gnu.org>
parents: 92900
diff changeset
454 (caar list)
4151ef80cb37 (number-chinese-months, calendar-chinese-from-absolute): Use nth, caar.
Glenn Morris <rgm@gnu.org>
parents: 92900
diff changeset
455 (1+ (- date (cadr (car list)))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
456
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
457 ;; Bound in generate-calendar.
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
458 (defvar displayed-month)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
459 (defvar displayed-year)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
460
92827
02fc7543d146 (generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents: 92660
diff changeset
461 ;;;###holiday-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
462 (defun holiday-chinese-new-year ()
93453
22b3710e206a (holiday-chinese-new-year): Doc fix and comment.
Glenn Morris <rgm@gnu.org>
parents: 93220
diff changeset
463 "Date of Chinese New Year, if visible in calendar.
22b3710e206a (holiday-chinese-new-year): Doc fix and comment.
Glenn Morris <rgm@gnu.org>
parents: 93220
diff changeset
464 Returns (((MONTH DAY YEAR) TEXT)), where the date is Gregorian."
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
465 (let ((m displayed-month)
93523
aa0e26f1d3ae (holiday-chinese-new-year): Use a single let.
Glenn Morris <rgm@gnu.org>
parents: 93477
diff changeset
466 (y displayed-year)
aa0e26f1d3ae (holiday-chinese-new-year): Use a single let.
Glenn Morris <rgm@gnu.org>
parents: 93477
diff changeset
467 chinese-new-year)
93453
22b3710e206a (holiday-chinese-new-year): Doc fix and comment.
Glenn Morris <rgm@gnu.org>
parents: 93220
diff changeset
468 ;; In the Gregorian calendar, CNY falls between Jan 21 and Feb 20.
22b3710e206a (holiday-chinese-new-year): Doc fix and comment.
Glenn Morris <rgm@gnu.org>
parents: 93220
diff changeset
469 ;; Jan is visible if displayed-month = 12, 1, 2; Feb if d-m = 1, 2, 3.
22b3710e206a (holiday-chinese-new-year): Doc fix and comment.
Glenn Morris <rgm@gnu.org>
parents: 93220
diff changeset
470 ;; If we shift the calendar forward one month, we can do a
93454
648b1e67e4b5 Fix typo in previous change.
Glenn Morris <rgm@gnu.org>
parents: 93453
diff changeset
471 ;; one-sided test, namely: d-m <= 4 means CNY might be visible.
93453
22b3710e206a (holiday-chinese-new-year): Doc fix and comment.
Glenn Morris <rgm@gnu.org>
parents: 93220
diff changeset
472 (increment-calendar-month m y 1) ; shift forward a month
93523
aa0e26f1d3ae (holiday-chinese-new-year): Use a single let.
Glenn Morris <rgm@gnu.org>
parents: 93477
diff changeset
473 (and (< m 5)
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
474 (calendar-date-is-visible-p
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
475 (setq chinese-new-year
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
476 (calendar-gregorian-from-absolute
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
477 (cadr (assoc 1 (calendar-chinese-year y))))))
93523
aa0e26f1d3ae (holiday-chinese-new-year): Use a single let.
Glenn Morris <rgm@gnu.org>
parents: 93477
diff changeset
478 (list
aa0e26f1d3ae (holiday-chinese-new-year): Use a single let.
Glenn Morris <rgm@gnu.org>
parents: 93477
diff changeset
479 (list chinese-new-year
aa0e26f1d3ae (holiday-chinese-new-year): Use a single let.
Glenn Morris <rgm@gnu.org>
parents: 93477
diff changeset
480 (format "Chinese New Year (%s)"
aa0e26f1d3ae (holiday-chinese-new-year): Use a single let.
Glenn Morris <rgm@gnu.org>
parents: 93477
diff changeset
481 (calendar-chinese-sexagesimal-name (+ y 57))))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
482
92827
02fc7543d146 (generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents: 92660
diff changeset
483 ;;;###cal-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
484 (defun calendar-chinese-date-string (&optional date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
485 "String of Chinese date of Gregorian DATE.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
486 Defaults to today's date if DATE is not given."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
487 (let* ((a-date (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
488 (or date (calendar-current-date))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
489 (c-date (calendar-chinese-from-absolute a-date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
490 (cycle (car c-date))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
491 (year (cadr c-date))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
492 (month (nth 2 c-date))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
493 (day (nth 3 c-date))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
494 (this-month (calendar-chinese-to-absolute
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
495 (list cycle year month 1)))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
496 (next-month (calendar-chinese-to-absolute
13283
f8658d1ca0f2 Various fixes and simplifications.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13281
diff changeset
497 (list (if (= year 60) (1+ cycle) cycle)
f8658d1ca0f2 Various fixes and simplifications.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13281
diff changeset
498 (if (= (floor month) 12) (1+ year) year)
92989
130c0da046a4 (calendar-chinese-from-absolute, calendar-chinese-date-string): Expand
Glenn Morris <rgm@gnu.org>
parents: 92967
diff changeset
499 ;; Remainder of (1+(floor month))/12, with
130c0da046a4 (calendar-chinese-from-absolute, calendar-chinese-date-string): Expand
Glenn Morris <rgm@gnu.org>
parents: 92967
diff changeset
500 ;; 12 instead of 0.
130c0da046a4 (calendar-chinese-from-absolute, calendar-chinese-date-string): Expand
Glenn Morris <rgm@gnu.org>
parents: 92967
diff changeset
501 (1+ (mod (floor month) 12))
13283
f8658d1ca0f2 Various fixes and simplifications.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13281
diff changeset
502 1)))
13281
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
503 (m-cycle (% (+ (* year 5) (floor month)) 60)))
13306
77d8e407592e Fix the way the sexagisimal names are calculated.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13284
diff changeset
504 (format "Cycle %s, year %s (%s), %smonth %s%s, day %s (%s)"
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
505 cycle
13675
280cee006df8 (calendar-chinese-sexagesimal-name): Renamed from
Paul Eggert <eggert@twinsun.com>
parents: 13574
diff changeset
506 year (calendar-chinese-sexagesimal-name year)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
507 (if (not (integerp month))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
508 "second "
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
509 (if (< 30 (- next-month this-month))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
510 "first "
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
511 ""))
13281
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
512 (floor month)
13306
77d8e407592e Fix the way the sexagisimal names are calculated.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13284
diff changeset
513 (if (integerp month)
13675
280cee006df8 (calendar-chinese-sexagesimal-name): Renamed from
Paul Eggert <eggert@twinsun.com>
parents: 13574
diff changeset
514 (format " (%s)" (calendar-chinese-sexagesimal-name
20215
13b173216a3d (calendar-chinese-date-string): Fix month name.
Karl Heuer <kwzh@gnu.org>
parents: 19903
diff changeset
515 (+ (* 12 year) month 50)))
13306
77d8e407592e Fix the way the sexagisimal names are calculated.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13284
diff changeset
516 "")
13675
280cee006df8 (calendar-chinese-sexagesimal-name): Renamed from
Paul Eggert <eggert@twinsun.com>
parents: 13574
diff changeset
517 day (calendar-chinese-sexagesimal-name (+ a-date 15)))))
13306
77d8e407592e Fix the way the sexagisimal names are calculated.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13284
diff changeset
518
92827
02fc7543d146 (generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents: 92660
diff changeset
519 ;;;###cal-autoload
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
520 (defun calendar-chinese-print-date ()
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
521 "Show the Chinese date equivalents of date."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
522 (interactive)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
523 (message "Computing Chinese date...")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
524 (message "Chinese date: %s"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
525 (calendar-chinese-date-string (calendar-cursor-to-date t))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
526
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
527 (define-obsolete-function-alias 'calendar-print-chinese-date
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
528 'calendar-chinese-print-date "23.1")
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
529
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
530 (defun calendar-chinese-months-to-alist (l)
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
531 "Make list of months L into an assoc list."
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
532 (and l (car l)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
533 (if (and (cdr l) (cadr l))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
534 (if (= (car l) (floor (cadr l)))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
535 (append
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
536 (list (cons (format "%s (first)" (car l)) (car l))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
537 (cons (format "%s (second)" (car l)) (cadr l)))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
538 (calendar-chinese-months-to-alist (cddr l)))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
539 (append
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
540 (list (cons (int-to-string (car l)) (car l)))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
541 (calendar-chinese-months-to-alist (cdr l))))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
542 (list (cons (int-to-string (car l)) (car l))))))
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
543
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
544 (defun calendar-chinese-months (c y)
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
545 "A list of the months in cycle C, year Y of the Chinese calendar."
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
546 (memq 1 (append
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
547 (mapcar (lambda (x)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
548 (car x))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
549 (calendar-chinese-year (extract-calendar-year
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
550 (calendar-gregorian-from-absolute
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
551 (calendar-chinese-to-absolute
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
552 (list c y 1 1))))))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
553 (mapcar (lambda (x)
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
554 (if (> (car x) 11) (car x)))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
555 (calendar-chinese-year (extract-calendar-year
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
556 (calendar-gregorian-from-absolute
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
557 (calendar-chinese-to-absolute
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
558 (list (if (= y 60) (1+ c) c)
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
559 (if (= y 60) 1 y)
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
560 1 1)))))))))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
561
92827
02fc7543d146 (generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents: 92660
diff changeset
562 ;;;###cal-autoload
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
563 (defun calendar-chinese-goto-date (date &optional noecho)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
564 "Move cursor to Chinese date DATE.
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
565 Echo Chinese date unless NOECHO is non-nil."
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
566 (interactive
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
567 (let* ((c (calendar-chinese-from-absolute
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
568 (calendar-absolute-from-gregorian (calendar-current-date))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
569 (cycle (calendar-read
13281
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
570 "Chinese calendar cycle number (>44): "
92579
8ddfb879916b Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 92546
diff changeset
571 (lambda (x) (> x 44))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
572 (int-to-string (car c))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
573 (year (calendar-read
13281
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
574 "Year in Chinese cycle (1..60): "
92579
8ddfb879916b Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 92546
diff changeset
575 (lambda (x) (and (<= 1 x) (<= x 60)))
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
576 (int-to-string (cadr c))))
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
577 (month-list (calendar-chinese-months-to-alist
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
578 (calendar-chinese-months cycle year)))
13281
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
579 (month (cdr (assoc
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
580 (completing-read "Chinese calendar month: "
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
581 month-list nil t)
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
582 month-list)))
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
583 (last (if (= month
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
584 (nth 2
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
585 (calendar-chinese-from-absolute
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
586 (+ 29
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
587 (calendar-chinese-to-absolute
92900
c6b7fe651716 Re-order so that functions are defined before use.
Glenn Morris <rgm@gnu.org>
parents: 92827
diff changeset
588 (list cycle year month 1))))))
13281
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
589 30
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
590 29))
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
591 (day (calendar-read
510f946d1e22 Completely rewritten!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 13053
diff changeset
592 (format "Chinese calendar day (1-%d): " last)
92579
8ddfb879916b Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 92546
diff changeset
593 (lambda (x) (and (<= 1 x) (<= x last))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
594 (list (list cycle year month day))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
595 (calendar-goto-date (calendar-gregorian-from-absolute
93739
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
596 (calendar-chinese-to-absolute date)))
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
597 (or noecho (calendar-chinese-print-date)))
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
598
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
599 (define-obsolete-function-alias 'calendar-goto-chinese-date
14357375e115 (calendar-chinese): Rename custom group from chinese-calendar. Update users.
Glenn Morris <rgm@gnu.org>
parents: 93637
diff changeset
600 'calendar-chinese-goto-date "23.1")
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
601
92614
52850e6ad92b Comment.
Glenn Morris <rgm@gnu.org>
parents: 92579
diff changeset
602 (defvar date)
52850e6ad92b Comment.
Glenn Morris <rgm@gnu.org>
parents: 92579
diff changeset
603
52850e6ad92b Comment.
Glenn Morris <rgm@gnu.org>
parents: 92579
diff changeset
604 ;; To be called from list-sexp-diary-entries, where DATE is bound.
92827
02fc7543d146 (generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents: 92660
diff changeset
605 ;;;###diary-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
606 (defun diary-chinese-date ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
607 "Chinese calendar equivalent of date diary entry."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
608 (format "Chinese date: %s" (calendar-chinese-date-string date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
609
14685
496342156d13 Renamed from cal-chinese.el to avoid 14-character limitation.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
610 (provide 'cal-china)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
611
92579
8ddfb879916b Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 92546
diff changeset
612 ;; arch-tag: 7e5b7e0d-676c-47e3-8696-93e7ea0ab644
14685
496342156d13 Renamed from cal-chinese.el to avoid 14-character limitation.
Karl Heuer <kwzh@gnu.org>
parents: 14169
diff changeset
613 ;;; cal-china.el ends here