Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
5c645a20
Commit
5c645a20
authored
Apr 04, 2008
by
Glenn Morris
Browse files
Update for cal-julian name changes.
parent
bd773d17
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
15 deletions
+15
-15
lisp/calendar/cal-china.el
lisp/calendar/cal-china.el
+3
-3
lisp/calendar/cal-coptic.el
lisp/calendar/cal-coptic.el
+2
-2
lisp/calendar/holidays.el
lisp/calendar/holidays.el
+2
-2
lisp/calendar/lunar.el
lisp/calendar/lunar.el
+4
-4
lisp/calendar/solar.el
lisp/calendar/solar.el
+4
-4
No files found.
lisp/calendar/cal-china.el
View file @
5c645a20
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
(
require
'lunar
)
; lunar-new-moon-on-or-after
(
require
'lunar
)
; lunar-new-moon-on-or-after
;; solar-date-next-longitude brought in by lunar.
;; solar-date-next-longitude brought in by lunar.
;;;(require 'solar)
;;;(require 'solar)
;; calendar-absolute
-
from-a
stro and v versa
are cal-autoloads.
;; calendar-
astro-to-
absolute
and
from-a
bsolute
are cal-autoloads.
;;;(require 'cal-julian)
;;;(require 'cal-julian)
...
@@ -195,7 +195,7 @@ The Zodiac signs begin when the sun's longitude is a multiple of 30 degrees."
...
@@ -195,7 +195,7 @@ The Zodiac signs begin when the sun's longitude is a multiple of 30 degrees."
(
calendar-daylight-savings-ends-time
(
calendar-daylight-savings-ends-time
chinese-calendar-daylight-savings-ends-time
))
chinese-calendar-daylight-savings-ends-time
))
(
floor
(
floor
(
calendar-a
bsolute-from-astro
(
calendar-a
stro-to-absolute
(
solar-date-next-longitude
(
calendar-astro-from-absolute
d
)
30
)))))
(
solar-date-next-longitude
(
calendar-astro-from-absolute
d
)
30
)))))
(
defun
chinese-new-moon-on-or-after
(
d
)
(
defun
chinese-new-moon-on-or-after
(
d
)
...
@@ -217,7 +217,7 @@ The Zodiac signs begin when the sun's longitude is a multiple of 30 degrees."
...
@@ -217,7 +217,7 @@ The Zodiac signs begin when the sun's longitude is a multiple of 30 degrees."
(
calendar-daylight-savings-ends-time
(
calendar-daylight-savings-ends-time
chinese-calendar-daylight-savings-ends-time
))
chinese-calendar-daylight-savings-ends-time
))
(
floor
(
floor
(
calendar-a
bsolute-from-astro
(
calendar-a
stro-to-absolute
(
lunar-new-moon-on-or-after
(
calendar-astro-from-absolute
d
))))))
(
lunar-new-moon-on-or-after
(
calendar-astro-from-absolute
d
))))))
(
defun
chinese-month-list
(
start
end
)
(
defun
chinese-month-list
(
start
end
)
...
...
lisp/calendar/cal-coptic.el
View file @
5c645a20
...
@@ -41,10 +41,10 @@
...
@@ -41,10 +41,10 @@
"Array of the month names in the Coptic calendar."
)
"Array of the month names in the Coptic calendar."
)
(
eval-and-compile
(
eval-and-compile
(
autoload
'calendar-
absolute-from-julian
"cal-julian"
))
(
autoload
'calendar-
julian-to-absolute
"cal-julian"
))
(
defvar
coptic-calendar-epoch
(
defvar
coptic-calendar-epoch
(
eval-when-compile
(
calendar-
absolute-from-julian
'
(
8
29
284
)))
(
eval-when-compile
(
calendar-
julian-to-absolute
'
(
8
29
284
)))
"Absolute date of start of Coptic calendar = August 29, 284 AD (Julian)."
)
"Absolute date of start of Coptic calendar = August 29, 284 AD (Julian)."
)
(
defvar
coptic-name
"Coptic"
(
defvar
coptic-name
"Coptic"
...
...
lisp/calendar/holidays.el
View file @
5c645a20
...
@@ -439,7 +439,7 @@ is non-nil)."
...
@@ -439,7 +439,7 @@ is non-nil)."
(
list
(
list
greg
string
))))))
(
list
(
list
greg
string
))))))
;; Prior call to calendar-julian-from-absolute will autoload cal-julian.
;; Prior call to calendar-julian-from-absolute will autoload cal-julian.
(
declare-function
calendar-
absolute-from-julian
"cal-julian"
(
date
))
(
declare-function
calendar-
julian-to-absolute
"cal-julian"
(
date
))
(
defun
holiday-greek-orthodox-easter
()
(
defun
holiday-greek-orthodox-easter
()
"Date of Easter according to the rule of the Council of Nicaea."
"Date of Easter according to the rule of the Council of Nicaea."
...
@@ -456,7 +456,7 @@ is non-nil)."
...
@@ -456,7 +456,7 @@ is non-nil)."
(
*
11
(
%
julian-year
19
)))
(
*
11
(
%
julian-year
19
)))
30
))
30
))
(
paschal-moon
; day after full moon on or after March 21
(
paschal-moon
; day after full moon on or after March 21
(
-
(
calendar-
absolute-from-julian
(
list
4
19
julian-year
))
(
-
(
calendar-
julian-to-absolute
(
list
4
19
julian-year
))
shifted-epact
))
shifted-epact
))
(
nicaean-easter
; Sunday following the Paschal moon
(
nicaean-easter
; Sunday following the Paschal moon
(
calendar-gregorian-from-absolute
(
calendar-gregorian-from-absolute
...
...
lisp/calendar/lunar.el
View file @
5c645a20
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
(
require
'calendar
)
(
require
'calendar
)
(
require
'solar
)
(
require
'solar
)
(
require
'cal-dst
)
(
require
'cal-dst
)
;; calendar-a
bsolute-from-astro
and v versa are cal-autoloads.
;; calendar-a
stro-to-absolute
and v versa are cal-autoloads.
;;;(require 'cal-julian)
;;;(require 'cal-julian)
(
defun
lunar-phase
(
index
)
(
defun
lunar-phase
(
index
)
...
@@ -354,7 +354,7 @@ use when highlighting the day in the calendar."
...
@@ -354,7 +354,7 @@ use when highlighting the day in the calendar."
(
-
(
solar-ephemeris-correction
(
-
(
solar-ephemeris-correction
(
extract-calendar-year
(
extract-calendar-year
(
calendar-gregorian-from-absolute
(
calendar-gregorian-from-absolute
(
floor
(
calendar-a
bsolute-from-astro
newJDE
))))))
(
floor
(
calendar-a
stro-to-absolute
newJDE
))))))
(
/
calendar-time-zone
60.0
24.0
))))
(
/
calendar-time-zone
60.0
24.0
))))
(
defun
lunar-new-moon-on-or-after
(
d
)
(
defun
lunar-new-moon-on-or-after
(
d
)
...
@@ -367,7 +367,7 @@ as governed by the values of `calendar-daylight-savings-starts',
...
@@ -367,7 +367,7 @@ as governed by the values of `calendar-daylight-savings-starts',
`calendar-daylight-savings-ends-time', `calendar-daylight-time-offset', and
`calendar-daylight-savings-ends-time', `calendar-daylight-time-offset', and
`calendar-time-zone'."
`calendar-time-zone'."
(
let*
((
date
(
calendar-gregorian-from-absolute
(
let*
((
date
(
calendar-gregorian-from-absolute
(
floor
(
calendar-a
bsolute-from-astro
d
))))
(
floor
(
calendar-a
stro-to-absolute
d
))))
(
year
(
+
(
extract-calendar-year
date
)
(
year
(
+
(
extract-calendar-year
date
)
(
/
(
calendar-day-number
date
)
365.25
)))
(
/
(
calendar-day-number
date
)
365.25
)))
(
k
(
floor
(
*
(
-
year
2000.0
)
12.3685
)))
(
k
(
floor
(
*
(
-
year
2000.0
)
12.3685
)))
...
@@ -376,7 +376,7 @@ as governed by the values of `calendar-daylight-savings-starts',
...
@@ -376,7 +376,7 @@ as governed by the values of `calendar-daylight-savings-starts',
(
while
(
<
date
d
)
(
while
(
<
date
d
)
(
setq
k
(
1+
k
)
(
setq
k
(
1+
k
)
date
(
lunar-new-moon-time
k
)))
date
(
lunar-new-moon-time
k
)))
(
calendar-a
bsolute-from-astro
date
)))
(
calendar-a
stro-to-absolute
date
)))
(
time
(
*
24
(
-
a-date
(
truncate
a-date
))))
(
time
(
*
24
(
-
a-date
(
truncate
a-date
))))
(
date
(
calendar-gregorian-from-absolute
(
truncate
a-date
)))
(
date
(
calendar-gregorian-from-absolute
(
truncate
a-date
)))
(
adj
(
dst-adjust-time
date
time
)))
(
adj
(
dst-adjust-time
date
time
)))
...
...
lisp/calendar/solar.el
View file @
5c645a20
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
(
require
'calendar
)
(
require
'calendar
)
(
require
'cal-dst
)
(
require
'cal-dst
)
;; calendar-a
bsolute-from-astro
and v versa are cal-autoloads.
;; calendar-a
stro-to-absolute
and v versa are cal-autoloads.
;;;(require 'cal-julian)
;;;(require 'cal-julian)
...
@@ -723,7 +723,7 @@ The values of `calendar-daylight-savings-starts',
...
@@ -723,7 +723,7 @@ The values of `calendar-daylight-savings-starts',
`calendar-daylight-savings-starts-time', `calendar-daylight-savings-ends',
`calendar-daylight-savings-starts-time', `calendar-daylight-savings-ends',
`calendar-daylight-savings-ends-time', `calendar-daylight-time-offset', and
`calendar-daylight-savings-ends-time', `calendar-daylight-time-offset', and
`calendar-time-zone' are used to interpret local time."
`calendar-time-zone' are used to interpret local time."
(
let*
((
a-d
(
calendar-a
bsolute-from-astro
d
))
(
let*
((
a-d
(
calendar-a
stro-to-absolute
d
))
;; Get Universal Time.
;; Get Universal Time.
(
date
(
calendar-astro-from-absolute
(
date
(
calendar-astro-from-absolute
(
-
a-d
(
-
a-d
...
@@ -735,7 +735,7 @@ The values of `calendar-daylight-savings-starts',
...
@@ -735,7 +735,7 @@ The values of `calendar-daylight-savings-starts',
(
extract-calendar-year
(
extract-calendar-year
(
calendar-gregorian-from-absolute
(
calendar-gregorian-from-absolute
(
floor
(
floor
(
calendar-a
bsolute-from-astro
(
calendar-a
stro-to-absolute
date
)))))))
date
)))))))
(
U
(
/
(
-
date
2451545
)
3652500
))
(
U
(
/
(
-
date
2451545
)
3652500
))
(
longitude
(
longitude
...
@@ -1041,7 +1041,7 @@ Requires floating point."
...
@@ -1041,7 +1041,7 @@ Requires floating point."
;; (calendar-absolute-from-gregorian
;; (calendar-absolute-from-gregorian
;; (list (+ 3 (* k 3)) 15 y)))
;; (list (+ 3 (* k 3)) 15 y)))
;; 90))
;; 90))
;; (abs-day (calendar-a
bsolute-from-astro
d)))
;; (abs-day (calendar-a
stro-to-absolute
d)))
(abs-day (calendar-absolute-from-gregorian d)))
(abs-day (calendar-absolute-from-gregorian d)))
(list
(list
(list (calendar-gregorian-from-absolute (floor abs-day))
(list (calendar-gregorian-from-absolute (floor abs-day))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment