Document release date.

~N/~~N forms of "back"

.gitattributes

@@ -1,4 +1,5 @@
 .gitignore		export-ignore
 .gitattributes		export-ignore
 remind.php		export-ignore
-sync-to-dianne-git	export-ignore
+sync-to-dianne-git	export-ignore
+php                     export-ignore

Makefile

@@ -20,10 +20,10 @@ install:
 	@echo ""
 	@$(MAKE) -C src install
 	@$(MAKE) -C rem2html install
-	@$(MAKE) -C rem2pdf -f Makefile.top install
+	@$(MAKE) -C rem2pdf -f Makefile.top install INSTALL_BASE=$(INSTALL_BASE)
 clean:
 	find . -name '*~' -exec rm {} \;
-	$(MAKE) -C src clean
+	-$(MAKE) -C src clean
 	-$(MAKE) -C rem2pdf clean
 
 test:

configure

@@ -622,6 +622,7 @@ ac_includes_default="\
 ac_header_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+PERLARTIFACTS
 VERSION
 EGREP
 GREP
@@ -681,6 +682,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_perl_build_artifacts
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1305,6 +1307,13 @@ if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-perl-build-artifacts
+                          Disable perllocal.pod and .packlist generation
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -2292,6 +2301,16 @@ EOF
 ac_config_headers="$ac_config_headers src/config.h"
 
 
+# Check whether --enable-perl-build-artifacts was given.
+if test "${enable_perl_build_artifacts+set}" = set; then :
+  enableval=$enable_perl_build_artifacts; ac_cv_perlartifacts=$enableval
+else
+  ac_cv_perlartifacts=yes
+fi
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3798,7 +3817,7 @@ _ACEOF
 
 
 
-for ac_header in sys/types.h sys/file.h glob.h wctype.h locale.h
+for ac_header in sys/types.h sys/file.h glob.h wctype.h locale.h langinfo.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -3957,6 +3976,12 @@ if test "$GCC" = yes; then
 	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
 fi
 
+if test "$ac_cv_perlartifacts" = "yes" ; then
+    PERLARTIFACTS=
+else
+    PERLARTIFACTS='NO_PACKLIST=1 NO_PERLLOCAL=1'
+fi
+
 for ac_func in setenv unsetenv glob mbstowcs setlocale initgroups
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -3969,7 +3994,8 @@ _ACEOF
 fi
 done
 
-VERSION=03.04.00
+VERSION=03.04.02
+
 
 
 ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h rem2html/Makefile rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf"

configure.in

@@ -14,6 +14,12 @@ EOF
 
 AC_CONFIG_HEADER(src/config.h)
 
