Mercurial > emacs
annotate lisp/calendar/cal-iso.el @ 93580:b6cea5b391eb
(calendar-holiday-list): Fix previous change.
(holiday-filter-visible-calendar): Doc fix. Use mapcar.
(holiday-easter-etc): Fix nesting of result. Tweak holiday order.
Use calendar-date-is-visible-p, not holiday-filter-visible-calendar.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 03 Apr 2008 04:09:31 +0000 |
parents | b3e69c64ac95 |
children | e6a9bdb70ed7 |
rev | line source |
---|---|
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
20462
diff
changeset
|
1 ;;; cal-iso.el --- calendar functions for the ISO calendar |
13053 | 2 |
92609 | 3 ;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
4 ;; 2008 Free Software Foundation, Inc. | |
13053 | 5 |
6 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> | |
65919
5c09efcfc1d9
Update maintainer email address.
Glenn Morris <rgm@gnu.org>
parents:
65145
diff
changeset
|
7 ;; Maintainer: Glenn Morris <rgm@gnu.org> |
13053 | 8 ;; Keywords: calendar |
9 ;; Human-Keywords: ISO calendar, calendar, diary | |
10 | |
11 ;; This file is part of GNU Emacs. | |
12 | |
13 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
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 | 16 ;; any later version. |
17 | |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
14169 | 24 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64085 | 25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
26 ;; Boston, MA 02110-1301, USA. | |
13053 | 27 |
28 ;;; Commentary: | |
29 | |
93481
b3e69c64ac95
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93185
diff
changeset
|
30 ;; See calendar.el. |
20462
d179de7ad92e
Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents:
14169
diff
changeset
|
31 |
13053 | 32 ;;; Code: |
33 | |
34 (require 'calendar) | |
35 | |
36 (defun calendar-absolute-from-iso (date) | |
37 "The number of days elapsed between the Gregorian date 12/31/1 BC and DATE. | |
38 The `ISO year' corresponds approximately to the Gregorian year, but | |
39 weeks start on Monday and end on Sunday. The first week of the ISO year is | |
40 the first such week in which at least 4 days are in a year. The ISO | |
41 commercial DATE has the form (week day year) in which week is in the range | |
42 1..52 and day is in the range 0..6 (1 = Monday, 2 = Tuesday, ..., 0 = | |
43 Sunday). The Gregorian date Sunday, December 31, 1 BC is imaginary." | |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
44 (let ((day (extract-calendar-day date))) |
13053 | 45 (+ (calendar-dayname-on-or-before |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
46 1 (+ 3 (calendar-absolute-from-gregorian |
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
47 (list 1 1 (extract-calendar-year date))))) |
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
48 ;; ISO date is (week day year); normally (month day year). |
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
49 (* 7 (1- (extract-calendar-month date))) |
92586
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
50 (if (zerop day) 6 (1- day))))) |
13053 | 51 |
52 (defun calendar-iso-from-absolute (date) | |
53 "Compute the `ISO commercial date' corresponding to the absolute DATE. | |
54 The ISO year corresponds approximately to the Gregorian year, but weeks | |
55 start on Monday and end on Sunday. The first week of the ISO year is the | |
56 first such week in which at least 4 days are in a year. The ISO commercial | |
57 date has the form (week day year) in which week is in the range 1..52 and | |
58 day is in the range 0..6 (1 = Monday, 2 = Tuesday, ..., 0 = Sunday). The | |
59 absolute date is the number of days elapsed since the (imaginary) Gregorian | |
60 date Sunday, December 31, 1 BC." | |
61 (let* ((approx (extract-calendar-year | |
62 (calendar-gregorian-from-absolute (- date 3)))) | |
63 (year (+ approx | |
64 (calendar-sum y approx | |
92902 | 65 (>= date (calendar-absolute-from-iso |
66 (list 1 1 (1+ y)))) | |
67 1)))) | |
13053 | 68 (list |
69 (1+ (/ (- date (calendar-absolute-from-iso (list 1 1 year))) 7)) | |
70 (% date 7) | |
71 year))) | |
72 | |
92833
272f566348a7
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92818
diff
changeset
|
73 ;;;###cal-autoload |
13053 | 74 (defun calendar-iso-date-string (&optional date) |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
75 "String of ISO date of Gregorian DATE, default today." |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
38422
diff
changeset
|
76 (let* ((d (calendar-absolute-from-gregorian |
13053 | 77 (or date (calendar-current-date)))) |
78 (day (% d 7)) | |
79 (iso-date (calendar-iso-from-absolute d))) | |
80 (format "Day %s of week %d of %d" | |
81 (if (zerop day) 7 day) | |
82 (extract-calendar-month iso-date) | |
83 (extract-calendar-year iso-date)))) | |
84 | |
92833
272f566348a7
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92818
diff
changeset
|
85 ;;;###cal-autoload |
13053 | 86 (defun calendar-print-iso-date () |
87 "Show equivalent ISO date for the date under the cursor." | |
88 (interactive) | |
89 (message "ISO date: %s" | |
90 (calendar-iso-date-string (calendar-cursor-to-date t)))) | |
91 | |
93185
5a7437fafea3
(calendar-iso-read-date): New name for calendar-iso-read-args. Update
Glenn Morris <rgm@gnu.org>
parents:
92902
diff
changeset
|
92 (defun calendar-iso-read-date (&optional dayflag) |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
93 "Interactively read the arguments for an ISO date command. |
92625
e26350e23411
(calendar-iso-read-args): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
92609
diff
changeset
|
94 Reads a year and week, and if DAYFLAG is non-nil a day (otherwise |
e26350e23411
(calendar-iso-read-args): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
92609
diff
changeset
|
95 taken to be 1)." |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
96 (let* ((year (calendar-read |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
97 "ISO calendar year (>0): " |
92586
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
98 (lambda (x) (> x 0)) |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
99 (int-to-string (extract-calendar-year |
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
100 (calendar-current-date))))) |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
101 (no-weeks (extract-calendar-month |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
102 (calendar-iso-from-absolute |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
103 (1- |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
104 (calendar-dayname-on-or-before |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
105 1 (calendar-absolute-from-gregorian |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
106 (list 1 4 (1+ year)))))))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
107 (week (calendar-read |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
108 (format "ISO calendar week (1-%d): " no-weeks) |
92586
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
109 (lambda (x) (and (> x 0) (<= x no-weeks))))) |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
110 (day (if dayflag (calendar-read |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
111 "ISO day (1-7): " |
92586
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
112 (lambda (x) (and (<= 1 x) (<= x 7)))) |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
113 1))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
114 (list (list week day year)))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
115 |
93185
5a7437fafea3
(calendar-iso-read-date): New name for calendar-iso-read-args. Update
Glenn Morris <rgm@gnu.org>
parents:
92902
diff
changeset
|
116 (define-obsolete-function-alias |
5a7437fafea3
(calendar-iso-read-date): New name for calendar-iso-read-args. Update
Glenn Morris <rgm@gnu.org>
parents:
92902
diff
changeset
|
117 'calendar-iso-read-args 'calendar-iso-read-date "23.1") |
5a7437fafea3
(calendar-iso-read-date): New name for calendar-iso-read-args. Update
Glenn Morris <rgm@gnu.org>
parents:
92902
diff
changeset
|
118 |
92833
272f566348a7
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92818
diff
changeset
|
119 ;;;###cal-autoload |
13053 | 120 (defun calendar-goto-iso-date (date &optional noecho) |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
121 "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil." |
93185
5a7437fafea3
(calendar-iso-read-date): New name for calendar-iso-read-args. Update
Glenn Morris <rgm@gnu.org>
parents:
92902
diff
changeset
|
122 (interactive (calendar-iso-read-date t)) |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
123 (calendar-goto-date (calendar-gregorian-from-absolute |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
124 (calendar-absolute-from-iso date))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
125 (or noecho (calendar-print-iso-date))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
126 |
92833
272f566348a7
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92818
diff
changeset
|
127 ;;;###cal-autoload |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
128 (defun calendar-goto-iso-week (date &optional noecho) |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
129 "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil. |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
130 Interactively, goes to the first day of the specified week." |
93185
5a7437fafea3
(calendar-iso-read-date): New name for calendar-iso-read-args. Update
Glenn Morris <rgm@gnu.org>
parents:
92902
diff
changeset
|
131 (interactive (calendar-iso-read-date)) |
13053 | 132 (calendar-goto-date (calendar-gregorian-from-absolute |
133 (calendar-absolute-from-iso date))) | |
134 (or noecho (calendar-print-iso-date))) | |
135 | |
92586
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
136 (defvar date) |
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
137 |
92609 | 138 ;; To be called from list-sexp-diary-entries, where DATE is bound. |
92833
272f566348a7
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92818
diff
changeset
|
139 ;;;###diary-autoload |
13053 | 140 (defun diary-iso-date () |
141 "ISO calendar equivalent of date diary entry." | |
142 (format "ISO date: %s" (calendar-iso-date-string date))) | |
143 | |
144 (provide 'cal-iso) | |
145 | |
92586
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
146 ;; arch-tag: 3c0154cc-d30f-4981-9f60-42bdf7a468f6 |
13053 | 147 ;;; cal-iso.el ends here |