Prep for 06.01.09 release.

Start adding support for window properties.

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.08.
+# Generated by GNU Autoconf 2.72 for remind 06.01.09.
 #
 #
 # 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.08'
-PACKAGE_STRING='remind 06.01.08'
+PACKAGE_VERSION='06.01.09'
+PACKAGE_STRING='remind 06.01.09'
 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.08 to adapt to many kinds of systems.
+'configure' configures remind 06.01.09 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.08:";;
+     short | recursive ) echo "Configuration of remind 06.01.09:";;
    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.08
+remind configure 06.01.09
 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.08, which was
+It was created by remind $as_me 06.01.09, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4231,6 +4231,7 @@ U="`uname -s`"
 if test "$U" != "SunOS" -a "$GCC" = yes; then
    	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
         # Check for link-time optimization support
+        OLDCFLAGS="$CFLAGS"
         CFLAGS="$CFLAGS -flto=auto"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -flto=auto" >&5
 printf %s "checking whether $CC supports -flto=auto... " >&6; }
@@ -4258,11 +4259,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lto" >&5
 printf "%s\n" "$lto" >&6; }
         if test "x$lto" != "xyes" ; then
-	    CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
+	    CFLAGS="$OLDCFLAGS"
         else
             { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -ffat-lto-object" >&5
 printf %s "checking whether $CC supports -ffat-lto-object... " >&6; }
-            CFLAGS="$CFLAGS -ffat-lto-objects"
+            OLDCFLAGS="$CFLAGS"
+            CFLAGS="$CFLAGS -Werror -ffat-lto-objects"
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int x = 1;
@@ -4287,7 +4289,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
             { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lto" >&5
 printf "%s\n" "$lto" >&6; }
             if test "x$lto" != "xyes" ; then
-                CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes -flto=auto"
+                CFLAGS="$OLDCFLAGS"
+            else
+                CFLAGS="$OLDCFLAGS -ffat-lto-objects"
             fi
         fi
 fi
@@ -4895,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.08, which was
+This file was extended by remind $as_me 06.01.09, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4960,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.08
+remind config.status 06.01.09
 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.08, , , https://dianne.skoll.ca/projects/remind/)
