Update release notes.

Add test for bug found by Alexander Keller
Proper fix for overflow.
2026-04-16 14:28:40 +02:00 · 2015-07-27 15:41:14 -04:00 · 2015-07-27 15:38:11 -04:00 · 2015-07-27 13:20:00 -04:00 · 2015-07-27 13:18:16 -04:00 · 2015-05-27 13:21:33 -04:00
90 changed files with 945 additions and 558 deletions
--- a/2
+++ b/2
@@ -293,7 +293,7 @@ POSSIBILITY OF SUCH DAMAGES.

 		     END OF TERMS AND CONDITIONS
 --
-David F. Skoll <dfs@roaringpenguin.com>
+Dianne Skoll <dfs@roaringpenguin.com>

 Tel. (613) 231-6599
 http://www.roaringpenguin.com
--- a/2
+++ b/2
@@ -27,4 +27,4 @@ iPhone or iPad, please don't.  Those products enforce Apple's rigorous
 controls much more stringently than Mac OS X on an Apple PC.

 --
-David F. Skoll
+Dianne Skoll
--- a/build.tk
+++ b/build.tk
@@ -7,7 +7,7 @@
 #   A cheesy graphical front-end for building and installing REMIND.
 #
 #   This file is part of REMIND.
-#   Copyright (C) 1992-1999 David F. Skoll
+#   Copyright (C) 1992-1999 Dianne Skoll
 #   Copyright (C) 1999-2000 Roaring Penguin Software Inc.
 #
 #--------------------------------------------------------------
--- a/375
+++ b/375
--- a/configure.in
+++ b/configure.in
@@ -75,6 +75,6 @@ if test "$GCC" = yes; then
 fi

 AC_CHECK_FUNCS(setenv unsetenv glob mbstowcs setlocale)
-VERSION=03.01.11
+VERSION=03.01.15
 AC_SUBST(VERSION)
 AC_OUTPUT(src/Makefile www/Makefile src/version.h)
--- a/contrib/README
+++ b/contrib/README
@@ -1,5 +1,5 @@
 This directory contains contributed scripts.  They are provided
-"as-is" with no warranty.  Please do not contact David Skoll
+"as-is" with no warranty.  Please do not contact Dianne Skoll
 or Roaring Penguin Software Inc. for help with these scripts;
 instead, contact the script authors.

@@ -7,4 +7,4 @@ You should check the upstream sources; there may be newer versions
 of these scripts available.

 --
-David F. Skoll
+Dianne Skoll
--- a/contrib/rem2ics-0.93/rem2ics
+++ b/contrib/rem2ics-0.93/rem2ics
@@ -251,7 +251,7 @@ Please report bugs (with patches, if possible).
 Inspired by Anthony J. Chivetta E<lt>achivetta@gmail.comE<gt>'s
 rem2ics in awk.

-Thank you to David Skoll E<lt>dfs@roaringpengiun.com<gt> for Remind,
+Thank you to Dianne Skoll E<lt>dfs@roaringpengiun.com<gt> for Remind,
 and to the IETF calsch wg for the iCalendar specification.

 =cut
--- a/contrib/remind-conf-mode.06/remind-conf-mode.el
+++ b/contrib/remind-conf-mode.06/remind-conf-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008  Shelagh Manton <shelagh.manton@gmail.com>

 ;; Author: Shelagh Manton <shelagh.manton@gmail.com> with help from
-;; David F. Skoll
+;; Dianne Skoll
 ;; Keywords: remind configure mode
 ;; Version: .04

--- a/docs/README.UNIX
+++ b/docs/README.UNIX
@@ -100,5 +100,5 @@ exit


 --
-David F. Skoll <dfs@roaringpenguin.com>
+Dianne Skoll <dfs@roaringpenguin.com>
 http://www.roaringpenguin.com/remind/
--- a/docs/WHATSNEW
+++ b/docs/WHATSNEW
@@ -1,5 +1,61 @@
 CHANGES TO REMIND

+* Version 3.1 Patch 15 - 2015-07-27
+
+- BUG FIX: Fix a buffer overflow found by Alexander Keller
+
+- BUG FIX: Fix a typo in this file: was 2014 instead of 2015.
+
+- BUG FIX: Make parser reject an AT followed by more than one time.
+
+- BUG FIX: Make parser reject epeated delta or *repeat values.
+
+* Version 3.1 Patch 14 - 2015-04-24
+
+- NEW FEATURE: Putting the line __EOF__ in a .rem file causes Remind
+  to treat it as end-of-file.
+
+- IMPROVEMENT: Use better PNG images for moons in the HTML display
+
+- CHANGE: Author name updated from "David" to "Dianne"
+
+- BUG FIX: The "-n" command-line option should really run in "ADVANCE_MODE"
+  rather than "CAL_MODE" internally; otherwise, the substitution sequences
+  may be misinterpreted.
+
+- BUG FIX: A typo in clearing out MD5 sum context has been fixed.
+
+- BUG FIX: Typo in Spanish translation was fixed.
+
+* Version 3.1 Patch 13 - 2013-03-22
+
+- BUG FIX: Sunrise/Sunset calculations greatly improved thanks to John
+  McGowan.  Accuracy should now be within a couple of minutes in most
+  places.
+
+- BUG FIX: Allow specification of margins as low as 0 points in rem2ps,
+  courtesy of Jonathan Kamens.
+
+- BUG FIX: Permit compilation with gcc 2.95 (which doesn't allow variable
+  declarations after non-declaration statements in a block.)
+
+- BUG FIX: Several minor documentation errors corrected courtesy of
+  Simon Ruderich.
+
+- BUG FIX: Spurious test harness failure was fixed.
+
+* Version 3.1 Patch 12 - 2012-01-23
+
+- NEW FEATURE: Many substitution sequences "%x" have an alternate mode
+  denoted by "%*x".  This alternate mode leaves out prepositions.  For
+  example, in English "%i" might yield "on 01-25" while "%*i" yields only
+  "01-25".
+
+- BUG FIX: The "dusk" and "dawn" calculations were completely wrong.  They
+  have been fixed.  Also, sunrise/sunset calculations have been tweaked,
+  so the results may be off by a minute or two compared to previous versions
+  of Remind.
+
 * Version 3.1 Patch 11 - 2011-12-16

 - BUG FIX: For some inexplicable reason, dawn was considered to happen when
@@ -550,7 +606,7 @@ CHANGES TO REMIND
 + BUG FIXES

 - Fixed sunset(), sunrise() and minsfromutc() functions which were broken
-  by 3.0.17.  (In 3.0.17, they did not account for daylight savings time.)
+  by 3.0.17.  (In 3.0.17, they did not account for daylight saving time.)

 - Updated "finnish.h" to include proper URL and translation of all
  error messages.
--- a/examples/defs.rem
+++ b/examples/defs.rem
@@ -17,7 +17,7 @@
 #  "#COLORS" for examples of ANSI color escape sequences.                   #
 # 									    #
 # This file is part of REMIND.						    #
-# Copyright (C) 1992-1997 David F. Skoll                                    #
+# Copyright (C) 1992-1997 Dianne Skoll                                    #
 # Copyright (C) 1999-2000 Roaring Penguin Software Inc.                     #
 # 									    #
 #############################################################################
@@ -307,8 +307,8 @@ REM      Mar 17		MSG %"St. Patrick's%" Day

 # The DST rules are accurate for most locations in
 # North America
-REM Sun Apr 1 ++2 UNTIL 1 Jan 2007 MSG Daylight Savings Time - %"DST starts%" %b
-REM Sun Mar 8 ++2 FROM 1 Jan 2007 MSG Daylight Savings Time - %"DST starts%" %b
+REM Sun Apr 1 ++2 UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST starts%" %b
+REM Sun Mar 8 ++2 FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST starts%" %b

 REM      Apr  1		MSG %"April Fool's%" Day
 REM  Mon Tue Wed Thu Fri Sat 15 Apr MSG %"Income tax%" due
@@ -327,8 +327,8 @@ REM      Nov 11		MSG %"Veterans Day%"

 # The DST rules are accurate for most locations in
 # North America
-REM Sun [_last(Oct)] UNTIL 1 Jan 2007 MSG Daylight Savings Time - %"DST over%"
-REM Sun 1 Nov FROM 1 Jan 2007 MSG Daylight Savings Time - %"DST over%"
+REM Sun [_last(Oct)] UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST over%"
+REM Sun 1 Nov FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST over%"

 REM      Oct 30		MSG %"Mischief Night%"
 REM      Oct 31		MSG %"Halloween%"
@@ -402,7 +402,7 @@ REM PS BoxWidth 3 mul 4 div Border 5 sub moveto \
 # dates were obtained from "The First Jewish Catalog" by Richard Siegel	 #
 # and Michael and Sharon Strassfeld, published by the Jewish Publication #
 # Society of America.  The Reform version of the calendar was guessed	 #
-# at by David Skoll based on experience.  There is probably no standard  #
+# at by Dianne Skoll based on experience.  There is probably no standard  #
 # Reform position on many of the holidays, so you may have to adjust     #
 # the file as required.                                                  #
 #									 #
