Update release notes.

that are in the future.

configure.in

@@ -75,6 +75,6 @@ if test "$GCC" = yes; then
 fi
 
 AC_CHECK_FUNCS(setenv unsetenv glob mbstowcs setlocale)
-VERSION=03.01.10
+VERSION=03.01.11
 AC_SUBST(VERSION)
 AC_OUTPUT(src/Makefile www/Makefile src/version.h)

contrib/remind-conf-mode.06/remind-conf-mode.el

@@ -112,7 +112,7 @@
 	 "WARN" "UNTIL" "THROUGH" "SCANFROM" "DURATION" "TAG" "MSG" "MSF" "CAL" "SPECIAL" "IFTRIG"
 	 "PS" "PSFILE" "BANNER" "INCLUDE" "PUSH-OMIT-CONTEXT" "DEBUG" "DUMPVARS"
 	 "CLEAR-OMIT-CONTEXT" "POP-OMIT-CONTEXT"  "SET" "ERRMSG" "FSET"
-	 "EXIT" "FLUSH" "PRESERVE" "MOON" "COLOR")
+	 "EXIT" "FLUSH" "PRESERVE" "MOON" "COLOR" "COLOUR")
    #'(lambda (a b) (> (length a) (length b)))))
 
 (defconst remind-type-keywords

docs/WHATSNEW

@@ -1,5 +1,31 @@
 CHANGES TO REMIND
 
+* 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
+  the sun was 14 degrees below the horizon instead of the standard 6
+  degrees for Civil Dawn.  This has been fixed.
+
+- BUG FIXES: Clarified the man pages and fixed some typos.
+
+- BUG FIX: Add THROUGH to the remind.vim syntax highlighting file.
+
+- ENHANCEMENT (?): Allow SPECIAL COLOR to be spelled SPECIAL COLOUR.
+
+- BUG FIX: Apply minor Debian cleanups reported by Kurt B. Kaiser.
+
 * Version 3.1 Patch 10 - 2010-11-01
 
 - NOTE: This is the 20th anniversary of Remind's first public release.

examples/remind.vim

@@ -19,11 +19,11 @@ endif
 syn case ignore
 
 syn keyword remindCommands	REM OMIT SET FSET UNSET
-syn keyword remindExpiry	UNTIL FROM SCANFROM SCAN WARN SCHED
+syn keyword remindExpiry	UNTIL FROM SCANFROM SCAN WARN SCHED THROUGH
 syn keyword remindTag		PRIORITY TAG
 syn keyword remindTimed		AT DURATION
 syn keyword remindMove		ONCE SKIP BEFORE AFTER
-syn keyword remindSpecial	INCLUDE INC BANNER PUSH-OMIT-CONTEXT PUSH CLEAR-OMIT-CONTEXT CLEAR POP-OMIT-CONTEXT POP COLOR
+syn keyword remindSpecial	INCLUDE INC BANNER PUSH-OMIT-CONTEXT PUSH CLEAR-OMIT-CONTEXT CLEAR POP-OMIT-CONTEXT POP COLOR COLOUR
 syn keyword remindRun		MSG MSF RUN CAL SATISFY SPECIAL PS PSFILE SHADE MOON
 syn keyword remindConditional	IF ELSE ENDIF IFTRIG
 syn keyword remindDebug		DEBUG DUMPVARS DUMP ERRMSG FLUSH PRESERVE

man/cm2rem.1

@@ -1,5 +1,5 @@
 .TH CM2REM 1 "18 October 1999"
-.UC4
+.UC 4
 .SH NAME
 cm2rem.tcl \- Convert Sun's "cm" input file to Remind format
 .SH SYNOPSIS

man/rem.1

@@ -1,5 +1,5 @@
 .TH REM 1 "30 August 2007"
-.UC4
+.UC 4
 .SH NAME
 rem \- Invoke Remind with a default filename
 .SH SYNOPSIS

man/rem2ps.1

@@ -1,5 +1,5 @@
 .TH REM2PS 1 "11 April 2005"
-.UC4
+.UC 4
 .SH NAME
 rem2ps \- draw a PostScript calendar from Remind output
 .SH SYNOPSIS

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
@@ -225,7 +231,7 @@ As an example, suppose you have an X Window program called \fBxmessage\fR that
 pops up a window and displays its invocation arguments.  You could use:
 .PP
 .nf
-		remind '-kxmessage %s &' ...
+		remind '\-kxmessage %s &' ...
 .fi
 .PP
 to have all of your \fBMSG\fR-type reminders processed using xmessage.
@@ -706,7 +712,7 @@ month is computed as the first Monday in the next month, minus 7 days.
 The \fIback\fR specification in the reminder is used in this case:
 .PP
 .nf
-	REM Mon 1 -7 MSG Last Monday of every month.
+	REM Mon 1 \-7 MSG Last Monday of every month.
 .fi
 .PP
 A \fIback\fR is specified with one or two dashes followed by an integer.
@@ -857,7 +863,7 @@ the reminder is triggered on the first of each month, as well as the day
 preceding it.  The omitted days are counted.
 .PP
 .nf
-	REM 1 -1 OMIT Sat Sun MSG Last working day of month
+	REM 1 \-1 OMIT Sat Sun MSG Last working day of month
 .fi
 .PP
 Again, in the above example, the \fIback\fR of \-1 normally causes the
@@ -985,7 +991,7 @@ command-line option.  This is useful, for example, in .xinitrc
 scripts, where you can use the command:
 .PP
 .nf
-	remind -fa myreminders &
+	remind \-fa myreminders &
 .fi
 .PP
 This ensures that when you exit X-Windows, the \fBRemind\fR process is killed.
@@ -1869,7 +1875,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 +1891,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
@@ -1953,7 +1957,7 @@ If non-zero, then the \fB\-t\fR option was supplied on the command line.
 .TP
 .B $LatDeg, $LatMin, $LatSec
 These specify the latitude of your location.  \fB$LatDeg\fR can
-range from -90 to 90, and the others from -59 to 59.  Northern latitudes
+range from \-90 to 90, and the others from \-59 to 59.  Northern latitudes
 are positive; southern ones are negative.  For southern latitudes, all
 three components should be negative.
 .TP
@@ -1965,8 +1969,10 @@ the latitude and longitude system variables.
 .TP
 .B $LongDeg, $LongMin, $LongSec
 These specify the longitude of your location.  \fB$LongDeg\fR can
-range from -180 to 180.  Western longitudes are positive; eastern
-ones are negative.
+range from \-180 to 180.  Western longitudes are positive; eastern
+ones are negative.  Note that all three components should have the
+same sign: All positive for Western longitudes and all negative
+for Eastern longitudes.
 .RS
 .PP
 The latitude and longitude information is required for the functions
@@ -1994,7 +2000,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
@@ -2114,11 +2120,11 @@ be a string, containing a mix of the characters "rwx" for read,
 write and execute permission testing.  Alternatively, \fImode\fR can
 be a number as described in the UNIX \fBaccess\fR(2) system call.  The
 function returns 0 if the file can be accessed with the specified \fImode\fR,
-and -1 otherwise.
+and \-1 otherwise.
 .TP
 .B args(s_fname)
 Returns the number of arguments expected by the user-defined function
-\fIfname\fR, or -1 if no such user-defined function exists.  Note that
+\fIfname\fR, or \-1 if no such user-defined function exists.  Note that
 this function examines only user-defined functions, not built-in functions.
 Its main use is to determine whether or not a particular user-defined
 function has been defined previously.  The \fBargs()\fR function is
@@ -2624,7 +2630,7 @@ does not check for this.)  For example, if you want the time of each new
 moon displayed, you could use this in your reminder script:
 .PP
 .nf
