emacs: lisp/calendar/solar.el comparison

comparison lisp/calendar/solar.el @ 3866:c97c63c1a920

* solar.el (calendar-holiday-solar-equinoxes-solstices): Renamed solar-equinoxes-solstices. (calendar-time-display-form, calendar-latitude, calendar-longitude): Moved from calendar.el. (calendar-time-zone, calendar-standard-time-zone-name, calendar-daylight-time-zone-name, calendar-daylight-savings-starts, calendar-daylight-savings-ends): Take default values from calendar-current-time-zone, instead of being overwritten in open code if they were set to nil. (solar-time-string): Subtract calendar-daylight-time-offset when computing dst-ends. Avoid rounding errors when rounding time to the nearest minute.

author	Jim Blandy <jimb@redhat.com>
date	Tue, 22 Jun 1993 03:22:40 +0000
parents	e9961fa24193
children	72da559fedd2

comparison

equal deleted inserted replaced

-:2c6883d0a1b2
+:c97c63c1a920
 ;; and this notice must be preserved on all copies.
 ;;; Commentary:
 ;; This collection of functions implements the features of calendar.el and
-;; diary.el that deal with sunrise/sunset and equinoxes/solstices.
+;; diary.el that deal with times of day, sunrise/sunset, and
+;; eqinoxes/solstices.
 ;; Based on the ``Almanac for Computers 1984,'' prepared by the Nautical
 ;; Almanac Office, United States Naval Observatory, Washington, 1984 and
 ;; on ``Astronomical Formulae for Calculators,'' 3rd ed., by Jean Meeus,
 ;; Willmann-Bell, Inc., 1985.
 (if (fboundp 'atan)
 (require 'lisp-float-type)
 (error "Solar calculations impossible since floating point is unavailable."))
-(require 'calendar)
+(require 'cal-dst)
+;;;###autoload
+(defvar calendar-time-display-form
+'(12-hours ":" minutes am-pm
+(if time-zone " (") time-zone (if time-zone ")"))
+"*The pseudo-pattern that governs the way a time of day is formatted.
+A pseudo-pattern is a list of expressions that can involve the keywords
+`12-hours', `24-hours', and `minutes',  all numbers in string form,
+and `am-pm' and `time-zone',  both alphabetic strings.
+For example, the form
+'(24-hours \":\" minutes
+(if time-zone \" (\") time-zone (if time-zone \")\"))
+would give military-style times like `21:07 (UTC)'.")
+;;;###autoload
+(defvar calendar-latitude nil
+"*Latitude of `calendar-location-name' in degrees, + north, - south.
+For example, 40.7 for New York City.")
+;;;###autoload
+(defvar calendar-longitude nil
+"*Longitude of `calendar-location-name' in degrees, + east, - west.
+For example, -74.0 for New York City.")
+;;;###autoload
+(defvar calendar-location-name
+'(let ((float-output-format "%.1f"))
+(format "%s%s, %s%s"
+	     (abs calendar-latitude)
+	     (if (> calendar-latitude 0) "N" "S")
+	     (abs calendar-longitude)
+	     (if (> calendar-longitude 0) "E" "W")))
+"*Expression evaluating to name of `calendar-longitude', calendar-latitude'.
+Default value is just the latitude, longitude pair.")
 (defun solar-setup ()
 "Prompt user for latitude, longitude, and time zone."
 (beep)
 (if (not calendar-longitude)
 Format used is given by `calendar-time-display-form'.  Converted to daylight
 savings time according to `calendar-daylight-savings-starts',
 `calendar-daylight-savings-ends', `calendar-daylight-switchover-time', and
 `calendar-daylight-savings-offset'."
 (let* ((year (extract-calendar-year date))
-(abs-date-and-time (+ (calendar-absolute-from-gregorian date)
+	 (time (round (* 60 time)))
-(/ time 24.0)))
+	 (rounded-abs-date (+ (calendar-absolute-from-gregorian date)
-(rounded-abs-date (+ abs-date-and-time (/ 1.0 60 24 2)));; half min
+			      (/ time 60.0 24.0)))
-(dst-change-over
-(/ (eval calendar-daylight-savings-switchover-time) 60.0 24.0))
 (dst-starts (and calendar-daylight-savings-starts
 (+ (calendar-absolute-from-gregorian
 (eval calendar-daylight-savings-starts))
-dst-change-over)))
+			     (/ calendar-daylight-savings-switchover-time
+				60.0 24.0))))
 (dst-ends (and calendar-daylight-savings-ends
 (+ (calendar-absolute-from-gregorian
 (eval calendar-daylight-savings-ends))
-dst-change-over)))
+			   (/ (- calendar-daylight-savings-switchover-time
+				 calendar-daylight-time-offset)
+			      60.0 24.0))))
 	 (dst (and (not (eq style 'standard))
 (or (eq style 'daylight)
 (and dst-starts dst-ends
 (or (and (< dst-starts dst-ends);; northern hemi.
 (<= dst-starts rounded-abs-date)
 (<= dst-starts rounded-abs-date)))))
 (and dst-starts (not dst-ends)
 (<= dst-starts rounded-abs-date))
 (and dst-ends (not dst-starts)
 (< rounded-abs-date dst-ends)))))
-(time (if dst
-(+ time (/ (eval calendar-daylight-time-offset) 60.0))
-time))
 	 (time-zone (if dst
 			calendar-daylight-time-zone-name
 			calendar-standard-time-zone-name))
-	 (24-hours (truncate time))
+	 (time (+ time (if dst calendar-daylight-time-offset 0)))
-	 (minutes (round (* 60 (- time 24-hours))))
+	 (24-hours (/ time 60))
-(24-hours (if (= minutes 60) (1+ 24-hours) 24-hours))
+	 (minutes (format "%02d" (% time 60)))
-(minutes (if (= minutes 60) 0 minutes))
+	 (12-hours (format "%d" (1+ (% (+ 24-hours 11) 12))))
-(minutes (format "%02d" minutes))
-	 (12-hours (format "%d" (if (> 24-hours 12)
-				    (- 24-hours 12)
-				  (if (= 24-hours 0) 12 24-hours))))
 	 (am-pm (if (>= 24-hours 12) "pm" "am"))
 	 (24-hours (format "%02d" 24-hours)))
 (mapconcat 'eval calendar-time-display-form "")))
 (defun solar-sunrise-sunset (date)
 (defun solar-equinoxes/solstices (k year)
 "Date of equinox/solstice K for YEAR.  K=0, spring equinox; K=1, summer
 solstice; K=2, fall equinox; K=3, winter solstice.  Accurate to within
 several minutes."
 (let ((date (list (+ 3 (* k 3)) 21 year))
+app
 	(correction 1000))
 (while (> correction 0.00001)
 (setq app (solar-mod (solar-apparent-longitude-of-sun date) 360.0))
 (setq correction (* 58 (solar-sin-degrees (- (* k 90) app))))
 (setq date (list (extract-calendar-month date)
 (if (> calendar-latitude 0) "N" "S")
 (abs calendar-longitude)
 (if (> calendar-longitude 0) "E" "W")))))
 (calendar-standard-time-zone-name
 (if (< arg 16) calendar-standard-time-zone-name
-(cond ((= calendar-time-zone 0) "UT")
+(cond ((= calendar-time-zone 0) "UTC")
 ((< calendar-time-zone 0)
-(format "UT%dmin" calendar-time-zone))
+(format "UTC%dmin" calendar-time-zone))
-(t  (format "UT+%dmin" calendar-time-zone)))))
+(t  (format "UTC+%dmin" calendar-time-zone)))))
 (calendar-daylight-savings-starts
 (if (< arg 16) calendar-daylight-savings-starts))
 (calendar-daylight-savings-ends
 (if (< arg 16) calendar-daylight-savings-ends))
 (date (if (< arg 4) (calendar-current-date) (calendar-read-date)))
 (let* ((sunset (solar-sunset date))
 	     (light (if sunset (- sunset (/ 18.0 60.0)))))
 (if light (format "%s Sabbath candle lighting"
 (solar-time-string light date))))))
-(defun calendar-holiday-function-solar-equinoxes-solstices ()
+(defun solar-equinoxes-solstices ()
 "Date and time of equinoxes and solstices, if visible in the calendar window.
 Requires floating point."
-(let* ((m displayed-month)
+(let ((m displayed-month)
-	 (y displayed-year))
+(y displayed-year))
 (increment-calendar-month m y (cond ((= 1 (% m 3)) -1)
 					((= 2 (% m 3))  1)
 					(t              0)))
 (let* ((calendar-standard-time-zone-name
-(if calendar-time-zone calendar-standard-time-zone-name "UT"))
+(if calendar-time-zone calendar-standard-time-zone-name "UTC"))
 (calendar-daylight-savings-starts
 (if calendar-time-zone calendar-daylight-savings-starts))
 (calendar-daylight-savings-ends
 (if calendar-time-zone calendar-daylight-savings-ends))
 (calendar-time-zone (if calendar-time-zone calendar-time-zone 0))

Mercurial > emacs

comparison lisp/calendar/solar.el @ 3866:c97c63c1a920