Mercurial > emacs
view lisp/calendar/cal-french.el @ 111789:f97704487fb3
Merge changes made in Gnus trunk.
nnir.el: Batch header retrieval.
proto-stream.el: New library to provide protocol-specific TLS/STARTTLS connections for IMAP, NNTP, SMTP, POP3 and similar protocols.
nnimap.el (nnimap-open-connection): Use it.
proto-stream.el (open-proto-stream): Complete the documentation.
nnimap.el (nnimap-open-connection): Check for "OK" from the greeting.
nntp.el: Use proto-streams for the relevant connections types.
nntp.el (nntp-open-connection): Switch on STARTTLS on supported servers.
proto-stream.el (open-proto-stream): Add a way to specify what the end of a command is.
proto-stream.el (proto-stream-open-tls): Delete output from openssl if we're using tls.el.
proto-stream.el (proto-stream-open-network): If we don't have gnutls-cli or gnutls built in, then don't try to establish a STARTTLS connection.
color.el (color-lab->srgb): Fix function call name.
proto-stream.el: Fix the syntax in the comment.
nntp.el (nntp-open-connection): Fix the STARTTLS command syntax.
proto-stream.el (proto-stream-open-starttls): Actually implement the starttls.el STARTTLS.
proto-stream.el (proto-stream-always-use-starttls): New variable.
proto-stream.el (proto-stream-open-starttls): De-duplicate the starttls code.
proto-stream.el (proto-stream-open-starttls): Folded back into the main function.
proto-stream.el (proto-stream-command): Refactor out.
nnimap.el (nnimap-stream): Change default to `undecided'.
nnimap.el (nnimap-open-connection): If `nnimap-stream' is `undecided', try ssl first, and then network.
nnimap.el (nnimap-open-connection-1): Respect nnimap-server-port.
nnimap.el (nnimap-open-connection): Be more backwards-compatible.
proto-stream.el (open-protocol-stream): Renamed from open-proto-stream.
proto-stream.el (proto-stream-open-network): When doing opportunistic TLS upgrades we don't really care about the identity of the peer.
gnus.texi (Customizing the IMAP Connection): Note the new defaults.
gnus.texi (Direct Functions): Note the STARTTLS upgrade.
proto-stream.el (proto-stream-open-network): Force starttls.el to use gnutls-cli, since that what we've checked for.
proto-stream.el (proto-stream-always-use-starttls): Only default to t if open-gnutls-stream exists.
proto-stream.el (proto-stream-open-network): If STARTTLS failed, then just open a normal connection.
proto-stream.el (proto-stream-open-network): Wait until the greeting before doing STARTTLS.
nnimap.el (nnimap-open-connection-1): Always upgrade to STARTTLS (for backwards compatibility).
nnimap.el (nnimap-open-connection-1): Really respect nnimap-server-port.
nntp.el (nntp-open-connection): Provide a :success condition.
nnimap.el (nnimap-open-connection-1): Ditto.
proto-stream.el (proto-stream-open-network): See what the response to the STARTTLS command is.
proto-stream.el (proto-stream-open-network): Add some comments.
proto-stream.el: Fix example.
proto-stream.el (open-protocol-stream): Actually mention the STARTTLS upgrade.
nnir.el (nnir-get-active): Skip nnir-ignored-newsgroups when searching.
nnir.el (nnir-ignore-newsgroups): Fix default value.
nnir.el (nnir-run-gmane): Use mm-delete-duplicates instead of delete-dups that is not available in XEmacs 21.4.
mm-util.el (mm-delete-duplicates): Add comment.
gnus-sum.el (gnus-summary-delete-article): If delete fails don't change the registry.
nnimap.el (nnimap-open-connection-1): w32 open-network-stream doesn't seem to accept strings-with-numbers as port numbers.
color.el: fix docstring to use English rather than math notation for intervals.
shr.el (shr-find-fill-point): Don't break before apostrophes.
nnir.el (nnir-request-move-article): Bail out if no move support in group.
color.el (color-rgb->hsv): Fix docstring.
nnir.el (nnir-get-active): Improve active list retrieval.
shr.el (shr-find-fill-point): Work better for kinsoku chars and apostrophes.
gnus-gravatar.el (gnus-gravatar-size): Set gnus-gravatar-size to nil.
nnimap.el (nnimap-open-connection-1): Use gnus-string-match-p.
nnimap.el (nnimap-open-connection-1): Fix PREAUTH.
proto-stream.el (open-protocol-stream): All starttls connections are handled by the network handler.
gnus-gravatar.el (gnus-gravatar-insert): Delete unnecessary binding to t of inhibit-read-only since it is inside gnus-with-article-headers.
gnus-gravatar.el (gnus-gravatar-transform-address): Use mail-extract-address-components that supports non-ASCII names rather than mail-header-parse-addresses.
shr.el (shr-find-fill-point): Don't break line between kinsoku-bol characters.
gnus-gravatar.el (gnus-gravatar-insert): Allow LWSP in the middle of names.
nnmaildir.el (nnmaildir-request-set-mark): Add article to add-mark funcall.
gnus-msg.el: Remove nastygram thing.
message.el (message-from-style): Fix comment.
message.el (message-user-organization): Do not use gnus-local-organization.
gnus.el: Remove gnus-local-organization.
rtree.el: New file to handle range trees.
nnir.el, gnus-sum.el: Redo the way nnir handles registry updates.
rtree.el (rtree-extract): Simplify.
gnus-win.el (gnus-configure-windows): Remove Gnus 3.x setting support.
gnus-msg.el: Mark gnus-outgoing-message-group as obsolete.
gnus.texi (Archived Messages): Remove gnus-outgoing-message-group.
gnus-win.el (gnus-configure-frame): Remove old compatibility code.
rtree.el (rtree-memq): Rewrite it as a non-recursive function.
rtree.el (rtree-add, rtree-delq, rtree-length): Implement.
rtree.el (rtree-add): Make code slightly faster.
nnir.el: Allow modified summary-line-format in nnir summary buffers.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 02 Dec 2010 22:21:31 +0000 |
parents | 280c8ae2476d |
children | 417b1e4d63cd |
line wrap: on
line source
;;; cal-french.el --- calendar functions for the French Revolutionary calendar ;; Copyright (C) 1988, 1989, 1992, 1994, 1995, 1997, 2001, 2002, 2003, ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 ;; Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Maintainer: Glenn Morris <rgm@gnu.org> ;; Keywords: calendar ;; Human-Keywords: French Revolutionary calendar, calendar, diary ;; Package: calendar ;; 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; See calendar.el. ;;; Code: (require 'calendar) (defconst calendar-french-epoch (calendar-absolute-from-gregorian '(9 22 1792)) "Absolute date of start of French Revolutionary calendar = Sept 22, 1792.") (defconst calendar-french-month-name-array ["Vende'miaire" "Brumaire" "Frimaire" "Nivo^se" "Pluvio^se" "Vento^se" "Germinal" "Flore'al" "Prairial" "Messidor" "Thermidor" "Fructidor"] "Array of month names in the French calendar.") (defconst calendar-french-multibyte-month-name-array ["Vendémiaire" "Brumaire" "Frimaire" "Nivôse" "Pluviôse" "Ventôse" "Germinal" "Floréal" "Prairial" "Messidor" "Thermidor" "Fructidor"] "Array of multibyte month names in the French calendar.") (defconst calendar-french-day-name-array ["Primidi" "Duodi" "Tridi" "Quartidi" "Quintidi" "Sextidi" "Septidi" "Octidi" "Nonidi" "Decadi"] "Array of day names in the French calendar.") (defconst calendar-french-special-days-array ["de la Vertu" "du Ge'nie" "du Travail" "de la Raison" "des Re'compenses" "de la Re'volution"] "Array of special day names in the French calendar.") (defconst calendar-french-multibyte-special-days-array ["de la Vertu" "du Génie" "du Travail" "de la Raison" "des Récompenses" "de la Révolution"] "Array of multibyte special day names in the French calendar.") (defun calendar-french-accents-p () "Return non-nil 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]))))) (defun calendar-french-month-name-array () "Return the array of month names, depending on whether accents are available." (if (calendar-french-accents-p) calendar-french-multibyte-month-name-array calendar-french-month-name-array)) (defun calendar-french-day-name-array () "Return the array of day names." calendar-french-day-name-array) (defun calendar-french-special-days-array () "Return the special day names, depending on whether accents are available." (if (calendar-french-accents-p) calendar-french-multibyte-special-days-array calendar-french-special-days-array)) (defun calendar-french-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 calendar-french-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 (calendar-french-leap-year-p year) 6 5))) (defun calendar-french-to-absolute (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 (calendar-extract-month date)) (day (calendar-extract-day date)) (year (calendar-extract-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- calendar-french-epoch)))) ; days before start of calendar (define-obsolete-function-alias 'calendar-absolute-from-french 'calendar-french-to-absolute "23.1") (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 calendar-french-epoch) (list 0 0 0) ; pre-French Revolutionary date (let* ((approx ; approximation from below (/ (- date calendar-french-epoch) 366)) (year ; search forward from the approximation (+ approx (calendar-sum y approx (>= date (calendar-french-to-absolute (list 1 1 (1+ y)))) 1))) (month ; search forward from Vendemiaire (1+ (calendar-sum m 1 (> date (calendar-french-to-absolute (list m (calendar-french-last-day-of-month m year) year))) 1))) (day ; calculate the day by subtraction (- date (1- (calendar-french-to-absolute (list month 1 year)))))) (list month day year)))) ;;;###cal-autoload (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 (calendar-extract-year french-date)) (m (calendar-extract-month french-date)) (d (calendar-extract-day french-date))) (cond ((< y 1) "") ((= m 13) (format (if (calendar-french-accents-p) "Jour %s de l'Année %d de la Révolution" "Jour %s de l'Anne'e %d de la Re'volution") (aref (calendar-french-special-days-array) (1- d)) y)) (t (format (if (calendar-french-accents-p) "%d %s an %d de la Révolution" "%d %s an %d de la Re'volution") d (aref (calendar-french-month-name-array) (1- m)) y))))) ;;;###cal-autoload (defun calendar-french-print-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)))) (define-obsolete-function-alias 'calendar-print-french-date 'calendar-french-print-date "23.1") ;;;###cal-autoload (defun calendar-french-goto-date (date &optional noecho) "Move cursor to French Revolutionary date DATE. Echo French Revolutionary date unless NOECHO is non-nil." (interactive (let* ((months (calendar-french-month-name-array)) (special-days (calendar-french-special-days-array)) (year (progn (calendar-read (if (calendar-french-accents-p) "Année de la Révolution (>0): " "Anne'e de la Re'volution (>0): ") (lambda (x) (> x 0)) (number-to-string (calendar-extract-year (calendar-french-from-absolute (calendar-absolute-from-gregorian (calendar-current-date)))))))) (month-list (mapcar 'list (append months (if (calendar-french-leap-year-p year) (mapcar (lambda (x) (concat "Jour " x)) calendar-french-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-string (completing-read "Mois ou Sansculottide: " month-list nil t) (calendar-make-alist month-list 1 'car) t))) (day (if (> month 12) (- month 12) (calendar-read "Jour (1-30): " (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-french-to-absolute date))) (or noecho (calendar-french-print-date))) (define-obsolete-function-alias 'calendar-goto-french-date 'calendar-french-goto-date "23.1") (defvar date) ;; To be called from diary-list-sexp-entries, where DATE is bound. ;;;###diary-autoload (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) ;; Local Variables: ;; coding: utf-8 ;; End: ;; arch-tag: 7e8045a3-8609-46b5-9cde-cf40ce541cf9 ;;; cal-french.el ends here