Fix typo

configure

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

docs/WHATSNEW

@@ -1,5 +1,38 @@
 CHANGES TO REMIND
 
+* Version 3.3 Patch 0 - YYYY-MM-DD
+
+- FIX: rem2ps: Add a %%PageBoundingBox: document structuring convention
+  comment.
+
+- 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
+\fBReminf\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,246 @@ 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.
+.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 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
@@ -1895,6 +1936,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
@@ -3731,7 +3788,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 +4377,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 +4440,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.
@@ -88,6 +88,7 @@ distro:
 beta-tgz:
 	cd .. && git archive --worktree-attributes --format=tar --prefix=remind-$(VERSION)/ 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,76 @@ static void WriteBottomCalLine (void);
 static void WriteIntermediateCalLine (void);
 static void WriteCalDays (void);
 
+static 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++;
+    }
+}
+
+static void PrintJSONKeyPairInt(char const *name, int val)
+{
+    printf("\"");
+    PrintJSONString(name);
+    printf("\":%d, ", val);
+}
+
+static 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("\", ");
+}
+
+static 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);
+
+}
+
+static 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);
+
+}
+
 #ifdef REM_USE_WCHAR
 static void PutWideChar(wchar_t const wc)
 {
@@ -202,26 +358,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 80;
+    }
+    return w.ws_col;
 }
 
 /***************************************************************/
@@ -244,14 +520,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 +660,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();
 }
 
@@ -631,9 +962,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 +979,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 +1001,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 +1013,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 +1032,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 +1051,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 +1073,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 +1085,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 +1116,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 +1262,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 +1279,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 +1354,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 +1364,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 +1433,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 +1475,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 +1497,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 +1518,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 +1535,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 +1553,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 +1577,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 +1602,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 +1625,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);
@@ -1531,6 +2081,8 @@ char const *SynthesizeTag(void)
     unsigned char buf[16];
     static char out[128];
     MD5Init(&ctx);
+    MD5Update(&ctx, (unsigned char *) FileName, strlen(FileName));
+    MD5Update(&ctx, (unsigned char *) &LineNo, sizeof(LineNo));
     MD5Update(&ctx, (unsigned char *) CurLine, strlen(CurLine));
     MD5Final(buf, &ctx);
     sprintf(out, "__syn__%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",

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;
 
@@ -759,20 +763,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 +788,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 +796,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 +880,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 +907,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 +921,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 +932,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 +946,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);

src/dosubst.c

@@ -656,8 +656,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/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

@@ -38,6 +38,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 +136,7 @@ void InitRemind(int argc, char const *argv[])
     int InvokedAsRem = 0;
     char const *s;
     int weeks;
-
+    int x;
     int jul;
 
 #if defined(__APPLE__)
@@ -190,6 +191,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 +206,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 +423,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 +453,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 +645,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                                                */

src/protos.h

@@ -148,3 +148,6 @@ char const *SynthesizeTag(void);
 void ClearLastTriggers(void);
 void SaveLastTrigger(Trigger const *t);
 void SaveLastTimeTrig(TimeTrig const *t);
+void PerIterationInit(void);
+char const *Decolorize(int r, int g, int b);
+char const *Colorize(int r, int g, int b);

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)))
 
@@ -46,6 +47,7 @@ typedef struct calentry {
     struct calentry *next;
     int special;
     char *entry;
+    int daynum;
 } CalEntry;
 
 typedef struct {
@@ -137,6 +139,168 @@ 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;
+		}
+	    }
+	}
+    }
+
+    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;
+    }
+    return c;
+}
+
 /***************************************************************/
 /*                                                             */
 /*   MAIN PROGRAM                                              */
@@ -154,10 +318,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 +362,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 +398,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,7 +441,8 @@ void DoPsCal(void)
 	}
 
 	DBufGets(&buf, stdin);
-	if (!strcmp(DBufValue(&buf), PSEND)) {
+	if (!strcmp(DBufValue(&buf), PSEND) ||
+	    !strcmp(DBufValue(&buf), PSEND2)) {
 	    DBufFree(&buf);
 	    break;
 	}
@@ -281,71 +451,30 @@ void DoPsCal(void)
 	if (DBufValue(&buf)[0] == '#') {
 	    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 (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 +488,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 +502,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/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   },

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

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') {