-	REM [moondate(0)] PS [psmoon(0, -1, moontime(0)+"")]
+	REM [moondate(0)] PS [psmoon(0, \-1, moontime(0)+"")]
 .fi
 .PP
 Note how the time is coerced to a string by concatenating the null string.
@@ -2666,7 +2672,7 @@ Returns the date as provided by the operating system.  This is in contrast to
 in calendar mode, or if a date has been supplied on the command line.
 .TP
 .B sgn(i_num)
-Returns -1 if \fInum\fR is negative, 1 if \fInum\fR is positive,
+Returns \-1 if \fInum\fR is negative, 1 if \fInum\fR is positive,
 and 0 if \fInum\fR is zero.
 .TP
 .B shell(s_cmd [,i_maxlen])
@@ -2703,7 +2709,7 @@ May 16 and 17.  You can go backwards, too, so:
 .PP
 .nf
 	OMIT 14 May 2009
-	SET a slide('2009-05-21', -5, "Sat", "Sun")
+	SET a slide('2009-05-21', \-5, "Sat", "Sun")
 .fi
 .PP
 takes \fIa\fR back to 2009-05-13.
@@ -2737,7 +2743,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
@@ -2921,7 +2927,7 @@ exceptions:
 o
 If \fBRemind\fR is expecting an expression, as in the \fBSET\fR command,
 or the \fBIF\fR command, you should \fBnot\fR include square brackets.
-FOr example, use:
+For example, use:
 .PP
 .nf
 		SET a 4+5
@@ -3045,7 +3051,7 @@ to true if a corresponding \fBREM\fR command would trigger.  Examples:
 		; Executed except on 1 Nov
 	ENDIF
 
-	IFTRIG 1 -1 OMIT Sat Sun +4
+	IFTRIG 1 \-1 OMIT Sat Sun +4
 		; Executed on last working day of month,
 		; and the 4 working days preceding it
 	ELSE
@@ -3073,7 +3079,7 @@ you define a function taking no parameters.  Here are some examples:
 .nf
 	FSET double(x) 2*x
 	FSET yeardiff(date1, date2) year(date1) - year(date2)
