Set release date.

docs/WHATSNEW

@@ -1,10 +1,12 @@
 CHANGES TO REMIND
 
-* Version 3.3 Patch 0 - YYYY-MM-DD
+* 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.

man/rem2ps.1

@@ -315,7 +315,7 @@ calendar.
 .PP
 .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
+\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.
@@ -445,6 +445,7 @@ 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
@@ -585,7 +586,7 @@ subsequent months is forthcoming.
 \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
+\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:

man/remind.1

@@ -489,7 +489,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

src/rem2ps.c

@@ -31,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[] = {
@@ -227,6 +228,8 @@ JSONToCalEntry(DynamicBuffer *buf)
 		} else if (!StrCmpi(s, "COLOUR") ||
 			   !StrCmpi(s, "COLOR")) {
 		    c->special = SPECIAL_COLOR;
+		} else {
+		    c->special = SPECIAL_UNKNOWN;
 		}
 	    }
 	}
@@ -297,6 +300,8 @@ TextToCalEntry(DynamicBuffer *buf)
     } else if (!StrCmpi(passthru, "COLOUR") ||
 	       !StrCmpi(passthru, "COLOR")) {
 	c->special = SPECIAL_COLOR;
+    } else if (StrCmpi(passthru, "*")) {
+	c->special = SPECIAL_UNKNOWN;
     }
     return c;
 }
@@ -449,6 +454,7 @@ void DoPsCal(void)
 
 	/* Ignore lines beginning with '#' */
 	if (DBufValue(&buf)[0] == '#') {
+	    DBufFree(&buf);
 	    continue;
 	}
 
@@ -460,6 +466,13 @@ void DoPsCal(void)
 	    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();

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>

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