--- a/man/cm2rem.1
+++ b/man/cm2rem.1
@@ -13,7 +13,7 @@ files, there should be a system utility to convert them to version 3 files.
 \fBcm2rem.tcl\fR is supported by Roaring Penguin Software
 Inc. (http://www.roaringpenguin.com)
 .PP
-\fBcm2rem.tcl\fR was written by David F. Skoll <dfs@roaringpenguin.com>.
+\fBcm2rem.tcl\fR was written by Dianne Skoll <dfs@roaringpenguin.com>.
 .SH BUGS
 Not all of the Sun calendar manager options are respected.  In particular,
 nothing is done for e-mail actions.  Also, the resulting Remind script
--- a/man/rem.1
+++ b/man/rem.1
@@ -15,6 +15,6 @@ value of DOTREMINDERS as the filename.  Otherwise, \fBremind\fR uses
 the filename $HOME/.reminders
 .PP
 .SH AUTHOR
-Remind was written by David F. Skoll <dfs@roaringpenguin.com>
+Remind was written by Dianne Skoll <dfs@roaringpenguin.com>
 .SH SEE ALSO
 \fBremind\fR
--- a/man/rem2ps.1
+++ b/man/rem2ps.1
@@ -397,7 +397,7 @@ that don't care about this information should ignore lines starting with
 Rem2PS is now supported by Roaring Penguin Software
 Inc. (http://www.roaringpenguin.com)
 .PP
-Rem2PS was written by David F. Skoll <dfs@roaringpenguin.com>.
+Rem2PS was written by Dianne Skoll <dfs@roaringpenguin.com>.
 .SH BUGS
 All \fBRem2ps\fR options are case-sensitive, unlike \fBRemind\fR.
 Any time you supply
--- a/man/remind.1
+++ b/man/remind.1
@@ -19,6 +19,10 @@ be a directory rather than a plain file, then \fBRemind\fR reads all of
 the files in that directory that match the pattern "*.rem".  The files
 are read in sorted order; the sort order may depend on your locale, but
 should match the sort order used by the shell to expand "*.rem".
+.PP
+\fBRemind\fR reads its files starting from the beginning to the end, or
+until it encounters a line whose sole content is "__EOF__" (without the quotes.)
+Anything after the __EOF__ marker is completely ignored.

 .SH OPTIONS
 \fBRemind\fR has a slew of options.  If you're new to the program,
@@ -149,10 +153,16 @@ The \fB\-h\fR option ("hush...") suppresses certain warning and information
 messages.  In particular, if no reminders are triggered, this mode
 produces no output.
 .TP
-\fB\-a\fR
-The \fB\-a\fR option causes \fBRemind\fR not to immediately trigger timed
-reminders that would also be queued.  It also causes \fBRemind\fR not to
-place timed reminders in a calendar.
+.B \-a
+The \fB\-a\fR option causes \fBRemind\fR not to immediately trigger
+timed reminders that trigger on the current day.  It also causes
+\fBRemind\fR not to place timed reminders in a calendar.  If you
+supply two or more \fB\-a\fR options, then \fBRemind\fR \fIwill\fR
+trigger timed reminders that are in the future, but will not trigger
+timed reminders whose time has passed.  (Regardless of how many
+\fB\-a\fR options you supply, \fBRemind\fR will not include timed
+reminders in the calendar if at least one \fB\-a\fR option is used.)
+
 .TP
 \fB\-q\fR
 The \fB\-q\fR option causes \fBRemind\fR not to queue timed reminders
@@ -230,20 +240,17 @@ pops up a window and displays its invocation arguments.  You could use:
 .PP
 to have all of your \fBMSG\fR-type reminders processed using xmessage.
 .PP
-A word of warning:  It is very easy to spawn dozens of xmessage processes
-with the above technique.  So be very careful.  Also, the \fIcmd\fR is passed
-as an argument to \fBsprintf()\fR.  If you use formatting directives other
-than %s, or use more than one %s directive, there's a good chance that
-you'll crash \fBRemind\fR.  Finally, because all shell and whitespace
-characters are escaped, the program you execute with the \fB\-k\fR
-option must be prepared to handle the entire message as a single argument.
+A word of warning: It is very easy to spawn dozens of xmessage
+processes with the above technique.  So be very careful.  Because all
+shell and whitespace characters are escaped, the program you execute
+with the \fB\-k\fR option must be prepared to handle the entire
+message as a single argument.
 .RE
 .TP
-\fB\-z\fR[\fIn\fR]
-Runs \fBRemind\fR in the daemon mode.  If \fIn\fR is supplied, it
-specifies how often (in minutes) \fBRemind\fR should wake up to
-check if the reminder script has been changed.  \fIN\fR defaults
-to 5, and can range from 5 to 60.  Note that the use of the
+\fB\-z\fR[\fIn\fR] Runs \fBRemind\fR in the daemon mode.  If \fIn\fR
+is supplied, it specifies how often (in minutes) \fBRemind\fR should
+wake up to check if the reminder script has been changed.  \fIN\fR
+defaults to 1, and can range from 1 to 60.  Note that the use of the
 \fB\-z\fR option also enables the \fB\-f\fR option.
 .PP
 .RS
@@ -313,7 +320,7 @@ text editor capable of creating plain ASCII files to create a
 very simple and almost immediately understandable:
 .PP
 .nf
-	REM 6 Jan MSG David's birthday
+	REM 6 Jan MSG Dianne's birthday
 .fi
 .PP
 to the baroque and obscure:
@@ -399,7 +406,7 @@ Note that you can omit the reminder type, in which case it
 defaults to \fBMSG\fR.  So you can write:
 .PP
 .nf
-	6 January David's Birthday
+	6 January Dianne's Birthday
 .fi
 .PP
 although this is not recommended.
@@ -1455,7 +1462,7 @@ administrator.)
 If you specify a filename of "-" in the \fBINCLUDE\fR command, \fBRemind\fR
 will begin reading from standard input.
 .PP
-If you specify a \fIdirectory\fR as the argument to \fBINCLDUE\fR, then
+If you specify a \fIdirectory\fR as the argument to \fBINCLUDE\fR, then
 \fBRemind\fR will process all files in that directory that match the shell
 patterm "*.rem".  The files are processed in sorted order; the sort order
 matches that used by the shell when it expands "*.rem".
@@ -1869,7 +1876,7 @@ If non-zero, then the \fB\-c\fR option was supplied on the command line.
 .B $Daemon (read-only)
 If the daemon mode \fB\-z\fR was invoked, contains the number of
 minutes between wakeups.  If not running in daemon mode, contains
-0.  For the MS-DOS version, always contains 0.
+0.
 .TP
 .B $DateSep
 This variable can be set only to "/" or "-".  It holds the character
@@ -1885,15 +1892,13 @@ from 0 to 9999.
 .TP
 .B $DontFork (read-only)
 If non-zero, then the \fB\-c\fR option was supplied on the command line.
-For the MS-DOS version, always contains 1.
 .TP
 .B $DontTrigAts (read-only)
-If non-zero, then the \fB\-a\fR option was supplied on the command line.
-For the MS-DOS version, always contains 0.
+The number of times that the \fB\-a\fR option was supplied on the
+command line.
 .TP
 .B $DontQueue (read-only)
 If non-zero, then the \fB\-q\fR option was supplied on the command line.
-For the MS-DOS version, always contains 1.
 .TP
 .B $EndSent (STRING type)
 Contains a list of characters that end a sentence.  The \fBMSF\fR
@@ -1926,10 +1931,10 @@ reminder.  The default is 0.
 The standard Unix library functions may have difficulty dealing with dates
 later than 2037.  If this variable is set to 1, then the UTC calculations
 "fold back" years later than 2037 before using the Unix library functions.
-For example, to find out whether or not daylight savings time is in
+For example, to find out whether or not daylight saving time is in
 effect in June, 2077, the year is "folded back" to 2010, because both
 years begin on a Monday, and both are non-leapyears.  The rules for
-daylight savings time are thus presumed to be identical for both
+daylight saving time are thus presumed to be identical for both
 years, and the Unix library functions can handle 2010.  By default,
 this variable is 0.  Set it to 1 if the sun or UTC functions misbehave
 for years greater than 2037.
@@ -1986,7 +1991,7 @@ The number of minutes between Universal Time Coordinated and local time.  If
 \fB$CalcUTC\fR is non-zero, this is calculated upon startup of \fBRemind\fR.
 Otherwise, you must set it explicitly.  If \fB$CalcUTC\fR is zero,
 then \fB$MinsFromUTC\fR is used in the astronomical calculations.  You
-must adjust it for daylight savings time yourself.  Also, if you
+must adjust it for daylight saving time yourself.  Also, if you
 want to initialize \fB$MinsFromUTC\fR
 using the \fB\-i\fR command-line option, you
 must also set \fB$CalcUTC\fR to 0 with the \fB\-i\fR option.
@@ -1996,7 +2001,7 @@ If non-zero, then the \fB\-n\fR option was supplied on the command line.
 .TP
 .B $NumQueued (read-only)
 Contains the number of reminders queued so far for background
-timed triggering.  For MS-DOS, always returns 0.
+timed triggering.
 .TP
 .B $NumTrig (read-only)
 Contains the number of reminders triggered for the current date.  One
@@ -2398,7 +2403,7 @@ The optional parameter \fIstart\fR specifies the position in
 .RE
 .TP
 .B isdst([d_date [,t_time]]) \fRor\fB isdst(q_datetime)
-Returns a positive number if daylight savings time is in
+Returns a positive number if daylight saving time is in
 effect on the specified date and time.  \fIDate\fR
 defaults to \fBtoday()\fR and \fItime\fR defaults to midnight.
 .RS
@@ -2739,7 +2744,7 @@ an algorithm in "Almanac for Computers for the year 1978" by
 L. E. Doggett, Nautical Almanac Office, USNO.  They require
 the latitude and longitude to be specified by setting the appropriate
 system variables.  (See "System Variables".)  The sun functions
-should be accurate to within about 2 minutes for latitudes lower
+should be accurate to within about 4 minutes for latitudes lower
 than 60 degrees.  The functions are available starting from version
 03.00.07 of \fBRemind\fR.
 .RE
@@ -3475,11 +3480,11 @@ the body in the %"...%" sequence, only that portion is inserted.  For
 example, consider the following:
 .PP
 .nf
-	REM 6 Jan MSG %"David's birthday%" is %b
+	REM 6 Jan MSG %"Dianne's birthday%" is %b
 .fi
 .PP
-In the normal mode, \fBRemind\fR would print "David's birthday is today"
-on 6 January.  However, in the calendar mode, only the text "David's birthday"
+In the normal mode, \fBRemind\fR would print "Dianne's birthday is today"
+on 6 January.  However, in the calendar mode, only the text "Dianne's birthday"
 is inserted into the box for 6 January.
 .PP
 If you explicitly use the %"...%" sequence in a \fBRUN\fR-type reminder,
@@ -4388,7 +4393,7 @@ versions of \fBRemind\fR prior to 03.00.01.
 Remind is now supported by Roaring Penguin Software
 Inc. (http://www.roaringpenguin.com)
 .PP
-David F. Skoll <dfs@roaringpenguin.com> wrote \fBRemind\fR.  The moon code
+Dianne Skoll <dfs@roaringpenguin.com> wrote \fBRemind\fR.  The moon code
 was copied largely unmodified from "moontool" by John Walker.  The
 sunrise and sunset functions use ideas from programs by Michael
 Schwartz and Marc T. Kaufman.  The Hebrew calendar support was taken
--- a/man/tkremind.1
+++ b/man/tkremind.1
@@ -361,9 +361,9 @@ This line is emitted in response to a \fBSTATUS\fR command.  The number
 TkRemind is now supported by Roaring Penguin Software
 Inc. (http://www.roaringpenguin.com)
 .PP
-TkRemind was written by David F. Skoll <dfs@roaringpenguin.com>.
+TkRemind was written by Dianne Skoll <dfs@roaringpenguin.com>.

-\fBTkRemind\fR is Copyright 1996-1998 by David F. Skoll, Copyright
+\fBTkRemind\fR is Copyright 1996-1998 by Dianne Skoll, Copyright
 1999 by Roaring Penguin Software Inc.

 .SH FILES
--- a/scripts/cm2rem.tcl
+++ b/scripts/cm2rem.tcl
@@ -8,7 +8,7 @@
 #   files (version 3 only) to Remind format.
 #
 #   This file is part of REMIND.
-#   Copyright (C) 1992-1998 by David F. Skoll
+#   Copyright (C) 1992-1998 by Dianne Skoll
 #   Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
 #
 #--------------------------------------------------------------
--- a/scripts/tkremind
+++ b/scripts/tkremind
@@ -7,7 +7,7 @@
 #   A cheesy graphical front/back end for Remind using Tcl/Tk
 #
 #   This file is part of REMIND.
-#   Copyright (C) 1992-1998 David F. Skoll
+#   Copyright (C) 1992-1998 Dianne Skoll
 #   Copyright (C) 1999-2010 Roaring Penguin Software Inc.
 #
 #--------------------------------------------------------------
@@ -2319,7 +2319,7 @@ proc main {} {

    global AppendFile HighestTagSoFar DayNames
    catch {
-	puts "\nTkRemind Copyright (C) 1996-1998 David F. Skoll"
+	puts "\nTkRemind Copyright (C) 1996-1998 Dianne Skoll"
 	puts "Copyright (C) 1999-2010 Roaring Penguin Software Inc."
    }
    catch { SetFonts }
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -41,7 +41,7 @@ test: remind
 	@sh ../tests/test-rem

 .c.o:
-	@CC@ -c @CFLAGS@ @DEFS@ $(CEXTRA) $(LANGDEF) -I. -I$(srcdir) $<
+	@CC@ -c @CPPFLAGS@ @CFLAGS@ @DEFS@ $(CEXTRA) $(LANGDEF) -I. -I$(srcdir) $<

 rem2ps: rem2ps.o dynbuf.o
 	@CC@ @LDFLAGS@ $(LDEXTRA) -o rem2ps rem2ps.o dynbuf.o
@@ -80,13 +80,13 @@ depend:
 # Build a tar file based on all files checked into git.
 distro:
 	ln -s . ../remind-$(VERSION)
-	(cd ..; git ls-files -x .gitignore) | sed -e 's/^/remind-$(VERSION)\//' | xargs tar -C .. -cvf remind-$(VERSION).tar
+	(cd ..; git ls-files | fgrep -v .gitignore | fgrep -v remind.php) | sed -e 's/^/remind-$(VERSION)\//' | xargs tar -C .. -cvf remind-$(VERSION).tar
 	gzip -f -v -9 remind-$(VERSION).tar
 	rm -f ../remind-$(VERSION)

 beta-tgz:
 	ln -s . ../remind-$(VERSION)-BETA-$(BETA)
-	(cd ..; git ls-files -x .gitignore) | sed -e 's/^/remind-$(VERSION)-BETA-$(BETA)\//' | xargs tar -C .. -cvf remind-$(VERSION)-BETA-$(BETA).tar
+	(cd ..; git ls-files | fgrep -v .gitignore | fgrep -v remind.php) | sed -e 's/^/remind-$(VERSION)-BETA-$(BETA)\//' | xargs tar -C .. -cvf remind-$(VERSION)-BETA-$(BETA).tar
 	gzip -f -v -9 remind-$(VERSION)-BETA-$(BETA).tar
 	rm -f ../remind-$(VERSION)-BETA-$(BETA)

--- a/src/calendar.c
+++ b/src/calendar.c
@@ -5,7 +5,7 @@
 /*  The code for generating a calendar.                        */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/custom.h
+++ b/src/custom.h
@@ -6,7 +6,7 @@
 /*  which you can customize.                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
@@ -178,7 +178,7 @@
 /*---------------------------------------------------------------------*/
 /* How many attempts to resolve a weird date spec?                     */
 /*---------------------------------------------------------------------*/
-#define TRIG_ATTEMPTS 50
+#define TRIG_ATTEMPTS 500

 /*---------------------------------------------------------------------*/
 /* How many global omits of the form YYYY MM DD do we handle?          */
--- a/src/custom.h.in
+++ b/src/custom.h.in
@@ -6,7 +6,7 @@
 /*  which you can customize.                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
@@ -178,7 +178,7 @@
 /*---------------------------------------------------------------------*/
 /* How many attempts to resolve a weird date spec?                     */
 /*---------------------------------------------------------------------*/
-#define TRIG_ATTEMPTS 50
+#define TRIG_ATTEMPTS 500

 /*---------------------------------------------------------------------*/
 /* How many global omits of the form YYYY MM DD do we handle?          */
--- a/src/dorem.c
+++ b/src/dorem.c
@@ -7,7 +7,7 @@
 /*  commands.                                                  */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
@@ -447,16 +447,19 @@ static int ParseTimeTrig(ParsePtr s, TimeTrig *tim, int save_in_globals)
 	switch(tok.type) {
 	case T_Time:
 	    DBufFree(&buf);
+	    if (tim->ttime != NO_TIME) return E_TIME_TWICE;
 	    tim->ttime = tok.val;
 	    break;

 	case T_Delta:
 	    DBufFree(&buf);
+	    if (tim->delta != NO_DELTA) return E_DELTA_TWICE;
 	    tim->delta = (tok.val > 0) ? tok.val : -tok.val;
 	    break;

 	case T_Rep:
 	    DBufFree(&buf);
+	    if (tim->rep != NO_REP) return E_REP_TWICE;
 	    tim->rep = tok.val;
 	    break;

@@ -751,10 +754,10 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	DBufFree(&buf);
    }

-/* If it's NextMode, process as a CAL-type entry, and issue simple-calendar
-   format. */
+/* If it's NextMode, process as a ADVANCE_MODE-type entry, and issue
+   simple-calendar format. */
    if (NextMode) {
-	if ( (r=DoSubst(p, &buf, t, tim, jul, CAL_MODE)) ) return r;
+	if ( (r=DoSubst(p, &buf, t, tim, jul, ADVANCE_MODE)) ) return r;
 	if (!DBufLen(&buf)) {
 	    DBufFree(&buf);
 	    DBufFree(&pre_buf);
@@ -924,7 +927,17 @@ int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int jul, int *err)

    /* Don't trigger timed reminders if DontIssueAts is true, and if the
       reminder is for today */
-    if (jul == JulianToday && DontIssueAts && tim->ttime != NO_TIME) return 0;
+    if (jul == JulianToday && DontIssueAts && tim->ttime != NO_TIME) {
+	if (DontIssueAts > 1) {
+	    /* If two or more -a options, then *DO* issue ats that are in the
+	       future */
+	    if (tim->ttime < SystemTime(0) / 60) {
+		return 0;
+	    }
+	} else {
+	    return 0;
+	}
+    }

    /* Don't trigger "old" timed reminders */
 /*** REMOVED...
--- a/src/dosubst.c
+++ b/src/dosubst.c
@@ -6,7 +6,7 @@
 /*  reminders are triggered.                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
@@ -62,6 +62,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
    char *os;
    char s[256];
    int origLen = DBufLen(dbuf);
+    int altmode;

    FromJulian(jul, &y, &m, &d);

@@ -141,6 +142,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    if (DBufPutc(dbuf, c) != OK) return E_NO_MEM;
 	    continue;
 	}
+	altmode = 0;
 	s[0] = 0;
 	c = ParseChar(p, &err, 0);
 	if (err) {
@@ -150,6 +152,17 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	if (!c) {
 	    break;
 	}
+	if (c == '*') {
+	    altmode = c;
+	    c = ParseChar(p, &err, 0);
+	    if (err) {
+		DBufFree(dbuf);
+		return err;
+	    }
+	    if (!c) {
+		break;
+	    }
+	}
 	done = 0;
 	if (diff <= 1) {
 	    switch(UPPER(c)) {
@@ -206,8 +219,13 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_A_OVER
 	    L_A_OVER
 #else
-	    sprintf(s, "%s %s, %d %s, %d", L_ON, DayName[jul%7], d,
-		    MonthName[m], y);
+	    if (altmode == '*') {
+		sprintf(s, "%s, %d %s, %d", DayName[jul%7], d,
+			MonthName[m], y);
+	    } else {
+		sprintf(s, "%s %s, %d %s, %d", L_ON, DayName[jul%7], d,
+			MonthName[m], y);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -225,7 +243,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_C_OVER
 	    L_C_OVER
 #else
-	    sprintf(s, "%s %s", L_ON, DayName[jul%7]);
+	    if (altmode == '*') {
+		sprintf(s, "%s", DayName[jul%7]);
+	    } else {
+		sprintf(s, "%s %s", L_ON, DayName[jul%7]);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -243,8 +265,13 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_E_OVER
 	    L_E_OVER
 #else
-	    sprintf(s, "%s %02d%c%02d%c%04d", L_ON, d, DateSep,
-		    m+1, DateSep, y);
+	    if (altmode == '*') {
+		sprintf(s, "%02d%c%02d%c%04d", d, DateSep,
+			m+1, DateSep, y);
+	    } else {
+		sprintf(s, "%s %02d%c%02d%c%04d", L_ON, d, DateSep,
+			m+1, DateSep, y);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -253,7 +280,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_F_OVER
 	    L_F_OVER
 #else
-	    sprintf(s, "%s %02d%c%02d%c%04d", L_ON, m+1, DateSep, d, DateSep, y);
+	    if (altmode == '*') {
+		sprintf(s, "%02d%c%02d%c%04d", m+1, DateSep, d, DateSep, y);
+	    } else {
+		sprintf(s, "%s %02d%c%02d%c%04d", L_ON, m+1, DateSep, d, DateSep, y);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -262,7 +293,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_G_OVER
 	    L_G_OVER
 #else
-	    sprintf(s, "%s %s, %d %s", L_ON, DayName[jul%7], d, MonthName[m]);
+	    if (altmode == '*') {
+		sprintf(s, "%s, %d %s", DayName[jul%7], d, MonthName[m]);
+	    } else {
+		sprintf(s, "%s %s, %d %s", L_ON, DayName[jul%7], d, MonthName[m]);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -271,7 +306,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_H_OVER
 	    L_H_OVER
 #else
-	    sprintf(s, "%s %02d%c%02d", L_ON, d, DateSep, m+1);
+	    if (altmode == '*') {
+		sprintf(s, "%02d%c%02d", d, DateSep, m+1);
+	    } else {
+		sprintf(s, "%s %02d%c%02d", L_ON, d, DateSep, m+1);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -280,7 +319,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_I_OVER
 	    L_I_OVER
 #else
-	    sprintf(s, "%s %02d%c%02d", L_ON, m+1, DateSep, d);
+	    if (altmode == '*') {
+		sprintf(s, "%02d%c%02d", m+1, DateSep, d);
+	    } else {
+		sprintf(s, "%s %02d%c%02d", L_ON, m+1, DateSep, d);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -289,8 +332,13 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_J_OVER
 	    L_J_OVER
 #else
-	    sprintf(s, "%s %s, %s %d%s, %d", L_ON, DayName[jul%7],
-		    MonthName[m], d, plu, y);
+	    if (altmode == '*') {
+		sprintf(s, "%s, %s %d%s, %d", DayName[jul%7],
+			MonthName[m], d, plu, y);
+	    } else {
+		sprintf(s, "%s %s, %s %d%s, %d", L_ON, DayName[jul%7],
+			MonthName[m], d, plu, y);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -299,8 +347,13 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_K_OVER
 	    L_K_OVER
 #else
-	    sprintf(s, "%s %s, %s %d%s", L_ON, DayName[jul%7],
-		    MonthName[m], d, plu);
+	    if (altmode == '*') {
+		sprintf(s, "%s, %s %d%s", DayName[jul%7],
+			MonthName[m], d, plu);
+	    } else {
+		sprintf(s, "%s %s, %s %d%s", L_ON, DayName[jul%7],
+			MonthName[m], d, plu);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -309,7 +362,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_L_OVER
 	    L_L_OVER
 #else
-	    sprintf(s, "%s %04d%c%02d%c%02d", L_ON, y, DateSep, m+1, DateSep, d);
+	    if (altmode == '*') {
+		sprintf(s, "%04d%c%02d%c%02d", y, DateSep, m+1, DateSep, d);
+	    } else {
+		sprintf(s, "%s %04d%c%02d%c%02d", L_ON, y, DateSep, m+1, DateSep, d);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -391,8 +448,13 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_U_OVER
 	    L_U_OVER
 #else
-	    sprintf(s, "%s %s, %d%s %s, %d", L_ON, DayName[jul%7], d,
-		    plu, MonthName[m], y);
+	    if (altmode == '*') {
+		sprintf(s, "%s, %d%s %s, %d", DayName[jul%7], d,
+			plu, MonthName[m], y);
+	    } else {
+		sprintf(s, "%s %s, %d%s %s, %d", L_ON, DayName[jul%7], d,
+			plu, MonthName[m], y);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -401,8 +463,13 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_V_OVER
 	    L_V_OVER
 #else
-	    sprintf(s, "%s %s, %d%s %s", L_ON, DayName[jul%7], d, plu,
-		    MonthName[m]);
+	    if (altmode == '*') {
+		sprintf(s, "%s, %d%s %s", DayName[jul%7], d, plu,
+			MonthName[m]);
+	    } else {
+		sprintf(s, "%s %s, %d%s %s", L_ON, DayName[jul%7], d, plu,
+			MonthName[m]);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -464,7 +531,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_2_OVER
 	    L_2_OVER
 #else
-	    sprintf(s, "%s %d%c%02d%s", L_AT, hh, TimeSep, min, pm);
+	    if (altmode == '*') {
+		sprintf(s, "%d%c%02d%s", hh, TimeSep, min, pm);
+	    } else {
+		sprintf(s, "%s %d%c%02d%s", L_AT, hh, TimeSep, min, pm);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -474,7 +545,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    L_3_OVER
 #else

-	    sprintf(s, "%s %02d%c%02d", L_AT, h, TimeSep, min);
+	    if (altmode == '*') {
+		sprintf(s, "%02d%c%02d", h, TimeSep, min);
+	    } else {
+		sprintf(s, "%s %02d%c%02d", L_AT, h, TimeSep, min);
+	    }
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -590,8 +665,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    if (DBufPutc(dbuf, c) != OK) return E_NO_MEM;
 	}
 	if (isupper(c)) {
-	    os = DBufValue(dbuf) - strlen(s);
-	    *os = UPPER(*os);
+	    os = DBufValue(dbuf);
+	    os += strlen(os) - strlen(s);
+	    if (os >= DBufValue(dbuf)) {
+		*os = UPPER(*os);
+	    }
 	}
    }

--- a/src/dynbuf.c
+++ b/src/dynbuf.c
@@ -6,7 +6,7 @@
 /*  buffers.                                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/dynbuf.h
+++ b/src/dynbuf.h
@@ -5,7 +5,7 @@
 /*  Declaration of functions for manipulating dynamic buffers  */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/err.h
+++ b/src/err.h
@@ -5,7 +5,7 @@
 /*  Error definitions.                                         */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
@@ -119,7 +119,7 @@
 #define E_CANT_CONVERT_TZ    99
 #define E_NO_MATCHING_REMS  100
 #define E_STRING_TOO_LONG   101
-
+#define E_TIME_TWICE        102
 #ifdef MK_GLOBALS
 #undef EXTERN
 #define EXTERN
@@ -234,7 +234,8 @@ EXTERN char *ErrMsg[]
    "Bad function in WARN clause",
    "Can't convert between time zones",
    "No files matching *.rem",
-    "String too long"
+    "String too long",
+    "Time specified twice"
 }
 #endif /* MK_GLOBALS */
 ;
--- a/src/expr.c
+++ b/src/expr.c
@@ -5,7 +5,7 @@
 /*  This file contains routines to parse and evaluate          */
 /*  expressions.                                               */
 /*                                                             */
-/*  Copyright 1992-1998 by David F. Skoll                      */
+/*  Copyright 1992-1998 by Dianne Skoll                        */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/expr.h
+++ b/src/expr.h
@@ -5,7 +5,7 @@
 /*  Contains a few definitions used by expression evaluator.   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/files.c
+++ b/src/files.c
@@ -7,7 +7,7 @@
 /*  files.                                                     */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
@@ -181,6 +181,8 @@ int ReadLine(void)
 static int ReadLineFromFile(void)
 {
    int l;
+    char copy_buffer[4096];
+    size_t n;

    DynamicBuffer buf;

@@ -234,8 +236,25 @@ static int ReadLineFromFile(void)
 	    DBufFree(&LineBuffer);
 	    return E_NO_MEM;
 	}
-	FreshLine = 1;
+	DBufFree(&buf);
+
+	/* If the line is: __EOF__ treat it as end-of-file */
 	CurLine = DBufValue(&LineBuffer);
+	if (!strcmp(CurLine, "__EOF__")) {
+	    if (PurgeMode && PurgeFP) {
+		PurgeEchoLine("%s\n", "__EOF__");
+		while ((n = fread(copy_buffer, 1, sizeof(copy_buffer), fp)) != 0) {
+		    fwrite(copy_buffer, 1, n, PurgeFP);
+		}
+		if (PurgeFP != stdout) fclose(PurgeFP);
+		PurgeFP = NULL;
+	    }
+	    FCLOSE(fp);
+	    DBufFree(&LineBuffer);
+	    CurLine = DBufValue(&LineBuffer);
+	}
+
+	FreshLine = 1;
 	if (DebugFlag & DB_ECHO_LINE) OutputLine(ErrFp);
 	return OK;
    }
--- a/src/funcs.c
+++ b/src/funcs.c
@@ -6,7 +6,7 @@
 /*  expressions.                                               */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
@@ -1791,7 +1791,7 @@ static int FEasterdate(func_info *info)
 /*                                                             */
 /*  FIsdst and FMinsfromutc                                    */
 /*                                                             */
-/*  Check whether daylight savings time is in effect, and      */
+/*  Check whether daylight saving time is in effect, and      */
 /*  get minutes from UTC.                                      */
 /*                                                             */
 /***************************************************************/
@@ -1854,12 +1854,10 @@ static int FTimeStuff(int wantmins, func_info *info)

 static int SunStuff(int rise, double cosz, int jul)
 {
-    int year, mon, day;
-    int jan0;
    int mins, hours;
-    int dusk_or_dawn;
+    int year, mon, day;

-    double M, L, tanA, sinDelta, cosDelta, a, a_hr, cosH, t, H, T;
+    double M, L, sinDelta, cosDelta, a, a_hr, cosH, t, H, T;
    double latitude, longdeg, UT, local;

 /* Get offset from UTC */
@@ -1879,47 +1877,39 @@ static int SunStuff(int rise, double cosz, int jul)


    FromJulian(jul, &year, &mon, &day);
-    jan0 = jul - Julian(year, 0, 1);

-    dusk_or_dawn = rise;
    if (rise > 1)
 	rise -= 2;
-/* Following formula on page B6 exactly... */
-    t = (double) jan0;
-    if (rise) t += (6.0 + longdeg/15.0) / 24.0;
-    else      t += (18.0 + longdeg/15.0) / 24.0;

-/* Mean anomaly of sun for 1978 ... how accurate for other years??? */
-    M = 0.985600 * t - 3.251;  /* In degrees */
+/* Following formula on page B6 exactly... */
+    t = (double) jul;
+    if (rise) {
+	t += (6.0 + longdeg/15.0) / 24.0;
+    } else {
+	t += (18.0 + longdeg/15.0) / 24.0;
+    }
+
+/* Mean anomaly of sun starting from 1 Jan 1990 */
+/* NOTE: This assumes that BASE = 1990!!! */
+#if BASE != 1990
+#error Sun calculations assume a BASE of 1990!
+#endif
+    t = 0.9856002585 * t;
+    M = t + 357.828757; /* In degrees */
+
+    /* Make sure M is in the range [0, 360) */
+    M -= (floor(M/360.0) * 360.0);

 /* Sun's true longitude */
-    L = M + 1.916*sin(DEGRAD*M) + 0.02*sin(2*DEGRAD*M) + 282.565;
-    if (dusk_or_dawn == 2) {/* dusk */
-	L += 6;
-    } else if (dusk_or_dawn == 3) {/* dawn */
-	L -= 6;
-    }
+    L = M + 1.916*sin(DEGRAD*M) + 0.02*sin(2*DEGRAD*M) + 283.07080214;
    if (L > 360.0) L -= 360.0;

 /* Tan of sun's right ascension */
-    tanA = 0.91746 * tan(DEGRAD*L);
-    a = RADDEG * atan(tanA);
-
-/* Move a into same quadrant as L */
-    if (0.0 <= L && L < 90.0) {
-	if (a < 0.0) a += 180.0;
-    } else if (90.0 <= L && L < 180.0) {
-	a += 180.0;
-    } else if (180.0 <= L && L < 270.0) {
-	a += 180.0;
-    } else {
-	if (a > 0.0) a += 180.0;
+    a = RADDEG * atan2(0.91746*sin(DEGRAD*L), cos(DEGRAD*L));
+    if (a<0) {
+	a += 360.0;
    }
-/*   if (fabs(a - L) > 90.0)
-     a += 180.0; */
-    
-    if (a > 360.0)
-	a -= 360.0;
+
    a_hr = a / 15.0;

 /* Sine of sun's declination */
@@ -1941,7 +1931,9 @@ static int SunStuff(int rise, double cosz, int jul)
    H = RADDEG * acos(cosH);
    if (rise) H = 360.0 - H;

-    T = H / 15.0 + a_hr - 0.065710*t - 6.620;
+    t -= 360.0*floor(t/360.0);
+    T = (H-t) / 15.0 + a_hr - 6.726637276;
+
    if (T >= 24.0) T -= 24.0;
    else if (T < 0.0) T+= 24.0;
    
@@ -1952,6 +1944,9 @@ static int SunStuff(int rise, double cosz, int jul)
    if (local < 0.0) local += 24.0;
    else if (local >= 24.0) local -= 24.0;

+    /* Round off local time to nearest minute */
+    local = floor(local * 60.0 + 0.5) / 60.0;
+
    hours = (int) local;
    mins = (int) ((local - hours) * 60.0);
    
@@ -1975,9 +1970,13 @@ static int SunStuff(int rise, double cosz, int jul)
 static int FSun(int rise, func_info *info)
 {
    int jul = JulianToday;
-    static double cosz = -0.014543897;  /* for sunrise and sunset */
+    double cosz = -0.014543897;  /* for sunrise and sunset */
    int r;

+    /* Civil twilight: cos(96 degrees) */
+    if (rise == 2 || rise == 3) {
+	cosz = -0.104528463268;
+    }
    if (Nargs >= 1) {
 	if (!HASDATE(ARG(0))) return E_BAD_TYPE;
 	jul = DATEPART(ARG(0));
--- a/src/globals.c
+++ b/src/globals.c
@@ -8,7 +8,7 @@
 /*  globals.h and err.h                                        */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/globals.h
+++ b/src/globals.h
@@ -7,7 +7,7 @@
 /*  MK_GLOBALS.  Also contains useful macro definitions.       */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/hbcal.c
+++ b/src/hbcal.c
@@ -5,7 +5,7 @@
 /*  Support for the Hebrew calendar                            */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /*  Derived from code written by Amos Shapir in 1978; revised  */
--- a/src/init.c
+++ b/src/init.c
@@ -7,7 +7,7 @@
 /*  in normal mode.                                            */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2011 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
@@ -59,7 +59,7 @@
 *             v = Dump variables at end
 *             l = Display entire line in error messages
 *  -e       = Send messages normally sent to stderr to stdout instead
- *  -z[n]    = Daemon mode waking up every n (def 5) minutes.
+ *  -z[n]    = Daemon mode waking up every n (def 1) minutes.
 *  -bn      = Time format for cal (0, 1, or 2)
 *  -xn      = Max. number of iterations for SATISFY
 *  -uname   = Run as user 'name' - only valid when run by root.  If run
@@ -317,7 +317,7 @@ void InitRemind(int argc, char const *argv[])

 	    case 'a':
 	    case 'A':
-		DontIssueAts = 1;
+		DontIssueAts++;
 		break;

 	    case 'q':
@@ -600,7 +600,7 @@ void InitRemind(int argc, char const *argv[])
 #ifndef L_USAGE_OVERRIDE
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 David F. Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 Dianne Skoll\n", VERSION, L_LANGNAME);
    fprintf(ErrFp, "Copyright 1999-2011 Roaring Penguin Software Inc.\n");
 #ifdef BETA
    fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
@@ -622,7 +622,7 @@ void Usage(void)
    fprintf(ErrFp, " -a     Don't trigger timed reminders immediately - just queue them\n");
    fprintf(ErrFp, " -q     Don't queue timed reminders\n");
    fprintf(ErrFp, " -f     Trigger timed reminders by staying in foreground\n");
-    fprintf(ErrFp, " -z[n]  Enter daemon mode, waking every n (5) minutes.\n");
+    fprintf(ErrFp, " -z[n]  Enter daemon mode, waking every n (1) minutes.\n");
    fprintf(ErrFp, " -d...  Debug: e=echo x=expr-eval t=trig v=dumpvars l=showline f=tracefiles\n");
    fprintf(ErrFp, " -e     Divert messages normally sent to stderr to stdout\n");
    fprintf(ErrFp, " -b[n]  Time format for cal: 0=am/pm, 1=24hr, 2=none\n");
--- a/src/lang.h
+++ b/src/lang.h
@@ -5,14 +5,14 @@
 /*  Header file for language support for various languages.    */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/

 /* I'm chauvinistic and name each language with its English name... */

-#define ENGLISH    0 /* original   by David F. Skoll                   */
+#define ENGLISH    0 /* original   by Dianne Skoll                   */
 #define GERMAN     1 /* translated by Wolfgang Thronicke               */
 #define DUTCH      2 /* translated by Willem Kasdorp and Erik-Jan Vens */
 #define FINNISH    3 /* translated by Mikko Silvonen                   */
--- a/src/langs/danish.h
+++ b/src/langs/danish.h
@@ -6,7 +6,7 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
+/*  REMIND is Copyright (C) 1992-1998 by Dianne Skoll          */
 /*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*  This file is Copyright (C) 1993 by Mogens Lynnerup.        */
 /*                                                             */
@@ -100,10 +100,10 @@

 #define L_AMPM_OVERRIDE(ampm, hour)	ampm = (hour < 12) ? (hour<5) ? " om natten" : " om formiddagen" : (hour > 17) ? " om aftenen" : " om eftermiddagen";
 #define L_ORDINAL_OVERRIDE		plu = ".";
-#define L_A_OVER                        sprintf(s, "%s %s, den %d. %s %d", L_ON, DayName[jul%7], d, MonthName[m], y);
+#define L_A_OVER                        if (altmode == '*') { sprintf(s, "%s, den %d. %s %d", DayName[jul%7], d, MonthName[m], y); } else { sprintf(s, "%s %s, den %d. %s %d", L_ON, DayName[jul%7], d, MonthName[m], y); }
 #define L_E_OVER                        sprintf(s, "den %02d%c%02d%c%04d", d, DateSep, m+1, DateSep, y);
 #define L_F_OVER                        sprintf(s, "den %02d%c%02d%c%04d", m+1, DateSep, d, DateSep, y);
-#define	L_G_OVER			sprintf(s, "%s %s, den %d. %s", L_ON, DayName[jul%7], d, MonthName[m]);
+#define	L_G_OVER			if (altmode == '*') { sprintf(s, "%s, den %d. %s", DayName[jul%7], d, MonthName[m]); } else { sprintf(s, "%s %s, den %d. %s", L_ON, DayName[jul%7], d, MonthName[m]); }
 #define L_H_OVER                        sprintf(s, "den %02d%c%02d", d, DateSep, m+1);
 #define L_I_OVER                        sprintf(s, "den %02d%c%02d", m+1, DateSep, d);
 #define L_U_OVER			L_A_OVER
--- a/src/langs/dutch.h
+++ b/src/langs/dutch.h
@@ -6,12 +6,12 @@
 /*                                                             */
 /*  Author: Willem Kasdorp                                     */
 /*                                                             */
-/*  Modified slightly by David Skoll                           */
+/*  Modified slightly by Dianne Skoll                          */
 /*                                                             */
 /*  Further corrections by Erik-Jan Vens                       */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
--- a/src/langs/english.h
+++ b/src/langs/english.h
@@ -5,7 +5,7 @@
 /*  Support for the English language.                          */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
--- a/src/langs/finnish.h
+++ b/src/langs/finnish.h
@@ -11,7 +11,7 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  This file is Copyright (C) 1993-1998 by Mikko Silvonen.    */
-/*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
+/*  REMIND is Copyright (C) 1992-1998 by Dianne Skoll          */
 /*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
@@ -161,26 +161,19 @@
       } \
 }
 #endif
-#define L_A_OVER sprintf(s, "%s%s %d. %s%s %d", DayName[jul%7], L_ON, d, \
-			 MonthName[m], L_PARTIT, y);
-#define L_C_OVER sprintf(s, "%s%s", DayName[jul%7], L_ON);
-#define L_E_OVER sprintf(s, "%02d%c%02d%c%04d", d, DateSep, m+1, DateSep, \
-			 y);
+#define L_A_OVER if (altmode == '*') { sprintf(s, "%s %d. %s %d", DayName[jul%7], d, MonthName[m], y); } else { sprintf(s, "%s%s %d. %s%s %d", DayName[jul%7], L_ON, d, MonthName[m], L_PARTIT, y); }
+#define L_C_OVER if (altmode == '*') { sprintf(s, "%s", DayName[jul%7]); } else { sprintf(s, "%s%s", DayName[jul%7], L_ON); }
+#define L_E_OVER sprintf(s, "%02d%c%02d%c%04d", d, DateSep, m+1, DateSep, y);
 #define L_F_OVER sprintf(s, "%02d%c%02d%c%04d", m+1, DateSep, d, DateSep, y);
-#define L_G_OVER sprintf(s, "%s%s %d. %s%s", DayName[jul%7], L_ON, d, \
-			 MonthName[m], L_PARTIT);
+#define L_G_OVER if (altmode == '*') { sprintf(s, "%s %d. %s", DayName[jul%7], d, MonthName[m]); } else { sprintf(s, "%s%s %d. %s%s", DayName[jul%7], L_ON, d, MonthName[m], L_PARTIT); }
 #define L_H_OVER sprintf(s, "%02d%c%02d", d, DateSep, m+1);
 #define L_I_OVER sprintf(s, "%02d%c%02d", m+1, DateSep, d);
-#define L_J_OVER sprintf(s, "%s%s %sn %d%s %d", DayName[jul%7], L_ON, \
-			 MonthName[m], d, plu, y);
-#define L_K_OVER sprintf(s, "%s%s %sn %d%s", DayName[jul%7], L_ON, \
-			 MonthName[m], d, plu);
+#define L_J_OVER if (altmode == '*') { sprintf(s, "%s %sn %d%s %d", DayName[jul%7], MonthName[m], d, plu, y); } else { sprintf(s, "%s%s %sn %d%s %d", DayName[jul%7], L_ON, MonthName[m], d, plu, y); }
+#define L_K_OVER if (altmode == '*') { sprintf(s, "%s %sn %d%s", DayName[jul%7], MonthName[m], d, plu); } else { sprintf(s, "%s%s %sn %d%s", DayName[jul%7], L_ON, MonthName[m], d, plu); }
 #define L_L_OVER sprintf(s, "%04d%c%02d%c%02d", y, DateSep, m+1, DateSep, d);
 #define L_Q_OVER sprintf(s, "n");
-#define L_U_OVER sprintf(s, "%s%s %d%s %s%s %d", DayName[jul%7], L_ON, \
-			 d, plu, MonthName[m], L_PARTIT, y);
-#define L_V_OVER sprintf(s, "%s%s %d%s %s%s", DayName[jul%7], L_ON, d, \
-			 plu, MonthName[m], L_PARTIT);
+#define L_U_OVER if (altmode == '*') { sprintf(s, "%s %d%s %s %d", DayName[jul%7], d, plu, MonthName[m], y); } else { sprintf(s, "%s%s %d%s %s%s %d", DayName[jul%7], L_ON, d, plu, MonthName[m], L_PARTIT, y); }
+#define L_V_OVER if (altmode == '*') { sprintf(s, "%s %d%s %s", DayName[jul%7], d, plu, MonthName[m]); } else { sprintf(s, "%s%s %d%s %s%s", DayName[jul%7], L_ON, d, plu, MonthName[m], L_PARTIT); }
 #define L_1_OVER \
 if (tdiff == 0) \
  sprintf(s, "%s", L_NOW); \
@@ -309,7 +302,8 @@ EXTERN char *ErrMsg[] =
    "Virheellinen funktio WARN-lausekkeessa",
    "Can't convert between time zones",
    "No files matching *.rem",
-    "String too long"
+    "String too long",
+    "Time specified twice"

 #elif IBMEXTENDED
    "Ok",
@@ -413,7 +407,8 @@ EXTERN char *ErrMsg[] =
    "Virheellinen funktio WARN-lausekkeessa",
    "Can't convert between time zones",
    "No files matching *.rem",
-    "String too long"
+    "String too long",
+    "Time specified twice"

 #else
    "Ok",
@@ -517,7 +512,8 @@ EXTERN char *ErrMsg[] =
    "Virheellinen funktio WARN-lausekkeessa",
    "Can't convert between time zones",
    "No files matching *.rem",
-    "String too long"
+    "String too long",
+    "Time specified twice"


 #endif
@@ -529,7 +525,7 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 David F. Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 Dianne Skoll\n", VERSION, L_LANGNAME);
    fprintf(ErrFp, "Copyright 1999-2000 Roaring Penguin Software Inc.\n");
 #ifdef BETA
    fprintf(ErrFp, ">>>> BETAVERSIO <<<<\n");
--- a/src/langs/french.h
+++ b/src/langs/french.h
@@ -8,10 +8,10 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
+/*  REMIND is Copyright (C) 1992-1998 by Dianne Skoll          */
 /*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*  This file is Copyright (C) 1993 by Laurent Duperval and    */
-/*  David F. Skoll.                                            */
+/*  Dianne Skoll.                                              */
 /*                                                             */
 /***************************************************************/

@@ -129,13 +129,9 @@ else if (tdiff < 0) { \
      sprintf(s, "dans %d heure%s et %d minute%s", hdiff, hplu, mdiff, mplu); \
 }

-#define L_J_OVER \
-sprintf(s, "%s %s, %d%s %s, %d", L_ON, DayName[jul%7], \
-	d, plu, MonthName[m], y);
+#define L_J_OVER if (altmode == '*') { sprintf(s, "%s, %d%s %s, %d", DayName[jul%7], d, plu, MonthName[m], y); } else { sprintf(s, "%s %s, %d%s %s, %d", L_ON, DayName[jul%7], d, plu, MonthName[m], y); }

-#define L_K_OVER \
-sprintf(s, "%s %s, %d%s %s", L_ON, DayName[jul%7], \
-	d, plu, MonthName[m]);
+#define L_K_OVER if (altmode == '*') { sprintf(s, "%s, %d%s %s", DayName[jul%7], d, plu, MonthName[m]); } else { sprintf(s, "%s %s, %d%s %s", L_ON, DayName[jul%7], d, plu, MonthName[m]); }

 #endif /* L_IN_DOSUBST */

@@ -246,7 +242,8 @@ EXTERN char *ErrMsg[] =
    "Fonction ill\351gale apr\350s WARN",
    "Can't convert between time zones",
    "No files matching *.rem",
-    "String too long"
+    "String too long",
+    "Time specified twice"

 #else /* ISOLATIN1 */
    "Ok",
@@ -350,7 +347,8 @@ EXTERN char *ErrMsg[] =
    "Fonction illegale apres WARN",
    "Can't convert between time zones",
    "No files matching *.rem",
-    "String too long"
+    "String too long",
+    "Time specified twice"
 #endif /* ISOLATIN1 */
 };
 #endif /* MK_GLOBALS */
@@ -360,7 +358,7 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 David F. Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 Dianne Skoll\n", VERSION, L_LANGNAME);
    fprintf(ErrFp, "Copyright 1999-2000 Roaring Penguin Software Inc.\n");
 #ifdef BETA
    fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
--- a/src/langs/german.h
+++ b/src/langs/german.h
@@ -9,7 +9,7 @@
 /*  I don't speak German.                                      */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
@@ -93,8 +93,8 @@
   See the file dosubst.c for more info. */
 #define L_AMPM_OVERRIDE(ampm, hour)	ampm = (hour < 12) ? (hour<5) ? " nachts" : " vormittags" : (hour > 17) ? " abends" : " nachmittags";
 #define L_ORDINAL_OVERRIDE		plu = ".";
-#define L_A_OVER			sprintf(s, "%s %s, den %d. %s %d", L_ON, DayName[jul%7], d, MonthName[m], y);
-#define	L_G_OVER			sprintf(s, "%s %s, den %d. %s", L_ON, DayName[jul%7], d, MonthName[m]);
+#define L_A_OVER			if (altmode == '*') { sprintf(s, "%s, den %d. %s %d", DayName[jul%7], d, MonthName[m], y); } else { sprintf(s, "%s %s, den %d. %s %d", L_ON, DayName[jul%7], d, MonthName[m], y); }
+#define	L_G_OVER			if (altmode == '*') { sprintf(s, "%s, den %d. %s", DayName[jul%7], d, MonthName[m]); } else { sprintf(s, "%s %s, den %d. %s", L_ON, DayName[jul%7], d, MonthName[m]); }
 #define L_U_OVER			L_A_OVER
 #define L_V_OVER			L_G_OVER

--- a/src/langs/icelandic.h
+++ b/src/langs/icelandic.h
@@ -5,7 +5,7 @@
 /*  Support for the Icelandic language.                        */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*  Translated by Björn Davíðsson (bjossi@snerpa.is)           */
 /*                                                             */
--- a/src/langs/italian.h
+++ b/src/langs/italian.h
@@ -7,7 +7,7 @@
 /*  This file is part of REMIND.                               */
 /*  It is Copyright (C) 1996 by Valerio Aimale                 */
 /*                                                             */
-/*  Remind is copyright (C) 1992-1998 by David F. Skoll        */
+/*  Remind is copyright (C) 1992-1998 by Dianne Skoll          */
 /*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
--- a/src/langs/norwgian.h
+++ b/src/langs/norwgian.h
@@ -6,7 +6,7 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  This file is Copyright (C) 1993 by Trygve Randen.          */
-/*  Remind is Copyright (C) 1992-1998 by David F. Skoll        */
+/*  Remind is Copyright (C) 1992-1998 by Dianne Skoll          */
 /*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
@@ -101,8 +101,8 @@
 /* Define any overrides here, such as L_ORDINAL_OVERRIDE, L_A_OVER, etc.
   See the file dosubst.c for more info. */
 #define L_ORDINAL_OVERRIDE              plu = ".";
-#define L_A_OVER                        sprintf(s, "%s %s, den %d. %s %d", L_ON, DayName[jul%7], d, MonthName[m], y);
-#define L_G_OVER                        sprintf(s, "%s %s, den %d. %s", L_ON, DayName[jul%7], d, MonthName[m]);
+#define L_A_OVER                        if (altmode == '*') { sprintf(s, "%s, den %d. %s %d", DayName[jul%7], d, MonthName[m], y); } else { sprintf(s, "%s %s, den %d. %s %d", L_ON, DayName[jul%7], d, MonthName[m], y); }
+#define L_G_OVER                        if (altmode == '*') { sprintf(s, "%s, den %d. %s", DayName[jul%7], d, MonthName[m]); } else { sprintf(s, "%s %s, den %d. %s", L_ON, DayName[jul%7], d, MonthName[m]); }
 #define L_U_OVER                        L_A_OVER
 #define L_V_OVER                        L_G_OVER

--- a/src/langs/polish.h
+++ b/src/langs/polish.h
@@ -9,7 +9,7 @@
 /*  Polish.                                                    */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
@@ -141,8 +141,8 @@ ampm = (hour<12) ? \
 : " w nocy";
 #endif
 #define L_ORDINAL_OVERRIDE		plu = "";
-#define L_A_OVER			sprintf(s, "%s %s, %d. %s %d", L_ON, DayName[jul%7], d, MonthName[m], y);
-#define	L_G_OVER			sprintf(s, "%s %s, %d. %s", L_ON, DayName[jul%7], d, MonthName[m]);
+#define L_A_OVER			if (altmode == '*') { sprintf(s, "%s, %d. %s %d", DayName[jul%7], d, MonthName[m], y); } else { sprintf(s, "%s %s, %d. %s %d", L_ON, DayName[jul%7], d, MonthName[m], y); }
+#define	L_G_OVER			if (altmode == '*') { sprintf(s, "%s, %d. %s", DayName[jul%7], d, MonthName[m]); } else { sprintf(s, "%s %s, %d. %s", L_ON, DayName[jul%7], d, MonthName[m]); }
 #define L_U_OVER			L_A_OVER
 #define L_V_OVER			L_G_OVER

@@ -281,7 +281,8 @@ EXTERN char *ErrMsg[] =
    "Illegal function in WARN clause (NEEDS TRANSLATION TO POLISH)",
    "Can't convert between time zones",
    "No files matching *.rem",
-    "String too long"
+    "String too long",
+    "Time specified twice"
 #else /* ISOLATIN1 */
    "OK",
    "Brakujacy ']'",
@@ -384,7 +385,8 @@ EXTERN char *ErrMsg[] =
    "Illegal function in WARN clause (NEEDS TRANSLATION TO POLISH)",
    "Can't convert between time zones",
    "No files matching *.rem",
-    "String too long"
+    "String too long",
+    "Time specified twice"
 #endif /* ISOLATIN1 */
 };
 #endif /* MK_GLOBALS */
@@ -394,7 +396,7 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 David F. Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 Dianne Skoll\n", VERSION, L_LANGNAME);
    fprintf(ErrFp, "Copyright 1999-2000 Roaring Penguin Software Inc.\n");
 #ifdef BETA
    fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
--- a/src/langs/portbr.h
+++ b/src/langs/portbr.h
@@ -8,10 +8,10 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
+/*  REMIND is Copyright (C) 1992-1998 by Dianne Skoll          */
 /*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*  This file is Copyright (C) 1996 by Marco Paganini and      */
-/*  David F. Skoll.                                            */
+/*  Dianne Skoll.                                              */
 /*                                                             */
 /***************************************************************/

@@ -247,7 +247,8 @@ EXTERN char *ErrMsg[] =
    "Funcao ilegal na clausula WARN",
    "Can't convert between time zones",
    "No files matching *.rem",
-    "String too long"
+    "String too long",
+    "Time specified twice"
 };
 #endif /* MK_GLOBALS */

@@ -256,7 +257,7 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (versao %s) (C) 1992-1998 David F. Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "\nREMIND %s (versao %s) (C) 1992-1998 Dianne Skoll\n", VERSION, L_LANGNAME);
    fprintf(ErrFp, "(C) 1999-2000 Roaring Penguin Software Inc.\n");
 #ifdef BETA
    fprintf(ErrFp, ">>>> VERSAO BETA <<<<\n");
--- a/src/langs/romanian.h
+++ b/src/langs/romanian.h
@@ -1,4 +1,4 @@
-/***************************************************************/
+!/***************************************************************/
 /*                                                             */
 /*  ROMANIAN.H                                                 */
 /*                                                             */
@@ -8,7 +8,7 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
+/*  REMIND is Copyright (C) 1992-1998 by Dianne Skoll          */
 /*       Copyright 1999-2000 by Roaring Penguin Software Inc.  */
 /*  This file is Copyright (C) 1996-1998 by Liviu Daia         */
 /*                                                             */
--- a/src/langs/spanish.h
+++ b/src/langs/spanish.h
@@ -7,7 +7,7 @@
 /*  Author: Rafa Couto <rafacouto@biogate.com>                 */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
@@ -42,7 +42,7 @@
 #define L_JUL "Julio"
 #define L_AUG "Agosto"
 #define L_SEP "Septiembre"
-#define L_OCT "Octuber"
+#define L_OCT "Octubre"
 #define L_NOV "Noviembre"
 #define L_DEC "Diciembre"

--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 /*  routines, etc.                                             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2011 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/md5.c
+++ b/src/md5.c
@@ -141,7 +141,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
    MD5Transform(ctx->buf, (uint32 *) ctx->in);
    byteReverse((unsigned char *) ctx->buf, 4);
    memcpy(digest, ctx->buf, 16);
-    memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
+    memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
 }

 #ifndef ASM_MD5
--- a/src/moon.c
+++ b/src/moon.c
@@ -5,7 +5,7 @@
 /*  Calculations for figuring out moon phases.                 */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/omit.c
+++ b/src/omit.c
@@ -6,7 +6,7 @@
 /*  the data structures for OMITted dates.                     */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
@@ -390,12 +390,12 @@ DoThroughOmit(ParsePtr p, int ystart, int mstart, int dstart)
 {
    int yend = NO_YR, mend = NO_MON, dend = NO_DAY, r;
    int start, end, tmp;
+    int parsing = 1;

    Token tok;

    DynamicBuffer buf;
    DBufInit(&buf);
-    int parsing = 1;

    while(parsing) {
 	if ( (r=ParseToken(p, &buf)) ) return r;
--- a/src/protos.h
+++ b/src/protos.h
@@ -5,7 +5,7 @@
 /*  Function Prototypes.                                       */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/queue.c
+++ b/src/queue.c
@@ -5,7 +5,7 @@
 /*  Queue up reminders for subsequent execution.               */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/rem2ps.c
+++ b/src/rem2ps.c
@@ -5,7 +5,7 @@
 /*  Print a PostScript calendar.                               */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
 	if (!strcmp(DBufValue(&buf), PSBEGIN)) {
 	    if (!validfile) {
 		if (Verbose) {
-		    fprintf(stderr, "Rem2PS: Version %s Copyright 1992-1998 by David F. Skoll\n\n", VERSION);
+		    fprintf(stderr, "Rem2PS: Version %s Copyright 1992-1998 by Dianne Skoll\n\n", VERSION);
 		    fprintf(stderr, "Generating PostScript calendar\n");
 		}
 	    }
@@ -772,7 +772,7 @@ void Init(int argc, char *argv[])
 	case 'o':
 	    if (i == argc) Usage("Offset must be supplied");
 	    offset = atoi(argv[i++]);
-	    if (offset < 36) offset = 36;
+	    if (offset < 0) offset = 0;
 	    if (!*s) Usage("Offset must specify l, r, t or b");
 	    while(*s) {
 		switch(*s++) {
--- a/src/rem2ps.h
+++ b/src/rem2ps.h
@@ -5,7 +5,7 @@
 /*  Define the PostScript prologue                             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
@@ -13,8 +13,8 @@
 char *PSProlog1[] =
 {
    "% This file was produced by Remind and Rem2PS, written by",
-    "% David F. Skoll.",
-    "% Remind and Rem2PS are Copyright 1992-1997 David F. Skoll.",
+    "% Dianne Skoll.",
+    "% Remind and Rem2PS are Copyright 1992-1997 Dianne Skoll.",
    "/ISOLatin1Encoding where { pop save true }{ false } ifelse",
    "  /ISOLatin1Encoding [ StandardEncoding 0 45 getinterval aload pop /minus",
    "    StandardEncoding 46 98 getinterval aload pop /dotlessi /grave /acute",
--- a/src/sort.c
+++ b/src/sort.c
@@ -5,7 +5,7 @@
 /*  Routines for sorting reminders by trigger date             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/test-all-languages.sh
+++ b/src/test-all-languages.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Make sure Remind compiles with all supported languages; show
+# tstlang.rem output for each language.
+
+ALL=`grep ^#define lang.h | grep -v '#define LANG' | awk '{print $2}'`
+
+for i in $ALL ; do
+    make clean all LANGDEF=-DLANG=$i || exit 1
+    ./remind -q -r ../tests/tstlang.rem
+done
+exit 0
--- a/src/token.c
+++ b/src/token.c
@@ -6,7 +6,7 @@
 /*  classifying the tokens parsed.                             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -5,7 +5,7 @@
 /*  Routines for figuring out the trigger date of a reminder   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
@@ -426,7 +426,9 @@ int ComputeTrigger(int today, Trigger *trig, int *err, int save_in_globals)
 	result;

    trig->expired = 0;
-    if (save_in_globals) LastTrigValid = 0;
+    if (save_in_globals) {
+	LastTrigValid = 0;
+    }

 /* Assume everything works */
    *err = OK;
--- a/src/types.h
+++ b/src/types.h
@@ -5,7 +5,7 @@
 /*  Type definitions all dumped here.                          */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/userfns.c
+++ b/src/userfns.c
@@ -6,7 +6,7 @@
 /*  functions.                                                 */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/utils.c
+++ b/src/utils.c
@@ -5,7 +5,7 @@
 /*  Useful utility functions.                                  */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
--- a/src/var.c
+++ b/src/var.c
@@ -6,7 +6,7 @@
 /*  user- and system-defined variables.                        */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
+/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
 /*  Copyright (C) 1999-2007 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
@@ -757,6 +757,10 @@ static void DumpSysVar(char const *name, const SysVar *v)
    if (!v && !name) return;  /* Shouldn't happen... */

    buffer[0]='$'; buffer[1] = 0;
+    if (name && strlen(name) > VAR_NAME_LEN) {
+	fprintf(ErrFp, "$%s: Name too long\n", name);
+	return;
+    }
    if (name) strcat(buffer, name); else strcat(buffer, v->name);
    fprintf(ErrFp, "%*s  ", VAR_NAME_LEN+1, buffer);
    if (v) {
--- a/tests/sun.rem
+++ b/tests/sun.rem
@@ -0,0 +1,13 @@
+SET $LatDeg 45
+SET $LatMin 24
+SET $LatSec 0
+SET $LongDeg 75
+SET $LongMin 39
+SET $LongSec 0
+SET $MinsFromUTC -300
+SET $CalcUTC 0
+
+MSG Dawn: [dawn()]
+MSG Sunrise: [sunrise()]
+MSG Sunset: [sunset()]
+MSG Dusk: [dusk()]
--- a/tests/test-rem
+++ b/tests/test-rem
@@ -7,7 +7,7 @@
 # in the build directory.
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 David F. Skoll        
+# Copyright (C) 1992-1997 Dianne Skoll        
 # Copyright (C) 1999-2000 Roaring Penguin Software Inc.
 # ---------------------------------------------------------------------------

@@ -68,7 +68,7 @@ echo "Sort Test" >> ../tests/test.out
 (echo "REM AT 12:00 MSG Untimed"; echo "REM MSG Timed") | ../src/remind -q -gaaad - 1 Jan 2000 >> ../tests/test.out 2>&1

 echo "Purge Test" >> ../tests/test.out
-../src/remind -j999 ../tests/purge_dir/f1.rem >> ../tests/test.out 2>&1
+../src/remind -j999 ../tests/purge_dir/f1.rem 3 Feb 2012 >> ../tests/test.out 2>&1
 echo "F1" >> ../tests/test.out
 cat ../tests/purge_dir/f1.rem.purged >> ../tests/test.out
 echo "F2" >> ../tests/test.out
@@ -81,6 +81,26 @@ rm -f ../tests/purge_dir/*.rem.purged >> ../tests/test.out 2>&1

 ../src/remind -p ../tests/shade.rem 1 August 2009 | ../src/rem2ps -e -l -c3 >> ../tests/test.out 2>&1

+# The sun tests can fail due to math roundoff error changing the times
+# by a minute...
+# ../src/remind -p12 ../tests/sun.rem 1 Jan 2011 >> ../tests/test.out 2>&1
+
+# Test -a vs -aa
+../src/remind -q -a - 1 Jan 2012 9:00 <<'EOF' >> ../tests/test.out 2>&1
+REM 1 Jan 2012 AT 8:00 MSG 8am: Should not show up
+REM 1 Jan 2012 AT 9:00 MSG 9am: Should not show up
+REM 1 Jan 2012 AT 10:00 MSG 10am: Should not show up
+MSG [$DontTrigAts]
+EOF
+
+../src/remind -q -a -a - 1 Jan 2012 9:00 <<'EOF' >> ../tests/test.out 2>&1
+REM 1 Jan 2012 AT 8:00 MSG 8am: Should not show up
+REM 1 Jan 2012 AT 9:00 MSG 9am: Should show up
+REM 1 Jan 2012 AT 10:00 MSG 10am: Should show up
+MSG [$DontTrigAts]
+EOF
+
+
 cmp -s ../tests/test.out ../tests/test.cmp
 if [ "$?" = "0" ]; then
   echo "Remind:  Acceptance test PASSED"
--- a/tests/test.cmp
+++ b/tests/test.cmp
@@ -12,8 +12,12 @@ Test 1
 REM Wed UNTIL 15 Feb 1991 SATISFY [trigdate() > '1990-01-01'] MSG wookie
 ../tests/test.rem(10): Expired

+# bad AT
+REM AT 0:00 0:01 0:02 MSG foo
+../tests/test.rem(13): Time specified twice
+
 REM MSG Today is [hebday(today())] [hebmon(today())] [hebyear(today())]
-../tests/test.rem(12): Trig = Saturday, 16 February, 1991
+../tests/test.rem(15): Trig = Saturday, 16 February, 1991
 Reminders for Saturday, 16th February, 1991:

 today() => 1991-02-16
@@ -33,7 +37,7 @@ y => "Tishrey"
 hebdate(1, "Tishrey") => 1991-09-09
 trigger(1991-09-09) => "9 September 1991"
 Leaving UserFN _h() => "9 September 1991"
-../tests/test.rem(15): Trig = Monday, 9 September, 1991
+../tests/test.rem(18): Trig = Monday, 9 September, 1991
 [_h(2,  "Tishrey")] MSG Rosh Hashana 2
 Entering UserFN _h(2, "Tishrey")
 x => 2
@@ -41,7 +45,7 @@ y => "Tishrey"
 hebdate(2, "Tishrey") => 1991-09-10
 trigger(1991-09-10) => "10 September 1991"
 Leaving UserFN _h() => "10 September 1991"
-../tests/test.rem(16): Trig = Tuesday, 10 September, 1991
+../tests/test.rem(19): Trig = Tuesday, 10 September, 1991
 [_h(3,  "Tishrey")] MSG Tzom Gedalia
 Entering UserFN _h(3, "Tishrey")
 x => 3
@@ -49,7 +53,7 @@ y => "Tishrey"
 hebdate(3, "Tishrey") => 1991-09-11
 trigger(1991-09-11) => "11 September 1991"
 Leaving UserFN _h() => "11 September 1991"
-../tests/test.rem(17): Trig = Wednesday, 11 September, 1991
+../tests/test.rem(20): Trig = Wednesday, 11 September, 1991
 [_h(10, "Tishrey")] MSG Yom Kippur
 Entering UserFN _h(10, "Tishrey")
 x => 10
@@ -57,7 +61,7 @@ y => "Tishrey"
 hebdate(10, "Tishrey") => 1991-09-18
 trigger(1991-09-18) => "18 September 1991"
 Leaving UserFN _h() => "18 September 1991"
-../tests/test.rem(18): Trig = Wednesday, 18 September, 1991
+../tests/test.rem(21): Trig = Wednesday, 18 September, 1991
 [_h(15, "Tishrey")] MSG Sukkot 1
 Entering UserFN _h(15, "Tishrey")
 x => 15
@@ -65,7 +69,7 @@ y => "Tishrey"
 hebdate(15, "Tishrey") => 1991-09-23
 trigger(1991-09-23) => "23 September 1991"
 Leaving UserFN _h() => "23 September 1991"
-../tests/test.rem(19): Trig = Monday, 23 September, 1991
+../tests/test.rem(22): Trig = Monday, 23 September, 1991
 [_h(25, "Kislev")]  MSG Channuka
 Entering UserFN _h(25, "Kislev")
 x => 25
@@ -73,7 +77,7 @@ y => "Kislev"
 hebdate(25, "Kislev") => 1991-12-02
 trigger(1991-12-02) => "2 December 1991"
 Leaving UserFN _h() => "2 December 1991"
-../tests/test.rem(20): Trig = Monday, 2 December, 1991
+../tests/test.rem(23): Trig = Monday, 2 December, 1991
 [_h(10, "Tevet")]   MSG Asara B'Tevet
 Entering UserFN _h(10, "Tevet")
 x => 10
@@ -81,7 +85,7 @@ y => "Tevet"
 hebdate(10, "Tevet") => 1991-12-17
 trigger(1991-12-17) => "17 December 1991"
 Leaving UserFN _h() => "17 December 1991"
-../tests/test.rem(21): Trig = Tuesday, 17 December, 1991
+../tests/test.rem(24): Trig = Tuesday, 17 December, 1991
 [_h(15, "Shvat")]   MSG Tu B'Shvat
 Entering UserFN _h(15, "Shvat")
 x => 15
@@ -89,7 +93,7 @@ y => "Shvat"
 hebdate(15, "Shvat") => 1992-01-20
 trigger(1992-01-20) => "20 January 1992"
 Leaving UserFN _h() => "20 January 1992"
-../tests/test.rem(22): Trig = Monday, 20 January, 1992
+../tests/test.rem(25): Trig = Monday, 20 January, 1992
 [_h(15, "Adar A")]  MSG Purim Katan
 Entering UserFN _h(15, "Adar A")
 x => 15
@@ -97,7 +101,7 @@ y => "Adar A"
 hebdate(15, "Adar A") => 1992-02-19
 trigger(1992-02-19) => "19 February 1992"
 Leaving UserFN _h() => "19 February 1992"
-../tests/test.rem(23): Trig = Wednesday, 19 February, 1992
+../tests/test.rem(26): Trig = Wednesday, 19 February, 1992
 [_h(14, "Adar")]    MSG Purim
 Entering UserFN _h(14, "Adar")
 x => 14
@@ -105,7 +109,7 @@ y => "Adar"
 hebdate(14, "Adar") => 1991-02-28
 trigger(1991-02-28) => "28 February 1991"
 Leaving UserFN _h() => "28 February 1991"
-../tests/test.rem(24): Trig = Thursday, 28 February, 1991
+../tests/test.rem(27): Trig = Thursday, 28 February, 1991
 [_h(15, "Nisan")]   MSG Pesach
 Entering UserFN _h(15, "Nisan")
 x => 15
@@ -113,7 +117,7 @@ y => "Nisan"
 hebdate(15, "Nisan") => 1991-03-30
 trigger(1991-03-30) => "30 March 1991"
 Leaving UserFN _h() => "30 March 1991"
-../tests/test.rem(25): Trig = Saturday, 30 March, 1991
+../tests/test.rem(28): Trig = Saturday, 30 March, 1991
 [_h(27, "Nisan")]   MSG Yom HaShoah
 Entering UserFN _h(27, "Nisan")
 x => 27
@@ -121,7 +125,7 @@ y => "Nisan"
 hebdate(27, "Nisan") => 1991-04-11
 trigger(1991-04-11) => "11 April 1991"
 Leaving UserFN _h() => "11 April 1991"
-../tests/test.rem(26): Trig = Thursday, 11 April, 1991
+../tests/test.rem(29): Trig = Thursday, 11 April, 1991
 [_h(4,  "Iyar")]    MSG Yom HaZikaron
 Entering UserFN _h(4, "Iyar")
 x => 4
@@ -129,7 +133,7 @@ y => "Iyar"
 hebdate(4, "Iyar") => 1991-04-18
 trigger(1991-04-18) => "18 April 1991"
 Leaving UserFN _h() => "18 April 1991"
-../tests/test.rem(27): Trig = Thursday, 18 April, 1991
+../tests/test.rem(30): Trig = Thursday, 18 April, 1991
 [_h(5,  "Iyar")]    MSG Yom Ha'atzmaut
 Entering UserFN _h(5, "Iyar")
 x => 5
@@ -137,7 +141,7 @@ y => "Iyar"
 hebdate(5, "Iyar") => 1991-04-19
 trigger(1991-04-19) => "19 April 1991"
 Leaving UserFN _h() => "19 April 1991"
-../tests/test.rem(28): Trig = Friday, 19 April, 1991
+../tests/test.rem(31): Trig = Friday, 19 April, 1991
 [_h(28, "Iyar")]    MSG Yom Yerushalayim
 Entering UserFN _h(28, "Iyar")
 x => 28
@@ -145,7 +149,7 @@ y => "Iyar"
 hebdate(28, "Iyar") => 1991-05-12
 trigger(1991-05-12) => "12 May 1991"
 Leaving UserFN _h() => "12 May 1991"
-../tests/test.rem(29): Trig = Sunday, 12 May, 1991
+../tests/test.rem(32): Trig = Sunday, 12 May, 1991
 [_h(6,  "Sivan")]   MSG Shavuot
 Entering UserFN _h(6, "Sivan")
 x => 6
@@ -153,7 +157,7 @@ y => "Sivan"
 hebdate(6, "Sivan") => 1991-05-19
 trigger(1991-05-19) => "19 May 1991"
 Leaving UserFN _h() => "19 May 1991"
-../tests/test.rem(30): Trig = Sunday, 19 May, 1991
+../tests/test.rem(33): Trig = Sunday, 19 May, 1991
 [_h(9,  "Av")]      MSG Tish'a B'Av
 Entering UserFN _h(9, "Av")
 x => 9
@@ -161,7 +165,7 @@ y => "Av"
 hebdate(9, "Av") => 1991-07-20
 trigger(1991-07-20) => "20 July 1991"
 Leaving UserFN _h() => "20 July 1991"
-../tests/test.rem(31): Trig = Saturday, 20 July, 1991
+../tests/test.rem(34): Trig = Saturday, 20 July, 1991

 # Test some jahrzeit cases
 fset _i(x,y,z,a) trigger(hebdate(x,y,z,a))
@@ -175,7 +179,7 @@ a => 5759
 hebdate(30, "Heshvan", 1991-02-16, 5759) => 1991-11-07
 trigger(1991-11-07) => "7 November 1991"
 Leaving UserFN _i() => "7 November 1991"
-../tests/test.rem(35): Trig = Thursday, 7 November, 1991
+../tests/test.rem(38): Trig = Thursday, 7 November, 1991
 [_i(30, "Heshvan", today(), 5760)] MSG Complete-Defective
 today() => 1991-02-16
 Entering UserFN _i(30, "Heshvan", 1991-02-16, 5760)
@@ -186,7 +190,7 @@ a => 5760
 hebdate(30, "Heshvan", 1991-02-16, 5760) => 1991-11-07
 trigger(1991-11-07) => "7 November 1991"
 Leaving UserFN _i() => "7 November 1991"
-../tests/test.rem(36): Trig = Thursday, 7 November, 1991
+../tests/test.rem(39): Trig = Thursday, 7 November, 1991
 [_i(30, "Heshvan", today(), 5761)] MSG Illegal
 today() => 1991-02-16
 Entering UserFN _i(30, "Heshvan", 1991-02-16, 5761)
@@ -194,7 +198,7 @@ x => 30
 y => "Heshvan"
 z => 1991-02-16
 a => 5761
-hebdate(30, "Heshvan", 1991-02-16, 5761) => ../tests/test.rem(37): 30 Heshvan 5761: Invalid Hebrew date
+hebdate(30, "Heshvan", 1991-02-16, 5761) => ../tests/test.rem(40): 30 Heshvan 5761: Invalid Hebrew date
 Invalid Hebrew date
 Leaving UserFN _i() => Invalid Hebrew date

@@ -208,7 +212,7 @@ a => 5759
 hebdate(30, "Kislev", 1991-02-16, 5759) => 1991-12-07
 trigger(1991-12-07) => "7 December 1991"
 Leaving UserFN _i() => "7 December 1991"
-../tests/test.rem(39): Trig = Saturday, 7 December, 1991
+../tests/test.rem(42): Trig = Saturday, 7 December, 1991
 [_i(30, "Kislev", today(), 5760)] MSG Complete-Defective
 today() => 1991-02-16
 Entering UserFN _i(30, "Kislev", 1991-02-16, 5760)
@@ -219,7 +223,7 @@ a => 5760
 hebdate(30, "Kislev", 1991-02-16, 5760) => 1991-12-07
 trigger(1991-12-07) => "7 December 1991"
 Leaving UserFN _i() => "7 December 1991"
-../tests/test.rem(40): Trig = Saturday, 7 December, 1991
+../tests/test.rem(43): Trig = Saturday, 7 December, 1991
 [_i(30, "Kislev", today(), 5761)] MSG Illegal
 today() => 1991-02-16
 Entering UserFN _i(30, "Kislev", 1991-02-16, 5761)
@@ -227,7 +231,7 @@ x => 30
 y => "Kislev"
 z => 1991-02-16
 a => 5761
-hebdate(30, "Kislev", 1991-02-16, 5761) => ../tests/test.rem(41): 30 Kislev 5761: Invalid Hebrew date
+hebdate(30, "Kislev", 1991-02-16, 5761) => ../tests/test.rem(44): 30 Kislev 5761: Invalid Hebrew date
 Invalid Hebrew date
 Leaving UserFN _i() => Invalid Hebrew date

@@ -241,7 +245,7 @@ a => 5755
 hebdate(30, "Adar A", 1991-02-16, 5755) => 1992-03-05
 trigger(1992-03-05) => "5 March 1992"
 Leaving UserFN _i() => "5 March 1992"
-../tests/test.rem(43): Trig = Thursday, 5 March, 1992
+../tests/test.rem(46): Trig = Thursday, 5 March, 1992
 [_i(30, "Adar A", today(), 5756)] MSG Illegal
 today() => 1991-02-16
 Entering UserFN _i(30, "Adar A", 1991-02-16, 5756)
@@ -249,7 +253,7 @@ x => 30
 y => "Adar A"
 z => 1991-02-16
 a => 5756
-hebdate(30, "Adar A", 1991-02-16, 5756) => ../tests/test.rem(44): No Adar A in 5756
+hebdate(30, "Adar A", 1991-02-16, 5756) => ../tests/test.rem(47): No Adar A in 5756
 Invalid Hebrew date
 Leaving UserFN _i() => Invalid Hebrew date
 [_i(29, "Adar A", today(), 5755)] MSG Leap
@@ -262,7 +266,7 @@ a => 5755
 hebdate(29, "Adar A", 1991-02-16, 5755) => 1991-03-15
 trigger(1991-03-15) => "15 March 1991"
 Leaving UserFN _i() => "15 March 1991"
-../tests/test.rem(45): Trig = Friday, 15 March, 1991
+../tests/test.rem(48): Trig = Friday, 15 March, 1991
 [_i(29, "Adar A", today(), 5756)] MSG Illegal
 today() => 1991-02-16
 Entering UserFN _i(29, "Adar A", 1991-02-16, 5756)
@@ -270,225 +274,225 @@ x => 29
 y => "Adar A"
 z => 1991-02-16
 a => 5756
-hebdate(29, "Adar A", 1991-02-16, 5756) => ../tests/test.rem(46): No Adar A in 5756
+hebdate(29, "Adar A", 1991-02-16, 5756) => ../tests/test.rem(49): No Adar A in 5756
 Invalid Hebrew date
 Leaving UserFN _i() => Invalid Hebrew date

 # This causes a parse error on version 03.01.01
 REM 1990-01-01 SATISFY 1
-../tests/test.rem(49): Expired
+../tests/test.rem(52): Expired

 # Test each possible case of the basic reminders.

 REM MSG Every Day
-../tests/test.rem(53): Trig = Saturday, 16 February, 1991
+../tests/test.rem(56): Trig = Saturday, 16 February, 1991
 Every Day


 REM 18 MSG Every 18th 
-../tests/test.rem(55): Trig = Monday, 18 February, 1991
+../tests/test.rem(58): Trig = Monday, 18 February, 1991
 REM 15 MSG Every 15th
-../tests/test.rem(56): Trig = Friday, 15 March, 1991
+../tests/test.rem(59): Trig = Friday, 15 March, 1991

 REM Feb MSG February
-../tests/test.rem(58): Trig = Saturday, 16 February, 1991
+../tests/test.rem(61): Trig = Saturday, 16 February, 1991
 February

 REM Jan MSG January
-../tests/test.rem(59): Trig = Wednesday, 1 January, 1992
+../tests/test.rem(62): Trig = Wednesday, 1 January, 1992
 REM March MSG March
-../tests/test.rem(60): Trig = Friday, 1 March, 1991
+../tests/test.rem(63): Trig = Friday, 1 March, 1991

 REM 13 Jan MSG 13 Jan
-../tests/test.rem(62): Trig = Monday, 13 January, 1992
+../tests/test.rem(65): Trig = Monday, 13 January, 1992
 REM 15 Feb MSG 15 Feb
-../tests/test.rem(63): Trig = Saturday, 15 February, 1992
+../tests/test.rem(66): Trig = Saturday, 15 February, 1992
 REM 28 Feb MSG 28 Feb
-../tests/test.rem(64): Trig = Thursday, 28 February, 1991
+../tests/test.rem(67): Trig = Thursday, 28 February, 1991
 REM 29 Feb MSG 29 Feb
-../tests/test.rem(65): Trig = Saturday, 29 February, 1992
+../tests/test.rem(68): Trig = Saturday, 29 February, 1992
 REM 5 Mar MSG 5 Mar
-../tests/test.rem(66): Trig = Tuesday, 5 March, 1991
+../tests/test.rem(69): Trig = Tuesday, 5 March, 1991

 REM 1990 MSG 1990
-../tests/test.rem(68): Expired
+../tests/test.rem(71): Expired
 REM 1991 MSG 1991
-../tests/test.rem(69): Trig = Saturday, 16 February, 1991
+../tests/test.rem(72): Trig = Saturday, 16 February, 1991
 1991

 REM 1992 MSG 1991
-../tests/test.rem(70): Trig = Wednesday, 1 January, 1992
+../tests/test.rem(73): Trig = Wednesday, 1 January, 1992

 REM 1 1990 MSG 1 1990
-../tests/test.rem(72): Expired
+../tests/test.rem(75): Expired
 REM 29 1991 MSG 29 1991
-../tests/test.rem(73): Trig = Friday, 29 March, 1991
+../tests/test.rem(76): Trig = Friday, 29 March, 1991
 REM 29 1992 MSG 29 1992
-../tests/test.rem(74): Trig = Wednesday, 29 January, 1992
+../tests/test.rem(77): Trig = Wednesday, 29 January, 1992
 REM 16 1991 MSG 16 1991
-../tests/test.rem(75): Trig = Saturday, 16 February, 1991
+../tests/test.rem(78): Trig = Saturday, 16 February, 1991
 16 1991


 REM Jan 1990 MSG Jan 1990
-../tests/test.rem(77): Expired
+../tests/test.rem(80): Expired
 REM Feb 1991 MSG Feb 1991
-../tests/test.rem(78): Trig = Saturday, 16 February, 1991
+../tests/test.rem(81): Trig = Saturday, 16 February, 1991
 Feb 1991

 REM Dec 1991 MSG Dec 1991
-../tests/test.rem(79): Trig = Sunday, 1 December, 1991
+../tests/test.rem(82): Trig = Sunday, 1 December, 1991
 REM May 1992 MSG May 1992
-../tests/test.rem(80): Trig = Friday, 1 May, 1992
+../tests/test.rem(83): Trig = Friday, 1 May, 1992

 REM 1 Jan 1991 MSG 1 Jan 1991
-../tests/test.rem(82): Expired
+../tests/test.rem(85): Expired
 REM 16 Feb 1991 MSG 16 Feb 1991
-../tests/test.rem(83): Trig = Saturday, 16 February, 1991
+../tests/test.rem(86): Trig = Saturday, 16 February, 1991
 16 Feb 1991

 REM 29 Dec 1992 MSG 29 Dec 1992
-../tests/test.rem(84): Trig = Tuesday, 29 December, 1992
+../tests/test.rem(87): Trig = Tuesday, 29 December, 1992

 REM Sun MSG Sun
-../tests/test.rem(86): Trig = Sunday, 17 February, 1991
+../tests/test.rem(89): Trig = Sunday, 17 February, 1991
 REM Fri Sat Tue MSG Fri Sat Tue
-../tests/test.rem(87): Trig = Saturday, 16 February, 1991
+../tests/test.rem(90): Trig = Saturday, 16 February, 1991
 Fri Sat Tue


 REM Sun 16 MSG Sun 16
-../tests/test.rem(89): Trig = Sunday, 17 February, 1991
+../tests/test.rem(92): Trig = Sunday, 17 February, 1991
 REM Mon Tue Wed Thu Fri 1 MSG Mon Tue Wed Thu Fri 1
-../tests/test.rem(90): Trig = Friday, 1 March, 1991
+../tests/test.rem(93): Trig = Friday, 1 March, 1991

 REM Sun Feb MSG Sun Feb
-../tests/test.rem(92): Trig = Sunday, 17 February, 1991
+../tests/test.rem(95): Trig = Sunday, 17 February, 1991
 REM Mon Tue March MSG Mon Tue March
-../tests/test.rem(93): Trig = Monday, 4 March, 1991
+../tests/test.rem(96): Trig = Monday, 4 March, 1991

 REM Sun 16 Feb MSG Sun 16 Feb
-../tests/test.rem(95): Trig = Sunday, 17 February, 1991
+../tests/test.rem(98): Trig = Sunday, 17 February, 1991
 REM Mon Tue 10 March MSG Mon Tue 10 March
-../tests/test.rem(96): Trig = Monday, 11 March, 1991
+../tests/test.rem(99): Trig = Monday, 11 March, 1991

 REM Sat Sun 1991 MSG Sat Sun 1991
-../tests/test.rem(98): Trig = Saturday, 16 February, 1991
+../tests/test.rem(101): Trig = Saturday, 16 February, 1991
 Sat Sun 1991

 REM Mon Tue 1992 MSG Mon Tue 1992
-../tests/test.rem(99): Trig = Monday, 6 January, 1992
+../tests/test.rem(102): Trig = Monday, 6 January, 1992

 REM Sun 16 1991 MSG Sun 16 1991
-../tests/test.rem(101): Trig = Sunday, 17 February, 1991
+../tests/test.rem(104): Trig = Sunday, 17 February, 1991
 REM Mon Tue Wed Thu Fri 1 1992 MSG Mon Tue Wed Thu Fri 1 1992
-../tests/test.rem(102): Trig = Wednesday, 1 January, 1992
+../tests/test.rem(105): Trig = Wednesday, 1 January, 1992

 REM Mon Feb 1991 MSG Mon Feb 1991
-../tests/test.rem(104): Trig = Monday, 18 February, 1991
+../tests/test.rem(107): Trig = Monday, 18 February, 1991
 REM Tue Jan 1992 MSG Tue Jan 1992
-../tests/test.rem(105): Trig = Tuesday, 7 January, 1992
+../tests/test.rem(108): Trig = Tuesday, 7 January, 1992

 REM Sun Mon 16 Feb 1991 MSG Sun Mon 16 Feb 1991
-../tests/test.rem(107): Trig = Sunday, 17 February, 1991
+../tests/test.rem(110): Trig = Sunday, 17 February, 1991
 REM Tue 28 Jan 1992 MSG Tue 28 Jan 1992
-../tests/test.rem(108): Trig = Tuesday, 28 January, 1992
+../tests/test.rem(111): Trig = Tuesday, 28 January, 1992

 # Try some Backs
 CLEAR-OMIT-CONTEXT
 REM 1 -1 OMIT sat sun MSG 1 -1 OMIT Sat Sun
-../tests/test.rem(112): Trig = Thursday, 28 February, 1991
+../tests/test.rem(115): Trig = Thursday, 28 February, 1991
 REM 1 --1 OMIT sat sun MSG 1 --1 OMIT Sat Sun
-../tests/test.rem(113): Trig = Thursday, 28 February, 1991
+../tests/test.rem(116): Trig = Thursday, 28 February, 1991

 OMIT 28 Feb
 REM 1 -1 OMIT sat sun MSG 1 -1 OMIT Sat Sun (28 Feb omitted)
-../tests/test.rem(116): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(119): Trig = Wednesday, 27 February, 1991
 REM 1 --1 OMIT sat sun MSG 1 --1 OMIT Sat Sun (28 Feb omitted)
-../tests/test.rem(117): Trig = Thursday, 28 February, 1991
+../tests/test.rem(120): Trig = Thursday, 28 February, 1991

 CLEAR-OMIT-CONTEXT

 # Try out UNTIL
 REM Wed UNTIL 21 Feb 1991 MSG Wed UNTIL 21 Feb 1991
-../tests/test.rem(122): Trig = Wednesday, 20 February, 1991
+../tests/test.rem(125): Trig = Wednesday, 20 February, 1991

 # Try playing with the OMIT context

 OMIT 28 Feb 1991
 REM 1 Mar -1 MSG 1 mar -1 (28feb91 omitted)
-../tests/test.rem(127): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(130): Trig = Wednesday, 27 February, 1991
 REM 1 Mar --1 MSG 1 mar --1 (28Feb91 omitted)
-../tests/test.rem(128): Trig = Thursday, 28 February, 1991
+../tests/test.rem(131): Trig = Thursday, 28 February, 1991
 REM 28 Feb BEFORE MSG 28 Feb BEFORE (28Feb91 omitted)
-../tests/test.rem(129): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(132): Trig = Wednesday, 27 February, 1991
 REM 28 Feb SKIP MSG 28 Feb SKIP (28Feb91 omitted)
-../tests/test.rem(130): Trig = Friday, 28 February, 1992
+../tests/test.rem(133): Trig = Friday, 28 February, 1992
 REM 28 Feb AFTER MSG 28 Feb AFTER (28Feb91 omitted)
-../tests/test.rem(131): Trig = Friday, 1 March, 1991
+../tests/test.rem(134): Trig = Friday, 1 March, 1991

 PUSH-OMIT-CONTEXT
 CLEAR-OMIT-CONTEXT
 REM 1 Mar -1 MSG 1 mar -1
-../tests/test.rem(135): Trig = Thursday, 28 February, 1991
-REM 1 Mar --1 MSG 1 mar --1
-../tests/test.rem(136): Trig = Thursday, 28 February, 1991
-REM 28 Feb BEFORE MSG 28 Feb BEFORE
-../tests/test.rem(137): Trig = Thursday, 28 February, 1991
-REM 28 Feb SKIP MSG 28 Feb SKIP
 ../tests/test.rem(138): Trig = Thursday, 28 February, 1991
-REM 28 Feb AFTER MSG 28 Feb AFTER
+REM 1 Mar --1 MSG 1 mar --1
 ../tests/test.rem(139): Trig = Thursday, 28 February, 1991
+REM 28 Feb BEFORE MSG 28 Feb BEFORE
+../tests/test.rem(140): Trig = Thursday, 28 February, 1991
+REM 28 Feb SKIP MSG 28 Feb SKIP
+../tests/test.rem(141): Trig = Thursday, 28 February, 1991
+REM 28 Feb AFTER MSG 28 Feb AFTER
+../tests/test.rem(142): Trig = Thursday, 28 February, 1991

 POP-OMIT-CONTEXT
 REM 1 Mar -1 MSG 1 mar -1 (28feb91 omitted)
-../tests/test.rem(142): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(145): Trig = Wednesday, 27 February, 1991
 REM 1 Mar --1 MSG 1 mar --1 (28Feb91 omitted)
-../tests/test.rem(143): Trig = Thursday, 28 February, 1991
+../tests/test.rem(146): Trig = Thursday, 28 February, 1991
 REM 28 Feb BEFORE MSG 28 Feb BEFORE (28Feb91 omitted)
-../tests/test.rem(144): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(147): Trig = Wednesday, 27 February, 1991
 REM 28 Feb SKIP MSG 28 Feb SKIP (28Feb91 omitted)
-../tests/test.rem(145): Trig = Friday, 28 February, 1992
+../tests/test.rem(148): Trig = Friday, 28 February, 1992
 REM 28 Feb AFTER MSG 28 Feb AFTER (28Feb91 omitted)
-../tests/test.rem(146): Trig = Friday, 1 March, 1991
+../tests/test.rem(149): Trig = Friday, 1 March, 1991


 REM 13 March 1991 *1 UNTIL 19 March 1991 MSG 13-19 Mar 91
-../tests/test.rem(149): Trig = Wednesday, 13 March, 1991
+../tests/test.rem(152): Trig = Wednesday, 13 March, 1991

 # Test BACK
 CLEAR-OMIT-CONTEXT
 REM 18 Feb 1991 +1 MSG 18 Feb 1991 +1
-../tests/test.rem(153): Trig = Monday, 18 February, 1991
+../tests/test.rem(156): Trig = Monday, 18 February, 1991

 OMIT 17 Feb 1991
 REM 18 Feb 1991 +1 MSG 18 Feb 1991 +1 (17Feb91 omitted)
-../tests/test.rem(156): Trig = Monday, 18 February, 1991
+../tests/test.rem(159): Trig = Monday, 18 February, 1991
 18 Feb 1991 +1 (17Feb91 omitted)

 REM 18 Feb 1991 ++1 MSG 18 Feb 1991 ++1 (17Feb91 omitted)
-../tests/test.rem(157): Trig = Monday, 18 February, 1991
+../tests/test.rem(160): Trig = Monday, 18 February, 1991

 CLEAR-OMIT-CONTEXT
 # Test the scanfrom clause
 REM Fri SATISFY 1
-../tests/test.rem(161): Trig = Friday, 22 February, 1991
+../tests/test.rem(164): Trig = Friday, 22 February, 1991
 OMIT [trigger(trigdate())]
 trigdate() => 1991-02-22
 trigger(1991-02-22) => "22 February 1991"
 REM Fri after MSG 23 Feb 1991
-../tests/test.rem(163): Trig = Saturday, 23 February, 1991
+../tests/test.rem(166): Trig = Saturday, 23 February, 1991
 CLEAR-OMIT-CONTEXT
 REM Fri SCANFROM [trigger(today()-7)] SATISFY 1
 today() => 1991-02-16
 1991-02-16 - 7 => 1991-02-09
 trigger(1991-02-09) => "9 February 1991"
-../tests/test.rem(165): Trig = Friday, 15 February, 1991
+../tests/test.rem(168): Trig = Friday, 15 February, 1991
 OMIT [trigger(trigdate())]
 trigdate() => 1991-02-15
 trigger(1991-02-15) => "15 February 1991"
 REM Fri after MSG 16 Feb 1991
-../tests/test.rem(167): Trig = Saturday, 16 February, 1991
+../tests/test.rem(170): Trig = Saturday, 16 February, 1991
 16 Feb 1991

 CLEAR-OMIT-CONTEXT
@@ -586,7 +590,7 @@ day(1991-03-08) => 8
 8 % 2 => 0
 0 || 0 => 0
 Leaving UserFN _ofunc() => 0
-../tests/test.rem(172): Trig = Friday, 8 March, 1991
+../tests/test.rem(175): Trig = Friday, 8 March, 1991
 REM 8 March OMITFUNC _ofunc -1 MSG OmitFunc Test 2
 Entering UserFN _ofunc(1991-03-07)
 x => 1991-03-07
@@ -660,31 +664,31 @@ day(1991-02-28) => 28
 28 % 2 => 0
 0 || 0 => 0
 Leaving UserFN _ofunc() => 0
-../tests/test.rem(173): Trig = Thursday, 28 February, 1991
+../tests/test.rem(176): Trig = Thursday, 28 February, 1991

 # omitfunc ignores local/global omits
 fset _ofunc(x) 0
 OMIT 1 March
 OMIT 2 March 1991
 REM 1 March OMIT Sun OMITFUNC _ofunc AFTER MSG Should trigger 1 March
-../tests/test.rem(179): Warning: OMIT is ignored if you use OMITFUNC
+../tests/test.rem(182): Warning: OMIT is ignored if you use OMITFUNC
 Entering UserFN _ofunc(1991-02-15)
 Leaving UserFN _ofunc() => 0
 Entering UserFN _ofunc(1991-03-01)
 Leaving UserFN _ofunc() => 0
-../tests/test.rem(179): Trig = Friday, 1 March, 1991
+../tests/test.rem(182): Trig = Friday, 1 March, 1991
 REM 1 March OMIT Sun AFTER MSG Should trigger 4 March
-../tests/test.rem(180): Trig = Monday, 4 March, 1991
+../tests/test.rem(183): Trig = Monday, 4 March, 1991

 # Test shorthand reminders
 REM 1991-02-28 MSG Feb 28
-../tests/test.rem(183): Trig = Thursday, 28 February, 1991
+../tests/test.rem(186): Trig = Thursday, 28 February, 1991
 REM 1991/02/28@14:45 MSG Feb 28
-../tests/test.rem(184): Trig = Thursday, 28 February, 1991
+../tests/test.rem(187): Trig = Thursday, 28 February, 1991
 REM Wed UNTIL 1991-01-01 MSG Expired
-../tests/test.rem(185): Expired
+../tests/test.rem(188): Expired
 REM Wed SCANFROM 1991-02-26 MSG SCANFROM
-../tests/test.rem(186): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(189): Trig = Wednesday, 27 February, 1991

 set a000 abs(1)
 abs(1) => 1
@@ -708,7 +712,7 @@ set a008 coerce("string", 11:44)
 coerce("string", 11:44) => "11:44"
 set a009 coerce("int", "badnews")
 coerce("int", "badnews") => Can't coerce
-../tests/test.rem(197): Can't coerce
+../tests/test.rem(200): Can't coerce
 set a010 coerce("int", "12")
 coerce("int", "12") => 12
 set a011 coerce("int", 11:44)
@@ -720,7 +724,7 @@ set a013 date(1992, 2, 2)
 date(1992, 2, 2) => 1992-02-02
 set a014 date(1993, 2, 29)
 date(1993, 2, 29) => Bad date specification
-../tests/test.rem(202): Bad date specification
+../tests/test.rem(205): Bad date specification
 set a015 day(today())
 today() => 1991-02-16
 day(1991-02-16) => 16
@@ -815,15 +819,15 @@ strlen("sadjflkhsldkfhsdlfjhk") => 21
 set a050 substr(a049, 2)
 a049 => 21
 substr(21, 2) => Type mismatch
-../tests/test.rem(240): Type mismatch
+../tests/test.rem(243): Type mismatch
 set a051 substr(a050, 2, 6)
-a050 => ../tests/test.rem(241): Undefined variable: a050
+a050 => ../tests/test.rem(244): Undefined variable: a050
 set a052 time(1+2, 3+4)
 1 + 2 => 3
 3 + 4 => 7
 time(3, 7) => 03:07
 rem 10 jan 1992 AT 11:22 CAL
-../tests/test.rem(243): Trig = Friday, 10 January, 1992
+../tests/test.rem(246): Trig = Friday, 10 January, 1992
 set a053 trigdate()
 trigdate() => 1992-01-10
 set a054 trigtime()
@@ -836,7 +840,7 @@ set a057 value("a05"+"6")
 "a05" + "6" => "a056"
 value("a056") => "SDFJHSDF KSJDFH KJSDFH KSJDFH"
 set a058 version()
-version() => "03.01.11"
+version() => "03.01.15"
 set a059 wkday(today())
 today() => 1991-02-16
 wkday(1991-02-16) => "Saturday"
@@ -915,31 +919,101 @@ y => 11:33
 x => "foo"
 y => 11:33
 "foo" * 11:33 => Type mismatch
-../tests/test.rem(266): `*': Type mismatch
+../tests/test.rem(269): `*': Type mismatch
 Leaving UserFN h() => Type mismatch
 set a074 dosubst("%a %b %c %d %e %f %g %h", '1992/5/5')
 dosubst("%a %b %c %d %e %f %g %h", 1992-05-05) => "on Tuesday, 5 May, 1992 in 444 days' tim"...
 msg [a074]%
-../tests/test.rem(268): Trig = Saturday, 16 February, 1991
+../tests/test.rem(271): Trig = Saturday, 16 February, 1991
 a074 => "on Tuesday, 5 May, 1992 in 444 days' tim"...
 on Tuesday, 5 May, 1992 in 444 days' time on Tuesday 5 on 05-05-1992 on 05-05-1992 on Tuesday, 5 May on 05-05
 set a075 dosubst("%i %j %k %l %m %n %o %p", '1992/5/5')
 dosubst("%i %j %k %l %m %n %o %p", 1992-05-05) => "on 05-05 on Tuesday, May 5th, 1992 on Tu"...
 msg [a075]%
-../tests/test.rem(270): Trig = Saturday, 16 February, 1991
+../tests/test.rem(273): Trig = Saturday, 16 February, 1991
 a075 => "on 05-05 on Tuesday, May 5th, 1992 on Tu"...
 on 05-05 on Tuesday, May 5th, 1992 on Tuesday, May 5th on 1992-05-05 May 5  s
 set a076 dosubst("%q %r %s %t %u %v %w %x", '1992/5/5')
 dosubst("%q %r %s %t %u %v %w %x", 1992-05-05) => "s' 05 th 05 on Tuesday, 5th May, 1992 on"...
 msg [a076]%
-../tests/test.rem(272): Trig = Saturday, 16 February, 1991
+../tests/test.rem(275): Trig = Saturday, 16 February, 1991
 a076 => "s' 05 th 05 on Tuesday, 5th May, 1992 on"...
 s' 05 th 05 on Tuesday, 5th May, 1992 on Tuesday, 5th May Tuesday 444
-set a077 dosubst("%y %z", '1992/5/5')
-dosubst("%y %z", 1992-05-05) => "1992 92
+set a074 dosubst("%*a %*b %*c %*d %*e %*f %*g %*h", '1992/5/5')
+dosubst("%*a %*b %*c %*d %*e %*f %*g %*h", 1992-05-05) => "Tuesday, 5 May, 1992 in 444 days' time T"...
+msg [a074]%
+../tests/test.rem(277): Trig = Saturday, 16 February, 1991
+a074 => "Tuesday, 5 May, 1992 in 444 days' time T"...
+Tuesday, 5 May, 1992 in 444 days' time Tuesday 5 05-05-1992 05-05-1992 Tuesday, 5 May 05-05
+set a075 dosubst("%*i %*j %*k %*l %*m %*n %*o %*p", '1992/5/5')
+dosubst("%*i %*j %*k %*l %*m %*n %*o %*p", 1992-05-05) => "05-05 Tuesday, May 5th, 1992 Tuesday, Ma"...
+msg [a075]%
+../tests/test.rem(279): Trig = Saturday, 16 February, 1991
+a075 => "05-05 Tuesday, May 5th, 1992 Tuesday, Ma"...
+05-05 Tuesday, May 5th, 1992 Tuesday, May 5th 1992-05-05 May 5  s
+set a076 dosubst("%*q %*r %*s %*t %*u %*v %*w %*x", '1992/5/5')
+dosubst("%*q %*r %*s %*t %*u %*v %*w %*x", 1992-05-05) => "s' 05 th 05 Tuesday, 5th May, 1992 Tuesd"...
+msg [a076]%
+../tests/test.rem(281): Trig = Saturday, 16 February, 1991
+a076 => "s' 05 th 05 Tuesday, 5th May, 1992 Tuesd"...
+s' 05 th 05 Tuesday, 5th May, 1992 Tuesday, 5th May Tuesday 444
+set a077 dosubst("%*y %*z", '1992/5/5')
+dosubst("%*y %*z", 1992-05-05) => "1992 92
 "
 msg [a077]%
-../tests/test.rem(274): Trig = Saturday, 16 February, 1991
+../tests/test.rem(283): Trig = Saturday, 16 February, 1991
+a077 => "1992 92
+"
+1992 92
+set a074 dosubst("%A %B %C %D %E %F %G %H", '1992/5/5')
+dosubst("%A %B %C %D %E %F %G %H", 1992-05-05) => "On Tuesday, 5 May, 1992 In 444 days' tim"...
+msg [a074]%
+../tests/test.rem(285): Trig = Saturday, 16 February, 1991
+a074 => "On Tuesday, 5 May, 1992 In 444 days' tim"...
+On Tuesday, 5 May, 1992 In 444 days' time On Tuesday 5 On 05-05-1992 On 05-05-1992 On Tuesday, 5 May On 05-05
+set a075 dosubst("%I %J %K %L %M %N %O %P", '1992/5/5')
+dosubst("%I %J %K %L %M %N %O %P", 1992-05-05) => "On 05-05 On Tuesday, May 5th, 1992 On Tu"...
+msg [a075]%
+../tests/test.rem(287): Trig = Saturday, 16 February, 1991
+a075 => "On 05-05 On Tuesday, May 5th, 1992 On Tu"...
+On 05-05 On Tuesday, May 5th, 1992 On Tuesday, May 5th On 1992-05-05 May 5  S
+set a076 dosubst("%Q %R %S %T %U %V %W %X", '1992/5/5')
+dosubst("%Q %R %S %T %U %V %W %X", 1992-05-05) => "S' 05 Th 05 On Tuesday, 5th May, 1992 On"...
+msg [a076]%
+../tests/test.rem(289): Trig = Saturday, 16 February, 1991
+a076 => "S' 05 Th 05 On Tuesday, 5th May, 1992 On"...
+S' 05 Th 05 On Tuesday, 5th May, 1992 On Tuesday, 5th May Tuesday 444
+set a077 dosubst("%Y %Z", '1992/5/5')
+dosubst("%Y %Z", 1992-05-05) => "1992 92
+"
+msg [a077]%
+../tests/test.rem(291): Trig = Saturday, 16 February, 1991
+a077 => "1992 92
+"
+1992 92
+set a074 dosubst("%*A %*B %*C %*D %*E %*F %*G %*H", '1992/5/5')
+dosubst("%*A %*B %*C %*D %*E %*F %*G %*H", 1992-05-05) => "Tuesday, 5 May, 1992 In 444 days' time T"...
+msg [a074]%
+../tests/test.rem(293): Trig = Saturday, 16 February, 1991
+a074 => "Tuesday, 5 May, 1992 In 444 days' time T"...
+Tuesday, 5 May, 1992 In 444 days' time Tuesday 5 05-05-1992 05-05-1992 Tuesday, 5 May 05-05
+set a075 dosubst("%*I %*J %*K %*L %*M %*N %*O %*P", '1992/5/5')
+dosubst("%*I %*J %*K %*L %*M %*N %*O %*P", 1992-05-05) => "05-05 Tuesday, May 5th, 1992 Tuesday, Ma"...
+msg [a075]%
+../tests/test.rem(295): Trig = Saturday, 16 February, 1991
+a075 => "05-05 Tuesday, May 5th, 1992 Tuesday, Ma"...
+05-05 Tuesday, May 5th, 1992 Tuesday, May 5th 1992-05-05 May 5  S
+set a076 dosubst("%*Q %*R %*S %*T %*U %*V %*W %*X", '1992/5/5')
+dosubst("%*Q %*R %*S %*T %*U %*V %*W %*X", 1992-05-05) => "S' 05 Th 05 Tuesday, 5th May, 1992 Tuesd"...
+msg [a076]%
+../tests/test.rem(297): Trig = Saturday, 16 February, 1991
+a076 => "S' 05 Th 05 Tuesday, 5th May, 1992 Tuesd"...
+S' 05 Th 05 Tuesday, 5th May, 1992 Tuesday, 5th May Tuesday 444
+set a077 dosubst("%*Y %*Z", '1992/5/5')
+dosubst("%*Y %*Z", 1992-05-05) => "1992 92
+"
+msg [a077]%
+../tests/test.rem(299): Trig = Saturday, 16 February, 1991
 a077 => "1992 92
 "
 1992 92
@@ -967,7 +1041,7 @@ dump
            a017  29
            a036  "bar"
            a055  1
-            a074  "on Tuesday, 5 May, 1992 in 444 days' tim"...
+            a074  "Tuesday, 5 May, 1992 In 444 days' time T"...
            a008  "11:44"
            a027  0
            a046  "ies"
@@ -976,7 +1050,7 @@ dump
            a018  1
            a037  1991-02-15
            a056  "SDFJHSDF KSJDFH KJSDFH KSJDFH"
-            a075  "on 05-05 on Tuesday, May 5th, 1992 on Tu"...
+            a075  "05-05 Tuesday, May 5th, 1992 Tuesday, Ma"...
            a028  1
            a047  -1
            a066  0
@@ -984,12 +1058,12 @@ dump
            a019  0
            a038  33
            a057  "SDFJHSDF KSJDFH KJSDFH KSJDFH"
-            a076  "s' 05 th 05 on Tuesday, 5th May, 1992 on"...
+            a076  "S' 05 Th 05 Tuesday, 5th May, 1992 Tuesd"...
            a029  0
            a048  "foo"
            a067  "INT"
            a039  "February"
-            a058  "03.01.11"
+            a058  "03.01.15"
            a077  "1992 92
 "
            a049  21
@@ -1046,12 +1120,16 @@ dump
            a045  "iess"
            a064  1
            a083  1991-03-24
+dump $aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+        Variable  Value
+
+$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: Name too long
 OMIT 2010-09-03 THROUGH 2010-09-15
 OMIT December 25 MSG X
-../tests/test.rem(286): Trig = Wednesday, 25 December, 1991
+../tests/test.rem(312): Trig = Wednesday, 25 December, 1991
 # Next should give a parse error
 OMIT 26 Dec 2010 THROUGH 27 Dec 2010 MSG This is not legal
-../tests/test.rem(288): Trig = Sunday, 26 December, 2010
+../tests/test.rem(314): Trig = Sunday, 26 December, 2010
 OMIT DUMP
 Global Full OMITs (16 of maximum allowed 500):
 	1991-03-11
@@ -2319,8 +2397,8 @@ No reminders.
 %%Orientation: Landscape
 %%EndComments
 % This file was produced by Remind and Rem2PS, written by
-% David F. Skoll.
-% Remind and Rem2PS are Copyright 1992-1997 David F. Skoll.
+% Dianne Skoll.
+% Remind and Rem2PS are Copyright 1992-1997 Dianne Skoll.
 /ISOLatin1Encoding where { pop save true }{ false } ifelse
  /ISOLatin1Encoding [ StandardEncoding 0 45 getinterval aload pop /minus
    StandardEncoding 46 98 getinterval aload pop /dotlessi /grave /acute
@@ -3411,3 +3489,15 @@ grestore
 showpage
 %%Trailer
 %%Pages: 1
+Reminders for Sunday, 1st January, 2012:
+
+1
+
+Reminders for Sunday, 1st January, 2012:
+
+9am: Should show up
+
+10am: Should show up
+
+2
+
--- a/tests/test.rem
+++ b/tests/test.rem
@@ -9,6 +9,9 @@

 REM Wed UNTIL 15 Feb 1991 SATISFY [trigdate() > '1990-01-01'] MSG wookie

+# bad AT
+REM AT 0:00 0:01 0:02 MSG foo
+
 REM MSG Today is [hebday(today())] [hebmon(today())] [hebyear(today())]
 fset _h(x, y) trigger(hebdate(x,y))

@@ -270,7 +273,29 @@ set a075 dosubst("%i %j %k %l %m %n %o %p", '1992/5/5')
 msg [a075]%
 set a076 dosubst("%q %r %s %t %u %v %w %x", '1992/5/5')
 msg [a076]%
-set a077 dosubst("%y %z", '1992/5/5')
+set a074 dosubst("%*a %*b %*c %*d %*e %*f %*g %*h", '1992/5/5')
+msg [a074]%
+set a075 dosubst("%*i %*j %*k %*l %*m %*n %*o %*p", '1992/5/5')
+msg [a075]%
+set a076 dosubst("%*q %*r %*s %*t %*u %*v %*w %*x", '1992/5/5')
+msg [a076]%
+set a077 dosubst("%*y %*z", '1992/5/5')
+msg [a077]%
+set a074 dosubst("%A %B %C %D %E %F %G %H", '1992/5/5')
+msg [a074]%
+set a075 dosubst("%I %J %K %L %M %N %O %P", '1992/5/5')
+msg [a075]%
+set a076 dosubst("%Q %R %S %T %U %V %W %X", '1992/5/5')
+msg [a076]%
+set a077 dosubst("%Y %Z", '1992/5/5')
+msg [a077]%
+set a074 dosubst("%*A %*B %*C %*D %*E %*F %*G %*H", '1992/5/5')
+msg [a074]%
+set a075 dosubst("%*I %*J %*K %*L %*M %*N %*O %*P", '1992/5/5')
+msg [a075]%
+set a076 dosubst("%*Q %*R %*S %*T %*U %*V %*W %*X", '1992/5/5')
+msg [a076]%
+set a077 dosubst("%*Y %*Z", '1992/5/5')
 msg [a077]%
 set a078 easterdate(today())
 set a079 easterdate(1992)
@@ -282,8 +307,13 @@ set a083 slide('1991-04-01', -7, "Sat")
 set a084 nonomitted('1991-03-01', '1991-03-13', "Sat", "Sun")
 set a085 nonomitted('1991-03-24', '1991-04-01', "Sat")
 dump
+dump $aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 OMIT 2010-09-03 THROUGH 2010-09-15
 OMIT December 25 MSG X
 # Next should give a parse error
 OMIT 26 Dec 2010 THROUGH 27 Dec 2010 MSG This is not legal
 OMIT DUMP
+__EOF__
+REM This line should not even be seen
+And you can put whatever you like here.
+[+f=asdfasdasde3ir0a]
--- a/tests/tstlang.rem
+++ b/tests/tstlang.rem
@@ -11,7 +11,7 @@
 # Use the output to verify your translations.
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 David F. Skoll        
+# Copyright (C) 1992-1997 Dianne Skoll        
 # Copyright (C) 1999-2000 Roaring Penguin Software Inc.
 #
 # ---------------------------------------------------------------------------
@@ -30,7 +30,7 @@ if !$RunOff || !$DontQueue || $DontTrigAts
 endif

 # Set up a few useful definitions
-fset show(x) "%%" + x + " yields: " + char(34) + "%" + x + char(34) + "%"
+fset show(x) "%%" + x + " yields: " + char(34) + "%" + x + char(34) + "% and %%*" + x + " yields: " + char(34) + "%*" + x + char(34) + "%"
 set a trigger(today()+2) + " ++2"
 set l language()
 set tt now()+134
--- a/www/Makefile.in
+++ b/www/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile.in for installing WWW server calendar scripts
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
+# Copyright (C) 1992-1997 by Dianne Skoll
 # Copyright (C) 1999-2007 by Roaring Penguin Software Inc.

 # The complete path to where the scripts actually live, as seen by
--- a/www/README.rem2html
+++ b/www/README.rem2html
@@ -10,4 +10,4 @@ You may have to edit the "#!/usr/bin/perl" line to reflect the
 location of your Perl interpreter.

 --
-David F. Skoll
+Dianne Skoll
--- a/www/cal_dispatch-DIST
+++ b/www/cal_dispatch-DIST
@@ -1,7 +1,7 @@
 #!/bin/sh

 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
+# Copyright (C) 1992-1997 by Dianne Skoll
 # Copyright (C) 1999-2000 by Roaring Penguin Software Inc.

 # CAL_DISPATCH -- Shell script for CGI directory to dispatch calendar
--- a/www/calps
+++ b/www/calps
@@ -2,7 +2,7 @@
 # PostScript calendar shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
+# Copyright (C) 1992-1997 by Dianne Skoll
 # Copyright (C) 1999-2000 by Roaring Penguin Software Inc.

 echo "Content-type: application/postscript"
--- a/www/firstquarter.png
+++ b/www/firstquarter.png
--- a/www/fullmoon.png
+++ b/www/fullmoon.png
--- a/www/hebdate
+++ b/www/hebdate
@@ -2,7 +2,7 @@
 # Hebrew date shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
+# Copyright (C) 1992-1997 by Dianne Skoll
 # Copyright (C) 1999-2000 by Roaring Penguin Software Inc.

 echo Content-type: text/html
--- a/www/hebdate.rem-DIST
+++ b/www/hebdate.rem-DIST
@@ -1,7 +1,7 @@
 # Hebrew date reminder file
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
+# Copyright (C) 1992-1997 by Dianne Skoll
 # Copyright (C) 1999-2000 by Roaring Penguin Software Inc.

 BANNER %
@@ -24,7 +24,7 @@ ENDIF
 # dates were obtained from "The First Jewish Catalog" by Richard Siegel	 #
 # and Michael and Sharon Strassfeld, published by the Jewish Publication #
 # Society of America.  The Reform version of the calendar was guessed	 #
-# at by David Skoll based on experience.  Additional corrections were    #
+# at by Dianne Skoll based on experience.  Additional corrections were    #
 # made from the paper "Calendrical Calculations" by Nachum Dershowitz    #
 # and Edward M. Reingold.  Any further corrections are welcome.          #
 #									 #
--- a/www/hebhtml
+++ b/www/hebhtml
@@ -2,7 +2,7 @@
 # HTML calendar shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
+# Copyright (C) 1992-1997 by Dianne Skoll
 # Copyright (C) 1999-2000 by Roaring Penguin Software Inc.

 echo "Content-Type: text/html"
--- a/www/hebps
+++ b/www/hebps
@@ -2,7 +2,7 @@
 # Hebrew PostScript calendar shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
+# Copyright (C) 1992-1997 by Dianne Skoll
 # Copyright (C) 1999-2000 by Roaring Penguin Software Inc.

 # Figure out the month:  If day <= 20, use this month; otherwise, use
--- a/www/lastquarter.png
+++ b/www/lastquarter.png
--- a/www/moon
+++ b/www/moon
@@ -2,7 +2,7 @@
 # Moon shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
+# Copyright (C) 1992-1997 by Dianne Skoll
 # Copyright (C) 1999-2000 by Roaring Penguin Software Inc.

 echo Content-type: text/html
--- a/www/moon.rem-DIST
+++ b/www/moon.rem-DIST
@@ -1,7 +1,7 @@
 # File for giving moon phase info.
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
+# Copyright (C) 1992-1997 by Dianne Skoll
 # Copyright (C) 1999-2000 by Roaring Penguin Software Inc.

 set now now()
--- a/www/newmoon.png
+++ b/www/newmoon.png
--- a/www/php/remind.php
+++ b/www/php/remind.php
@@ -4,8 +4,8 @@ class Remind
 {
    # For validating commands we send to popen
    function is_valid_day($d) {
-	return (preg_match('/^\d+$/', $d) &&
-	       $d >= 1 && $d <= 31;
+	return (preg_match('/^\d+$/', $d)) &&
+		$d >= 1 && $d <= 31;
    }

    function is_valid_month($m) {
@@ -160,6 +160,22 @@ class Remind
 	return $html;
    }

+    function small_calendar($results, $month, $monlen, $first_col, $which, &$options)
+    {
+	$monday_first = $results['monday_flag'];
+	if ($monday_first) {
+	    $first_col--;
+	    if ($first_col < 0) {
+		$first_col = 6;
+	    }
+	}
+
+	$html = "<td class=\"rem-small-calendar\">\n<table class=\"rem-sc-table\">\n<caption class=\"rem-sc-caption\">";
+	# TODO: URL for small calendar
+	$html .= $month;
+	$html .= "</caption>\n";
+    }
+
    function generate_html(&$results, &$specials, &$options)
    {
 	$monday_first = $results['monday_flag'];
@@ -318,8 +334,8 @@ $fp = popen('rem -p -l', 'r');
 $r = new Remind;
 $ans = $r->parse_remind_output($fp);
 pclose($fp);
-#print_r($ans);
+print_r($ans);
 $options = array();
-print $r->generate_html($ans['results'], $ans['specials'], $options);
+#print $r->generate_html($ans['results'], $ans['specials'], $options);

 ?>
--- a/www/rem2html
+++ b/www/rem2html
@@ -84,7 +84,7 @@ Insert I<html_text> right before the E<lt>/bodyE<gt> tag.

 =head1 AUTHOR

-rem2html was written by David F. Skoll with much inspiration from an
+rem2html was written by Dianne Skoll with much inspiration from an
 earlier version by Don Schwarz.

 =cut
--- a/www/sunrise
+++ b/www/sunrise
@@ -2,7 +2,7 @@
 # Sunrise shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
+# Copyright (C) 1992-1997 by Dianne Skoll
 # Copyright (C) 1999-2000 by Roaring Penguin Software Inc.

 echo Content-type: text/html
--- a/www/sunrise.rem-DIST
+++ b/www/sunrise.rem-DIST
@@ -1,7 +1,7 @@
 # File for giving sunrise info
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
+# Copyright (C) 1992-1997 by Dianne Skoll
 # Copyright (C) 1999-2000 by Roaring Penguin Software Inc.

 set now now()
--- a/www/sunset
+++ b/www/sunset
@@ -2,7 +2,7 @@
 # Sunset shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
+# Copyright (C) 1992-1997 by Dianne Skoll
 # Copyright (C) 1999-2000 by Roaring Penguin Software Inc.

 echo Content-type: text/html
--- a/www/sunset.rem-DIST
+++ b/www/sunset.rem-DIST
@@ -1,7 +1,7 @@
 # File for giving sunset info
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
+# Copyright (C) 1992-1997 by Dianne Skoll
 # Copyright (C) 1999-2000 by Roaring Penguin Software Inc.

 set now now()
Author	SHA1	Message	Date
Dianne Skoll	81749ac1c9	Update release notes.	2015-07-27 15:41:14 -04:00
Dianne Skoll	65989c29b7	Add test for bug found by Alexander Keller	2015-07-27 15:38:11 -04:00
Dianne Skoll	ec4e58f25c	Proper fix for overflow.	2015-07-27 13:20:00 -04:00
Dianne Skoll	0c699c2a19	Fix potential buffer overflow.	2015-07-27 13:18:16 -04:00
Dianne Skoll	739a938d32	Don't permit repeated DELTA or REPEATs either.	2015-05-27 13:21:33 -04:00
Dianne Skoll	61ad405b4a	Reject AT clause with more than one following TIME.	2015-05-27 13:19:25 -04:00
Dianne Skoll	700e649e76	Fix typo in year. Pointed out by hymie@lactose.homelinux.net	2015-04-24 15:33:35 -04:00
Dianne Skoll	7bfdb1f0eb	Document the magic __EOF__ marker.	2015-04-24 14:42:48 -04:00
Dianne Skoll	0c0280b2a9	Add test for __EOF__	2015-04-24 14:40:12 -04:00
Dianne Skoll	57a1871077	Fix test output.	2015-04-24 14:37:32 -04:00
Dianne Skoll	ee972ad29f	Update version to 3.1.14	2015-04-24 14:37:06 -04:00
David F. Skoll	29c8475ea9	s/David/Dianne/	2015-04-17 02:07:18 -04:00
David F. Skoll	6dd0f6ed63	Fix typo.	2014-11-06 14:32:30 -05:00
David F. Skoll	fc2d7ae446	Add support for __EOF__ to make Remind stop reading a file.	2014-05-22 14:19:06 -04:00
David F. Skoll	d232ac0334	Clear out MD5 context correctly.	2014-02-14 12:46:12 -05:00
David F. Skoll	6e8dd68c8a	Use ADVANCE_MODE rather than CAL_MODE for "-n" cmdline option.	2013-04-30 15:58:02 -04:00
David F. Skoll	495cc1b38d	Improve PNG images.	2013-03-22 16:21:52 -04:00
David F. Skoll	d90e74b1a3	Update release notes.	2013-03-22 15:48:04 -04:00
David F. Skoll	bbd8a4b729	Bump version to 3.1.13.	2013-03-22 15:44:03 -04:00
David F. Skoll	cae3e18717	Two cleanup patches from Simon Ruderich.	2013-03-18 14:07:09 -04:00
David F. Skoll	0e989a7422	Use atan2 instead of atan.	2013-03-10 18:00:36 -04:00
David F. Skoll	7b7ce5bb57	Remove dead code and dead variable.	2013-03-08 10:27:38 -05:00
David F. Skoll	df95cdaad0	Final sunrise/sunset tweakage.	2013-03-08 10:26:48 -05:00
David F. Skoll	3026b6e5c2	Tweak sun stuff per John McGowan ticket #27369 .	2013-03-07 13:49:53 -05:00
David F. Skoll	b3306c5572	Revert change: TrigAttempts too hard to define.	2012-12-09 11:23:02 -05:00
David F. Skoll	9ef3be33e5	Add new $TrigAttempts special var.	2012-12-09 11:17:16 -05:00
David F. Skoll	292262c128	-z defaults to 1, not 5, so correct man page and help output. Thanks to Simon Ruderich for pointing out the bug.	2012-11-01 13:07:42 -04:00
David F. Skoll	e54bfe9197	Minor patches from Simon Ruderich	2012-10-18 09:31:12 -04:00
David F. Skoll	c56cfe9e1d	Fix test harness failure.	2012-05-08 16:54:54 -04:00
David F. Skoll	f6b6a3285c	Apply patch from Jonathan Kamens to allow 0-point margins.	2012-04-26 08:57:37 -04:00
David F. Skoll	6b031b0fdf	Change "Daylight Savings" to "Daylight Saving"	2012-03-23 15:45:49 -04:00
David F. Skoll	2dab7025ba	Fix incorrect info in man page.	2012-03-14 11:47:43 -04:00
David F. Skoll	7403114897	Patch to allow compilation with gcc 2.95.	2012-02-13 10:23:53 -05:00
David F. Skoll	82cbeec560	Update tests to skip sun-tests by default.	2012-01-23 13:21:50 -05:00
David F. Skoll	df6b4ac566	Update release notes.	2012-01-23 13:08:22 -05:00
David F. Skoll	4ba21ab526	Fix test-all-languages.sh.	2012-01-23 12:01:11 -05:00
David F. Skoll	acac7a7b31	Add shell script to test all languages. Add %* substitutions to tstlang.rem	2012-01-23 11:58:07 -05:00
David F. Skoll	2290fd09f5	Add altmode to various languages.	2012-01-23 11:49:32 -05:00
David F. Skoll	f02b6a1773	"-x" flag to git-ls-files doesn't work, apparently.	2012-01-23 11:14:00 -05:00
David F. Skoll	efffe05d42	Merge branch 'master' of ssh://source.roaringpenguin.com/home/dfs/personal-git-repos/Remind	2012-01-20 15:49:27 -05:00
David F. Skoll	950d67c522	Update Finnish translation for altmode.	2012-01-20 15:49:03 -05:00
David F. Skoll	a1aa61f54e	Fix comment.	2012-01-12 13:12:59 -05:00
David F. Skoll	3c2bd66460	Clarify wording.	2012-01-12 13:05:46 -05:00
David F. Skoll	245cebee56	If multiple -a options are supplied, then do trigger timed reminders that are in the future.	2012-01-12 13:04:53 -05:00
David F. Skoll	c45364fdb3	More WIP on PHP stuff.	2012-01-12 12:48:36 -05:00
David F. Skoll	e380308604	More sunstuff tweaking.	2011-12-28 13:14:24 -05:00
David F. Skoll	bd019524dd	Update test output	2011-12-28 08:50:03 -05:00
David F. Skoll	895536d7d3	Use proper value of cos(6 degrees) for dusk/dawn	2011-12-28 08:49:37 -05:00
David F. Skoll	3a0e41afd1	Round off sun times to nearest minute.	2011-12-27 12:34:17 -05:00
David F. Skoll	23dd28471e	Update sunrise/sunset calculations with different formula for mean anomaly.	2011-12-27 12:20:36 -05:00
David F. Skoll	761217d403	Add dawn/sunrise/sunset/dusk tests.	2011-12-26 17:44:34 -05:00
David F. Skoll	77ed694111	Use proper formula for dusk/dawn.	2011-12-26 14:41:21 -05:00
David F. Skoll	61bcce3104	Add tests for %x and upper-case %X substitutions.	2011-12-25 11:43:07 -05:00
David F. Skoll	bf41b12ccd	Paranoia.	2011-12-24 11:04:21 -05:00
David F. Skoll	5eabd7d8d8	Fix dumb error. :)	2011-12-24 11:02:52 -05:00
David F. Skoll	0c66f5f3af	Add "alternate" substitution mode: %*X is the same as %x but it leaves out the preposition "at" or "on".	2011-12-24 10:58:37 -05:00