annotate lisp/calendar/cal-julian.el @ 92912:bf22321f752b

Re-indent. (calendar-absolute-from-julian): Move definition before use. Remove un-needed local `day'. (calendar-goto-julian-date, calendar-goto-astro-day-number): Doc fix.
author Glenn Morris <rgm@gnu.org>
date Fri, 14 Mar 2008 03:34:42 +0000
parents 3e0b7b9e8f11
children 1a690de051ab
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: 24189
diff changeset
1 ;;; cal-julian.el --- calendar functions for the Julian calendar
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
2
92608
18dc9ef91100 (calendar-absolute-from-julian): Use zerop.
Glenn Morris <rgm@gnu.org>
parents: 92587
diff changeset
3 ;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
18dc9ef91100 (calendar-absolute-from-julian): Use zerop.
Glenn Morris <rgm@gnu.org>
parents: 92587
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: 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: Julian calendar, Julian day number, 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: 13673
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
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
30 ;; This collection of functions implements the features of calendar.el and
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
31 ;; diary.el that deal with the Julian calendar.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
32
20462
d179de7ad92e Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents: 17380
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: 54076
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: 54076
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: 17380
diff changeset
36
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
37 ;;; Code:
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
38
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
39 (require 'calendar)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
40
92912
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
41 (defun calendar-absolute-from-julian (date)
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
42 "The number of days elapsed between the Gregorian date 12/31/1 BC and DATE.
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
43 The Gregorian date Sunday, December 31, 1 BC is imaginary."
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
44 (let ((month (extract-calendar-month date))
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
45 (year (extract-calendar-year date)))
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
46 (+ (calendar-day-number date)
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
47 (if (and (zerop (% year 100))
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
48 (not (zerop (% year 400)))
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
49 (> month 2))
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
50 1 0) ; correct for Julian but not Gregorian leap year
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
51 (* 365 (1- year))
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
52 (/ (1- year) 4)
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
53 -2)))
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
54
92834
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
55 ;;;###cal-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
56 (defun calendar-julian-from-absolute (date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
57 "Compute the Julian (month day year) corresponding to the absolute DATE.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
58 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
59 Gregorian date Sunday, December 31, 1 BC."
92819
8863bb0c2832 Re-format comments.
Glenn Morris <rgm@gnu.org>
parents: 92608
diff changeset
60 (let* ((approx (/ (+ date 2) 366)) ; approximation from below
8863bb0c2832 Re-format comments.
Glenn Morris <rgm@gnu.org>
parents: 92608
diff changeset
61 (year ; search forward from the approximation
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
62 (+ approx
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
63 (calendar-sum y approx
92912
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
64 (>= date (calendar-absolute-from-julian
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
65 (list 1 1 (1+ y))))
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
66 1)))
92819
8863bb0c2832 Re-format comments.
Glenn Morris <rgm@gnu.org>
parents: 92608
diff changeset
67 (month ; search forward from January
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
68 (1+ (calendar-sum m 1
92912
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
69 (> date
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
70 (calendar-absolute-from-julian
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
71 (list m
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
72 (if (and (= m 2) (zerop (% year 4)))
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
73 29
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
74 (aref [31 28 31 30 31 30 31
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
75 31 30 31 30 31]
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
76 (1- m)))
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
77 year)))
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
78 1)))
92819
8863bb0c2832 Re-format comments.
Glenn Morris <rgm@gnu.org>
parents: 92608
diff changeset
79 (day ; calculate the day by subtraction
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
80 (- date (1- (calendar-absolute-from-julian (list month 1 year))))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
81 (list month day year)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
82
92834
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
83 ;;;###cal-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
84 (defun calendar-julian-date-string (&optional date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
85 "String of Julian date of Gregorian DATE.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
86 Defaults to today's date if DATE is not given.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
87 Driven by the variable `calendar-date-display-form'."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
88 (calendar-date-string
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
89 (calendar-julian-from-absolute
92912
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
90 (calendar-absolute-from-gregorian (or date (calendar-current-date))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
91 nil t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
92
92834
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
93 ;;;###cal-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
94 (defun calendar-print-julian-date ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
95 "Show the Julian calendar equivalent of the date under the cursor."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
96 (interactive)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
97 (message "Julian date: %s"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
98 (calendar-julian-date-string (calendar-cursor-to-date t))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
99
92834
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
100 ;;;###cal-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
101 (defun calendar-goto-julian-date (date &optional noecho)
92912
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
102 "Move cursor to Julian DATE; echo Julian date unless NOECHO is non-nil."
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
103 (interactive
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
104 (let* ((today (calendar-current-date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
105 (year (calendar-read
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
106 "Julian calendar year (>0): "
92587
267241a78df9 Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
107 (lambda (x) (> x 0))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
108 (int-to-string
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
109 (extract-calendar-year
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
110 (calendar-julian-from-absolute
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
111 (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
112 today))))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
113 (month-array calendar-month-name-array)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
114 (completion-ignore-case t)
54076
9e3e3d184730 (calendar-goto-julian-date): Use assoc-string instead of
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
115 (month (cdr (assoc-string
92912
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
116 (completing-read
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
117 "Julian calendar month name: "
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
118 (mapcar 'list (append month-array nil))
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
119 nil t)
54076
9e3e3d184730 (calendar-goto-julian-date): Use assoc-string instead of
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
120 (calendar-make-alist month-array 1) t)))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 38422
diff changeset
121 (last
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
122 (if (and (zerop (% year 4)) (= month 2))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
123 29
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
124 (aref [31 28 31 30 31 30 31 31 30 31 30 31] (1- month))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
125 (day (calendar-read
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
126 (format "Julian calendar day (%d-%d): "
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
127 (if (and (= year 1) (= month 1)) 3 1) last)
92587
267241a78df9 Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
128 (lambda (x)
92912
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
129 (and (< (if (and (= year 1) (= month 1)) 2 0) x)
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
130 (<= x last))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
131 (list (list month day year))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
132 (calendar-goto-date (calendar-gregorian-from-absolute
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
133 (calendar-absolute-from-julian date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
134 (or noecho (calendar-print-julian-date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
135
92819
8863bb0c2832 Re-format comments.
Glenn Morris <rgm@gnu.org>
parents: 92608
diff changeset
136 (defvar displayed-month)
8863bb0c2832 Re-format comments.
Glenn Morris <rgm@gnu.org>
parents: 92608
diff changeset
137 (defvar displayed-year)
8863bb0c2832 Re-format comments.
Glenn Morris <rgm@gnu.org>
parents: 92608
diff changeset
138
92834
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
139 ;;;###holiday-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
140 (defun holiday-julian (month day string)
92819
8863bb0c2832 Re-format comments.
Glenn Morris <rgm@gnu.org>
parents: 92608
diff changeset
141 "Holiday on MONTH, DAY (Julian) called STRING.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
142 If MONTH, DAY (Julian) is visible, the value returned is corresponding
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
143 Gregorian date in the form of the list (((month day year) STRING)). Returns
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
144 nil if it is not visible in the current calendar window."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
145 (let ((m1 displayed-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
146 (y1 displayed-year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
147 (m2 displayed-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
148 (y2 displayed-year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
149 (year))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
150 (increment-calendar-month m1 y1 -1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
151 (increment-calendar-month m2 y2 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
152 (let* ((start-date (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
153 (list m1 1 y1)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
154 (end-date (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
155 (list m2 (calendar-last-day-of-month m2 y2) y2)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
156 (julian-start (calendar-julian-from-absolute start-date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
157 (julian-end (calendar-julian-from-absolute end-date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
158 (julian-y1 (extract-calendar-year julian-start))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
159 (julian-y2 (extract-calendar-year julian-end)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
160 (setq year (if (< 10 month) julian-y1 julian-y2))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
161 (let ((date (calendar-gregorian-from-absolute
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
162 (calendar-absolute-from-julian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
163 (list month day year)))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
164 (if (calendar-date-is-visible-p date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
165 (list (list date string)))))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
166
92834
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
167 ;;;###cal-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
168 (defun calendar-absolute-from-astro (d)
13673
da11ffac4f8b (calendar-absolute-from-astro): Doc fix.
Paul Eggert <eggert@twinsun.com>
parents: 13053
diff changeset
169 "Absolute date of astronomical (Julian) day number D."
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
170 (- d 1721424.5))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
171
92834
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
172 ;;;###cal-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
173 (defun calendar-astro-from-absolute (d)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
174 "Astronomical (Julian) day number of absolute date D."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
175 (+ d 1721424.5))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
176
92834
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
177 ;;;###cal-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
178 (defun calendar-astro-date-string (&optional date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
179 "String of astronomical (Julian) day number after noon UTC of Gregorian DATE.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
180 Defaults to today's date if DATE is not given."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
181 (int-to-string
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
182 (ceiling
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
183 (calendar-astro-from-absolute
92912
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
184 (calendar-absolute-from-gregorian (or date (calendar-current-date)))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
185
92834
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
186 ;;;###cal-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
187 (defun calendar-print-astro-day-number ()
92819
8863bb0c2832 Re-format comments.
Glenn Morris <rgm@gnu.org>
parents: 92608
diff changeset
188 "Show astronomical (Julian) day number after noon UTC on cursor date."
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
189 (interactive)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
190 (message
15069
6237f2b08205 Spelling error.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 14169
diff changeset
191 "Astronomical (Julian) day number (at noon UTC): %s.0"
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
192 (calendar-astro-date-string (calendar-cursor-to-date t))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
193
92834
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
194 ;;;###cal-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
195 (defun calendar-goto-astro-day-number (daynumber &optional noecho)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
196 "Move cursor to astronomical (Julian) DAYNUMBER.
92912
bf22321f752b Re-indent.
Glenn Morris <rgm@gnu.org>
parents: 92834
diff changeset
197 Echo astronomical (Julian) day number unless NOECHO is non-nil."
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
198 (interactive (list (calendar-read
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
199 "Astronomical (Julian) day number (>1721425): "
92587
267241a78df9 Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
200 (lambda (x) (> x 1721425)))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
201 (calendar-goto-date
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
202 (calendar-gregorian-from-absolute
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
203 (floor
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
204 (calendar-absolute-from-astro daynumber))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
205 (or noecho (calendar-print-astro-day-number)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
206
92834
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
207
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
208 (defvar date)
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
209
92608
18dc9ef91100 (calendar-absolute-from-julian): Use zerop.
Glenn Morris <rgm@gnu.org>
parents: 92587
diff changeset
210 ;; To be called from list-sexp-diary-entries, where DATE is bound.
92834
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
211 ;;;###diary-autoload
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
212 (defun diary-julian-date ()
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
213 "Julian calendar equivalent of date diary entry."
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
214 (format "Julian date: %s" (calendar-julian-date-string date)))
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
215
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
216 ;; To be called from list-sexp-diary-entries, where DATE is bound.
3e0b7b9e8f11 (diary-julian-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents: 92819
diff changeset
217 ;;;###diary-autoload
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
218 (defun diary-astro-day-number ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
219 "Astronomical (Julian) day number diary entry."
17380
ba0844956fde (diary-astro-day-number): Change format string.
Richard M. Stallman <rms@gnu.org>
parents: 15069
diff changeset
220 (format "Astronomical (Julian) day number at noon UTC: %s.0"
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
221 (calendar-astro-date-string date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
222
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
223 (provide 'cal-julian)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
224
92587
267241a78df9 Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents: 79703
diff changeset
225 ;; arch-tag: 0520acdd-1c60-4188-9aa8-9b8c24d856ae
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
226 ;;; cal-julian.el ends here