From 327c8eb2f9a636046ea354d0d7b7851354397127 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 28 Jun 1996 08:44:25 +0000 Subject: [PATCH] (french-calendar-accents): New variable. (french-calendar-month-name-array): Check that variable. (french-calendar-special-days-array): Likewise. (calendar-french-date-string): Likewise. (calendar-goto-french-date): Likewise. --- lisp/calendar/cal-french.el | 51 +++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el index c11a7cd0bb4..8f68841d229 100644 --- a/lisp/calendar/cal-french.el +++ b/lisp/calendar/cal-french.el @@ -29,10 +29,9 @@ ;; diary.el that deal with the French Revolutionary calendar. ;; Technical details of the French Revolutionary calendar can be found in -;; ``Calendrical Calculations, Part II: Three Historical Calendars'' -;; by E. M. Reingold, N. Dershowitz, and S. M. Clamen, -;; Software--Practice and Experience, Volume 23, Number 4 (April, 1993), -;; pages 383-404. +;; ``Calendrical Calculations, Part II: Three Historical Calendars'' by +;; E. M. Reingold, N. Dershowitz, and S. M. Clamen, Software--Practice and +;; Experience, Volume 23, Number 4 (April, 1993), pages 383-404. ;; Comments, corrections, and improvements should be sent to ;; Edward M. Reingold Department of Computer Science @@ -44,20 +43,31 @@ (require 'calendar) +(defvar french-calendar-accents + (and (char-table-p standard-display-table) + (equal (aref standard-display-table 161) [161])) + "True if diacritical marks are available.") + (defconst french-calendar-epoch (calendar-absolute-from-gregorian '(9 22 1792)) "Absolute date of start of French Revolutionary calendar = September 22, 1792.") (defconst french-calendar-month-name-array - ["Vende'miaire" "Brumaire" "Frimaire" "Nivo^se" "Pluvio^se" "Vento^se" - "Germinal" "Flore'al" "Prairial" "Messidor" "Thermidor" "Fructidor"]) + (if french-calendar-accents + ["Vendémiaire" "Brumaire" "Frimaire" "Nivôse" "Pluviôse" "Ventôse" + "Germinal" "Floréal" "Prairial" "Messidor" "Thermidor" "Fructidor"] + ["Vende'miaire" "Brumaire" "Frimaire" "Nivo^se" "Pluvio^se" "Vento^se" + "Germinal" "Flore'al" "Prairial" "Messidor" "Thermidor" "Fructidor"])) (defconst french-calendar-day-name-array ["Primidi" "Duodi" "Tridi" "Quartidi" "Quintidi" "Sextidi" "Septidi" "Octidi" "Nonidi" "Decadi"]) (defconst french-calendar-special-days-array - ["de la Vertu" "du Genie" "du Labour" "de la Raison" "de la Re'compense" - "de la Re'volution"]) + (if french-calendar-accents + ["de la Vertu" "du Genie" "du Labour" "de la Raison" + "de la Récompense" "de la Révolution"] + ["de la Vertu" "du Genie" "du Labour" "de la Raison" "de la Re'compense" + "de la Re'volution"])) (defun french-calendar-leap-year-p (year) "True if YEAR is a leap year on the French Revolutionary calendar. @@ -143,14 +153,19 @@ Defaults to today's date if DATE is not given." (d (extract-calendar-day french-date))) (cond ((< y 1) "") - ((= m 13) (format "Jour %s de l'Anne'e %d de la Re'volution" + ((= m 13) (format (if french-calendar-accents + "Jour %s de l'Année %d de la Révolution" + "Jour %s de l'Anne'e %d de la Re'volution") (aref french-calendar-special-days-array (1- d)) y)) - (t (format "De'cade %s, %s de %s de l'Anne'e %d de la Re'volution" - (make-string (1+ (/ (1- d) 10)) ?I) - (aref french-calendar-day-name-array (% (1- d) 10)) - (aref french-calendar-month-name-array (1- m)) - y))))) + (t (format + (if french-calendar-accents + "Décade %s, %s de %s de l'Année %d de la Révolution" + "De'cade %s, %s de %s de l'Anne'e %d de la Re'volution") + (make-string (1+ (/ (1- d) 10)) ?I) + (aref french-calendar-day-name-array (% (1- d) 10)) + (aref french-calendar-month-name-array (1- m)) + y))))) (defun calendar-print-french-date () "Show the French Revolutionary calendar equivalent of the selected date." @@ -165,7 +180,9 @@ Defaults to today's date if DATE is not given." Echo French Revolutionary date unless NOECHO is t." (interactive (let* ((year (calendar-read - "Anne'e de la Re'volution (>0): " + (if french-calendar-accents + "Année de la Révolution (>0): " + "Anne'e de la Re'volution (>0): ") '(lambda (x) (> x 0)) (int-to-string (extract-calendar-year @@ -199,7 +216,9 @@ Echo French Revolutionary date unless NOECHO is t." (decade (if (> month 12) 1 (calendar-read - "De'cade (1-3): " + (if french-calendar-accents + "Décade (1-3): " + "De'cade (1-3): ") '(lambda (x) (memq x '(1 2 3)))))) (day (if (> month 12) (- month 12) -- 2.39.2