+AC_INIT(remind, 06.01.09, , , https://dianne.skoll.ca/projects/remind/)
 AC_CONFIG_SRCDIR([src/queue.c])
 
 cat <<'EOF'
@@ -50,6 +50,7 @@ U="`uname -s`"
 if test "$U" != "SunOS" -a "$GCC" = yes; then
    	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
         # Check for link-time optimization support
+        OLDCFLAGS="$CFLAGS"
         CFLAGS="$CFLAGS -flto=auto"
         AC_MSG_CHECKING([whether $CC supports -flto=auto])
         AC_LINK_IFELSE(
@@ -61,10 +62,11 @@ if test "$U" != "SunOS" -a "$GCC" = yes; then
                )
         AC_MSG_RESULT([$lto])
         if test "x$lto" != "xyes" ; then
-	    CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
+	    CFLAGS="$OLDCFLAGS"
         else
             AC_MSG_CHECKING([whether $CC supports -ffat-lto-object])
-            CFLAGS="$CFLAGS -ffat-lto-objects"
+            OLDCFLAGS="$CFLAGS"
+            CFLAGS="$CFLAGS -Werror -ffat-lto-objects"
             AC_LINK_IFELSE(
                 [AC_LANG_PROGRAM(
                     [[int x = 1;]],
@@ -74,7 +76,9 @@ if test "$U" != "SunOS" -a "$GCC" = yes; then
                 )
             AC_MSG_RESULT([$lto])
             if test "x$lto" != "xyes" ; then
-                CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes -flto=auto"
+                CFLAGS="$OLDCFLAGS"
+            else
+                CFLAGS="$OLDCFLAGS -ffat-lto-objects"
             fi
         fi
 fi

docs/WHATSNEW

@@ -1,5 +1,22 @@
 CHANGES TO REMIND
 
+* VERSION 06.01.09 - 2025-11-??
+
+- 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"
+  dialog box, it is marked as non-editable by TkRemind.
+
+- 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
+  after an expression.
+
 * VERSION 06.01.08 - 2025-10-27
 
 - BUG FIXES: tkremind: Fix many bugs with modal dialogs: Clicking too fast

man/tkremind.1.in

@@ -71,6 +71,17 @@ year.  Once you've done this, click \fBGo\fR to go to the date, or
 
 To exit \fBTkRemind\fR, click \fBQuit\fR.
 
+.SH CHANGING THE VIEW
+By default, \fBTkRemind\fR shows the calendar for an entire month.
+The \fBView...\fR menu lets you pick from the following choices: Display
+an entire month, or display one, two or four weeks' worth of reminders.
+If you change the view, \fBTkRemind\fR remembers the change and that
+view becomes the default view next time you start \fBTkRemind\fR
+
+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.
+
 .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
@@ -127,6 +138,10 @@ reminder you entered using the \fBAdd Reminder...\fR dialog.  You can
 edit the reminder, thereby gaining access to advanced features of
 \fBRemind\fR.  You can also use it simply to play around and discover
 \fBRemind\fR's idioms for expressing different types of reminders.
+.PP
+\fBNOTE\fR: If you hand-edit a reminder, then that reminder will
+\fInot\fR be editable in TkRemind's graphical reminder dialog any more.
+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
@@ -187,13 +202,11 @@ reminder entirely by selecting \fBDelete reminder\fR.  The remaining
 buttons, \fBPreview reminder\fR and \fBCancel\fR operate identically
 to the dialog in "ADDING REMINDERS."
 
-Note that if you edit a reminder (using \fBPreview reminder\fR),
-any edits you made are \fInot\fR retained in the dialog box.  You
-should not attempt to edit such reminders; you have to retype them
-in the \fBPreview reminder\fR dialog.
-
-If the reminder was not created with \fBTkRemind\fR, you can't edit
-it with \fBTkRemind\fR.
+Note that if you have hand-edited a reminder (using \fBPreview
+reminder\fR), or if the reminder was hand-created in the first place,
+then clicking on it will \fInot\fR pop up the TkRemind
+reminder-editing dialog.  Instead, TkRemind will start up a text
+editor (if you have configured one) so you can hand-edit the reminder.
 
 .SH USING A TEXT EDITOR
 

src/err.h

@@ -137,6 +137,7 @@
 #define E_NO_MB             113
 #define E_BAD_MB_SEQ        114
 #define E_EXPR_NODES_EXCEEDED 115
+#define E_EXPECTING_EOXPR   116
 #ifdef MK_GLOBALS
 #undef EXTERN
 #define EXTERN
@@ -270,6 +271,7 @@ 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",
 }
 #endif /* MK_GLOBALS */
 ;

src/expr.c

@@ -2759,9 +2759,21 @@ expr_node *parse_expression(char const **e, int *r, Var *locals)
             print_expr_tree(node, ErrFp);
             fprintf(ErrFp, "\n");
         }
-        if (**e && (**e != ']')) {
+        orig = o2;
+    }
+    if (**e && (**e != ']')) {
+        if (DebugFlag & DB_PARSE_EXPR) {
             fprintf(ErrFp, "  Unparsed: %s\n", *e);
         }
+        if (*r == OK) {
+            *r = E_EXPECTING_EOXPR;
+        }
+    }
+    if (*r != OK) {
+        if (node) {
+            free_expr_tree(node);
+            node = NULL;
+        }
     }
     if (!SuppressErrorOutputInCatch) {
         if (*r == E_EXPECT_COMMA     ||
@@ -2771,6 +2783,7 @@ expr_node *parse_expression(char const **e, int *r, Var *locals)
             *r == E_2FEW_ARGS        ||
             *r == E_PARSE_ERR        ||
             *r == E_EOLN             ||
+            *r == E_EXPECTING_EOXPR  ||
             *r == E_BAD_NUMBER       ||
             *r == E_BAD_DATE         ||
             *r == E_BAD_TIME         ||

src/funcs.c

@@ -34,8 +34,10 @@
 #endif
 
 #ifdef HAVE_SYS_TERMIOS_H
+#ifdef __sun
 #include <sys/termios.h>
 #endif
+#endif
 
 #include <ctype.h>
 #include <math.h>

src/init.c

@@ -36,8 +36,10 @@
 #endif
 
 #ifdef HAVE_SYS_TERMIOS_H
+#ifdef __sun
 #include <sys/termios.h>
 #endif
+#endif
 
 
 #include "types.h"

tests/manpage-personal-dict

@@ -304,6 +304,8 @@ Pango
 ParseUntriggered
 Paulo
 Pelzl
+PgDn
+PgUp
 Philipp
 Pinard
 Plaser

tests/test-rem

@@ -27,12 +27,16 @@ if test `id -u` = 0 ; then
     exit 1
 fi
 
-REMIND="../src/remind --flush -q"
+REMIND_CMD=${REMIND_CMD:-../src/remind}
+REM2PS=${REM2PS:-../src/rem2ps}
+REMIND="$REMIND_CMD --flush -q"
 OUT="../tests/test.out"
 CMP="../tests/test.cmp"
 # Set a known timezone so moon phases show up in predictable places
 TZ=UTC
 export TZ
+LANG=C.UTF-8
+LC_ALL=C.UTF-8
 
 # Check if "grep" accepts "-a" flag
 echo TEST | grep -a TEST > /dev/null 2>&1
@@ -189,8 +193,8 @@ rm -f ../tests/purge_dir/*.rem.purged >> $OUT 2>&1
 
 $REMIND ../tests/runtest.rem >> $OUT 2>&1
 
-$REMIND -p ../tests/shade.rem 1 August 2009 | ../src/rem2ps -e -l -c3 >> $OUT 2>&1
-$REMIND -pp ../tests/shade.rem 1 August 2009 | ../src/rem2ps -e -l -c3 >> $OUT 2>&1
+$REMIND -p ../tests/shade.rem 1 August 2009 | "$REM2PS" -e -l -c3 >> $OUT 2>&1
+$REMIND -pp ../tests/shade.rem 1 August 2009 | "$REM2PS" -e -l -c3 >> $OUT 2>&1
 
 TZ=America/Toronto $REMIND ../tests/sunmoon.rem 1 Jan 2011 >> $OUT 2>&1
 
@@ -507,8 +511,8 @@ $REMIND --version >> $OUT 2>&1
 # Test queueing.  Because eventstart depends on the actual system
 # date, we use the --test flag to fake the date and time.
 # We can't use $REMIND here because it includes the -q flag.
-echo JSONQUEUE | ../src/remind --flush --test -z0 ../tests/queue1.rem >> $OUT 2>&1
-echo QUEUE     | ../src/remind --flush --test -zj ../tests/queue1.rem >> $OUT 2>&1
+echo JSONQUEUE | "$REMIND_CMD" --flush --test -z0 ../tests/queue1.rem >> $OUT 2>&1
+echo QUEUE     | "$REMIND_CMD" --flush --test -zj ../tests/queue1.rem >> $OUT 2>&1
 
 # Test for leap year bug that was fixed
 $REMIND -dte - 28 Feb 2024 <<'EOF' >> $OUT 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.08"
+version() => "06.01.09"
 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.08"
+a058  "06.01.09"
 a059  "Saturday"
 a010  12
 a060  6
@@ -5040,8 +5040,9 @@ set a 7 * "Cabbage! "
 
 # Should result in errors
 set pqxya 1+2)
-1 + 2 => 3
-../tests/test.rem(1014): Expecting end-of-line
+1+2)
+   ^-- here
+../tests/test.rem(1014): Expecting end-of-expression
 
 # Should result in an error
 REM Tue OMIT 2024-01-01 MSG Wookie
@@ -5562,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.08"
-"06.01.08" > "01.00.00" => 1
+version() => "06.01.09"
+"06.01.09" > "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...
@@ -16669,7 +16670,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:  106467
+Total expression node evaluations:  106464
 
 Test 2
 
@@ -23707,7 +23708,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.08
+06.01.09
 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
@@ -23905,7 +23906,9 @@ Parsed expression: 1||1
 Parsed expression: 2
   => 2
   Unparsed: , 3
-../tests/expr.rem(15): Expecting end-of-line
+2, 3
+ ^-- here
+../tests/expr.rem(15): Expecting 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"
@@ -23923,7 +23926,7 @@ max(6, 9, 50) => 50
 Parsed expression: max(1,
   => Error: Illegal character
   Unparsed: ,1)
-,1)
+max(1,,1)
       ^-- here
 Parsed expression: 5%0
   => (% 5 0)
@@ -24284,7 +24287,7 @@ Expression nodes high-water: 499
     Expression nodes leaked: 0
      Parse level high-water: 2001
 Max expr node evaluations per line: 499
-Total expression node evaluations:  632
+Total expression node evaluations:  631
 -stdin-(14): Unmatched PUSH-OMIT-CONTEXT at -stdin-(7)
 -stdin-(14): Warning: PUSH-OMIT-CONTEXT without matching POP-OMIT-CONTEXT
 No reminders.
@@ -25063,6 +25066,7 @@ 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" ""
 
 # Other Messages
 TRANSLATE "%s function `%s' defined at %s(%s) does not use its argument" ""