commit ecec5492c7a2bbc271163b2e53a001df8d9c0607 parent 04975e995334f5dc515877727562da3f574094ee Author: Commit-Bot <unknown> Date: Wed, 1 Dec 2010 17:00:02 +0000 Automatic commit from picoLisp.tgz, From: Wed, 01 Dec 2010 17:00:02 GMT Diffstat:
| M | ersatz/picolisp.jar | | | 0 | |
| M | lib/cal.l | | | 30 | +++++++++++++++--------------- |
| M | src64/version.l | | | 4 | ++-- |
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/ersatz/picolisp.jar b/ersatz/picolisp.jar Binary files differ. diff --git a/lib/cal.l b/lib/cal.l @@ -1,22 +1,22 @@ -# 17sep02abu +# 01dec10abu # (c) Software Lab. Alexander Burger -# Easter date +# Easter date algorithm from J.M. Oudin (1940) (de easter (Year) - (unless (<= 1900 Year 2099) - (quit "Illegal Year" Year) ) (let - (A (% Year 19) - B (% Year 4) - C (% Year 7) - D (% (+ 24 (* 19 A)) 30) - E (% (+ 5 (* 2 B) (* 4 C) (* 6 D)) 7) - Day (+ 22 D E) - Mon 3 ) - (and (> Day 31) (setq Day (+ D E -9) Mon 4)) - (and (= Day 26) (= Mon 4) (setq Day 19)) - (and (= Day 25) (= Mon 4) (= D 28) (= E 6) (> A 10) (setq Day 18)) - (date Year Mon Day) ) ) + (C (/ Year 100) + N (% Year 19) # Metonic cycle + I (% + (+ + (- C (/ C 4) (/ (- C (/ (- C 17) 25)) 3)) + (* 19 N) + 15 ) + 30 ) ) + (dec 'I (* (/ I 28) (- 1 (* (/ I 28) (/ 29 (inc I)) (/ (- 21 N) 11))))) + (let + (L (- I (% (+ Year (/ Year 4) I 2 (- C) (/ C 4)) 7)) + Mon (+ 3 (/ (+ L 40) 44)) ) + (date Year Mon (+ L 28 (* (/ Mon 4) -31))) ) ) ) # Feiertage (de feier (X Year) diff --git a/src64/version.l b/src64/version.l @@ -1,6 +1,6 @@ -# 29nov10abu +# 01dec10abu # (c) Software Lab. Alexander Burger -(de *Version 3 0 4 15) +(de *Version 3 0 4 16) # vi:et:ts=3:sw=3