+AC_ARG_ENABLE(perl-build-artifacts,
+[  --disable-perl-build-artifacts
+                          Disable perllocal.pod and .packlist generation], ac_cv_perlartifacts=$enableval, ac_cv_perlartifacts=yes)
+
+AH_BOTTOM([#include <custom.h>])
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -31,7 +37,7 @@ AC_CHECK_SIZEOF(unsigned int)
 AC_CHECK_SIZEOF(unsigned long)
 
 dnl Checks for header files.
-AC_CHECK_HEADERS(sys/types.h sys/file.h glob.h wctype.h locale.h)
+AC_CHECK_HEADERS(sys/types.h sys/file.h glob.h wctype.h locale.h langinfo.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_STRUCT_TM
@@ -44,9 +50,16 @@ if test "$GCC" = yes; then
 	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
 fi
 
+if test "$ac_cv_perlartifacts" = "yes" ; then
+    PERLARTIFACTS=
+else
+    PERLARTIFACTS='NO_PACKLIST=1 NO_PERLLOCAL=1'
+fi
+
 AC_CHECK_FUNCS(setenv unsetenv glob mbstowcs setlocale initgroups)
-VERSION=03.04.00
+VERSION=03.04.02
 AC_SUBST(VERSION)
 AC_SUBST(PERL)
+AC_SUBST(PERLARTIFACTS)
 AC_OUTPUT(src/Makefile www/Makefile src/version.h rem2html/Makefile rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf)
 chmod a+x rem2pdf/bin/rem2pdf

contrib/remind-conf-mode/remind-conf-mode.el

@@ -5,7 +5,7 @@
 ;; Author: Shelagh Manton <shelagh.manton@gmail.com> with help from
 ;; Dianne Skoll
 ;; Keywords: remind configure convenience
-;; Version: 0.14
+;; Version: 0.15
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License
@@ -111,12 +111,18 @@
 
 (defconst remind-keywords
   (sort
-   (list "RUN" "REM" "ONCE" "SATISFY" "BEFORE" "UNSET" "OMIT" "FIRST" "SATISFY"
+   (list "ADDOMIT" "AFTER" "AT" "BANNER" "BEFORE"
-	 "OMIT" "DATE" "SKIP" "ONCE" "AFTER" "WARN" "PRIORITY" "AT" "SCHED" "IF" "ELSE" "ENDIF"
+         "CAL" "CLEAR-OMIT-CONTEXT" "DEBUG" "DO" "DUMPVARS"
-	 "WARN" "UNTIL" "THROUGH" "SCANFROM" "DURATION" "TAG" "MSG" "MSF" "CAL" "SPECIAL" "IFTRIG"
+         "DURATION" "ELSE" "ENDIF" "ERRMSG" "EXIT" "FIRST"
-	 "PS" "PSFILE" "BANNER" "INCLUDE" "PUSH-OMIT-CONTEXT" "DEBUG" "DUMPVARS" "PUSH" "CLEAR" "POP"
+         "FLUSH" "FOURTH" "FROM" "FSET" "IF" "IFTRIG" "IN"
-	 "CLEAR-OMIT-CONTEXT" "POP-OMIT-CONTEXT"  "SET" "ERRMSG" "FSET" "DUMP" "BAN" "INC" "SCAN"
+         "INCLUDE" "INCLUDECMD" "LAST" "LASTDAY"
-	 "EXIT" "FLUSH" "PRESERVE" "MOON" "COLOR" "UNSET")
+         "LASTWORKDAY" "MAYBE-UNCOMPUTABLE" "MSF"
+         "MSG" "OMIT" "OMITFUNC" "ONCE"
+         "POP-OMIT-CONTEXT" "PRESERVE" "PRIORITY" "PS" "PSFILE"
+         "PUSH-OMIT-CONTEXT" "REM" "RUN" "SATISFY" "SCANFROM"
+         "SCHED" "SECOND" "SET" "SKIP" "SPECIAL"
+         "TAG" "THIRD" "THROUGH" "UNSET" "UNTIL"
+         "WARN")
    #'(lambda (a b) (> (length a) (length b)))))
 
 
@@ -127,12 +133,20 @@
 
 (defconst remind-builtin-variables
   (sort
-   (list "$CalcUTC" "$CalMode" "$Daemon" "$DateSep" "$DefaultPrio" "$DontFork" "$DontTrigAts" "$DontQueue"
+   (list "$April" "$August" "$CalcUTC" "$CalMode" "$Daemon" "$DateSep"
-	 "$EndSent" "$EndSentIg" "$NumTrig" "$FirstIndent" "$FoldYear" "$FormWidth" "$HushMode"
+         "$DateTimeSep" "$December" "$DefaultColor" "$DefaultPrio"
-	 "$IgnoreOnce" "$InfDelta" "$NextMode" "$NumQueued" "$NumTrig" "$PrefixLineNo" "$PSCal" "$RunOff"
+         "$DefaultTDelta" "$DeltaOffset" "$DontFork" "$DontQueue"
-	 "$SimpleCal" "$SortByDate" "$SortByPrio" "$MinsFromUTC" "$LatDeg" "$LatMin" "$LatSec" "$EndSent"
+         "$DontTrigAts" "$EndSent" "$EndSentIg" "$February" "$FirstIndent"
-	 "$EndSentIg" "$Location" "$LongDeg" "$LongMin" "$LongSec" "$MaxSatIter" "$SubsIndent" "$T" "$Td"
+         "$FoldYear" "$FormWidth" "$Friday" "$HushMode" "$IgnoreOnce"
-	 "$Tm" "$Tw" "$Ty" "$TimeSep" "$UntimedFirst" "$U" "$Ud" "$Um" "$Uw" "$Uy")
+         "$InfDelta" "$IntMax" "$IntMin" "$January" "$July" "$June" "$LatDeg"
+         "$Latitude" "$LatMin" "$LatSec" "$Location" "$LongDeg" "$Longitude"
+         "$LongMin" "$LongSec" "$March" "$MaxSatIter" "$MaxStringLen" "$May"
+         "$MinsFromUTC" "$Monday" "$NextMode" "$November" "$NumQueued"
+         "$NumTrig" "$October" "$PrefixLineNo" "$PSCal" "$RunOff" "$Saturday"
+         "$September" "$SimpleCal" "$SortByDate" "$SortByPrio" "$SortByTime"
+         "$SubsIndent" "$Sunday" "$T" "$Td" "$Thursday" "$TimeSep" "$Tm"
+         "$Tuesday" "$Tw" "$Ty" "$U" "$Ud" "$Um" "$UntimedFirst" "$Uw" "$Uy"
+         "$Wednesday")
    #'(lambda (a b) (> (length a) (length b)))))
 
 
@@ -147,15 +161,22 @@
 
 (defconst remind-builtin-functions
   (sort
-   (list "abs" "access" "args" "asc" "baseyr" "char" "choose" "coerce" "current" "date" "datetime" "datepart" 
+   (list "abs" "access" "adawn" "adusk" "ampm" "args" "asc" "baseyr" "char"
-	 "dawn" "day" "daysinmon" "defined" "dosubst" "dusk" "easter" "easterdate" "evaltrig" "filedate" 
+         "choose" "coerce" "current" "date" "datepart" "datetime" "dawn" "day"
-	 "filedatetime" "filedir" "filename" "getenv" "hebdate" "hebday" "hebmon" "hebyear" "hour" "iif" "index" "isdst" 
+         "daysinmon" "defined" "dosubst" "dusk" "easterdate" "evaltrig"
-	 "isleap" "isomitted" "language" "lower" "max" "min" "minute" "minsfromutc" "mon" "monnum" "moondate" "moondatetime"
+         "filedate" "filedatetime" "filedir" "filename" "getenv" "hebdate"
-	 "moonphase" "moontime" "msgprefix" "msgsuffix" "nonomitted" "now" "ord" "ostype" "plural" 
+         "hebday" "hebmon" "hebyear" "hour" "iif" "index" "isany" "isdst"
-	 "psmoon" "psshade" "realcurrent" "realnow" "realtoday" "sgn" "shell" "slide" "strlen" "substr" "sunrise" "sunset" "time" "timepart" 
+         "isleap" "isomitted" "language" "lower" "max" "min" "minsfromutc"
-	 "thisyear" "today" "trigdate" "trigdatetime" "trigger" "trigger" "trigtime" "trigvalid" "typeof" "tzconvert" "upper" "value" 
+         "minute" "mon" "monnum" "moondate" "moondatetime" "moonphase"
-	 "version" "weekno" "wkday" "wkdaynum" "year"
+         "moontime" "ndawn" "ndusk" "nonomitted" "now" "ord" "ostype" "plural"
-	 )
+         "psmoon" "psshade" "realcurrent" "realnow" "realtoday" "sgn" "shell"
+         "shellescape" "slide" "strlen" "substr" "sunrise" "sunset" "time"
+         "timepart" "today" "trig" "trigback" "trigdate" "trigdatetime"
+         "trigdelta" "trigduration" "trigeventduration" "trigeventstart"
+         "trigfrom" "trigger" "trigpriority" "trigrep" "trigscanfrom"
+         "trigtime" "trigtimedelta" "trigtimerep" "triguntil" "trigvalid"
+         "typeof" "tzconvert" "upper" "value" "version" "weekno" "wkday"
+         "wkdaynum" "year")
    #'(lambda (a b) (> (length a) (length b)))))
 
 ;;; faces
@@ -244,12 +265,35 @@
 :group 'remind-conf
 )
 
+(defconst remind-keywords-regex (regexp-opt remind-keywords 'words))
+(defconst remind-type-keywords-regex (regexp-opt remind-type-keywords 'words))
+(defconst remind-builtin-variables-regex (regexp-opt remind-builtin-variables 'words))
+(defconst remind-builtin-functions-regex (regexp-opt remind-builtin-functions 'words))
+(defconst remind-time-words-regex (regexp-opt remind-time-words 'words))
+
+;; Case-insensitive matching functions
+(defun remind-keywords-matcher (limit)
+  (let ((case-fold-search t))
+    (re-search-forward remind-keywords-regex limit 'no-error)))
+(defun remind-type-keywords-matcher (limit)
+  (let ((case-fold-search t))
+    (re-search-forward remind-type-keywords-regex limit 'no-error)))
+(defun remind-builtin-variables-matcher (limit)
+  (let ((case-fold-search t))
+    (re-search-forward remind-builtin-variables-regex limit 'no-error)))
+(defun remind-builtin-functions-matcher (limit)
+  (let ((case-fold-search t))
+    (re-search-forward remind-builtin-functions-regex limit 'no-error)))
+(defun remind-time-words-matcher (limit)
+  (let ((case-fold-search t))
+    (re-search-forward remind-time-words-regex limit 'no-error)))
+
 ;; keywords
 
 (defconst remind-conf-font-lock-keywords-1
   (list
    '("^[\;\#]\\s-+.*$" . remind-comment-face)
-   (cons (regexp-opt remind-keywords 'words) remind-conf-keyword-face)
+   '(remind-keywords-matcher . remind-conf-keyword-face)
    '("%[\"_]" . font-lock-warning-face)
    '("\\(%[a-mops-w]\\)" . remind-conf-substitutes-face)
    '("\"[^\"]*\"" . remind-string-face))
@@ -258,15 +302,15 @@
 (defconst remind-conf-font-lock-keywords-2
   (append remind-conf-font-lock-keywords-1
 	  (list
-	   (cons (regexp-opt remind-time-words 'words) remind-time-face)
+           '(remind-time-words-matcher . remind-time-face)
-	   (cons (regexp-opt remind-builtin-functions 'words) remind-conf-command-face)
+           '(remind-builtin-functions-matcher . remind-conf-command-face)
 	   '("%$" . remind-conf-endline-face)))
   "Additional commands to highlight in `remind-conf-mode'.")
 
 (defconst remind-conf-font-lock-keywords-3
   (append remind-conf-font-lock-keywords-2
 	  (list
-	   (cons (regexp-opt remind-type-keywords 'words) remind-conf-type-face)
+           '(remind-type-keywords-matcher . remind-conf-type-face)
 	   '("\[[a-zA-Z]\\{3,6\\}\]" . remind-conf-color-face)
 	   '("\\s-+\\([12][0-9]\\|3[01]\\|0?[0-9]\\)\\s-+" . remind-conf-substitutes-face);better date regexp
 	   '("\\s-+\\([12][09][0-9][0-9][-/]\\(0[1-9]\\|1[0-2]\\)[-/]\\([12][0-9]\\|0[1-9]\\|3[01]\\)\\)\\s-+" . remind-time-face) ;; pseudo ISO 8601 date format.
@@ -274,7 +318,7 @@
 	   '("\\s-+\\(\\(?:20\\|19\\)[0-9][0-9]\\)\\s-+" . remind-conf-substitutes-face);years
 	   '("\\s-+\\(2[0-4]\\|[01]?[0-9][.:][0-5][0-9]\\)\\s-+" . remind-conf-substitutes-face);24hour clock, more precise
 	   '("\\s-+\\([+-][+-]?[1-9][0-9]*\\)\\s-+" 1 remind-conf-delta-face prepend)
-	   (cons (regexp-opt remind-builtin-variables 'words) remind-conf-variable-face)))
+           '(remind-builtin-variables-matcher . remind-conf-variable-face)))
   "The ultimate in highlighting experiences for `remind-conf-mode'.")
 
 ;;YYYY-MM-DD@hh:mm, YYYY-MM-DD@hh.mm, YYYY/MM/DD@hh:mm and YYYY/MM/DD@hh.mm
@@ -462,12 +506,11 @@ Acts on the region or places point where it needs to be."
 ;; finally the derived mode.
 
 ;;;###autoload
-(define-derived-mode remind-conf-mode text-mode "REM"
+(define-derived-mode remind-conf-mode text-mode "Remind Conf Mode"
   "Major mode for editing remind calendar configuration files.
 
 \\{remind-conf-mode-map}"
   :syntax-table remind-conf-syntax-table
-  (set (make-local-variable 'font-lock-keywords-case-fold-search) t) ;this is not working atm 2009-04-13
   (set (make-local-variable 'font-lock-defaults) '(remind-conf-font-lock-keywords))
   (set (make-local-variable 'comment-start) ";")
   (set (make-local-variable 'comment-start) "#")

docs/WHATSNEW

@@ -1,6 +1,111 @@
 CHANGES TO REMIND
 
-* VERSION 3.4 Patch 0 - 2022-??-??
+* VERSION 3.4 Patch 2 - 2022-03-14
+
+- NEW FEATURE: remind: Add syntactic sugar to simplify some common
+  types of reminders.  See "SYNTACTIC SUGAR FOR REM" in the remind
+  man page.  Based on suggestions from Ian! D. Allen.
+
+- CHANGE: examples/defs.rem: The examples file has been updated to use
+  the newer syntactic sugar.
+
+- CHANGE: remind: Always parse the body of REM statements to catch
+  expression errors.  In the past, something like:
+
+      REM 2025-01-02 MSG [1/0]
+
+  would not cause a division-by-zero error except on 2025-01-02.  Now,
+  the error is always caught.  NOTE POTENTIAL INCOMPATIBILITY: There may
+  be edge-cases when formerly-valid remind scripts now trigger errors.
+  However, this is pretty unlikely.
+
+- NEW FEATURE: remind: Add the "trig" function to allow more
+  expressiveness when creating triggers.  See man page for details.
+
+- IMPROVEMENT: tkremind: Tweak the calendar display; improve ability to
+  customize colors, including supplying two built-in themes.  Based on
+  patch and suggestion from Paulo (last name unknown).
+
+- IMPROVEMENT: tkremind: TkRemind handles errors in reminders scripts
+  much more unobtrusively.  Instead of popping up a modal dialog box
+  with almost-unreadable error output, it discreetly notifies you of
+  errors with a button that lets you view the specific error messages
+  in a more readable format.
+
+- IMPROVEMENT: examples/remind.vim: Update list of keywords in vim syntax
+  highlighting file.
+
+- IMPROVEMENT: contrib/remind-conf-mode: Update the list of keywords,
+  functions and variables in the Emacs syntax-highlighting file.  Also make
+  it match them case-insensitively.
+
+- CHANGE: remind: Increase $MaxSatIter default to 1000 instead of 150.
+  Computers are much faster than when I first wrote remind and they
+  can handle this higher limit easily.  The higher limit also enables
+  certain reasonable reminders that failed in the past because of the
+  low SATISFY iteration limit.
+
+- CHANGE: remind: The "||" operator now returns the value of the first
+  non-zero operand rather than just returning 1 or 0.  Similarly, "&&"
+  returns 0 if either operand is false or the value of the last
+  operand if both operands are true.
+
+     NOTE POTENTIAL INCOMPATIBILITY: Remind scripts that depend on ||
+     and && always returning exactly one of 1 or 0 may need
+     adjustment.
+
+- CHANGE: The || and && operators can accept any non-STRING type as long
+  as both operands have the same type.  The "false" values are defined
+  as follows; true values are any other value:
+
+     INT:      0
+     TIME:     00:00
+     DATE:     '1990-01-01'             (the Remind epoch)
+     DATETIME: '1990-01-01@00:00'       (the Remind epoch)
+
+- IMPROVEMENT: remind: Issue diagnostics if an UNTIL or THROUGH date
+  is earlier than any possible trigger date, as well as an UNTIL date
+  with a fully-specified date and no repeat ("*N").  Suggestion from
+  Ian! D. Allen.
+
+- BUG FIX: tkremind: If the same moon phase appeared twice in a month,
+  TkRemind would not display the first occurrence correctly.  This has
+  been fixed.
+
+- BUG FIX: rem2pdf: Fix typos in the man page.
+
+- BUG FIX: remind: The IF command documentation didn't reflect how it
+  actually worked; now it does.
+
+- BUG FIX: remind: Use correct UNTIL/THROUGH keyword in error message.
+
+- BUG FIX: rem2pdf: Correct the calculation that warns about an over-full
+  calendar box.  Problem noted by Jonathan Kamens.
+
+- BUG FIX: remind: The "remind -c" output would sometimes be incorrect if
+  scripts with double-wide characters were used.  This has been fixed.
+
+- BUG FIX: remind: The "remind -c" output would sometimes be incorrect
+  if right-to-left scripts were used in reminders.  This has been fixed.
+
+* VERSION 3.4 Patch 1 - 2022-02-23
+
+- MINOR IMPROVEMENT: Support the INSTALL_BASE environment variable for
+  installing rem2pdf in a non-standard location like your home directory.
+  This is passed in to rem2pdf's Makefile at build and install time.
+
+- MINOR IMPROVEMENT: ./configure: Add --disable-perl-build-artifacts flag
+  to avoid installation of perllocal.pod and .packlist files.
+
+- BUG FIX: tkremind: If the system date rolls over, update the display
+  to correctly highlight the current date.  This worked in older versions
+  of Remind, but was broken by 03.04.00.
+
+- BUG FIX: rem2pdf: The small calendar font would sometimes be scaled
+  incorrectly so the small calendar overflowed the box.  This has been
+  fixed.
+
+* VERSION 3.4 Patch 0 - 2022-02-10
 
 - MAJOR CHANGE: Remind and its helpers (except for rem2ps) fully support
   UTF-8.  If your system locale is a UTF-8 locale and your terminal
@@ -42,6 +147,9 @@ CHANGES TO REMIND
 
 - CLEANUP: remind: C source code: Remove various unused or obsolete macros.
 
+- BUG FIXES: Minor fixups to groff source and Makefiles courtesy of
+  Jochen Sprickerhof.
+
 - BUG FIX: Properly support formatting of double-wide characters in the
   terminal mode "remind -c" calendar.
 

examples/defs.rem

@@ -16,7 +16,7 @@
 #  "#PSSTUFF" for nifty PostScript examples				    #
 # 									    #
 # This file is part of REMIND.						    #
-# Copyright (C) 1992-2018 Dianne Skoll                                      #
+# Copyright (C) 1992-2022 Dianne Skoll                                      #
 # 									    #
 #############################################################################
 
@@ -25,63 +25,14 @@ RUN OFF
 ################################################
 # Ensure required version of remind is used... #
 ################################################
-IF version() < "03.01.10"
+IF version() < "03.04.02"
    ERRMSG This file requires at least version 03.01.10 of Remind.%
    ERRMSG This version is version [version()].
    EXIT
 ENDIF
 
-######################################
-# Symbolic constants for weekdays... #
-######################################
-SET Sunday    0
-SET Monday    1
-SET Tuesday   2
-SET Wednesday 3
-SET Thursday  4
-SET Friday    5
-SET Saturday  6
-
-SET Sun 0
-SET Mon 1
-SET Tue 2
-SET Wed 3
-SET Thu 4
-SET Fri 5
-SET Sat 6
-
-#########################################
-# Symbolic constants for month names... #
-#########################################
-
-SET Jan 1
-SET Feb 2
-SET Mar 3
-SET Apr 4
-SET May 5
-SET Jun 6
-SET Jul 7
-SET Aug 8
-SET Sep 9
-SET Oct 10
-SET Nov 11
-SET Dec 12
-
-SET January   1
-SET February  2
-SET March     3
-SET April     4
-SET May       5
-SET June      6
-SET July      7
-SET August    8
-SET September 9
-SET October   10
-SET November  11
-SET December  12
-
 ###########################################################
-# Other symbolic constants and functions for "pasting"... #
+# Symbolic constants and functions for "pasting"...       #
 ###########################################################
 SET Quote CHAR(34)
 
@@ -119,50 +70,23 @@ REM 1 MSG John's [_mo_num(11, 1984)] 'monthly' anniversary
 # Here's a tricky problem:  The 4th of July is a holiday in the U.S.
 # However, if it falls on a Saturday, the previous Friday is a holiday.
 # If it falls on a Sunday, the next Monday is a holiday.  Here's how
-# to do it.  NOTE that the following procedure makes the OMIT context
+# to do it.
-# dependent upon the current date.  SInce it only depends on the current
+#
-# year, which is not likely to change while producing a calendar, we
+# For those reminders that update the OMIT context with ADDOMIT, we use
-# are fairly safe.  However, reminders with huge DELTA or BACK components
+# SCANFROM -7 for safety; see the man page about moveable OMITs.
-# may not operate as expected.  In general, any time you make OMIT
-# dependent upon the current date, it's tricky and results may not be
-# what you expect.  You should try to make sure that the OMIT context
-# "near" any current reminders will not change during a calendar run.
-# The SCANFROM clause will make these OMITs safe.
 ############################################################################
 
-# Calculate the weekday of the holiday.
+# If it falls on a Saturday, bump to previous Friday
-REM 4 July SCANFROM -7 SATISFY 1
+REM 4 July OMIT SAT SCANFROM -1 BEFORE ADDOMIT SATISFY [$Td != 4] MSG Independence day (observed)
 
-SET iday $T
+# If it falls on a Sunday, bump to following Monday
-IF WKDAYNUM(iday) == Sat
+REM 4 July OMIT SUN SCANFROM -7 AFTER ADDOMIT SATISFY [$Td != 4] MSG Independence day (observed)
-	REM [iday] MSG Independence day (actual)
-	OMIT [iday-1] MSG Independence day (observed)
-ELSE
-	IF WKDAYNUM(iday) == Sun
-		REM [iday] MSG Independence day (actual)
-		OMIT [iday+1] MSG Independence day (observed)
-	ELSE
-		OMIT [iday] MSG Independence day
-	ENDIF
-ENDIF
 
-############################################################################
+# If it falls on Sat or Sun, note the actual day
-# A meeting on the first Monday of every month which is moved to the       #
+REM 4 July SATISFY [$Tw == 0 || $Tw == 6] MSG Independence day (actual)
-# second Monday in the event of a holiday.                                 #
-############################################################################
 
-# First, the normal meeting.  However, the SKIP keyword means this
+# Otherwise observed and actual is on the 4th
-# one won't be triggered if the first Monday is a holiday
+REM 4 July OMIT SAT SUN SKIP SCANFROM -7 ADDOMIT MSG Independence Day
-REM Mon 1 SKIP MSG Meeting
-
-# Now, calculate the "potential" delayed meeting
-REM Mon 8 SATISFY 1
-
-# But only actually trigger the delayed meeting if the previous
-# Monday was a holiday
-IF ISOMITTED($T-7)
-   REM [$T] MSG Delayed meeting
-ENDIF
 
 ##########################################################################
 #								         #
@@ -216,38 +140,38 @@ REM  [easter+49] MSG %"Pentecost%"
 # which ones are omitted - use the general forms shown below.  You'll
 # need the Week_n variables defined way up in the file.
 
-OMIT    Jan  1		MSG %"New Year's%" Day
+OMIT    Jan  1		MSG %"New Year's Day%"
-REM Mon Jan [Week_3]	MSG Martin Luther King - %"MLK Day%"
+REM Third Monday in Jan MSG Martin Luther King - %"MLK Day%"
 REM     Feb  2		MSG %"Ground Hog Day%"
-REM     Feb 14		MSG %"Valentine's%" Day
+REM     Feb 14		MSG %"Valentine's Day%"
-REM Mon Feb [Week_3]	SCANFROM -7 ADDOMIT MSG %"President's Day%"
+REM Third Monday in Feb SCANFROM -7 ADDOMIT MSG %"President's Day%"
-REM     Mar 17		MSG %"St. Patrick's%" Day
+REM     Mar 17		MSG %"St. Patrick's Day%"
 
 # The DST rules are accurate for most locations in
 # North America
 REM Sun Apr 1 ++2 UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST starts%" %b
 REM Sun Mar 8 ++2 FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST starts%" %b
 
-REM Sun [_last(Oct)] ++2 UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST ends%" %b
+REM Last Sunday in October ++2 UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST ends%" %b
-REM Sun 1 Nov ++2 FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST ends%" %b
+REM First Sunday in November ++2 FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST ends%" %b
 
 REM     Apr  1		MSG %"April Fool's%" Day
 REM Mon Tue Wed Thu Fri Sat 15 Apr MSG %"Income tax%" due
 REM     May  5		MSG %"Cinco de Mayo%"
-REM Sat May [Week_1]	MSG %"Kentucky Derby%"
+REM First Sat in May 	MSG %"Kentucky Derby%"
-REM Sun May [Week_2]	MSG %"Mother's Day%"
+REM Second Sun in May	MSG %"Mother's Day%"
-REM Sat May [Week_3]	MSG %"Armed Forces Day%"
+REM Third Sat in May	MSG %"Armed Forces Day%"
-REM Mon [_last(May)]	SCANFROM -7 ADDOMIT MSG %"Memorial Day%"
+REM Last Monday in May	SCANFROM -7 ADDOMIT MSG %"Memorial Day%"
 REM     Jun 14		MSG %"Flag Day%"
-REM Sun Jun [Week_3]	MSG %"Father's Day%"
+REM Third Sun in June	MSG %"Father's Day%"
-REM Mon Sep [Week_1]	SCANFROM -7 ADDOMIT MSG %"Labor Day%"
+REM First Mon in Sep	SCANFROM -7 ADDOMIT MSG %"Labor Day%"
-REM Mon Oct [Week_2]	MSG %"Columbus Day%"
+REM Second Mon in Oct	MSG %"Columbus Day%"
 REM     Nov 11		MSG %"Veterans Day%"
 
 REM     Oct 30		MSG %"Mischief Night%"
 REM     Oct 31		MSG %"Halloween%"
 REM Tue Nov  2 SCANFROM -7 SATISFY [($Ty % 4) == 0] MSG %"Election Day%"
-REM Thu Nov [Week_4]	SCANFROM -7 ADDOMIT MSG %"Thanksgiving Day%"
+REM Last Thu in Nov 	SCANFROM -7 ADDOMIT MSG %"Thanksgiving Day%"
 REM Fri Nov [Week_4+1]	SCANFROM -7 ADDOMIT MSG %"Thanksgiving (cont.)%"
 OMIT    Dec 24		MSG %"Christmas Eve%"
 OMIT    Dec 25		MSG %"Christmas%" Day
@@ -262,6 +186,24 @@ if $NumTrig > SaveTrig
 	REM SPECIAL SHADE 220
 endif
 
+############################################################################
+# A meeting on the first Monday of every month which is moved to the       #
+# second Monday in the event of a holiday.                                 #
+############################################################################
+
+# First, the normal meeting.  However, the SKIP keyword means this
+# one won't be triggered if the first Monday is a holiday
+REM First Monday SKIP MSG Meeting
+
+# Now, calculate the "potential" delayed meeting
+REM Second Monday SATISFY 1
+
+# But only actually trigger the delayed meeting if the previous
+# Monday was a holiday
+IF ISOMITTED($T-7)
+   REM [$T] MSG Delayed meeting
+ENDIF
+
 #PSSTUFF2
 ##########################################################################
 #									 #
@@ -278,10 +220,10 @@ REM PS Border Border moveto \
    ([hebday($U)] [hebmon($U)]) show
 
 # Fill in the phases of the moon on the PostScript calendar
-[moondate(0)] SPECIAL MOON 0
+REM [moondate(0)] SPECIAL MOON 0
-[moondate(1)] SPECIAL MOON 1
+REM [moondate(1)] SPECIAL MOON 1
-[moondate(2)] SPECIAL MOON 2
+REM [moondate(2)] SPECIAL MOON 2
-[moondate(3)] SPECIAL MOON 3
+REM [moondate(3)] SPECIAL MOON 3
 
 # The following example puts sunrise and sunset times in PostScript in the
 # calendar - the sizes are hard-coded, however, and work best in landscape.

examples/remind.vim

@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:	Remind
-" Maintainer:	Davide Alberani <alberanid@libero.it>
+" Maintainer:	Davide Alberani <da@erlug.linux.it>
-" Last Change:	18 Sep 2009
+" Last Change:	02 Nov 2015 + 13 Mar 2021 by Dianne Skoll <dianne@skoll.ca>
-" Version:	0.5
+" Version:	0.7+dianne1
-" URL:		http://erlug.linux.it/~da/vim/syntax/remind.vim
+" URL:		http://ismito.it/vim/syntax/remind.vim
 "
 " remind is a sophisticated reminder service
 " you can download remind from:
@@ -23,7 +23,7 @@ syn keyword remindExpiry	UNTIL FROM SCANFROM SCAN WARN SCHED THROUGH
 syn keyword remindTag		PRIORITY TAG
 syn keyword remindTimed		AT DURATION
 syn keyword remindMove		ONCE SKIP BEFORE AFTER
-syn keyword remindSpecial	INCLUDE INC BANNER PUSH-OMIT-CONTEXT PUSH CLEAR-OMIT-CONTEXT CLEAR POP-OMIT-CONTEXT POP COLOR COLOUR
+syn keyword remindSpecial	INCLUDE INC BANNER PUSH-OMIT-CONTEXT PUSH CLEAR-OMIT-CONTEXT CLEAR POP-OMIT-CONTEXT POP COLOR COLOUR DO
 syn keyword remindRun		MSG MSF RUN CAL SATISFY SPECIAL PS PSFILE SHADE MOON
 syn keyword remindConditional	IF ELSE ENDIF IFTRIG
 syn keyword remindDebug		DEBUG DUMPVARS DUMP ERRMSG FLUSH PRESERVE

man/remind.1

@@ -70,7 +70,10 @@ on terminals that emulate the VT00 line-drawing character set.
 .B 'u'
 is similar to 'l', but causes \fBRemind\fR to use UNICODE line-drawing
 characters to draw the calendar.  The characters are hard-coded and will
-only work on terminals that are set to UTF-8 character encoding.
+only work on terminals that are set to UTF-8 character encoding.  This
+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 'c'
 causes \fBRemind\fR to use VT100 escape sequences to approximate
@@ -267,7 +270,7 @@ calendar output.
 .TP
 \fB\-x\fR[\fIn\fR]
 Sets the iteration limit for the \fBSATISFY\fR clause of a \fBREM\fR
-command.  Defaults to 150.
+command.  Defaults to 1000.
 .TP
 \fB\-k\fR\fIcmd\fR
 Instead of simply printing \fBMSG\fR-type
@@ -814,7 +817,8 @@ could be specified as:
 However, events that do not repeat daily, weekly, monthly or yearly require
 another approach.  The \fIrepeat\fR component of the \fBREM\fR command
 fills this need.  To use it, you must completely specify a date (year, month
-and day, and optionally weekday.)  The \fIrepeat\fR component is an asterisk
+and day, and optionally weekday); this is the start date of the
+repetition period.  The \fIrepeat\fR component is an asterisk
 followed by a number specifying the repetition period in days.
 .PP
 For example, suppose you get paid every second Wednesday, and your
@@ -824,12 +828,12 @@ last payday was Wednesday, 28 October, 1992.  You can use:
 	REM 28 Oct 1992 *14 MSG Payday
 .fi
 .PP
-This issues the reminder every 14 days, starting from the calculated trigger
+This issues the reminder every 14 days, starting from 28 Oct 1992.
-date.  You can use \fIdelta\fR and \fIback\fR with \fIrepeat.\fR  Note,
+You can use \fIdelta\fR and \fIback\fR with \fIrepeat.\fR  Note,
-however, that the \fIback\fR is used only to compute the initial
+however, that the \fIback\fR is used only to compute the starting
-trigger date; thereafter, the reminder repeats with the specified
+date; thereafter, the reminder repeats with the specified
 period.  Similarly, if you specify a weekday, it is used only to calculate
-the initial date, and does not affect the repetition period.
+the starting date, and does not affect the repetition period.
 .PP
 .B SCANFROM \fRand\fB FROM
 .PP
@@ -1152,6 +1156,84 @@ Note that \fIduration\fR is specified either in hours and minutes as a
 duration of 00:00 or 0, then \fBRemind\fR behaves exactly as if no
 \fBDURATION\fR at all had been present.
 
+.PP
+.SH SYNTACTIC SUGAR FOR REM
+.PP
+The REM command has syntactic sugar to let you express common
+reminders.  The following pairs of reminders are equivalent:
+.PP
+.nf
+    REM First Monday April MSG Foo
+    REM Mon 1 April        MSG Foo
+
+    REM Second Monday May  MSG Bar
+    REM Mon 8 May          MSG Bar
+
+    REM Third Monday MSG Third Monday of every month
+    REM Mon 15 MSG Third Monday of every month
+
+    REM Fourth Sunday June 2025 MSG Fourth Sunday in June 2025
+    REM Sun 22 June 2025 MSG Fourth Sunday in June 2025
+
+    REM Last Monday MSG Last Monday of every month
+    REM Mon 1 --7 MSG Last Monday of every month
+
+    REM Last Monday April MSG Last Monday of every April
+    REM Mon 1 May --7 MSG  Last Monday of every April
+
+    REM Last Monday December 2025 MSG Last Monday of Dec 2025
+    REM Monday 1 Jan 2026 --7 MSG Last Monday of Dec 2025
+.fi
+.PP
+Note that \fBLast\fR effectively adjusts the month and year, if necessary, to
+make the reminder trigger on the correct date.
+.PP
+The keyword \fBIN\fR is completely ignored, so you can write (for example):
+.PP
+.nf
+    REM Second Monday in May MSG foo
+    REM Last Monday in December 2025 MSG Bar
+.fi
+.PP
+An alternate form of \fIback\fR makes writing reminders easier.
+The following groups of reminders are equivalent:
+.PP
+.nf
+    REM ~~1 MSG Last day of every month
+    REM Lastday MSG  Last day of every month
+    REM 1 --1 MSG Last day of every month
+
+    REM May ~~1 MSG Last day of May
+    REM Lastday May MSG Last day of May
+    REM 1 June --1 MSG Last day of May
+
+    REM Dec 2025 ~~1 MSG Last day of December 2025
+    REM Lastday Dec 2025 MSG Last day of December 2025
+    REM 1 Jan 2026 --1 MSG Last day of December 2025
+
+    REM Apr ~1 OMIT SAT SUN MSG Last workday of April
+    REM Lastworkday April OMIT SAT SUN MSG Last workday of April
+    REM 1 May -1 OMIT SAT SUN MSG Last workday of April
+
+    REM Apr ~~7 MSG Seventh-last day of April
+    REM 1 May --7 MSG Seventh-last day of April
+
+    REM Apr ~2 OMIT SAT SUN MSG Second-last workday of April
+    REM 1 May -2 OMIT SAT SUN MSG Second-last workday of April
+.fi
+.PP
+As we see, "Lastday" is equivalent to ~~1 and "Lastworkday" to ~1.
+.PP
+Note that the First/Second/Third/Fourth/Last keywords and the ~ and ~~ form
+of \fIback\fR imply a value for the day of the month; as such, they cannot
+be combined with a day.  Additionally, First/Second/Third/Fourth/Last
+must have at least one weekday name.  The following are illegal:
+.PP
+.nf
+    REM First Monday 3 June MSG Huh?
+    REM April 3 ~~1 MSG What?
+    REM Second June MSG Where's the weekday???
+.fi
 .PP
 .SH THE SUBSTITUTION FILTER
 .PP
@@ -1828,7 +1910,7 @@ quotes \fImust\fR be supplied.  This distinguishes date constants
 from division or subtraction of integers.  Examples:
 .PP
 .RS
-\'1993/02/22', '1992-12-25', '1999/01/01'
+\(aq1993/02/22', '1992-12-25', '1999/01/01'
 .PP
 Note that \fBDATE\fR values are \fIprinted\fR
 without the quotes.  Although either '-' or '/' is accepted as a date
@@ -1846,13 +1928,33 @@ constants with the addition of an "@HH:MM" part, optionally followed
 by "am" or "pm".  For example:
 .PP
 .RS
-\'2008-04-05@23:11', '1999/02/03@14:06', '2001-04-07@08:30', '2020-01-01@3:20pm'
+\(aq2008-04-05@23:11', '1999/02/03@14:06', '2001-04-07@08:30', '2020-01-01@3:20pm'
 .PP
 \fBDATETIME\fR values are printed without the quotes.  Notes about date
 and time separator characters for \fBDATE\fR and \fBTIME\fR constants apply
 also to \fBDATETIME\fR constants.
 .RE
 .PP
+.B ZERO VALUES
+.PP
+The non-string types all have an associated \fIzero\fR value, which is
+treated as "false" by the IF command and the logical operators.  The
+zero values are:
+.PP
+.RS
+.PP
+\fBINT\fR - 0
+.PP
+\fBDATE\fR - '1990-01-01'
+.PP
+\fBTIME\fR - 00:00
+.PP
+\fBDATETIME\fR - '1990-01-01@00:00'
+.RE
+.PP
+Additionally, for the purpose of the IF command (but \fInot\fR the
+logical operators) the empty string "" is considered a false value.
+.PP
 .B OPERATORS
 .PP
 \fBRemind\fR has the following operators.  Operators on the same line
@@ -1976,14 +2078,16 @@ If the operands are not of the same type, == returns 0 and != returns
 .RE
 .TP
 .B &&
-This is the logical AND operator.  Both of its operands must be of
+This is the logical AND operator.  Both of its operands must be of the
-type \fBINT\fR.  It returns 1 if both operands are non-zero, and 0
+same type and must not be \fBSTRING\fR type.  Returns the second
-otherwise.
+operand if both operands are non-zero.  Otherwise, returns a zero
+of the same type as the operands.
 .TP
 .B ||
 This is the logical OR operator.  Both of its operands must be of
-type \fBINT\fR.  It returns 1 if either operand is non-zero, and 0
+the same type and must not be of \fBSTRING\fR type.  It returns
-otherwise.
+the first operand that is non-zero; if both operands are zero, then
+returns a zero of the same type as the operands.
 .PP
 .B NOTES
 .PP
@@ -2418,7 +2522,7 @@ Returns the time of "astronomical twilight" on the specified \fIdate\fR.  If
 .TP
 .B ampm(tq_time [,s_am [,s_pm]])
 Returns a \fBSTRING\fR that is the result of converting \fItime\fR
-(which is either a \fBTIME\R or a \fBDATETIME\fR object) to "AM/PM"
+(which is either a \fBTIME\fR or a \fBDATETIME\fR object) to "AM/PM"
 format.  The optional arguments \fIam\fR and \fIpm\fR are the strings
 to append in the AM and PM case, respectively; they default to "AM"
 and "PM".  The function obeys the system variables $DateSep,
@@ -3116,6 +3220,114 @@ Returns \fBRemind\fR's notion of "today."  This may be the actual system
 date, or a date supplied on the command line, or the date of the
 calendar entry currently being computed.
 .TP
+.B trig(s_1 [,s_2, ...])
+For each string argument s_\fIn\fR, \fBtrig\fR evaluates s_\fIn\fR
+as if it were a REM or IFTRIG trigger
+specification.  If the trigger would trigger today, then the trigger
+date is returned and no further triggers are evaluated.  If none
+of the triggers would trigger today, then the zero date
+1990-01-01 is returned.
+.RS
+\fBtrig\fR also has a zero-argument form; this returns the trigger
+date of the \fImost recent\fR \fBtrig\fR function that returned a
+non-zero trigger date.
+.PP
+\fBtrig\fR can be used to make more sophisticated versions of
+\fBIFTRIG\fR.  For example, if you have meetings every Monday in
+June and July, and you want warnings 3 days in advance, you
+could use:
+.nf
+    REM [trig("Mon Jun +3", "Mon July +3")] +3 MSG Meeting %b
+.fi
+.PP
+NOTE: We need to repeat the +3 delta outside of the \fBtrig\fR
+function for advance warning to work properly.  This is because
+\fBtrig\fR returns a date constant (the trigger date) and the
+REM command does not know the details of \fBtrig\fR's arguments.
+.PP
+Note that because \fBRemind\fR does not have short-circuit logical
+operators, something like:
+.PP
+.nf
+    SET a trig("Mon +7") || trig("Fri +7")
+.fi
+
+would set the value of trig() to the date of the following
+Thursday.  Even though trig("Mon +7") always returns true,
+the logical-OR operator still evaluates trig("Fri +7") which
+\fIalso\fR returns true and sets \fBtrig()\fR.
+.PP
+You can work around the lack of a short-circuit logical-OR as follows:
+If \fBtrig\fR returns a true value, the specific value it returns
+can be coerced to a DATE which is the trigger date.  So the following code:
+.PP
+.nf
+    SET a trig("Mon +4") || trig("Fri +4")
+    IF a
+        REM [a] +4 MSG [wkday($T)] %b.
+    ENDIF
+.fi
+.PP
+would operate as follows:
+.PP
+.nf
+    On Monday:    Monday today.
+    On Tuesday:   Friday in 3 days' time.
+    On Wednesday: Friday in 2 days' time.
+    On Thursday:  Monday in 4 days' time.
+    On Friday:    Monday in 3 days' time.
+    On Saturday:  Monday in 2 days' time.
+    On Sunday:    Monday tomorrow.
+.fi
+.PP
+Compare with the following:
+.PP
+.nf
+    SET a trig("Mon +4") || trig("Fri +4")
+    IF a
+        REM [trig()] +4 MSG [wkday($T)] %b.
+    ENDIF
+.fi
+.PP
+which yields:
+.PP
+.nf
+    On Monday:    Friday in 4 days' time.
+    On Tuesday:   Friday in 3 days' time.
+    On Wednesday: Friday in 2 days' time.
+    On Thursday:  Friday tomorrow.
+    On Friday:    Friday today.
+    On Saturday:  Monday in 2 days' time.
+    On Sunday:    Monday tomorrow.
+.fi
+.PP
+That is because \fBtrig()\fR returns the trigger date of
+the \fIlast\fR trig function that returns true,
+whereas the value of \fBa\fR is the trigger date of the \fIfirst\fR
+trig function that returns true.
+.PP
+\fBImportant Note\fR:  Because \fBtrig()\fR always returns an absolute
+date, it will \fBnot\fR work properly with a \fBSATISFY\fR clause.
+Consider this reminder:
+.PP
+.nf
+    REM [trig("Mar", "Apr")] SATISFY [$Td == 15] MSG 15 Mar or April
+.fi
+.PP
+If we run \fBRemind\fR on 5 March 2022, we might expect the trigger
+date to be calculated as 15 March 2022... but that's not what happens.
+Instead, the \fBtrig\fR function is evaluated first, and it returns
+2022-03-05.  So as far as \fBRemind\fR is concerned, the REM statement
+becomes:
+.PP
+.nf
+    REM 2022-03-05 SATISFY [$Td == 15] MSG 15 Mar or April
+.fi
+.PP
+and the SATISFY expression is never true.  So: \fIDo not mix
+trig() and SATISFY\fR.
+.RE
+.TP
 .B trigdate()
 Returns the calculated trigger date of the last \fBREM\fR
 or \fBIFTRIG\fR command.  If used
@@ -3532,12 +3744,12 @@ Note that the commands are shown indented for clarity.  Also, the \fBELSE\fR
 portion can be omitted.  \fBIF\fR commands can be nested up to a small limit,
 probably around 8 or 16 levels of nesting, depending on your system.
 .PP
-If the \fIexpr\fR evaluates to a non-zero \fBINT\fR, or a non-null
+If the \fIexpr\fR evaluates to a non-zero \fBINT\fR, a \fBDATE\fR that
-\fBSTRING\fR, then the \fBIF\fR portion is considered true, and the
+is not 1990-01-01, a \fBTIME\fR that is not 00:00, a \fBDATETIME\fR
-\fIt-commands\fR are executed.  If \fIexpr\fR evaluates to zero or
+that is not 1990-01-01@00:00, or a non-null \fBSTRING\fR, then the
-null, then the \fIf-commands\fR (if the \fBELSE\fR portion is present)
+\fBIF\fR portion is considered true, and the \fIt-commands\fR are
-are executed.  If \fIexpr\fR is not of type \fBINT\fR or \fBSTRING\fR,
+executed.  If \fIexpr\fR evaluates to zero or null, then the
-then it is an error.
+\fIf-commands\fR (if the \fBELSE\fR portion is present) are executed.
 .PP
 Examples:
 .PP

man/tkremind.1

@@ -173,6 +173,13 @@ it will be underlined when you move the cursor over it, and
 you can edit it in a text editor by either left- or right-clicking
 on the reminder.
 
+.SH ERRORS
+
+If there are any errors in your reminder file, the "Queue..." button
+changes to "Errors...".  Click on "Errors..." to see the Remind error
+output.  Click "OK" to close the error window; this makes the button
+in the main TkRemind window to revert to "Queue..."
+
 .SH BACKGROUND REMINDERS
 
 If you create "timed" reminders, \fBTkRemind\fR will queue them in

rem2html/rem2html

@@ -68,7 +68,7 @@ and newmoon.png, which are expected to live in C<--imgbase>.
 =item --stylesheet I<url.css>
 
 Use I<url.css> as the stylesheet.  If this option is used,
-I<url.css> is interpreted relative to B<imgbase> I<unless> it start
+I<url.css> is interpreted relative to B<imgbase> I<unless> it starts
 with a "/".
 
 =item --nostyle

rem2pdf/Makefile.top.in

@@ -29,7 +29,9 @@ install:
 	    if test $$? != 0 ; then echo "Not installing rem2pdf; missing $$m"; exit 0; fi; \
 	done; \
 	echo "Installing rem2pdf"; \
-        if test "$(prefix)" = "/usr" ; then \
+        if test "$(INSTALL_BASE)" != "" ; then \
+                $(MAKE) install DESTDIR=$(DESTDIR) "INSTALL_BASE=$(INSTALL_BASE)" && exit 0; \
+        elif test "$(prefix)" = "/usr" ; then \
 		$(MAKE) install DESTDIR=$(DESTDIR) INSTALLDIRS=vendor && exit 0; \
         else \
 		$(MAKE) install DESTDIR=$(DESTDIR) && exit 0; \
@@ -37,4 +39,4 @@ install:
 	exit 1;
 
 Makefile: Makefile.PL
-	$(PERL) Makefile.PL || true
+	$(PERL) Makefile.PL @PERLARTIFACTS@ INSTALL_BASE=$(INSTALL_BASE) || true

rem2pdf/bin/rem2pdf.in

@@ -478,14 +478,14 @@ positioned absolutely with respect to the day's box (and is not
 counted when calculating the box's height.)
 
 A positive I<x> value positions the left edge of the text I<x> points
-to the right of the left side of the calender box, while a negative
+to the right of the left side of the calendar box, while a negative
 I<x> value positions the right edge of the text I<x> points to the left
-of the right side of the calender box.
+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 calender box, while a negative I<y> value
+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 calender box.
+the calendar box.
 
 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

rem2pdf/lib/Remind/PDF.pm

@@ -637,7 +637,7 @@ sub draw_day
                 $so_far += $h2;
         }
         if ($height) {
-                if ($entry_height > $height) {
+                if ($h + $entry_height + 2 * $settings->{border_size} > $height) {
                         print STDERR "WARNING: overfull box at $day " . $self->{monthname} . ' ' . $self->{year} . "\n";
                         $entry_height = $height;
                 }
@@ -753,24 +753,13 @@ sub draw_small_calendar
                 $last_day_on_row += 7;
                 $rows++;
         }
-        my $layout = Pango::Cairo::create_layout($cr);
+        my $font_size = $self->calculate_small_calendar_font_size($cr, $width, $height, $settings, $rows);
-        my $desc = Pango::FontDescription->from_string($settings->{small_cal_font} . ' ' . '10px');
-        $layout->set_font_description($desc);
-        $layout->set_text('88 88 88 88 88 88 88');
-        my ($wid, $h) = $layout->get_pixel_size();
-        $h += 1;
-        $h *= ($rows + 2); # row for month name; row for day names
 
-        my $scale = $width / $wid;
+        my $layout = Pango::Cairo::create_layout($cr);
-        if (($height / $h) < $scale) {
+        my $desc = Pango::FontDescription->from_string($settings->{small_cal_font} . ' ' . $font_size . 'px');
-                $scale = $height / $h;
-        }
-        my $font_size = int($scale * 10);
-        $layout = Pango::Cairo::create_layout($cr);
-        $desc = Pango::FontDescription->from_string($settings->{small_cal_font} . ' ' . $font_size . 'px');
         $layout->set_font_description($desc);
         $layout->set_text('88 ');
-        ($wid, $h) = $layout->get_pixel_size();
+        my ($wid, $h) = $layout->get_pixel_size();
         $h += 1;
 
         # Month name
@@ -824,6 +813,43 @@ sub draw_small_calendar
         }
 }
 
+sub calculate_small_calendar_font_size
+{
+        my ($self, $cr, $width, $height, $settings, $rows) = @_;
+
+        my $layout = Pango::Cairo::create_layout($cr);
+        my $desc = Pango::FontDescription->from_string($settings->{small_cal_font} . ' ' . '10px');
+        $layout->set_font_description($desc);
+        $layout->set_text('88 88 88 88 88 88 88');
+        my ($wid, $h) = $layout->get_pixel_size();
+        $h += 1;
+        $h *= ($rows + 2); # row for month name; row for day names
+
+        my $scale = $width / $wid;
+        if (($height / $h) < $scale) {
+                $scale = $height / $h;
+        }
+        my $font_size = int($scale * 10);
+
+        # Check
+        $desc = Pango::FontDescription->from_string($settings->{small_cal_font} . ' ' . $font_size . 'px');
+        $layout->set_font_description($desc);
+        $layout->set_text('88 88 88 88 88 88 88');
+        ($wid, $h) = $layout->get_pixel_size();
+        $h += 1;
+        $h *= ($rows + 2); # row for month name; row for day names
+
+        $scale = $width / $wid;
+        if (($height / $h) < $scale) {
+                $scale = $height / $h;
+        }
+
+        if ($scale < 1) { # Font size is too big
+                $font_size--;
+        }
+        return $font_size;
+}
+
 package Remind::PDF::Multi;
 
 =head1 NAME

scripts/tkremind

@@ -127,6 +127,12 @@ set OptDescr(BackgroundColor) "Default background color of calendar boxes"
 set Option(TextColor) "#000000"
 set OptDescr(TextColor) "Default text color in calendar boxes"
 
+set Option(TodayColor) "#00C0C0"
+set OptDescr(TodayColor) "Background color for today heading"
+
+set Option(LineColor) "#000000"
+set OptDescr(LineColor) "Color of gridlines on calendar"
+
 set Option(LabelColor) "#000000"
 set OptDescr(LabelColor) "Default label color for headings"
 
@@ -165,6 +171,9 @@ set EditorPid -1
 # Inotify file
 set InotifyFP ""
 
+# Errors from last remind run
+set RemindErrors ""
+
 # Reminder file to append to -- default
 set AppendFile {NOSUCHFILE}
 catch {set AppendFile $ReminderFile}
@@ -282,7 +291,17 @@ proc is_warning_header { line } {
 proc Initialize {} {
     global DayNames argc argv CommandLine ReminderFile AppendFile Remind PSCmd
     global MondayFirst TwentyFourHourMode ReminderFileModTime
+    global TodayDay TodayMonth TodayYear
+
     global Option ConfigFile
+
+    # In case date has rolled over, recalculate Today* values
+    set now [clock seconds]
+
+    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 CommandLine "|$Remind -itkremind=1 -pp -y -l EXTRA"
     set PSCmd "$Remind -itkremind=1 -itkprint=1 -pp -l EXTRA"
     set i 0
@@ -449,7 +468,7 @@ proc CreateCalFrame { w dayNames } {
     }
 
     global MondayFirst
-    frame $w -background $Option(WinBackground)
+    frame $w -background $Option(LineColor)
     for {set i 0} {$i < 7} {incr i} {
 	if {$MondayFirst} {
 	    set index [expr ($i+1)%7]
@@ -457,28 +476,31 @@ proc CreateCalFrame { w dayNames } {
 	    set index $i
 	}
 
-	label $w.day$i -border 1 -text [lindex $dayNames $index] -justify center -font HeadingFont -foreground $Option(LabelColor) -background $Option(WinBackground)
+	label $w.day$i -bd 0 -text [lindex $dayNames $index] -justify center -font HeadingFont -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 0
-	grid configure $w.day$i -row 0 -column $i -sticky ew
+	grid configure $w.day$i -row 0 -column $i -sticky ew -padx 1 -pady 1
     }
     for {set i 0} {$i < 6} {incr i} {
 	set n [expr $i*7]
 	for {set j 0} {$j < 7} {incr j} {
 	    set f [expr $n+$j]
 	    button $w.l$f -text "" -justify center -command "" \
-		-state disabled -relief flat -border 0 -padx 0 -pady 0 -font HeadingFont
+		-state disabled -relief flat -bd 0 -padx 0 -pady 0 -font HeadingFont -highlightthickness 1
-	    text $w.t$f -width 12 -height $h -border 1 -spacing3 3 -wrap word -relief flat \
+	    text $w.t$f -width 12 -height $h -bd 0 -spacing3 3 -wrap word -relief flat \
-		-state disabled -takefocus 0 -cursor {} -font CalboxFont -foreground $Option(TextColor) -background $Option(BackgroundColor)
+		-state disabled -takefocus 0 -cursor {} -font CalboxFont -foreground $Option(TextColor) -background $Option(BackgroundColor) \
+                -highlightthickness 0
+            frame $w.f$f -padx 0 -pady 0 -highlightthickness 0 -relief flat -bd 0
 	    $w.t$f tag bind TAGGED <ButtonPress-1> "EditTaggedReminder $w.t$f"
 	    $w.t$f tag bind REM <ButtonPress-3> "FireEditor $w.t$f"
-	    grid configure $w.l$f -row [expr $i*2+1] -column $j -sticky ew
+            pack $w.l$f -in $w.f$f -side top -expand 0 -fill x
-	    grid configure $w.t$f -row [expr $i*2+2] -column $j -sticky nsew
+            pack $w.t$f -in $w.f$f -side top -expand 1 -fill both
+            grid configure $w.f$f -row [expr $i+1] -column $j -sticky nsew -padx 1 -pady 1
 	}
     }
 
     for {set i 0} {$i < 7} {incr i} {
 	grid columnconfigure $w $i -weight 1
     }
-    for {set i 2} {$i < 14} {incr i 2} {
+    for {set i 1} {$i < 7} {incr i} {
 	grid rowconfigure $w $i -weight 1
     }
 }
@@ -504,8 +526,12 @@ proc ConfigureCalFrame { w firstDay numDays } {
     set last [expr $offset+$numDays]
 
     for {set i 0} {$i < $first} {incr i} {
-	grid $w.l$i $w.t$i
+	grid $w.f$i
-	$w.l$i configure -text "" -command "" -state normal -relief flat -foreground $Option(LabelColor) -background $Option(WinBackground)
+        pack $w.l$i -in $w.f$i -side top -expand 0 -fill x
+        pack $w.t$i -in $w.f$i -side top -expand 1 -fill both
+        raise $w.l$i
+        raise $w.t$i
+	$w.l$i configure -text "" -command "" -state normal -relief flat -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
         $w.l$i configure -state disabled
 	balloon_add_help $w.l$i ""
 	$w.t$i configure -relief flat -takefocus 0 -state normal -background $Option(WinBackground)
@@ -515,13 +541,17 @@ proc ConfigureCalFrame { w firstDay numDays } {
 	}
 	$w.t$i tag bind TAGGED <ButtonPress-1> "EditTaggedReminder $w.t$i"
 	$w.t$i tag bind REM <ButtonPress-3> "FireEditor $w.t$i"
-	$w.t$i configure -state disabled
+	$w.t$i configure -state disabled -takefocus 0
     }
     for {set i $first} {$i <= $last} {incr i} {
-	grid $w.l$i $w.t$i
+	grid $w.f$i
+        pack $w.l$i -in $w.f$i -side top -expand 0 -fill x
+        pack $w.t$i -in $w.f$i -side top -expand 1 -fill both
+        raise $w.l$i
+        raise $w.t$i
 	set d [expr $i-$first+1]
 	$w.l$i configure -text $d -state normal -relief flat \
-		-command "ModifyDay $d $firstDay" -foreground $Option(LabelColor) -background $Option(WinBackground)
+		-command "ModifyDay $d $firstDay" -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
 	balloon_add_help $w.l$i "Add a reminder..."
 	$w.t$i configure -relief sunken -takefocus 1 -state normal -foreground $Option(TextColor) -background $Option(BackgroundColor)
 	$w.t$i delete 1.0 end
@@ -530,23 +560,27 @@ proc ConfigureCalFrame { w firstDay numDays } {
 	}
 	$w.t$i tag bind TAGGED <ButtonPress-1> "EditTaggedReminder $w.t$i"
 	$w.t$i tag bind REM <ButtonPress-3> "FireEditor $w.t$i"
-	$w.t$i configure -state disabled
+	$w.t$i configure -state disabled -takefocus 0
     }
     set forgetIt 0
     for {set i [expr $last+1]} {$i < 42} {incr i} {
 	if {$i%7 == 0} {
 	    set forgetIt 1
 	}
-	set row [expr ($i/7)*2+1]
+	set row [expr ($i/7)+1]
 	if {$forgetIt} {
-	    grid remove $w.l$i $w.t$i
+	    grid remove $w.f$i
 	    grid rowconfigure $w $row -weight 0
 	    grid rowconfigure $w [expr $row+1] -weight 0
 	} else {
-	    grid $w.l$i $w.t$i
+	    grid $w.f$i
+            pack $w.l$i -in $w.f$i -side top -expand 0 -fill x
+            pack $w.t$i -in $w.f$i -side top -expand 1 -fill both
+            raise $w.l$i
+            raise $w.t$i
 	    grid rowconfigure $w [expr $row+1] -weight 1
 	}
-	$w.l$i configure -text "" -command "" -state normal -relief flat -foreground $Option(LabelColor) -background $Option(WinBackground)
+	$w.l$i configure -text "" -command "" -state normal -relief flat -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
         $w.l$i configure -state disabled
 	balloon_add_help $w.l$i ""
 	$w.t$i configure -relief flat -takefocus 0 -state normal -background $Option(WinBackground)
@@ -556,11 +590,11 @@ proc ConfigureCalFrame { w firstDay numDays } {
 	}
 	$w.t$i tag bind TAGGED <ButtonPress-1> "EditTaggedReminder $w.t$i"
 	$w.t$i tag bind REM <ButtonPress-3> "FireEditor $w.t$i"
-	$w.t$i configure -state disabled
+	$w.t$i configure -state disabled -takefocus 0
     }
     if { $CurMonth == $TodayMonth && $CurYear == $TodayYear } {
 	set n [expr $TodayDay + $offset]
-	$w.l$n configure -background "#00c0c0"
+	$w.l$n configure -background $Option(TodayColor)
     }
 }
 
@@ -577,36 +611,36 @@ proc DoQueue {} {
 #---------------------------------------------------------------------------
 proc CreateCalWindow { dayNames } {
     global Option
-    frame .h -background $Option(WinBackground);
+    frame .h -background $Option(LineColor)
-    label .h.title -text "" -justify center -pady 1 -border 1 -relief raised -font HeadingFont -background $Option(WinBackground) -foreground $Option(LabelColor)
+    label .h.title -text "" -justify center -pady 2 -bd 0 -relief flat -font HeadingFont -background $Option(WinBackground) -foreground $Option(LabelColor)
-    pack .h.title -side top -fill x
+    pack .h.title -side top -fill x -pady 1 -padx 1
     pack .h -side top -expand 0 -fill x
-
+    . configure -background $Option(LineColor)
     CreateCalFrame .cal $dayNames
 
-    frame .b -background $Option(WinBackground);
+    frame .b -background $Option(LineColor)
-    button .b.prev -text "\u2b9c" -command {MoveMonth -1} -border 1 -foreground $Option(LabelColor) -background $Option(WinBackground)
+    button .b.prev -text "\u2b9c" -command {MoveMonth -1} -bd 0 -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
     balloon_add_help .b.prev "Go to previous month"
-    button .b.this -text {Today} -command {ThisMonth} -border 1 -foreground $Option(LabelColor) -background $Option(WinBackground)
+    button .b.this -text {Today} -command {ThisMonth} -bd 0 -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
     balloon_add_help .b.this "Go to this month"
-    button .b.next -text "\u2b9e" -command {MoveMonth 1} -border 1 -foreground $Option(LabelColor) -background $Option(WinBackground)
+    button .b.next -text "\u2b9e" -command {MoveMonth 1} -bd 0 -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
     balloon_add_help .b.next "Go to next month"
-    button .b.goto -text {Go To Date...} -command {GotoDialog} -border 1 -foreground $Option(LabelColor) -background $Option(WinBackground)
+    button .b.goto -text {Go To Date...} -command {GotoDialog} -bd 0 -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
     balloon_add_help .b.goto "Go to a specific date"
-    button .b.print -text {Print...} -command {DoPrint} -border 1 -foreground $Option(LabelColor) -background $Option(WinBackground)
+    button .b.print -text {Print...} -command {DoPrint} -bd 0 -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
-    balloon_add_help .b.print "Print a PostScript calendar"
+    balloon_add_help .b.print "Print a PostScript or PDF calendar"
-    button .b.queue -text {Queue...} -command {DoQueue} -border 1 -foreground $Option(LabelColor) -background $Option(WinBackground)
+    button .b.options -text {Options...} -command EditOptions -bd 0 -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
-    balloon_add_help .b.queue "See the queue of pending reminders (debugging purposes only)"
-    button .b.quit -text {Quit} -command {Quit} -border 1 -foreground $Option(LabelColor) -background $Option(WinBackground)
-    balloon_add_help .b.quit "Quit TkRemind"
-    button .b.options -text {Options...} -command EditOptions -border 1 -foreground $Option(LabelColor) -background $Option(WinBackground)
     balloon_add_help .b.options "Set TkRemind options"
-    label .b.status -text "" -width 25 -relief sunken -border 1 -foreground $Option(LabelColor) -background $Option(WinBackground)
+    button .b.queue -text {Queue...} -command {DoQueue} -bd 0 -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
-    label .b.nqueued -text "" -width 20 -relief sunken -border 1 -foreground $Option(LabelColor) -background $Option(WinBackground)
+    balloon_add_help .b.queue "See the queue of pending reminders (debugging purposes only)"
-    pack .b.prev .b.this .b.next .b.goto .b.print .b.options .b.queue .b.quit -side left -fill both
+    button .b.quit -text {Quit} -command {Quit} -bd 0 -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
-    pack .b.status -side left -fill both -expand 1
+    balloon_add_help .b.quit "Quit TkRemind"
-    pack .b.nqueued -side left -fill both
+    label .b.status -text "" -width 25 -relief flat -bd 0 -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 0
-    pack .b -side bottom -fill x -expand 0
+    label .b.nqueued -text "" -width 20 -relief flat -bd 0 -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 0
+    pack .b.prev .b.this .b.next .b.goto .b.print .b.options .b.queue .b.quit -side left -fill both -padx 1
+    pack .b.status -side left -fill both -expand 1 -padx 1
+    pack .b.nqueued -side left -fill both -padx 1
+    pack .b -side bottom -fill x -expand 0 -pady 1
     pack .cal -side top -fill both -expand 1
     wm title . "TkRemind"
     wm iconname . ""
@@ -689,7 +723,7 @@ proc EditOptions {} {
     pack $w.cmd -in $w.rf -side left -expand 1 -fill x
     $w.cmd insert 0 $tmpOpt(RunCmd)
 
-    frame $w.sep3 -border 1 -relief sunken
+    frame $w.sep3 -bd 1 -relief sunken
     # E-mail reminder if popup not dismissed
     frame $w.eml
     label $w.lab_email_address -text "E-mail reminders here if popup not dismissed:" -anchor w -justify left
@@ -734,6 +768,12 @@ proc EditOptions {} {
     label $w.bgcolor -text "  Background color:"
     button $w.bbgcolor -background $Option(BackgroundColor) -command [list PickColor BackgroundColor $w.bbgcolor] -text ...
 
+    label $w.tbgcolor -text "Color for highlighting \"today\":"
+    button $w.tbbgcolor -background $Option(TodayColor) -command [list PickColor TodayColor $w.tbbgcolor] -text ...
+
+    label $w.gridcolor -text "  Gridline color:"
+    button $w.gridbcolor -background $Option(LineColor) -command [list PickColor LineColor $w.gridbcolor] -text ...
+
     grid $w.textcolor $w.btextcolor $w.bgcolor $w.bbgcolor -in $w.colors1
     grid $w.bgcolor $w.bbgcolor -in $w.colors1
 
@@ -742,11 +782,12 @@ proc EditOptions {} {
     label $w.wincolor -text "  Window color:"
     button $w.bwincolor -background $Option(WinBackground) -command [list PickColor WinBackground $w.bwincolor] -text ...
     grid $w.headcolor $w.bheadcolor $w.wincolor $w.bwincolor -in $w.colors1
-
+    grid $w.tbgcolor $w.tbbgcolor $w.gridcolor $w.gridbcolor -in $w.colors1
+    
     grid columnconfigure $w.colors1 0 -weight 1
     grid columnconfigure $w.colors1 2 -weight 1
-    frame $w.sep1 -border 1 -relief sunken
+    frame $w.sep1 -bd 1 -relief sunken
-    frame $w.sep2 -border 1 -relief sunken
+    frame $w.sep2 -bd 1 -relief sunken
 
     checkbutton $w.feed \
 	    -text "Feed popped-up reminder to command's standard input" \
@@ -770,10 +811,12 @@ proc EditOptions {} {
     pack $w.colors1 -in $w.f -side top -expand 0 -fill x
     pack $w.sep2 -in $w.f -side top -expand 0 -fill x -ipady 1
 
+    button $w.default -text "Light Theme" -command [list set_default_colors $w]
+    button $w.dark -text "Dark Theme" -command [list set_dark_colors $w]
     button $w.save -text "Save Options" -command "SaveOptions $w; destroy $w"
     button $w.cancel -text "Cancel" -command "CancelOptions; destroy $w"
     wm protocol $w WM_DELETE_WINDOW "CancelOptions; destroy $w"
-    pack $w.save $w.cancel -in $w.b -side left -expand 0 -fill x
+    pack $w.default $w.dark $w.save $w.cancel -in $w.b -side left -expand 0 -fill x
     CenterWindow $w .
 }
 
@@ -845,6 +888,10 @@ proc SaveOptions { w } {
     .b.queue configure -foreground $Option(LabelColor) -background $Option(WinBackground)
     .b.quit configure -foreground $Option(LabelColor) -background $Option(WinBackground)
     .b.options configure -foreground $Option(LabelColor) -background $Option(WinBackground)
+    . configure -background $Option(LineColor);
+    .h configure -background $Option(LineColor);
+    .cal configure -background $Option(LineColor)
+    .b configure -background $Option(LineColor)
 }
 
 proc WriteOptionsToFile {} {
@@ -939,11 +986,12 @@ proc ConfigureCalWindow { month year firstDay numDays } {
 proc FillCalWindow {} {
     set FileName ""
     set LineNo 0
-    global DayNames CurYear CurMonth MonthNames CommandLine Option TagToObj
+    global DayNames CurYear CurMonth MonthNames CommandLine Option TagToObj RemindErrors
 
     array unset TagToObj
 
     Status "Firing off Remind..."
+    set_button_to_queue
     set month [lindex $MonthNames $CurMonth]
 
     set cmd [regsub EXTRA $CommandLine $Option(ExtraRemindArgs)]
@@ -1032,7 +1080,7 @@ proc FillCalWindow {} {
 		continue
 	    }
 	    "MOON" {
-		DoMoonSpecial $n $stuff $fntag
+		DoMoonSpecial $n $stuff $fntag $day
 		continue
 	    }
 	    "COLOUR" -
@@ -1057,7 +1105,7 @@ proc FillCalWindow {} {
 		    set extratags "clr$color"
 		    .cal.t$n configure -state normal
 		    .cal.t$n tag configure $extratags -foreground "#$color"
-		    .cal.t$n configure -state disabled
+		    .cal.t$n configure -state disabled -takefocus 0
 		    set stuff $rest
 		    set type "COLOR"
 		}
@@ -1083,16 +1131,27 @@ proc FillCalWindow {} {
             }
 	}
 	.cal.t$n insert end "\n"
-	.cal.t$n configure -state disabled
+	.cal.t$n configure -state disabled -takefocus 0
 
     }
     set problem [catch { close $file } errmsg]
     if {$problem} {
-	tk_dialog .error Error "There was a problem running Remind: $errmsg" error 0 OK
+        set RemindErrors [unique_lines $errmsg]
+        set_button_to_errors
     }
     DisplayTime
 }
 
+proc unique_lines { s } {
+    set l [split $s "\n"]
+    foreach line $l {
+        if {"$line" != ""} {
+            dict set d $line 1
+        }
+    }
+    return [join [dict keys $d] "\n"]
+}
+
 #---------------------------------------------------------------------------
 # MoveMonth -- move by +1 or -1 months
 # Arguments:
@@ -1152,13 +1211,13 @@ proc DoPrint {} {
     toplevel .p
     wm title .p "TkRemind Print..."
     wm iconname .p "Print..."
-    frame .p.f1 -relief sunken -border 2
+    frame .p.f1 -relief sunken -bd 2
     frame .p.f11
     frame .p.f12
-    frame .p.f2 -relief sunken -border 2
+    frame .p.f2 -relief sunken -bd 2
-    frame .p.f2a -relief sunken -border 2
+    frame .p.f2a -relief sunken -bd 2
-    frame .p.f3 -relief sunken -border 2
+    frame .p.f3 -relief sunken -bd 2
-    frame .p.f3a -relief sunken -border 2
+    frame .p.f3a -relief sunken -bd 2
     frame .p.f4
 
     radiobutton .p.tofile -text "To file: " -variable Option(PrintDest) -value file
@@ -1169,7 +1228,7 @@ proc DoPrint {} {
     .p.command insert end "lpr"
 
     if { $HaveRem2PDF } {
-        frame .p.ff -relief sunken -border 2
+        frame .p.ff -relief sunken -bd 2
         label .p.format -text "Output Format:"
         radiobutton .p.pdf -text "PDF" -variable Option(PrintFormat) -value pdf
         radiobutton .p.ps -text "PostScript" -variable Option(PrintFormat) -value ps
@@ -1451,16 +1510,16 @@ proc CreateModifyDialog {w day firstDay args} {
     set month [lindex $MonthNames $CurMonth]
     set wkday [lindex $EnglishDayNames [expr ($day+$firstDay-1) % 7]]
 
-    frame $w.o -border 4 -relief ridge
+    frame $w.o -bd 4 -relief ridge
-    frame $w.o1 -border 4
+    frame $w.o1 -bd 4
-    frame $w.o2 -border 4
+    frame $w.o2 -bd 4
-    frame $w.o3 -border 4
+    frame $w.o3 -bd 4
-    frame $w.exp -border 4
+    frame $w.exp -bd 4
-    frame $w.adv -border 4
+    frame $w.adv -bd 4
-    frame $w.weekend -border 4
+    frame $w.weekend -bd 4
-    frame $w.durationbox -border 4
+    frame $w.durationbox -bd 4
-    frame $w.time -border 4
+    frame $w.time -bd 4
-    frame $w.hol -border 4
+    frame $w.hol -bd 4
     frame $w.msg
     frame $w.buttons
     pack $w.o1 $w.o2 $w.o3  -side top -anchor w -in $w.o
@@ -3530,7 +3589,7 @@ proc DoShadeSpecial { n r g b } {
 # %DESCRIPTION:
 #  Handles the "MOON" special -- draws a moon symbol
 #***********************************************************************
-proc DoMoonSpecial { n stuff fntag } {
+proc DoMoonSpecial { n stuff fntag day } {
     set msg ""
     set num [scan $stuff "%d %d %d %s" phase junk1 junk2 msg]
     if {$num < 1} {
@@ -3539,12 +3598,24 @@ proc DoMoonSpecial { n stuff fntag } {
     if {$phase < 0 || $phase > 3} {
 	return
     }
+
     switch -exact -- $phase {
-	0 { set win .moon_new }
+        0 { set win .moon_new }
-	1 { set win .moon_first }
+        1 { set win .moon_first }
-	2 { set win .moon_full }
+        2 { set win .moon_full }
-	3 { set win .moon_last }
+        3 { set win .moon_last }
     }
+
+    # We need two sets of moon phase windows.  There can be
+    # two of a given phase in the same month, but Tk does
+    # not allow the same embedded window in two separate
+    # text boxes.  So we use this hack to make sure
+    # we use a different window if the same moon phase
+    # happens twice in a month.
+    if {$day > 16} {
+        append win "2"
+    }
+
     .cal.t$n configure -state normal
     .cal.t$n window create 1.0 -window $win
 
@@ -3569,7 +3640,7 @@ proc DoMoonSpecial { n stuff fntag } {
             .cal.t$n tag bind $fntag <ButtonPress-1> "FireEditor .cal.t$n $fntag"
         }
     }
-    .cal.t$n configure -state disabled
+    .cal.t$n configure -state disabled -takefocus 0
 }
 #***********************************************************************
 # %PROCEDURE: DisplayTime
@@ -3607,8 +3678,12 @@ proc CreateMoonWindows {} {
     catch { destroy .moon_full  }
     catch { destroy .moon_last  }
 
+    catch { destroy .moon_new2  }
+    catch { destroy .moon_first2}
+    catch { destroy .moon_full2 }
+    catch { destroy .moon_last2 }
+
     set extra 1
-    #set wid [font measure CalboxFont 0]
     set wid [font metrics CalboxFont -ascent]
     set orig_wid $wid
     incr wid $extra
@@ -3619,24 +3694,32 @@ proc CreateMoonWindows {} {
     incr orig_wid $extra
 
     set w [expr $extra+$orig_wid]
-    canvas .moon_new -background $Option(BackgroundColor) -width $wid -height $wid -borderwidth 0 -highlightthickness 0
-    .moon_new create oval $extra $extra $w $w -outline $Option(TextColor) -width 1
 
-    canvas .moon_first -background $Option(BackgroundColor) -width $wid -height $wid -borderwidth 0 -highlightthickness 0
+    foreach win {.moon_new .moon_new2 } {
-    .moon_first create oval $extra $extra $w $w -outline $Option(TextColor) -width 1
+        canvas $win -background $Option(BackgroundColor) -width $wid -height $wid -borderwidth 0 -highlightthickness 0
-    .moon_first create arc $extra $extra $w $w -outline $Option(TextColor) -fill $Option(TextColor) -start 90 -extent 180 -outline {}
+        $win create oval $extra $extra $w $w -outline $Option(TextColor) -width 1
+        balloon_add_help $win "New Moon"
+    }
 
-    canvas .moon_full -background $Option(BackgroundColor) -width $wid -height $wid -borderwidth 0 -highlightthickness 0
+    foreach win {.moon_first .moon_first2 } {
-    .moon_full create oval $extra $extra $w $w -outline $Option(TextColor) -fill $Option(TextColor) -width 1
+        canvas $win -background $Option(BackgroundColor) -width $wid -height $wid -borderwidth 0 -highlightthickness 0
+        $win create oval $extra $extra $w $w -outline $Option(TextColor) -width 1
+        $win create arc $extra $extra $w $w -outline $Option(TextColor) -fill $Option(TextColor) -start 90 -extent 180 -outline {}
+        balloon_add_help $win "First Quarter"
+    }
 
-    canvas .moon_last -background $Option(BackgroundColor) -width $wid -height $wid -borderwidth 0 -highlightthickness 0
+    foreach win {.moon_full .moon_full2 } {
-    .moon_last create oval $extra $extra $w $w -outline $Option(TextColor) -width 1
+        canvas $win -background $Option(BackgroundColor) -width $wid -height $wid -borderwidth 0 -highlightthickness 0
-    .moon_last create arc $extra $extra $w $w -outline $Option(TextColor) -fill $Option(TextColor) -start 270 -extent 180 -outline {}
+        $win create oval $extra $extra $w $w -outline $Option(TextColor) -fill $Option(TextColor) -width 1
+        balloon_add_help $win  "Full Moon"
+    }
 
-    balloon_add_help .moon_new   "New Moon"
+    foreach win {.moon_last .moon_last2 } {
-    balloon_add_help .moon_first "First Quarter"
+        canvas $win -background $Option(BackgroundColor) -width $wid -height $wid -borderwidth 0 -highlightthickness 0
-    balloon_add_help .moon_full  "Full Moon"
+        $win create oval $extra $extra $w $w -outline $Option(TextColor) -width 1
-    balloon_add_help .moon_last  "Last Quarter"
+        $win create arc $extra $extra $w $w -outline $Option(TextColor) -fill $Option(TextColor) -start 270 -extent 180 -outline {}
+        balloon_add_help $win  "Last Quarter"
+    }
 }
 
 #***********************************************************************
@@ -3996,4 +4079,72 @@ proc FindConfigFile {} {
     set ConfigFile "~/.tkremindrc"
 }
 
+proc set_default_colors { w } {
+    global tmpOpt
+    set tmpOpt(BackgroundColor) "#d9d9d9"
+    set tmpOpt(LabelColor) "#000000"
+    set tmpOpt(LineColor) "#000000"
+    set tmpOpt(TextColor) "#000000"
+    set tmpOpt(TodayColor) "#00C0C0"
+    set tmpOpt(WinBackground) "#d9d9d9"
+    update_color_buttons $w
+}
+
+proc set_dark_colors { w } {
+    global tmpOpt
+    set tmpOpt(BackgroundColor) "#000000"
+    set tmpOpt(LabelColor) "#00ffff"
+    set tmpOpt(LineColor) "#0080fc"
+    set tmpOpt(TextColor) "#ffffff"
+    set tmpOpt(TodayColor) "#b000b6"
+    set tmpOpt(WinBackground) "#000000"
+    update_color_buttons $w
+}
+
+proc update_color_buttons { w } {
+    global tmpOpt
+    $w.bbgcolor configure -background $tmpOpt(BackgroundColor)
+    $w.bheadcolor configure -background $tmpOpt(LabelColor)
+    $w.gridbcolor configure -background $tmpOpt(LineColor)
+    $w.btextcolor configure -background $tmpOpt(TextColor)
+    $w.tbbgcolor configure -background $tmpOpt(TodayColor)
+    $w.bwincolor configure -background $tmpOpt(WinBackground)
+}
+
+proc set_button_to_queue {} {
+    .b.queue configure -text {Queue...} -command {DoQueue}
+}
+proc set_button_to_errors {} {
+    .b.queue configure -text {Errors...} -command {ShowErrors}
+}
+
+proc ShowErrors {} {
+    global RemindErrors
+    set w ".errors"
+    catch { destroy $w }
+    toplevel $w
+    text $w.t -width 80 -height 30 -wrap word -yscrollcommand "$w.sb set"
+    scrollbar $w.sb -orient vertical -command "$w.t yview"
+    button $w.ok -text OK -command DoneShowingErrors
+    grid $w.t -row 0 -column 0 -sticky nsew
+    grid $w.sb -row 0 -column 1 -sticky ns
+    grid $w.ok -row 1 -column 0 -stick w
+    grid columnconfigure $w 0 -weight 1
+    grid columnconfigure $w 1 -weight 0
+    grid rowconfigure $w 0 -weight 1
+    grid rowconfigure $w 1 -weight 0
+    $w.t insert end $RemindErrors
+    $w.t configure -state disabled
+    CenterWindow $w .
+}
+
+proc DoneShowingErrors {} {
+    global RemindErrors
+    set RemindErrors {}
+    set_button_to_queue
+    destroy .errors
+}
+
+# Rem2PS program to execute -- supply full path if you want
+
 main

src/calendar.c

@@ -15,6 +15,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <ctype.h>
 
 #include <stdlib.h>
@@ -26,6 +27,10 @@
 #include <wchar.h>
 #endif
 
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
 #include "types.h"
 #include "protos.h"
 #include "expr.h"
@@ -75,6 +80,8 @@ static struct line_drawing VT100Drawing = {
   "\x6c", "\x74", "\x6a", "\x71"
 };
 
+static int encoding_is_utf8 = 0;
+
 static struct line_drawing UTF8Drawing = {
     "", "",
     "\xe2\x94\xb4",
@@ -248,6 +255,17 @@ static void WriteBottomCalLine (void);
 static void WriteIntermediateCalLine (void);
 static void WriteCalDays (void);
 
+static void
+send_lrm(void)
+{
+    /* Send a lrm control sequence if UseUTF8Chars is enabled
+       or char encoding is UTF-8
+    */
+    if (UseUTF8Chars || encoding_is_utf8) {
+        printf("\xE2\x80\x8E");
+    }
+}
+
 static char const *
 despace(char const *s)
 {
@@ -587,6 +605,14 @@ void ProduceCalendar(void)
 {
     int y, m, d;
 
+    /* Check if current locale is UTF-8, if we have langinfo.h */
+#ifdef HAVE_LANGINFO_H
+    char const *encoding = nl_langinfo(CODESET);
+    if (!strcasecmp(encoding, "utf-8")) {
+        encoding_is_utf8 = 1;
+    }
+
+#endif
     if (UseUTF8Chars) {
 	linestruct = &UTF8Drawing;
     } else if (UseVTChars) {
@@ -975,6 +1001,10 @@ static void PrintLeft(char const *s, int width, char pad)
     while (*ws && wcwidth(*ws) == 0) {
         PutWideChar(*ws++);
     }
+
+    /* Possibly send lrm control sequence */
+    send_lrm();
+
     for (i=display_len; i<width; i++) fputc(pad, stdout);
     if (buf != static_buf) free(buf);
 #endif
@@ -1055,6 +1085,9 @@ static void PrintCentered(char const *s, int width, char *pad)
     while (*ws && wcwidth(*ws) == 0) {
         PutWideChar(*ws++);
     }
+    /* Possibly send lrm control sequence */
+    send_lrm();
+
     for (i=d+display_len; i<width; i++) fputs(pad, stdout);
     if (buf != static_buf) free(buf);
 #endif
@@ -1089,7 +1122,6 @@ static int WriteOneCalLine(void)
     return done;
 }
 
-
 /***************************************************************/
 /*                                                             */
 /*  WriteOneColLine                                            */
@@ -1140,9 +1172,14 @@ static int WriteOneColLine(int col)
             }
 	    if (iswspace(*ws)) {
                 wspace = ws;
-            }
-            if (wcwidth(*ws)) {
                 width++;
+            } else {
+                if (wcwidth(*ws)) {
+                    width += wcwidth(*ws);
+                    if (width > ColSpaces) {
+                        break;
+                    }
+                }
             }
 	    ws++;
 	}
@@ -1154,13 +1191,16 @@ static int WriteOneColLine(int col)
 
 	/* If we couldn't find a space char, print what we have. */
 	if (!wspace) {
-	    for (ws = e->wc_pos; ws - e->wc_pos < ColSpaces; ws++) {
+	    for (ws = e->wc_pos; numwritten < ColSpaces; ws++) {
 		if (!*ws) break;
                 if (iswspace(*ws)) {
                     putchar(' ');
                     numwritten++;
                 } else {
                     if (wcwidth(*ws) > 0) {
+                        if (numwritten + wcwidth(*ws) > ColSpaces) {
+                            break;
+                        }
                         numwritten += wcwidth(*ws);
                     }
                     PutWideChar(*ws);
@@ -1188,6 +1228,9 @@ static int WriteOneColLine(int col)
 	    printf("%s", Decolorize(e->r, e->g, e->b));
 	}
 
+        /* Possibly send lrm control sequence */
+        send_lrm();
+
 	/* Flesh out the rest of the column */
 	while(numwritten++ < ColSpaces) putchar(' ');
 
@@ -1824,6 +1867,13 @@ static int DoCalRem(ParsePtr p, int col)
 	e->next = CurCol;
 	CalColumn[col] = e;
 	SortCol(&CalColumn[col]);
+    } else {
+        /* Parse the rest of the line to catch expression-pasting errors */
+        while (ParseChar(p, &r, 0)) {
+            if (r != 0) {
+                return r;
+            }
+        }
     }
     return OK;
 }

src/config.h.in

@@ -20,6 +20,8 @@
 
 #undef HAVE_LOCALE_H
 
+#undef HAVE_LANGINFO_H
+
 #undef HAVE_GLOB
 
 #undef HAVE_SETENV

src/custom.h

@@ -116,7 +116,7 @@
 /*---------------------------------------------------------------------*/
 /* VAL_STACK_SIZE: The size of the operand stack for expr. parsing     */
 /*---------------------------------------------------------------------*/
-#define VAL_STACK_SIZE 500
+#define VAL_STACK_SIZE 1000
 
 /*---------------------------------------------------------------------*/
 /* INCLUDE_NEST: How many nested INCLUDES do we handle?                */

src/custom.h.in

@@ -116,7 +116,7 @@
 /*---------------------------------------------------------------------*/
 /* VAL_STACK_SIZE: The size of the operand stack for expr. parsing     */
 /*---------------------------------------------------------------------*/
-#define VAL_STACK_SIZE 500
+#define VAL_STACK_SIZE 1000
 
 /*---------------------------------------------------------------------*/
 /* INCLUDE_NEST: How many nested INCLUDES do we handle?                */

src/dorem.c

@@ -28,7 +28,7 @@ static int ParseTimeTrig (ParsePtr s, TimeTrig *tim, int save_in_globals);
 static int ParseLocalOmit (ParsePtr s, Trigger *t);
 static int ParseScanFrom (ParsePtr s, Trigger *t, int type);
 static int ParsePriority (ParsePtr s, Trigger *t);
-static int ParseUntil (ParsePtr s, Trigger *t);
+static int ParseUntil (ParsePtr s, Trigger *t, int type);
 static int ShouldTriggerBasedOnWarn (Trigger *t, int jul, int *err);
 static int ComputeTrigDuration(TimeTrig *t);
 
@@ -168,27 +168,37 @@ int DoRem(ParsePtr p)
 	FreeTrig(&trig);
 	return OK;
     }
-/* Queue the reminder, if necessary */
+
+    /* Queue the reminder, if necessary */
     if (jul == JulianToday &&
 	!(!IgnoreOnce &&
 	  trig.once != NO_ONCE &&
 	  FileAccessDate == JulianToday))
 	QueueReminder(p, &trig, &tim, trig.sched);
-/* If we're in daemon mode, do nothing over here */
+    /* If we're in daemon mode, do nothing over here */
     if (Daemon) {
 	FreeTrig(&trig);
 	return OK;
     }
 
+    r = OK;
     if (ShouldTriggerReminder(&trig, &tim, jul, &err)) {
 	if ( (r=TriggerReminder(p, &trig, &tim, jul)) ) {
 	    FreeTrig(&trig);
 	    return r;
 	}
+    } else {
+        /* Parse the rest of the line to catch any potential
+           expression-pasting errors */
+        while (ParseChar(p, &r, 0)) {
+            if (r != 0) {
+                break;
+            }
+        }
     }
 
     FreeTrig(&trig);
-    return OK;
+    return r;
 }
 
 /***************************************************************/
@@ -237,11 +247,15 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
     tim->delta = DefaultTDelta;
     tim->rep   = NO_REP;
     tim->duration = NO_TIME;
+    trig->need_wkday = 0;
+    trig->adj_for_last = 0;
+
     if (save_in_globals) {
 	LastTriggerTime = NO_TIME;
     }
 
-    while(1) {
+    int parsing = 1;
+    while(parsing) {
 	/* Read space-delimited string */
 	r = ParseToken(s, &buf);
 	if (r) return r;
@@ -249,6 +263,25 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	/* Figure out what we've got */
 	FindToken(DBufValue(&buf), &tok);
 	switch(tok.type) {
+        case T_In:
+            /* Completely ignored */
+	    DBufFree(&buf);
+            break;
+
+        case T_Ordinal:
+            DBufFree(&buf);
+            if (trig->d != NO_DAY)     return E_DAY_TWICE;
+            if (tok.val < 0) {
+                if (trig->back != NO_BACK) return E_BACK_TWICE;
+                trig->back = -7;
+                trig->d = 1;
+                trig->adj_for_last = 1;
+            } else {
+                trig->d = 1 + 7 * tok.val;
+            }
+            trig->need_wkday = 1;
+            break;
+
 	case T_Date:
 	    DBufFree(&buf);
 	    if (trig->d != NO_DAY) return E_DAY_TWICE;
@@ -322,7 +355,6 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    DBufFree(&buf);
 	    trig->typ = tok.val;
 	    if (s->isnested) return E_CANT_NEST_RTYPE;
-	    if (trig->scanfrom == NO_DATE) trig->scanfrom = JulianToday;
 	    if (trig->typ == PASSTHRU_TYPE) {
 		r = ParseToken(s, &buf);
 		if (r) return r;
@@ -332,19 +364,20 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 		}
 		StrnCpy(trig->passthru, DBufValue(&buf), PASSTHRU_LEN);
 	    }
-	    return OK;
+            parsing = 0;
+            break;
 
 	case T_Through:
 	    DBufFree(&buf);
 	    if (trig->rep != NO_REP) return E_REP_TWICE;
 	    trig->rep = 1;
-	    r = ParseUntil(s, trig);
+	    r = ParseUntil(s, trig, tok.type);
 	    if (r) return r;
 	    break;
 
 	case T_Until:
 	    DBufFree(&buf);
-	    r=ParseUntil(s, trig);
+	    r=ParseUntil(s, trig, tok.type);
 	    if (r) return r;
 	    break;
 
@@ -378,6 +411,15 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    trig->back = tok.val;
 	    break;
 
+	case T_BackAdj:
+	    DBufFree(&buf);
+	    if (trig->back != NO_BACK) return E_BACK_TWICE;
+	    if (trig->d != NO_DAY) return E_DAY_TWICE;
+	    trig->back = tok.val;
+            trig->d = 1;
+            trig->adj_for_last = 1;
+	    break;
+
 	case T_Once:
 	    DBufFree(&buf);
 	    if (trig->once != NO_ONCE) return E_ONCE_TWICE;
@@ -392,7 +434,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	case T_Omit:
 	    DBufFree(&buf);
 	    if (trig->omitfunc[0]) {
-		Eprint("Warning: OMIT is ignored if you use OMITFUNC");
+		Wprint("Warning: OMIT is ignored if you use OMITFUNC");
 	    }
 
 	    r = ParseLocalOmit(s, trig);
@@ -401,12 +443,12 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 
 	case T_Empty:
 	    DBufFree(&buf);
-	    if (trig->scanfrom == NO_DATE) trig->scanfrom = JulianToday;
+            parsing = 0;
-	    return OK;
+            break;
 
 	case T_OmitFunc:
 	    if (trig->localomit) {
-		Eprint("Warning: OMIT is ignored if you use OMITFUNC");
+		Wprint("Warning: OMIT is ignored if you use OMITFUNC");
 	    }
 	    r=ParseToken(s, &buf);
 	    if (r) return r;
@@ -474,10 +516,58 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    DBufFree(&buf);
 	    trig->typ = MSG_TYPE;
 	    if (s->isnested) return E_CANT_NEST_RTYPE;
-	    if (trig->scanfrom == NO_DATE) trig->scanfrom = JulianToday;
+            parsing = 0;
-	    return OK;
+            break;
 	}
     }
+
+    if (trig->need_wkday && trig->wd == NO_WD) {
+        Eprint("Weekday name(s) required");
+        return E_PARSE_ERR;
+    }
+
+    /* Adjust month and possibly year */
+    if (trig->adj_for_last) {
+        if (trig->m != NO_MON) {
+            trig->m++;
+            if (trig->m >= 12) {
+                trig->m = 0;
+                if (trig->y != NO_YR) {
+                    trig->y++;
+                }
+            }
+        }
+        trig->adj_for_last = 0;
+    }
+
+    /* Check for some warning conditions */
+    if (!s->nonconst_expr) {
+        if (trig->y != NO_YR && trig->m != NO_MON && trig->d != NO_DAY && trig->until != NO_UNTIL) {
+            if (Julian(trig->y, trig->m, trig->d) > trig->until) {
+                Wprint("Warning: UNTIL/THROUGH date earlier than start date");
+            }
+        }
+        if (trig->from != NO_DATE) {
+            if (trig->until != NO_UNTIL && trig->until < trig->from) {
+                Wprint("Warning: UNTIL/THROUGH date earlier than FROM date");
+            }
+        } else if (trig->scanfrom != NO_DATE) {
+            if (trig->until != NO_UNTIL && trig->until < trig->scanfrom) {
+                Wprint("Warning: UNTIL/THROUGH date earlier than SCANFROM date");
+            }
+        }
+    }
+
+    if (trig->y != NO_YR && trig->m != NO_MON && trig->d != NO_DAY && trig->until != NO_UNTIL && trig->rep == NO_REP) {
+        Wprint("Warning: Useless use of UNTIL with fully-specified date and no *rep");
+    }
+
+    /* Set scanfrom to default if not set explicitly */
+    if (trig->scanfrom == NO_DATE) {
+        trig->scanfrom = JulianToday;
+    }
+
+    return OK;
 }
 
 /***************************************************************/
@@ -568,12 +658,18 @@ static int ParseLocalOmit(ParsePtr s, Trigger *t)
 /*  ParseUntil - parse the UNTIL portion of a reminder         */
 /*                                                             */
 /***************************************************************/
-static int ParseUntil(ParsePtr s, Trigger *t)
+static int ParseUntil(ParsePtr s, Trigger *t, int type)
 {
     int y = NO_YR,
 	m = NO_MON,
 	d = NO_DAY;
 
+    char const *which;
+    if (type == T_Until) {
+        which = "UNTIL";
+    } else {
+        which = "THROUGH";
+    }
     Token tok;
     int r;
     DynamicBuffer buf;
@@ -589,7 +685,7 @@ static int ParseUntil(ParsePtr s, Trigger *t)
 	case T_Year:
 	    DBufFree(&buf);
 	    if (y != NO_YR) {
-		Eprint("UNTIL: %s", ErrMsg[E_YR_TWICE]);
+		Eprint("%s: %s", which, ErrMsg[E_YR_TWICE]);
 		return E_YR_TWICE;
 	    }
 	    y = tok.val;
@@ -598,7 +694,7 @@ static int ParseUntil(ParsePtr s, Trigger *t)
 	case T_Month:
 	    DBufFree(&buf);
 	    if (m != NO_MON) {
-		Eprint("UNTIL: %s", ErrMsg[E_MON_TWICE]);
+		Eprint("%s: %s", which, ErrMsg[E_MON_TWICE]);
 		return E_MON_TWICE;
 	    }
 	    m = tok.val;
@@ -607,7 +703,7 @@ static int ParseUntil(ParsePtr s, Trigger *t)
 	case T_Day:
 	    DBufFree(&buf);
 	    if (d != NO_DAY) {
-		Eprint("UNTIL: %s", ErrMsg[E_DAY_TWICE]);
+		Eprint("%s: %s", which, ErrMsg[E_DAY_TWICE]);
 		return E_DAY_TWICE;
 	    }
 	    d = tok.val;
@@ -616,15 +712,15 @@ static int ParseUntil(ParsePtr s, Trigger *t)
 	case T_Date:
 	    DBufFree(&buf);
 	    if (y != NO_YR) {
-		Eprint("UNTIL: %s", ErrMsg[E_YR_TWICE]);
+		Eprint("%s: %s", which, ErrMsg[E_YR_TWICE]);
 		return E_YR_TWICE;
 	    }
 	    if (m != NO_MON) {
-		Eprint("UNTIL: %s", ErrMsg[E_MON_TWICE]);
+		Eprint("%s: %s", which, ErrMsg[E_MON_TWICE]);
 		return E_MON_TWICE;
 	    }
 	    if (d != NO_DAY) {
-		Eprint("UNTIL: %s", ErrMsg[E_DAY_TWICE]);
+		Eprint("%s: %s", which, ErrMsg[E_DAY_TWICE]);
 		return E_DAY_TWICE;
 	    }
 	    FromJulian(tok.val, &y, &m, &d);
@@ -632,7 +728,7 @@ static int ParseUntil(ParsePtr s, Trigger *t)
 
 	default:
 	    if (y == NO_YR || m == NO_MON || d == NO_DAY) {
-		Eprint("UNTIL: %s", ErrMsg[E_INCOMPLETE]);
+		Eprint("%s: %s", which, ErrMsg[E_INCOMPLETE]);
 		DBufFree(&buf);
 		return E_INCOMPLETE;
 	    }

src/expr.c

@@ -44,21 +44,32 @@ static int MakeValue (char const *s, Value *v, Var *locals, ParsePtr p);
 
 /* Binary operators - all left-associative */
 
+/* Operator precedence:
+ *   Highest:    Unary -    Unary !
+ *               /   %
+ *               +   -
+ *               <   <=   >   >=
+ *               ==   !=
+ *               &&
+ *    Lowest:    ||
+ *
+ */
+
 /* Make SURE they are sorted lexically... this may die on an EBCDIC
    system... */
 
 Operator BinOp[] = {
     { "!=", 15, BIN_OP, NotEqual },
-    { "%", 20, BIN_OP, Mod },
+    { "%",  20, BIN_OP, Mod },
     { "&&", 14, BIN_OP, LogAND },
-    { "*", 20, BIN_OP, Multiply },
+    { "*",  20, BIN_OP, Multiply },
-    { "+", 18, BIN_OP, Add },
+    { "+",  18, BIN_OP, Add },
-    { "-", 18, BIN_OP, Subtract },
+    { "-",  18, BIN_OP, Subtract },
-    { "/", 20, BIN_OP, Divide },
+    { "/",  20, BIN_OP, Divide },
-    { "<", 16, BIN_OP, LessThan },
+    { "<",  16, BIN_OP, LessThan },
     { "<=", 16, BIN_OP, LessOrEqual },
     { "==", 15, BIN_OP, EqualTo },
-    { ">", 16, BIN_OP, GreaterThan },
+    { ">",  16, BIN_OP, GreaterThan },
     { ">=", 16, BIN_OP, GreaterOrEqual },
     { "||", 12, BIN_OP, LogOR },
 };
@@ -66,8 +77,8 @@ Operator BinOp[] = {
 
 /* These ones must be sorted too. */
 Operator UnOp[] = {
-    { "!", 22, UN_OP, LogNot },
+    { "!",  22, UN_OP, LogNot },
-    { "-", 22, UN_OP, UnMinus },
+    { "-",  22, UN_OP, UnMinus },
 };
 #define NUM_UN_OPS (sizeof(UnOp) / sizeof(Operator))
 
@@ -75,7 +86,8 @@ extern BuiltinFunc Func[];
 
 Operator OpStack[OP_STACK_SIZE];
 Value    ValStack[VAL_STACK_SIZE];
-int OpStackPtr, ValStackPtr;
+int      OpStackPtr = 0;
+int      ValStackPtr = 0;
 
 /***************************************************************/
 /*                                                             */
@@ -115,12 +127,13 @@ static int DebugPerform(Operator *op)
 /*  Clean the stack after an error occurs.                     */
 /*                                                             */
 /***************************************************************/
-static void CleanStack(void)
+static void CleanStack(int old_op_stack_ptr, int old_val_stack_ptr)
 {
     int i;
 
-    for (i=0; i<ValStackPtr; i++) DestroyValue(ValStack[i]);
+    for (i=old_val_stack_ptr; i<ValStackPtr; i++) DestroyValue(ValStack[i]);
-    ValStackPtr = 0;
+    ValStackPtr = old_val_stack_ptr;
+    OpStackPtr = old_op_stack_ptr;
 }
 
 /***************************************************************/
@@ -306,8 +319,8 @@ int EvalExpr(char const **e, Value *v, ParsePtr p)
 {
     int r;
 
-    OpStackPtr = 0;
+    int old_op_stack_ptr = OpStackPtr;
-    ValStackPtr = 0;
+    int old_val_stack_ptr = ValStackPtr;
 
     r = Evaluate(e, NULL, p);
 
@@ -316,11 +329,15 @@ int EvalExpr(char const **e, Value *v, ParsePtr p)
     DBufFree(&ExprBuf);
 
     if (r) {
-	CleanStack();
+	CleanStack(old_op_stack_ptr, old_val_stack_ptr);
+        /* fprintf(stderr, "O=%d V=%d\n", OpStackPtr, ValStackPtr); */
 	return r;
     }
-    *v = *ValStack;
+    OpStackPtr = old_op_stack_ptr;
-    ValStack[0].type = ERR_TYPE;
+    ValStackPtr = old_val_stack_ptr;
+    *v = ValStack[old_val_stack_ptr];
+    ValStack[old_val_stack_ptr].type = ERR_TYPE;
+    /* fprintf(stderr, "O=%d V=%d\n", OpStackPtr, ValStackPtr); */
     return r;
 }
 
@@ -1108,13 +1125,16 @@ static int LogOR(void)
 	return r;
     }
 
-    if (v1.type == INT_TYPE && v2.type == INT_TYPE) {
+    if (v1.type != v2.type || v1.type == STR_TYPE || v2.type == STR_TYPE) {
-	v1.v.val = (v1.v.val || v2.v.val) ? 1 : 0;
+        DestroyValue(v1); DestroyValue(v2);
-	PushValStack(v1);
+        return E_BAD_TYPE;
-	return OK;
     }
-    DestroyValue(v1); DestroyValue(v2);
+
-    return E_BAD_TYPE;
+    if (v1.v.val == 0) {
+        v1.v.val = v2.v.val;
+    }
+    PushValStack(v1);
+    return OK;
 }
 
 /***************************************************************/
@@ -1135,13 +1155,15 @@ static int LogAND(void)
 	return r;
     }
 
-    if (v1.type == INT_TYPE && v2.type == INT_TYPE) {
+    if (v1.type != v2.type || v1.type == STR_TYPE || v2.type == STR_TYPE) {
-	v1.v.val = (v1.v.val && v2.v.val) ? 1 : 0;
+        DestroyValue(v1); DestroyValue(v2);
-	PushValStack(v1);
+        return E_BAD_TYPE;
-	return OK;
     }
-    DestroyValue(v1); DestroyValue(v2);
+    if (v1.v.val != 0) {
-    return E_BAD_TYPE;
+        v1.v.val = v2.v.val;
+    }
+    PushValStack(v1);
+    return OK;
 }
 
 /***************************************************************/

src/funcs.c

@@ -58,6 +58,7 @@ static int FADusk          (func_info *);
 static int FAbs            (func_info *);
 static int FAccess         (func_info *);
 static int FAmpm           (func_info *);
+static int FTrig           (func_info *);
 static int FIsAny          (func_info *);
 static int FArgs           (func_info *);
 static int FAsc            (func_info *);
@@ -126,6 +127,7 @@ static int FSunset         (func_info *);
 static int FTime           (func_info *);
 static int FTimepart       (func_info *);
 static int FToday          (func_info *);
+static int FTrig           (func_info *);
 static int FTrigback       (func_info *);
 static int FTrigdate       (func_info *);
 static int FTrigdatetime   (func_info *);
@@ -279,6 +281,7 @@ BuiltinFunc Func[] = {
     {   "time",         2,      2,      1,          FTime   },
     {   "timepart",     1,      1,      1,          FTimepart },
     {   "today",        0,      0,      0,          FToday  },
+    {   "trig",         0,      NO_MAX, 0,          FTrig },
     {   "trigback",     0,      0,      0,          FTrigback },
     {   "trigdate",     0,      0,      0,          FTrigdate },
     {   "trigdatetime", 0,      0,      0,          FTrigdatetime },
@@ -2411,8 +2414,7 @@ static int FPsshade(func_info *info)
 
     if (!psshade_warned) {
 	psshade_warned = 1;
-	Eprint("psshade() is deprecated; use SPECIAL SHADE instead.");
+	Wprint("psshade() is deprecated; use SPECIAL SHADE instead.");
-        FreshLine = 1;
     }
 
     sprintf(s, "/_A LineWidth 2 div def ");
@@ -2467,8 +2469,7 @@ static int FPsmoon(func_info *info)
     }
     if (!psmoon_warned) {
 	psmoon_warned = 1;
-	Eprint("psmoon() is deprecated; use SPECIAL MOON instead.");
+	Wprint("psmoon() is deprecated; use SPECIAL MOON instead.");
-        FreshLine = 1;
     }
     if (size > 0) {
 	sprintf(sizebuf, "%d", size);
@@ -2971,8 +2972,12 @@ FEvalTrig(func_info *info)
     CreateParser(ARGSTR(0), &p);
     p.allownested = 0;
     r = ParseRem(&p, &trig, &tim, 0);
-    if (r) return r;
+    if (r) {
+        DestroyParser(&p);
+        return r;
+    }
     if (trig.typ != NO_TYPE) {
+        DestroyParser(&p);
 	FreeTrig(&trig);
 	return E_PARSE_ERR;
     }
@@ -2981,7 +2986,7 @@ FEvalTrig(func_info *info)
     } else {
 	/* Hokey... */
 	if (trig.scanfrom != JulianToday) {
-	    Eprint("Warning: SCANFROM is ignored in two-argument form of evaltrig()");
+	    Wprint("Warning: SCANFROM is ignored in two-argument form of evaltrig()");
 	}
 	jul = ComputeTrigger(scanfrom, &trig, &tim, &r, 0);
     }
@@ -2990,6 +2995,7 @@ FEvalTrig(func_info *info)
         jul = -1;
     }
     FreeTrig(&trig);
+    DestroyParser(&p);
     if (r) return r;
     if (jul < 0) {
 	RetVal.type = INT_TYPE;
@@ -3003,3 +3009,59 @@ FEvalTrig(func_info *info)
     }
     return OK;
 }
+
+static int LastTrig = 0;
+static int
+FTrig(func_info *info)
+{
+    Parser p;
+    Trigger trig;
+    TimeTrig tim;
+    int jul;
+    int r;
+    int i;
+
+    RetVal.type = DATE_TYPE;
+    if (Nargs == 0) {
+        RETVAL = LastTrig;
+        return OK;
+    }
+
+    for (i=0; i<Nargs; i++) {
+        ASSERT_TYPE(i, STR_TYPE);
+    }
+
+    RETVAL = 0;
+
+    for (i=0; i<Nargs; i++) {
+        CreateParser(ARGSTR(i), &p);
+        p.allownested = 0;
+        r = ParseRem(&p, &trig, &tim, 0);
+        if (r) {
+            DestroyParser(&p);
+            return r;
+        }
+        if (trig.typ != NO_TYPE) {
+            DestroyParser(&p);
+            FreeTrig(&trig);
+            return E_PARSE_ERR;
+        }
+	jul = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 0);
+
+        if (r == E_CANT_TRIG) {
+            DestroyParser(&p);
+            FreeTrig(&trig);
+            continue;
+        }
+        if (ShouldTriggerReminder(&trig, &tim, jul, &r)) {
+            LastTrig = jul;
+            RETVAL = jul;
+            DestroyParser(&p);
+            FreeTrig(&trig);
+            return OK;
+        }
+        DestroyParser(&p);
+        FreeTrig(&trig);
+    }
+    return OK;
+}

src/globals.h

@@ -88,7 +88,7 @@ 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);
+EXTERN  INIT(   int     MaxSatIter, 1000);
 EXTERN  INIT(   int     MaxStringLen, MAX_STR_LEN);
 EXTERN  INIT(	char	*FileName, NULL);
 EXTERN	INIT(	int	UseStdin, 0);

src/init.c

@@ -698,7 +698,7 @@ void Usage(void)
     fprintf(ErrFp, " -d...  Debug: e=echo x=expr-eval t=trig v=dumpvars l=showline f=tracefiles\n");
     fprintf(ErrFp, " -e     Divert messages normally sent to stderr to stdout\n");
     fprintf(ErrFp, " -b[n]  Time format for cal: 0=am/pm, 1=24hr, 2=none\n");
-    fprintf(ErrFp, " -x[n]  Iteration limit for SATISFY clause (def=150)\n");
+    fprintf(ErrFp, " -x[n]  Iteration limit for SATISFY clause (def=1000)\n");
     fprintf(ErrFp, " -kcmd  Run `cmd' for MSG-type reminders\n");
     fprintf(ErrFp, " -g[dddd] Sort reminders by date, time, priority, and 'timedness'\n");
     fprintf(ErrFp, " -ivar=val Initialize var to val and preserve var\n");

src/langs/finnish.h

@@ -283,7 +283,7 @@ void Usage(void)
     fprintf(ErrFp, " -d...  Virheenetsintä: e=echo x=expr-eval t=trig v=dumpvars l=showline\n");
     fprintf(ErrFp, " -e     Ohjaa virhetulostus stdout-vuohon\n");
     fprintf(ErrFp, " -b[n]  Ajan ilmaisu: 0=ap/ip, 1=24 tuntia, 2=ei aikoja\n");
-    fprintf(ErrFp, " -x[n]  SATISFY-lauseen toistoraja (oletus 150)\n");
+    fprintf(ErrFp, " -x[n]  SATISFY-lauseen toistoraja (oletus 1000)\n");
     fprintf(ErrFp, " -kcmd  Suorita 'cmd' MSG-tyyppisille viesteille\n");
     fprintf(ErrFp, " -g[ddd] Lajittele viestit päiväyksen, ajan ja tärkeyden mukaan\n");
     fprintf(ErrFp, " -ivar=val Alusta muuttuja var arvolla val ja säilytä var\n");

src/langs/french.h

@@ -258,7 +258,7 @@ void Usage(void)
     fprintf(ErrFp, " -d...  Debug: e=echo x=expr-eval t=trig v=dumpvars l=showline\n");
     fprintf(ErrFp, " -e     Envoyer les messages de stderr à stdout\n");
     fprintf(ErrFp, " -b[n]  Formats de l'heure pour le calendrier: 0=am/pm, 1=24hr, 2=aucun\n");
-    fprintf(ErrFp, " -x[n]  Limite d'itérations pour la clause SATISFY (def=150)\n");
+    fprintf(ErrFp, " -x[n]  Limite d'itérations pour la clause SATISFY (def=1000)\n");
     fprintf(ErrFp, " -kcmd  Exécuter 'cmd' pour les rappels de type MSG\n");
     fprintf(ErrFp, " -g[ddd] Trier les rappels par date, heure et priorité avant d'émettre\n");
     fprintf(ErrFp, " -ivar=val Initialiser var à val et conserver var\n");

src/langs/polish.h

@@ -270,7 +270,7 @@ void Usage(void)
     fprintf(ErrFp, " -d...  Odpluskwianie: e=echo x=expr-eval t=trig v=dumpvars l=showline\n");
     fprintf(ErrFp, " -e     Komunikaty o błędach skieruj na stdout\n");
     fprintf(ErrFp, " -b[n]  Format czasu: 0=am/pm, 1=24godz., 2=żaden\n");
-    fprintf(ErrFp, " -x[n]  Limit powtórzeń klauzuli SATISFY (domyślnie=150)\n");
+    fprintf(ErrFp, " -x[n]  Limit powtórzeń klauzuli SATISFY (domyślnie=1000)\n");
     fprintf(ErrFp, " -kcmd  Wywołaj 'cmd' dla przypomnień typu MSG\n");
     fprintf(ErrFp, " -g[ddd] Sortuj przypomnienia według daty, czasu i priorytetu\n");
     fprintf(ErrFp, " -ivar=val Zainicjuj zmienną var wartościa val i zachowaj ja\n");

src/langs/portbr.h

@@ -283,7 +283,7 @@ void Usage(void)
     fprintf(ErrFp, " -d...  Debug: e=echo x=expr-eval t=trigger v=dumpvars l=showline\n");
     fprintf(ErrFp, " -e     Desvia mensagens normalmente enviadas a stderr para stdout\n");
     fprintf(ErrFp, " -b[n]  Formato da hora para o cal: 0=am/pm, 1=24hr, 2=nenhum\n");
-    fprintf(ErrFp, " -x[n]  Limite de iteracoes para a clausula SATISFY (default=150)\n");
+    fprintf(ErrFp, " -x[n]  Limite de iteracoes para a clausula SATISFY (default=1000)\n");
     fprintf(ErrFp, " -kcmd  Executa `cmd' para os compromissos com MSG\n");
     fprintf(ErrFp, " -g[ddd] Classifica compromissos por data, hora e prioridade antes de exibir\n");
     fprintf(ErrFp, " -ivar=val Inicializa (e preserva) variavel var com val\n");

src/main.c

@@ -568,6 +568,29 @@ int EvaluateExpr(ParsePtr p, Value *v)
     return OK;
 }
 
+/***************************************************************/
+/*                                                             */
+/*  Wprint - print a warning message.                          */
+/*                                                             */
+/***************************************************************/
+void Wprint(char const *fmt, ...)
+{
+    va_list argptr;
+
+
+    if (FileName) {
+	if (strcmp(FileName, "-"))
+	    (void) fprintf(ErrFp, "%s(%d): ", FileName, LineNo);
+	else
+	    (void) fprintf(ErrFp, "-stdin-(%d): ", LineNo);
+    }
+
+    va_start(argptr, fmt);
+    (void) vfprintf(ErrFp, fmt, argptr);
+    (void) fputc('\n', ErrFp);
+    va_end(argptr);
+    return;
+}
 /***************************************************************/
 /*                                                             */
 /*  Eprint - print an error message.                           */

src/omit.c

@@ -463,7 +463,7 @@ DoThroughOmit(ParsePtr p, int ystart, int mstart, int dstart)
     end   = Julian(yend,   mend,   dend);
 
     if (end < start) {
-	Eprint("Warning: Swapping dates on OMIT ... THROUGH ... line");
+	Wprint("Warning: Swapping dates on OMIT ... THROUGH ... line");
 	tmp = start;
 	start = end;
 	end = tmp;

src/protos.h

@@ -62,6 +62,7 @@ int EvaluateExpr (ParsePtr p, Value *v);
 int Evaluate (char const **s, Var *locals, ParsePtr p);
 int FnPopValStack (Value *val);
 void Eprint (char const *fmt, ...);
+void Wprint (char const *fmt, ...);
 void OutputLine (FILE *fp);
 void CreateParser (char const *s, ParsePtr p);
 void DestroyParser (ParsePtr p);

src/token.c

@@ -43,30 +43,36 @@ Token TokArray[] = {
     { "at",		2,	T_At,		0 },
     { "august",		3,	T_Month,	7 },
     { "banner",		3,	T_Banner,	0 },
-    { "before",	3,	T_Skip,	BEFORE_SKIP },
+    { "before",	        3,	T_Skip,	        BEFORE_SKIP },
     { "cal",		3,	T_RemType,	CAL_TYPE },
     { "clear-omit-context", 5,   T_Clr,         0 },
-    { "debug",          5,      T_Debug,       0 },
+    { "debug",          5,      T_Debug,        0 },
     { "december",	3,	T_Month,       11 },
     { "do",     	2,	T_IncludeR,	0 },
-    { "dumpvars",       4,      T_Dumpvars,    0 },
+    { "dumpvars",       4,      T_Dumpvars,     0 },
     { "duration",       3,      T_Duration,     0 },
-    { "else",		4,	T_Else,	0 },
+    { "else",		4,	T_Else,	        0 },
     { "endif",		5,	T_EndIf,	0 },
-    { "errmsg",         6,      T_ErrMsg,      0 },
+    { "errmsg",         6,      T_ErrMsg,       0 },
     { "exit",		4,	T_Exit,		0 },
     { "february",	3,	T_Month,	1 },
+    { "first",          5,      T_Ordinal,      0 },
     { "flush",		5,	T_Flush,	0 },
+    { "fourth",         6,      T_Ordinal,      3 },
     { "friday",		3,	T_WkDay,	4 },
     { "from",		4,	T_Scanfrom,	FROM_TYPE },
     { "fset",		4,	T_Fset,		0 },
     { "if",		2,	T_If,		0 },
     { "iftrig",		6,	T_IfTrig,	0 },
+    { "in",             2,      T_In,           0 },
     { "include",	3,	T_Include,	0 },
     { "includecmd",     10,     T_IncludeCmd,   0 },
     { "january",	3,	T_Month,	0 },
     { "july",		3,	T_Month,	6 },
     { "june",		3,	T_Month,	5 },
+    { "last",           4,      T_Ordinal,     -1 },
+    { "lastday",        7,      T_BackAdj,     -1 },
+    { "lastworkday",    11,     T_BackAdj,      1 },
     { "march",		3,	T_Month,	2 },
     { "may",		3,	T_Month,	4 },
     { "maybe-uncomputable", 5,  T_MaybeUncomputable, 0},
@@ -90,12 +96,14 @@ Token TokArray[] = {
     { "saturday",	3,	T_WkDay,	5 },
     { "scanfrom",	4,	T_Scanfrom,	SCANFROM_TYPE },
     { "sched",		5,	T_Sched,	0 },
+    { "second",         6,      T_Ordinal,      1 },
     { "september",	3,	T_Month,	8 },
     { "set",		3,	T_Set,		0 },
     { "skip",		3,	T_Skip,	SKIP_SKIP },
     { "special",        7,      T_RemType,      PASSTHRU_TYPE },
     { "sunday",		3,	T_WkDay,	6 },
     { "tag",            3,      T_Tag,          0 },
+    { "third",          5,      T_Ordinal,      2 },
     { "through",        7,      T_Through,      0 },
     { "thursday",	3,	T_WkDay,	3 },
     { "tuesday",	3,	T_WkDay,	1 },
@@ -325,6 +333,14 @@ void FindNumericToken(char const *s, Token *t)
 	t->type = T_Back;
 	t->val *= mult;
 	return;
+    } else if (*s == '~') {
+	s++;
+	if (*s == '~') { mult = -1; s++; }
+	PARSENUM(t->val, s);
+	if (*s) return;  /* Illegal token if followed by non-numeric char */
+	t->type = T_BackAdj;
+	t->val *= mult;
+	return;
     }
     return;  /* Unknown token type */
 }

src/types.h

@@ -69,6 +69,8 @@ typedef struct {
     int once;
     int scanfrom;
     int from;
+    int adj_for_last;            /* Adjust month/year for use of LAST */
+    int need_wkday;              /* Set if we *need* a weekday */
     int priority;
     int duration_days;           /* Duration converted to days to search */
     int eventstart;              /* Original event start (datetime) */
@@ -157,7 +159,8 @@ enum TokTypes
   T_AddOmit,
   T_WkDay,
   T_Month, T_Time, T_Date, T_DateTime,
-  T_Skip, T_At, T_RemType, T_Until, T_Year, T_Day, T_Rep, T_Delta, T_Back,
+  T_Skip, T_At, T_RemType, T_Until, T_Year, T_Day, T_Rep, T_Delta,
+  T_Back, T_BackAdj,
   T_Once,
   T_Empty,
   T_Comment,
@@ -175,7 +178,10 @@ enum TokTypes
   T_LongTime,
   T_OmitFunc,
   T_Through,
-  T_MaybeUncomputable
+  T_MaybeUncomputable,
+  T_Ordinal,
+  T_In,
+  T_LastBack
 };
 
 /* The structure of a token */

src/userfns.c

@@ -167,7 +167,7 @@ int DoFset(ParsePtr p)
     /* Add the function definition */
     FSet(func);
     if (orig_namelen > VAR_NAME_LEN) {
-	Eprint("Warning: Function name `%s...' truncated to `%s'",
+	Wprint("Warning: Function name `%s...' truncated to `%s'",
 	       func->name, func->name);
     }
     return OK;

src/var.c

@@ -43,8 +43,7 @@ typedef int (*SysVarFunc)(int, Value *);
 static void deprecated_var(char const *var, char const *instead)
 {
     if (DebugFlag & DB_PRTLINE) {
-        Eprint("%s is deprecated; use %s instead", var, instead);
+        Wprint("%s is deprecated; use %s instead", var, instead);
-        FreshLine = 1;
     }
 }
 
@@ -508,7 +507,7 @@ int DoSet (Parser *p)
     if (*DBufValue(&buf) == '$') r = SetSysVar(DBufValue(&buf)+1, &v);
     else r = SetVar(DBufValue(&buf), &v);
     if (buf.len > VAR_NAME_LEN) {
-	Eprint("Warning: Variable name `%.*s...' truncated to `%.*s'",
+	Wprint("Warning: Variable name `%.*s...' truncated to `%.*s'",
 	       VAR_NAME_LEN, DBufValue(&buf), VAR_NAME_LEN, DBufValue(&buf));
     }
     DBufFree(&buf);
@@ -908,9 +907,7 @@ int GetSysVar(char const *name, Value *val)
     /* In "verbose" mode, print attempts to test $RunOff */
     if (DebugFlag & DB_PRTLINE) {
 	if (v->value == (void *) &RunDisabled) {
-	    Eprint("(Security note: $RunOff variable tested.)");
+	    Wprint("(Security note: $RunOff variable tested.)");
-	    /* Allow further messages from this line */
-	    FreshLine = 1;
 	}
     }
     return OK;

tests/scripts.rem

@@ -27,7 +27,7 @@ SET $December "दिसंबर"
 REM 1 MSG Përkujtues
 REM 2 SPECIAL SHADE 192 192 255
 REM 2 MSG تذكير
-REM 3 MSG 提醒
+REM 3 MSG 提醒提醒提醒提醒提醒提醒提醒提醒
 REM 4 MSG રીમાઇન્ડર
 REM 5 MSG Emlékeztető
 REM 6 MSG Áminning
@@ -57,6 +57,7 @@ REM 24 MSG リマインダー
 REM 25 MSG Искә төшерү
 REM 26 MSG Напомняне
 REM 27 MSG ഓർമ്മപ്പെടുത്തൽ
+REM 28 MSG リaリaaリaaリaaリaaリaaリaaリaaリaaリaaリa
 REM 1 SPECIAL SHADE 192 255 192
 REM 14 SPECIAL SHADE 255 192 192
 REM 14 SPECIAL PANGO <span face="Zapf Chancery" size="15000">This is so <span foreground="blue">fancy</span></span>

tests/test-rem

@@ -321,7 +321,8 @@ if test -z "$LC_ALL" ; then
 fi
 
 if test "$OK" = 0 ; then
-    export LC_ALL=en_US.utf-8
+    export LC_ALL=C.UTF-8
+    export LANG=C.UTF-8
 fi
 
 ../src/remind -w128 -c ../tests/utf-8.rem 1 Nov 2019 >> ../tests/test.out

tests/test.rem

@@ -524,6 +524,22 @@ msg [$Uw]%
 msg [$Uy]%
 msg [$Wednesday]%
 
+# Diagnose until before start date, only for non-constant expressions and
+# fully-specified start date
+REM Mon 1992 UNTIL 1991-01-01 MSG Not diagnosed - not fully-specified start
+REM 1992-01-01 *1 UNTIL 1991-12-31 MSG Diagnosed
+set x '1992-01-01'
+REM [x] *1 UNTIL 1991-12-31 MSG Not diagnosed - nonconst expression
+
+REM MON FROM 1992-01-01 UNTIL 1991-12-31 Diagnosed
+REM MON SCANFROM 1992-01-01 UNTIL 1991-12-31 Diagnosed
+
+REM MON FROM [x] UNTIL 1991-12-31 Not diagnosed
+REM MON SCANFROM [x] UNTIL 1991-12-31 Not diagnosed
+
+REM 1992-01-01 UNTIL 1992-02-02 MSG Diagnosed
+REM [x] UNTIL 1992-02-02 MSG Diagnosed
+
 dump $aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 OMIT 2010-09-03 THROUGH 2010-09-15
 OMIT December 25 MSG X
@@ -714,6 +730,66 @@ msg [a]
 set x psshade(50)
 set x psmoon(0)
 
+# Trig
+IF trig("sun +1") || trig("thu +1")
+    REM [trig()] +1 MSG Foo %b
+ENDIF
+
+# Trig with a bad warnfunc
+FSET w(x) x/0
+IF trig("sun warn w") || trig("thu warn w")
+    REM [trig()] +1 MSG Foo %b
+ENDIF
+
+# Trig with a good warnfunc
+FSET w(x) choose(x, 5, 3, 1, 0)
+
+# Ugh.  This is where short-circuit logical operators
+# would really come in handy.
+IF trig("sun warn w") || trig("thu warn w")
+    REM [trig()] +5 MSG Foo %b
+ENDIF
+
+REM [trig("Mon", "Tue", "Wed", "Sat")] MSG foo
+REM [trig("Mon", "Tue", "Wed")] MSG bar
+
+# The new syntactic sugar
+REM First Monday January MSG x
+REM Second Tuesday in April MSG x
+REM Third Wednesday in October MSG x
+REM Fourth Friday in July MSG x
+REM Last Tuesday in August MSG x
+REM Last Sunday in December MSG x
+
+REM First Monday January 2000 MSG x
+REM Second Tuesday in April 2000 MSG x
+REM Third Wednesday in October 2000 MSG x
+REM Fourth Friday in July 2000 MSG x
+REM Last Tuesday in August 2000 MSG x
+REM Last Sunday in December 2000 MSG x
+
+REM January ~~1 MSG y
+REM February ~~1 MSG y
+REM February ~~2 MSG y
+REM February ~~3 MSG y
+REM February ~~8 MSG y
+REM February ~~20 MSG y
+PUSH
+OMIT 31 March
+REM March ~1 MSG y
+REM March ~~1 MSG y
+REM Lastday March MSG y
+REM Lastworkday March MSG y
+POP
+REM Dec 2000 ~~1 MSG y
+REM Dec 2000 ~~2 MSG y
+REM Dec 2000 ~~3 MSG y
+REM Dec 2000 ~~7 MSG y
+REM Jan 2001 ~~1 MSG y
+
+REM Lastday April 2022 OMIT SAT SUN MSG foo
+REM Lastworkday April 2022 OMIT SAT SUN MSG foo
+
 # Don't want Remind to queue reminders
 EXIT