Mercurial > emacs
annotate lisp/calendar/cal-french.el @ 69637:8b3e0cacc358
Define aliases for append_glyph and produce_stretch_glyph
when `static' is defined to avoid name clash with those in xdisp.c.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Wed, 22 Mar 2006 22:47:32 +0000 |
parents | 8daf7d9a0771 |
children | 7a3f13e2dd57 4b3d39451150 |
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 | 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, |
68721 | 4 ;; 2004, 2005, 2006 Free Software Foundation, Inc. |
957 | 5 |
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 | 10 |
11 ;; This file is part of GNU Emacs. | |
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 |
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5833
diff
changeset
|
15 ;; the Free Software Foundation; either version 2, or (at your option) |
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5833
diff
changeset
|
16 ;; any later version. |
957 | 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 | 24 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64085 | 25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
26 ;; Boston, MA 02110-1301, USA. | |
957 | 27 |
28 ;;; Commentary: | |
29 | |
30 ;; This collection of functions implements the features of calendar.el and | |
31 ;; diary.el that deal with the French Revolutionary calendar. | |
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 | 39 |
40 ;; Comments, corrections, and improvements should be sent to | |
41 ;; Edward M. Reingold Department of Computer Science | |
42 ;; (217) 333-6733 University of Illinois at Urbana-Champaign | |
43 ;; reingold@cs.uiuc.edu 1304 West Springfield Avenue | |
44 ;; Urbana, Illinois 61801 | |
45 | |
46 ;;; Code: | |
47 | |
65145
ac895e21e622
(date): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64085
diff
changeset
|
48 (defvar date) |
ac895e21e622
(date): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64085
diff
changeset
|
49 |
957 | 50 (require 'calendar) |
51 | |
19885
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
52 (defun french-calendar-accents () |
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
53 "True if diacritical marks are available." |
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
54 (and (or window-system |
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
55 (terminal-coding-system)) |
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
56 (or enable-multibyte-characters |
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
57 (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
|
58 (equal (aref standard-display-table 161) [161]))))) |
15550
4df6e0ffab90
(french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
59 |
13048 | 60 (defconst french-calendar-epoch (calendar-absolute-from-gregorian '(9 22 1792)) |
61 "Absolute date of start of French Revolutionary calendar = September 22, 1792.") | |
62 | |
957 | 63 (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
|
64 ["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
|
65 "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
|
66 |
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
67 (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
|
68 ["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
|
69 "Germinal" "Floréal" "Prairial" "Messidor" "Thermidor" "Fructidor"]) |
957 | 70 |
71 (defconst french-calendar-day-name-array | |
72 ["Primidi" "Duodi" "Tridi" "Quartidi" "Quintidi" "Sextidi" "Septidi" | |
73 "Octidi" "Nonidi" "Decadi"]) | |
74 | |
19885
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
75 (defconst french-calendar-multibyte-special-days-array |
28781
dc2a0cf401ab
(french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents:
24191
diff
changeset
|
76 ["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
|
77 "de la Révolution"]) |
19885
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
78 |
957 | 79 (defconst french-calendar-special-days-array |
28781
dc2a0cf401ab
(french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents:
24191
diff
changeset
|
80 ["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
|
81 "de la Re'volution"]) |
957 | 82 |
20474
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
83 (defun french-calendar-month-name-array () |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
84 (if (french-calendar-accents) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
85 french-calendar-multibyte-month-name-array |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
86 french-calendar-month-name-array)) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
87 |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
88 (defun french-calendar-day-name-array () |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
89 french-calendar-day-name-array) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
90 |
20393
6f1b751fc31d
(french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents:
20245
diff
changeset
|
91 (defun french-calendar-special-days-array () |
6f1b751fc31d
(french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents:
20245
diff
changeset
|
92 (if (french-calendar-accents) |
6f1b751fc31d
(french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents:
20245
diff
changeset
|
93 french-calendar-multibyte-special-days-array |
6f1b751fc31d
(french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents:
20245
diff
changeset
|
94 french-calendar-special-days-array)) |
6f1b751fc31d
(french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents:
20245
diff
changeset
|
95 |
957 | 96 (defun french-calendar-leap-year-p (year) |
97 "True if YEAR is a leap year on the French Revolutionary calendar. | |
98 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
|
99 calendar, follows historical practice based on equinoxes (years 3, 7, |
957 | 100 and 11 were leap years; 15 and 20 would have been leap years). For later |
101 years uses the proposed rule of Romme (never adopted)--leap years fall every | |
102 four years except century years not divisible 400 and century years that are | |
103 multiples of 4000." | |
104 (or (memq year '(3 7 11));; Actual practice--based on equinoxes | |
105 (memq year '(15 20)) ;; Anticipated practice--based on equinoxes | |
106 (and (> year 20) ;; Romme's proposal--never adopted | |
107 (zerop (% year 4)) | |
108 (not (memq (% year 400) '(100 200 300))) | |
109 (not (zerop (% year 4000)))))) | |
110 | |
111 (defun french-calendar-last-day-of-month (month year) | |
1338 | 112 "Return last day of MONTH, YEAR on the French Revolutionary calendar. |
957 | 113 The 13th month is not really a month, but the 5 (6 in leap years) day period of |
114 `sansculottides' at the end of the year." | |
115 (if (< month 13) | |
116 30 | |
117 (if (french-calendar-leap-year-p year) | |
118 6 | |
119 5))) | |
120 | |
121 (defun calendar-absolute-from-french (date) | |
1338 | 122 "Compute absolute date from French Revolutionary date DATE. |
957 | 123 The absolute date is the number of days elapsed since the (imaginary) |
124 Gregorian date Sunday, December 31, 1 BC." | |
125 (let ((month (extract-calendar-month date)) | |
126 (day (extract-calendar-day date)) | |
127 (year (extract-calendar-year date))) | |
128 (+ (* 365 (1- year));; Days in prior years | |
129 ;; Leap days in prior years | |
130 (if (< year 20) | |
131 (/ year 4);; Actual and anticipated practice (years 3, 7, 11, 15) | |
132 ;; Romme's proposed rule (using the Principle of Inclusion/Exclusion) | |
133 (+ (/ (1- year) 4);; Luckily, there were 4 leap years before year 20 | |
134 (- (/ (1- year) 100)) | |
135 (/ (1- year) 400) | |
136 (- (/ (1- year) 4000)))) | |
137 (* 30 (1- month));; Days in prior months this year | |
138 day;; Days so far this month | |
13048 | 139 (1- french-calendar-epoch))));; Days before start of calendar |
957 | 140 |
141 (defun calendar-french-from-absolute (date) | |
1338 | 142 "Compute the French Revolutionary equivalent for absolute date DATE. |
143 The result is a list of the form (MONTH DAY YEAR). | |
144 The absolute date is the number of days elapsed since the | |
7639 | 145 \(imaginary) Gregorian date Sunday, December 31, 1 BC." |
13048 | 146 (if (< date french-calendar-epoch) |
957 | 147 (list 0 0 0);; pre-French Revolutionary date |
13048 | 148 (let* ((approx ;; Approximation from below. |
149 (/ (- date french-calendar-epoch) 366)) | |
957 | 150 (year ;; Search forward from the approximation. |
151 (+ approx | |
152 (calendar-sum y approx | |
153 (>= date (calendar-absolute-from-french (list 1 1 (1+ y)))) | |
154 1))) | |
155 (month ;; Search forward from Vendemiaire. | |
156 (1+ (calendar-sum m 1 | |
157 (> date | |
158 (calendar-absolute-from-french | |
159 (list m | |
160 (french-calendar-last-day-of-month m year) | |
161 year))) | |
162 1))) | |
163 (day ;; Calculate the day by subtraction. | |
164 (- date | |
165 (1- (calendar-absolute-from-french (list month 1 year)))))) | |
166 (list month day year)))) | |
167 | |
5699
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
168 (defun calendar-french-date-string (&optional date) |
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
169 "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
|
170 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
|
171 Defaults to today's date if DATE is not given." |
957 | 172 (let* ((french-date (calendar-french-from-absolute |
173 (calendar-absolute-from-gregorian | |
5699
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
174 (or date (calendar-current-date))))) |
957 | 175 (y (extract-calendar-year french-date)) |
176 (m (extract-calendar-month french-date)) | |
177 (d (extract-calendar-day french-date))) | |
5699
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
178 (cond |
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
179 ((< y 1) "") |
19885
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
180 ((= m 13) (format (if (french-calendar-accents) |
15550
4df6e0ffab90
(french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
181 "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
|
182 "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
|
183 (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
|
184 y)) |
15550
4df6e0ffab90
(french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
185 (t (format |
19885
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
186 (if (french-calendar-accents) |
28781
dc2a0cf401ab
(french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents:
24191
diff
changeset
|
187 "%d %s an %d de la Révolution" |
dc2a0cf401ab
(french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents:
24191
diff
changeset
|
188 "%d %s an %d de la Re'volution") |
dc2a0cf401ab
(french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents:
24191
diff
changeset
|
189 d |
19885
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
190 (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
|
191 y))))) |
5699
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
192 |
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
193 (defun calendar-print-french-date () |
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
194 "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
|
195 (interactive) |
20763
129b8b78151c
(calendar-french-single-byteify): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20474
diff
changeset
|
196 (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
|
197 (if (string-equal f "") |
957 | 198 (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
|
199 (message "French Revolutionary date: %s" f)))) |
957 | 200 |
201 (defun calendar-goto-french-date (date &optional noecho) | |
1338 | 202 "Move cursor to French Revolutionary date DATE. |
957 | 203 Echo French Revolutionary date unless NOECHO is t." |
204 (interactive | |
20763
129b8b78151c
(calendar-french-single-byteify): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20474
diff
changeset
|
205 (let ((accents (french-calendar-accents)) |
20474
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
206 (months (french-calendar-month-name-array)) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
207 (special-days (french-calendar-special-days-array))) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
208 (let* ((year |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
209 (progn |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
210 (calendar-read |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
211 (if accents |
20763
129b8b78151c
(calendar-french-single-byteify): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20474
diff
changeset
|
212 "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
|
213 "Anne'e de la Re'volution (>0): ") |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
214 '(lambda (x) (> x 0)) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
215 (int-to-string |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
216 (extract-calendar-year |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
217 (calendar-french-from-absolute |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
218 (calendar-absolute-from-gregorian |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
219 (calendar-current-date)))))))) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
220 (month-list |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
221 (mapcar 'list |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
222 (append months |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
223 (if (french-calendar-leap-year-p year) |
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) (concat "Jour " x)) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
226 french-calendar-special-days-array) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
227 (reverse |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
228 (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
|
229 (reverse |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
230 (mapcar |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
231 '(lambda (x) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
232 (concat "Jour " x)) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
233 special-days)))))))) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
234 (completion-ignore-case t) |
54073
8061b3e9df12
(calendar-goto-french-date): Use assoc-string instead of
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
235 (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
|
236 (completing-read |
4f1b1bddae88
(calendar-goto-french-date): Use assoc-ignore-case and do not
Richard M. Stallman <rms@gnu.org>
parents:
20763
diff
changeset
|
237 "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
|
238 month-list |
4f1b1bddae88
(calendar-goto-french-date): Use assoc-ignore-case and do not
Richard M. Stallman <rms@gnu.org>
parents:
20763
diff
changeset
|
239 nil t) |
54073
8061b3e9df12
(calendar-goto-french-date): Use assoc-string instead of
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
240 (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
|
241 (day (if (> month 12) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
242 (- month 12) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
243 (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
|
244 "Jour (1-30): " |
28781
dc2a0cf401ab
(french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents:
24191
diff
changeset
|
245 '(lambda (x) (and (<= 1 x) (<= x 30)))))) |
dc2a0cf401ab
(french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents:
24191
diff
changeset
|
246 (month (if (> month 12) 13 month))) |
20474
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
247 (list (list month day year))))) |
957 | 248 (calendar-goto-date (calendar-gregorian-from-absolute |
249 (calendar-absolute-from-french date))) | |
250 (or noecho (calendar-print-french-date))) | |
251 | |
252 (defun diary-french-date () | |
253 "French calendar equivalent of date diary entry." | |
17381
d1fc8a2d353f
(diary-french-date): Use `date'.
Richard M. Stallman <rms@gnu.org>
parents:
15550
diff
changeset
|
254 (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
|
255 (if (string-equal f "") |
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
256 "Date is pre-French Revolution" |
17381
d1fc8a2d353f
(diary-french-date): Use `date'.
Richard M. Stallman <rms@gnu.org>
parents:
15550
diff
changeset
|
257 (format "French Revolutionary date: %s" f)))) |
957 | 258 |
259 (provide 'cal-french) | |
260 | |
52401 | 261 ;;; arch-tag: 7e8045a3-8609-46b5-9cde-cf40ce541cf9 |
957 | 262 ;;; cal-french.el ends here |