Mercurial > emacs
annotate lisp/calendar/cal-iso.el @ 73321:0266829c1021
(x_check_expected_move): Remove unused var `count'.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 10 Oct 2006 14:37:54 +0000 |
parents | 8daf7d9a0771 |
children | 7a3f13e2dd57 4b3d39451150 |
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 |
68721 | 3 ;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006 |
67465
a55ee709ec8d
Update copyright pending Emacs 22.
Glenn Morris <rgm@gnu.org>
parents:
65919
diff
changeset
|
4 ;; 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 | |
15 ;; the Free Software Foundation; either version 2, or (at your option) | |
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 | |
30 ;; This collection of functions implements the features of calendar.el and | |
31 ;; diary.el that deal with the ISO calendar. | |
32 | |
20462
d179de7ad92e
Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents:
14169
diff
changeset
|
33 ;; Technical details of all the calendrical calculations can be found in |
61148
7f7db25577d9
Update reference to "Calendrical Calculations" book; there's a new edition.
Paul Eggert <eggert@twinsun.com>
parents:
57324
diff
changeset
|
34 ;; ``Calendrical Calculations: The Millennium Edition'' by Edward M. Reingold |
7f7db25577d9
Update reference to "Calendrical Calculations" book; there's a new edition.
Paul Eggert <eggert@twinsun.com>
parents:
57324
diff
changeset
|
35 ;; and Nachum Dershowitz, Cambridge University Press (2001). |
20462
d179de7ad92e
Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents:
14169
diff
changeset
|
36 |
13053 | 37 ;; Comments, corrections, and improvements should be sent to |
38 ;; Edward M. Reingold Department of Computer Science | |
39 ;; (217) 333-6733 University of Illinois at Urbana-Champaign | |
40 ;; reingold@cs.uiuc.edu 1304 West Springfield Avenue | |
41 ;; Urbana, Illinois 61801 | |
42 | |
43 ;;; Code: | |
44 | |
65145
ac895e21e622
(date): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64085
diff
changeset
|
45 (defvar date) |
ac895e21e622
(date): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64085
diff
changeset
|
46 |
13053 | 47 (require 'calendar) |
48 | |
49 (defun calendar-absolute-from-iso (date) | |
50 "The number of days elapsed between the Gregorian date 12/31/1 BC and DATE. | |
51 The `ISO year' corresponds approximately to the Gregorian year, but | |
52 weeks start on Monday and end on Sunday. The first week of the ISO year is | |
53 the first such week in which at least 4 days are in a year. The ISO | |
54 commercial DATE has the form (week day year) in which week is in the range | |
55 1..52 and day is in the range 0..6 (1 = Monday, 2 = Tuesday, ..., 0 = | |
56 Sunday). The Gregorian date Sunday, December 31, 1 BC is imaginary." | |
57 (let* ((week (extract-calendar-month date)) | |
58 (day (extract-calendar-day date)) | |
59 (year (extract-calendar-year date))) | |
60 (+ (calendar-dayname-on-or-before | |
61 1 (+ 3 (calendar-absolute-from-gregorian (list 1 1 year)))) | |
62 (* 7 (1- week)) | |
63 (if (= day 0) 6 (1- day))))) | |
64 | |
65 (defun calendar-iso-from-absolute (date) | |
66 "Compute the `ISO commercial date' corresponding to the absolute DATE. | |
67 The ISO year corresponds approximately to the Gregorian year, but weeks | |
68 start on Monday and end on Sunday. The first week of the ISO year is the | |
69 first such week in which at least 4 days are in a year. The ISO commercial | |
70 date has the form (week day year) in which week is in the range 1..52 and | |
71 day is in the range 0..6 (1 = Monday, 2 = Tuesday, ..., 0 = Sunday). The | |
72 absolute date is the number of days elapsed since the (imaginary) Gregorian | |
73 date Sunday, December 31, 1 BC." | |
74 (let* ((approx (extract-calendar-year | |
75 (calendar-gregorian-from-absolute (- date 3)))) | |
76 (year (+ approx | |
77 (calendar-sum y approx | |
78 (>= date (calendar-absolute-from-iso (list 1 1 (1+ y)))) | |
79 1)))) | |
80 (list | |
81 (1+ (/ (- date (calendar-absolute-from-iso (list 1 1 year))) 7)) | |
82 (% date 7) | |
83 year))) | |
84 | |
85 (defun calendar-iso-date-string (&optional date) | |
86 "String of ISO date of Gregorian DATE. | |
87 Defaults to today's date if DATE is not given." | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
38422
diff
changeset
|
88 (let* ((d (calendar-absolute-from-gregorian |
13053 | 89 (or date (calendar-current-date)))) |
90 (day (% d 7)) | |
91 (iso-date (calendar-iso-from-absolute d))) | |
92 (format "Day %s of week %d of %d" | |
93 (if (zerop day) 7 day) | |
94 (extract-calendar-month iso-date) | |
95 (extract-calendar-year iso-date)))) | |
96 | |
97 (defun calendar-print-iso-date () | |
98 "Show equivalent ISO date for the date under the cursor." | |
99 (interactive) | |
100 (message "ISO date: %s" | |
101 (calendar-iso-date-string (calendar-cursor-to-date t)))) | |
102 | |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
103 (defun calendar-iso-read-args (&optional dayflag) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
104 "Interactively read the arguments for an iso date command." |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
105 (let* ((today (calendar-current-date)) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
106 (year (calendar-read |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
107 "ISO calendar year (>0): " |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
108 '(lambda (x) (> x 0)) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
109 (int-to-string (extract-calendar-year today)))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
110 (no-weeks (extract-calendar-month |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
111 (calendar-iso-from-absolute |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
112 (1- |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
113 (calendar-dayname-on-or-before |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
114 1 (calendar-absolute-from-gregorian |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
115 (list 1 4 (1+ year)))))))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
116 (week (calendar-read |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
117 (format "ISO calendar week (1-%d): " no-weeks) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
118 '(lambda (x) (and (> x 0) (<= x no-weeks))))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
119 (day (if dayflag (calendar-read |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
120 "ISO day (1-7): " |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
121 '(lambda (x) (and (<= 1 x) (<= x 7)))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
122 1))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
123 (list (list week day year)))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
124 |
13053 | 125 (defun calendar-goto-iso-date (date &optional noecho) |
126 "Move cursor to ISO DATE; echo ISO date unless NOECHO is t." | |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
127 (interactive (calendar-iso-read-args t)) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
128 (calendar-goto-date (calendar-gregorian-from-absolute |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
129 (calendar-absolute-from-iso date))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
130 (or noecho (calendar-print-iso-date))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
131 |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
132 (defun calendar-goto-iso-week (date &optional noecho) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
133 "Move cursor to ISO DATE; echo ISO date unless NOECHO is t. |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
134 Interactively, goes to the first day of the specified week." |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
135 (interactive (calendar-iso-read-args)) |
13053 | 136 (calendar-goto-date (calendar-gregorian-from-absolute |
137 (calendar-absolute-from-iso date))) | |
138 (or noecho (calendar-print-iso-date))) | |
139 | |
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 | |
52401 | 146 ;;; arch-tag: 3c0154cc-d30f-4981-9f60-42bdf7a468f6 |
13053 | 147 ;;; cal-iso.el ends here |