Update WHATSNEW.

Don't convert 90-99 to 1990-1999 when parsing numbers.

COPYRIGHT

@@ -3,7 +3,7 @@ THE REMIND COPYRIGHT
 1. REMIND refers to the entire set of files and documentation in the
 REMIND package.
 
-2. REMIND is Copyright 1992-2018 Dianne Skoll, except where noted in
+2. REMIND is Copyright 1992-2020 Dianne Skoll, except where noted in
 individual files.
 
 3. DISTRIBUTION AND USE

configure

@@ -3991,7 +3991,7 @@ _ACEOF
 fi
 done
 
-VERSION=03.02.00
+VERSION=03.03.01
 
 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.02.00
+VERSION=03.03.01
 AC_SUBST(VERSION)
 AC_OUTPUT(src/Makefile www/Makefile src/version.h)

docs/WHATSNEW

@@ -1,5 +1,71 @@
 CHANGES TO REMIND
 
+* VERSION 3.3 Patch 1 - 2020-03-20
+
+- CHANGE: For overlapping multi-day events, issue a reminder for the
+  most *recent* event rather than the earliest event.  NOTE
+  INCOMPATIBILITY: This is a behavior change!
+
+- CHANGE: Do not convert 90-99 to 1990-1999 when parsing numbers to
+  recognize years.  NOTE INCOMPATIBILITY: This is a behavior change!
+
+- CHANGE: Revert change to -y option that included filename and line
+  number in the hash.
+
+- CHANGE: Retain newlines (produced by %_) in JSON output.
+
+- FIX: Document $FormWidth system variable
+
+- FIX: Highlight today's date in "remind -c" output
+
+- FIX: Eliminate compiler warnings on Ubuntu 18.04.
+
+- IMPROVEMENT: Allow times to be specified either in 24-hour mode
+  (HH:MM or HH.MM) or AM/PM mode (HH:MMam; HH:MMpm, etc.)
+
+- IMPROVEMENT: Allow DURATION to be specified as a time (1:30) or a
+  number of minutes (90).
+
+- IMPROVEMENT: If terminal size can be determined, set $FormWidth to
+  terminal width - 8; if not, set $FormWidth to 72.
+
+- MINOR IMPROVEMENT: Add the "ampm()" built-in function.
+
+* Version 3.3 Patch 0 - 2020-01-31
+
+- FIX: rem2ps: Add a %%PageBoundingBox: document structuring convention
+  comment.
+
+- FIX: rem2ps: Ignore unknown SPECIAL-type reminders.
+
+- IMPROVEMENT: In calendar mode ("-c" option), Remind automatically adjusts
+  the width of the calendar to fit the terminal window if standard output
+  is a TTY.
+
+- IMPROVEMENT: Add JSON-based output with "remind -pp" and "remind -ppp"
+  The JSON-based intermediate format preserves a lot more information
+  about the original reminder, allowing back-ends more insight into
+  the intent of the reminder, the recurrence used, etc.  See the documentation
+  in "man rem2ps"
+
+- IMPROVEMENT: TkRemind can "reverse-engineer" reminders that it creates
+  using the additional information in the "remind -pp" format, so it
+  doesn't create or use ugly comment blocks to delimit the reminders
+  it creates.
+
+- IMPROVEMENT: TkRemind: Add popup help to most buttons and controls.
+
+- NEW FEATURE: Add support for $DefaultColor system variable, suggested
+  by Tim Chase.
+
+- NEW FEATURE: The "-@[n][,m]" command-line option allows colored reminders
+  in Agenda Mode as well as in Calendar Mode.  It also adds support for
+  terminal emulators that can handle the xterm 256-color escape sequences
+  as well as the true 24-bit color escape sequences.
+
+- CHANGE: SPECIALs are now case-insensitive.  Before, only SPECIAL COLOR
+  would work.  Now you can use Special Color, special color, etc.
+
 * Version 3.2 Patch 0 - 2020-01-03
 
 - IMPROVEMENT: Add support for events spanning multiple days (with AT

man/rem2ps.1

@@ -5,9 +5,9 @@ rem2ps \- draw a PostScript calendar from Remind output
 .SH SYNOPSIS
 .B rem2ps [\fIoptions\fR]
 .SH DESCRIPTION
-\fBRem2ps\fR reads the standard input, which should be the results of running
-\fBRemind\fR with the \fB\-p\fR option.  It emits PostScript code (which
-draws a calendar) to the standard output.
+\fBRem2ps\fR reads the standard input, which should be the results of
+running \fBRemind\fR with the \fB\-p\fR or \fB\-pp\fR option.  It
+emits PostScript code (which draws a calendar) to the standard output.
 .PP
 See the section "Rem2PS Input Format" for details about the \fB\-p\fR
 data.  This may be useful if you wish to create other \fBRemind\fR
@@ -267,7 +267,7 @@ hold:
 .TP
 o
 The PostScript origin is at the bottom left-hand corner of the page, and
-PostScript units of 1/72" are in effect.
+PostScript units of 1/72 inch are in effect.
 .TP
 o
 The variables MinX, MinY, MaxX and MaxY define the bounding box within
@@ -313,7 +313,13 @@ Use that file with the \fBRem2ps\fR \fB\-p\fR option to create calendars
 with the year and month in large grey letters in the background of the
 calendar.
 .PP
-.SH REM2PS INPUT FORMAT
+.SH REM2PS INPUT FORMAT (-P OPTION)
+The \fB\-p\fR option is an older, simpler interchange format used by
+\fBRemind\fR to communicate with back-ends.  New back-ends are
+encoraged to support the new \fB\-pp\fR format preferably, though they
+are encouraged to support the older \fB\-p\fR format as well if the
+older format contains enough information for them to work properly.
+.PP
 \fBRemind \-p\fR sends the following lines to standard output.
 The information is designed to be easily parsed by back-end programs:
 .TP
@@ -375,6 +381,9 @@ was provided.
 .PP
 \fIbody\fR is the body of the reminder.
 .PP
+Future versions of \fBRemind\fR may add additional keys to the JSON
+object.  Back-ends \fImust\fR ignore keys they don't recognize.
+.PP
 After a month's worth of reminders have been emitted, \fBRemind\fR
 emits the line:
 .PP
@@ -393,6 +402,247 @@ the line number and file name of the file containing the reminder.  Back-ends
 that don't care about this information should ignore lines starting with
 "#" (except, of course, for the # rem2ps lines.)
 .PP
+.SH REM2PS PARTIAL JSON INPUT FORMAT (-PP OPTION)
+\fBRemind \-pp\fR sends the following lines to standard output.  They
+are designed to be easily parsed, but contain much more information
+than the old-style \fBremind -p\fR output.  The extra information
+contains a representation of the parsed "REM" statement, which could
+allow converters to better preserve semantics of a reminder.  For
+example, this format passes enough information to allow a back-end to
+(in many cases) determine a reminder's recurrence rather than just treating
+each reminder as a one-off event.
+.PP
+The lines emitted by \fBremind \-pp\fR are as follows:
+.TP
+.B # rem2ps2 begin
+This line signifies the start of calendar data.  Back-ends can search
+for it to verify they are being fed correct information.  Note the
+"2" after "rem2ps", which distinguishes this format from the older \fB\-p\fR
+format.
+.TP
+\fImonth_name year num_days first_day monday_first\fR
+Same as the \fB\-p\fR format
+.TP
+\fIsun mon tue wed thu fri sat\fR
+Same as the \fB\-p\fR format
+.TP
+\fInext_mon next_days\fR
+Same as the \fB\-p\fR format
+.TP
+\fIprev_mon prev_days\fR
+Same as the \fB\-p\fR format
+.PP
+.B CALENDAR ENTRIES
+.PP
+The remaining data consists of calendar entries expressed as a JSON object
+on a single line.  Each such line will begin with "{" and will be a well-formed
+JSON object.  The keys that may be present in the JSON object are as
+follows:
+.TP
+.B date \fIYYYY-MM-DD\fR
+The \fbdate\fR key will \fIalways\fR be present; it is the trigger date
+of the reminder expressed as a string in the format \fIYYYY-MM-DD\fR
+.TP
+.B filename \fIf\fR
+The filename in which the reminder was found.
+.TP
+.B lineno \fIn\fR
+The line number within the file on which the reminder was found.
+.TP
+.B nonconst_expr 1
+If the reminder contained a non-constant expression that had to be evaluated
+to determine the trigger date, this key will be present with the value 1.
+If this key is present, then it is unsafe for a back-end to rely on
+recurrence semantics or even the semantics of any part of the parsed
+reminder, as they may have been computed in a way that cannot be expressed
+in JSON.
+.TP
+.B if_depth \fIn\fR
+If the reminder is inside one or more IF or ELSE statements, this key
+will be present and the value will be the number of nested IFs from
+the top-level to the reminder.  Back-ends should be wary of
+interpreting recurrence semantics of reminders within an IF or ELSE
+block.
+.TP
+.B passthru \fIspecial\fR
+If the reminder was a SPECIAL reminder, the \fBpassthru\fR key will be
+present and the value will be the type of SPECIAL (such as SHADE, COLOR,
+MOON, etc.)
+.TP
+.B tags \fIdata\fR
+If any TAG clauses are present, the \fBtag\fR key will be present and consist
+of a comma-separated list of tags.
+.TP
+.B time \fIt\fR
+If an AT clause was present, this key will contain the time of the AT clause
+in minutes after midnight.
+.TP
+.B tdelta \fIn\fR
+If a time delta (+n after an AT clause) was present, this key contains the
+delta value in minutes.
+.TP
+.B trep \fIn\fR
+If a time repeat (*n after an AT clause) was present, this key contains the
+repeat value in minutes.
+.TP
+.B eventduration \fIn\fR
+If a DURATION clause was present, this key contains the event duration in
+minutes.
+.TP
+.B duration \fIn\fR
+If a DURATION clause was present, this key contains today's duration in
+minutes.  See the \fBremind(1)\fR man page, "MULTI-DAY EVENTS", for a
+discussion of duration vs. event duration.
+.TP
+.B eventstart \fIdt\fR
+If an AT clause was present, this key contains the event start time in
+the format \fIYYYY-MM-DDTHH:MM\fR.
+.TP
+.B back \fIn\fR
+If the reminder contained a "back" clause (\-n or \-\-n), this key
+contains the back value.  If the "back" value was \-n, the value will
+be positive; if it was \-\-n, the value will be negative.
+.TP
+.B delta \fIn\fR
+If the reminder contained a "delta" clause (\+n or \+\+n), this key
+contains the delta value.  If the "delta" value was \+n, the value will
+be positive; if it was \+\+n, the value will be negative.
+.TP
+.B rep \fIn\fR
+If the reminder contained a "repeat" clause (*n), this key contains
+the repeat value.
+.TP
+.B skip \fItype\fR
+If the reminder contained a SKIP, BEFORE or AFTER keyword, then this
+key will contain that keyword.
+.TP
+.B localomit \fIarray\fR
+If the reminder contains a local OMIT keyword, this key will be present.
+Its value will be an array of English day names that are OMITted.
+.TP
+.B wd \fIarray\fR
+If the reminder contains one or more weekdays, this key will be present.
+Its value will be an array of English day names that are present.
+.TP
+.B d \fIn\fR
+If a day-of-month is present in the reminder specification, this key
+will be present and its value will be the day number.
+.TP
+.B m \fIn\fR
+If a month is present in the reminder specification, this key
+will be present and its value will be the month number.
+.TP
+.B y \fIn\fR
+If a year is present in the reminder specification, this key
+will be present and its value will be the year.
+.TP
+.B until \fIYYYY-MM-DD\fR
+If the reminder contains an UNTIL or THROUGH clause, this key
+will be present.  Its value will be a string of the form YYYY-MM-DD.
+.TP
+.B once 1
+If the reminder contains a ONCE keyword, this key will be present
+with a value of 1.
+.TP
+.B scanfrom \fIYYYY-MM-DD\fR
+If the reminder contains a SCANFROM keyword, this key will be present
+and its value will be a string of the form YYYY-MM-DD.
+.TP
+.B from \fIYYYY-MM-DD\fR
+If the reminder contains a FROM keyword, this key will be present
+and its value will be a string of the form YYYY-MM-DD.
+.TP
+.B priority \fIn\fR
+The priority of the reminder.  Always present; if no PRIORITY keyword
+is specified, then a reminder has a default priority of 5000.
+.TP
+.B r \fIn\fR
+For a SHADE or COLOR special, the red color component.
+.TP
+.B g \fIn\fR
+For a SHADE or COLOR special, the green color component.
+.TP
+.B b \fIn\fR
+For a SHADE or COLOR special, the blue color component.
+.TP
+.B body \fIbody\fR
+The body of the reminder to issue.  Always present.
+.TP
+.B rawbody \fIraw\fR
+The "raw" body of the reminder, before any expression-pasting or
+substitution-sequence processing.  If the raw body would be the same
+as the processed body, then this key is not present.
+.PP
+After a month's worth of reminders have been emitted, \fBRemind\fR
+emits the line:
+.PP
+\fB# rem2ps2 end
+.PP
+However, back-ends should keep reading until EOF in case more data for
+subsequent months is forthcoming.
+.PP
+
+.SH REM2PS PURE JSON INPUT FORMAT (-PPP OPTION)
+\fBRemind \-ppp\fR emits \fIpure JSON\fR output.  The format is
+as follows:
+.PP
+\fBRemind\fR outputs a JSON array.  Each element of the array is a
+\fImonth descriptor\fR.
+.PP
+Each month descriptor is a JSON object with the following elements:
+.TP
+.B monthname \fIname\fR
+The name of the month.
+.TP
+.B year \fIyyyy\fR
+The year.
+.TP
+.B daysinmonnth \fIn\fR
+The number of days in the current month.
+.TP
+.B firstwkday \fIn\fR
+The weekday of the first day of the month (0 = Sunday, 1 = Monday, 6 = Saturday).
+.TP
+.B mondayfirst \fIn\fR
+An indicator of whether or not the calendar week should start with
+Sunday (n=0) or Monday (n=1).
+.TP
+.B daynames \fR[\fIdays\fR]
+A seven-element array of day names; each element is a string representing
+the names of the days from Sunday through Saturday.
+.TP
+.B prevmonthname \fIname\fR
+The name of the previous month.
+.TP
+.B daysinprevmonth \fIn\fR
+The number of days in the previous month.
+.TP
+.B prevmonthyear \fIyyyy\fR
+The year of the previous month.  (The same as \fByear\fR unless the current
+month is January.)
+.TP
+.B nextmonthname \fIname\fR
+The name of the following month.
+.TP
+.B daysinnextmonth \fIn\fR
+The number of days in the following month.
+.TP
+.B nextmonthyear \fIyyyy\fR
+The year of the following month.  (The same as \fByear\fR unless the
+current month is December.)
+.TP
+.B entries \fR[\fIarray\fR]
+The \fBentries\fR key consists of an array of calendar entries; each
+entry is a JSON object that has the same format as described in the
+\fBCALENDAR ENTRIES\fR section in the \fB\-PP FORMAT\fR section,
+\fIwith the following difference\fR: In \fB\-PP\fR mode, if a reminder
+has \fB%"\fR markers, only the text between the markers
+is included in the \fBbody\fR element.  In \fB\-PPP\fR mode, the
+entire text \fIincluding\fR the \fB%"\fR markers is included and it's up to
+the back-end to extract the portion between the markers if that
+is desired.
+
+
 .SH AUTHOR
 Rem2PS was written by Dianne Skoll <dianne@skoll.ca>
 .SH BUGS

man/remind.1

@@ -46,7 +46,8 @@ The \fB\-c\fR option causes \fBRemind\fR to produce a calendar that is
 sent to standard output.  If you supply a number \fIn\fR, then a
 calendar will be generated for \fIn\fR months, starting with the
 current month.  By default, a calendar for only the current month is
-produced. 
+produced.
+.RS
 .PP
 You can precede \fIn\fR (if any) with a set of flags.  The flags
 are as follows:
@@ -72,24 +73,54 @@ only work on terminals that are set to UTF-8 character encoding.
 .TP
 .B 'c'
 causes \fBRemind\fR to use VT100 escape sequences to approximate
-SPECIAL COLOR reminders.  The approximation is (of necessity) very
+SPECIAL COLOR reminders.  Note that this flag is kept for
+backwards-compatibility; you should use the \fB\-@\fI[n][,m]\fR
+command-line option instead.
+.RE
+
+.TP
+.B \-@\fR[\fIn\fR][,\fIm\fR]
+Tells \fBRemind\fR to approximate SPECIAL COLOR reminders using VT100
+escape sequences.  The approximation is (of necessity) very
 coarse, because the VT100 only has eight different color sequences,
 each with one of two brightnesses.  A color component greater than
 64 is considered "on", and if any of the three color components is
 greater than 128, the color is considered "bright".
-
+.RS
+.PP
+If you supply the optional numeric parameters, the have the following
+meanings:  \fIn\fR=0 tells \fBRemind\fR to use the standard 16 VT100
+colors.  \fIn\fR=1 tells it to use an extended 256-color palette supported
+by many terminal emulators such as xterm.  And \fIn\fR=2 tells it to
+use escape sequences that support true 24-bit colors, again supported
+by many terminal emulators such as xterm.
+.PP
+If the optional \fIm\fR parameter is supplied following a comma,
+then \fIm\fR=0 tells \fBRemind\fR that the terminal background is dark,
+and \fBRemind\fR will brighten up dark colors to make them visible.  If
+\fIm\fR=1, then \fBRemind\fR assumes the terminal background is light
+and it will darken bright colors to make them visible.  If no \fIm\fR
+is supplied, then \fBRemind\fR does not perform any adjustments, and
+some reminders may be hard or impossible to see if the color is too close
+to the terminal background color.
+.RE
 .TP
 .B \-w\fR\fIcol\fR[,\fIpad\fR[,\fIspc\fR]]]
 The \fB\-w\fR option specifies the output width, padding and spacing
 of the formatted calendar output.  \fICol\fR specifies the number of
-columns in the output device, and defaults to 80.  \fIPad\fR specifies
-how many lines to use to "pad" empty calendar boxes.  This defaults to
-5.  If you have many reminders on certain days that make your calendar
-too large to fit on a page, you can try reducing \fIpad\fR to make the
-empty boxes smaller.  \fISpc\fR specifies how many blank lines to leave
-between the day number and the first reminder entry.  It defaults to 1.
+columns in the output device.  If not specified, or specified as 0,
+it defaults to the larger of 71 or the actual width of your terminal,
+or to 80 if standard output is not a terminal.
 .RS
 .PP
+\fIPad\fR specifies how many lines
+to use to "pad" empty calendar boxes.  This defaults to 5.  If you
+have many reminders on certain days that make your calendar too large
+to fit on a page, you can try reducing \fIpad\fR to make the empty
+boxes smaller.  \fISpc\fR specifies how many blank lines to leave
+between the day number and the first reminder entry.  It defaults to
+1.
+.PP
 Any of \fIcol\fR, \fIpad\fR or \fIspc\fR can be omitted, providing you
 provide the correct number of commas.  Don't use any spaces in the option.
 .RE
@@ -106,17 +137,27 @@ If you immediately follow the \fBs\fR with the letter
 day they actually occur \fIas well as\fR on any preceding days specified
 by the reminder's \fIdelta\fR.
 .TP
-.B \-p\fR[\fBa\fR]\fIn\fR
+.B \-p\fR[\fBa\fR][\fBp\fR][\fBp\fR]\fIn\fR
 The \fB\-p\fR option is very similar to the \fB\-s\fR option, except
 that the output contains additional information for use by the
-\fBRem2PS\fR program, which creates a PostScript calendar.  For this
+\fBRem2PS\fR program, which creates a PostScript calendar, and various
+other back-end programs.  For this
 option, \fIn\fR cannot start with "+"; it must specify a number of months.
 The format of the \fB\-p\fR output is described in the \fBrem2ps(1)\fR
 man page.  If you immediately follow the \fBp\fR with the letter
 \fBa\fR, then \fBRemind\fR displays reminders on the calendar on the
 day they actually occur \fIas well as\fR on any preceding days specified
-by the reminder's \fIdelta\fR.
-
+by the reminder's \fIdelta\fR.  If you follow the \fBp\fR with another
+\fBp\fR, then \fBRemind\fR uses a more comprehensive JSON-based
+format rather than the "simple calendar" format.  This format is
+also documented in the \fBrem2ps(1)\fR man page.  Finally, if you use
+three p's, as in \fB\-ppp\fR, then \fBRemind\fR uses a pure JSON
+format, again documented in \fBrem2ps(1)\fR.
+.RS
+.PP
+Note that the \fB\-pp\fR or \fB\-ppp\fR options also enable the \fB\-l\fR
+option.
+.RE
 .TP
 .B \-l
 If you use the \-l option in conjunction with the \-p option, then
@@ -293,14 +334,15 @@ If you supply a \fIdate\fR on the command line, it must consist of
 of the month, and \fIyear\fR is a year (all 4 digits) from 1990 to
 about 2075.  You can leave out the \fIday\fR, which then defaults to 1.
 .PP
-If you do supply a \fIdate\fR on the command line, then \fBRemind\fR uses
-it, rather than the actual system date, as its notion of "today."
-This lets you create calendars for future months, or test to see
-how your reminders will be triggered in the future.  Similarly,
-you can supply a \fItime\fR (in 24-hour format -- for example, 17:15) to
-set \fBRemind\fR's notion of "now" to a particular time.  Supplying
-a \fItime\fR on the command line also implicitly enables the \fB\-q\fR
-option and disables the \fB\-z\fR option.
+If you do supply a \fIdate\fR on the command line, then \fBRemind\fR
+uses it, rather than the actual system date, as its notion of "today."
+This lets you create calendars for future months, or test to see how
+your reminders will be triggered in the future.  Similarly, you can
+supply a \fItime\fR to set \fBRemind\fR's notion of "now" to a
+particular time.  Supplying a \fItime\fR on the command line also
+implicitly enables the \fB\-q\fR option and disables the \fB\-z\fR
+option.  The \fItime\fR may be specified in 24-hour format (eg, 13:20)
+or common "AM/PM" format (1:20pm).
 .PP
 If you would rather specify the date more succinctly, you can supply
 it as YYYY-MM-DD or YYYY/MM/DD.  You can even supply a date and
@@ -448,7 +490,8 @@ of a special reminder depends on the back-end.  For the \fBRem2PS\fR
 back-end, \fBSPECIAL PostScript\fR is equivalent to a \fBPS\fR-type
 reminder, and \fBSPECIAL PSFile\fR is equivalent to a \fBPSFILE\fR-type
 reminder.  The body of a \fBSPECIAL\fR reminder is obviously dependent
-upon the back-end.
+upon the back-end.  A back-end \fImust\fR ignore a \fBSPECIAL\fR that
+it does not recognize.
 .PP
 .B DATE SPECIFICATIONS
 .PP
@@ -475,7 +518,7 @@ characters must be used.  The following are examples of the various parts of a
 JANUARY, feb, March, ApR, may, Aug
 .TP
 .I year:
-1990, 1993, 2030, 95 (interpreted as 1995).  The year can range
+1990, 1993, 2030.  The year can range
 from 1990 to 2075.
 .TP
 .I weekday:
@@ -925,8 +968,13 @@ it terminates the search after the \fBSATISFY\fR iteration limit
 .PP
 Timed reminders are those that have an \fBAT\fR keyword followed
 by a \fItime\fR and optional \fItdelta\fR and \fItrepeat\fR.  The \fItime\fR
-must be specified in 24-hour format, with 0:00 representing midnight,
+mau be specified in 24-hour format, with 0:00 representing midnight,
 12:00 representing noon, and 23:59 representing one minute to midnight.
+Alternatively, it may be specified in common "AM/PM" format; in this case,
+the hour must range from 1 to 12.  12:00am represents midnight, 12:00pm
+represents noon, and 11:59pm represents one minute to midnight.  The "am"
+and "pm" portions are case-insensitive and the "m" is optional.
+.PP
 You can use either a colon or a period to separate the hours from the
 minutes.  That is, 13:39 and 13.39 are equivalent.
 .PP
@@ -953,7 +1001,7 @@ The following reminder will be triggered on Thursdays and Fridays,
 but will only be queued on Fridays:
 .PP
 .nf
-	REM Fri ++1 AT 13:00 MSG Lunch at 1pm Friday.
+	REM Fri ++1 AT 1:00PM MSG Lunch at 1pm Friday.
 .fi
 .PP
 The \fItdelta\fR and \fItrepeat\fR have the same form as a \fIrepeat\fR
@@ -1035,15 +1083,21 @@ to each distinct REM command.
 .PP
 The \fBDURATION\fR keyword makes sense only for timed reminders; it
 specifies the duration of an event.  For example, if you have a
-90-minute meeting starting at 1:00pm, you could use:
+90-minute meeting starting at 1:00pm, you could use any of the following:
 .PP
 .nf
-	REM 5 March 1999 AT 13:00 DURATION 1:30 MSG Meeting
+	REM 5 March 2021 AT 13:00 DURATION 1:30 MSG Meeting
+	REM 5 March 2021 AT 13:00 DURATION 90 MSG Meeting
+	REM 5 March 2021 AT 1:00pm DURATION 1:30 MSG Meeting
+	REM 5 March 2021 AT 1:00pm DURATION 90 MSG Meeting
 .fi
 .PP
-Note that \fIduration\fR is specified in hours and minutes.  If you
-specify a duration of 00:00, then \fBRemind\fR behaves exactly as if
-no \fBDURATION\fR at all had been present.
+
+Note that \fIduration\fR is specified either in hours and minutes as a
+\fItime\fR, or in minutes as an \fIinteger\fR.  If you specify a
+duration of 00:00 or 0, then \fBRemind\fR behaves exactly as if no
+\fBDURATION\fR at all had been present.
+
 .PP
 .SH THE SUBSTITUTION FILTER
 .PP
@@ -1623,13 +1677,15 @@ in C.
 .RE
 .TP
 .B TIME constants
-12:33, 0:01, 14:15, 16:42, 12.16, 13.00, 1.11
+12:33, 0:01, 14:15, 16:42, 12.16, 13.00, 1.11, 4:30PM, 12:20am
 .PP
 .RS
-Note that \fBTIME\fR constants are written in 24-hour format.  Either the
-period or colon can be used to separate the minutes from the hours.
-However, Remind will consistently output times using only one separator
-character.  (The output separator character is chosen at compile-time.)
+Note that \fBTIME\fR constants may be written in 24-hour format or in
+common "AM/PM" format.  If you use "AM/PM" format, then the hour can
+range from 1 to 12.  Either a period or colon can be used to separate
+the minutes from the hours.  However, Remind will consistently output
+times in 24-hour format using only one separator character.  (The
+output separator character is chosen at compile-time.)
 .RE
 .TP
 .B DATE constants
@@ -1652,11 +1708,12 @@ versions prior to 03.00.02 did not support the '-' date separator.
 .RE
 .TP
 .B DATETIME constants
-\fBDATETIME\fR constants are expressed similarly to \fBDATE\fR constants
-with the addition of an "@HH:MM" part.  For example:
+\fBDATETIME\fR constants are expressed similarly to \fBDATE\fR
+constants with the addition of an "@HH:MM" part, optionally followed
+by "am" or "pm".  For example:
 .PP
 .RS
-\'2008-04-05@23:11', '1999/02/03@14:06', '2001-04-07@08:30'
+\'2008-04-05@23:11', '1999/02/03@14:06', '2001-04-07@08:30', '2020-01-01@3:20pm'
 .PP
 \fBDATETIME\fR values are printed without the quotes.  Notes about date
 and time separator characters for \fBDATE\fR and \fBTIME\fR constants apply
@@ -1895,6 +1952,22 @@ This variable can be set only to "/" or "-".  It holds the character
 used to separate portions of a date when \fBRemind\fR prints a DATE or
 DATETIME value.
 .TP
+.B $DefaultColor
+This variable can be set to a string that has the form of three
+space-separated numbers.  Each number must be an integer from 0 to
+255, or all three numbers must be -1.  The default value of
+\fB$DefaultColor\fR is "-1 -1 -1", which suppresses default coloring
+of MSG-type reminders.  If you set \fB$DefaultColor\fR to any other
+value, then all MSG-, MSF- and CAL-type reminders are effectively
+converted into SPECIAL COLOR reminders whose color value is specified
+by \fB$DefaultColor\fR.
+.RS
+.PP
+Unlike other system variables, the value of \fB$DefaultColor\fR is
+\fInot\fR preserved between calendar iterations; rather, it is reset
+to "-1 -1 -1" at the start of each iteration.
+.RE
+.TP
 .B $DefaultPrio
 The default priority assigned to reminders without a \fBPRIORITY\fR
 clause.  You can set this as required to adjust the priorities of
@@ -1953,9 +2026,11 @@ for years greater than 2037.
 .TP
 .B $FormWidth
 The maximum width of each line of text for formatting \fBMSF\fR-type
-reminders.  The default is 72.  If an \fBMSF\fR-type reminder contains
-a word too long to fit in this width, it will not be truncated - the
-width limit will be ignored.
+reminders.  The default is the width of the terminal in columns, minus
+8, but clamped at a minimum of 20 and a maximum of 500.  If standard
+output is not a terminal, then the default is 72.If an \fBMSF\fR-type
+reminder contains a word too long to fit in this width, it will not be
+truncated - the width limit will be ignored.
 .TP
 .B $HushMode (read-only)
 If non-zero, then the \fB\-h\fR option was supplied on the command line.
@@ -2148,6 +2223,23 @@ is supplied, only the date component is used.
 Returns the time of "astronomical twilight" on the specified \fIdate\fR.  If
 \fIdate\fR is omitted, defaults to \fBtoday()\fR.
 .TP
+.B ampm(tq_time [,s_am [,s_pm]])
+Returns a \fBSTRING\fR that is the result of converting \fItime\fR
+(which is either a \fBTIME\R or a \fBDATETIME\fR object) to "AM/PM"
+format.  The optional arguments \fIam\fR and \fIpm\fR are the strings
+to append in the AM and PM case, respectively; they default to "AM"
+and "PM".  The function obeys the system variables $DateSep,
+$TimeSep and $DateTimeSep when formatting its output.  For example:
+.RS
+.PP
+.nf
+        ampm(0:22)                 returns "12:22AM"
+        ampm(17:45, "am", "pm")    returns "5:45pm"
+        ampm('2020-03-14@21:34')   returns "2020-03-14@9:34PM"
+.fi
+.PP
+.RE
+.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
@@ -3057,12 +3149,12 @@ is an implementation artifact.
 .B SELF-OVERLAPPING EVENTS
 .PP
 A multi-day event has the possibility of "overlapping itself".  When this
-happens, \fBRemind\fR prefers the \fIearlier\fR event (only one copy of
+happens, \fBRemind\fR prefers the \fIlater\fR event (only one copy of
 an event is ever triggered for a given date.)  Consider this example:
 .PP
 .nf
    #!/bin/sh
-   remind - '*4' 11 Feb 1991 <<'EOF'
+   remind - '*5' 10 Feb 1991 <<'EOF'
 
    BANNER %
    REM MON at 0:00 DURATION 192:0 MSG [today()] [trigeventstart()] [trigduration()]%
@@ -3073,17 +3165,16 @@ an event is ever triggered for a given date.)  Consider this example:
 The output is:
 .PP
 .nf
-   1991-02-11 1991-02-04@00:00 24:00
+   1991-02-10 1991-02-04@00:00 48:00
+   1991-02-11 1991-02-11@00:00 192:00
    1991-02-12 1991-02-11@00:00 168:00
    1991-02-13 1991-02-11@00:00 144:00
    1991-02-14 1991-02-11@00:00 120:00
 .fi
 .PP
-Although 1991-02-11 is a Monday (which should cause the event to be
-triggered, the 8-day-long event that started on 1991-02-04 \fIhas not
-finished yet\fR, so that is the one that is triggered.  The next day,
-the event starting on 1991-02-04 \fIhas\fR finished, so the 1991-02-11
-event triggers, with a remaining duration of 168:00, or 7 days.
+Although the event from 1991-02-04 still has 24 hours left on 1991-02-11,
+the fresh occurrence on 1991-02-11 takes precedences and is the one that
+is triggered.
 .PP
 I do not recommend constructing self-overlapping multi-day events.
 .PP
@@ -3731,7 +3822,7 @@ iterations.  On the next iteration, the commands are skipped, since
 initialized has remained defined.  Thus, time-consuming operations that
 do not depend on the value of \fBtoday()\fR are done only once.
 .PP
-System variables (those whose names start with '$') are automatically
+Most system variables (those whose names start with '$') are automatically
 preserved between calendar iterations.
 .PP
 Note that for efficiency, \fBRemind\fR caches the reminder script
@@ -4320,7 +4411,7 @@ They are used only when piping data from a \fBremind \-p\fR line.
 equivalent of MSG in \fBremind's\fR normal mode of operation.)
 .PP
 The various \fBSPECIAL\fRs recognized are particular for each
-backend; however, there are three \fBSPECIAL\fRs that all backends
+backend; however, there are four \fBSPECIAL\fRs that all backends
 should attempt to support.  They are currently supported by
 \fBRem2PS\fR, \fBtkremind\fR and \fBrem2html\fR.
 .PP
@@ -4383,9 +4474,12 @@ The rest of the line is the text to put in the calendar.
 .PP
 The COLOR special is "doubly special", because in its normal operating
 mode, \fBremind\fR treats a COLOR special just like a MSG-type reminder.
-Also, if you invoke \fBRemind\fR with \fB\-cc\fR..., then it approximates
+Also, if you invoke \fBRemind\fR with \fB\-@\fR[\fIn\fR], then it approximates
 SPECIAL COLOR reminders on your terminal.
 .PP
+See also the documentation of the \fB$DefaultColor\fR system variable
+in the section "SYSTEM VARIABLES".
+.PP
 The \fBWEEK\fR special lets you place annotations such as the week
 number in the calendar.  For example, this would number each Monday
 with the ISO 8601 week number.  The week number is shown like this:

src/Makefile.in

@@ -45,8 +45,8 @@ test: remind
 
 $(REMINDOBJS): $(REMINDHDRS)
 
-rem2ps: rem2ps.o dynbuf.o
-	@CC@ @LDFLAGS@ $(LDEXTRA) -o rem2ps rem2ps.o dynbuf.o
+rem2ps: rem2ps.o dynbuf.o json.o
+	@CC@ @LDFLAGS@ $(LDEXTRA) -o rem2ps rem2ps.o dynbuf.o json.o -lm
 
 remind: $(REMINDOBJS)
 	@CC@ @LDFLAGS@ $(LDEXTRA) -o remind $(REMINDOBJS) @LIBS@
@@ -74,7 +74,7 @@ clobber:
 	rm -f *.o *~ remind rem2ps test.out core *.bak
 
 depend:
-	gccmakedep @DEFS@ $(REMINDSRCS) rem2ps.c
+	gccmakedep @DEFS@ $(REMINDSRCS) rem2ps.c json.c
 
 # The next targets are not very useful to you.  I use them to build
 # distributions, etc.
@@ -86,8 +86,9 @@ distro:
 	gpg --detach-sign -u dianne@skoll.ca remind-$(VERSION).tar.gz
 
 beta-tgz:
-	cd .. && git archive --worktree-attributes --format=tar --prefix=remind-$(VERSION)/ HEAD > src/remind-$(VERSION)-BETA-$(BETA).tar
+	cd .. && git archive --worktree-attributes --format=tar --prefix=remind-$(VERSION)-BETA-$(BETA)/ HEAD > src/remind-$(VERSION)-BETA-$(BETA).tar
 	gzip -f -v -9 remind-$(VERSION)-BETA-$(BETA).tar
+	gpg --detach-sign -u dianne@skoll.ca remind-$(VERSION)-BETA-$(BETA).tar.gz
 
 #---------------- Stuff after this added by "make depend" -----------------
 

src/calendar.c

@@ -16,6 +16,8 @@
 #include <ctype.h>
 
 #include <stdlib.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
 
 #ifdef REM_USE_WCHAR
 #include <wctype.h>
@@ -31,10 +33,11 @@
 /* Data structures used by the calendar */
 typedef struct cal_entry {
     struct cal_entry *next;
-    char const *text;
+    char *text;
+    char *raw_text;
     char const *pos;
 #ifdef REM_USE_WCHAR
-    wchar_t const *wc_text;
+    wchar_t *wc_text;
     wchar_t const *wc_pos;
 #endif
     int is_color;
@@ -44,8 +47,12 @@ typedef struct cal_entry {
     DynamicBuffer tags;
     char passthru[PASSTHRU_LEN+1];
     int duration;
-    char const *filename;
+    char *filename;
     int lineno;
+    Trigger trig;
+    TimeTrig tt;
+    int nonconst_expr;
+    int if_depth;
 } CalEntry;
 
 /* Line-drawing sequences */
@@ -132,13 +139,92 @@ static char *VT100Colors[2][2][2][2] /* [Br][R][G][B] */ = {
 static struct line_drawing *linestruct;
 #define DRAW(x) fputs(linestruct->x, stdout)
 
+struct xterm256_colors {
+    int r;
+    int g;
+    int b;
+};
+
+/* Xterm support 256 different colors, numbered from 0 to 255.  The following
+   table is a list of the [r, g, b] components of each Xterm color.  The
+   data was obtained from https://jonasjacek.github.io/colors/ */
+static struct xterm256_colors XTerm256Colors[] =
+{
+    {  0,   0,   0}, {128,   0,   0}, {  0, 128,   0}, {128, 128,   0},
+    {  0,   0, 128}, {128,   0, 128}, {  0, 128, 128}, {192, 192, 192},
+    {128, 128, 128}, {255,   0,   0}, {  0, 255,   0}, {255, 255,   0},
+    {  0,   0, 255}, {255,   0, 255}, {  0, 255, 255}, {255, 255, 255},
+    {  0,   0,   0}, {  0,   0,  95}, {  0,   0, 135}, {  0,   0, 175},
+    {  0,   0, 215}, {  0,   0, 255}, {  0,  95,   0}, {  0,  95,  95},
+    {  0,  95, 135}, {  0,  95, 175}, {  0,  95, 215}, {  0,  95, 255},
+    {  0, 135,   0}, {  0, 135,  95}, {  0, 135, 135}, {  0, 135, 175},
+    {  0, 135, 215}, {  0, 135, 255}, {  0, 175,   0}, {  0, 175,  95},
+    {  0, 175, 135}, {  0, 175, 175}, {  0, 175, 215}, {  0, 175, 255},
+    {  0, 215,   0}, {  0, 215,  95}, {  0, 215, 135}, {  0, 215, 175},
+    {  0, 215, 215}, {  0, 215, 255}, {  0, 255,   0}, {  0, 255,  95},
+    {  0, 255, 135}, {  0, 255, 175}, {  0, 255, 215}, {  0, 255, 255},
+    { 95,   0,   0}, { 95,   0,  95}, { 95,   0, 135}, { 95,   0, 175},
+    { 95,   0, 215}, { 95,   0, 255}, { 95,  95,   0}, { 95,  95,  95},
+    { 95,  95, 135}, { 95,  95, 175}, { 95,  95, 215}, { 95,  95, 255},
+    { 95, 135,   0}, { 95, 135,  95}, { 95, 135, 135}, { 95, 135, 175},
+    { 95, 135, 215}, { 95, 135, 255}, { 95, 175,   0}, { 95, 175,  95},
+    { 95, 175, 135}, { 95, 175, 175}, { 95, 175, 215}, { 95, 175, 255},
+    { 95, 215,   0}, { 95, 215,  95}, { 95, 215, 135}, { 95, 215, 175},
+    { 95, 215, 215}, { 95, 215, 255}, { 95, 255,   0}, { 95, 255,  95},
+    { 95, 255, 135}, { 95, 255, 175}, { 95, 255, 215}, { 95, 255, 255},
+    {135,   0,   0}, {135,   0,  95}, {135,   0, 135}, {135,   0, 175},
+    {135,   0, 215}, {135,   0, 255}, {135,  95,   0}, {135,  95,  95},
+    {135,  95, 135}, {135,  95, 175}, {135,  95, 215}, {135,  95, 255},
+    {135, 135,   0}, {135, 135,  95}, {135, 135, 135}, {135, 135, 175},
+    {135, 135, 215}, {135, 135, 255}, {135, 175,   0}, {135, 175,  95},
+    {135, 175, 135}, {135, 175, 175}, {135, 175, 215}, {135, 175, 255},
+    {135, 215,   0}, {135, 215,  95}, {135, 215, 135}, {135, 215, 175},
+    {135, 215, 215}, {135, 215, 255}, {135, 255,   0}, {135, 255,  95},
+    {135, 255, 135}, {135, 255, 175}, {135, 255, 215}, {135, 255, 255},
+    {175,   0,   0}, {175,   0,  95}, {175,   0, 135}, {175,   0, 175},
+    {175,   0, 215}, {175,   0, 255}, {175,  95,   0}, {175,  95,  95},
+    {175,  95, 135}, {175,  95, 175}, {175,  95, 215}, {175,  95, 255},
+    {175, 135,   0}, {175, 135,  95}, {175, 135, 135}, {175, 135, 175},
+    {175, 135, 215}, {175, 135, 255}, {175, 175,   0}, {175, 175,  95},
+    {175, 175, 135}, {175, 175, 175}, {175, 175, 215}, {175, 175, 255},
+    {175, 215,   0}, {175, 215,  95}, {175, 215, 135}, {175, 215, 175},
+    {175, 215, 215}, {175, 215, 255}, {175, 255,   0}, {175, 255,  95},
+    {175, 255, 135}, {175, 255, 175}, {175, 255, 215}, {175, 255, 255},
+    {215,   0,   0}, {215,   0,  95}, {215,   0, 135}, {215,   0, 175},
+    {215,   0, 215}, {215,   0, 255}, {215,  95,   0}, {215,  95,  95},
+    {215,  95, 135}, {215,  95, 175}, {215,  95, 215}, {215,  95, 255},
+    {215, 135,   0}, {215, 135,  95}, {215, 135, 135}, {215, 135, 175},
+    {215, 135, 215}, {215, 135, 255}, {215, 175,   0}, {215, 175,  95},
+    {215, 175, 135}, {215, 175, 175}, {215, 175, 215}, {215, 175, 255},
+    {215, 215,   0}, {215, 215,  95}, {215, 215, 135}, {215, 215, 175},
+    {215, 215, 215}, {215, 215, 255}, {215, 255,   0}, {215, 255,  95},
+    {215, 255, 135}, {215, 255, 175}, {215, 255, 215}, {215, 255, 255},
+    {255,   0,   0}, {255,   0,  95}, {255,   0, 135}, {255,   0, 175},
+    {255,   0, 215}, {255,   0, 255}, {255,  95,   0}, {255,  95,  95},
+    {255,  95, 135}, {255,  95, 175}, {255,  95, 215}, {255,  95, 255},
+    {255, 135,   0}, {255, 135,  95}, {255, 135, 135}, {255, 135, 175},
+    {255, 135, 215}, {255, 135, 255}, {255, 175,   0}, {255, 175,  95},
+    {255, 175, 135}, {255, 175, 175}, {255, 175, 215}, {255, 175, 255},
+    {255, 215,   0}, {255, 215,  95}, {255, 215, 135}, {255, 215, 175},
+    {255, 215, 215}, {255, 215, 255}, {255, 255,   0}, {255, 255,  95},
+    {255, 255, 135}, {255, 255, 175}, {255, 255, 215}, {255, 255, 255},
+    {  8,   8,   8}, { 18,  18,  18}, { 28,  28,  28}, { 38,  38,  38},
+    { 48,  48,  48}, { 58,  58,  58}, { 68,  68,  68}, { 78,  78,  78},
+    { 88,  88,  88}, { 98,  98,  98}, {108, 108, 108}, {118, 118, 118},
+    {128, 128, 128}, {138, 138, 138}, {148, 148, 148}, {158, 158, 158},
+    {168, 168, 168}, {178, 178, 178}, {188, 188, 188}, {198, 198, 198},
+    {208, 208, 208}, {218, 218, 218}, {228, 228, 228}, {238, 238, 238}
+};
+
 /* Global variables */
 static CalEntry *CalColumn[7];
 
 static int ColSpaces;
 
-static void Colorize(CalEntry const *e);
-static void Decolorize(void);
+static int DidAMonth;
+static int DidADay;
+
+static void ColorizeEntry(CalEntry const *e);
 static void SortCol (CalEntry **col);
 static void DoCalendarOneWeek (int nleft);
 static void DoCalendarOneMonth (void);
@@ -159,6 +245,91 @@ static void WriteBottomCalLine (void);
 static void WriteIntermediateCalLine (void);
 static void WriteCalDays (void);
 
+void PrintJSONString(char const *s)
+{
+    while (*s) {
+	switch(*s) {
+	case '\b': printf("\\b"); break;
+	case '\f': printf("\\f"); break;
+	case '\n': printf("\\n"); break;
+	case '\r': printf("\\r"); break;
+	case '\t': printf("\\t"); break;
+	case '"':  printf("\\\""); break;
+	case '\\': printf("\\\\"); break;
+	default: printf("%c", *s);
+	}
+	s++;
+    }
+}
+
+void PrintJSONKeyPairInt(char const *name, int val)
+{
+    printf("\"");
+    PrintJSONString(name);
+    printf("\":%d, ", val);
+}
+
+void PrintJSONKeyPairString(char const *name, char const *val)
+{
+    /* If value is blank, skip it! */
+    if (!val || !*val) {
+	return;
+    }
+
+    printf("\"");
+    PrintJSONString(name);
+    printf("\":\"");
+    PrintJSONString(val);
+    printf("\", ");
+}
+
+void PrintJSONKeyPairDate(char const *name, int jul)
+{
+    int y, m, d;
+    if (jul == NO_DATE) {
+	/* Skip it! */
+	return;
+    }
+    FromJulian(jul, &y, &m, &d);
+    printf("\"");
+    PrintJSONString(name);
+    printf("\":\"%04d-%02d-%02d\", ", y, m+1, d);
+
+}
+
+void PrintJSONKeyPairDateTime(char const *name, int dt)
+{
+    int y, m, d, h, i, k;
+    if (dt == NO_TIME) {
+	/* Skip it! */
+	return;
+    }
+    i = dt / MINUTES_PER_DAY;
+    FromJulian(i, &y, &m, &d);
+    k = dt % MINUTES_PER_DAY;
+    h = k / 60;
+    i = k % 60;
+    printf("\"");
+    PrintJSONString(name);
+    printf("\":\"%04d-%02d-%02dT%02d:%02d\", ", y, m+1, d, h, i);
+
+}
+
+void PrintJSONKeyPairTime(char const *name, int t)
+{
+    int h, i;
+    if (t == NO_TIME) {
+	/* Skip it! */
+	return;
+    }
+    h = t / 60;
+    i = t % 60;
+    printf("\"");
+    PrintJSONString(name);
+    printf("\":\"%02d:%02d\", ", h, i);
+
+}
+
 #ifdef REM_USE_WCHAR
 static void PutWideChar(wchar_t const wc)
 {
@@ -202,26 +373,146 @@ static void goff(void)
   printf("%s", linestruct->graphics_off);
 }
 
-static void Decolorize(void)
+static void
+ClampColor(int *r, int *g, int *b)
 {
-  printf("%s", "\x1B[0m");
+    if (TerminalBackground == TERMINAL_BACKGROUND_UNKNOWN) {
+	/* No special clamping if terminal background is unknown */
+	return;
+    }
+    if (TerminalBackground == TERMINAL_BACKGROUND_DARK) {
+	if (*r <= 64 && *g <= 64 && *b <= 64) {
+	    int max = *r;
+	    double factor;
+	    if (*g > max) max = *g;
+	    if (*b > max) max = *b;
+	    if (max == 0) {
+		*r = 65;
+		*g = 65;
+		*b = 65;
+		return;
+	    }
+	    factor = 65.0 / (double) max;
+	    *r = (int) (factor * (double) *r);
+	    *g = (int) (factor * (double) *g);
+	    *b = (int) (factor * (double) *b);
+	}
+	return;
+    }
+    if (TerminalBackground == TERMINAL_BACKGROUND_LIGHT) {
+	if (*r > 191 && *g > 191 && *b > 191) {
+	    int min = *r;
+	    if (*g < min) min = *g;
+	    if (*b < min) min = *b;
+	    double factor = 192.0 / (double) min;
+	    *r = (int) (factor * (double) *r);
+	    *g = (int) (factor * (double) *g);
+	    *b = (int) (factor * (double) *b);
+	}
+    }
 }
 
-static void Colorize(CalEntry const *e)
+char const *
+Decolorize(int r, int g, int b)
 {
-  int bright = 0;
-  int r, g, b;
-  if (e->r > 128 || e->g > 128 || e->b > 128) {
-    bright = 1;
-  }
-  if (e->r > 64) r = 1;
-  else r = 0;
-  if (e->g > 64) g = 1;
-  else g = 0;
-  if (e->b > 64) b = 1;
-  else b = 0;
+    if (!strcmp(Colorize(r, g, b), "")) {
+	return "";
+    }
+    return "\x1B[0m";
+}
 
-  printf("%s", VT100Colors[bright][r][g][b]);
+static char const *
+Colorize256(int r, int g, int b)
+{
+    static char buf[40];
+    int best = -1;
+    int best_dist = 0;
+    int dist;
+    struct xterm256_colors *cur;
+    size_t i;
+
+    ClampColor(&r, &g, &b);
+    for (i=0; i<(sizeof(XTerm256Colors) / sizeof(XTerm256Colors[0])); i++) {
+	cur = &XTerm256Colors[i];
+	dist = ((r - cur->r) * (r - cur->r)) +
+	    ((b - cur->b) * (b - cur->b)) +
+	    ((g - cur->g) * (g - cur->g));
+	if (best == -1 || dist < best_dist) {
+	    best_dist = dist;
+	    best = (int) i;
+	}
+    }
+    cur = &XTerm256Colors[best];
+    sprintf(buf, "\x1B[38;5;%dm", best);
+    return buf;
+}
+
+static char const *
+ColorizeTrue(int r, int g, int b)
+{
+    static char buf[40];
+    ClampColor(&r, &g, &b);
+    sprintf(buf, "\x1B[38;2;%d;%d;%dm", r, g, b);
+    return buf;
+}
+
+char const *
+Colorize(int r, int g, int b)
+{
+    int bright = 0;
+
+    if (UseTrueColors) {
+	return ColorizeTrue(r, g, b);
+    }
+
+    if (Use256Colors) {
+	return Colorize256(r, g, b);
+    }
+    if (r > 128 || g > 128 || b > 128) {
+	bright = 1;
+    }
+    if (r > 64) r = 1;
+    else r = 0;
+    if (g > 64) g = 1;
+    else g = 0;
+    if (b > 64) b = 1;
+    else b = 0;
+
+    if (TerminalBackground == TERMINAL_BACKGROUND_DARK) {
+	/* Convert black-on-black to grey */
+	if (!r && !g && !b) return VT100Colors[1][0][0][0];
+    }
+    if (TerminalBackground == TERMINAL_BACKGROUND_LIGHT) {
+	/* Convert white-on-white to grey */
+	if (r && g && b) return VT100Colors[1][0][0][0];
+    }
+    return VT100Colors[bright][r][g][b];
+}
+
+static void ColorizeEntry(CalEntry const *e)
+{
+    printf("%s", Colorize(e->r, e->g, e->b));
+}
+
+static int
+ComputeCalWidth(int x)
+{
+    struct winsize w;
+    if (x >= 71) {
+	/* Has been set with -w option */
+	return x;
+    }
+    if (!isatty(STDOUT_FILENO)) {
+	/* Output is not a TTY... assume 80 */
+	return 80;
+    }
+    if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) < 0) {
+	return 80;
+    }
+    if (w.ws_col < 71) {
+	return 71;
+    }
+    return w.ws_col;
 }
 
 /***************************************************************/
@@ -244,14 +535,25 @@ void ProduceCalendar(void)
     }
     ShouldCache = 1;
 
+    CalWidth = ComputeCalWidth(CalWidth);
+
     ColSpaces = (CalWidth - 9) / 7;
     CalWidth = 7*ColSpaces + 8;
 
     if (CalMonths) {
 	FromJulian(JulianToday, &y, &m, &d);
 	JulianToday = Julian(y, m, 1);
-	while (CalMonths--)
+	DidAMonth = 0;
+	if (PsCal == PSCAL_LEVEL3) {
+	    printf("[\n");
+	}
+	while (CalMonths--) {
 	    DoCalendarOneMonth();
+	    DidAMonth = 1;
+	}
+	if (PsCal == PSCAL_LEVEL3) {
+	    printf("\n]\n");
+	}
 	return;
     } else {
 	if (MondayFirst) JulianToday -= (JulianToday%7);
@@ -373,30 +675,74 @@ static void DoCalendarOneMonth(void)
 
     if (!DoSimpleCalendar) WriteCalHeader();
 
+    DidADay = 0;
+
     if (PsCal) {
 	FromJulian(JulianToday, &y, &m, &d);
-	printf("%s\n", PSBEGIN);
-	printf("%s %d %d %d %d\n",
-	       MonthName[m], y, DaysInMonth(m, y), (JulianToday+1) % 7,
-	       MondayFirst);
-	printf("%s %s %s %s %s %s %s\n",
-	       DayName[6], DayName[0], DayName[1], DayName[2],
-	       DayName[3], DayName[4], DayName[5]);
+	if (PsCal == PSCAL_LEVEL1) {
+	    printf("%s\n", PSBEGIN);
+	} else if (PsCal == PSCAL_LEVEL2) {
+	    printf("%s\n", PSBEGIN2);
+	} else {
+	    if (DidAMonth) {
+		printf(",\n");
+	    }
+	    printf("{\n");
+	}
+	if (PsCal < PSCAL_LEVEL3) {
+	    printf("%s %d %d %d %d\n",
+		   MonthName[m], y, DaysInMonth(m, y), (JulianToday+1) % 7,
+		   MondayFirst);
+	    printf("%s %s %s %s %s %s %s\n",
+		   DayName[6], DayName[0], DayName[1], DayName[2],
+		   DayName[3], DayName[4], DayName[5]);
+	} else {
+	    PrintJSONKeyPairString("monthname", MonthName[m]);
+	    PrintJSONKeyPairInt("year", y);
+	    PrintJSONKeyPairInt("daysinmonth", DaysInMonth(m, y));
+	    PrintJSONKeyPairInt("firstwkday", (JulianToday+1) % 7);
+	    PrintJSONKeyPairInt("mondayfirst", MondayFirst);
+	    printf("\"daynames\":[\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\"],",
+		   DayName[6], DayName[0], DayName[1], DayName[2],
+		   DayName[3], DayName[4], DayName[5]);
+	}
 	mm = m-1;
 	if (mm<0) {
 	    mm = 11; yy = y-1;
 	} else yy=y;
 
-	printf("%s %d\n", MonthName[mm], DaysInMonth(mm,yy));
+	if (PsCal < PSCAL_LEVEL3) {
+	    printf("%s %d\n", MonthName[mm], DaysInMonth(mm,yy));
+	} else {
+	    PrintJSONKeyPairString("prevmonthname", MonthName[mm]);
+	    PrintJSONKeyPairInt("daysinprevmonth", DaysInMonth(mm, yy));
+	    PrintJSONKeyPairInt("prevmonthyear", yy);
+	}
 	mm = m+1;
 	if (mm>11) {
 	    mm = 0; yy = y+1;
 	} else yy=y;
-	printf("%s %d\n", MonthName[mm], DaysInMonth(mm,yy));
+	if (PsCal < PSCAL_LEVEL3) {
+	    printf("%s %d\n", MonthName[mm], DaysInMonth(mm,yy));
+	} else {
+	    PrintJSONKeyPairString("nextmonthname", MonthName[mm]);
+	    PrintJSONKeyPairInt("daysinnextmonth", DaysInMonth(mm, yy));
+	    PrintJSONKeyPairInt("nextmonthyear", yy);
+	    printf("\"entries\":[\n");
+	}
     }
     while (WriteCalendarRow()) continue;
 
-    if (PsCal) printf("%s\n", PSEND);
+    if (PsCal == PSCAL_LEVEL1) {
+	printf("%s\n", PSEND);
+    } else if (PsCal == PSCAL_LEVEL2) {
+	printf("%s\n", PSEND2);
+    } else if (PsCal == PSCAL_LEVEL3){
+	if (DidADay) {
+	    printf("\n");
+	}
+	printf("]\n}");
+    }
     if (!DoSimpleCalendar) WriteCalTrailer();
 }
 
@@ -447,8 +793,13 @@ static int WriteCalendarRow(void)
 	if (i < wd || d+i-wd>DaysInMonth(m, y))
 	    PrintLeft("", ColSpaces, ' ');
 	else {
-	    sprintf(buf, "%d", d+i-wd);
-	    PrintLeft(buf, ColSpaces, ' ');
+	    sprintf(buf, "%d ", d+i-wd);
+	    if (OrigJul+i == RealToday) {
+		PrintLeft(buf, ColSpaces-1, '*');
+		PutChar(' ');
+	    } else {
+		PrintLeft(buf, ColSpaces, ' ');
+	    }
 	}
 	gon();
 	DRAW(tb);
@@ -631,9 +982,10 @@ static int WriteOneColLine(int col)
 	if (!*ws && e->next) {
 	    PrintLeft("", ColSpaces, ' ');
 	    CalColumn[col] = e->next;
-	    free((void *)e->text);
-	    free((void *)e->filename);
-	    if (e->wc_text) free((void *)e->wc_text);
+	    free(e->text);
+	    free(e->raw_text);
+	    free(e->filename);
+	    if (e->wc_text) free(e->wc_text);
 	    free(e);
 	    return 1;
 	}
@@ -647,7 +999,7 @@ static int WriteOneColLine(int col)
 
 	/* Colorize reminder if necessary */
 	if (UseVTColors && e->is_color) {
-	    Colorize(e);
+	    ColorizeEntry(e);
 	}
 
 	/* If we couldn't find a space char, print what we have. */
@@ -669,7 +1021,7 @@ static int WriteOneColLine(int col)
 
 	/* Decolorize reminder if necessary */
 	if (UseVTColors && e->is_color) {
-	    Decolorize();
+	    printf("%s", Decolorize(e->r, e->g, e->b));
 	}
 
 	/* Flesh out the rest of the column */
@@ -681,9 +1033,10 @@ static int WriteOneColLine(int col)
 	/* If done, free memory if no next entry. */
 	if (!*ws && !e->next) {
 	    CalColumn[col] = e->next;
-	    free((void *)e->text);
-	    free((void *)e->filename);
-	    if (e->wc_text) free((void *)e->wc_text);
+	    free(e->text);
+	    free(e->raw_text);
+	    free(e->filename);
+	    if (e->wc_text) free(e->wc_text);
 	    free(e);
 	} else {
 	    e->wc_pos = ws;
@@ -699,11 +1052,12 @@ static int WriteOneColLine(int col)
 	if (!*s && e->next) {
 	    PrintLeft("", ColSpaces, ' ');
 	    CalColumn[col] = e->next;
-	    free((void *)e->text);
-	    free((void *)e->filename);
+	    free(e->text);
+	    free(e->filename);
 #ifdef REM_USE_WCHAR
-	    if (e->wc_text) free((void *)e->wc_text);
+	    if (e->wc_text) free(e->wc_text);
 #endif
+	    free(e->raw_text);
 	    free(e);
 	    return 1;
 	}
@@ -717,7 +1071,7 @@ static int WriteOneColLine(int col)
 
 	/* Colorize reminder if necessary */
 	if (UseVTColors && e->is_color) {
-	    Colorize(e);
+	    ColorizeEntry(e);
 	}
 
 	/* If we couldn't find a space char, print what we have. */
@@ -739,7 +1093,7 @@ static int WriteOneColLine(int col)
 
 	/* Decolorize reminder if necessary */
 	if (UseVTColors && e->is_color) {
-	    Decolorize();
+	    printf("%s", Decolorize(e->r, e->g, e->b));
 	}
 
 	/* Flesh out the rest of the column */
@@ -751,11 +1105,12 @@ static int WriteOneColLine(int col)
 	/* If done, free memory if no next entry. */
 	if (!*s && !e->next) {
 	    CalColumn[col] = e->next;
-	    free((void *)e->text);
-	    free((void *)e->filename);
+	    free(e->text);
+	    free(e->filename);
 #ifdef REM_USE_WCHAR
-	    if (e->wc_text) free((void *)e->wc_text);
+	    if (e->wc_text) free(e->wc_text);
 #endif
+	    free(e->raw_text);
 	    free(e);
 	} else {
 	    e->pos = s;
@@ -781,11 +1136,7 @@ static void GenerateCalEntries(int col)
     Parser p;
 
 /* Do some initialization first... */
-    ClearGlobalOmits();
-    DestroyOmitContexts();
-    DestroyVars(0);
-    NumTriggered = 0;
-    ClearLastTriggers();
+    PerIterationInit();
 
     r=IncludeFile(InitialFile);
     if (r) {
@@ -931,14 +1282,16 @@ static int DoCalRem(ParsePtr p, int col)
     CalEntry *CurCol = CalColumn[col];
     CalEntry *e;
     char const *s, *s2;
-    DynamicBuffer buf, obuf, pre_buf;
+    DynamicBuffer buf, obuf, pre_buf, raw_buf;
     Token tok;
+    int nonconst_expr = 0;
 
     int is_color, col_r, col_g, col_b;
 
     is_color = 0;
     DBufInit(&buf);
     DBufInit(&pre_buf);
+    DBufInit(&raw_buf);
 
     /* Parse the trigger date and time */
     if ( (r=ParseRem(p, &trig, &tim, 1)) ) {
@@ -946,6 +1299,20 @@ static int DoCalRem(ParsePtr p, int col)
 	return r;
     }
 
+    if (trig.typ == MSG_TYPE ||
+	trig.typ == CAL_TYPE ||
+	trig.typ == MSF_TYPE) {
+	is_color = (
+	    DefaultColorR != -1
+	    && DefaultColorG != -1
+	    && DefaultColorB != -1);
+	if (is_color) {
+	    col_r = DefaultColorR;
+	    col_g = DefaultColorG;
+	    col_b = DefaultColorB;
+	}
+    }
+
 /* Don't include timed reminders in calendar if -a option supplied. */
     if (DontIssueAts && tim.ttime != NO_TIME) {
 	FreeTrig(&trig);
@@ -1007,6 +1374,8 @@ static int DoCalRem(ParsePtr p, int col)
 	}
     }
 
+    /* Save nonconst_expr flag */
+    nonconst_expr = p->nonconst_expr;
     /* Convert PS and PSF to PASSTHRU */
     if (trig.typ == PS_TYPE) {
 	strcpy(trig.passthru, "PostScript");
@@ -1015,13 +1384,27 @@ static int DoCalRem(ParsePtr p, int col)
 	strcpy(trig.passthru, "PSFile");
 	trig.typ = PASSTHRU_TYPE;
     }
+
+    /* If it's a plain reminder but we have a default color, add the
+       three colors to the prebuf and change passthru to "COLOR" */
+    if (trig.typ == MSG_TYPE ||
+	trig.typ == CAL_TYPE ||
+	trig.typ == MSF_TYPE) {
+	if (PsCal && is_color) {
+	    char cbuf[24];
+	    sprintf(cbuf, "%d %d %d ", col_r, col_g, col_b);
+	    DBufPuts(&pre_buf, cbuf);
+	    strcpy(trig.passthru, "COLOR");
+	    /* Don't change trig.typ or next if() will trigger! */
+	}
+    }
     if (trig.typ == PASSTHRU_TYPE) {
-	if (!PsCal && strcmp(trig.passthru, "COLOR") && strcmp(trig.passthru, "COLOUR")) {
+	if (!PsCal && StrCmpi(trig.passthru, "COLOR") && StrCmpi(trig.passthru, "COLOUR")) {
 	    FreeTrig(&trig);
 	    return OK;
 	}
-	if (!strcmp(trig.passthru, "COLOR") ||
-	    !strcmp(trig.passthru, "COLOUR")) {
+	if (!StrCmpi(trig.passthru, "COLOR") ||
+	    !StrCmpi(trig.passthru, "COLOUR")) {
 	    is_color = 1;
 	    /* Strip off the three color numbers */
 	    DBufFree(&buf);
@@ -1070,20 +1453,31 @@ static int DoCalRem(ParsePtr p, int col)
 	 ShouldTriggerReminder(&trig, &tim, jul, &err))) {
 	NumTriggered++;
 
+	/* The parse_ptr should not be nested, but just in case... */
+	if (!p->isnested) {
+	    if (DBufPuts(&raw_buf, p->pos) != OK) {
+		DBufFree(&obuf);
+		DBufFree(&pre_buf);
+		FreeTrig(&trig);
+		return E_NO_MEM;
+	    }
+	}
 	if (DoSimpleCalendar || tim.ttime != NO_TIME) {
 	    /* 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"))) {
+		 StrCmpi(trig.passthru, "COLOUR") &&
+		 StrCmpi(trig.passthru, "COLOR"))) {
 		if (DBufPuts(&obuf, SimpleTime(NO_TIME)) != OK) {
 		    DBufFree(&obuf);
+		    DBufFree(&raw_buf);
 		    DBufFree(&pre_buf);
 		    FreeTrig(&trig);
 		    return E_NO_MEM;
 		}
 	    } else {
 		if (DBufPuts(&obuf, CalendarTime(tim.ttime, tim.duration)) != OK) {
+		    DBufFree(&raw_buf);
 		    DBufFree(&obuf);
 		    DBufFree(&pre_buf);
 		    FreeTrig(&trig);
@@ -1101,6 +1495,7 @@ static int DoCalRem(ParsePtr p, int col)
 		if (!DoCoerce(STR_TYPE, &v)) {
 		    if (DBufPuts(&obuf, v.v.str) != OK) {
 			DestroyValue(v);
+			DBufFree(&raw_buf);
 			DBufFree(&obuf);
 			DBufFree(&pre_buf);
 			FreeTrig(&trig);
@@ -1122,12 +1517,14 @@ static int DoCalRem(ParsePtr p, int col)
 	if (r) {
 	    DBufFree(&pre_buf);
 	    DBufFree(&obuf);
+	    DBufFree(&raw_buf);
 	    FreeTrig(&trig);
 	    return r;
 	}
 	if (DBufLen(&obuf) <= oldLen) {
 	    DBufFree(&obuf);
 	    DBufFree(&pre_buf);
+	    DBufFree(&raw_buf);
 	    FreeTrig(&trig);
 	    return OK;
 	}
@@ -1141,6 +1538,7 @@ static int DoCalRem(ParsePtr p, int col)
 		if (!DoCoerce(STR_TYPE, &v)) {
 		    if (DBufPuts(&obuf, v.v.str) != OK) {
 			DestroyValue(v);
+			DBufFree(&raw_buf);
 			DBufFree(&obuf);
 			DBufFree(&pre_buf);
 			FreeTrig(&trig);
@@ -1157,10 +1555,15 @@ static int DoCalRem(ParsePtr p, int col)
 	e = NEW(CalEntry);
 	if (!e) {
 	    DBufFree(&obuf);
+	    DBufFree(&raw_buf);
 	    DBufFree(&pre_buf);
 	    FreeTrig(&trig);
 	    return E_NO_MEM;
 	}
+	e->nonconst_expr = nonconst_expr;
+	e->if_depth = NumIfs;
+	e->trig = trig;
+	e->tt = tim;
 #ifdef REM_USE_WCHAR
 	e->wc_pos = NULL;
 	e->wc_text = NULL;
@@ -1170,9 +1573,13 @@ static int DoCalRem(ParsePtr p, int col)
 	e->g = col_g;
 	e->b = col_b;
 	e->text = StrDup(s);
+	e->raw_text = StrDup(DBufValue(&raw_buf));
+	DBufFree(&raw_buf);
 	DBufFree(&obuf);
 	DBufFree(&pre_buf);
-	if (!e->text) {
+	if (!e->text || !e->raw_text) {
+	    if (e->text) free(e->text);
+	    if (e->raw_text) free(e->raw_text);
 	    free(e);
 	    FreeTrig(&trig);
 	    return E_NO_MEM;
@@ -1190,12 +1597,14 @@ static int DoCalRem(ParsePtr p, int col)
 	e->priority = trig.priority;
 	e->filename = StrDup(FileName);
 	if(!e->filename) {
+	    if (e->text) free(e->text);
+	    if (e->raw_text) free(e->raw_text);
 	    free(e);
 	    return E_NO_MEM;
 	}
 	e->lineno = LineNo;
 
-	if (trig.typ == PASSTHRU_TYPE) {
+	if (trig.typ == PASSTHRU_TYPE || is_color) {
 	    StrnCpy(e->passthru, trig.passthru, PASSTHRU_LEN);
 	} else {
 	    e->passthru[0] = 0;
@@ -1213,23 +1622,8 @@ static int DoCalRem(ParsePtr p, int col)
     return OK;
 }
 
-/***************************************************************/
-/*                                                             */
-/*  WriteSimpleEntries                                         */
-/*                                                             */
-/*  Write entries in 'simple calendar' format.                 */
-/*                                                             */
-/***************************************************************/
-static void WriteSimpleEntries(int col, int jul)
+static void WriteSimpleEntryProtocol1(CalEntry *e)
 {
-    CalEntry *e = CalColumn[col];
-    CalEntry *n;
-    int y, m, d;
-
-    FromJulian(jul, &y, &m, &d);
-    while(e) {
-	if (DoPrefixLineNo) printf("# fileinfo %d %s\n", e->lineno, e->filename);
-	printf("%04d/%02d/%02d", y, m+1, d);
 	if (e->passthru[0]) {
 	    printf(" %s", e->passthru);
 	} else {
@@ -1251,10 +1645,186 @@ static void WriteSimpleEntries(int col, int jul)
 	    printf("* ");
 	}
 	printf("%s\n", e->text);
-	free((void *)e->text);
-	free((void *)e->filename);
+}
+
+
+static void WriteSimpleEntryProtocol2(CalEntry *e, int today)
+{
+    int done = 0;
+    if (DoPrefixLineNo) {
+	PrintJSONKeyPairString("filename", e->filename);
+	PrintJSONKeyPairInt("lineno", e->lineno);
+    }
+    PrintJSONKeyPairString("passthru", e->passthru);
+    PrintJSONKeyPairString("tags", DBufValue(&(e->tags)));
+    if (e->duration != NO_TIME) {
+	PrintJSONKeyPairInt("duration", e->duration);
+    }
+    if (e->time != NO_TIME) {
+	PrintJSONKeyPairInt("time", e->time);
+	if (e->tt.delta) {
+	    PrintJSONKeyPairInt("tdelta", e->tt.delta);
+	}
+	if (e->tt.rep) {
+	    PrintJSONKeyPairInt("trep", e->tt.rep);
+	}
+    }
+    if (e->trig.eventduration != NO_TIME) {
+	PrintJSONKeyPairInt("eventduration", e->trig.eventduration);
+    }
+    /* wd is an array of days from 0=monday to 6=sunday.
+       We convert to array of strings */
+    if (e->trig.wd != NO_WD) {
+	printf("\"wd\":[");
+	done = 0;
+	int i;
+	for (i=0; i<7; i++) {
+	    if (e->trig.wd & (1 << i)) {
+		if (done) {
+		    printf(",");
+		}
+		done = 1;
+		printf("\"%s\"", EnglishDayName[i]);
+	    }
+	}
+	printf("], ");
+    }
+    if (e->trig.d != NO_DAY) {
+	PrintJSONKeyPairInt("d", e->trig.d);
+    }
+    if (e->trig.m != NO_MON) {
+	PrintJSONKeyPairInt("m", e->trig.m+1);
+    }
+    if (e->trig.y != NO_YR) {
+	PrintJSONKeyPairInt("y", e->trig.y);
+    }
+    PrintJSONKeyPairDateTime("eventstart", e->trig.eventstart);
+    if (e->trig.back) {
+	PrintJSONKeyPairInt("back", e->trig.back);
+    }
+    if (e->trig.delta) {
+	PrintJSONKeyPairInt("delta", e->trig.delta);
+    }
+    if (e->trig.rep) {
+	PrintJSONKeyPairInt("rep", e->trig.rep);
+    }
+    if (e->nonconst_expr) {
+	PrintJSONKeyPairInt("nonconst_expr", e->nonconst_expr);
+    }
+    if (e->if_depth) {
+	PrintJSONKeyPairInt("if_depth", e->if_depth);
+    }
+    switch(e->trig.skip) {
+    case SKIP_SKIP:
+	PrintJSONKeyPairString("skip", "SKIP");
+	break;
+    case BEFORE_SKIP:
+	PrintJSONKeyPairString("skip", "BEFORE");
+	break;
+    case AFTER_SKIP:
+	PrintJSONKeyPairString("skip", "AFTER");
+	break;
+    }
+    /* Local omit is an array of days from 0=monday to 6=sunday.
+       We convert to array of strings */
+    if (e->trig.localomit != NO_WD) {
+	printf("\"localomit\":[");
+	done = 0;
+	int i;
+	for (i=0; i<7; i++) {
+	    if (e->trig.localomit & (1 << i)) {
+		if (done) {
+		    printf(",");
+		}
+		done = 1;
+		printf("\"%s\"", EnglishDayName[i]);
+	    }
+	}
+	printf("], ");
+    }
+    PrintJSONKeyPairDate("until", e->trig.until);
+    if (e->trig.once != NO_ONCE) {
+	PrintJSONKeyPairInt("once", e->trig.once);
+    }
+    if (e->trig.scanfrom != today) {
+	PrintJSONKeyPairDate("scanfrom", e->trig.scanfrom);
+    }
+    PrintJSONKeyPairDate("from", e->trig.from);
+    PrintJSONKeyPairInt("priority", e->trig.priority);
+
+    if (e->is_color) {
+	PrintJSONKeyPairInt("r", e->r);
+	PrintJSONKeyPairInt("g", e->g);
+	PrintJSONKeyPairInt("b", e->b);
+    } else if (!StrCmpi(e->passthru, "SHADE")) {
+	int r, g, b, n;
+	n = sscanf(e->text, "%d %d %d", &r, &g, &b);
+	if (n < 3) {
+	    g = r;
+	    b = r;
+	}
+	if (r < 0) r = 0;
+	else if (r > 255) r = 255;
+	if (g < 0) g = 0;
+	else if (g > 255) g = 255;
+	if (b < 0) b = 0;
+	else if (b > 255) b = 255;
+	PrintJSONKeyPairInt("r", r);
+	PrintJSONKeyPairInt("g", g);
+	PrintJSONKeyPairInt("b", b);
+    }
+    /* Only print rawbody if it differs from body */
+    if (strcmp(e->raw_text, e->text)) {
+	PrintJSONKeyPairString("rawbody", e->raw_text);
+    }
+    printf("\"body\":\"");
+    PrintJSONString(e->text);
+    printf("\"");
+}
+
+/***************************************************************/
+/*                                                             */
+/*  WriteSimpleEntries                                         */
+/*                                                             */
+/*  Write entries in 'simple calendar' format.                 */
+/*                                                             */
+/***************************************************************/
+static void WriteSimpleEntries(int col, int jul)
+{
+    CalEntry *e = CalColumn[col];
+    CalEntry *n;
+    int y, m, d;
+
+    FromJulian(jul, &y, &m, &d);
+    while(e) {
+	if (DoPrefixLineNo) {
+	    if (PsCal != PSCAL_LEVEL2 && PsCal != PSCAL_LEVEL3) {
+		printf("# fileinfo %d %s\n", e->lineno, e->filename);
+	    }
+	}
+	if (PsCal >= PSCAL_LEVEL2) {
+	    if (PsCal == PSCAL_LEVEL3) {
+		if (DidADay) {
+		    printf(",\n");
+		}
+	    }
+	    DidADay = 1;
+	    printf("{\"date\":\"%04d-%02d-%02d\", ", y, m+1, d);
+	    WriteSimpleEntryProtocol2(e, jul);
+	    printf("}");
+	    if (PsCal != PSCAL_LEVEL3) {
+		printf("\n");
+	    }
+	} else {
+	    printf("%04d/%02d/%02d", y, m+1, d);
+	    WriteSimpleEntryProtocol1(e);
+	}
+
+	free(e->text);
+	free(e->raw_text);
+	free(e->filename);
 #ifdef REM_USE_WCHAR
-	if (e->wc_text) free((void *)e->wc_text);
+	if (e->wc_text) free(e->wc_text);
 #endif
 	n = e->next;
 	free(e);

src/custom.h

@@ -220,6 +220,9 @@
 #define PSBEGIN "# rem2ps begin"
 #define PSEND   "# rem2ps end"
 
+#define PSBEGIN2 "# rem2ps2 begin"
+#define PSEND2   "# rem2ps2 end"
+
 #ifdef BROKEN_PUTC
 #define Putc SafePutc
 #define PutChar SafePutChar

src/custom.h.in

@@ -220,6 +220,9 @@
 #define PSBEGIN "# rem2ps begin"
 #define PSEND   "# rem2ps end"
 
+#define PSBEGIN2 "# rem2ps2 begin"
+#define PSEND2   "# rem2ps2 end"
+
 #ifdef BROKEN_PUTC
 #define Putc SafePutc
 #define PutChar SafePutChar

src/dorem.c

@@ -43,7 +43,7 @@ ComputeTrigDuration(TimeTrig *t)
 	t->duration == NO_TIME) {
 	return 0;
     }
-    return (t->ttime + t->duration - 1) / 1440;
+    return (t->ttime + t->duration - 1) / MINUTES_PER_DAY;
 }
 
 /***************************************************************/
@@ -389,6 +389,10 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    r=ParseToken(s, &buf);
 	    if (r) return r;
 	    StrnCpy(trig->omitfunc, DBufValue(&buf), VAR_NAME_LEN);
+
+	    /* An OMITFUNC counts as a nonconst_expr! */
+	    s->expr_happened = 1;
+	    s->nonconst_expr = 1;
 	    DBufFree(&buf);
 	    break;
 
@@ -413,6 +417,9 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    switch(tok.type) {
 	    case T_Time:
 	    case T_LongTime:
+	    case T_Year:
+	    case T_Day:
+	    case T_Number:
 		if (tok.val != 0) {
 		    tim->duration = tok.val;
 		} else {
@@ -759,20 +766,24 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
     char const *s;
     Value v;
 
+    int red = -1, green = -1, blue = -1;
+    int is_color = 0;
+
     DBufInit(&buf);
     DBufInit(&calRow);
     DBufInit(&pre_buf);
     if (t->typ == RUN_TYPE && RunDisabled) return E_RUN_DISABLED;
-    if ((t->typ == PASSTHRU_TYPE && strcmp(t->passthru, "COLOR") && strcmp(t->passthru, "COLOUR")) ||
+    if ((t->typ == PASSTHRU_TYPE && StrCmpi(t->passthru, "COLOR") && StrCmpi(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") || !strcmp(t->passthru, "COLOUR"))) {
+    if (t->typ == PASSTHRU_TYPE && (!StrCmpi(t->passthru, "COLOR") || !StrCmpi(t->passthru, "COLOUR"))) {
 	/* Strip off three tokens */
 	r = ParseToken(p, &buf);
+	sscanf(DBufValue(&buf), "%d", &red);
 	if (!NextMode) {
 	    DBufPuts(&pre_buf, DBufValue(&buf));
 	    DBufPutc(&pre_buf, ' ');
@@ -780,6 +791,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	DBufFree(&buf);
 	if (r) return r;
 	r = ParseToken(p, &buf);
+	sscanf(DBufValue(&buf), "%d", &green);
 	if (!NextMode) {
 	    DBufPuts(&pre_buf, DBufValue(&buf));
 	    DBufPutc(&pre_buf, ' ');
@@ -787,6 +799,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	DBufFree(&buf);
 	if (r) return r;
 	r = ParseToken(p, &buf);
+	sscanf(DBufValue(&buf), "%d", &blue);
 	if (!NextMode) {
 	    DBufPuts(&pre_buf, DBufValue(&buf));
 	    DBufPutc(&pre_buf, ' ');
@@ -870,6 +883,23 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	return OK;
     }
 
+    /* Correct colors */
+    if (UseVTColors) {
+	if (red == -1 && green == -1 && blue == -1) {
+	    if (DefaultColorR != -1 && DefaultColorG != -1 && DefaultColorB != -1) {
+		red = DefaultColorR;
+		green = DefaultColorG;
+		blue = DefaultColorB;
+	    }
+	}
+	if (red >= 0 && green >= 0 && blue >= 0) {
+	    is_color = 1;
+	    if (red > 255) red = 255;
+	    if (green > 255) green = 255;
+	    if (blue > 255) blue = 255;
+	}
+    }
+
     /* Put the substituted string into the substitution buffer */
 
     /* Don't use msgprefix() on RUN-type reminders */
@@ -880,6 +910,9 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	    r = EvalExpr(&s, &v, NULL);
 	    if (!r) {
 		if (!DoCoerce(STR_TYPE, &v)) {
+		    if (is_color) {
+			DBufPuts(&buf, Colorize(red, green, blue));
+		    }
 		    if (DBufPuts(&buf, v.v.str) != OK) {
 			DBufFree(&buf);
 			DestroyValue(v);
@@ -891,6 +924,9 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	}
     }
 
+    if (is_color) {
+	DBufPuts(&buf, Colorize(red, green, blue));
+    }
     if ( (r=DoSubst(p, &buf, t, tim, jul, NORMAL_MODE)) ) return r;
     if (t->typ != RUN_TYPE) {
 	if (UserFuncExists("msgsuffix") == 1) {
@@ -899,6 +935,9 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	    r = EvalExpr(&s, &v, NULL);
 	    if (!r) {
 		if (!DoCoerce(STR_TYPE, &v)) {
+		    if (is_color) {
+			DBufPuts(&buf, Colorize(red, green, blue));
+		    }
 		    if (DBufPuts(&buf, v.v.str) != OK) {
 			DBufFree(&buf);
 			DestroyValue(v);
@@ -910,6 +949,10 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	}
     }
 
+    if (is_color) {
+	DBufPuts(&buf, Decolorize(red, green, blue));
+    }
+
     if ((!MsgCommand && t->typ == MSG_TYPE) || t->typ == MSF_TYPE) {
 	if (DBufPutc(&buf, '\n') != OK) {
 	    DBufFree(&buf);
@@ -944,7 +987,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	break;
 
     case RUN_TYPE:
-	system(DBufValue(&buf));
+	System(DBufValue(&buf));
 	break;
 
     default: /* Unknown/illegal type? */
@@ -1059,10 +1102,24 @@ int DoSatRemind(Trigger *trig, TimeTrig *tt, ParsePtr p)
     iter = 0;
     start = trig->scanfrom;
     while (iter++ < MaxSatIter) {
-	jul = ComputeTriggerNoAdjustDuration(start, trig, tt, &r, 1);
+	jul = ComputeTriggerNoAdjustDuration(start, trig, tt, &r, 1, 0);
 	if (r) {
 	    if (r == E_CANT_TRIG) return OK; else return r;
 	}
+	if (jul != start && trig->duration_days) {
+	    jul = ComputeTriggerNoAdjustDuration(start, trig, tt, &r, 1, trig->duration_days);
+	    if (r) {
+		if (r == E_CANT_TRIG) return OK; else return r;
+	    }
+	} else if (jul == start) {
+	    if (tt->ttime != NO_TIME) {
+		trig->eventstart = MINUTES_PER_DAY * r + tt->ttime;
+		if (tt->duration != NO_TIME) {
+		    trig->eventduration = tt->duration;
+		}
+	    }
+	    SaveAllTriggerInfo(trig, tt, jul, tt->ttime, 1);
+	}
 	if (jul == -1) {
 	    return E_EXPIRED;
 	}
@@ -1200,7 +1257,7 @@ int DoMsgCommand(char const *cmd, char const *msg)
     }
     r = OK;
 
-    system(DBufValue(&execBuffer));
+    System(DBufValue(&execBuffer));
 
 finished:
     DBufFree(&buf);

src/dosubst.c

@@ -644,10 +644,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    break;
 
 	case '_':
-	    if (mode != CAL_MODE && mode != ADVANCE_MODE && !MsgCommand)
+	    if (PsCal == PSCAL_LEVEL2 || PsCal == PSCAL_LEVEL3 || (mode != CAL_MODE && mode != ADVANCE_MODE && !MsgCommand)) {
 		sprintf(s, "%s", NL);
-	    else
+	    } else {
 		sprintf(s, " ");
+	    }
 	    SHIP_OUT(s);
 	    break;
 
@@ -656,8 +657,13 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    break;
 
 	case '"':
-	    if (DBufPutc(dbuf, QUOTE_MARKER) != OK) return E_NO_MEM;
-	    has_quote = 1;
+	    if (PsCal != PSCAL_LEVEL3) {
+		if (DBufPutc(dbuf, QUOTE_MARKER) != OK) return E_NO_MEM;
+		has_quote = 1;
+	    } else {
+		if (DBufPutc(dbuf, '%') != OK) return E_NO_MEM;
+		if (DBufPutc(dbuf, c) != OK) return E_NO_MEM;
+	    }
 	    break;
 
 	default:

src/dynbuf.c

@@ -150,7 +150,9 @@ int DBufGets(DynamicBuffer *dbuf, FILE *fp)
        we can usually save some unnecessary copying */
 
     *(dbuf->buffer) = 0;
-    fgets(dbuf->buffer, dbuf->allocatedLen, fp);
+    if (fgets(dbuf->buffer, dbuf->allocatedLen, fp) == NULL) {
+	return OK;
+    }
     if (!*(dbuf->buffer)) return OK;
     dbuf->len = strlen(dbuf->buffer);
     l = dbuf->len - 1;
@@ -162,7 +164,7 @@ int DBufGets(DynamicBuffer *dbuf, FILE *fp)
 
     while(busy) {
 	*tmp = 0;
-	fgets(tmp, 256, fp);
+	if (fgets(tmp, 256, fp) == NULL) return OK;
 	if (!*tmp) return OK;
 	l = strlen(tmp) - 1;
 	if (tmp[l] == '\n') {

src/expr.c

@@ -492,6 +492,7 @@ static int MakeValue(char const *s, Value *v, Var *locals, ParsePtr p)
 {
     int len;
     int h, m, r;
+    int ampm = 0;
 
     if (*s == '\"') { /* It's a literal string "*/
 	len = strlen(s)-1;
@@ -532,7 +533,27 @@ static int MakeValue(char const *s, Value *v, Var *locals, ParsePtr p)
 		m += *s - '0';
 		s++;
 	    }
+	    /* Check for p[m] or a[m] */
+	    if (*s == 'A' || *s == 'a' || *s == 'P' || *s == 'p') {
+		ampm = tolower(*s);
+		s++;
+		if (*s == 'm' || *s == 'M') {
+		    s++;
+		}
+	    }
 	    if (*s || h>23 || m>59) return E_BAD_TIME;
+	    if (ampm) {
+		if (h < 1 || h > 12) return E_BAD_TIME;
+		if (ampm == 'a') {
+		    if (h == 12) {
+			h = 0;
+		    }
+		} else if (ampm == 'p') {
+		    if (h < 12) {
+			h += 12;
+		    }
+		}
+	    }
 	    v->type = TIME_TYPE;
 	    v->v.val = h*60 + m;
 	    return OK;
@@ -701,26 +722,12 @@ int DoCoerce(char type, Value *v)
 	    return OK;
 
 	case STR_TYPE:
-	    h = 0;
-	    m = 0;
 	    s = v->v.str;
-	    if (!isdigit(*s)) return E_CANT_COERCE;
-	    while (isdigit(*s)) {
-		h *= 10;
-		h += *s++ - '0';
-	    }
-	    if (*s != ':' && *s != '.' && *s != TimeSep)
-		return E_CANT_COERCE;
-	    s++;
-	    if (!isdigit(*s)) return E_CANT_COERCE;
-	    while (isdigit(*s)) {
-		m *= 10;
-		m += *s++ - '0';
-	    }
-	    if (*s || h>23 || m>59) return E_CANT_COERCE;
+	    if (ParseLiteralTime(&s, &i)) return E_CANT_COERCE;
+	    if (*s) return E_CANT_COERCE;
 	    v->type = TIME_TYPE;
 	    free(v->v.str);
-	    v->v.val = h*60+m;
+	    v->v.val = i;
 	    return OK;
 
 	default: return E_CANT_COERCE;
@@ -1222,6 +1229,48 @@ int CopyValue(Value *dest, const Value *src)
     return OK;
 }
 
+int ParseLiteralTime(char const **s, int *tim)
+{
+    int h=0;
+    int m=0;
+    int ampm=0;
+    if (!isdigit(**s)) return E_BAD_TIME;
+    while(isdigit(**s)) {
+	h *= 10;
+	h += *(*s)++ - '0';
+    }
+    if (**s != ':' && **s != '.' && **s != TimeSep) return E_BAD_TIME;
+    (*s)++;
+    if (!isdigit(**s)) return E_BAD_TIME;
+    while(isdigit(**s)) {
+	m *= 10;
+	m += *(*s)++ - '0';
+    }
+    /* Check for p[m] or a[m] */
+    if (**s == 'A' || **s == 'a' || **s == 'P' || **s == 'p') {
+	ampm = tolower(**s);
+	(*s)++;
+	if (**s == 'm' || **s == 'M') {
+	    (*s)++;
+	}
+    }
+    if (h>23 || m>59) return E_BAD_TIME;
+    if (ampm) {
+	if (h < 1 || h > 12) return E_BAD_TIME;
+	if (ampm == 'a') {
+	    if (h == 12) {
+		h = 0;
+	    }
+	} else if (ampm == 'p') {
+	    if (h < 12) {
+		h += 12;
+	    }
+	}
+    }
+    *tim = h * 60 + m;
+    return OK;
+}
+
 /***************************************************************/
 /*                                                             */
 /*  ParseLiteralDate                                           */
@@ -1233,10 +1282,9 @@ int CopyValue(Value *dest, const Value *src)
 int ParseLiteralDate(char const **s, int *jul, int *tim)
 {
     int y, m, d;
-    int hour, min;
+    int r;
 
     y=0; m=0; d=0;
-    hour=0; min=0;
 
     *tim = NO_TIME;
     if (!isdigit(**s)) return E_BAD_DATE;
@@ -1266,20 +1314,9 @@ int ParseLiteralDate(char const **s, int *jul, int *tim)
     /* Do we have a time part as well? */
     if (**s == ' ' || **s == '@' || **s == 'T' || **s == 't') {
 	(*s)++;
-	while(isdigit(**s)) {
-	    hour *= 10;
-	    hour += *(*s)++ - '0';
-	}
-	if (**s != ':' && **s != '.' && **s != TimeSep) return E_BAD_TIME;
-	(*s)++;
-	while(isdigit(**s)) {
-	    min *= 10;
-	    min += *(*s)++ - '0';
-	}
-	if (hour > 23 || min > 59) return E_BAD_TIME;
-	*tim = hour * 60 + min;
+	r = ParseLiteralTime(s, tim);
+	if (r != OK) return r;
     }
-
     return OK;
 }
 

src/funcs.c

@@ -57,6 +57,7 @@ static int FADawn          (func_info *);
 static int FADusk          (func_info *);
 static int FAbs            (func_info *);
 static int FAccess         (func_info *);
+static int FAmpm           (func_info *);
 static int FArgs           (func_info *);
 static int FAsc            (func_info *);
 static int FBaseyr         (func_info *);
@@ -206,6 +207,7 @@ BuiltinFunc Func[] = {
     {   "access",       2,      2,      0,          FAccess },
     {   "adawn",        0,      1,      0,          FADawn},
     {   "adusk",        0,      1,      0,          FADusk},
+    {   "ampm",         1,      3,      1,          FAmpm   },
     {   "args",         1,      1,      0,          FArgs   },
     {   "asc",          1,      1,      1,          FAsc    },
     {   "baseyr",       0,      0,      1,          FBaseyr },
@@ -886,6 +888,76 @@ static int FSgn(func_info *info)
     return OK;
 }
 
+/***************************************************************/
+/*                                                             */
+/*  FAmpm - return a time as a string with "AM" or "PM" suffix */
+/*                                                             */
+/***************************************************************/
+static int FAmpm(func_info *info)
+{
+    int h, m;
+    int yr=0, mo=0, da=0;
+
+    char const *am = "AM";
+    char const *pm = "PM";
+    char const *ampm = NULL;
+
+    char outbuf[128];
+
+    if (ARG(0).type != DATETIME_TYPE && ARG(0).type != TIME_TYPE) {
+	return E_BAD_TYPE;
+    }
+    if (HASDATE(ARG(0))) {
+	FromJulian(DATEPART(ARG(0)), &yr, &mo, &da);
+    }
+    if (Nargs >= 2) {
+	ASSERT_TYPE(1, STR_TYPE);
+	am = ARGSTR(1);
+	if (Nargs >= 3) {
+	    ASSERT_TYPE(2, STR_TYPE);
+	    pm = ARGSTR(2);
+	}
+    }
+    h = TIMEPART(ARG(0)) / 60;
+    m = TIMEPART(ARG(0)) % 60;
+    if (h <= 11) {
+	/* AM */
+	if (h == 0) {
+	    if (ARG(0).type == DATETIME_TYPE) {
+		snprintf(outbuf, sizeof(outbuf), "%04d%c%02d%c%02d%c12%c%02d", yr, DateSep, mo+1, DateSep, da, DateTimeSep, TimeSep, m);
+	    } else {
+		snprintf(outbuf, sizeof(outbuf), "12%c%02d", TimeSep, m);
+	    }
+	} else {
+	    if (ARG(0).type == DATETIME_TYPE) {
+		snprintf(outbuf, sizeof(outbuf), "%04d%c%02d%c%02d%c%d%c%02d", yr, DateSep, mo+1, DateSep, da, DateTimeSep, h, TimeSep, m);
+	    } else {
+		snprintf(outbuf, sizeof(outbuf), "%d%c%02d", h, TimeSep, m);
+	    }
+	}
+	ampm = am;
+    } else {
+	if (h > 12) {
+	    h -= 12;
+	}
+	if (ARG(0).type == DATETIME_TYPE) {
+	    snprintf(outbuf, sizeof(outbuf), "%04d%c%02d%c%02d%c%d%c%02d", yr, DateSep, mo+1, DateSep, da, DateTimeSep, h, TimeSep, m);
+	} else {
+	    snprintf(outbuf, sizeof(outbuf), "%d%c%02d", h, TimeSep, m);
+	}
+	ampm = pm;
+    }
+    RetVal.type = STR_TYPE;
+    RetVal.v.str = malloc(strlen(outbuf) + strlen(ampm) + 1);
+    if (!RetVal.v.str) {
+	RetVal.type = ERR_TYPE;
+	return E_NO_MEM;
+    }
+    strcpy(RetVal.v.str, outbuf);
+    strcat(RetVal.v.str, ampm);
+    return OK;
+}
+
 /***************************************************************/
 /*                                                             */
 /*  FOrd - returns a string containing ordinal number.         */

src/globals.h

@@ -46,7 +46,7 @@ EXTERN  INIT(   int     DoPrefixLineNo, 0);
 EXTERN	INIT(	int	MondayFirst, 0);
 EXTERN	INIT(	int	Iterations, 1);
 EXTERN  INIT(   int     PsCal, 0);
-EXTERN  INIT(   int     CalWidth, 80);
+EXTERN  INIT(   int     CalWidth, -1);
 EXTERN  INIT(   int     CalWeeks, 0);
 EXTERN  INIT(   int     CalMonths, 0);
 EXTERN  INIT(	int 	Hush, 0);
@@ -73,6 +73,9 @@ EXTERN  INIT(   int     Daemon, 0);
 EXTERN  INIT(   char    DateSep, DATESEP);
 EXTERN  INIT(   char    TimeSep, TIMESEP);
 EXTERN  INIT(   char    DateTimeSep, DATETIMESEP);
+EXTERN  INIT(   int     DefaultColorR, -1);
+EXTERN  INIT(   int     DefaultColorB, -1);
+EXTERN  INIT(   int     DefaultColorG, -1);
 EXTERN  INIT(   int     SynthesizeTags, 0);
 EXTERN  INIT(   int     ScFormat, SC_AMPM);
 EXTERN  INIT(   int     MaxSatIter, 150);
@@ -100,6 +103,9 @@ EXTERN  INIT(   int     CalPad, 1);
 EXTERN  INIT(   int     UseVTChars, 0);
 EXTERN  INIT(   int     UseUTF8Chars, 0);
 EXTERN  INIT(   int     UseVTColors, 0);
+EXTERN  INIT(   int     Use256Colors, 0);
+EXTERN  INIT(   int     UseTrueColors, 0);
+EXTERN  INIT(   int     TerminalBackground, TERMINAL_BACKGROUND_UNKNOWN);
 
 /* Latitude and longitude */
 EXTERN  INIT(	int	  LatDeg, LAT_DEG);

src/init.c

@@ -23,6 +23,7 @@
 #include <sys/types.h>
 #include <pwd.h>
 #include <unistd.h>
+#include <sys/ioctl.h>
 
 #include "types.h"
 #include "protos.h"
@@ -38,6 +39,7 @@
  *             simple calendar format.
  *  -r       = Disallow RUN mode
  *  -c[n]    = Produce a calendar for n months (default = 1)
+ *  -@[n,m]  = Colorize n=0 VT100 n=1 85 n=2 True m=0 dark terminal m=1 light
  *  -w[n,n,n] = Specify output device width, padding and spacing
  *  -s[n]    = Produce calendar in "simple calendar" format
  *  -p[n]    = Produce calendar in format compatible with rem2ps
@@ -135,7 +137,7 @@ void InitRemind(int argc, char const *argv[])
     int InvokedAsRem = 0;
     char const *s;
     int weeks;
-
+    int x;
     int jul;
 
 #if defined(__APPLE__)
@@ -146,6 +148,17 @@ void InitRemind(int argc, char const *argv[])
 
     jul = NO_DATE;
 
+    /* If stdout is a terminal, initialize $FormWidth to terminal width-8,
+       but clamp to [20, 500] */
+    if (isatty(STDOUT_FILENO)) {
+	struct winsize w;
+	if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) == 0) {
+	    FormWidth = w.ws_col - 8;
+	    if (FormWidth < 20) FormWidth = 20;
+	    if (FormWidth > 500) FormWidth = 500;
+	}
+    }
+    
     /* Initialize global dynamic buffers */
     DBufInit(&Banner);
     DBufInit(&LineBuffer);
@@ -190,6 +203,7 @@ void InitRemind(int argc, char const *argv[])
 
     /* Parse the command-line options */
     i = 1;
+
     while (i < argc) {
 	arg = argv[i];
 	if (*arg != '-') break; /* Exit the loop if it's not an option */
@@ -204,6 +218,27 @@ void InitRemind(int argc, char const *argv[])
 	while (*arg) {
 	    switch(*arg++) {
 
+	    case '@':
+		UseVTColors = 1;
+		if (*arg) {
+		    PARSENUM(x, arg);
+		    if (x == 1) {
+			Use256Colors = 1;
+		    } else if (x == 2) {
+			UseTrueColors = 1;
+		    }
+		}
+		if (*arg == ',') {
+		    arg++;
+		    PARSENUM(x, arg);
+		    if (x == 0) {
+			TerminalBackground = TERMINAL_BACKGROUND_DARK;
+		    } else if (x == 1) {
+			TerminalBackground = TERMINAL_BACKGROUND_LIGHT;
+		    }
+		}
+		break;
+
 	    case 'j':
 	    case 'J':
 		PurgeMode = 1;
@@ -400,9 +435,21 @@ void InitRemind(int argc, char const *argv[])
 	    case 'p':
 	    case 'P':
 		DoSimpleCalendar = 1;
-		PsCal = 1;
-		if (*arg == 'a' || *arg == 'A') {
-		    DoSimpleCalDelta = 1;
+		PsCal = PSCAL_LEVEL1;
+		while (*arg == 'a' || *arg == 'A' ||
+		       *arg == 'p' || *arg == 'P') {
+		    if (*arg == 'a' || *arg == 'A') {
+			DoSimpleCalDelta = 1;
+		    } else if (*arg == 'p' || *arg == 'P') {
+			/* JSON interchange formats always include
+			   file and line number info */
+			DoPrefixLineNo = 1;
+			if (PsCal == PSCAL_LEVEL1) {
+			    PsCal = PSCAL_LEVEL2;
+			} else {
+			    PsCal = PSCAL_LEVEL3;
+			}
+		    }
 		    arg++;
 		}
 		PARSENUM(CalMonths, arg);
@@ -418,7 +465,10 @@ void InitRemind(int argc, char const *argv[])
 	    case 'W':
 		if (*arg != ',') {
 		    PARSENUM(CalWidth, arg);
-		    if (CalWidth < 71) CalWidth = 71;
+		    if (CalWidth != 0 && CalWidth < 71) CalWidth = 71;
+		    if (CalWidth == 0) {
+			CalWidth = -1;
+		    }
 		}
 		if (*arg == ',') {
 		    arg++;
@@ -607,6 +657,7 @@ void Usage(void)
     fprintf(ErrFp, "Options:\n");
     fprintf(ErrFp, " -n     Output next occurrence of reminders in simple format\n");
     fprintf(ErrFp, " -r     Disable RUN directives\n");
+    fprintf(ErrFp, " -@[n,m] Colorize COLOR reminders\n");
     fprintf(ErrFp, " -c[a][n] Produce a calendar for n (default 1) months\n");
     fprintf(ErrFp, " -c[a]+[n] Produce a calendar for n (default 1) weeks\n");
     fprintf(ErrFp, " -w[n[,p[,s]]]  Specify width, padding and spacing of calendar\n");

src/json.h

@@ -0,0 +1,280 @@
+/* vim: set et ts=3 sw=3 sts=3 ft=c:
+ *
+ * Copyright (C) 2012, 2013, 2014 James McLaughlin et al.  All rights reserved.
+ * https://github.com/udp/json-parser
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _JSON_H
+#define _JSON_H
+
+#ifndef json_char
+   #define json_char char
+#endif
+
+#ifndef json_int_t
+   #ifndef _MSC_VER
+      #include <inttypes.h>
+      #define json_int_t int64_t
+   #else
+      #define json_int_t __int64
+   #endif
+#endif
+
+#include <stdlib.h>
+
+#ifdef __cplusplus
+
+   #include <string.h>
+
+   extern "C"
+   {
+
+#endif
+
+typedef struct
+{
+   unsigned long max_memory;
+   int settings;
+
+   /* Custom allocator support (leave null to use malloc/free)
+    */
+
+   void * (* mem_alloc) (size_t, int zero, void * user_data);
+   void (* mem_free) (void *, void * user_data);
+
+   void * user_data;  /* will be passed to mem_alloc and mem_free */
+
+   size_t value_extra;  /* how much extra space to allocate for values? */
+
+} json_settings;
+
+#define json_enable_comments  0x01
+
+typedef enum
+{
+   json_none,
+   json_object,
+   json_array,
+   json_integer,
+   json_double,
+   json_string,
+   json_boolean,
+   json_null
+
+} json_type;
+
+extern const struct _json_value json_value_none;
+
+typedef struct _json_object_entry
+{
+    json_char * name;
+    unsigned int name_length;
+
+    struct _json_value * value;
+
+} json_object_entry;
+
+typedef struct _json_value
+{
+   struct _json_value * parent;
+
+   json_type type;
+
+   union
+   {
+      int boolean;
+      json_int_t integer;
+      double dbl;
+
+      struct
+      {
+	 unsigned int length;
+	 json_char * ptr; /* null terminated */
+
+      } string;
+
+      struct
+      {
+	 unsigned int length;
+
+	 json_object_entry * values;
+
+	 #if defined(__cplusplus) && __cplusplus >= 201103L
+	 decltype(values) begin () const
+	 {  return values;
+	 }
+	 decltype(values) end () const
+	 {  return values + length;
+	 }
+	 #endif
+
+      } object;
+
+      struct
+      {
+	 unsigned int length;
+	 struct _json_value ** values;
+
+	 #if defined(__cplusplus) && __cplusplus >= 201103L
+	 decltype(values) begin () const
+	 {  return values;
+	 }
+	 decltype(values) end () const
+	 {  return values + length;
+	 }
+	 #endif
+
+      } array;
+
+   } u;
+
+   union
+   {
+      struct _json_value * next_alloc;
+      void * object_mem;
+
+   } _reserved;
+
+   #ifdef JSON_TRACK_SOURCE
+
+      /* Location of the value in the source JSON
+       */
+      unsigned int line, col;
+
+   #endif
+
+
+   /* Some C++ operator sugar */
+
+   #ifdef __cplusplus
+
+      public:
+
+	 inline _json_value ()
+	 {  memset (this, 0, sizeof (_json_value));
+	 }
+
+	 inline const struct _json_value &operator [] (int index) const
+	 {
+	    if (type != json_array || index < 0
+		     || ((unsigned int) index) >= u.array.length)
+	    {
+	       return json_value_none;
+	    }
+
+	    return *u.array.values [index];
+	 }
+
+	 inline const struct _json_value &operator [] (const char * index) const
+	 {
+	    if (type != json_object)
+	       return json_value_none;
+
+	    for (unsigned int i = 0; i < u.object.length; ++ i)
+	       if (!strcmp (u.object.values [i].name, index))
+		  return *u.object.values [i].value;
+
+	    return json_value_none;
+	 }
+
+	 inline operator const char * () const
+	 {
+	    switch (type)
+	    {
+	       case json_string:
+		  return u.string.ptr;
+
+	       default:
+		  return "";
+	    };
+	 }
+
+	 inline operator json_int_t () const
+	 {
+	    switch (type)
+	    {
+	       case json_integer:
+		  return u.integer;
+
+	       case json_double:
+		  return (json_int_t) u.dbl;
+
+	       default:
+		  return 0;
+	    };
+	 }
+
+	 inline operator bool () const
+	 {
+	    if (type != json_boolean)
+	       return false;
+
+	    return u.boolean != 0;
+	 }
+
+	 inline operator double () const
+	 {
+	    switch (type)
+	    {
+	       case json_integer:
+		  return (double) u.integer;
+
+	       case json_double:
+		  return u.dbl;
+
+	       default:
+		  return 0;
+	    };
+	 }
+
+   #endif
+
+} json_value;
+
+json_value * json_parse (const json_char * json,
+			 size_t length);
+
+#define json_error_max 128
+json_value * json_parse_ex (json_settings * settings,
+			    const json_char * json,
+			    size_t length,
+			    char * error);
+
+void json_value_free (json_value *);
+
+
+/* Not usually necessary, unless you used a custom mem_alloc and now want to
+ * use a custom mem_free.
+ */
+void json_value_free_ex (json_settings * settings,
+			 json_value *);
+
+
+#ifdef __cplusplus
+   } /* extern "C" */
+#endif
+
+#endif

src/main.c

@@ -127,11 +127,7 @@ int main(int argc, char *argv[])
 	    }
 	}
 	if (Iterations) {
-	    ClearGlobalOmits();
-	    DestroyOmitContexts();
-	    DestroyVars(0);
-	    NumTriggered = 0;
-	    ClearLastTriggers();
+	    PerIterationInit();
 	    JulianToday++;
 	}
     }
@@ -149,6 +145,19 @@ void PurgeEchoLine(char const *fmt, ...)
 
 }
 
+void
+PerIterationInit(void)
+{
+    ClearGlobalOmits();
+    DestroyOmitContexts();
+    DestroyVars(0);
+    DefaultColorR = -1;
+    DefaultColorG = -1;
+    DefaultColorB = -1;
+    NumTriggered = 0;
+    ClearLastTriggers();
+}
+
 /***************************************************************/
 /*                                                             */
 /*  DoReminders                                                */
@@ -1361,6 +1370,16 @@ ClearLastTriggers(void)
     LastTimeTrig.duration = NO_TIME;
 }
 
+void
+SaveAllTriggerInfo(Trigger const *t, TimeTrig const *tt, int trigdate, int trigtime, int valid)
+{
+    SaveLastTrigger(t);
+    SaveLastTimeTrig(tt);
+    LastTriggerDate = trigdate;
+    LastTriggerTime = trigtime;
+    LastTrigValid = valid;
+}
+
 void
 SaveLastTrigger(Trigger const *t)
 {
@@ -1373,3 +1392,14 @@ SaveLastTimeTrig(TimeTrig const *t)
 {
     memcpy(&LastTimeTrig, t, sizeof(LastTimeTrig));
 }
+
+/* Wrapper to ignore warnings about ignoring return value of system() */
+void
+System(char const *cmd)
+{
+    int r;
+    r = system(cmd);
+    if (r == 0) {
+	r = 1;
+    }
+}

src/protos.h

@@ -37,6 +37,7 @@ int ShouldTriggerReminder (Trigger *t, TimeTrig *tim, int jul, int *err);
 int DoSubst (ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul, int mode);
 int DoSubstFromString (char const *source, DynamicBuffer *dbuf, int jul, int tim);
 int ParseLiteralDate (char const **s, int *jul, int *tim);
+int ParseLiteralTime (char const **s, int *tim);
 int EvalExpr (char const **e, Value *v, ParsePtr p);
 int DoCoerce (char type, Value *v);
 void PrintValue  (Value *v, FILE *fp);
@@ -89,7 +90,7 @@ char const *FindInitialToken (Token *tok, char const *s);
 void FindToken (char const *s, Token *tok);
 void FindNumericToken (char const *s, Token *t);
 int ComputeTrigger (int today, Trigger *trig, TimeTrig *tim, int *err, int save_in_globals);
-int ComputeTriggerNoAdjustDuration (int today, Trigger *trig, TimeTrig *tim, int *err, int save_in_globals);
+int ComputeTriggerNoAdjustDuration (int today, Trigger *trig, TimeTrig *tim, int *err, int save_in_globals, int duration_days);
 int AdjustTriggerForDuration(int today, int r, Trigger *trig, TimeTrig *tim, int save_in_globals);
 int ComputeScanStart(int today, Trigger *trig, TimeTrig *tt);
 char *StrnCpy (char *dest, char const *source, int n);
@@ -148,3 +149,15 @@ char const *SynthesizeTag(void);
 void ClearLastTriggers(void);
 void SaveLastTrigger(Trigger const *t);
 void SaveLastTimeTrig(TimeTrig const *t);
+void SaveAllTriggerInfo(Trigger const *t, TimeTrig const *tt, int trigdate, int trigtime, int valid);
+
+void PerIterationInit(void);
+char const *Decolorize(int r, int g, int b);
+char const *Colorize(int r, int g, int b);
+void PrintJSONString(char const *s);
+void PrintJSONKeyPairInt(char const *name, int val);
+void PrintJSONKeyPairString(char const *name, char const *val);
+void PrintJSONKeyPairDate(char const *name, int jul);
+void PrintJSONKeyPairDateTime(char const *name, int dt);
+void PrintJSONKeyPairTime(char const *name, int t);
+void System(char const *cmd);

src/queue.c

@@ -246,11 +246,7 @@ void HandleQueuedReminders(void)
 
 	    /* Set up global variables so some functions like trigdate()
 	       and trigtime() work correctly                             */
-	    LastTriggerDate = JulianToday;
-	    LastTriggerTime = q->tt.ttime;
-	    LastTrigValid = 1;
-	    SaveLastTrigger(&(q->t));
-	    SaveLastTimeTrig(&(q->tt));
+	    SaveAllTriggerInfo(&(q->t), &(q->tt), JulianToday, q->tt.ttime, 1);
 	    (void) TriggerReminder(&p, &trig, &q->tt, JulianToday);
 	    if (Daemon < 0) {
 		printf("NOTE endreminder\n");
@@ -452,6 +448,70 @@ static int CalculateNextTimeUsingSched(QueuedRem *q)
     }
 }
 
+/* Dump the queue in JSON format */
+static void
+json_queue(QueuedRem const *q)
+{
+    int done = 0;
+    printf("[");
+    while(q) {
+	if (q->tt.nexttime == NO_TIME) {
+	    q = q->next;
+	    continue;
+	}
+	if (done) {
+	    printf(",");
+	}
+	done = 1;
+	printf("{");
+	switch(q->typ) {
+	case NO_TYPE: PrintJSONKeyPairString("type", "NO_TYPE"); break;
+	case MSG_TYPE: PrintJSONKeyPairString("type", "MSG_TYPE"); break;
+	case RUN_TYPE: PrintJSONKeyPairString("type", "RUN_TYPE"); break;
+	case CAL_TYPE: PrintJSONKeyPairString("type", "CAL_TYPE"); break;
+	case SAT_TYPE: PrintJSONKeyPairString("type", "SAT_TYPE"); break;
+	case PS_TYPE: PrintJSONKeyPairString("type", "PS_TYPE"); break;
+	case PSF_TYPE: PrintJSONKeyPairString("type", "PSF_TYPE"); break;
+	case MSF_TYPE: PrintJSONKeyPairString("type", "MSF_TYPE"); break;
+	case PASSTHRU_TYPE: PrintJSONKeyPairString("type", "PASSTHRU_TYPE"); break;
+	default: PrintJSONKeyPairString("type", "?"); break;
+	}
+	PrintJSONKeyPairInt("rundisabled", q->RunDisabled);
+	PrintJSONKeyPairInt("ntrig", q->ntrig);
+	PrintJSONKeyPairTime("ttime", q->tt.ttime);
+	PrintJSONKeyPairTime("nextttime", q->tt.nexttime);
+	PrintJSONKeyPairInt("delta", q->tt.delta);
+	if (q->tt.rep != NO_TIME) {
+	    PrintJSONKeyPairInt("rep", q->tt.rep);
+	}
+	if (q->tt.duration != NO_TIME) {
+	    PrintJSONKeyPairInt("duration", q->tt.duration);
+	}
+	if (q->passthru[0]) {
+	    PrintJSONKeyPairString("passthru", q->passthru);
+	}
+	if (q->sched[0]) {
+	    PrintJSONKeyPairString("sched", q->sched);
+	}
+	if (DBufLen(&(q->tags))) {
+	    PrintJSONKeyPairString("tags", DBufValue(&(q->tags)));
+	}
+
+	/* Last one is a special case - no trailing comma */
+	printf("\"");
+	PrintJSONString("body");
+	printf("\":\"");
+	if (q->text) {
+	    PrintJSONString(q->text);
+	} else {
+	    PrintJSONString("");
+	}
+	printf("\"}");
+	q = q->next;
+    }
+    printf("]\n");
+}
+
 /***************************************************************/
 /*                                                             */
 /*  DaemonWait                                                 */
@@ -536,6 +596,11 @@ static void DaemonWait(unsigned int sleeptime)
 	}
 	printf("NOTE endqueue\n");
 	fflush(stdout);
+    } else if (!strcmp(cmdLine, "JSONQUEUE\n")) {
+	printf("NOTE JSONQUEUE\n");
+	json_queue(QueueHead);
+	printf("NOTE ENDJSONQUEUE\n");
+	fflush(stdout);
     } else if (!strcmp(cmdLine, "REREAD\n")) {
 	printf("NOTE reread\n");
 	fflush(stdout);

src/rem2ps.c

@@ -20,6 +20,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include "rem2ps.h"
+#include "json.h"
 
 #define NEW(type) (malloc(sizeof(type)))
 
@@ -30,6 +31,7 @@
 #define SPECIAL_COLOR      4
 #define SPECIAL_WEEK       5
 #define SPECIAL_SHADE      6
+#define SPECIAL_UNKNOWN    7
 
 /* Array holding how specials sort */
 static int SpecialSortOrder[] = {
@@ -46,6 +48,7 @@ typedef struct calentry {
     struct calentry *next;
     int special;
     char *entry;
+    int daynum;
 } CalEntry;
 
 typedef struct {
@@ -137,6 +140,172 @@ void WriteOneEntry (CalEntry *c);
 void GetSmallLocations (void);
 char const *EatToken(char const *in, char *out, int maxlen);
 
+/***************************************************************/
+/*                                                             */
+/*  StrCmpi                                                    */
+/*                                                             */
+/*  Compare strings, case insensitive.                         */
+/*                                                             */
+/***************************************************************/
+int StrCmpi(char const *s1, char const *s2)
+{
+    int r;
+    while (*s1 && *s2) {
+	r = toupper(*s1) - toupper(*s2);
+	if (r) return r;
+	s1++;
+	s2++;
+    }
+    return toupper(*s1) - toupper(*s2);
+}
+/***************************************************************/
+/*                                                             */
+/*   Parse the new-style JSON intermediate format              */
+/*                                                             */
+/***************************************************************/
+static CalEntry *
+JSONToCalEntry(DynamicBuffer *buf)
+{
+    CalEntry *c;
+    json_value *val;
+
+    val = json_parse(DBufValue(buf), DBufLen(buf));
+    if (!val) {
+	fprintf(stderr, "Unable to parse JSON line `%s'\n", DBufValue(buf));
+	exit(1);
+    }
+
+    if (val->type != json_object) {
+	fprintf(stderr, "Expecting JSON object; found `%s'\n",
+		DBufValue(buf));
+	exit(1);
+    }
+
+    c = NEW(CalEntry);
+    if (!c) {
+	fprintf(stderr, "malloc failed - aborting.\n");
+	exit(1);
+    }
+    c->next = NULL;
+    c->special = SPECIAL_NORMAL;
+
+    int got_date = 0, got_body = 0;
+    size_t i;
+    for (i=0; i<val->u.object.length; i++) {
+	char const *nm = val->u.object.values[i].name;
+	json_value *v = val->u.object.values[i].value;
+	char const *s;
+	if (!strcmp(nm, "date")) {
+	    if (v->type == json_string) {
+		s = v->u.string.ptr;
+		c->daynum = (s[8] - '0') * 10 + s[9] - '0';
+		got_date = 1;
+	    }
+	} else if (!strcmp(nm, "body")) {
+	    if (v->type == json_string) {
+		s = v->u.string.ptr;
+		c->entry = malloc(strlen(s)+1);
+		if (!c->entry) {
+		    fprintf(stderr, "malloc failed - aborting.\n");
+		    exit(1);
+		}
+		strcpy(c->entry, s);
+		got_body = 1;
+	    }
+	} else if (!strcmp(nm, "passthru")) {
+	    if (v->type == json_string) {
+		s = v->u.string.ptr;
+		if (!StrCmpi(s, "PostScript")) {
+		    c->special = SPECIAL_POSTSCRIPT;
+		} else if (!StrCmpi(s, "SHADE")) {
+		    c->special = SPECIAL_SHADE;
+		} else if (!StrCmpi(s, "MOON")) {
+		    c->special = SPECIAL_MOON;
+		} else if (!StrCmpi(s, "WEEK")) {
+		    c->special = SPECIAL_WEEK;
+		} else if (!StrCmpi(s, "PSFile")) {
+		    c->special = SPECIAL_PSFILE;
+		} else if (!StrCmpi(s, "COLOUR") ||
+			   !StrCmpi(s, "COLOR")) {
+		    c->special = SPECIAL_COLOR;
+		} else {
+		    c->special = SPECIAL_UNKNOWN;
+		}
+	    }
+	}
+    }
+
+    json_value_free(val);
+
+    if (!got_body || !got_date) {
+	fprintf(stderr, "Could not parse line `%s'\n", DBufValue(buf));
+	exit(1);
+    }
+    return c;
+}
+
+/***************************************************************/
+/*                                                             */
+/*   Parse the old-style REM2PS intermediate format            */
+/*                                                             */
+/***************************************************************/
+static CalEntry *
+TextToCalEntry(DynamicBuffer *buf)
+{
+    char const *startOfBody;
+    char passthru[PASSTHRU_LEN+1];
+
+    CalEntry *c = NEW(CalEntry);
+    if (!c) {
+	fprintf(stderr, "malloc failed - aborting.\n");
+	exit(1);
+    }
+    c->next = NULL;
+    c->special = SPECIAL_NORMAL;
+    c->daynum = (DBufValue(buf)[8] - '0') * 10 + DBufValue(buf)[9] - '0';
+
+    /* Skip the tag, duration and time */
+    startOfBody = DBufValue(buf)+10;
+
+    /* Eat the passthru */
+    startOfBody = EatToken(startOfBody, passthru, PASSTHRU_LEN);
+
+    /* Eat the tag */
+    startOfBody = EatToken(startOfBody, NULL, 0);
+
+    /* Eat the duration */
+    startOfBody = EatToken(startOfBody, NULL, 0);
+
+    /* Eat the time */
+    startOfBody = EatToken(startOfBody, NULL, 0);
+
+    c->entry = malloc(strlen(startOfBody) + 1);
+    if (!c->entry) {
+	fprintf(stderr, "malloc failed - aborting.\n");
+	exit(1);
+    }
+    strcpy(c->entry, startOfBody);
+
+    /* Save the type of SPECIAL */
+    if (!StrCmpi(passthru, "PostScript")) {
+	c->special = SPECIAL_POSTSCRIPT;
+    } else if (!StrCmpi(passthru, "SHADE")) {
+	c->special = SPECIAL_SHADE;
+    } else if (!StrCmpi(passthru, "MOON")) {
+	c->special = SPECIAL_MOON;
+    } else if (!StrCmpi(passthru, "WEEK")) {
+	c->special = SPECIAL_WEEK;
+    } else if (!StrCmpi(passthru, "PSFile")) {
+	c->special = SPECIAL_PSFILE;
+    } else if (!StrCmpi(passthru, "COLOUR") ||
+	       !StrCmpi(passthru, "COLOR")) {
+	c->special = SPECIAL_COLOR;
+    } else if (StrCmpi(passthru, "*")) {
+	c->special = SPECIAL_UNKNOWN;
+    }
+    return c;
+}
+
 /***************************************************************/
 /*                                                             */
 /*   MAIN PROGRAM                                              */
@@ -154,10 +323,17 @@ int main(int argc, char *argv[])
 	Usage("Input should not come from a terminal");
     }
 
+    int first_line = 1;
     /* Search for a valid input file */
     while (!feof(stdin)) {
 	DBufGets(&buf, stdin);
-	if (!strcmp(DBufValue(&buf), PSBEGIN)) {
+	if (first_line && (!strcmp(DBufValue(&buf), "["))) {
+	    fprintf(stderr, "Rem2PS: It appears that you have invoked Remind with the -ppp option.\n        Please use either -p or -pp, but not -ppp.\n");
+	    exit(1);
+	}
+	first_line = 0;
+	if (!strcmp(DBufValue(&buf), PSBEGIN) ||
+	    !strcmp(DBufValue(&buf), PSBEGIN2)) {
 	    if (!validfile) {
 		if (Verbose) {
 		    fprintf(stderr, "Rem2PS: Version %s Copyright 1992-2020 by Dianne Skoll\n\n", VERSION);
@@ -191,10 +367,7 @@ void DoPsCal(void)
     int days, wkday, prevdays, nextdays;
     int sfirst;
     int i;
-    int is_ps;
     int firstcol;
-    char const *startOfBody;
-    char passthru[PASSTHRU_LEN+1];
     DynamicBuffer buf;
     CalEntry *c, *d, *p;
 
@@ -230,6 +403,7 @@ void DoPsCal(void)
 
     printf("%%%%Page: %c%c%c%c%c %d\n", month[0], month[1], month[2],
 	   year[2], year[3], validfile);
+    printf("%%%%PageBoundingBox: 0 0 %d %d\n", CurPage->xsize, CurPage->ysize);
 
 /* Emit PostScript to do the heading */
     if (!PortraitMode) printf("90 rotate 0 XSIZE neg translate\n");
@@ -272,80 +446,48 @@ void DoPsCal(void)
 	}
 
 	DBufGets(&buf, stdin);
-	if (!strcmp(DBufValue(&buf), PSEND)) {
+	if (!strcmp(DBufValue(&buf), PSEND) ||
+	    !strcmp(DBufValue(&buf), PSEND2)) {
 	    DBufFree(&buf);
 	    break;
 	}
 
 	/* Ignore lines beginning with '#' */
 	if (DBufValue(&buf)[0] == '#') {
+	    DBufFree(&buf);
 	    continue;
 	}
-	/* Read the day number - a bit of a hack! */
-	DayNum = (DBufValue(&buf)[8] - '0') * 10 + DBufValue(&buf)[9] - '0';
-	if (DayNum != CurDay) {
-	    for(; CurDay<DayNum; CurDay++) {
+
+	if (DBufValue(&buf)[0] == '{') {
+	    /* Starts with '{', so assume new-style JSON format */
+	    c = JSONToCalEntry(&buf);
+	} else {
+	    /* Assume it's the old-style rem2ps intermediate format */
+	    c = TextToCalEntry(&buf);
+	}
+
+	/* If it's an unknown special, ignore */
+	if (c->special == SPECIAL_UNKNOWN) {
+	    DBufFree(&buf);
+	    free(c);
+	    c = NULL;
+	    continue;
+	}
+	if (c->daynum != CurDay) {
+	    for(; CurDay<c->daynum; CurDay++) {
 		WriteCalEntry();
 		WkDayNum = (WkDayNum + 1) % 7;
 	    }
 	}
-	/* Add the text */
-	c = NEW(CalEntry);
-	if (!c) {
-	    fprintf(stderr, "malloc failed - aborting.\n");
-	    exit(1);
-	}
-	c->next = NULL;
-	c->special = SPECIAL_NORMAL;
-
-	/* Skip the tag, duration and time */
-	startOfBody = DBufValue(&buf)+10;
-
-	/* Eat the passthru */
-	startOfBody = EatToken(startOfBody, passthru, PASSTHRU_LEN);
-
-	/* Eat the tag */
-	startOfBody = EatToken(startOfBody, NULL, 0);
-
-	/* Eat the duration */
-	startOfBody = EatToken(startOfBody, NULL, 0);
-
-	/* Eat the time */
-	startOfBody = EatToken(startOfBody, NULL, 0);
-
-	is_ps = 0;
-	if (!strcmp(passthru, "PostScript") ||
-	    !strcmp(passthru, "PSFile") ||
-	    !strcmp(passthru, "MOON") ||
-	    !strcmp(passthru, "WEEK") ||
-	    !strcmp(passthru, "SHADE")) {
-	    is_ps = 1;
-	}
-	c->entry = malloc(strlen(startOfBody) + 1);
-	if (!c->entry) {
-	    fprintf(stderr, "malloc failed - aborting.\n");
-	    exit(1);
-	}
-	strcpy(c->entry, startOfBody);
-
-	if (is_ps) {
-	    /* Save the type of SPECIAL */
-	    if (!strcmp(passthru, "PostScript")) {
-		c->special = SPECIAL_POSTSCRIPT;
-	    } else if (!strcmp(passthru, "SHADE")) {
-		c->special = SPECIAL_SHADE;
-	    } else if (!strcmp(passthru, "MOON")) {
-		c->special = SPECIAL_MOON;
-	    } else if (!strcmp(passthru, "WEEK")) {
-		c->special = SPECIAL_WEEK;
+	if (c->special == SPECIAL_POSTSCRIPT ||
+	    c->special == SPECIAL_SHADE ||
+	    c->special == SPECIAL_MOON ||
+	    c->special == SPECIAL_WEEK ||
+	    c->special == SPECIAL_PSFILE) {
+	    if (!PsEntries[c->daynum]) {
+		PsEntries[c->daynum] = c;
 	    } else {
-		c->special = SPECIAL_PSFILE;
-	    }
-
-	    if (!PsEntries[DayNum]) {
-		PsEntries[DayNum] = c;
-	    } else {
-		d = PsEntries[DayNum];
+		d = PsEntries[c->daynum];
 		p = NULL;
 		/* Slot it into the right place */
 		while (d->next && (SpecialSortOrder[c->special] <= SpecialSortOrder[d->special])) {
@@ -359,14 +501,12 @@ void DoPsCal(void)
 		    if (p) {
 			p->next = c;
 		    } else {
-			PsEntries[DayNum] = c;
+			PsEntries[c->daynum] = c;
 		    }
 		    c->next = d;
 		}
 	    }
-	} else if (!strcmp(passthru, "*") ||
-		   !strcmp(passthru, "COLOUR") ||
-	           !strcmp(passthru, "COLOR")) {
+	} else {
 	    /* Put on linked list */
 	    if (!CurEntries) {
 		CurEntries = c;
@@ -375,10 +515,6 @@ void DoPsCal(void)
 		while(d->next) d = d->next;
 		d->next = c;
 	    }
-	    if (!strcmp(passthru, "COLOR") ||
-		!strcmp(passthru, "COLOUR")) {
-		c->special = SPECIAL_COLOR;
-	    }
 	}
     }
     for(; CurDay<=days; CurDay++) {

src/sort.c

@@ -150,7 +150,7 @@ void IssueSortedReminders(void)
 	    break;
 
 	case RUN_TYPE:
-	    system(cur->text);
+	    System(cur->text);
 	    break;
 	}
 

src/token.c

@@ -257,6 +257,7 @@ void FindNumericToken(char const *s, Token *t)
 {
     int mult = 1, hour, min;
     char const *s_orig = s;
+    int ampm = 0;
 
     t->type = T_Illegal;
     t->val = 0;
@@ -284,10 +285,6 @@ void FindNumericToken(char const *s, Token *t)
 	   like Jan 6, 1998 */
 	if (*s == ',') {
 	    s++;
-	    /* Special hack - convert years between 90 and
-	       99 to 1990 and 1999 */
-	    if (t->val >= 90 && t->val <= 99) t->val += 1900;
-
 	    /* Classify the number we've got */
 	    if (t->val >= BASE && t->val <= BASE+YR_RANGE) t->type = T_Year;
 	    else if (t->val >= 1 && t->val <= 31) t->type = T_Day;
@@ -299,7 +296,29 @@ void FindNumericToken(char const *s, Token *t)
 	    s++;
 	    hour = t->val;
 	    PARSENUM(min, s);
-	    if (*s || min > 59) return;  /* Illegal time */
+	    if (min > 59) return; /* Illegal time */
+	    /* Check for p[m] or a[m] */
+	    if (*s == 'A' || *s == 'a' || *s == 'P' || *s == 'p') {
+		ampm = tolower(*s);
+		s++;
+		if (*s == 'm' || *s == 'M') {
+		    s++;
+		}
+	    }
+	    if (*s) return;  /* Illegal time */
+	    if (ampm) {
+		if (hour < 1 || hour > 12) return;
+		if (ampm == 'a') {
+		    if (hour == 12) {
+			hour = 0;
+		    }
+		} else if (ampm == 'p') {
+		    if (hour < 12) {
+			hour += 12;
+		    }
+		}
+	    }
+
 	    t->val = hour*60 + min;  /* Convert to minutes past midnight */
 	    if (hour <= 23) {
 		t->type = T_Time;

src/trigger.c

@@ -454,11 +454,7 @@ AdjustTriggerForDuration(int today, int r, Trigger *trig, TimeTrig *tim, int sav
 
     }
     if (save_in_globals) {
-	LastTriggerTime = tim->ttime;
-	SaveLastTimeTrig(tim);
-	SaveLastTrigger(trig);
-	LastTriggerDate = r;
-	LastTrigValid = 1;
+	SaveAllTriggerInfo(trig, tim, r, tim->ttime, 1);
     }
     return r;
 }
@@ -474,10 +470,29 @@ AdjustTriggerForDuration(int today, int r, Trigger *trig, TimeTrig *tim, int sav
 int ComputeTrigger(int today, Trigger *trig, TimeTrig *tim,
 		   int *err, int save_in_globals)
 {
-    int r = ComputeTriggerNoAdjustDuration(today, trig, tim, err, save_in_globals);
+    int r = ComputeTriggerNoAdjustDuration(today, trig, tim, err, save_in_globals, 0);
     if (*err != OK) {
 	return r;
     }
+    if (r == today) {
+	if (tim->ttime != NO_TIME) {
+	    trig->eventstart = MINUTES_PER_DAY * r + tim->ttime;
+	    if (tim->duration != NO_TIME) {
+		trig->eventduration = tim->duration;
+	    }
+	}
+	if (save_in_globals) {
+	    SaveAllTriggerInfo(trig, tim, r, tim->ttime, 1);
+	}
+	return r;
+    }
+
+    if (trig->duration_days) {
+	r = ComputeTriggerNoAdjustDuration(today, trig, tim, err, save_in_globals, trig->duration_days);
+	if (*err != OK) {
+	    return r;
+	}
+    }
     r = AdjustTriggerForDuration(today, r, trig, tim, save_in_globals);
     return r;
 }
@@ -491,10 +506,10 @@ int ComputeTrigger(int today, Trigger *trig, TimeTrig *tim,
 /*                                                             */
 /***************************************************************/
 int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig *tim,
-				   int *err, int save_in_globals)
+				   int *err, int save_in_globals, int duration_days)
 {
     int nattempts = 0,
-	start = today - trig->duration_days,
+	start = today - duration_days,
 	nextstart = 0,
 	y, m, d, omit,
 	result;
@@ -561,7 +576,7 @@ int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig *tim,
 	}
 
 	/** FIXME: Fix bad interaction with SATISFY... need to rethink!!! */
-	if (result+trig->duration_days >= today &&
+	if (result+duration_days >= today &&
 	    (trig->skip != SKIP_SKIP || !omit)) {
 	    if (save_in_globals) {
 		LastTriggerDate = result;  /* Save in global var */

src/types.h

@@ -216,3 +216,18 @@ typedef struct {
 /* Flags for FROM / SCANFROM */
 #define SCANFROM_TYPE 0
 #define FROM_TYPE     1
+
+/* PS Calendar levels */
+
+/* Original interchange format */
+#define PSCAL_LEVEL1  1
+
+/* Line-by-line JSON */
+#define PSCAL_LEVEL2  2
+
+/* Pure JSON */
+#define PSCAL_LEVEL3  3
+
+#define TERMINAL_BACKGROUND_UNKNOWN 0
+#define TERMINAL_BACKGROUND_DARK    1
+#define TERMINAL_BACKGROUND_LIGHT   2

src/var.c

@@ -168,6 +168,45 @@ static int datetime_sep_func(int do_set, Value *val)
     return OK;
 }
 
+static int default_color_func(int do_set, Value *val)
+{
+    int col_r, col_g, col_b;
+    if (!do_set) {
+    /* 12 = strlen("255 255 255\0") */
+ val->v.str = malloc(12);
+ if (!val->v.str) return E_NO_MEM;
+    snprintf(val->v.str, 12, "%d %d %d",
+        DefaultColorR,
+        DefaultColorG,
+        DefaultColorB
+        );
+ val->type = STR_TYPE;
+ return OK;
+    }
+    if (val->type != STR_TYPE) return E_BAD_TYPE;
+    if (sscanf(val->v.str, "%d %d %d", &col_r, &col_g, &col_b) != 3) {
+        return E_BAD_TYPE;
+    }
+    /* They either all have to be -1, or all between 0 and 255 */
+    if (col_r == -1 && col_g == -1 && col_b == -1) {
+	DefaultColorR = -1;
+	DefaultColorG = -1;
+	DefaultColorB = -1;
+	return OK;
+    }
+    if (col_r < 0) return E_2LOW;
+    if (col_r > 255) return E_2HIGH;
+    if (col_g < 0) return E_2LOW;
+    if (col_g > 255) return E_2HIGH;
+    if (col_b < 0) return E_2LOW;
+    if (col_b > 255) return E_2HIGH;
+
+    DefaultColorR = col_r;
+    DefaultColorG = col_g;
+    DefaultColorB = col_b;
+    return OK;
+}
+
 static int date_sep_func(int do_set, Value *val)
 {
     if (!do_set) {
@@ -608,6 +647,7 @@ static SysVar SysVarArr[] = {
     {"Daemon",         0,  INT_TYPE,     &Daemon,             0,      0   },
     {"DateSep",        1,  SPECIAL_TYPE, date_sep_func,       0,      0   },
     {"DateTimeSep",    1,  SPECIAL_TYPE, datetime_sep_func,   0,      0   },
+    {"DefaultColor",   1,  SPECIAL_TYPE, default_color_func,  0,      0   },
     {"DefaultPrio",    1,  INT_TYPE,     &DefaultPrio,        0,      9999},
     {"DeltaOffset",    0,  INT_TYPE,     &DeltaOffset,        0,      0   },
     {"DontFork",       0,  INT_TYPE,     &DontFork,           0,      0   },
@@ -617,7 +657,7 @@ static SysVar SysVarArr[] = {
     {"EndSentIg",      1,  STR_TYPE,     &EndSentIg,          0,      0   },
     {"FirstIndent",    1,  INT_TYPE,     &FirstIndent,        0,      132 },
     {"FoldYear",       1,  INT_TYPE,     &FoldYear,           0,      1   },
-    {"FormWidth",      1,  INT_TYPE,     &FormWidth,          20,     132 },
+    {"FormWidth",      1,  INT_TYPE,     &FormWidth,          20,     500 },
     {"HushMode",       0,  INT_TYPE,     &Hush,               0,      0   },
     {"IgnoreOnce",     0,  INT_TYPE,     &IgnoreOnce,         0,      0   },
     {"InfDelta",       0,  INT_TYPE,     &InfiniteDelta,      0,      0   },

tests/shade.rem

@@ -28,3 +28,5 @@ REM Fri SPECIAL SHADE 255 204 204
 REM Sat SPECIAL SHADE 204 255 204
 REM Sun SPECIAL SHADE 204 204 255
 
+# This should be ignored by rem2ps
+REM SPECIAL HTML <b>FOO</b>

tests/test-rem

@@ -79,6 +79,7 @@ rm -f ../tests/purge_dir/*.rem.purged >> ../tests/test.out 2>&1
 ../src/remind ../tests/runtest.rem >> ../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 -pp ../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...
@@ -99,6 +100,194 @@ REM 1 Jan 2012 AT 10:00 MSG 10am: Should show up
 MSG [$DontTrigAts]
 EOF
 
+# An OMITFUNC should indicate nonconst_expr
+../src/remind -pp - 1 jan 2012 9:00 <<'EOF' >> ../tests/test.out 2>&1
+REM Mon OMITFUNC foo MSG bar
+EOF
+
+# Test default color
+../src/remind -ppp - 1 Jan 2012 9:00 <<'EOF' >> ../tests/test.out 2>&1
+REM 2 MSG Normal
+SET $DefaultColor "255 0 0"
+REM 3 MSG Red
+SET $DefaultColor "-1 -1 -1"
+REM 4 MSG Normal
+# Should give an error
+SET $DefaultColor "256 0 0"
+EOF
+
+# Test -@ option
+../src/remind -w,0,0 -@0 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@0
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@0,0 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@0,0
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@0,1 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@0,1
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@1 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@1
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@1,0 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@1,0
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@1,1 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@1,1
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@2 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@2
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@2,0 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@2,0
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@2,1 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@2,1
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
 
 cmp -s ../tests/test.out ../tests/test.cmp
 if [ "$?" = "0" ]; then

tests/test.rem

@@ -337,7 +337,7 @@ set a103 trigtimedelta()
 set a104 trigtimerep()
 set a105 trigduration()
 
-REM 2010-09-03 +3 -4 UNTIL 2012-01-01 PRIORITY 7 *14 AT 14:41 +15 *2 DURATION 3:33 MSG foo
+REM 2010-09-03 +3 -4 UNTIL 2012-01-01 PRIORITY 7 *14 AT 14:41 +15 *2 DURATION 213 MSG foo
 set a106 trigback()
 set a107 trigdelta()
 set a108 trigrep()
@@ -386,6 +386,9 @@ OMIT DUMP
 # Regression test for bugfix in Hebrew calendar Adar jahrzeit
 [_i(14, "Adar", today(), 5761)] MSG Purim
 
+# Regression test for bug found by Larry Hynes
+REM SATISFY [day(trigdate()-25) == 14] MSG Foo
+
 # Check combo of SATISFY and long-duration events
 REM 14 SATISFY [$Tw == 4] MSG Thursday, the 14th
 REM 14 AT 16:00 DURATION 8:00 SATISFY [$Tw == 4] MSG Thursday, the 14th
@@ -397,6 +400,134 @@ REM 14 AT 16:00 DURATION 40:00 SATISFY [$Tw == 4] MSG Thursday, the 14th
 # This is now an error
 REM DURATION 15:00 MSG Should fail... need AT if you have DURATION.
 
+# Parsing of AM/PM times
+REM AT 0:00am MSG foo 0a
+REM AT 1:00AM MSG foo 1a
+REM AT 2:00am MSG foo 2a
+REM AT 3:00AM MSG foo 3a
+REM AT 4:00am MSG foo 4a
+REM AT 5:00AM MSG foo 5a
+REM AT 6:00am MSG foo 6a
+REM AT 7:00AM MSG foo 7a
+REM AT 8:00am MSG foo 8a
+REM AT 9:00AM MSG foo 9a
+REM AT 10:00am MSG foo 10a
+REM AT 11:00AM MSG foo 11a
+REM AT 12:00am MSG foo 12a
+REM AT 13:00AM MSG foo 13a
+REM AT 0:00pm MSG foo 0p
+REM AT 1:00PM MSG foo 1p
+REM AT 2:00pm MSG foo 2p
+REM AT 3:00PM MSG foo 3p
+REM AT 4:00pm MSG foo 4p
+REM AT 5:00PM MSG foo 5p
+REM AT 6:00pm MSG foo 6p
+REM AT 7:00PM MSG foo 7p
+REM AT 8:00pm MSG foo 8p
+REM AT 9:00PM MSG foo 9p
+REM AT 10:00pm MSG foo 10p
+REM AT 11:00PM MSG foo 11p
+REM AT 12:00pm MSG foo 12p
+REM AT 13:00PM MSG foo 13p
+
+DEBUG +x
+SET x 0:00am + 0
+SET x 1:00AM + 0
+SET x 2:00am + 0
+SET x 3:00AM + 0
+SET x 4:00am + 0
+SET x 5:00AM + 0
+SET x 6:00am + 0
+SET x 7:00AM + 0
+SET x 8:00am + 0
+SET x 9:00AM + 0
+SET x 10:00am + 0
+SET x 11:00AM + 0
+SET x 12:00am + 0
+SET x 13:00AM + 0
+
+SET x 0:00pm + 0
+SET x 1:00PM + 0
+SET x 2:00pm + 0
+SET x 3:00PM + 0
+SET x 4:00pm + 0
+SET x 5:00PM + 0
+SET x 6:00pm + 0
+SET x 7:00PM + 0
+SET x 8:00pm + 0
+SET x 9:00PM + 0
+SET x 10:00pm + 0
+SET x 11:00PM + 0
+SET x 12:00pm + 0
+SET x 13:00PM + 0
+
+SET x '2015-02-03@0:00am' + 0
+SET x '2015-02-03@1:00AM' + 0
+SET x '2015-02-03@2:00am' + 0
+SET x '2015-02-03@3:00AM' + 0
+SET x '2015-02-03@4:00am' + 0
+SET x '2015-02-03@5:00AM' + 0
+SET x '2015-02-03@6:00am' + 0
+SET x '2015-02-03@7:00AM' + 0
+SET x '2015-02-03@8:00am' + 0
+SET x '2015-02-03@9:00AM' + 0
+SET x '2015-02-03@10:00am' + 0
+SET x '2015-02-03@11:00AM' + 0
+SET x '2015-02-03@12:00am' + 0
+SET x '2015-02-03@13:00AM' + 0
+
+SET x '2015-02-03@0:00pm' + 0
+SET x '2015-02-03@1:00PM' + 0
+SET x '2015-02-03@2:00pm' + 0
+SET x '2015-02-03@3:00PM' + 0
+SET x '2015-02-03@4:00pm' + 0
+SET x '2015-02-03@5:00PM' + 0
+SET x '2015-02-03@6:00pm' + 0
+SET x '2015-02-03@7:00PM' + 0
+SET x '2015-02-03@8:00pm' + 0
+SET x '2015-02-03@9:00PM' + 0
+SET x '2015-02-03@10:00pm' + 0
+SET x '2015-02-03@11:00PM' + 0
+SET x '2015-02-03@12:00pm' + 0
+SET x '2015-02-03@13:00PM' + 0
+
+# Test the ampm function
+set x ampm(0:12) + ""
+set x ampm(1:12) + ""
+set x ampm(2:12) + ""
+set x ampm(3:12) + ""
+set x ampm(4:12) + ""
+set x ampm(5:12) + ""
+set x ampm(6:12) + ""
+set x ampm(7:12) + ""
+set x ampm(8:12) + ""
+set x ampm(9:12) + ""
+set x ampm(10:12) + ""
+set x ampm(11:12) + ""
+set x ampm(12:12) + ""
+set x ampm(13:12) + ""
+set x ampm(14:12) + ""
+set x ampm(15:12) + ""
+set x ampm(16:12) + ""
+set x ampm(17:12) + ""
+set x ampm(18:12) + ""
+set x ampm(19:12) + ""
+set x ampm(20:12) + ""
+set x ampm(21:12) + ""
+set x ampm(22:12) + ""
+set x ampm(23:12) + ""
+
+# Coerce with am/pm
+set x coerce("TIME", "12:45am")
+set x coerce("TIME", "12:45")
+set x coerce("TIME", "1:45pm")
+set x coerce("DATETIME", "2020-05-05@12:45am")
+set x coerce("DATETIME", "2020-05-05@12:45")
+set x coerce("DATETIME", "2020-05-05@1:45pm")
+
+# Don't want Remind to queue reminders
+EXIT
+
 __EOF__
 REM This line should not even be seen
 And you can put whatever you like here.

www/Makefile.in

@@ -69,6 +69,7 @@ install:
 	sed $(SEDSCRIPT)  < moon.rem-DIST      > $(DESTDIR)$(SCRIPTDIR)/moon.rem
 	sed $(SEDSCRIPT)  < sunrise.rem-DIST   > $(DESTDIR)$(SCRIPTDIR)/sunrise.rem
 	sed $(SEDSCRIPT)  < sunset.rem-DIST    > $(DESTDIR)$(SCRIPTDIR)/sunset.rem
+	cp blank.rem $(DESTDIR)$(SCRIPTDIR)/blank.rem
 	sed $(SEDSCRIPT)  < calendar.html-DIST > $(DESTDIR)$(HTMLDIR)/calendar.html
 	sed $(SEDSCRIPT)  < hebhtml  > $(DESTDIR)$(SCRIPTDIR)/hebhtml
 	sed $(SEDSCRIPT2) < rem2html > $(DESTDIR)$(SCRIPTDIR)/rem2html$(CGISUFFIX)
@@ -76,6 +77,7 @@ install:
 	chmod 644 $(DESTDIR)$(SCRIPTDIR)/moon.rem
 	chmod 644 $(DESTDIR)$(SCRIPTDIR)/hebdate.rem
 	chmod 644 $(DESTDIR)$(SCRIPTDIR)/sunset.rem
+	chmod 644 $(DESTDIR)$(SCRIPTDIR)/blank.rem
 	chmod 644 $(DESTDIR)$(HTMLDIR)/calendar.html
 	chmod 755 $(DESTDIR)$(SCRIPTDIR)/cal_dispatch$(CGISUFFIX)
 	chmod 755 $(DESTDIR)$(SCRIPTDIR)/rem2html$(CGISUFFIX)

www/README

@@ -9,7 +9,7 @@ only tested it with Linux running NCSA's httpd and Apache's httpd, but
 it should work on any UNIX web server.
 
 To install it, you need the Remind package, available via ftp from
-ftp://ftp.doe.carleton.ca/pub/remind-3.0.  You should install Remind,
+https://dianne.skoll.ca/projects/remind/  You should install Remind,
 setting the lattitude, longitude, location and time zone as appropriate
 for your machine.
 
@@ -38,12 +38,8 @@ where "what" is one of:
 	hebps   -- get a PostScript calendar with Jewish holidays.
 	hebhtml -- get an HTML version of the above (requires Perl.)
 
-   (Visit http://www.doe.carleton.ca/~dfs/ for previews.)
-
    All of these links will be set up in a sample HTML document
    called "calendar.html" and installed in the HTMLDIR you specified
    in the Makefile.
 
 4) Enjoy!
-
-	

www/blank.rem

@@ -0,0 +1,5 @@
+[moondate(0)] SPECIAL MOON 0
+[moondate(1)] SPECIAL MOON 1
+[moondate(2)] SPECIAL MOON 2
+[moondate(3)] SPECIAL MOON 3
+REM Monday SPECIAL WEEK (W[weekno()])

www/calps

@@ -7,5 +7,5 @@
 echo "Content-type: application/postscript"
 echo
 
-$REMIND -p /dev/null | $REM2PS -e -c3 -l
+$REMIND -p $DIR/blank.rem | $REM2PS -e -c3 -l
 exit 0

www/hebdate.rem-DIST

@@ -29,6 +29,8 @@ ENDIF
 #									 #
 ##########################################################################
 
+SET n $NumTrig
+
 # --- HERE ARE THE JEWISH HOLIDAYS ---
 # Set the variable InIsrael to 1 if you live in Israel.  Otherwise,
 # you get the Diaspora versions of Jewish holidays
@@ -138,6 +140,10 @@ ENDIF
 
 fset msgprefix(x) ""
 
+IF $NumTrig > n
+   REM SPECIAL SHADE 224 224 255
+ENDIF
+
 # Counting the omer - do the whole spiel, i.e:
 # "This is the xth day of the omer, being y weeks and z days of the omer."
 # Nice Remind programming example here!
@@ -165,7 +171,7 @@ ELSE
 	[trigger(moondate(2))] SPECIAL MOON 2
 	[trigger(moondate(3))] SPECIAL MOON 3
 	REM PS Border Border moveto /DayFont findfont 10 scalefont setfont ([hebday(today())] [hebmon(today())]) show
-	REM SPECIAL HTML <P><FONT SIZE=-1>[hebday(today())] [hebmon(today())]</FONT></P>
+	REM SPECIAL HTML <P>[hebday(today())] [hebmon(today())]</P>
 
 ENDIF
 

www/rem2html

@@ -4,10 +4,11 @@ use strict;
 use warnings;
 
 use Getopt::Long;
+use JSON::Any;
 
 my %Options;
 
-my $rem2html_version = '2.0';
+my $rem2html_version = '2.1';
 
 my($days, $shades, $moons, $classes, $Month, $Year, $Numdays, $Firstwkday, $Mondayfirst, $weeks,
     @Daynames, $Nextmon, $Nextlen, $Prevmon, $Prevlen);
@@ -191,7 +192,7 @@ sub parse_input
     my $found_data = 0;
     while(<STDIN>) {
 	chomp;
-	last if /^\# rem2ps begin$/;
+	last if /^\# rem2ps2? begin$/;
     }
 
     my $line;
@@ -228,13 +229,29 @@ sub parse_input
     }
     while(<STDIN>) {
 	chomp;
-	last if /^\# rem2ps end$/;
+	last if /^\# rem2ps2? end$/;
 	next if /^\#/;
-	next unless m/^(\d*).(\d*).(\d*)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s*(.*)$/;
-	my ($y, $m, $d, $special, $tag, $duration, $time, $body) =
-	    ($1, $2, $3, $4, $5, $6, $7, $8);
+	my ($y, $m, $d, $special, $tag, $duration, $time, $body);
+	if (m/^(\d*).(\d*).(\d*)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s*(.*)$/) {
+		($y, $m, $d, $special, $tag, $duration, $time, $body) =
+		    ($1, $2, $3, $4, $5, $6, $7, $8);
+	} elsif (/\{/) {
+		my $obj = JSON::Any->jsonToObj($_);
+		next unless ($obj->{date} =~ /^(\d+)-(\d+)-(\d+)$/);
+		$y = $1;
+		$m = $2;
+		$d = $3;
+		$special = $obj->{passthru} || '*';
+		$tag = $obj->{tags} || '*';
+		$duration = $obj->{duration} || '*';
+		$time = $obj->{time} || '*';
+		$body = $obj->{body};
+	} else {
+		next;
+	}
 	my $d1 = $d;
 	$d1 =~ s/^0+//;
+	$special = uc($special);
 	if ($special eq 'HTML') {
 	    push(@{$days->[$d]}, $body);
 	} elsif ($special eq 'HTMLCLASS') {