Mercurial > emacs
view lisp/calendar/cal-french.el @ 31383:860d7ac182e3
(vc-rcs-show-log-entry): New function.
(vc-rcs-checkin, vc-rcs-checkout): Don't set all properties.
(vc-rcs-register): If there is no RCS subdir, ask the
user whether to create one.
(vc-rcs-state-heuristic): Use
file-ownership-preserved-p.
(vc-rcs-checkout): Remove the error-handling for missing-rcs.
(vc-rcs-state-heuristic): Don't use file-writable-p.
(vc-rcs-print-log): Insert in the current buffer.
(vc-rcs-diff): Insert in the current buffer and remove unused arg
CMP.
(vc-rcs-workfile-unchanged-p): Use vc-do-command
instead of vc-simple-command.
(vc-rcs-fetch-master-state): Removed check for unlocked-changes to
avoid doing a diff when opening a file.
(vc-rcs-state): Added check for unlocked-changes.
(vc-rcs-header): Escape Id.
(vc-rcs-workfile-unchanged-p): Remove optional arg VERSION.
(vc-rcs-state): Call vc-workfile-unchanged-p, not the RCS-specific
version.
(vc-rcs-state-heuristic): Use file-writable-p instead
of comparing userids.
(vc-rcs-fetch-master-state): Handle the case where rcs is missing.
Simplify the logic by eliminating unreachable code.
(vc-rcs-diff): Only pass `2' to vc-do-command if necessary and
just do a recursive call if we need to retry.
(vc-rcs-checkout): Handle the case where rcs is missing by making
the buffer read-write if requested and re-signalling the error.
(vc-rcs-find-most-recent-rev): New function. The code
derives from the old vc-parse-buffer but uses the revision number
rather than the date (much easier to compare robustly).
(vc-rcs-fetch-master-state): Use `with-temp-buffer'. Adapt to the
new vc-parse-buffer (and vc-rcs-find-most-recent-rev). Find the
locking-user more directly. Check strict locking and set
checkout-model appropriately.
(vc-rcs-parse-locks): Remove.
(vc-rcs-latest-on-branch-p): Use with-temp-buffer and adapt to the
new vc-parse-buffer (and vc-rcs-find-most-recent-rev).
(vc-rcs-system-release): Use with-current-buffer and
vc-parse-buffer.
(vc-rcs-register, vc-rcs-checkout): Use with-current-buffer.
Merge in code
from vc-rcs-hooks.el. Don't require 'vc anymore.
(vc-rcs-responsible-p): Use expand-file-name instead of concat and
file-directory-p instead of file-exists-p.
(vc-rcs-exists): Remove.
(vc-rcs-header): New var.
Update Copyright.
(vc-rcs-rename-file): New function.
(vc-rcs-diff): Remove unused `backend' variable.
(vc-rcs-clear-headers): New function; code moved here
from vc-clear-headers in vc.el.
(tail): Provide vc-rcs and remove vc-rcs-logentry-check.
(vc-rcs-register): Parse command output to find master
file name and workfile version.
(vc-rcs-checkout): Removed call to vc-file-clear-masterprops.
Require vc and vc-rcs-hooks.
(vc-rcs-trunk-p, vc-rcs-branch-part): Move to vc-rcs-hooks.
(vc-rcs-backend-release-p): Remove (use vc-rcs-release-p).
(vc-release-greater-or-equal-p): Move from vc.
(vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part,
vc-rcs-minor-part, vc-rcs-previous-version): Remove duplicates.
(vc-rcs-checkout): Add a missing `new-version' argument in the
call to vc-rcs-latest-on-branch-p. Hopefully that was the right
one.
(vc-rcs-steal-lock): Renamed from `vc-rcs-steal'.
Updated everything to use `vc-checkout-model'.
(vc-rcs-backend-release-p): function added. other
stuff updated to reference this function instead of the old
`vc-backend-release-p'.
(vc-rcs-logentry-check): Function added.
(vc-rcs-checkin, vc-rcs-previous-version)
(vc-rcs-checkout): Name space cleaned up. No more revision number
crunching function names that are not prefixed with vc-rcs.
(vc-rcs-checkout-model): Function added. References to
`vc-checkout-model' replaced.
(vc-rcs-admin): Added the query-only option as
required by the vc.el file.
(vc-rcs-exists): Function added.
(vc-*-checkout):
Use with-temp-file instead of /bin/sh. Merged from mainline
(vc-rcs-latest-on-branch-p): Moved to vc-rcs-hooks.el.
(vc-rcs-latest-on-branch-p, vc-rcs-trunk-p)
(vc-rcs-branch-p, vc-rcs-branch-part, vc-rcs-minor-part)
(vc-rcs-previous-version): Functions added.
(vc-rcs-diff): Function added.
(vc-rcs-checkout) Bug (typo) found and fixed.
(vc-rcs-register-switches) Variable `vc-rcs-register-switches' added.
Require vc when compiling.
(vc-rcs-print-log, vc-rcs-assign-name, vc-rcs-merge)
(vc-rcs-check-headers, vc-rcs-steal, vc-rcs-uncheck, vc-rcs-revert)
(vc-rcs-checkin): New functions (code from vc.el).
(vc-rcs-previous-version, vc-rcs-system-release, vc-rcs-checkout):
Doc fix.
(vc-rcs-release): Deleted. (Duplicated vc-rcs-system-release).
(vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part)
(vc-rcs-minor-part, vc-rcs-previous-version, vc-rcs-release)
(vc-rcs-release-p, vc-rcs-admin, vc-rcs-checkout): New functions
from vc.el.
(vc-rcs-system-release):
Renamed from vc-rcs-backend-release.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Mon, 04 Sep 2000 19:47:43 +0000 |
parents | dc2a0cf401ab |
children | 7a94f1c588c4 |
line wrap: on
line source
;;; cal-french.el --- calendar functions for the French Revolutionary calendar. ;; Copyright (C) 1988, 89, 92, 94, 95, 1997 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Keywords: calendar ;; Human-Keywords: French Revolutionary calendar, calendar, diary ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; This collection of functions implements the features of calendar.el and ;; diary.el that deal with the French Revolutionary calendar. ;; Technical details of the French Revolutionary calendar can be found in ;; ``Calendrical Calculations'' by Nachum Dershowitz and Edward M. Reingold, ;; Cambridge University Press (1997), and 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. ;; Comments, corrections, and improvements should be sent to ;; Edward M. Reingold Department of Computer Science ;; (217) 333-6733 University of Illinois at Urbana-Champaign ;; reingold@cs.uiuc.edu 1304 West Springfield Avenue ;; Urbana, Illinois 61801 ;;; Code: (require 'calendar) (defun french-calendar-accents () "True if diacritical marks are available." (and (or window-system (terminal-coding-system)) (or enable-multibyte-characters (and (char-table-p standard-display-table) (equal (aref standard-display-table 161) [161]))))) (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"]) (defconst french-calendar-multibyte-month-name-array ["Vendémiaire" "Brumaire" "Frimaire" "Nivôse" "Pluviôse" "Ventôse" "Germinal" "Floréal" "Prairial" "Messidor" "Thermidor" "Fructidor"]) (defconst french-calendar-day-name-array ["Primidi" "Duodi" "Tridi" "Quartidi" "Quintidi" "Sextidi" "Septidi" "Octidi" "Nonidi" "Decadi"]) (defconst french-calendar-multibyte-special-days-array ["de la Vertu" "du Génie" "du Travail" "de la Raison" "des Récompenses" "de la Révolution"]) (defconst french-calendar-special-days-array ["de la Vertu" "du Ge'nie" "du Travail" "de la Raison" "des Re'compenses" "de la Re'volution"]) (defun french-calendar-month-name-array () (if (french-calendar-accents) french-calendar-multibyte-month-name-array french-calendar-month-name-array)) (defun french-calendar-day-name-array () french-calendar-day-name-array) (defun french-calendar-special-days-array () (if (french-calendar-accents) french-calendar-multibyte-special-days-array french-calendar-special-days-array)) (defun french-calendar-leap-year-p (year) "True if YEAR is a leap year on the French Revolutionary calendar. For Gregorian years 1793 to 1805, the years of actual operation of the calendar, follows historical practice based on equinoxes (years 3, 7, and 11 were leap years; 15 and 20 would have been leap years). For later years uses the proposed rule of Romme (never adopted)--leap years fall every four years except century years not divisible 400 and century years that are multiples of 4000." (or (memq year '(3 7 11));; Actual practice--based on equinoxes (memq year '(15 20)) ;; Anticipated practice--based on equinoxes (and (> year 20) ;; Romme's proposal--never adopted (zerop (% year 4)) (not (memq (% year 400) '(100 200 300))) (not (zerop (% year 4000)))))) (defun french-calendar-last-day-of-month (month year) "Return last day of MONTH, YEAR on the French Revolutionary calendar. The 13th month is not really a month, but the 5 (6 in leap years) day period of `sansculottides' at the end of the year." (if (< month 13) 30 (if (french-calendar-leap-year-p year) 6 5))) (defun calendar-absolute-from-french (date) "Compute absolute date from French Revolutionary date DATE. The absolute date is the number of days elapsed since the (imaginary) Gregorian date Sunday, December 31, 1 BC." (let ((month (extract-calendar-month date)) (day (extract-calendar-day date)) (year (extract-calendar-year date))) (+ (* 365 (1- year));; Days in prior years ;; Leap days in prior years (if (< year 20) (/ year 4);; Actual and anticipated practice (years 3, 7, 11, 15) ;; Romme's proposed rule (using the Principle of Inclusion/Exclusion) (+ (/ (1- year) 4);; Luckily, there were 4 leap years before year 20 (- (/ (1- year) 100)) (/ (1- year) 400) (- (/ (1- year) 4000)))) (* 30 (1- month));; Days in prior months this year day;; Days so far this month (1- french-calendar-epoch))));; Days before start of calendar (defun calendar-french-from-absolute (date) "Compute the French Revolutionary equivalent for absolute date DATE. The result is a list of the form (MONTH DAY YEAR). The absolute date is the number of days elapsed since the \(imaginary) Gregorian date Sunday, December 31, 1 BC." (if (< date french-calendar-epoch) (list 0 0 0);; pre-French Revolutionary date (let* ((approx ;; Approximation from below. (/ (- date french-calendar-epoch) 366)) (year ;; Search forward from the approximation. (+ approx (calendar-sum y approx (>= date (calendar-absolute-from-french (list 1 1 (1+ y)))) 1))) (month ;; Search forward from Vendemiaire. (1+ (calendar-sum m 1 (> date (calendar-absolute-from-french (list m (french-calendar-last-day-of-month m year) year))) 1))) (day ;; Calculate the day by subtraction. (- date (1- (calendar-absolute-from-french (list month 1 year)))))) (list month day year)))) (defun calendar-french-date-string (&optional date) "String of French Revolutionary date of Gregorian DATE. Returns the empty string if DATE is pre-French Revolutionary. Defaults to today's date if DATE is not given." (let* ((french-date (calendar-french-from-absolute (calendar-absolute-from-gregorian (or date (calendar-current-date))))) (y (extract-calendar-year french-date)) (m (extract-calendar-month french-date)) (d (extract-calendar-day french-date))) (cond ((< y 1) "") ((= 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 (if (french-calendar-accents) "%d %s an %d de la Révolution" "%d %s an %d de la Re'volution") d (aref (french-calendar-month-name-array) (1- m)) y))))) (defun calendar-print-french-date () "Show the French Revolutionary calendar equivalent of the selected date." (interactive) (let ((f (calendar-french-date-string (calendar-cursor-to-date t)))) (if (string-equal f "") (message "Date is pre-French Revolution") (message "French Revolutionary date: %s" f)))) (defun calendar-goto-french-date (date &optional noecho) "Move cursor to French Revolutionary date DATE. Echo French Revolutionary date unless NOECHO is t." (interactive (let ((accents (french-calendar-accents)) (months (french-calendar-month-name-array)) (special-days (french-calendar-special-days-array))) (let* ((year (progn (calendar-read (if 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 (calendar-french-from-absolute (calendar-absolute-from-gregorian (calendar-current-date)))))))) (month-list (mapcar 'list (append months (if (french-calendar-leap-year-p year) (mapcar '(lambda (x) (concat "Jour " x)) french-calendar-special-days-array) (reverse (cdr;; we don't want rev. day in a non-leap yr. (reverse (mapcar '(lambda (x) (concat "Jour " x)) special-days)))))))) (completion-ignore-case t) (month (cdr (assoc-ignore-case (completing-read "Mois ou Sansculottide: " month-list nil t) (calendar-make-alist month-list 1 'car)))) (day (if (> month 12) (- month 12) (calendar-read "Jour (1-10): " '(lambda (x) (and (<= 1 x) (<= x 30)))))) (month (if (> month 12) 13 month))) (list (list month day year))))) (calendar-goto-date (calendar-gregorian-from-absolute (calendar-absolute-from-french date))) (or noecho (calendar-print-french-date))) (defun diary-french-date () "French calendar equivalent of date diary entry." (let ((f (calendar-french-date-string date))) (if (string-equal f "") "Date is pre-French Revolution" (format "French Revolutionary date: %s" f)))) (provide 'cal-french) ;;; cal-french.el ends here