Mercurial > emacs
annotate lisp/calendar/cal-french.el @ 48638:fff05c8f251d
(gud-running): Rename from gdb-running. Update uses.
(gud-tool-bar-map): Use tool-bar-local-item-from-menu rather than
tool-bar-add-item-from-menu to avoid let binding tool-bar-map
which fails if tool-bar.el is loaded in the mean time.
(gud-file-name): New fun.
(gud-find-file): Use it as default value for gud-find-file.
(gud-speedbar-buttons): Discriminate on gud-minor-mode rather than
on gud-find-file.
(gud-gdb-find-file, gud-dbx-file-name, gud-dbx-find-file)
(gud-xdb-file-name, gud-xdb-find-file, gud-perldb-find-file)
(gud-pdb-find-file, gud-jdb-find-file): Remove.
(gud-query-cmdline): Don't stuff the whole cwd in the command.
(gdb, dbx, xdb, perldb, pdb, jdb): Use the default for gud-find-file.
(gud-mipsdbx-massage-args): Remove.
(gud-dbx-command-name): New var. Do what gud-mipsdbx-massage-args did.
(gud-irixdbx-marker-filter): Use match-string and gud-file-name.
(gud-jdb-command-name): New var.
(gud-common-init): Re-instate RMS code of 11/13.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 03 Dec 2002 21:07:39 +0000 |
parents | a73eb952f031 |
children | 695cf19ef79e d7ddb3e565de |
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 |
19885
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
3 ;; Copyright (C) 1988, 89, 92, 94, 95, 1997 Free Software Foundation, Inc. |
957 | 4 |
5 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> | |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1338
diff
changeset
|
6 ;; Keywords: calendar |
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1338
diff
changeset
|
7 ;; Human-Keywords: French Revolutionary calendar, calendar, diary |
957 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5833
diff
changeset
|
11 ;; 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
|
12 ;; 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
|
13 ;; 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
|
14 ;; any later version. |
957 | 15 |
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5833
diff
changeset
|
16 ;; 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
|
17 ;; 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
|
18 ;; 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
|
19 ;; 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
|
20 |
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5833
diff
changeset
|
21 ;; You should have received a copy of the GNU General Public License |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, USA. | |
957 | 25 |
26 ;;; Commentary: | |
27 | |
28 ;; This collection of functions implements the features of calendar.el and | |
29 ;; diary.el that deal with the French Revolutionary calendar. | |
30 | |
7761
b6ac896a491a
Fix typo: Mayan -> French Revolutionary
Paul Eggert <eggert@twinsun.com>
parents:
7639
diff
changeset
|
31 ;; Technical details of the French Revolutionary calendar can be found in |
20462
d179de7ad92e
Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents:
20393
diff
changeset
|
32 ;; ``Calendrical Calculations'' by Nachum Dershowitz and Edward M. Reingold, |
d179de7ad92e
Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents:
20393
diff
changeset
|
33 ;; Cambridge University Press (1997), and in |
15550
4df6e0ffab90
(french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
34 ;; ``Calendrical Calculations, Part II: Three Historical Calendars'' by |
4df6e0ffab90
(french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
35 ;; 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
|
36 ;; Experience, Volume 23, Number 4 (April, 1993), pages 383-404. |
957 | 37 |
38 ;; Comments, corrections, and improvements should be sent to | |
39 ;; Edward M. Reingold Department of Computer Science | |
40 ;; (217) 333-6733 University of Illinois at Urbana-Champaign | |
41 ;; reingold@cs.uiuc.edu 1304 West Springfield Avenue | |
42 ;; Urbana, Illinois 61801 | |
43 | |
44 ;;; Code: | |
45 | |
46 (require 'calendar) | |
47 | |
19885
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
48 (defun french-calendar-accents () |
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
49 "True if diacritical marks are available." |
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
50 (and (or window-system |
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
51 (terminal-coding-system)) |
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
52 (or enable-multibyte-characters |
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
53 (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
|
54 (equal (aref standard-display-table 161) [161]))))) |
15550
4df6e0ffab90
(french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
55 |
13048 | 56 (defconst french-calendar-epoch (calendar-absolute-from-gregorian '(9 22 1792)) |
57 "Absolute date of start of French Revolutionary calendar = September 22, 1792.") | |
58 | |
957 | 59 (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
|
60 ["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
|
61 "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
|
62 |
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
63 (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
|
64 ["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
|
65 "Germinal" "Floréal" "Prairial" "Messidor" "Thermidor" "Fructidor"]) |
957 | 66 |
67 (defconst french-calendar-day-name-array | |
68 ["Primidi" "Duodi" "Tridi" "Quartidi" "Quintidi" "Sextidi" "Septidi" | |
69 "Octidi" "Nonidi" "Decadi"]) | |
70 | |
19885
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
71 (defconst french-calendar-multibyte-special-days-array |
28781
dc2a0cf401ab
(french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents:
24191
diff
changeset
|
72 ["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
|
73 "de la Révolution"]) |
19885
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
74 |
957 | 75 (defconst french-calendar-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 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
|
77 "de la Re'volution"]) |
957 | 78 |
20474
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
79 (defun french-calendar-month-name-array () |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
80 (if (french-calendar-accents) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
81 french-calendar-multibyte-month-name-array |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
82 french-calendar-month-name-array)) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
83 |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
84 (defun french-calendar-day-name-array () |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
85 french-calendar-day-name-array) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
86 |
20393
6f1b751fc31d
(french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents:
20245
diff
changeset
|
87 (defun french-calendar-special-days-array () |
6f1b751fc31d
(french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents:
20245
diff
changeset
|
88 (if (french-calendar-accents) |
6f1b751fc31d
(french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents:
20245
diff
changeset
|
89 french-calendar-multibyte-special-days-array |
6f1b751fc31d
(french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents:
20245
diff
changeset
|
90 french-calendar-special-days-array)) |
6f1b751fc31d
(french-calendar-special-days-array): New function.
Karl Heuer <kwzh@gnu.org>
parents:
20245
diff
changeset
|
91 |
957 | 92 (defun french-calendar-leap-year-p (year) |
93 "True if YEAR is a leap year on the French Revolutionary calendar. | |
94 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
|
95 calendar, follows historical practice based on equinoxes (years 3, 7, |
957 | 96 and 11 were leap years; 15 and 20 would have been leap years). For later |
97 years uses the proposed rule of Romme (never adopted)--leap years fall every | |
98 four years except century years not divisible 400 and century years that are | |
99 multiples of 4000." | |
100 (or (memq year '(3 7 11));; Actual practice--based on equinoxes | |
101 (memq year '(15 20)) ;; Anticipated practice--based on equinoxes | |
102 (and (> year 20) ;; Romme's proposal--never adopted | |
103 (zerop (% year 4)) | |
104 (not (memq (% year 400) '(100 200 300))) | |
105 (not (zerop (% year 4000)))))) | |
106 | |
107 (defun french-calendar-last-day-of-month (month year) | |
1338 | 108 "Return last day of MONTH, YEAR on the French Revolutionary calendar. |
957 | 109 The 13th month is not really a month, but the 5 (6 in leap years) day period of |
110 `sansculottides' at the end of the year." | |
111 (if (< month 13) | |
112 30 | |
113 (if (french-calendar-leap-year-p year) | |
114 6 | |
115 5))) | |
116 | |
117 (defun calendar-absolute-from-french (date) | |
1338 | 118 "Compute absolute date from French Revolutionary date DATE. |
957 | 119 The absolute date is the number of days elapsed since the (imaginary) |
120 Gregorian date Sunday, December 31, 1 BC." | |
121 (let ((month (extract-calendar-month date)) | |
122 (day (extract-calendar-day date)) | |
123 (year (extract-calendar-year date))) | |
124 (+ (* 365 (1- year));; Days in prior years | |
125 ;; Leap days in prior years | |
126 (if (< year 20) | |
127 (/ year 4);; Actual and anticipated practice (years 3, 7, 11, 15) | |
128 ;; Romme's proposed rule (using the Principle of Inclusion/Exclusion) | |
129 (+ (/ (1- year) 4);; Luckily, there were 4 leap years before year 20 | |
130 (- (/ (1- year) 100)) | |
131 (/ (1- year) 400) | |
132 (- (/ (1- year) 4000)))) | |
133 (* 30 (1- month));; Days in prior months this year | |
134 day;; Days so far this month | |
13048 | 135 (1- french-calendar-epoch))));; Days before start of calendar |
957 | 136 |
137 (defun calendar-french-from-absolute (date) | |
1338 | 138 "Compute the French Revolutionary equivalent for absolute date DATE. |
139 The result is a list of the form (MONTH DAY YEAR). | |
140 The absolute date is the number of days elapsed since the | |
7639 | 141 \(imaginary) Gregorian date Sunday, December 31, 1 BC." |
13048 | 142 (if (< date french-calendar-epoch) |
957 | 143 (list 0 0 0);; pre-French Revolutionary date |
13048 | 144 (let* ((approx ;; Approximation from below. |
145 (/ (- date french-calendar-epoch) 366)) | |
957 | 146 (year ;; Search forward from the approximation. |
147 (+ approx | |
148 (calendar-sum y approx | |
149 (>= date (calendar-absolute-from-french (list 1 1 (1+ y)))) | |
150 1))) | |
151 (month ;; Search forward from Vendemiaire. | |
152 (1+ (calendar-sum m 1 | |
153 (> date | |
154 (calendar-absolute-from-french | |
155 (list m | |
156 (french-calendar-last-day-of-month m year) | |
157 year))) | |
158 1))) | |
159 (day ;; Calculate the day by subtraction. | |
160 (- date | |
161 (1- (calendar-absolute-from-french (list month 1 year)))))) | |
162 (list month day year)))) | |
163 | |
5699
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
164 (defun calendar-french-date-string (&optional date) |
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
165 "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
|
166 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
|
167 Defaults to today's date if DATE is not given." |
957 | 168 (let* ((french-date (calendar-french-from-absolute |
169 (calendar-absolute-from-gregorian | |
5699
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
170 (or date (calendar-current-date))))) |
957 | 171 (y (extract-calendar-year french-date)) |
172 (m (extract-calendar-month french-date)) | |
173 (d (extract-calendar-day french-date))) | |
5699
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
174 (cond |
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
175 ((< y 1) "") |
19885
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
176 ((= m 13) (format (if (french-calendar-accents) |
15550
4df6e0ffab90
(french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
177 "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
|
178 "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
|
179 (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
|
180 y)) |
15550
4df6e0ffab90
(french-calendar-accents): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
181 (t (format |
19885
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
182 (if (french-calendar-accents) |
28781
dc2a0cf401ab
(french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents:
24191
diff
changeset
|
183 "%d %s an %d de la Révolution" |
dc2a0cf401ab
(french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents:
24191
diff
changeset
|
184 "%d %s an %d de la Re'volution") |
dc2a0cf401ab
(french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents:
24191
diff
changeset
|
185 d |
19885
266e93ddaf0e
(french-calendar-accents): Change variable to function.
Richard M. Stallman <rms@gnu.org>
parents:
17570
diff
changeset
|
186 (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
|
187 y))))) |
5699
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
188 |
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
189 (defun calendar-print-french-date () |
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
190 "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
|
191 (interactive) |
20763
129b8b78151c
(calendar-french-single-byteify): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20474
diff
changeset
|
192 (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
|
193 (if (string-equal f "") |
957 | 194 (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
|
195 (message "French Revolutionary date: %s" f)))) |
957 | 196 |
197 (defun calendar-goto-french-date (date &optional noecho) | |
1338 | 198 "Move cursor to French Revolutionary date DATE. |
957 | 199 Echo French Revolutionary date unless NOECHO is t." |
200 (interactive | |
20763
129b8b78151c
(calendar-french-single-byteify): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20474
diff
changeset
|
201 (let ((accents (french-calendar-accents)) |
20474
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
202 (months (french-calendar-month-name-array)) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
203 (special-days (french-calendar-special-days-array))) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
204 (let* ((year |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
205 (progn |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
206 (calendar-read |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
207 (if accents |
20763
129b8b78151c
(calendar-french-single-byteify): Function deleted.
Richard M. Stallman <rms@gnu.org>
parents:
20474
diff
changeset
|
208 "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
|
209 "Anne'e de la Re'volution (>0): ") |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
210 '(lambda (x) (> x 0)) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
211 (int-to-string |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
212 (extract-calendar-year |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
213 (calendar-french-from-absolute |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
214 (calendar-absolute-from-gregorian |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
215 (calendar-current-date)))))))) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
216 (month-list |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
217 (mapcar 'list |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
218 (append months |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
219 (if (french-calendar-leap-year-p year) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
220 (mapcar |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
221 '(lambda (x) (concat "Jour " x)) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
222 french-calendar-special-days-array) |
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 (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
|
225 (reverse |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
226 (mapcar |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
227 '(lambda (x) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
228 (concat "Jour " x)) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
229 special-days)))))))) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
230 (completion-ignore-case t) |
24191
4f1b1bddae88
(calendar-goto-french-date): Use assoc-ignore-case and do not
Richard M. Stallman <rms@gnu.org>
parents:
20763
diff
changeset
|
231 (month (cdr (assoc-ignore-case |
4f1b1bddae88
(calendar-goto-french-date): Use assoc-ignore-case and do not
Richard M. Stallman <rms@gnu.org>
parents:
20763
diff
changeset
|
232 (completing-read |
4f1b1bddae88
(calendar-goto-french-date): Use assoc-ignore-case and do not
Richard M. Stallman <rms@gnu.org>
parents:
20763
diff
changeset
|
233 "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
|
234 month-list |
4f1b1bddae88
(calendar-goto-french-date): Use assoc-ignore-case and do not
Richard M. Stallman <rms@gnu.org>
parents:
20763
diff
changeset
|
235 nil t) |
4f1b1bddae88
(calendar-goto-french-date): Use assoc-ignore-case and do not
Richard M. Stallman <rms@gnu.org>
parents:
20763
diff
changeset
|
236 (calendar-make-alist month-list 1 'car)))) |
20474
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
237 (day (if (> month 12) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
238 (- month 12) |
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
239 (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
|
240 "Jour (1-30): " |
28781
dc2a0cf401ab
(french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents:
24191
diff
changeset
|
241 '(lambda (x) (and (<= 1 x) (<= x 30)))))) |
dc2a0cf401ab
(french-calendar-multibyte-special-days-array)
Gerd Moellmann <gerd@gnu.org>
parents:
24191
diff
changeset
|
242 (month (if (> month 12) 13 month))) |
20474
2ff24b456bb7
(calendar-french-single-byteify): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
243 (list (list month day year))))) |
957 | 244 (calendar-goto-date (calendar-gregorian-from-absolute |
245 (calendar-absolute-from-french date))) | |
246 (or noecho (calendar-print-french-date))) | |
247 | |
248 (defun diary-french-date () | |
249 "French calendar equivalent of date diary entry." | |
17381
d1fc8a2d353f
(diary-french-date): Use `date'.
Richard M. Stallman <rms@gnu.org>
parents:
15550
diff
changeset
|
250 (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
|
251 (if (string-equal f "") |
a2d78b648542
(calendar-french-date-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5416
diff
changeset
|
252 "Date is pre-French Revolution" |
17381
d1fc8a2d353f
(diary-french-date): Use `date'.
Richard M. Stallman <rms@gnu.org>
parents:
15550
diff
changeset
|
253 (format "French Revolutionary date: %s" f)))) |
957 | 254 |
255 (provide 'cal-french) | |
256 | |
257 ;;; cal-french.el ends here |