Update release notes.

Thanks to Simon Ruderich for pointing out the bug.

configure

@@ -3949,7 +3949,7 @@ _ACEOF
 fi
 done
 
-VERSION=03.01.11
+VERSION=03.01.13
 
 ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h"
 

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.13
 AC_SUBST(VERSION)
 AC_OUTPUT(src/Makefile www/Makefile src/version.h)

docs/WHATSNEW

@@ -1,5 +1,34 @@
 CHANGES TO REMIND
 
+* 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 +579,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.

examples/defs.rem

@@ -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%"

man/remind.1

@@ -149,10 +149,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 +236,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
@@ -1455,7 +1458,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 +1872,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 +1888,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 +1927,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 +1987,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 +1997,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 +2399,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 +2740,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

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)
 

src/custom.h.in

@@ -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?          */

src/dorem.c

@@ -924,7 +924,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...

src/dosubst.c

@@ -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);
+	    }
 	}
     }
 

src/funcs.c

@@ -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));

src/init.c

@@ -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':
@@ -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");

src/langs/danish.h

@@ -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

src/langs/finnish.h

@@ -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); \

src/langs/french.h

@@ -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 */
 

src/langs/german.h

@@ -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
 

src/langs/norwgian.h

@@ -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
 

src/langs/polish.h

@@ -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
 

src/omit.c

@@ -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;

src/rem2ps.c

@@ -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++) {

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

src/trigger.c

@@ -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;

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()]

tests/test-rem

@@ -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"

tests/test.cmp

@@ -836,7 +836,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.13"
 set a059 wkday(today())
 today() => 1991-02-16
 wkday(1991-02-16) => "Saturday"
@@ -935,11 +935,81 @@ msg [a076]%
 ../tests/test.rem(272): 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(274): 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(276): 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(278): 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(280): 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(282): 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(284): 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(286): 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(288): 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(290): 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(292): 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(294): 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(296): Trig = Saturday, 16 February, 1991
 a077 => "1992 92
 "
 1992 92
@@ -967,7 +1037,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 +1046,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 +1054,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.13"
             a077  "1992 92
 "
             a049  21
@@ -1048,10 +1118,10 @@ dump
             a083  1991-03-24
 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(308): 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(310): Trig = Sunday, 26 December, 2010
 OMIT DUMP
 Global Full OMITs (16 of maximum allowed 500):
 	1991-03-11
@@ -3411,3 +3481,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
+

tests/test.rem

@@ -270,7 +270,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)

tests/tstlang.rem

@@ -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

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);
 
 ?>