Prevent test failures.

phases, don't leave a big gap at the top.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for remind 06.01.09.
+# Generated by GNU Autoconf 2.72 for remind 06.02.00.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
@@ -601,8 +601,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='remind'
 PACKAGE_TARNAME='remind'
-PACKAGE_VERSION='06.01.09'
+PACKAGE_VERSION='06.02.00'
-PACKAGE_STRING='remind 06.01.09'
+PACKAGE_STRING='remind 06.02.00'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL='https://dianne.skoll.ca/projects/remind/'
 
@@ -1258,7 +1258,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-'configure' configures remind 06.01.09 to adapt to many kinds of systems.
+'configure' configures remind 06.02.00 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1320,7 +1320,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of remind 06.01.09:";;
+     short | recursive ) echo "Configuration of remind 06.02.00:";;
    esac
   cat <<\_ACEOF
 
@@ -1408,7 +1408,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-remind configure 06.01.09
+remind configure 06.02.00
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1871,7 +1871,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by remind $as_me 06.01.09, which was
+It was created by remind $as_me 06.02.00, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4899,7 +4899,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by remind $as_me 06.01.09, which was
+This file was extended by remind $as_me 06.02.00, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4964,7 +4964,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-remind config.status 06.01.09
+remind config.status 06.02.00
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(remind, 06.01.09, , , https://dianne.skoll.ca/projects/remind/)
+AC_INIT(remind, 06.02.00, , , https://dianne.skoll.ca/projects/remind/)
 AC_CONFIG_SRCDIR([src/queue.c])
 
 cat <<'EOF'

docs/WHATSNEW

@@ -1,21 +1,66 @@
 CHANGES TO REMIND
 
-* VERSION 06.01.09 - 2025-11-??
+* VERSION 06.02.00 - 2025-11-03
 
 - MAJOR NEW FEATURE: TkRemind: A new "View..." menu lets you choose a
   calendar view from the following choices: Entire month, 1 week, 2
   weeks or 4 weeks.
 
-- CHANGE: TkRemind: If you hand-edit a reminder in the "Preview Reminder"
+- NEW FEATURE: remind: The "z" flag for the "-c" option makes Remind
-  dialog box, it is marked as non-editable by TkRemind.
+  turn reminders with a "Url:" INFO string into clickable hyperlinks.
+  Note that your terminal must support the escape sequences at
+  https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda
+  for this feature to work.
+
+- IMPROVEMENT: TkRemind: The Print dialog now allows you to preview
+  (and if you wish, adjust) the command used to print a calendar.
+
+- IMPROVEMENT: TkRemind: The Agenda Mode window ("Show Today's
+  Reminders") has navigation buttons for moving back or forward one
+  day at a time.
+
+- IMPROVEMENT: TkRemind: Add many keyboard shortcuts.  All pop-up
+  windows can be closed with Esc or Control-W.  Other shortcuts are
+  documented in the tkremind man page.
+
+- CHANGE: TkRemind: If you hand-edit a reminder in the "Preview
+  Reminder" dialog box, it is marked as non-editable by TkRemind.
+
+- CHANGE: TkRemind: Remove support for rem2ps.  All printing is now
+  done using rem2pdf.
+
+- IMPROVEMENT: remind: Improve error reporting if there's extraneous
+  content after an expression.
+
+- IMPROVEMENT: tests: test-rem was tweaked to allow testing of an
+  installed Remind installation.  This work was done by Jochen
+  Sprickerhof.
+
+- IMPROVEMENT: rem2pdf: When rendering weekly calendars, reduce the
+  default size when drawing moons; if a day does not have a moon
+  indicator, don't leave a big gap before the first reminder entry.
+
+- IMPROVEMENT: rem2pdf: Draw moon phases left-aligned.
+
+- IMPROVEMENT: rem2pdf: For weekly calendars with 4 weeks per page,
+  make all of the boxes the same height.
+
+- DOCUMENTATION IMPROVEMENT: remind: Document the INFO strings that
+  back-ends should strive to support (Url:, Location: and
+  Description:)
 
 - BUG FIX: TkRemind: Bind the Home/End/PgUp/PgDn keys on the numeric
   keyboard for navigation.
 
 - FIX: Don't enable -ffat-lto-objects on FreeBSD.
 
-- IMPROVEMENT: remind: Improve error reporting if there's extraneous content
+- BUG FIX: remind: Don't segfault if we can't open a .purged output
-  after an expression.
+  file in purge mode.
+
+- BUG FIX: rem2pdf: Make PANGO @x,y positioning consistent between
+  weekly and monthly calendars.  NOTE: If you use absolute PANGO
+  positioning, you might need to adjust your script because positions
+  are now relative to the centers of the grid lines.
 
 * VERSION 06.01.08 - 2025-10-27
 

man/remind.1.in

@@ -102,6 +102,12 @@ flag also enables the use of the UNICODE "left-to-right" mark that
 can fix up formatting problems with right-to-left languages in the calendar
 display.
 .TP
+.B 'z'
+causes \fBRemind\fR to use escape sequences to turn reminders with a
+"URL" info string into hyperlinks.  In order to work, your terminal
+must support the escape sequences documented at
+https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda
+.TP
 .B 'c'
 causes \fBRemind\fR to use VT100 escape sequences to approximate
 SPECIAL COLOR reminders.  Note that this flag is kept for
@@ -1485,6 +1491,15 @@ and description of a reminder like this:
                         MSG Engineering meeting
 .fi
 .PP
+While back-ends can choose which INFO strings to support, all back-ends
+should endeavor to support three standard ones: \fBLocation:\fR,
+\fBDescription:\fR and \fBUrl:\fR.  TkRemind supports all three of these,
+turning reminders with a \fBUrl:\fR INFO string into hyper-links, and
+popping up information windows for the \fBLocation:\fR and \fBDescription:\fR
+INFO strings.  \fBLocation:\fR and \fBUrl:\fR are self-explanatory;
+\fBDescription:\fR is meant for a longer, more in-depth description
+of the reminder than the summary that is normally displayed.
+.PP
 The \fBDURATION\fR keyword makes sense only for timed reminders; it
 specifies the duration of an event.  For example, if you have a
 90-minute meeting starting at 1:00pm, you could use any of the following:

man/tkremind.1.in

@@ -61,15 +61,17 @@ box appears completely full.
 .SH NAVIGATING
 To change to the previous or next month, click the \fB<\-\fR
 or \fB\->\fR button, respectively.  You can also use the left/right arrow
-keys or PageUp/PageDown to navigate.
+keys or \fBPgUp\fR/\fBPgDn\fR to navigate.
 
 To change back to the current month, click \fBToday\fR or press the
-Home key.  To go to a specific month, click \fBGo To Date...\fR.  This
+\fBHome\fR key.  To go to a specific month, click \fBGo To Date...\fR
-pops up a dialog box which allows you to select a month and enter a
+or press \fBg\fR.  This pops up a dialog box which allows you to
-year.  Once you've done this, click \fBGo\fR to go to the date, or
+select a month and enter a year.  Once you've done this, click
-\fBCancel\fR to cancel.
+\fBGo\fR to go to the date, or \fBCancel\fR to cancel.  Note also that
+all pop-up windows in \fBTkRemind\fR can be dismissed by pressing
+\fBEsc\fR or \fBControl-w\fR.
 
-To exit \fBTkRemind\fR, click \fBQuit\fR.
+To exit \fBTkRemind\fR, click \fBQuit\fR or press \fBControl-q\fR..
 
 .SH CHANGING THE VIEW
 By default, \fBTkRemind\fR shows the calendar for an entire month.
@@ -82,6 +84,10 @@ In the monthly view, the Next and Previous navigation buttons and keyboard
 shortcuts move by one month.  In all other views, they move by one week.
 This is true even for views that display multiple weeks.
 
+You can press the keys \fB1\fR, \fB2\fR, \fB4\fR or \fBm\fR over the
+main calendar window to change the view to one week, two weeks, four weeks
+or one month, respectively.
+
 .SH ADDING REMINDERS
 To add a reminder, click button 1 in any day number in the calendar.
 The \fBAdd Reminder...\fR dialog will pop up, with values preselected for
@@ -146,19 +152,29 @@ You will have to hand-edit it to change it.
 .SH SEEING A SINGLE DAY'S REMINDERS
 Right-click on any day number in the calendar to pop up a window with
 that day's reminders in Agenda Mode.  You can left- or right-click the
-current date and time indicator at the bottom of the window to see today's
+current date and time indicator at the bottom of the calendar window
-reminders in Agenda Mode.
+to see today's reminders in Agenda Mode.  You can also press \fBt\fR
+over the main calendar window to see today's reminders in Agenda Mode.
 
 In the Agenda Mode display, hovering over a reminder will show ancillary
 information such as a Location, URL or Description.  Clicking on a reminder
-will open an editor on the REM command that created the reminder.
+will open an editor on the REM command that created the reminder.  You can
+also navigate in the Agenda Mode window one day at a time using the
+forward and back arrow buttons or left/right arrow keys or \fBPgUp\fR/\fBPgDn\fR.
+You can get back to today by clicking \fBToday\fR or pressing the
+\fBHome\fR key.
+
+You can dismiss the Agenda Mode window by clicking \fBOK\fR or pressing
+the \fBEsc\fR key.
 
 .SH PRINTING
 To print the current month's calendar, click \fBPrint...\fR on the
-main calendar window.  This brings up the print dialog.  Printing
+main calendar window or press \fBp\fR or \fBControl-p\fR.  This brings
-either produces a PostScript file or sends PostScript to a UNIX command.
+up the print dialog.  Printing either produces a PostScript or PDF
-(If you have \fBrem2pdf\fR installed, you can choose to produce
+file, or sends PostScript or PDF to a UNIX command.
-PDF output rather than PostScript.)
+
+Note that you must have \fBrem2pdf\fR installed in order to be
+able to print.
 
 Select the print destination by choosing either \fBTo file:\fR or
 \fBTo command:\fR in the print dialog.  Press \fBBrowse...\fR to bring
@@ -175,7 +191,7 @@ the directory.
 Select the appropriate paper size and orientation.  Activate
 \fBFill page\fR if you want the calendar to fill the page.  This should
 be the normal case unless you have many reminders in a particular
-day.  (See the \fBRem2PS\fR or \fBrem2pdf\fR documentation.)
+day.  (See the \fBrem2pdf\fR documentation.)
 
 Finally, click \fBPrint\fR to print or \fBCancel\fR to cancel.  Note
 that during printing, \fBRemind\fR is called with the
@@ -186,9 +202,9 @@ is also supplied to \fBRemind\fR.
 If you click on \fBShow Command\fR rather than \fBPrint\fR, then
 \fBTkRemind\fR won't actually print anything.  Instead, it will pop
 up a text window with the command that it \fIwould have used\fR to print
-the calendar.  You can cut-and-paste the command into a shell prompt and
+the calendar.  You can adjust the command as needed and then click \fBRun\fR
-adjust as needed if you want to use any \fBrem2pdf\fR or \fBrem2ps\fR
+to run the modified command.  This lets you specify \fBrem2pdf\fR options
-options that are not directly supported by \fBTkRemind\fR.
+that are not directly supported by \fBTkRemind\fR.
 
 .SH EDITING REMINDERS
 
@@ -249,7 +265,8 @@ option of "turning off" the reminder for the rest of the day.
 .SH OPTIONS
 
 The final button on the calendar window, \fBOptions\fR, lets you configure
-certain aspects of \fBTkRemind\fR.  The configuration options are:
+certain aspects of \fBTkRemind\fR.  You can also pop up the options
+window by pressing \fBo\fR.  The configuration options are:
 
 .TP
 .B Start up Iconified
@@ -342,22 +359,6 @@ press \fBApply Options\fR to put them into effect, \fBSave Options\fR
 to put them into effect and save them in $HOME/.config/tkremindrc, or
 \fBCancel\fR to cancel any changes you made.
 
-.SH KEYBOARD SHORTCUTS
-\fBTkRemind\fR's main window includes the following keyboard shortcuts:
-
-.TP
-.B Ctrl-Q
-Quit
-.TP
-.B Left Arrow
-Previous Month
-.TP
-.B Right Arrow
-Next Month
-.TP
-.B Home
-Today
-
 .SH IMMEDIATE UPDATES
 
 If you are running \fBTkRemind\fR on Linux and \fBRemind\fR has been
@@ -572,5 +573,5 @@ $HOME/.config/tkremindrc -- \fBTkRemind\fR saved options.
 .SH HOME PAGE
 https://dianne.skoll.ca/projects/remind/
 .SH SEE ALSO
-\fBremind\fR, \fBrem2ps\fR, \fBrem2pdf\fR, \fBrem2html\fR
+\fBremind\fR, \fBrem2pdf\fR, \fBrem2html\fR
 

rem2pdf/bin/rem2pdf.in

@@ -51,7 +51,7 @@ my $settings = {
         title_url => '',
         title_size => 14,
         header_size => 12,
-        daynum_size => 14,
+        daynum_size => -1,
         entry_size => 8,
 
         border_size => 4,
@@ -526,7 +526,9 @@ Specify the size of the header font in 1/72ndths of an inch.  The default is 14.
 =item --daynum-size=I<n>
 
 Specify the size of the day number font in 1/72ndths of an inch.  The
-default is 14.
+default is 14 for monthly calendars or 10 for weekly calendars.  (Weekly
+calendars don't have day numbers in the calendar boxes, but this setting
+is used to scale the size of moon phase indicators.)
 
 =item --entry-size=I<n>
 
@@ -683,7 +685,10 @@ of the right side of the calendar box.
 A positive I<y> value positions the top edge of the text I<y> points
 below the top of the calendar box, while a negative I<y> value
 positions the bottom edge of the text I<y> points above the bottom of
-the calendar box.
+the calendar box.  Note that the coordinates are relative to the center
+of the lines that delineate the boxes; you should use an I<x> value
+whose absolute value is at least 2 and a I<y> value whose absolute
+value is at least 4 to avoid colliding with the lines.
 
 If you use absolutely-positioned text, it's up to you to make sure it
 doesn't overlap other text; B<rem2pdf> takes no special precautions to
@@ -692,7 +697,7 @@ prevent this.
 As an example, this places Sunrise and Sunset times at the bottom left
 of each calendar box:
 
-  REM SPECIAL PANGO @1,-1 <span size="4800"><i>Rise [sunrise($U)] Set [sunset($U)]</i></span>
+  REM SPECIAL PANGO @2,-4 <span size="4800"><i>Rise [sunrise($U)] Set [sunset($U)]</i></span>
 
 (Note that Pango expresses font sizes in 1024's of a point, so a size of
 4800 works out to about 4.6 points.)

rem2pdf/lib/Remind/PDF.pm

@@ -468,6 +468,9 @@ sub render
 {
         my ($self, $cr, $settings, $index, $total) = @_;
 
+        if ($settings->{daynum_size} < 0) {
+                $settings->{daynum_size} = 14;
+        }
         if ($settings->{svg} || $settings->{eps}) {
                 if ($index > 1) {
                         if ($index == 2) {
@@ -628,7 +631,7 @@ sub col_box_coordinates
                 $settings->{margin_left} + $cell * $col,
                 $so_far,
                 $settings->{margin_left} + $cell * ($col + 1),
-                $so_far + $height + $settings->{border_size},
+                $so_far + $height + 2* $settings->{border_size},
             );
 }
 
@@ -663,7 +666,7 @@ sub draw_day
                         $cr->set_source_rgb($shade->{r} / 255,
                                             $shade->{g} / 255,
                                             $shade->{b} / 255);
-                        $cr->rectangle($x1, $y1, $x2 - $x1, $y2 - $y1 + $settings->{border_size});
+                        $cr->rectangle($x1, $y1, $x2 - $x1, $y2 - $y1);
                         $cr->fill();
                         $cr->restore;
                 }
@@ -1111,6 +1114,9 @@ Remind::PDF::Weekly - render a weekly calendar
 sub render
 {
         my ($self, $cr, $settings, $index, $total) = @_;
+        if ($settings->{daynum_size} < 0) {
+                $settings->{daynum_size} = 10;
+        }
         if ($settings->{svg} || $settings->{eps}) {
                 if ($index > $settings->{weeks_per_page}) {
                         if ($index == $settings->{weeks_per_page}+1) {
@@ -1130,7 +1136,7 @@ sub render
                 }
         }
 
-        $settings->{numbers_on_left} = 1;
+        $settings->{numbers_on_left} = 0;
         # Set up bounding box
         if ($settings->{weeks_per_page} == 1) {
                 $self->{bounding_box} = [
@@ -1139,22 +1145,16 @@ sub render
                         $settings->{width} - $settings->{margin_right},
                         $settings->{height} - $settings->{margin_bottom}]
         } else {
+                my $gap = $settings->{margin_top} * 0.5;
                 my $total_height = $settings->{height} - $settings->{margin_top} - $settings->{margin_bottom};
-                my $week_height = $total_height / $settings->{weeks_per_page};
+                my $week_height = ($total_height - $gap * ($settings->{weeks_per_page}-1)) / $settings->{weeks_per_page};
-                my $top_offset = (($index-1) % $settings->{weeks_per_page}) * $week_height;
+                my $top_offset = ((($index-1) % $settings->{weeks_per_page}) * $week_height) + (($index-1) % $settings->{weeks_per_page})  * $gap;
                 my $bot_offset = $top_offset + $week_height;
-                $self->{bounding_box} = 
+                $self->{bounding_box} = [
-                    $self->{bounding_box} = [
+                        $settings->{margin_left},
-                            $settings->{margin_left},
+                        $settings->{margin_top} + $top_offset,
-                            $settings->{margin_top} + $top_offset,
+                        $settings->{width} - $settings->{margin_right},
-                            $settings->{width} - $settings->{margin_right},
+                        $settings->{margin_top} + $bot_offset];
-                            $settings->{margin_top} + $bot_offset];
-                if ($index != 1) {
-                        $self->{bounding_box}[1] += 0.25 * $settings->{margin_top};
-                }
-                if ($index != $settings->{weeks_per_page}) {
-                    $self->{bounding_box}[3] -= 0.25 * $settings->{margin_top};
-                }
         }
         $self->draw_headings($cr, $settings);
         for (my $i=0; $i<7; $i++) {
@@ -1262,7 +1262,13 @@ sub draw_entries
         $layout->set_font_description($desc);
         my ($wid, $h) = $layout->get_pixel_size();
 
-        my $so_far = $box->[1] + $h + $settings->{border_size};
+        my $so_far = $box->[1] + $settings->{border_size};
+        foreach my $entry (@{$self->{entries}->[$i]}) {
+                if ($entry->isa('Remind::PDF::Entry::moon')) {
+                        $so_far = $box->[1] + $h + $settings->{border_size};
+                        last;
+                }
+        }
 
         my $box_height = $box->[3] - $box->[1];
         my $done = 0;

rem2pdf/lib/Remind/PDF/Entry.pm

@@ -152,7 +152,7 @@ sub render
 
         $cr->save();
         Remind::PDF->set_cr_color($cr, $settings->{daynum_color});
-        $cr->move_to($x2 - $settings->{border_size}/2 - $wid, $y2 + $settings->{border_size} - $h);
+        $cr->move_to($x2 - $settings->{border_size}/2 - $wid, $y2 - $h);
         my $url;
         if ($self->{info} && $self->{info}->{url}) {
                 $url = $self->{info}->{url};

scripts/tkremind.in

@@ -252,9 +252,6 @@ set DateToWinOffset [dict create]
 # Remind program to execute -- supply full path if you want
 set Remind "remind"
 
-# Rem2PS program to execute -- supply full path if you want
-set Rem2PS "rem2ps"
-
 # Rem2PDF program to execute -- supply full path if you want
 set Rem2PDF "rem2pdf"
 
@@ -351,17 +348,14 @@ set Option(WrapCal) 0
 set OptDescr(PrintDaysRight) "(0/1) If 1, put day numbers in the top-right of each calendar box"
 set Option(PrintDaysRight) 1
 
-set OptDescr(PrintEncoding) "(0/1) If 1, apply ISO-8859-1 encoding to PostScript output"
-set Option(PrintEncoding) 0
-
 set OptDescr(PrintMargins) "Print margins: One of 24pt, 36pt or 48pt"
 set Option(PrintMargins) 36pt
 
 set OptDescr(PrintSmallCalendars) "(0/1) If 1, print small calendars in PostScript output"
 set Option(PrintSmallCalendars) 1
 
-set OptDescr(PrintFormat) "Print format: pdf, ps or ps1 - ps1 means PostScript using rem2pdf"
+set OptDescr(PrintFormat) "Print format: pdf or ps"
-set Option(PrintFormat) ps
+set Option(PrintFormat) pdf
 
 set WarningHeaders [list "# Lines starting with REM TAG TKTAGnnn ... were created by tkremind" "# Do not edit them by hand or results may be unpredictable."]
 
@@ -440,9 +434,12 @@ proc Initialize {} {
     set TodayMonth [expr [string trim [clock format $now -format %N]] - 1]
     set TodayYear [clock format $now -format %Y]
     set TodayDay [string trim [clock format $now -format %e]]
+    set CurMonth $TodayMonth
+    set CurYear $TodayYear
+    set CurDay $TodayDay
 
     set CommandLine "$Remind -itkremind=1 -ppp%WEEKS% -y -l %EXTRA%"
-    set PSCmd "$Remind -itkremind=1 -itkprint=1 -pp -l %EXTRA%"
+    set PSCmd "$Remind -itkremind=1 -itkprint=1 -pp%WEEKS% -l %EXTRA%"
     set i 0
     while {$i < $argc} {
 	if {[regexp -- {-[bgxim].*} [lindex $argv $i]]} {
@@ -874,11 +871,23 @@ proc CreateCalWindow { dayNames } {
     wm protocol . WM_DELETE_WINDOW Quit
     wm deiconify .
     bind . <Control-KeyPress-q> Quit
+    bind . <Control-KeyPress-p> ".b.print flash; .b.print invoke"
+    bind . <KeyPress-p> ".b.print flash; .b.print invoke"
+    bind . <KeyPress-t> [list ShowTodaysReminders 1 ""]
+    bind . <KeyPress-F1> ".b.help flash; .b.help invoke"
+    bind . <KeyPress-h> ".b.help flash; .b.help invoke"
+    bind . <KeyPress-g> ".b.goto flash; .b.goto invoke"
+    bind . <KeyPress-o> ".b.options flash; .b.options invoke"
+    bind . <KeyPress-question> ".b.help flash; .b.help invoke"
     bind . <KeyPress-Left> ".b.prev flash; .b.prev invoke"
     bind . <KeyPress-Right> ".b.next flash; .b.next invoke"
     bind . <KeyPress-Prior> ".b.prev flash; .b.prev invoke"
     bind . <KeyPress-Next> ".b.next flash; .b.next invoke"
     bind . <KeyPress-Home> ".b.this flash; .b.this invoke"
+    bind . <KeyPress-1> "SetView Week-1"
+    bind . <KeyPress-2> "SetView Week-2"
+    bind . <KeyPress-4> "SetView Week-4"
+    bind . <KeyPress-m> "SetView Month"
     catch { bind . <KeyPress-KP_Home> ".b.this flash; .b.this invoke" }
     catch { bind . <KeyPress-KP_Prior> ".b.prev flash; .b.prev invoke" }
     catch { bind . <KeyPress-KP_Next> ".b.next flash; .b.next invoke" }
@@ -1075,6 +1084,8 @@ proc EditOptions {} {
     button $w.cancel -text "Cancel" -command "CancelOptions; destroy $w"
     wm protocol $w WM_DELETE_WINDOW "CancelOptions; destroy $w"
     pack $w.default $w.dark $w.save $w.cancel -in $w.b -side left -expand 0 -fill x
+    bind $w <KeyPress-Escape> "$w.cancel flash; $w.cancel invoke"
+    bind $w <Control-KeyPress-w> "$w.cancel flash; $w.cancel invoke"
     CenterWindow $w .
 }
 
@@ -1172,6 +1183,22 @@ proc WriteOptionsToFile {} {
 	return
     }
 
+    # Make sure View option is sane
+    if { "$Option(View)" != "Month" &&
+         "$Option(View)" != "Week-1" &&
+         "$Option(View)" != "Week-2" &&
+         "$Option(View)" != "Week-4" } {
+        set Option(View) "Month"
+    }
+
+    # We no longer support rem2ps
+    if { "$Option(PrintFormat)" == "ps1" } {
+        set Option(PrintFormat) ps
+    }
+
+    # Delete obsolete option
+    catch { unset Option(PrintEncoding) }
+
     puts $f "# TkRemind option file -- created automatically"
     puts $f "# [clock format [clock seconds]]"
     puts $f "# Format of each line is 'key value' where 'key'"
@@ -1212,7 +1239,9 @@ proc LoadOptions {} {
         }
         foreach {key val} $line {}
         if {![info exists Option($key)]} {
-            puts stderr "Unknown option in $ConfigFile: $key"
+            if { "$key" != "PrintEncoding" } {
+                puts stderr "Unknown option in $ConfigFile: $key"
+            }
             continue
         }
         set Option($key) $val
@@ -1232,6 +1261,14 @@ proc LoadOptions {} {
          "$Option(View)" != "Week-4" } {
         set Option(View) "Month"
     }
+
+    # We no longer support rem2ps
+    if { "$Option(PrintFormat)" == "ps1" } {
+        set Option(PrintFormat) ps
+    }
+
+    # Delete obsolete option
+    catch { unset Option(PrintEncoding) }
 }
 
 
@@ -1303,7 +1340,7 @@ proc get_num_weeks {} {
 #---------------------------------------------------------------------------
 proc FillCalWindowWeekly { nweeks } {
     global DayNames CurYear CurMonth CurDay MonthNames CommandLine Option TagToObj SynToObj RemindErrors MondayFirst Hostname
-    global TodayYear TodayMonth TodayDay Option
+    global TodayYear TodayMonth TodayDay Option RemindErrors
 
     array unset TagToObj
     array unset SynToObj
@@ -1384,6 +1421,10 @@ proc FillCalWindowWeekly { nweeks } {
     } else {
         wm title . "$title - TkRemind @VERSION@"
     }
+    if {$problem} {
+        set RemindErrors [unique_lines $errmsg]
+        set_button_to_errors
+    }
     DisplayTime
 }
 
@@ -1455,7 +1496,7 @@ proc FillCalWindowMonthly {} {
 }
 
 proc AddReminderToCalendar { obj } {
-    global TagToObj
+    global TagToObj SynToObj
     set fntag "x"
     if {[dict exists $obj filename]} {
         set fname [dict get $obj filename]
@@ -1611,7 +1652,8 @@ proc MoveMonth {delta} {
     } else {
         set dt [format "%04d-%02d-%02d" $CurYear [expr $CurMonth+1] $CurDay]
         set dt [clock scan $dt -format "%Y-%m-%d"]
-        set dt [expr $dt + 7 * 24 * 60 * 60 * $delta]
+        # Move to noon to avoid Daylight Saving Time issues!
+        set dt [expr $dt + 7 * 24 * 60 * 60 * $delta + 43200]
         set CurYear [clock format $dt -format %Y]
         set CurMonth [expr [string trim [clock format $dt -format %N]] - 1]
         set CurDay [string trim [clock format $dt -format %e] ]
@@ -1662,10 +1704,16 @@ proc DoPrint {} {
 }
 
 proc DoPrintHelper {} {
-    global Rem2PS Rem2PDF HaveRem2PDF PSCmd Option PrintStatus RemindErrors
+    global Rem2PDF HaveRem2PDF PSCmd Option PrintStatus RemindErrors
-    global CudRday CurMonth CurYear MonthNames
+    global CurDay CurMonth CurYear MonthNames
 
     catch {destroy .p}
+
+    if {! $HaveRem2PDF} {
+        tk_messageBox -message "rem2pdf was not found, but is required to print calendars" -icon error -type ok
+        return
+    }
+
     toplevel .p
     bind .p <ButtonPress-1> [list raise .p]
 
@@ -1687,13 +1735,10 @@ proc DoPrintHelper {} {
     entry .p.command
     .p.command insert end "lpr"
 
-    if { $HaveRem2PDF } {
+    frame .p.ff -relief sunken -bd 2
-        frame .p.ff -relief sunken -bd 2
+    label .p.format -text "Output Format:"
-        label .p.format -text "Output Format:"
+    radiobutton .p.pdf -text "PDF" -variable Option(PrintFormat) -value pdf
-        radiobutton .p.pdf -text "PDF" -variable Option(PrintFormat) -value pdf
+    radiobutton .p.ps -text "PostScript" -variable Option(PrintFormat) -value ps
-        radiobutton .p.ps -text "PostScript (using rem2ps)" -variable Option(PrintFormat) -value ps
-        radiobutton .p.ps1 -text "PostScript (using rem2pdf)" -variable Option(PrintFormat) -value ps1
-    }
 
     label .p.size -text "Paper Size:"
     radiobutton .p.letter -text "Letter" -variable Option(PrintSize) -value letter
@@ -1709,9 +1754,8 @@ proc DoPrintHelper {} {
     radiobutton .p.portrait -text "Portrait" -variable Option(PrintOrient) -value portrait
 
     checkbutton .p.fill -text "Fill page" -variable Option(PrintFill)
-    checkbutton .p.wrap -text "Use at most 5 rows (rem2pdf only)" -variable Option(WrapCal)
+    checkbutton .p.wrap -text "Use at most 5 rows" -variable Option(WrapCal)
     checkbutton .p.right -text "Day numbers at top-right" -variable Option(PrintDaysRight)
-    checkbutton .p.encoding -text "ISO 8859-1 PostScript encoding" -variable Option(PrintEncoding)
     checkbutton .p.calendars -text "Print small calendars" -variable Option(PrintSmallCalendars)
 
     button .p.print -text "Print" -command {set PrintStatus print}
@@ -1719,30 +1763,22 @@ proc DoPrintHelper {} {
     button .p.cancel -text "Cancel" -command {set PrintStatus cancel}
 
     wm protocol .p WM_DELETE_WINDOW { .p.cancel flash; .p.cancel invoke }
-    if {$HaveRem2PDF} {
+    pack .p.f1 .p.ff .p.f2 .p.f2a .p.f3 .p.f3a \
-        pack .p.f1 .p.ff .p.f2 .p.f2a .p.f3 .p.f3a \
+        -side top -fill both -expand 1 -anchor w
-            -side top -fill both -expand 1 -anchor w
+    pack .p.fill .p.wrap .p.right .p.calendars -in .p.f3a \
-        pack .p.fill .p.wrap .p.right .p.encoding .p.calendars -in .p.f3a \
+        -side top -anchor w -fill none -expand 0
-	    -side top -anchor w -fill none -expand 0
-    } else {
-        pack .p.f1 .p.f2 .p.f2a .p.f3 .p.f3a \
-            -side top -fill both -expand 1 -anchor w
-        pack .p.fill .p.right .p.encoding .p.calendars -in .p.f3a \
-	    -side top -anchor w -fill none -expand 0
-    }
     pack .p.f4 -side top -fill both -expand 1 -anchor w
     pack .p.f11 .p.f12 -in .p.f1 -side top -fill none -expand 0 -anchor w
     pack .p.tofile .p.filename .p.browse -in .p.f11 -side left -fill none -expand 0 -anchor w
     pack .p.tocmd .p.command -in .p.f12 -side left -fill none -expand 0 -anchor w
-    if { $HaveRem2PDF } {
+    pack .p.format .p.pdf .p.ps -in .p.ff -side top -fill none -expand 0 -anchor w
-        pack .p.format .p.pdf .p.ps .p.ps1 -in .p.ff -side top -fill none -expand 0 -anchor w
-    }
     pack .p.size .p.letter .p.a4 -in .p.f2 -side top -fill none -expand 0 -anchor w
     pack .p.margin .p.24pt .p.36pt .p.48pt -in .p.f2a -side top -anchor w -fill none -expand 0
     pack .p.orient .p.landscape .p.portrait -in .p.f3 -side top -fill none -expand 0 -anchor w
     pack .p.print .p.showcmd .p.cancel -in .p.f4 -side left -fill none -expand 0
 
     bind .p <KeyPress-Escape> ".p.cancel flash; .p.cancel invoke"
+    bind .p <Control-KeyPress-w> ".p.cancel flash; .p.cancel invoke"
     bind .p <KeyPress-Return> ".p.print flash; .p.print invoke"
     set PrintStatus 2
     CenterWindow .p .
@@ -1780,56 +1816,35 @@ proc DoPrintHelper {} {
 	set fname "| $cmd"
     }
 
-    if {$HaveRem2PDF && $Option(PrintFormat) == "pdf"} {
+    set p $PSCmd
-        set p [regsub %EXTRA% $PSCmd "-itkpdf=1 $Option(ExtraRemindArgs)"]
+    if {"$Option(View)" == "Month"} {
-        set cmd "$p 1 [lindex $MonthNames $CurMonth] $CurYear | $Rem2PDF"
+        set p [regsub %WEEKS% $PSCmd ""]
-    } elseif {$HaveRem2PDF && $Option(PrintFormat) == "ps1"} {
-        set p [regsub %EXTRA% $PSCmd "-itkpdf=1 $Option(ExtraRemindArgs)"]
-        set cmd "$p 1 [lindex $MonthNames $CurMonth] $CurYear | $Rem2PDF --ps"
     } else {
-        set p [regsub %EXTRA% $PSCmd $Option(ExtraRemindArgs)]
+        set p [regsub %WEEKS% $PSCmd "+[get_num_weeks]"]
-        set cmd "$p 1 [lindex $MonthNames $CurMonth] $CurYear | $Rem2PS"
-        set Option(PrintFormat) ps
     }
-
+    if {$Option(PrintFormat) == "pdf"} {
-    if {$Option(PrintSize) == "letter"} {
+        set p [regsub %EXTRA% $p "-itkpdf=1 $Option(ExtraRemindArgs)"]
-        if {$Option(PrintFormat) == "ps"} {
+        set cmd "$p 1 [lindex $MonthNames $CurMonth] $CurYear | $Rem2PDF --weeks-per-page=[get_num_weeks]"
-            append cmd " -m Letter"
-        } else {
-            append cmd " --media=Letter"
-        }
     } else {
-        if {$Option(PrintFormat) == "ps"} {
+        set p [regsub %EXTRA% $p "-itkpdf=1 $Option(ExtraRemindArgs)"]
-            append cmd " -m A4"
+        set cmd "$p 1 [lindex $MonthNames $CurMonth] $CurYear | $Rem2PDF --ps --weeks-per-page=[get_num_weeks]"
-        } else {
+    }
-            append cmd " --media=A4"
+    if {$Option(PrintSize) == "letter"} {
-        }
+        append cmd " --media=Letter"
+    } else {
+        append cmd " --media=A4"
     }
 
     if {$Option(PrintMargins) == "24pt"} {
-        if {$Option(PrintFormat) == "ps"} {
+        append cmd " --margin-right=24 --margin-left=24 --margin-top=24 --margin-bottom=24"
-            append cmd " -or 24 -ol 24 -ot 24 -ob 24"
-        } else {
-            append cmd " --margin-right=24 --margin-left=24 --margin-top=24 --margin-bottom=24"
-        }
     } elseif {$Option(PrintMargins) == "36pt"} {
-        if {$Option(PrintFormat) == "ps"} {
+        append cmd " --margin-right=36 --margin-left=36 --margin-top=36 --margin-bottom=36"
-            append cmd " -or 36 -ol 36 -ot 36 -ob 36"
-        } else {
-            append cmd " --margin-right=36 --margin-left=36 --margin-top=36 --margin-bottom=36"
-        }
     } else {
-        if {$Option(PrintFormat) == "ps"} {
+        append cmd " --margin-right=48 --margin-left=48 --margin-top=48 --margin-bottom=48"
-            append cmd " -or 48 -ol 48 -ot 48 -ob 48"
-        } else {
-            append cmd " --margin-right=48 --margin-left=48 --margin-top=48 --margin-bottom=48"
-        }
     }
 
     if {$Option(WrapCal)} {
-        if {$Option(PrintFormat) == "pdf" || $Option(PrintFormat) == "ps1"} {
+        append cmd " --wrap"
-            append cmd " --wrap"
-        }
     }
     if {$Option(PrintOrient) == "landscape"} {
 	append cmd " -l"
@@ -1842,12 +1857,6 @@ proc DoPrintHelper {} {
     if {!$Option(PrintDaysRight)} {
         append cmd " -x"
     }
-    if {$Option(PrintEncoding)} {
-        if {$Option(PrintFormat) == "ps"} {
-            append cmd " -i"
-        }
-    }
-
     if {$Option(PrintSmallCalendars)} {
 	append cmd " -c3"
     } else {
@@ -1856,25 +1865,7 @@ proc DoPrintHelper {} {
 
     append cmd " $fname"
     if {$PrintStatus == "showcmd"} {
-        puts "SHOWING COMMAND"
+        ShowPrintCommand $cmd
-        catch { destroy .pc }
-        toplevel .pc -background $Option(WinBackground)
-        text .pc.t -width 80 -height 10 -font TkFixedFont -foreground $Option(TextColor) -background $Option(BackgroundColor) -yscrollcommand ".pc.sb set" -wrap word
-        scrollbar .pc.sb -orient vertical -command ".pc.t yview"
-        button .pc.ok -text "OK" -command "destroy .pc"  -foreground $Option(LabelColor) -background $Option(BackgroundColor) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
-        grid .pc.t -row 0 -column 0 -sticky nsew
-        grid .pc.sb -row 0 -column 1 -sticky ns
-        grid .pc.ok -row 1 -column 0 -sticky w
-        grid columnconfigure .pc 0 -weight 1
-        grid columnconfigure .pc 1 -weight 0
-        grid rowconfigure .pc 0 -weight 1
-        grid rowconfigure .pc 1 -weight 0
-        CenterWindow .pc .
-        .pc.t insert end "Command for printing calendar follows; cut-and-paste and adjust as needed:\n\n"
-        .pc.t insert end $cmd
-        .pc.t configure -state disabled
-        wm deiconify .pc
-        puts "DONE SHOWING COMMAND"
     } else {
         Status "Printing..."
         if {[catch {exec /bin/sh "-c" $cmd} err]} {
@@ -1885,6 +1876,45 @@ proc DoPrintHelper {} {
     }
 }
 
+proc ShowPrintCommand { cmd } {
+    global Option
+    catch { destroy .pc }
+    toplevel .pc -background $Option(WinBackground)
+    frame .pc.f -padx 0 -pady 0 -highlightthickness 0 -relief flat -bd 0  -background $Option(BackgroundColor)
+    frame .pc.tf -padx 0 -pady 0 -highlightthickness 0 -relief flat -bd 0  -background $Option(BackgroundColor)
+    message .pc.m  -width 600 -foreground $Option(TextColor) -background $Option(BackgroundColor) -text "Below is the command that would be used to print a calendar.  Edit it as desired and click Run to run the command, or click Cancel to close this window."
+    text .pc.t -width 80 -height 5 -font TkFixedFont -foreground $Option(TextColor) -background $Option(BackgroundColor) -yscrollcommand ".pc.sb set" -wrap word -insertbackground $Option(TextColor)
+    .pc.t insert end $cmd
+    scrollbar .pc.sb -orient vertical -command ".pc.t yview"
+    button .pc.run -text "Run" -command "RunPrintCommand"  -foreground $Option(LabelColor) -background $Option(BackgroundColor) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
+    button .pc.cancel -text "Cancel" -command "destroy .pc"  -foreground $Option(LabelColor) -background $Option(BackgroundColor) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
+    pack .pc.m -side top -fill x -expand 0
+    pack .pc.tf -side top -fill both -expand 1
+    pack .pc.f -side top -fill x -expand 0
+    pack .pc.t -in .pc.tf -side left -expand 1 -fill both
+    pack .pc.sb -in .pc.tf -side left -expand 0 -fill y
+    pack .pc.run .pc.cancel -in .pc.f -side left -expand 0 -fill none
+    .pc.t configure -state normal
+    CenterWindow .pc .
+    wm deiconify .pc
+}
+
+proc RunPrintCommand {} {
+    global RemindErrors
+    set cmd [.pc.t get 1.0 end]
+    set cmd [string trim $cmd]
+    catch { destroy .pc }
+    set cmd [regsub -all "\n" $cmd " "]
+    if { "$cmd" != "" } {
+        Status "Printing..."
+        if {[catch {exec /bin/sh "-c" $cmd} err]} {
+            set RemindErrors [unique_lines $err]
+            set_button_to_errors
+        }
+        DisplayTime
+    }
+}
+
 #---------------------------------------------------------------------------
 # PrintFileBrowse -- browse for a filename for Print dialog
 # Arguments: none
@@ -1943,6 +1973,7 @@ proc GotoDialog {} {
     pack .g.y -expand 1 -fill x
     pack .g.b -expand 1 -fill x
     bind .g <KeyPress-Escape> ".g.b.cancel flash; .g.b.cancel invoke"
+    bind .g <Control-KeyPress-w> ".g.b.cancel flash; .g.b.cancel invoke"
     CenterWindow .g .
     set oldFocus [focus]
     focus .g.y.e
@@ -2319,6 +2350,7 @@ proc CreateModifyDialog {w i args} {
     }
 
     bind $w <KeyPress-Escape> "$w.but1 flash; $w.but1 invoke"
+    bind $w <Control-KeyPress-w> "$w.but1 flash; $w.but1 invoke"
     if {$nbut >= 2} {
 	bind $w.entry <KeyPress-Return> "$w.but2 flash; $w.but2 invoke"
     }
@@ -2516,6 +2548,7 @@ proc ModifyDayHelper {i} {
             show_error $err
             raise .mod
 	} else {
+            set rem [string trim $rem]
 	    if {$ModifyDialogResult == 3} {
 		set newrem [EditReminder $rem Cancel "Add reminder"]
                 if {$ModifyDialogResult == 1 || $ModifyDialogResult == -2} {
@@ -2904,6 +2937,7 @@ proc EditReminder {rem args} {
     pack .edit.t -side top -fill both -expand 1
     pack .edit.f -side top -fill x -expand 1
     bind .edit <KeyPress-Escape> ".edit.but1 flash; .edit.but1 invoke"
+    bind .edit <Control-KeyPress-w> ".edit.but1 flash; .edit.but1 invoke"
     wm protocol .edit WM_DELETE_WINDOW { .edit.but1 flash; .edit.but1 invoke }
     set ModifyDialogResult 0
     CenterWindow .edit .
@@ -2926,6 +2960,7 @@ proc EditReminder {rem args} {
         bind .edit <Destroy> ""
         destroy .edit
     }
+    set rem [string trim $rem]
     return $rem
 }
 
@@ -3018,6 +3053,7 @@ proc BrowseForFile {w title {oktext "OK"} {showdots 0} {filter "*"}} {
 
     bind $w <ButtonPress-1> "catch { raise .p } ; raise $w"
     bind $w <KeyPress-Escape> "$w.cancel flash; $w.cancel invoke"
+    bind $w <Control-KeyPress-w> "$w.cancel flash; $w.cancel invoke"
     bind $w.list <Button-1> "$w.entry delete 0 end; $w.entry insert 0 \[selection get\]"
     bind $w.list <Double-Button-1> "$w.ok flash; $w.ok invoke"
     bind $w.list <Return> "$w.entry delete 0 end; $w.entry insert 0 \[selection get\]; $w.ok flash; $w.ok invoke"
@@ -3232,6 +3268,8 @@ proc ShowQueue { queue } {
     grid rowconfigure $w 0 -weight 1
     grid rowconfigure $w 1 -weight 0
     CenterWindow $w .
+    bind $w <KeyPress-Escape> "$w.ok flash; $w.ok invoke"
+    bind $w <Control-KeyPress-w> "$w.ok flash; $w.ok invoke"
     set obj [lsort -command sort_q $queue]
     set did 0
     $w.t tag configure grey -background "#DDDDDD" -selectbackground "#999999"
@@ -4151,6 +4189,7 @@ proc details_popup { pairs } {
     global Balloon
     set maxwid 80
     set h .balloonhelp
+    catch { destroy $h }
     set c 0
     toplevel $h -bg #000000
     frame $h.l -padx 0 -pady 0 -highlightthickness 0 -relief flat -bd 0 -bg #FFFFC0
@@ -4186,12 +4225,9 @@ proc EditTaggedReminder { w i } {
         return
     }
     set InModalDialog 1
-    set problem [catch { EditTaggedReminderHelper $w $i } err more]
+    catch { EditTaggedReminderHelper $w $i } result options
     set InModalDialog 0
-    if {$problem} {
+    return -options $options $result
-        puts $err
-        puts $more
-    }
 }
 
 proc EditTaggedReminderHelper { w i } {
@@ -4242,6 +4278,7 @@ proc EditTaggedReminderHelper { w i } {
 	    show_error "$err"
 	    continue
 	}
+        set rem [string trim $rem]
         set edited 0
 	if {$ModifyDialogResult == 4} {
 	    set newrem [EditReminder $rem "Cancel" "Replace reminder"]
@@ -4653,6 +4690,63 @@ proc daily_rem_enter { lines } {
     set Balloon(HelpId) [after $Balloon(HelpTime) [list details_popup $lines]]
 }
 
+proc MakeTodaysRemindersWindow { w date } {
+    global Option
+    if {[winfo exists $w]} {
+	foreach t [$w.text tag names] {
+	    $w.text tag delete $t
+	}
+        if {"$date" == ""} {
+            set wtitle "Today's Reminders"
+        } else {
+            set wtitle "Reminders for $date"
+        }
+        raise $w
+        return
+    }
+
+    catch { destroy $w }
+    toplevel $w -background $Option(WinBackground)
+    if {"$date" == ""} {
+        set wtitle "Today's Reminders"
+    } else {
+        set wtitle "Reminders for $date"
+    }
+    wm iconname $w "Reminders"
+    frame $w.buttons -background $Option(LineColor)
+    text $w.text -width 80 -height 20 -wrap word -yscrollcommand "$w.sb set" -foreground $Option(TextColor) -background $Option(BackgroundColor) -font CalboxFont -spacing1 3
+    scrollbar $w.sb -orient vertical -command "$w.text yview"
+    button $w.ok -text "OK" -command "destroy $w" -foreground $Option(LabelColor) -background $Option(BackgroundColor) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
+    button $w.next -text "\u2b9e" -command [list MoveTodaysReminders $w 1] -foreground $Option(LabelColor) -background $Option(BackgroundColor) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
+    balloon_add_help $w.next "Move forward one day"
+    button $w.prev -text "\u2b9c" -command [list MoveTodaysReminders $w -1] -foreground $Option(LabelColor) -background $Option(BackgroundColor) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
+    button $w.today -text "Today" -command { ShowTodaysReminders 1 [clock format [clock seconds] -format "%Y-%m-%d"] } -foreground $Option(LabelColor) -background $Option(BackgroundColor) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
+    balloon_add_help $w.today "Move to today"
+    balloon_add_help $w.prev "Move backward one day"
+    balloon_add_help $w.ok "Dismiss this window"
+    grid $w.text -row 0 -column 0 -sticky nsew
+    grid $w.sb -row 0 -column 1 -sticky ns
+    pack $w.ok $w.prev $w.today $w.next -in $w.buttons -side left -expand 0 -fill none
+    grid $w.buttons -row 1 -column 0 -sticky w
+    grid rowconfigure $w 0 -weight 1
+    grid rowconfigure $w 1 -weight 0
+    grid columnconfigure $w 0 -weight 1
+    grid columnconfigure $w 1 -weight 0
+    bind $w <KeyPress-Left> "$w.prev flash; $w.prev invoke"
+    bind $w <KeyPress-Right> "$w.next flash; $w.next invoke"
+    bind $w <KeyPress-Prior> "$w.prev flash; $w.prev invoke"
+    bind $w <KeyPress-Next> "$w.next flash; $w.next invoke"
+    bind $w <KeyPress-Home> "$w.today flash; $w.today invoke"
+    bind $w <KeyPress-Escape> "$w.ok flash; $w.ok invoke"
+    bind $w <Control-KeyPress-w> "$w.ok flash; $w.ok invoke"
+    catch { bind $w <KeyPress-KP_Prior> "$w.prev flash; $w.prev invoke" }
+    catch { bind $w <KeyPress-KP_Next> "$w.next flash; $w.next invoke" }
+    catch { bind $w <KeyPress-KP_Left> "$w.prev flash; $w.prev invoke" }
+    catch { bind $w <KeyPress-KP_Right> "$w.next flash; $w.next invoke" }
+    catch { bind $w <KeyPress-KP_Home> "$w.today flash; $w.today invoke" }
+    CenterWindow $w .
+}
+
 #***********************************************************************
 # %PROCEDURE: ShowTodaysReminders
 # %ARGUMENTS:
@@ -4673,26 +4767,9 @@ proc ShowTodaysReminders { force date } {
     }
 
     set w .today
-    catch { destroy $w }
+    MakeTodaysRemindersWindow $w $date
-    toplevel $w -background $Option(WinBackground)
+    $w.text configure -state normal
-    if {"$date" == ""} {
+    $w.text delete 1.0 end
-        set wtitle "Today's Reminders"
-    } else {
-        set wtitle "Reminders for $date"
-    }
-    wm iconname $w "Reminders"
-    text $w.text -width 80 -height 20 -wrap word -yscrollcommand "$w.sb set" -foreground $Option(TextColor) -background $Option(BackgroundColor) -font CalboxFont -spacing1 3
-    scrollbar $w.sb -orient vertical -command "$w.text yview"
-    button $w.ok -text "OK" -command "destroy $w" -foreground $Option(LabelColor) -background $Option(BackgroundColor) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
-
-    grid $w.text -row 0 -column 0 -sticky nsew
-    grid $w.sb -row 0 -column 1 -sticky ns
-    grid $w.ok -row 1 -column 0 -sticky w
-    grid rowconfigure $w 0 -weight 1
-    grid rowconfigure $w 1 -weight 0
-    grid columnconfigure $w 0 -weight 1
-    grid columnconfigure $w 1 -weight 0
-    CenterWindow $w .
 
     # Grab the reminders
     set stuff ""
@@ -4702,11 +4779,13 @@ proc ShowTodaysReminders { force date } {
     }
     append cmdline $Option(ExtraRemindArgs)
     append cmdline " $ReminderFile"
-    if {"$date" != ""} {
+    if { "$date" == "" } {
-        append cmdline " $date"
-    } else {
         set date [clock format [clock seconds] -format "%Y-%m-%d" -locale C]
     }
+    append cmdline " $date"
+
+    set_win_prop $w date $date
+
     append cmdline " 2>/dev/null"
     set f [open $cmdline r]
     while {[gets $f line] >= 0} {
@@ -4831,15 +4910,21 @@ proc ShowTodaysReminders { force date } {
         $w.text insert end [dict get $thing body] $tags
         $w.text insert end "\n"
     }
-
-    #$w.text insert end "\n\n$stuff\n"
     $w.text configure -state disabled
 }
 
+proc MoveTodaysReminders { w amt } {
+    set date [get_win_prop $w date]
+    set dt [clock scan $date -format "%Y-%m-%d"]
+    # We move to noon to avoid dayligh saving time issues!
+    incr dt [expr 86400 * $amt + 43200]
+    set date [clock format $dt -format "%Y-%m-%d"]
+    ShowTodaysReminders 1 $date
+}
+
 proc compare_reminders { a b } {
     set a_date [dict get $a date]
     set b_date [dict get $b date]
-    #puts "Comparing $a_date $b_date"
     if {"$a_date" < "$b_date"} {
         return -1
     }
@@ -4989,6 +5074,7 @@ proc balloon_popup_help { w } {
 	return
     }
     set h .balloonhelp
+    catch { destroy $h }
     toplevel $h -bg #000000
     label $h.l -text $Balloon(helptext$w) -wraplength 200 -justify left -bg #FFFFC0 -bd 0
     pack $h.l -padx 1 -pady 1 -ipadx 2 -ipady 1
@@ -5135,9 +5221,9 @@ proc FindConfigFile {} {
         # Migrate .tkremindrc to $confighome/tkremindrc
         if {[file exists [home "/.tkremindrc"]]} {
             if {![file exists "$confighome/tkreminderc"]} {
-                puts "Migrating ~/.tkremindrc to $confighome/tkremindrc"
+                catch { puts "Migrating ~/.tkremindrc to $confighome/tkremindrc" }
                 if {[catch { file copy [home "/.tkremindrc"] "$confighome/tkremindrc"}]} {
-                    puts "FAILED!\n"
+                    catch { puts "FAILED!\n" }
                     set ConfigFile [home "/.tkremindrc"]
                     return
                 }
@@ -5239,9 +5325,12 @@ proc ShowManPage { cmd jump destroy } {
         $w.t tag bind url <Enter> [list URLEnter $w.t]
         $w.t tag bind url <Leave> [list URLLeave $w.t]
         $w.t tag bind url <Motion> [list URLMove $w.t]
+        bind $w <KeyPress-Escape> "$w.ok flash; $w.ok invoke"
+        bind $w <Control-KeyPress-w> "$w.ok flash; $w.ok invoke"
     } else {
         $w.t configure -state normal
         $w.t delete 1.0 end
+
     }
     set env(COLUMNS) 80
     set env(MANWIDTH) 80
@@ -5398,7 +5487,7 @@ proc ShowErrors {} {
     set w ".errors"
     catch { destroy $w }
     toplevel $w -background $Option(WinBackground)
-    text $w.t -width 80 -height 30 -wrap word -yscrollcommand "$w.sb set" -foreground $Option(TextColor) -background $Option(BackgroundColor) -font CalBoxFont
+    text $w.t -width 80 -height 30 -wrap word -yscrollcommand "$w.sb set" -foreground $Option(TextColor) -background $Option(BackgroundColor) -font [font actual TkFixedFont]
     scrollbar $w.sb -orient vertical -command "$w.t yview"
     button $w.ok -text OK -command DoneShowingErrors -foreground $Option(TextColor) -background $Option(BackgroundColor) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
     grid $w.t -row 0 -column 0 -sticky nsew
@@ -5427,6 +5516,8 @@ proc ShowErrors {} {
     if {$i > 0} {
         $w.t insert end "\nIf an error message is underlined when you hover over it, click button-1 to edit the offending file at the line number of the error.\n"
     }
+    bind $w <KeyPress-Escape> "$w.ok flash; $w.ok invoke"
+    bind $w <Control-KeyPress-w> "$w.ok flash; $w.ok invoke"
     $w.t configure -state disabled
     CenterWindow $w .
 }

src/calendar.c

@@ -99,6 +99,9 @@ static struct line_drawing UTF8Drawing = {
     "\xe2\x94\x80"
 };
 
+static char const *start_link = "\x1B]8;;";
+static char const *end_link = "\x1B]8;;\x1B\\";
+
 static char *VT100Colors[2][2][2][2] /* [Br][R][G][B] */ = {
   {
   /*** DIM COLORS ***/
@@ -301,6 +304,7 @@ static void WriteTopCalLine (void);
 static void WriteBottomCalLine (void);
 static void WriteIntermediateCalLine (void);
 static void WriteCalDays (void);
+static char const *get_url(TrigInfo *infos);
 
 static int
 DayOf(int dse)
@@ -1557,6 +1561,8 @@ static int WriteOneColLine(int col)
     int clamp = 1;
     int numwritten = 0;
     int d = ColToDay[col];
+    char const *url = get_url(e->infos);
+
     if (d && UseBGVTColors && bgcolor[d][0] != -1) {
         clamp = 0;
     }
@@ -1605,6 +1611,10 @@ static int WriteOneColLine(int col)
             ColorizeEntry(e, clamp);
         }
 
+        if (url) {
+            printf("%s", start_link);
+            printf("%s\x1B\\", url);
+        }
         /* If we couldn't find a space char, print what we have. */
         if (!wspace) {
             for (ws = e->wc_pos; numwritten < ColSpaces; ws++) {
@@ -1639,6 +1649,9 @@ static int WriteOneColLine(int col)
             }
         }
 
+        if (url) {
+            printf("%s", end_link);
+        }
         /* Decolorize reminder if necessary, but keep any SHADE */
         if (UseVTColors && e->is_color) {
             printf("%s", Decolorize());
@@ -2462,6 +2475,34 @@ void WriteJSONTimeTrigger(TimeTrig const *tt)
     }
 }
 
+static char const *
+get_url(TrigInfo *infos)
+{
+    TrigInfo *ti = infos;
+    char const *url;
+    if (!LinksInTerminal) {
+        /* Nope, not doing links in terminal */
+        return NULL;
+    }
+    while (ti) {
+        char const *colon = strchr(ti->info, ':');
+        if (!colon) {
+            ti = ti->next;
+            continue;
+        }
+        if (!strncasecmp(ti->info, "url", colon-ti->info)) {
+            url = colon+1;
+            while (*url && isspace(*url)) {
+                url++;
+            }
+            if (!*url) return NULL;
+            return url;
+        }
+        ti = ti->next;
+    }
+    return NULL;
+}
+
 void
 WriteJSONInfoChain(TrigInfo *ti)
 {

src/err.h

@@ -138,6 +138,8 @@
 #define E_BAD_MB_SEQ        114
 #define E_EXPR_NODES_EXCEEDED 115
 #define E_EXPECTING_EOXPR   116
+#define E_EXPECTING_ATOM    117
+
 #ifdef MK_GLOBALS
 #undef EXTERN
 #define EXTERN
@@ -271,7 +273,8 @@ EXTERN char *ErrMsg[]
 /* E_NO_MB */              "C library does not support multibyte characters",
 /* E_BAD_MB_SEQ */         "Invalid multibyte sequence",
 /* E_EXPR_NODES_EXCEEDED */ "Maximum expression complexity exceeded",
-/* E_EXPECTING_EOXPR */    "Expecting end-of-expression",
+/* E_EXPECTING_EOXPR */    "Expecting operator or end-of-expression",
+/* E_EXPECTING_ATOM */     "Expecting constant, variable, function call or (expression)",
 }
 #endif /* MK_GLOBALS */
 ;

src/expr.c

@@ -170,6 +170,8 @@ static expr_node *expr_node_free_list = NULL;
 /* Maximum parse level before we bail (to avoid SEGV from filling stack)*/
 #define MAX_PARSE_LEVEL 2000
 
+/* Legal punctuation characters in an expression */
+#define LEGAL_CHARS "+-*/%&|=<>!)"
 static int parse_level_high_water = 0;
 #define CHECK_PARSE_LEVEL() do { if (level > parse_level_high_water) { parse_level_high_water = level; if (level > MAX_PARSE_LEVEL) { *r = E_OP_STK_OVER; return NULL; } } } while(0)
 
@@ -2228,9 +2230,15 @@ static int set_constant_value(expr_node *atom)
         atom->u.value.v.val = val;
         return OK;
     }
+
     atom->u.value.type = ERR_TYPE;
-    Eprint("`%s': %s", DBufValue(&ExprBuf), GetErr(E_ILLEGAL_CHAR));
+    if (strchr(LEGAL_CHARS, *s) != NULL) {
-    return E_ILLEGAL_CHAR;
+        r = E_EXPECTING_ATOM;
+    } else {
+        r = E_ILLEGAL_CHAR;
+    }
+    Eprint("`%s': %s", DBufValue(&ExprBuf), GetErr(r));
+    return r;
 }
 
 /***************************************************************/
@@ -2346,8 +2354,13 @@ static expr_node *parse_atom(char const **e, int *r, Var *locals, int level)
         *s != '$' &&
         *s != '"' &&
         *s != '\'') {
-        Eprint("%s `%c'", GetErr(E_ILLEGAL_CHAR), *s);
+        if (strchr(LEGAL_CHARS, *s) != NULL) {
-        *r = E_ILLEGAL_CHAR;
+            *r = E_EXPECTING_ATOM;
+            Eprint("%s", GetErr(*r));
+        } else {
+            *r = E_ILLEGAL_CHAR;
+            Eprint("%s `%c'", GetErr(*r), *s);
+        }
         return NULL;
     }
 
@@ -2761,6 +2774,9 @@ expr_node *parse_expression(char const **e, int *r, Var *locals)
         }
         orig = o2;
     }
+    while (**e && isempty(**e)) {
+        (*e)++;
+    }
     if (**e && (**e != ']')) {
         if (DebugFlag & DB_PARSE_EXPR) {
             fprintf(ErrFp, "  Unparsed: %s\n", *e);
@@ -2787,6 +2803,7 @@ expr_node *parse_expression(char const **e, int *r, Var *locals)
             *r == E_BAD_NUMBER       ||
             *r == E_BAD_DATE         ||
             *r == E_BAD_TIME         ||
+            *r == E_EXPECTING_ATOM   ||
             *r == E_ILLEGAL_CHAR) {
             end_of_expr = find_end_of_expr(orig);
             while (**e && isempty(**e)) {

src/files.c

@@ -225,8 +225,9 @@ static void OpenPurgeFile(char const *fname, char const *mode)
     if (!PurgeFP) {
         fprintf(ErrFp, tr("Cannot open `%s' for writing: %s"), DBufValue(&fname_buf), strerror(errno));
         fprintf(ErrFp, "\n");
+    } else {
+        set_cloexec(fileno(PurgeFP));
     }
-    set_cloexec(fileno(PurgeFP));
     DBufFree(&fname_buf);
 }
 

src/globals.h

@@ -106,6 +106,7 @@ EXTERN  INIT(   int     DefaultPrio, NO_PRIORITY);
 EXTERN  INIT(   int     SysTime, -1);
 EXTERN  INIT(   int     LocalSysTime, -1);
 EXTERN  INIT(   int     ParseUntriggered, 0);
+EXTERN  INIT(   int     LinksInTerminal, 0);
 
 EXTERN  char    const *InitialFile;
 EXTERN  char    const *LocalTimeZone;

src/init.c

@@ -519,6 +519,11 @@ void InitRemind(int argc, char const *argv[])
                         arg++;
                         continue;
                     }
+                    if (*arg == 'z' || *arg == 'Z') {
+                        LinksInTerminal = 1;
+                        arg++;
+                        continue;
+                    }
                     break;
                 }
                 if (weeks) {

tests/manpage-personal-dict

@@ -135,6 +135,7 @@ Emanuele
 EndSent
 EndSentIg
 EntrySize
+Esc
 Example2
 Expr
 ExpressionTimeLimit

tests/test-rem

@@ -36,7 +36,10 @@ CMP="../tests/test.cmp"
 TZ=UTC
 export TZ
 LANG=C.UTF-8
+export LANG
 LC_ALL=C.UTF-8
+export LC_ALL
+unset LC_PAPER
 
 # Check if "grep" accepts "-a" flag
 echo TEST | grep -a TEST > /dev/null 2>&1

tests/test.cmp

@@ -1046,7 +1046,7 @@ set a057 value("a05"+"6")
 "a05" + "6" => "a056"
 value("a056") => "SDFJHSDF KSJDFH KJSDFH KSJDFH"
 set a058 version()
-version() => "06.01.09"
+version() => "06.02.00"
 set a059 wkday(today())
 today() => 1991-02-16
 wkday(1991-02-16) => "Saturday"
@@ -2609,7 +2609,7 @@ a056  "SDFJHSDF KSJDFH KJSDFH KSJDFH"
 a007  "1991-02-16"
 a057  "SDFJHSDF KSJDFH KJSDFH KSJDFH"
 a008  "11:44"
-a058  "06.01.09"
+a058  "06.02.00"
 a059  "Saturday"
 a010  12
 a060  6
@@ -5042,7 +5042,7 @@ set a 7 * "Cabbage! "
 set pqxya 1+2)
 1+2)
    ^-- here
-../tests/test.rem(1014): Expecting end-of-expression
+../tests/test.rem(1014): Expecting operator or end-of-expression
 
 # Should result in an error
 REM Tue OMIT 2024-01-01 MSG Wookie
@@ -5563,8 +5563,8 @@ REM SATISFY ""
 REM SATISFY [version() > "01.00.00"]
 ../tests/test.rem(1074): SATISFY: expression has no reference to trigdate() or $T...
 ../tests/test.rem(1074): Trig = Saturday, 16 February, 1991
-version() => "06.01.09"
+version() => "06.02.00"
-"06.01.09" > "01.00.00" => 1
+"06.02.00" > "01.00.00" => 1
 ../tests/test.rem(1074): Trig(satisfied) = Saturday, 16 February, 1991
 REM SATISFY [max(x, max(x, 1, 2, 3), 4, 5, 6) * 5]
 ../tests/test.rem(1075): SATISFY: expression has no reference to trigdate() or $T...
@@ -16427,9 +16427,14 @@ eval("1/0") => 1 / 0 => Division by zero
 ../tests/test.rem(1590): `/': Division by zero
 Division by zero
 set a eval("1 / / 2")
-eval("1 / / 2") => ../tests/test.rem(1591): Illegal character `/'
+eval("1 / / 2") => ../tests/test.rem(1591): Expecting constant, variable, function call or (expression)
 1 / / 2
     ^-- here
+Expecting constant, variable, function call or (expression)
+set a eval("1 / # 2")
+eval("1 / # 2") => ../tests/test.rem(1592): Illegal character `#'
+1 / # 2
+    ^-- here
 Illegal character
 set a catch(eval("1 +"), 33)
 eval("1 +") => Unexpected end of line
@@ -16439,7 +16444,10 @@ eval("1/0") => 1 / 0 => Division by zero
 Division by zero
 catch(*Division by zero*, 34) => 34
 set a catch(eval("1 / / 2"), 35)
-eval("1 / / 2") => Illegal character
+eval("1 / / 2") => Expecting constant, variable, function call or (expression)
+catch(*Expecting constant, variable, function call or (expression)*, 35) => 35
+set a catch(eval("1 / # 2"), 35)
+eval("1 / # 2") => Illegal character
 catch(*Illegal character*, 35) => 35
 
 # Ensure RUN is disabled in eval
@@ -16447,7 +16455,7 @@ set a shell("echo foo")
 shell("echo foo") => "foo"
 set a eval("shell(\"echo foo\")")
 eval("shell(\"echo foo\")") => shell("echo foo") => RUN disabled
-../tests/test.rem(1598): shell(): RUN disabled
+../tests/test.rem(1600): shell(): RUN disabled
 RUN disabled
 set a shell("echo foo")
 shell("echo foo") => "foo"
@@ -16460,8 +16468,8 @@ Leaving UserFN i() => "foo"
 set a eval("i()")
 eval("i()") => Entering UserFN i()
 shell("echo foo") => RUN disabled
-../tests/test.rem(1603): shell(): RUN disabled
+../tests/test.rem(1605): shell(): RUN disabled
-    ../tests/test.rem(1601): [#0] In function `i'
+    ../tests/test.rem(1603): [#0] In function `i'
 Leaving UserFN i() => RUN disabled
 RUN disabled
 set a i()
@@ -16474,19 +16482,19 @@ set b eval(a)
 a => "eval(\"1\")+ shell(\"ls\")"
 eval("eval(\"1\")+ shell(\"ls\")") => eval("1") => 1
 shell("ls") => RUN disabled
-../tests/test.rem(1607): shell(): RUN disabled
+../tests/test.rem(1609): shell(): RUN disabled
 RUN disabled
 
 # "value" should use lazy evaluation
 set a value(4:33)
 value(04:33) => Type mismatch
-../tests/test.rem(1610): Type mismatch
+../tests/test.rem(1612): Type mismatch
 set a value('2020-01-01', 42)
 value(2020-01-01, ?) => Type mismatch
-../tests/test.rem(1611): Type mismatch
+../tests/test.rem(1613): Type mismatch
 set a value("nosuchvar")
 value("nosuchvar") => Undefined variable
-../tests/test.rem(1612): Undefined variable
+../tests/test.rem(1614): Undefined variable
 set a value("nosuchvar", 42)
 value("nosuchvar", 42) => 42
 set a value("a", 42)
@@ -16496,11 +16504,11 @@ value("a") => 42
 DEBUG -x
 
 DEBUG -e
-../tests/test.rem(1622): eval(): Too many recursive function calls
+../tests/test.rem(1624): eval(): Too many recursive function calls
 Base: 1991-02-09
 Base: 1991-02-09
-../tests/test.rem(1630): Expired
+../tests/test.rem(1632): Expired
-../tests/test.rem(1631): Expired
+../tests/test.rem(1633): Expired
 trigvalid = 1; trigdate = 1991-01-14
 trigvalid = 0; trigdate = 0
 daysinmon(2, 2000) => 29
@@ -16512,36 +16520,36 @@ daysinmon("Feb", 2001) => 28
 daysinmon("March", 2000) => 31
 daysinmon("March", 2001) => 31
 daysinmon("Cabbage", 2001) => Invalid month name
-../tests/test.rem(1658): daysinmon(): Invalid month name
+../tests/test.rem(1660): daysinmon(): Invalid month name
 daysinmon(2000-02-14) => 29
 daysinmon(2001-02-14) => 28
 daysinmon(2000-04-14) => 30
 daysinmon(2001-04-14) => 30
 date(2020, "April", 15) => 2020-04-15
 date(2020, "Carrot", 12) => Invalid month name
-../tests/test.rem(1666): date(): Invalid month name
+../tests/test.rem(1668): date(): Invalid month name
 datetime(2020, "April", 13, 04:44) => 2020-04-13@04:44
 datetime(2020, "April", 13, 4, 44) => 2020-04-13@04:44
 datetime(2020, "Lettuce", 13, 04:44) => Invalid month name
-../tests/test.rem(1669): datetime(): Invalid month name
+../tests/test.rem(1671): datetime(): Invalid month name
 datetime(2020, "Lettuce", 13, 4, 44) => Invalid month name
-../tests/test.rem(1670): datetime(): Invalid month name
+../tests/test.rem(1672): datetime(): Invalid month name
 wkdaynum("Tue") => 2
 wkdaynum("Wednesday") => 3
 wkdaynum("telephone") => Invalid weekday name
-../tests/test.rem(1674): wkdaynum(): Invalid weekday name
+../tests/test.rem(1676): wkdaynum(): Invalid weekday name
-../tests/test.rem(1685): Cannot modify system variable: `$NumTrig'
+../tests/test.rem(1687): Cannot modify system variable: `$NumTrig'
-../tests/test.rem(1686): POP-VARS without matching PUSH-VARS
+../tests/test.rem(1688): POP-VARS without matching PUSH-VARS
 
 FUNSET a
 FSET b(x, y) x*y
 FSET c() 33
 
 set a a(2)
-../tests/test.rem(1695): Undefined function: `a'
+../tests/test.rem(1697): Undefined function: `a'
 set a b(2)
 b(?) => Not enough arguments
-../tests/test.rem(1696): b(): Not enough arguments
+../tests/test.rem(1698): b(): Not enough arguments
 set a b(2, 3)
 Entering UserFN b(2, 3)
 x => 2
@@ -16563,7 +16571,7 @@ Entering UserFN a(2)
 Leaving UserFN a(2) => 42
 set a b(2)
 b(?) => Not enough arguments
-../tests/test.rem(1707): b(): Not enough arguments
+../tests/test.rem(1709): b(): Not enough arguments
 set a b(2, 3)
 Entering UserFN b(2, 3)
 x => 2
@@ -16578,10 +16586,10 @@ Leaving UserFN c() => 66
 POP-FUNCS
 
 set a a(2)
-../tests/test.rem(1713): Undefined function: `a'
+../tests/test.rem(1715): Undefined function: `a'
 set a b(2)
 b(?) => Not enough arguments
-../tests/test.rem(1714): b(): Not enough arguments
+../tests/test.rem(1716): b(): Not enough arguments
 set a b(2, 3)
 Entering UserFN b(2, 3)
 x => 2
@@ -16596,7 +16604,7 @@ DEBUG -xe
 Overridden: subst_colon subst_bang subst_question subst_at subst_hash
 bad => "ÿ"
 mbstrlen("ÿ") => Invalid multibyte sequence
-../tests/test.rem(1734): mbstrlen(): Invalid multibyte sequence
+../tests/test.rem(1736): mbstrlen(): Invalid multibyte sequence
 bad => "ÿ"
 strlen("ÿ") => 1
 faces => "🙂🙂🙂🙂🙂xyzçççéfoo"
@@ -16610,7 +16618,7 @@ index("🙂🙂🙂🙂🙂xyzçççéfoo", "ç") => 24
 bad => "ÿ"
 bad => "ÿ"
 mbindex("ÿ", "ÿ") => Invalid multibyte sequence
-../tests/test.rem(1742): mbindex(): Invalid multibyte sequence
+../tests/test.rem(1744): mbindex(): Invalid multibyte sequence
 faces => "🙂🙂🙂🙂🙂xyzçççéfoo"
 mbindex("🙂🙂🙂🙂🙂xyzçççéfoo", "ç", 11) => 11
 faces => "🙂🙂🙂🙂🙂xyzçççéfoo"
@@ -16629,10 +16637,10 @@ faces => "🙂🙂🙂🙂🙂xyzçççéfoo"
 mbsubstr("🙂🙂🙂🙂🙂xyzçççéfoo", 2, 9) => "🙂🙂🙂🙂xyzç"
 bad => "ÿ"
 mbsubstr("ÿ", 1) => Invalid multibyte sequence
-../tests/test.rem(1754): mbsubstr(): Invalid multibyte sequence
+../tests/test.rem(1756): mbsubstr(): Invalid multibyte sequence
 bad => "ÿ"
 mbsubstr("ÿ", 1, 20) => Invalid multibyte sequence
-../tests/test.rem(1755): mbsubstr(): Invalid multibyte sequence
+../tests/test.rem(1757): mbsubstr(): Invalid multibyte sequence
 faces => "🙂🙂🙂🙂🙂xyzçççéfoo"
 substr("🙂🙂🙂🙂🙂xyzçççéfoo", 2) => "Ÿ™‚🙂🙂🙂🙂xyzçççéfoo"
 faces => "🙂🙂🙂🙂🙂xyzçççéfoo"
@@ -16642,13 +16650,13 @@ codepoint("🙂🙂🙂🙂🙂xyzçççéfoo") => 128578
 mbchar(128578, 162, 122) => "🙂¢z"
 bad => "ÿ"
 codepoint("ÿ") => Invalid multibyte sequence
-../tests/test.rem(1762): codepoint(): Invalid multibyte sequence
+../tests/test.rem(1764): codepoint(): Invalid multibyte sequence
 codepoint("") => 0
 mbchar(0) => ""
 mbchar(0, 120) => Number too low
-../tests/test.rem(1765): mbchar(): Number too low
+../tests/test.rem(1767): mbchar(): Number too low
 mbchar(120, 0) => Number too low
-../tests/test.rem(1766): mbchar(): Number too low
+../tests/test.rem(1768): mbchar(): Number too low
 Variable hash table statistics:
   Entries: 100146; Buckets: 87719; Non-empty Buckets: 66303
   Maxlen: 5; Minlen: 0; Avglen: 1.142; Stddev: 0.878; Avg nonempty len: 1.510
@@ -16670,7 +16678,7 @@ Expression nodes high-water: 302076
     Expression nodes leaked: 0
      Parse level high-water: 34
 Max expr node evaluations per line: 2001
-Total expression node evaluations:  106464
+Total expression node evaluations:  106471
 
 Test 2
 
@@ -23708,7 +23716,7 @@ SECURITY: Won't read world-writable file or directory!
 Error reading include_dir/ww: Can't open file
 SECURITY: Won't read world-writable file or directory!
 Error reading include_dir/ww: No files matching *.rem
-06.01.09
+06.02.00
 Enabling test mode: This is meant for the acceptance test.
 Do not use --test in production.
 In test mode, the system time is fixed at 2025-01-06@19:00
@@ -23908,7 +23916,7 @@ Parsed expression: 2
   Unparsed: , 3
 2, 3
  ^-- here
-../tests/expr.rem(15): Expecting end-of-expression
+../tests/expr.rem(15): Expecting operator or end-of-expression
 Parsed expression: iif(0, "foo", 0, "bar", 1, "blech", 0, "quux", 1, "borhy", "wacka")
   => (Iif 0 "foo" 0 "bar" 1 "blech" 0 "quux" 1 "borhy" "wacka")
 iif(0, ?, 0, ?, 1, "blech", ?, ?, ?, ?, ?) => "blech"
@@ -25066,7 +25074,8 @@ TRANSLATE "TZ specified for non-timed reminder" ""
 TRANSLATE "C library does not support multibyte characters" ""
 TRANSLATE "Invalid multibyte sequence" ""
 TRANSLATE "Maximum expression complexity exceeded" ""
-TRANSLATE "Expecting end-of-expression" ""
+TRANSLATE "Expecting operator or end-of-expression" ""
+TRANSLATE "Expecting constant, variable, function call or (expression)" ""
 
 # Other Messages
 TRANSLATE "%s function `%s' defined at %s(%s) does not use its argument" ""

tests/test.rem

@@ -1589,9 +1589,11 @@ dump -c a
 set a eval("1 +")
 set a eval("1/0")
 set a eval("1 / / 2")
+set a eval("1 / # 2")
 set a catch(eval("1 +"), 33)
 set a catch(eval("1/0"), 34)
 set a catch(eval("1 / / 2"), 35)
+set a catch(eval("1 / # 2"), 35)
 
 # Ensure RUN is disabled in eval
 set a shell("echo foo")
@@ -1765,6 +1767,8 @@ set a mbchar(0)
 set a mbchar(0, 120)
 set a mbchar(120, 0)
 
+# Make sure trailing space doesn't cause a diagnostic.
+set a "foo"      
 DEBUG -x
 # Don't want Remind to queue reminders
 EXIT