-	FSET since(x) ord(year(trigdate())-x)
+	FSET since(x) ord(year(trigdate())\-x)
 .fi
 .PP
 The last function is useful in birthday reminders.  For example:
@@ -3197,7 +3203,7 @@ clause to do anything.
 Here's an example:
 .PP
 .nf
-	FSET _sfun(x) choose(x, -60, 30, 15, 10, 3, 1, 1, 1, 1, 0)
+	FSET _sfun(x) choose(x, \-60, 30, 15, 10, 3, 1, 1, 1, 1, 0)
 	REM AT 13:00 SCHED _sfun MSG foo
 .fi
 .PP
@@ -3449,7 +3455,7 @@ program to produce a calendar in PostScript format.  For example, the
 following command will send PostScript code to standard output:
 .PP
 .nf
-	remind -p .reminders | rem2ps
+	remind \-p .reminders | rem2ps
 .fi
 .PP
 You can print a PostScript calendar by piping this to the \fBlpr\fR command.
@@ -3458,7 +3464,7 @@ If you have a reminder script called ".reminders", and you
 execute this command:
 .PP
 .nf
-	remind -c .reminders jan 1993
+	remind \-c .reminders jan 1993
 .fi
 .PP
 then \fBRemind\fR executes the script 31 times, once for each day in
@@ -3691,7 +3697,7 @@ In daemon mode, \fBRemind\fR acts as if the \fB\-f\fR option had been used,
 so to run in the daemon mode in the background, use:
 .PP
 .nf
-	remind -z .reminders &
+	remind \-z .reminders &
 .fi
 .PP
 If you use \fBsh\fR or \fBbash\fR, you may have to use the "nohup" command
@@ -4106,7 +4112,7 @@ Calculations" by E. M. Reingold and Nachum Dershowitz.
 .PP
 The \fBSPECIAL\fR keyword is used to transmit "out-of-band" information
 to \fBRemind\fR backends, such as \fBtkremind\fR or \fBRem2PS\fR.
