annotate lisp/calendar/cal-iso.el @ 93948:a90650368da6

Require diary-lib rather than calendar. (appt): Add :prefix.
author Glenn Morris <rgm@gnu.org>
date Thu, 10 Apr 2008 03:43:52 +0000
parents bf9ef749c23e
children e49abd957e81
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: 20462
diff changeset
1 ;;; cal-iso.el --- calendar functions for the ISO calendar
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
2
92609
733bd38ed2dd Comments.
Glenn Morris <rgm@gnu.org>
parents: 92586
diff changeset
3 ;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
733bd38ed2dd Comments.
Glenn Morris <rgm@gnu.org>
parents: 92586
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>
65919
5c09efcfc1d9 Update maintainer email address.
Glenn Morris <rgm@gnu.org>
parents: 65145
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: ISO calendar, calendar, 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: 13053
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
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
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
32 ;;; Code:
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
33
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
34 (require 'calendar)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
35
93643
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
36 (defun calendar-iso-to-absolute (date)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
37 "The number of days elapsed between the Gregorian date 12/31/1 BC and DATE.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
38 The `ISO year' corresponds approximately to the Gregorian year, but
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
39 weeks start on Monday and end on Sunday. The first week of the ISO year is
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
40 the first such week in which at least 4 days are in a year. The ISO
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
41 commercial DATE has the form (week day year) in which week is in the range
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
42 1..52 and day is in the range 0..6 (1 = Monday, 2 = Tuesday, ..., 0 =
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
43 Sunday). The Gregorian date Sunday, December 31, 1 BC is imaginary."
93809
3ff2b47de8f2 Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents: 93782
diff changeset
44 (let ((day (calendar-extract-day date)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
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
93809
3ff2b47de8f2 Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents: 93782
diff changeset
47 (list 1 1 (calendar-extract-year date)))))
92818
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).
93809
3ff2b47de8f2 Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents: 93782
diff changeset
49 (* 7 (1- (calendar-extract-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
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
51
93643
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
52 (define-obsolete-function-alias 'calendar-absolute-from-iso
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
53 'calendar-iso-to-absolute "23.1")
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
54
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
55 (defun calendar-iso-from-absolute (date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
56 "Compute the `ISO commercial date' corresponding to the absolute DATE.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
57 The ISO year corresponds approximately to the Gregorian year, but weeks
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
58 start on Monday and end on Sunday. The first week of the ISO year is the
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
59 first such week in which at least 4 days are in a year. The ISO commercial
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
60 date has the form (week day year) in which week is in the range 1..52 and
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
61 day is in the range 0..6 (1 = Monday, 2 = Tuesday, ..., 0 = Sunday). The
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
62 absolute date is the number of days elapsed since the (imaginary) Gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
63 date Sunday, December 31, 1 BC."
93809
3ff2b47de8f2 Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents: 93782
diff changeset
64 (let* ((approx (calendar-extract-year
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
65 (calendar-gregorian-from-absolute (- date 3))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
66 (year (+ approx
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
67 (calendar-sum y approx
93643
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
68 (>= date (calendar-iso-to-absolute
92902
d77fc175bcfc Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92833
diff changeset
69 (list 1 1 (1+ y))))
d77fc175bcfc Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92833
diff changeset
70 1))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
71 (list
93643
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
72 (1+ (/ (- date (calendar-iso-to-absolute (list 1 1 year))) 7))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
73 (% date 7)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
74 year)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
75
92833
272f566348a7 (generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents: 92818
diff changeset
76 ;;;###cal-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
77 (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
78 "String of ISO date of Gregorian DATE, default today."
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 38422
diff changeset
79 (let* ((d (calendar-absolute-from-gregorian
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
80 (or date (calendar-current-date))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
81 (day (% d 7))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
82 (iso-date (calendar-iso-from-absolute d)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
83 (format "Day %s of week %d of %d"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
84 (if (zerop day) 7 day)
93809
3ff2b47de8f2 Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents: 93782
diff changeset
85 (calendar-extract-month iso-date)
3ff2b47de8f2 Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents: 93782
diff changeset
86 (calendar-extract-year iso-date))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
87
92833
272f566348a7 (generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents: 92818
diff changeset
88 ;;;###cal-autoload
93643
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
89 (defun calendar-iso-print-date ()
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
90 "Show equivalent ISO date for the date under the cursor."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
91 (interactive)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
92 (message "ISO date: %s"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
93 (calendar-iso-date-string (calendar-cursor-to-date t))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
94
93643
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
95 (define-obsolete-function-alias 'calendar-print-iso-date
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
96 'calendar-iso-print-date "23.1")
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
97
93185
5a7437fafea3 (calendar-iso-read-date): New name for calendar-iso-read-args. Update
Glenn Morris <rgm@gnu.org>
parents: 92902
diff changeset
98 (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
99 "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
100 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
101 taken to be 1)."
92818
3ed51c637a80 (calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents: 92625
diff changeset
102 (let* ((year (calendar-read
57324
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
103 "ISO calendar year (>0): "
92586
15aa69393e42 Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
104 (lambda (x) (> x 0))
93844
bf9ef749c23e Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents: 93809
diff changeset
105 (number-to-string (calendar-extract-year
92818
3ed51c637a80 (calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents: 92625
diff changeset
106 (calendar-current-date)))))
93809
3ff2b47de8f2 Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents: 93782
diff changeset
107 (no-weeks (calendar-extract-month
57324
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
108 (calendar-iso-from-absolute
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
109 (1-
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
110 (calendar-dayname-on-or-before
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
111 1 (calendar-absolute-from-gregorian
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
112 (list 1 4 (1+ year))))))))
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
113 (week (calendar-read
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
114 (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
115 (lambda (x) (and (> x 0) (<= x no-weeks)))))
57324
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
116 (day (if dayflag (calendar-read
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
117 "ISO day (1-7): "
92586
15aa69393e42 Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
118 (lambda (x) (and (<= 1 x) (<= x 7))))
57324
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
119 1)))
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
120 (list (list week day year))))
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
121
93643
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
122 (define-obsolete-function-alias 'calendar-iso-read-args
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
123 'calendar-iso-read-date "23.1")
93185
5a7437fafea3 (calendar-iso-read-date): New name for calendar-iso-read-args. Update
Glenn Morris <rgm@gnu.org>
parents: 92902
diff changeset
124
92833
272f566348a7 (generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents: 92818
diff changeset
125 ;;;###cal-autoload
93643
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
126 (defun calendar-iso-goto-date (date &optional noecho)
92818
3ed51c637a80 (calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents: 92625
diff changeset
127 "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
128 (interactive (calendar-iso-read-date t))
57324
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
129 (calendar-goto-date (calendar-gregorian-from-absolute
93643
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
130 (calendar-iso-to-absolute date)))
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
131 (or noecho (calendar-iso-print-date)))
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
132
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
133 (define-obsolete-function-alias 'calendar-goto-iso-date
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
134 'calendar-iso-goto-date "23.1")
57324
f51c087984a0 Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
135
92833
272f566348a7 (generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents: 92818
diff changeset
136 ;;;###cal-autoload
93643
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
137 (defun calendar-iso-goto-week (date &optional noecho)
92818
3ed51c637a80 (calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents: 92625
diff changeset
138 "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
139 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
140 (interactive (calendar-iso-read-date))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
141 (calendar-goto-date (calendar-gregorian-from-absolute
93643
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
142 (calendar-iso-to-absolute date)))
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
143 (or noecho (calendar-iso-print-date)))
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
144
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
145 (define-obsolete-function-alias 'calendar-goto-iso-week
e6a9bdb70ed7 (calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents: 93481
diff changeset
146 'calendar-iso-goto-week "23.1")
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
147
92586
15aa69393e42 Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
148 (defvar date)
15aa69393e42 Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
149
93782
a7aaeba2c2bc Comment.
Glenn Morris <rgm@gnu.org>
parents: 93643
diff changeset
150 ;; To be called from diary-list-sexp-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
151 ;;;###diary-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
152 (defun diary-iso-date ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
153 "ISO calendar equivalent of date diary entry."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
154 (format "ISO date: %s" (calendar-iso-date-string date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
155
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
156 (provide 'cal-iso)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
157
92586
15aa69393e42 Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
158 ;; arch-tag: 3c0154cc-d30f-4981-9f60-42bdf7a468f6
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
159 ;;; cal-iso.el ends here