annotate lisp/calendar/cal-french.el @ 92420:12e9e4bb410b

(iconsrcdir): New variable. (install-etc, mkdir): Use $iconsrcdir. Handle the `scalable' icon directory.
author Glenn Morris <rgm@gnu.org>
date Mon, 03 Mar 2008 02:26:30 +0000
parents 974a828870fe
children 606f2d163a64 68c1d9ecc30d
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: 28781
diff changeset
1 ;;; cal-french.el --- calendar functions for the French Revolutionary calendar
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2
67465
a55ee709ec8d Update copyright pending Emacs 22.
Glenn Morris <rgm@gnu.org>
parents: 65145
diff changeset
3 ;; Copyright (C) 1988, 1989, 1992, 1994, 1995, 1997, 2001, 2002, 2003,
79703
974a828870fe Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 78216
diff changeset
4 ;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
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>
2247
2c7997f249eb Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 1338
diff changeset
8 ;; Keywords: calendar
2c7997f249eb Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 1338
diff changeset
9 ;; Human-Keywords: French Revolutionary calendar, calendar, diary
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11 ;; This file is part of GNU Emacs.
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12
6736
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5833
diff changeset
13 ;; GNU Emacs is free software; you can redistribute it and/or modify
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5833
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)
6736
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5833
diff changeset
16 ;; any later version.
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17
6736
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5833
diff changeset
18 ;; GNU Emacs is distributed in the hope that it will be useful,
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5833
diff changeset
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5833
diff changeset
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5833
diff changeset
21 ;; GNU General Public License for more details.
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5833
diff changeset
22
3e1323443b1a Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents: 5833
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: 13048
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.
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
27
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
28 ;;; Commentary:
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
29
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
30 ;; This collection of functions implements the features of calendar.el and
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31 ;; diary.el that deal with the French Revolutionary calendar.
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32
7761
b6ac896a491a Fix typo: Mayan -> French Revolutionary
Paul Eggert <eggert@twinsun.com>
parents: 7639
diff changeset
33 ;; Technical details of the French Revolutionary calendar can be found in
61148
7f7db25577d9 Update reference to "Calendrical Calculations" book; there's a new edition.
Paul Eggert <eggert@twinsun.com>
parents: 54073
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: 54073
diff changeset
35 ;; and Nachum Dershowitz, Cambridge University Press (2001), and in
15550
4df6e0ffab90 (french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
36 ;; ``Calendrical Calculations, Part II: Three Historical Calendars'' by
4df6e0ffab90 (french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
37 ;; E. M. Reingold, N. Dershowitz, and S. M. Clamen, Software--Practice and
4df6e0ffab90 (french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
38 ;; Experience, Volume 23, Number 4 (April, 1993), pages 383-404.
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
39
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
40 ;;; Code:
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
41
65145
ac895e21e622 (date): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 64085
diff changeset
42 (defvar date)
ac895e21e622 (date): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 64085
diff changeset
43
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
44 (require 'calendar)
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
45
19885
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
46 (defun french-calendar-accents ()
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
47 "True if diacritical marks are available."
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
48 (and (or window-system
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
49 (terminal-coding-system))
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
50 (or enable-multibyte-characters
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
51 (and (char-table-p standard-display-table)
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
52 (equal (aref standard-display-table 161) [161])))))
15550
4df6e0ffab90 (french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
53
13048
6c21adf788d5 Minor fixes.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 7761
diff changeset
54 (defconst french-calendar-epoch (calendar-absolute-from-gregorian '(9 22 1792))
6c21adf788d5 Minor fixes.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 7761
diff changeset
55 "Absolute date of start of French Revolutionary calendar = September 22, 1792.")
6c21adf788d5 Minor fixes.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 7761
diff changeset
56
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
57 (defconst french-calendar-month-name-array
19885
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
58 ["Vende'miaire" "Brumaire" "Frimaire" "Nivo^se" "Pluvio^se" "Vento^se"
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
59 "Germinal" "Flore'al" "Prairial" "Messidor" "Thermidor" "Fructidor"])
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
60
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
61 (defconst french-calendar-multibyte-month-name-array
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
62 ["Vendémiaire" "Brumaire" "Frimaire" "Nivôse" "Pluviôse" "Ventôse"
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
63 "Germinal" "Floréal" "Prairial" "Messidor" "Thermidor" "Fructidor"])
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
64
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
65 (defconst french-calendar-day-name-array
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
66 ["Primidi" "Duodi" "Tridi" "Quartidi" "Quintidi" "Sextidi" "Septidi"
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
67 "Octidi" "Nonidi" "Decadi"])
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
68
19885
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
69 (defconst french-calendar-multibyte-special-days-array
28781
dc2a0cf401ab (french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents: 24191
diff changeset
70 ["de la Vertu" "du Génie" "du Travail" "de la Raison" "des Récompenses"
20474
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
71 "de la Révolution"])
19885
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
72
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
73 (defconst french-calendar-special-days-array
28781
dc2a0cf401ab (french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents: 24191
diff changeset
74 ["de la Vertu" "du Ge'nie" "du Travail" "de la Raison" "des Re'compenses"
19885
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
75 "de la Re'volution"])
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
76
20474
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
77 (defun french-calendar-month-name-array ()
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
78 (if (french-calendar-accents)
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
79 french-calendar-multibyte-month-name-array
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
80 french-calendar-month-name-array))
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
81
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
82 (defun french-calendar-day-name-array ()
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
83 french-calendar-day-name-array)
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
84
20393
6f1b751fc31d (french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents: 20245
diff changeset
85 (defun french-calendar-special-days-array ()
6f1b751fc31d (french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents: 20245
diff changeset
86 (if (french-calendar-accents)
6f1b751fc31d (french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents: 20245
diff changeset
87 french-calendar-multibyte-special-days-array
6f1b751fc31d (french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents: 20245
diff changeset
88 french-calendar-special-days-array))
6f1b751fc31d (french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents: 20245
diff changeset
89
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
90 (defun french-calendar-leap-year-p (year)
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91 "True if YEAR is a leap year on the French Revolutionary calendar.
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
92 For Gregorian years 1793 to 1805, the years of actual operation of the
19885
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
93 calendar, follows historical practice based on equinoxes (years 3, 7,
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
94 and 11 were leap years; 15 and 20 would have been leap years). For later
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
95 years uses the proposed rule of Romme (never adopted)--leap years fall every
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
96 four years except century years not divisible 400 and century years that are
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
97 multiples of 4000."
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
98 (or (memq year '(3 7 11));; Actual practice--based on equinoxes
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
99 (memq year '(15 20)) ;; Anticipated practice--based on equinoxes
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
100 (and (> year 20) ;; Romme's proposal--never adopted
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
101 (zerop (% year 4))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
102 (not (memq (% year 400) '(100 200 300)))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
103 (not (zerop (% year 4000))))))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
104
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
105 (defun french-calendar-last-day-of-month (month year)
1338
3ea4e9dc49b2 Dox fixes.
Richard M. Stallman <rms@gnu.org>
parents: 957
diff changeset
106 "Return last day of MONTH, YEAR on the French Revolutionary calendar.
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
107 The 13th month is not really a month, but the 5 (6 in leap years) day period of
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
108 `sansculottides' at the end of the year."
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
109 (if (< month 13)
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
110 30
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
111 (if (french-calendar-leap-year-p year)
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
112 6
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
113 5)))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
114
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
115 (defun calendar-absolute-from-french (date)
1338
3ea4e9dc49b2 Dox fixes.
Richard M. Stallman <rms@gnu.org>
parents: 957
diff changeset
116 "Compute absolute date from French Revolutionary date DATE.
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
117 The absolute date is the number of days elapsed since the (imaginary)
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
118 Gregorian date Sunday, December 31, 1 BC."
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
119 (let ((month (extract-calendar-month date))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
120 (day (extract-calendar-day date))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
121 (year (extract-calendar-year date)))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
122 (+ (* 365 (1- year));; Days in prior years
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
123 ;; Leap days in prior years
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
124 (if (< year 20)
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
125 (/ year 4);; Actual and anticipated practice (years 3, 7, 11, 15)
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
126 ;; Romme's proposed rule (using the Principle of Inclusion/Exclusion)
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
127 (+ (/ (1- year) 4);; Luckily, there were 4 leap years before year 20
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
128 (- (/ (1- year) 100))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
129 (/ (1- year) 400)
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
130 (- (/ (1- year) 4000))))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
131 (* 30 (1- month));; Days in prior months this year
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
132 day;; Days so far this month
13048
6c21adf788d5 Minor fixes.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 7761
diff changeset
133 (1- french-calendar-epoch))));; Days before start of calendar
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
134
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
135 (defun calendar-french-from-absolute (date)
1338
3ea4e9dc49b2 Dox fixes.
Richard M. Stallman <rms@gnu.org>
parents: 957
diff changeset
136 "Compute the French Revolutionary equivalent for absolute date DATE.
3ea4e9dc49b2 Dox fixes.
Richard M. Stallman <rms@gnu.org>
parents: 957
diff changeset
137 The result is a list of the form (MONTH DAY YEAR).
3ea4e9dc49b2 Dox fixes.
Richard M. Stallman <rms@gnu.org>
parents: 957
diff changeset
138 The absolute date is the number of days elapsed since the
7639
67b7d1ea7b2e Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6736
diff changeset
139 \(imaginary) Gregorian date Sunday, December 31, 1 BC."
13048
6c21adf788d5 Minor fixes.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 7761
diff changeset
140 (if (< date french-calendar-epoch)
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
141 (list 0 0 0);; pre-French Revolutionary date
13048
6c21adf788d5 Minor fixes.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 7761
diff changeset
142 (let* ((approx ;; Approximation from below.
6c21adf788d5 Minor fixes.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 7761
diff changeset
143 (/ (- date french-calendar-epoch) 366))
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
144 (year ;; Search forward from the approximation.
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
145 (+ approx
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
146 (calendar-sum y approx
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
147 (>= date (calendar-absolute-from-french (list 1 1 (1+ y))))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
148 1)))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
149 (month ;; Search forward from Vendemiaire.
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
150 (1+ (calendar-sum m 1
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
151 (> date
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
152 (calendar-absolute-from-french
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153 (list m
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
154 (french-calendar-last-day-of-month m year)
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
155 year)))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
156 1)))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
157 (day ;; Calculate the day by subtraction.
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
158 (- date
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
159 (1- (calendar-absolute-from-french (list month 1 year))))))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
160 (list month day year))))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
161
5699
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
162 (defun calendar-french-date-string (&optional date)
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
163 "String of French Revolutionary date of Gregorian DATE.
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
164 Returns the empty string if DATE is pre-French Revolutionary.
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
165 Defaults to today's date if DATE is not given."
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
166 (let* ((french-date (calendar-french-from-absolute
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
167 (calendar-absolute-from-gregorian
5699
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
168 (or date (calendar-current-date)))))
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
169 (y (extract-calendar-year french-date))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
170 (m (extract-calendar-month french-date))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
171 (d (extract-calendar-day french-date)))
5699
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
172 (cond
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
173 ((< y 1) "")
19885
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
174 ((= m 13) (format (if (french-calendar-accents)
15550
4df6e0ffab90 (french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
175 "Jour %s de l'Année %d de la Révolution"
4df6e0ffab90 (french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
176 "Jour %s de l'Anne'e %d de la Re'volution")
20393
6f1b751fc31d (french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents: 20245
diff changeset
177 (aref (french-calendar-special-days-array) (1- d))
5699
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
178 y))
15550
4df6e0ffab90 (french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
179 (t (format
19885
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
180 (if (french-calendar-accents)
28781
dc2a0cf401ab (french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents: 24191
diff changeset
181 "%d %s an %d de la Révolution"
dc2a0cf401ab (french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents: 24191
diff changeset
182 "%d %s an %d de la Re'volution")
dc2a0cf401ab (french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents: 24191
diff changeset
183 d
19885
266e93ddaf0e (french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents: 17570
diff changeset
184 (aref (french-calendar-month-name-array) (1- m))
15550
4df6e0ffab90 (french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
185 y)))))
5699
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
186
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
187 (defun calendar-print-french-date ()
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
188 "Show the French Revolutionary calendar equivalent of the selected date."
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
189 (interactive)
20763
129b8b78151c (calendar-french-single-byteify): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20474
diff changeset
190 (let ((f (calendar-french-date-string (calendar-cursor-to-date t))))
5699
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
191 (if (string-equal f "")
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
192 (message "Date is pre-French Revolution")
17570
daaffe2dece5 (calendar-print-french-date): Label French date in echo area.
Richard M. Stallman <rms@gnu.org>
parents: 17381
diff changeset
193 (message "French Revolutionary date: %s" f))))
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
194
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
195 (defun calendar-goto-french-date (date &optional noecho)
1338
3ea4e9dc49b2 Dox fixes.
Richard M. Stallman <rms@gnu.org>
parents: 957
diff changeset
196 "Move cursor to French Revolutionary date DATE.
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
197 Echo French Revolutionary date unless NOECHO is t."
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198 (interactive
20763
129b8b78151c (calendar-french-single-byteify): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20474
diff changeset
199 (let ((accents (french-calendar-accents))
20474
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
200 (months (french-calendar-month-name-array))
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
201 (special-days (french-calendar-special-days-array)))
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
202 (let* ((year
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
203 (progn
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
204 (calendar-read
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
205 (if accents
20763
129b8b78151c (calendar-french-single-byteify): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents: 20474
diff changeset
206 "Année de la Révolution (>0): "
20474
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
207 "Anne'e de la Re'volution (>0): ")
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
208 '(lambda (x) (> x 0))
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
209 (int-to-string
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
210 (extract-calendar-year
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
211 (calendar-french-from-absolute
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
212 (calendar-absolute-from-gregorian
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
213 (calendar-current-date))))))))
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
214 (month-list
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
215 (mapcar 'list
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
216 (append months
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
217 (if (french-calendar-leap-year-p year)
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
218 (mapcar
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
219 '(lambda (x) (concat "Jour " x))
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
220 french-calendar-special-days-array)
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
221 (reverse
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
222 (cdr;; we don't want rev. day in a non-leap yr.
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
223 (reverse
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
224 (mapcar
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
225 '(lambda (x)
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
226 (concat "Jour " x))
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
227 special-days))))))))
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
228 (completion-ignore-case t)
54073
8061b3e9df12 (calendar-goto-french-date): Use assoc-string instead of
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
229 (month (cdr (assoc-string
24191
4f1b1bddae88 (calendar-goto-french-date): Use assoc-ignore-case and do not
Richard M. Stallman <rms@gnu.org>
parents: 20763
diff changeset
230 (completing-read
4f1b1bddae88 (calendar-goto-french-date): Use assoc-ignore-case and do not
Richard M. Stallman <rms@gnu.org>
parents: 20763
diff changeset
231 "Mois ou Sansculottide: "
4f1b1bddae88 (calendar-goto-french-date): Use assoc-ignore-case and do not
Richard M. Stallman <rms@gnu.org>
parents: 20763
diff changeset
232 month-list
4f1b1bddae88 (calendar-goto-french-date): Use assoc-ignore-case and do not
Richard M. Stallman <rms@gnu.org>
parents: 20763
diff changeset
233 nil t)
54073
8061b3e9df12 (calendar-goto-french-date): Use assoc-string instead of
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
234 (calendar-make-alist month-list 1 'car) t)))
20474
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
235 (day (if (> month 12)
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
236 (- month 12)
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
237 (calendar-read
43939
a73eb952f031 (calendar-goto-french-date): Fix prompt to match the actual code.
Pavel Janík <Pavel@Janik.cz>
parents: 38422
diff changeset
238 "Jour (1-30): "
28781
dc2a0cf401ab (french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents: 24191
diff changeset
239 '(lambda (x) (and (<= 1 x) (<= x 30))))))
dc2a0cf401ab (french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents: 24191
diff changeset
240 (month (if (> month 12) 13 month)))
20474
2ff24b456bb7 (calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20462
diff changeset
241 (list (list month day year)))))
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
242 (calendar-goto-date (calendar-gregorian-from-absolute
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
243 (calendar-absolute-from-french date)))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
244 (or noecho (calendar-print-french-date)))
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
245
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
246 (defun diary-french-date ()
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
247 "French calendar equivalent of date diary entry."
17381
d1fc8a2d353f (diary-french-date): Use `date'.
Richard M. Stallman <rms@gnu.org>
parents: 15550
diff changeset
248 (let ((f (calendar-french-date-string date)))
5699
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
249 (if (string-equal f "")
a2d78b648542 (calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5416
diff changeset
250 "Date is pre-French Revolution"
17381
d1fc8a2d353f (diary-french-date): Use `date'.
Richard M. Stallman <rms@gnu.org>
parents: 15550
diff changeset
251 (format "French Revolutionary date: %s" f))))
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
252
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
253 (provide 'cal-french)
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
254
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 43939
diff changeset
255 ;;; arch-tag: 7e8045a3-8609-46b5-9cde-cf40ce541cf9
957
2619b7a9c11e entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
256 ;;; cal-french.el ends here