-They are used only when piping data from a \fBremind -p\fR line.
+They are used only when piping data from a \fBremind \-p\fR line.
 (Note that the COLOR special is an exception; it downgrades to the
 equivalent of MSG in \fBremind's\fR normal mode of operation.)
 .PP
@@ -4147,7 +4153,7 @@ of the \fBMOON\fR special is as follows:
 1 the first quarter, 2 a full moon and 3 the last quarter.
 .PP
 \fImoonsize\fR is the diameter in PostScript units of the moon to
-draw.  If omitted or supplied as -1, the backend chooses an appropriate
+draw.  If omitted or supplied as \-1, the backend chooses an appropriate
 size.
 .PP
 \fIfontsize\fR is the font size in PostScript units of the \fImsg\fR
@@ -4165,6 +4171,9 @@ calendar.  Use it like this:
 	REM ... SPECIAL COLOR 0 128 0 This is a dark green reminder
 .fi
 
+You can spell COLOR either the American way ("COLOR") or the British
+way ("COLOUR").  This manual will use the American way.
+
 Immediately following COLOR should be three decimal numbers ranging
 from 0 to 255 specifying red, green and blue intensities, respectively.
 The rest of the line is the text to put in the calendar.
@@ -4221,7 +4230,7 @@ This section is a sampling of what you can do with \fBRemind\fR.
 .PP
 .nf
 	REM 5 Feb 1991 AT 14:00 +45 *30 \\
-	RUN mail -s "Meeting at %2" $LOGNAME </dev/null &
+	RUN mail \-s "Meeting at %2" $LOGNAME </dev/null &
 .fi
 .PP
 On 5 February, 1991, this reminder will mail
@@ -4230,14 +4239,14 @@ you reminders of a 2:00pm meeting at 1:15,
 and the body of the message will be blank.
 .PP
 .nf
-	REM AT 17:00 RUN echo "5:00pm - GO HOME!" | xless -g +0+0 &
+	REM AT 17:00 RUN echo "5:00pm - GO HOME!" | xless \-g +0+0 &
 .fi
 .PP
 This reminder will pop up an xless window at 5:00pm every day.  The xless
 window will contain the line "5:00pm - GO HOME!"
 .PP
 .nf
-	REM AT 23:59 RUN (sleep 120; remind -a [filename()]) &
+	REM AT 23:59 RUN (sleep 120; remind \-a [filename()]) &
 .fi
 .PP
 This reminder will run at one minute to midnight.  It will cause a new
@@ -4255,7 +4264,7 @@ This invocation of \fBRemind\fR will cause it to print a calendar for
 1993, with all entries left blank.
 .PP
 .nf
-	REM CAL [trigdate()-date(year(trigdate()), 1, 1)+1]
+	REM CAL [trigdate()\-date(year(trigdate()), 1, 1)+1]
 .fi
 .PP
 This example puts an entry in each box of a calendar showing the number
@@ -4315,7 +4324,7 @@ in September.  It can move over a range of 7 days.  Consider the
 following sequence:
 .PP
 .nf
-	REM Mon 1 Sept SCANFROM [today()-7] SATISFY 1
+	REM Mon 1 Sept SCANFROM [today()\-7] SATISFY 1
 	OMIT [trigdate()]
 
 	REM Mon AFTER MSG Hello

man/tkremind.1

@@ -74,7 +74,7 @@ The next control specifies an expiry date for the reminder.  Select
 the check button to enable an expiry date, and fill in the values
 using pull-down menus.
 
-The third control specifes how much advance notice you want (if any),
+The third control specifies how much advance notice you want (if any),
 and whether or not weekends and holidays are counted when computing advance
 notice.
 
@@ -179,7 +179,7 @@ it starts up in a normal window.
 .TP
 .B Show Today's Reminders on Startup
 If this is selected, \fBTkRemind\fR shows a text window containing reminders
-which would be issued by "remind -q -a -r" on startup, and when the date
+which would be issued by "remind \-q \-a \-r" on startup, and when the date
 changes at midnight.
 
 .TP
@@ -268,7 +268,7 @@ the body.  Furthermore, if you use expression-pasting in the body,
 When \fBTkRemind\fR invokes \fBRemind\fR, it supplies the option:
 .PP
 .nf
-	-itkremind=1
+	\-itkremind=1
 .fi
 .PP
 on the command line.  So, in your \fBRemind\fR file, you can include:

scripts/tkremind

@@ -796,6 +796,7 @@ proc FillCalWindow {} {
 		DoMoonSpecial $n $stuff
 		continue
 	    }
+	    "COLOUR" -
 	    "COLOR" {
 		if {[regexp {^ *([0-9]+) +([0-9]+) +([0-9]+) +(.*)$} $stuff all r g b rest]} {
 		    if {$r > 255} {
@@ -822,7 +823,7 @@ proc FillCalWindow {} {
 		}
 	    }
 	}
-	if { $type != "*" && $type != "COLOR"} {
+	if { $type != "*" && $type != "COLOR" && $type != "COLOUR"} {
 	    continue
 	}
 	.cal.t$n configure -state normal

src/Makefile.in

@@ -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/calendar.c

@@ -1016,11 +1016,12 @@ static int DoCalRem(ParsePtr p, int col)
 	trig.typ = PASSTHRU_TYPE;
     }
     if (trig.typ == PASSTHRU_TYPE) {
-	if (!PsCal && strcmp(trig.passthru, "COLOR")) {
+	if (!PsCal && strcmp(trig.passthru, "COLOR") && strcmp(trig.passthru, "COLOUR")) {
 	    FreeTrig(&trig);
 	    return OK;
 	}
-	if (!strcmp(trig.passthru, "COLOR")) {
+	if (!strcmp(trig.passthru, "COLOR") ||
+	    !strcmp(trig.passthru, "COLOUR")) {
 	    is_color = 1;
 	    /* Strip off the three color numbers */
 	    DBufFree(&buf);
@@ -1073,6 +1074,7 @@ static int DoCalRem(ParsePtr p, int col)
 	    /* Suppress time if it's not today or if it's a non-COLOR special */
 	    if (jul != JulianToday ||
 		(trig.typ == PASSTHRU_TYPE &&
+		 strcmp(trig.passthru, "COLOUR") &&
 		 strcmp(trig.passthru, "COLOR"))) {
 		if (DBufPuts(&obuf, SimpleTime(NO_TIME)) != OK) {
 		    DBufFree(&obuf);

src/dorem.c

@@ -708,14 +708,14 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
     DBufInit(&calRow);
     DBufInit(&pre_buf);
     if (t->typ == RUN_TYPE && RunDisabled) return E_RUN_DISABLED;
-    if ((t->typ == PASSTHRU_TYPE && strcmp(t->passthru, "COLOR")) ||
+    if ((t->typ == PASSTHRU_TYPE && strcmp(t->passthru, "COLOR") && strcmp(t->passthru, "COLOUR")) ||
 	t->typ == CAL_TYPE ||
 	t->typ == PS_TYPE ||
 	t->typ == PSF_TYPE)
 	return OK;
 
     /* Handle COLOR types */
-    if (t->typ == PASSTHRU_TYPE && !strcmp(t->passthru, "COLOR")) {
+    if (t->typ == PASSTHRU_TYPE && (!strcmp(t->passthru, "COLOR") || !strcmp(t->passthru, "COLOUR"))) {
 	/* Strip off three tokens */
 	r = ParseToken(p, &buf);
 	if (!NextMode) {
@@ -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

@@ -1854,10 +1854,11 @@ 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;
+    int jan0;
+    double jan0d;
 
     double M, L, tanA, sinDelta, cosDelta, a, a_hr, cosH, t, H, T;
     double latitude, longdeg, UT, local;
@@ -1880,25 +1881,34 @@ static int SunStuff(int rise, double cosz, int jul)
 
     FromJulian(jul, &year, &mon, &day);
     jan0 = jul - Julian(year, 0, 1);
+    jan0d = (double) jan0;
 
     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;
+	jan0d += (6.0 + longdeg/15.0) / 24.0;
+    } else {
+	t += (18.0 + longdeg/15.0) / 24.0;
+	jan0d += (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
+    M = (0.9856002585 * 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 -= 14;
-    }
     if (L > 360.0) L -= 360.0;
 
 /* Tan of sun's right ascension */
@@ -1941,7 +1951,7 @@ 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 = H / 15.0 + a_hr - 0.065710 * jan0d - 6.620;
     if (T >= 24.0) T -= 24.0;
     else if (T < 0.0) T+= 24.0;
     
@@ -1952,6 +1962,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 +1988,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

@@ -8,7 +8,7 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2010 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1999-2011 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
@@ -137,7 +137,7 @@ void InitRemind(int argc, char const *argv[])
     char const *s;
     int weeks;
 
-    int jul, tim;
+    int jul;
 
 #if defined(__APPLE__)
     rkrphgvba(0);
@@ -146,7 +146,6 @@ void InitRemind(int argc, char const *argv[])
 #endif
 
     jul = NO_DATE;
-    tim = NO_TIME;
 
     /* Initialize global dynamic buffers */
     DBufInit(&Banner);
@@ -318,7 +317,7 @@ void InitRemind(int argc, char const *argv[])
 
 	    case 'a':
 	    case 'A':
-		DontIssueAts = 1;
+		DontIssueAts++;
 		break;
 
 	    case 'q':
@@ -570,12 +569,12 @@ void InitRemind(int argc, char const *argv[])
 	    }
 	    if (d == NO_DAY) d=1;
 	    if (d > DaysInMonth(m, y)) {
-		fprintf(ErrFp, BadDate);
+		fprintf(ErrFp, "%s", BadDate);
 		Usage();
 	    }
 	    JulianToday = Julian(y, m, d);
 	    if (JulianToday == -1) {
-		fprintf(ErrFp, BadDate);
+		fprintf(ErrFp, "%s", BadDate);
 		Usage();
 	    }
 	    CurYear = y;
@@ -602,7 +601,7 @@ void InitRemind(int argc, char const *argv[])
 void Usage(void)
 {
     fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 David F. Skoll\n", VERSION, L_LANGNAME);
-    fprintf(ErrFp, "Copyright 1999-2010 Roaring Penguin Software Inc.\n");
+    fprintf(ErrFp, "Copyright 1999-2011 Roaring Penguin Software Inc.\n");
 #ifdef BETA
     fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
 #endif
@@ -678,7 +677,7 @@ static void ChgUser(char const *user)
 
     home = malloc(strlen(pwent->pw_dir) + 6);
     if (!home) {
-	fprintf(ErrFp, ErrMsg[M_NOMEM_ENV]);
+	fprintf(ErrFp, "%s", ErrMsg[M_NOMEM_ENV]);
 	exit(1);
     }
     sprintf(home, "HOME=%s", pwent->pw_dir);
@@ -686,7 +685,7 @@ static void ChgUser(char const *user)
 
     shell = malloc(strlen(pwent->pw_shell) + 7);
     if (!shell) {
-	fprintf(ErrFp, ErrMsg[M_NOMEM_ENV]);
+	fprintf(ErrFp, "%s", ErrMsg[M_NOMEM_ENV]);
 	exit(1);
     }
     sprintf(shell, "SHELL=%s", pwent->pw_shell);
@@ -695,14 +694,14 @@ static void ChgUser(char const *user)
     if (pwent->pw_uid) {
 	username = malloc(strlen(pwent->pw_name) + 6);
 	if (!username) {
-	    fprintf(ErrFp, ErrMsg[M_NOMEM_ENV]);
+	    fprintf(ErrFp, "%s", ErrMsg[M_NOMEM_ENV]);
 	    exit(1);
 	}
 	sprintf(username, "USER=%s", pwent->pw_name);
 	putenv(username);
 	logname= malloc(strlen(pwent->pw_name) + 9);
 	if (!logname) {
-	    fprintf(ErrFp, ErrMsg[M_NOMEM_ENV]);
+	    fprintf(ErrFp, "%s", ErrMsg[M_NOMEM_ENV]);
 	    exit(1);
 	}
 	sprintf(logname, "LOGNAME=%s", pwent->pw_name);

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/main.c

@@ -7,7 +7,7 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2010 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1999-2011 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 

src/rem2ps.c

@@ -366,6 +366,7 @@ void DoPsCal(void)
 		}
 	    }
 	} else if (!strcmp(passthru, "*") ||
+		   !strcmp(passthru, "COLOUR") ||
 	           !strcmp(passthru, "COLOR")) {
 	    /* Put on linked list */
 	    if (!CurEntries) {
@@ -375,7 +376,8 @@ void DoPsCal(void)
 		while(d->next) d = d->next;
 		d->next = c;
 	    }
-	    if (!strcmp(passthru, "COLOR")) {
+	    if (!strcmp(passthru, "COLOR") ||
+		!strcmp(passthru, "COLOUR")) {
 		c->special = SPECIAL_COLOR;
 	    }
 	}

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

tests/colors.rem

@@ -7,11 +7,11 @@ REM 28 SPECIAL COLOR 65 0 65 Dim Magenta
 REM 28 SPECIAL COLOR 65 65 0 Dim Yellow
 REM 28 SPECIAL COLOR 65 65 65 Dim White
 
-REM 28 SPECIAL COLOR 129 0 0 Bright Red
-REM 28 SPECIAL COLOR 0 129 0 Bright Green
-REM 28 SPECIAL COLOR 0 0 129 Bright Blue
-REM 28 SPECIAL COLOR 0 129 129 Bright Cyan
-REM 28 SPECIAL COLOR 129 0 129 Bright Magenta
-REM 28 SPECIAL COLOR 129 129 0 Bright Yellow
-REM 28 SPECIAL COLOR 129 129 129 Bright White
+REM 28 SPECIAL COLOUR 129 0 0 Bright Red
+REM 28 SPECIAL COLOUR 0 129 0 Bright Green
+REM 28 SPECIAL COLOUR 0 0 129 Bright Blue
+REM 28 SPECIAL COLOUR 0 129 129 Bright Cyan
+REM 28 SPECIAL COLOUR 129 0 129 Bright Magenta
+REM 28 SPECIAL COLOUR 129 129 0 Bright Yellow
+REM 28 SPECIAL COLOUR 129 129 129 Bright White
 

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

@@ -81,6 +81,24 @@ 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
 
+../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.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

unconfigure

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 echo "Unconfiguring Remind..."
-echo rm -f config.cache config.log config.status src/Makefile src/config.h src/version.h
-rm -f config.cache config.log config.status src/Makefile src/config.h src/version.h
+echo rm -f config.cache config.log config.status src/Makefile src/config.h src/version.h www/Makefile
+rm -f config.cache config.log config.status src/Makefile src/config.h src/version.h www/Makefile
 exit 0

www/php/remind.php

@@ -0,0 +1,341 @@
+<?php
+
+class Remind
+{
+    # For validating commands we send to popen
+    function is_valid_day($d) {
+	return (preg_match('/^\d+$/', $d)) &&
+		$d >= 1 && $d <= 31;
+    }
+
+    function is_valid_month($m) {
+	return
+	    ($m == 'January') ||
+	    ($m == 'February') ||
+	    ($m == 'March') ||
+	    ($m == 'April') ||
+	    ($m == 'May') ||
+	    ($m == 'June') ||
+	    ($m == 'July') ||
+	    ($m == 'August') ||
+	    ($m == 'September') ||
+	    ($m == 'October') ||
+	    ($m == 'November') ||
+	    ($m == 'December');
+    }
+
+    function is_valid_year($y) {
+	return preg_match('/^\d\d\d\d$/', $y) &&
+	    $y >= 1900;
+    }
+
+
+    function get_el(&$array, $i)
+    {
+	if (!array_key_exists($i, $array)) return null;
+	return $array[$i];
+    }
+
+    function get_elem($array, $indexes)
+    {
+	foreach ($indexes as $i) {
+	    if (!is_array($array)) return null;
+	    if (!array_key_exists($i, $array)) return null;
+	    $array = $array[$i];
+	}
+	return $array;
+    }
+
+    function munge_entry($day, &$results, &$specials, &$options, $str, &$e) {
+	return htmlspecialchars($str);
+    }
+
+    function format_entry($day, &$results, &$specials, &$options, &$e) {
+	$special = $this->get_el($e, 'special');
+	$body = $this->get_el($e, 'body');
+
+	if ($body === null) $body = '';
+	if ($special === null || $special == '*') {
+	    return $this->munge_entry($day, $results, $specials, $options, $body, $e);
+	}
+	if ($special == 'COLOR' || $special == 'COLOUR') {
+	    if (preg_match('/^(\d+)\s+(\d+)\s+(\d+)\s+(.*)/', $body, $matches)) {
+		return sprintf('<span style="color: #%02x%02x%02x">%s</span>',
+			       $matches[1] % 255,
+			       $matches[2] % 255,
+			       $matches[3] % 255,
+			       $this->munge_entry($day, $results, $specials, $options, $matches[4], $e));
+	    }
+	    return 'Bad COLOR spec: ' . htmlspecialchars($body);
+	}
+
+	# HTML is passed through un-munged.
+	if ($special == 'HTML') return $body;
+
+	# Ignore unknown specials
+	return '';
+    }
+
+    function format_entries($day, &$results, &$specials, &$options, &$entries) {
+	$html = '';
+	foreach ($entries as $e) {
+	    $html .= '<div class="rem-entry">' . $this->format_entry($day, $results, $specials, $options, $e) . '</div>';
+	}
+	return $html;
+    }
+
+    function do_one_day($day, &$results, &$specials, &$options) {
+	$class = $this->get_elem($specials, array('HTMLCLASS', $day, 0, 'body'));
+	$shade = $this->get_elem($specials, array('SHADE', $day, 0, 'body'));
+	$moon  = $this->get_elem($specials, array('MOON', $day, 0, 'body'));
+
+	if ($class === null) $class = 'rem-cell';
+	$bg = '';
+	if ($shade !== null) {
+	    if (preg_match('/(\d+)\s+(\d+)\s+(\d+)/', $shade, $matches)) {
+		if ($matches[1] <= 255 && $matches[2] <= 255 && $matches[3] <= 255) {
+		    $bg = sprintf(' style="background: #%02x%02x%02x"',
+				  $matches[1], $matches[2], $matches[3]);
+		}
+	    }
+	}
+	$html = "<td class=\"$class\"$bg>";
+
+	$week = $this->get_elem($specials, array('WEEK', $day, 0, 'body'));
+	if ($week === null) {
+	    $week = '';
+	} else {
+	    $week = ' ' . $week;
+	}
+
+	$moon_html = '';
+	if ($moon !== null) {
+	    $phase = -1;
+	    if (preg_match('/(\d+)\s+(\S+)\s+(\S+)\s+(.*)$/', $moon, $matches)) {
+		$phase = $matches[1];
+		$moonsize = $matches[2];
+		$fontsize = $matches[3];
+		$msg = $matches[4];
+	    } elseif (preg_match('/(\d+)/', $moon, $matches)) {
+		$phase = $matches[1];
+		$msg = '';
+	    }
+	    if ($phase >= 0) {
+		if ($phase == 0) {
+		    $img = 'newmoon.png';
+		    $title = 'New Moon';
+		    $alt = 'new';
+		} elseif ($phase == 1) {
+		    $img = 'firstquarter.png';
+		    $title = 'First Quarter';
+		    $alt = '1st';
+		} elseif ($phase == 2) {
+		    $img = 'fullmoon.png';
+		    $alt = 'full';
+		    $title = 'Full Moon';
+		} else {
+		    $img = 'lastquarter.png';
+		    $alt = 'last';
+		    $title = 'Last Quarter';
+		}
+		$base = rtrim($this->get_el($options, 'imgbase'), '/');
+		if ($base !== null) {
+		    $img = $base . '/' . $img;
+		}
+		$moon_html = '<div class="rem-moon">' . "<img width=\"16\" height=\"16\" alt=\"$alt\" title=\"$title\" src=\"$img\">" . htmlspecialchars($msg) . '</div>';
+	    }
+	}
+
+	# Day number
+	$html .= $moon_html . '<div class="rem-daynumber">' . $day . $week . '</div>';
+
+	# And the entries
+	$entries = $this->get_elem($results, array('entries', $day));
+	if (is_array($entries) && count($entries) > 0) {
+	    $html .= '<div class="rem-entries">';
+	    $html .= $this->format_entries($day, $results, $specials, $options, $entries);
+	    $html .= '</div>';
+	}
+	$html .= "</td>\n";
+	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'];
+	$first_col = $results['first_day'];
+	if ($monday_first) {
+	    $first_col--;
+	    if ($first_col < 0) $first_col = 6;
+	}
+
+	$last_col = ($first_col + $results['days_in_mon'] -1) % 7;
+
+	$html = '<table class="rem-cal"><caption class="rem-cal-caption">' .
+	    htmlspecialchars($results['month']) . ' ' . htmlspecialchars($results['year']) .
+	    "</caption>\n";
+
+	$html .= '<tr class="rem-cal-hdr-row">';
+	if (!$monday_first) $html    .= '<th class="rem-cal-hdr">' . htmlspecialchars($results['day_names'][0])  . '</th>';
+	for ($i=1; $i<7; $i++) $html .= '<th class="rem-cal-hdr">' . htmlspecialchars($results['day_names'][$i]) . '</th>';
+	if ($monday_first) $html     .= '<th class="rem-cal-hdr">' . htmlspecialchars($results['day_names'][0])  . '</th>';
+	$html .= "</tr>\n";
+
+	# Do the leading empty columns
+	for ($col=0; $col < $first_col; $col++) {
+	    if ($col == 0) $html .= '<tr class="rem-cal-body-row">';
+	    $html .= '<td class="rem-empty">&nbsp;</td>';
+	}
+
+	for ($day=1; $day <= $results['days_in_mon']; $day++) {
+	    if ($col == 0) $html .= '<tr class="rem-cal-body-row">';
+	    $col++;
+	    $html .= $this->do_one_day($day, $results, $specials, $options);
+	    if ($col == 7) {
+		$html .= "</tr>\n";
+		$col = 0;
+	    }
+	}
+	if ($col) {
+	    while ($col++ < 7) {
+		$html .= '<td class="rem-empty">&nbsp;</td>';
+	    }
+	}
+	$html .= "</tr>\n";
+
+	$html .= "</table>\n";
+	return $html;
+    }
+    function parse_remind_output ($fp)
+    {
+	while(1) {
+	    $line = fgets($fp);
+	    if ($line === false) break;
+	    $line = trim($line);
+	    if ($line == '# rem2ps begin') break;
+	}
+	if ($line === false) {
+	    return array('success' => 0,
+			 'error' => 'Could not find any Rem2PS data');
+	}
+
+	$line = fgets($fp);
+	if ($line === false) {
+	    return array('success' => 0,
+			 'error' => 'Unexpected end-of-file');
+	}
+
+	$line = trim($line);
+	list($month, $year, $days_in_mon, $first_day, $monday_flag) = explode(' ', $line);
+	$retval = array('month' => $month,
+			'year'  => $year,
+			'days_in_mon' => $days_in_mon,
+			'first_day' => $first_day,
+			'monday_flag' => $monday_flag);
+
+	$line = fgets($fp);
+	if ($line === false) {
+	    return array('success' => 0,
+			 'error' => 'Unexpected end-of-file');
+	}
+
+	$line = trim($line);
+	$retval['day_names'] = explode(' ', $line);
+
+	$line = fgets($fp);
+	if ($line === false) {
+	    return array('success' => 0,
+			 'error' => 'Unexpected end-of-file');
+	}
+	$line = trim($line);
+
+	list($m, $n) = explode(' ', $line);
+	$retval['prev'] = array('month' => $m, 'days' => $n);
+
+	$line = fgets($fp);
+	if ($line === false) {
+	    return array('success' => 0,
+			 'error' => 'Unexpected end-of-file');
+	}
+	$line = trim($line);
+
+	list($m, $n) = explode(' ', $line);
+	$retval['next'] = array('month' => $m, 'days' => $n);
+
+	$line_info = 0;
+
+	$entries = array();
+	$specials = array();
+	while (1) {
+	    $line = fgets($fp);
+	    if ($line === false) break;
+	    $line = trim($line);
+	    if ($line == '# rem2ps end') break;
+	    if (strpos($line, '# fileinfo ') === 0) {
+		list($lno, $fname) = explode(' ', substr($line, 11), 2);
+		$lineinfo = array('file' => $fname, 'line' => $lno);
+		continue;
+	    }
+	    list($date, $special, $tags, $duration, $time, $body) = explode(' ', $line, 6);
+	    list($y, $m, $d) = explode('/', $date);
+	    $d = preg_replace('/^0(.)/', '$1', $d);
+	    $m = preg_replace('/^0(.)/', '$1', $m);
+	    $entry = array('day' => $d,
+			   'month' => $m,
+			   'year' => $y,
+			   'special' => $special,
+			   'tags' => $tags,
+			   'duration' => $duration,
+			   'time' => $time,
+			   'body' => $body);
+	    if (is_array($lineinfo)) {
+		$entry['line'] = $lineinfo['line'];
+		$entry['file'] = $lineinfo['file'];
+		$lineinfo = 0;
+	    }
+	    if ($special != '*' && $special != 'COLOR' && $special != 'COLOUR' && $special != 'HTML') {
+		if (!array_key_exists($special, $specials)) {
+		    $specials[$special] = array();
+		}
+		if (!array_key_exists($d, $specials[$special])) {
+		    $specials[$special][$d] = array();
+		}
+		$specials[$special][$d][] = $entry;
+	    } else {
+		if (!array_key_exists($d, $entries)) {
+		    $entries[$d] = array();
+		}
+		$entries[$d][] = $entry;
+	    }
+
+	}
+	$retval['entries'] = $entries;
+	return array('success' => 1, 'results' => $retval, 'specials' => $specials);
+    }
+}
+
+$fp = popen('rem -p -l', 'r');
+$r = new Remind;
+$ans = $r->parse_remind_output($fp);
+pclose($fp);
+print_r($ans);
+$options = array();
+#print $r->generate_html($ans['results'], $ans['specials'], $options);
+
+?>

www/rem2html

@@ -257,7 +257,7 @@ sub parse_input
 			$shades->[$d] = sprintf("#%02X%02X%02X",
 						($1 % 256), ($2 % 256), ($3 % 256));
 		}
-	} elsif ($special eq 'COLOR') {
+	} elsif ($special eq 'COLOR' || $special eq 'COLOUR') {
 		if ($body =~ /(\d+)\s+(\d+)\s+(\d+)\s+(.*)$/) {
 			my($r, $g, $b, $text) = ($1, $2, $3, $4);
 			my $color = sprintf("style=\"color: #%02X%02X%02X;\"",