Update WHATSNEW

Lets language packs customize ord.

Makefile

@@ -42,6 +42,9 @@ install-stripped:
 test:
 	@$(MAKE) -C src -s test
 
+cppcheck:
+	@$(MAKE) -C src cppcheck
+
 distclean: clean
 	-rm -f config.cache config.log config.status src/Makefile src/version.h src/config.h tests/test.out www/Makefile rem2pdf/Makefile.top rem2pdf/Makefile.old rem2pdf/Makefile rem2pdf/Makefile.PL rem2pdf/bin/rem2pdf rem2html/rem2html
 	-rm -f man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1 scripts/tkremind

README.md

@@ -6,10 +6,14 @@ the GNU General Public License, Vesion 2.
 
 ## Prerequisites:
 
-remind and rem2ps have no prerequisites beyond the standard C library and
-the standard math library.
+### Remind and Rem2PS
 
-rem2html requires the JSON::MaybeXS Perl module and rem2pdf
+**remind** and **rem2ps** have no prerequisites beyond the standard C
+library and the standard math library.
+
+### Rem2HTML and Rem2PDF
+
+**rem2html** requires the JSON::MaybeXS Perl module and **rem2pdf**
 requires the JSON::MaybeXS, Pango and Cairo Perl modules.
 
 - On Debian-like systems, these prerequisites may be installed with:
@@ -24,7 +28,9 @@ requires the JSON::MaybeXS, Pango and Cairo Perl modules.
 
 - On Arch linux, you need `pango-perl`, `cairo-perl` and `perl-json-maybexs`
 
-TkRemind requires Tcl/Tk and the tcllib library.
+### TkRemind
+
+**tkremind** requires Tcl/Tk and the tcllib library.
 
 - On Debian-like systems, install with:
 
@@ -45,7 +51,8 @@ all of your distribution's Noto Font-related packages.
 
 ## Installation
 
-Remind can be installed with the usual:
+Assuming you have a normal C development environment installed, Remind
+can be installed with the usual:
 
 `./configure && make && make test && sudo make install`
 

configure.ac

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

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

@@ -110,15 +110,17 @@
 (defconst remind-keywords
   (sort
    (list "ADDOMIT" "AFTER" "AT" "BAN" "BANNER" "BEFORE" "CAL" "CLEAR"
-         "CLEAR-OMIT-CONTEXT" "DEBUG" "DO" "DUMP" "DUMPVARS" "DURATION" "ELSE"
-         "ENDIF" "ERRMSG" "EXIT" "EXPR" "FIRST" "FLUSH" "FOURTH" "FRENAME" "FROM" "FSET"
-         "FUNSET" "IF" "IFTRIG" "IN" "INC" "INCLUDE" "INCLUDECMD" "INFO" "LAST"
-         "LASTDAY" "LASTWORKDAY" "MAYBE" "MAYBE-UNCOMPUTABLE" "MSF" "MSG"
-         "NOQUEUE" "OMIT" "OMITFUNC" "ONCE" "POP" "POP-OMIT-CONTEXT" "PRESERVE"
-         "PRIORITY" "PS" "PSFILE" "PUSH" "PUSH-OMIT-CONTEXT" "REM" "RUN"
-         "SATISFY" "SCAN" "SCANFROM" "SCHED" "SECOND" "SET" "SKIP" "SPECIAL"
-         "SYSINCLUDE" "TAG" "THIRD" "THROUGH" "TRANSLATE" "TRANS" "UNSET"
-         "UNTIL" "WARN")
+         "CLEAR-OMIT-CONTEXT" "COMPLETE-THROUGH" "DEBUG" "DO" "DUMP" "DUMPVARS"
+         "DURATION" "ELSE" "ENDIF" "ERRMSG" "EXIT" "EXPR" "FIRST"
+         "FLUSH" "FOURTH" "FRENAME" "FROM" "FSET" "FUNSET" "IF"
+         "IFTRIG" "IN" "INC" "INCLUDE" "INCLUDECMD" "INFO" "LAST"
+         "LASTDAY" "LASTWORKDAY" "MAYBE" "MAYBE-UNCOMPUTABLE" "MSF"
+         "MSG" "NOQUEUE" "OMIT" "OMITFUNC" "ONCE" "POP"
+         "POP-OMIT-CONTEXT" "POP-FUNCS" "POP-VARS" "PRESERVE" "PRIORITY" "PS"
+         "PSFILE" "PUSH" "PUSH-FUNCS" "PUSH-VARS" "PUSH-OMIT-CONTEXT" "REM" "RETURN"
+         "RUN" "SATISFY" "SCAN" "SCANFROM" "SCHED" "SECOND" "SET"
+         "SKIP" "SPECIAL" "SYSINCLUDE" "TAG" "THIRD" "THROUGH" "TODO"
+         "TRANSLATE" "TRANS" "UNSET" "UNTIL" "WARN")
    #'(lambda (a b) (> (length a) (length b)))))
 
 

docs/WHATSNEW

@@ -1,6 +1,64 @@
 CHANGES TO REMIND
 
-* VERSION 5,4 Patch 2 - 2025-07-16
+* VERSION 6.0 Patch 0 - 2025-??-??
+
+- MAJOR NEW FEATURE: remind: Introduction of TODOs.  These are similar
+  to normal reminders, but (in Agenda Mode) you keep getting reminded
+  of them even once they are in the past, unless you specifically mark
+  them as completed.
+
+- MAJOR NEW FEATURE: remind: The --json long option causes Remind to
+  output JSON in Agenda Mode instead of the normal text output.  See
+  tkremind for an example of how a front-end can use this output.
+
+- MINOR NEW FEATURE: remind: The RETURN statement can be used to skip
+  the rest of the current file.  Useful for early exit from an
+  INCLUDEd file.
+
+- MAJOR IMPROVEMENTS: tkremind: TkRemind has been given an overhaul.
+  The "Show Queue" and "Show Today's Reminders" windows now respect
+  the color scheme.  TkRemind lets you create TODO reminders and
+  easily mark them completed.  You can right-click on a day number
+  to get a window with Agenda Mode reminders for that day.
+
+- MINOR IMPROVEMENT: remind: Language packs can define an ordx(n)
+  function that localizes ord(n).  If this function is defined, then
+  ord(n) automatically calls it rather than using its built-in English
+  localization.  Appropriate ordx(n) definitions have been added to
+  all language packs.
+
+- MINOR IMPROVEMENT: remind: The %b substitution sequence handles
+  dates in the past (because of TODOs).  The %! sequence considers
+  both date and time, and can be used with non-timed reminders.  The
+  new %? sequence is similar to %!, but outputs "are" and "were"
+  instead of "is" and "was".  The new %*! and %*? sequences are
+  similar to %! and %?, but compare the trigger date to realtoday()
+  instead of to today().
+
+- MINOR IMPROVEMENT: remind: Downgrade a SPECIAL COLOR... with
+  out-of-range color values to a normal MSG-type reminder.
+
+- MINOR IMPROVEMENT: include/lang/nl.rem: Use "eergisteren" for "2
+  days ago" and "overmorgen" for "in 2 days' time."
+
+- MINOR IMPROVEMENT: tkremind: TkRemind now passes all command-line options
+  back to Remind.
+
+- BUG FIX: remind: SCANFROM and FROM are separated out internally, and
+  in the JSON output, the original FROM or SCANFROM value is
+  preserved, including relative SCANFROMs.
+
+* VERSION 5.5 Patch 0 - 2025-07-28
+
+- NEW FEATURE: remind:  Add the PUSH-VARS / POP-VARS commands and the
+  analogous PUSH-FUNCS / POP-FUNCS commands.  These let you localize
+  changes to variables and functions and help with writing more modular
+  reminder files.
+
+- INTERNAL CHANGES: Clean up the code following recommendations from
+  an updated "cppcheck" executable.
+
+* VERSION 5.4 Patch 2 - 2025-07-16
 
 - MINOR CHANGE: remind: Allow daysinmon() to take a DATE or DATETIME
   argument.
@@ -8,11 +66,11 @@ CHANGES TO REMIND
 - MINOR CHANGE: remind: All functions that want an integer month number
   will now also accept a string naming the month.
 
-= UPDATE: include/holidays/chinese-new-year.rem: Add dates for Chinese
+- UPDATE: include/holidays/chinese-new-year.rem: Add dates for Chinese
   New Year for 2051 through 2100.
 
 - BUG FIX: remind: Set trigdate() correctly for a fully-specified
-  date, even if it's in the past, as the manual documnented.  Bug
+  date, even if it's in the past, as the manual documented.  Bug
   found by Tim Chase.
 
 - DOCUMENTATION FIX: rem2html: Document the correct Perl module

include/holidays/README

@@ -38,10 +38,10 @@ You can use the following trick if you would like (for example) 7 days'
 advance warning of holidays:
 
     # Save old definition (if any) of msgsuffix
-    FRENAME msgsuffix saved_msgsuffix
+    PUSH-FUNCS msgsuffix
 
     # Save old value of $DefaultDelta
-    SET old_delta $DefaultDelta
+    PUSH-VARS $DefaultDelta
 
     # We want 7 days' advance warning
     SET $DefaultDelta 7
@@ -57,6 +57,9 @@ advance warning of holidays:
     SYSINCLUDE holidays/us.rem
     SYSINCLUDE holidays/us/ny.rem
 
-    # Restore old version of msgsuffix and $DefaultDelta
-    FRENAME saved_msgsuffix msgsuffix
-    SET $DefaultDelta old_delta
+    # Restore old value $DefaultDelta
+    POP-VARS
+
+    # Restore old version of msgsuffix
+    POP-FUNCS
+

include/holidays/jewish.rem

@@ -1,10 +1,18 @@
 # Major Jewish Holidays
 # SPDX-License-Identifier: GPL-2.0-only
 
+# Save variables and functions that we will mess with
+PUSH-VARS InIsrael IncludeIsraeliHolidays Reform
+PUSH-FUNCS _chan _h2 _PastSat _BackTwoFri _BackTwoSat
+
 # Set the variable InIsrael to 1 if you live in Israel.  Otherwise,
 # you get the Diaspora versions of Jewish holidays
 SET InIsrael value("InIsrael", 0)
 
+# Set this if you want to include holidays that are not really
+# Jewish religious holidays, but simply Israeli holidays
+SET IncludeIsraeliHolidays value("IncludeIsraeliHolidays", 0)
+
 # Set the variable Reform to 1 if you want the Reform version of the
 # Jewish calendar.  Otherwise, you get the traditional version
 SET Reform value("Reform", 0)
@@ -80,15 +88,18 @@ IF !InIsrael && !Reform
 ENDIF
 
 REM [hebdate(27, "Nisan")] INFO "Url: https://en.wikipedia.org/wiki/Yom_HaShoah" MSG Yom HaShoah
-REM [_BackTwoFri(4,  "Iyar")] INFO "Url: https://en.wikipedia.org/wiki/Yom_HaZikaron" MSG Yom HaZikaron
-REM [_BackTwoSat(5,  "Iyar")] INFO "Url: https://en.wikipedia.org/wiki/Independence_Day_(Israel)" MSG Yom Ha'atzmaut
+
+IF IncludeIsraeliHolidays
+    REM [_BackTwoFri(4,  "Iyar")] INFO "Url: https://en.wikipedia.org/wiki/Yom_HaZikaron" MSG Yom HaZikaron
+    REM [_BackTwoSat(5,  "Iyar")] INFO "Url: https://en.wikipedia.org/wiki/Independence_Day_(Israel)" MSG Yom Ha'atzmaut
+    REM [hebdate(28, "Iyar")] INFO "Url: https://en.wikipedia.org/wiki/Jerusalem_Day" MSG Yom Yerushalayim
+ENDIF
 
 # Not sure about Reform's position on Lag B'Omer
 IF !Reform
    REM [hebdate(18, "Iyar")] INFO "Url: https://en.wikipedia.org/wiki/Lag_BaOmer" MSG Lag B'Omer
 ENDIF
 
-REM [hebdate(28, "Iyar")] INFO "Url: https://en.wikipedia.org/wiki/Jerusalem_Day" MSG Yom Yerushalayim
 REM [hebdate(6,  "Sivan")] INFO "Url: https://en.wikipedia.org/wiki/Shavuot" MSG Shavuot
 
 IF !InIsrael && !Reform
@@ -102,3 +113,7 @@ IF !Reform
    REM [_PastSat(17, "Tamuz")] INFO "Url: https://en.wikipedia.org/wiki/Seventeenth_of_Tammuz" MSG Tzom Tammuz
    REM [_PastSat(9,  "Av")] INFO "Url: https://en.wikipedia.org/wiki/Tisha_B%27Av" MSG Tish'a B'Av
 ENDIF
+
+# Tidy up
+POP-FUNCS
+POP-VARS

include/lang/auto.rem

@@ -1,28 +1,32 @@
 # SPDX-License-Identifier: GPL-2.0-only
-if !defined("__autolang__")
-    SET __autolang__ 1
-    PRESERVE __autolang__
-    SET autolang getenv("REMIND_LANG")
+if defined("__autolang__")
+    RETURN
+endif
 
-    IF autolang == ""
-        SET autolang getenv("LC_ALL")
-    ENDIF
-    IF autolang == ""
-        SET autolang getenv("LANGUAGE")
-    ENDIF
-    IF autolang == ""
-        SET autolang getenv("LANG")
-    ENDIF
+SET __autolang__ 1
+PRESERVE __autolang__
 
-    IF autolang != ""
-        IF access($SysInclude + "/lang/" + lower(substr(autolang, 1, 5)) + ".rem", "r") == 0
-            SYSINCLUDE lang/[lower(substr(autolang, 1, 5))].rem
-        ELSE
-            IF access($SysInclude + "/lang/" + lower(substr(autolang, 1, 2)) + ".rem", "r") == 0
-                SYSINCLUDE lang/[lower(substr(autolang, 1, 2))].rem
-            ENDIF
-        ENDIF
-    ENDIF
-    UNSET autolang
+PUSH-VARS autolang
+SET autolang getenv("REMIND_LANG")
+
+IF autolang == ""
+    SET autolang getenv("LC_ALL")
+ENDIF
+IF autolang == ""
+    SET autolang getenv("LANGUAGE")
+ENDIF
+IF autolang == ""
+    SET autolang getenv("LANG")
 ENDIF
 
+IF autolang != ""
+    IF access($SysInclude + "/lang/" + lower(substr(autolang, 1, 5)) + ".rem", "r") == 0
+        SYSINCLUDE lang/[lower(substr(autolang, 1, 5))].rem
+    ELSE
+        IF access($SysInclude + "/lang/" + lower(substr(autolang, 1, 2)) + ".rem", "r") == 0
+            SYSINCLUDE lang/[lower(substr(autolang, 1, 2))].rem
+        ENDIF
+    ENDIF
+ENDIF
+POP-VARS
+

include/lang/ca.rem

@@ -28,7 +28,11 @@ SET $December "desembre"
 
 SET $Today "avui"
 SET $Tomorrow "demà"
-FSET subst_bx(a,d,t) iif(d==today()+2, "demà passat", "d'aquí " + (d-today()) + " dies")
+TRANSLATE "yesterday" "ahir"
+TRANSLATE "are" "són"
+TRANSLATE "were" "eren"
+
+FSET subst_bx(a,d,t) iif(d==today()+2, "demà passat", d >= today(), "d'aquí " + (d-today()) + " dies", "fa " + (today()-d) + " dies")
 
 # 1 d'abril vs 1 de maig.
 FSET subst_sx(a,d,t) iif(isany(substr(mon(d), 1, 1), "a", "o") , "d'", "de")

include/lang/da.rem

@@ -29,6 +29,10 @@ SET $December "December"
 SET $Today "i dag"
 SET $Tomorrow "i morgen"
 
+TRANSLATE "yesterday" "i går"
+TRANSLATE "are" "er"
+TRANSLATE "were" "var"
+
 BANNER Påmindelse for %w, %d. %m, %y%o:
 
 SET $Am "am"
@@ -51,13 +55,14 @@ SET $Mplu "ter"
 
 FSET subst_ampm(h) iif(h<5, " om natten", h < 12, " om formiddagen", h < 18, " om eftermiddagen", " om aftenen")
 FSET subst_ordinal(d) "."
+FSET ordx(n) n + "."
 
 FSET subst_p(alt, d, t) iif(d==today()+1, "", "e")
 FSET zeropad(s, len) pad(s, "0", len)
 FSET subst_a_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
 FSET subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
 
-FSET subst_bx(a, d, t)   "om " + (d-today()) + " dage"
+FSET subst_bx(a, d, t)  iif(d >= today(), "om " + (d-today()) + " dage", "for " + (today()-d) + " dage siden")
 
 FSET subst_ex(alt, d, t) "den " + zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(year(d), 4)
 FSET subst_fx(alt, d, t) "den " + zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2) + $DateSep + zeropad(year(d), 4)

include/lang/de.rem

@@ -31,6 +31,10 @@ SET $December "Dezember"
 SET $Today "heute"
 SET $Tomorrow "morgen"
 
+TRANSLATE "yesterday" "gestern"
+TRANSLATE "are" "sind"
+TRANSLATE "were" "waren"
+
 # Banner
 BANNER Termine für %w, den %d. %m %y%o:
 
@@ -51,11 +55,12 @@ SET $Fromnow "von heute"
 
 FSET subst_ampm(h)      iif(h<5, " nachts", h<12, " vormittags", h<=17, " nachmittags", " abends")
 FSET subst_ordinal(d)   "."
+FSET ordx(n) n + "."
 
 FSET subst_a_alt(d)     wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
 FSET subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
 
-FSET subst_bx(a, d, t)   "in " + (d-today()) + " Tagen"
+FSET subst_bx(a, d, t)   iif(d >= today(), "in " + (d-today()) + " Tagen", "vor " + (today()-d) + " Tagen")
 
 FSET subst_g_alt(d)     wkday(d) + ", den " + day(d) + ". " + mon(d)
 FSET subst_gx(alt, d, t) iif(alt, subst_g_alt(d), $On + " " + subst_g_alt(d))

include/lang/es.rem

@@ -29,6 +29,10 @@ SET $December "Diciembre"
 SET $Today "hoy"
 SET $Tomorrow "mañana"
 
+TRANSLATE "yesterday" "ayer"
+TRANSLATE "are" "son"
+TRANSLATE "were" "eran"
+
 BANNER Agenda para el %w, %d%s %m, %y%o:
 
 SET $Am "am"
@@ -47,4 +51,4 @@ SET $And "y"
 SET $Hplu "s"
 SET $Mplu "s"
 
-FSET subst_bx(a, d, t) "dentro de " + (d-today()) + " días"
+FSET subst_bx(a, d, t) iif(d >= today(), "dentro de " + (d-today()) + " días", "hace " + (today()-d) + " dias")

include/lang/fi.rem

@@ -29,6 +29,10 @@ SET $December "joulukuu"
 SET $Today "tänään"
 SET $Tomorrow "huomenna"
 
+TRANSLATE "yesterday" "eilen"
+TRANSLATE "are" "ovat"
+TRANSLATE "were" "olivat"
+
 BANNER Viestit %wna %d. %mta %y%o:
 
 SET $Am " ap."
@@ -52,11 +56,12 @@ SET $Mplu "a"
 FSET zeropad(s, len) pad(s, "0", len)
 
 FSET subst_ordinal(d) iif(d==1, ":senä", d==2, ":sena", (d%10)==2||(d%10)==3||(d%10)==6||(d%10)==8, ":ntena", ":ntenä")
+FSET ordx(d) d + subst_ordinal(d)
 
 FSET subst_a_alt(d, o, p) wkday(d) + o + " " + day(d) + ". " + mon(d) + p + " " + year(d)
 FSET subst_ax(a, d, t) iif(a, subst_a_alt(d, "", ""), subst_a_alt(d, $On, "ta"))
 
-FSET subst_bx(a, d, t) (d-today()) + " päivän kuluttua"
+FSET subst_bx(a, d, t) iif(d >= today(), (d-today()) + " päivän kuluttua", (today()-d) + " päivää sitten")
 FSET subst_cx(a, d, t) iif(a, wkday(d), wkday(d) + $On)
 
 FSET subst_ex(a, d, t) zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(year(d), 4)

include/lang/fr.rem

@@ -28,6 +28,11 @@ SET $December "décembre"
 
 SET $Today "aujourd'hui"
 SET $Tomorrow "demain"
+
+TRANSLATE "yesterday" "hier"
+TRANSLATE "are" "sont"
+TRANSLATE "were" "étaient"
+
 SET $On "le"
 SET $At "à"
 SET $Now "maintenant"
@@ -46,6 +51,7 @@ BANNER Rappels pour %w, %d%s %m, %y%o:
 
 # Ordinal for a day (English would be "st", "nd", "rd", "th")
 FSET subst_ordinal(d) iif(d == 1, "er", "")
+FSET ordx(n) n + iif(n == 1, "er", "e")
 
 # "%d hours", "%d minutes", or "%d hours and %d minutes"
 FSET subst_tdiff(hdiff, mdiff) iif(hdiff==0&&mdiff==0, $Now, \
@@ -56,13 +62,14 @@ FSET subst_1(alt, date, time) iif(time == now(), "maintenant", \
                                   time > now(), "dans " + subst_tdiff((time-now())/60, (time-now())%60), \
                                   "il y a " + subst_tdiff ((now()-time)/60, (now()-time)%60))
 
-FSET subst_bx(alt, date, time) "dans " + (date-today()) + " jours"
+FSET subst_bx(alt, date, time) iif(date >= today(), "dans " + (date-today()) + " jours", "il y a " + (today()-date) + " jours")
 FSET subst_j_alt(date) wkday(date) + ", " + day(date) + subst_ordinal(day(date)) + " " + mon(date) + ", " + year(date)
 FSET subst_jx(alt, date, time) iif(alt, subst_j_alt(date), $On + " " + subst_j_alt(date))
 
 FSET subst_k_alt(date) wkday(date) + ", " + day(date) + subst_ordinal(day(date)) + " " + mon(date)
 FSET subst_kx(alt, date, time) iif(alt, subst_k_alt(date), $On + " " + subst_k_alt(date))
 
+
 TRANSLATE "Missing ']'" "']' manquant"
 TRANSLATE "Missing quote" "Apostrophe manquant"
 TRANSLATE "Expression too complex" "Expression trop complexe"

include/lang/gr.rem

@@ -29,6 +29,10 @@ SET $December "Δεκέμβρ."
 SET $Today "σήμερα"
 SET $Tomorrow "αύριο"
 
+TRANSLATE "yesterday" "εχθές"
+TRANSLATE "are" "είναι"
+TRANSLATE "were" "ήταν"
+
 BANNER Υπενθυμίσεις: %w, %d %m, %y%o:
 
 SET $Am "πμ"
@@ -49,8 +53,9 @@ SET $And "και"
 SET $Hplu ""
 SET $Mplu ""
 
-FSET subst_bx(a, d, t) "σε " + (d - today()) + " ημέρες"
+FSET subst_bx(a, d, t) iif(d >= today(), "σε " + (d - today()) + " ημέρες", "πριν από " + (today()-d) + " ημέρες")
 FSET subst_ordinal(d)   "."
+FSET ordx(d) d + "."
 FSET subst_a_alt(d)     wkday(d) + ", " + day(d) + ". " + mon(d) + " " + year(d)
 FSET subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
 FSET subst_g_alt(d)     wkday(d) + ", " + day(d) + ". " + mon(d)

include/lang/is.rem

@@ -29,6 +29,10 @@ SET $December "desember"
 SET $Today "í dag"
 SET $Tomorrow "á morgun"
 
+TRANSLATE "yesterday" "í gær"
+TRANSLATE "are" "eru"
+TRANSLATE "were" "voru"
+
 BANNER Minnisatriði: %w, %d%s %m, %y%o:
 
 SET $Am "fh"
@@ -49,5 +53,5 @@ SET $And "og"
 SET $Hplu "ir"
 SET $Mplu "r"
 
-FSET subst_bx(a, d, t) "eftir " + (d - today()) + " daga"
+FSET subst_bx(a, d, t) iif(d >= today(), "eftir " + (d - today()) + " daga", "fyrir " + (today()-d) + " dögum")
 fset subst_p(a, d, t) iif(d == today()+1, "", "a")

include/lang/it.rem

@@ -29,6 +29,10 @@ SET $December "Dicembre"
 SET $Today "oggi"
 SET $Tomorrow "domani"
 
+TRANSLATE "yesterday" "Ieri"
+TRANSLATE "are" "sono"
+TRANSLATE "were" "erano"
+
 BANNER Promemoria per %w, %d %m %y%o:
 
 SET $Am "am"
@@ -48,7 +52,7 @@ SET $And "e"
 SET $Hplu "a"
 SET $Mplu "i"
 
-FSET subst_bx(a, d, t) "fra " + (d-today()) + " giorni"
+FSET subst_bx(a, d, t) iif(d >= today(), "fra " + (d-today()) + " giorni", (today()-d) + " giorni fa")
 FSET subst_p(a, d, t) iif(d==today()+1, "o", "i")
 FSET subst_q(a, d, t) iif(d==today()+1, "a", "e")
 

include/lang/nl.rem

@@ -28,6 +28,9 @@ SET $December "december"
 
 SET $Today "vandaag"
 SET $Tomorrow "morgen"
+TRANSLATE "yesterday" "gisteren"
+TRANSLATE "are" "zijn"
+TRANSLATE "were" "waren"
 
 BANNER Herinneringen voor %w, %d %m, %y%o:
 
@@ -55,9 +58,12 @@ FSET subst_1b(hdiff, mdiff) iif(hdiff==0, subst_minutes(mdiff), mdiff==0, subst_
 FSET subst_minutes(m) iif(m==1, "1 minuut", m + " minuten")
 FSET subst_hours(h) iif(h==1, "1 uur", h + " uren")
 
-FSET subst_bx(a, d, t) "over " + (d-today()) + " dagen"
+FSET subst_bx(a, d, t) iif (d == today()+2, "overmorgen", d+2 == today(), "eergisteren", d >= today(), "over " + (d-today()) + " dagen", (today()-d) + " dagen geleden")
 
 FSET subst_s(a, d, t) iif(day(d) == 1 || day(d) == 8, "e", day(d) < 20, "de", "te")
+
+FSET ordx(n) n + "e"
+
 TRANSLATE "New Moon" "Nieuwe maan"
 TRANSLATE "First Quarter" "Eerste kwartier"
 TRANSLATE "Full Moon" "Volle maan"

include/lang/no.rem

@@ -29,6 +29,10 @@ SET $December "Desember"
 SET $Today "i dag"
 SET $Tomorrow "i morgen"
 
+TRANSLATE "yesterday" "i går"
+TRANSLATE "are" "er"
+TRANSLATE "were" "var"
+
 BANNER Påminnelse for %w, %d. %m, %y%o:
 
 SET $Am "am"
@@ -48,8 +52,9 @@ SET $And "og"
 SET $Hplu "r"
 SET $Mplu "er"
 
-FSET subst_bx(a, d, t) "om " + (d-today()) + " dager"
+FSET subst_bx(a, d, t) iif(d >= today(), "om " + (d-today()) + " dager", "for " + (today()-d) + " dager siden")
 FSET subst_ordinal(d) "."
+FSET ordx(n) n + "."
 
 FSET subst_ax(a, d, t) iif(a, subst_a_alt(d), $On + " " + subst_a_alt(d))
 FSET subst_a_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)

include/lang/pl.rem

@@ -29,6 +29,10 @@ SET $December "Grudzień"
 SET $Today "dzisiaj"
 SET $Tomorrow "jutro"
 
+TRANSLATE "yesterday" "wczoraj"
+TRANSLATE "are" "są"
+TRANSLATE "were" "byli"
+
 BANNER Terminarz na %w, %d. %m %y%o:
 
 SET $Am "am"
@@ -53,7 +57,7 @@ FSET subst_ordinal(d) ""
 
 FSET subst_a_alt(d) wkday(d) + ", " + day(d) + ". " + mon(d) + " " + year(d)
 FSET subst_ax(a, d, t) iif(a, subst_a_alt(d), $On + " " + subst_a_alt(d))
-FSET subst_bx(a, d, t) "za " + (d-today()) + " dni"
+FSET subst_bx(a, d, t) iif(d >= today(), "za " + (d-today()) + " dni", (today()-d) + " dni temu")
 FSET subst_g_alt(d) wkday(d) + ", " + day(d) + ". " + mon(d)
 FSET subst_gx(a, d, t) iif(a, subst_g_alt(d), $On + " " + subst_g_alt(d))
 FSET subst_ux(a, d, t) subst_ax(a, d, t)

include/lang/pt.rem

@@ -29,6 +29,10 @@ SET $December "dezembro"
 SET $Today "hoje"
 SET $Tomorrow "amanhã"
 
+TRANSLATE "yesterday" "ontem"
+TRANSLATE "are" "são"
+TRANSLATE "were" "eram"
+
 BANNER Avisos para %w, %d de %m de %y%o:
 
 SET $Am "am"
@@ -53,7 +57,7 @@ FSET subst_ordinal(d) ""
 FSET subst_on_wd(d) iif(wkdaynum(d) == 1 || wkdaynum(d) == 2, "no", "na")
 
 FSET subst_a_alt(d) wkday(d) + ", " + day(d) + " de " + mon(d) + " de " + year(d)
-FSET subst_bx(a, d, t) "em " + (d-today()) + " dias"
+FSET subst_bx(a, d, t) iif(d >= today(), "em " + (d-today()) + " dias", "há " + (today()-d) + " dias")
 FSET subst_c_alt(d) wkday(d)
 FSET subst_g_alt(d) wkday(d) + ", " + day(d) + " " + mon(d)
 FSET subst_ax(a, d, t) iif(a, subst_a_alt(d), subst_on_wd(d) + " " + subst_a_alt(d))

include/lang/ro.rem

@@ -28,6 +28,9 @@ SET $December "Decembrie"
 
 SET $Today "astăzi"
 SET $Tomorrow "mâine"
+TRANSLATE "yesterday" "ieri"
+TRANSLATE "are" "sunt"
+TRANSLATE "were" "au fost"
 
 BANNER Reamintiri pentru %w, %d %m %y%o:
 
@@ -49,7 +52,7 @@ SET $Mplu "e"
 SET $Hplu "e"
 SET $And "şi"
 
-FSET subst_bx(a, d, t) "peste " + (d-today()) + " zile"
+FSET subst_bx(a, d, t) iif(d >= today(), "peste " + (d-today()) + " zile", "acume " + (today()-d) + " zile")
 
 FSET subst_ampm(h) iif(h<4, " noaptea", h<12, " dimineaţa", h<18, " după-amiaza", " seara")
 FSET subst_ordinal(d) ""

man/rem2ps.1.in

@@ -622,14 +622,23 @@ will be present.  Its value will be a string of the form YYYY-MM-DD.
 If the reminder contains a ONCE keyword, this key will be present
 with a value of 1.
 .TP
-.B scanfrom \fIYYYY-MM-DD\fR
+.B scanfrom \fIYYYY-MM-DD\fR or \fBscanfrom\fR \fI-n\fR
 If the reminder contains a SCANFROM keyword, this key will be present
-and its value will be a string of the form YYYY-MM-DD.
+and its value will be a string of the form YYYY-MM-DD for an absolute
+SCANFROM, or a negative integer of the form -n for a relative scanfrom
 .TP
 .B from \fIYYYY-MM-DD\fR
 If the reminder contains a FROM keyword, this key will be present
 and its value will be a string of the form YYYY-MM-DD.
 .TP
+.B is_todo \fIflag\fR
+If the reminder is a TODO reminder, then \fIflag\fR will be the integer
+1.  Otherwise, it will be the integer zero.
+.TP
+.B complete_through \fIYYYY-MM-DD\fR
+If the reminder has a COMPLETE-THROUGH date, then this key will be present
+and its value will be a string of the form YYYY-MM-DD.
+.TP
 .B priority \fIn\fR
 The priority of the reminder.  Always present; if no PRIORITY keyword
 is specified, then a reminder has a default priority of 5000.

man/remind.1.in

@@ -25,6 +25,29 @@ match the sort order used by the shell to expand "*.rem".
 until it encounters a line whose sole content is "__EOF__" (without the quotes.)
 Anything after the __EOF__ marker is completely ignored.
 
+.SH MODES OF OPERATION
+\fBRemind\fR has four major modes of operation:
+.TP
+.B Agenda Mode
+Agenda mode is the default mode.  In this mode, \fBRemind\fR prints
+today's reminders on standard output and exits.  It may fork a background
+process to pop up queued reminders for later in the day.
+.TP
+.B Calendar Mode
+In this mode, \fBRemind\fR generates a calendar either by drawing it
+in the terminal or by sending data in computer-readable format to a back-end
+program that actually draws the calendar.
+.TP
+.B Daemon Mode
+This is a special mode of operation in which \fBRemind\fR is invoked
+by a front-end and runs as a daemon, accepting requests from
+the front-end and sending messages back to the front-end.
+\fBTkRemind\fR uses \fBRemind\fR in daemon mode.
+.TP
+.B Purge Mode
+In this mode, \fBRemind\fR produces no output, but creates new versions of
+its input files with all expired reminders commented out.
+
 .SH OPTIONS
 \fBRemind\fR has a slew of options.  If you're new to the program,
 ignore them for now and skip to the section "REMINDER FILES".
@@ -209,7 +232,7 @@ format rather than the "simple calendar" format.  This format is
 also documented in the \fBrem2ps(1)\fR man page.  Finally, if you use
 three p's, as in \fB\-ppp\fR, then \fBRemind\fR uses a pure JSON
 format, again documented in \fBrem2ps(1)\fR.  If you include a \fBq\fR
-letter with this option, then the normal calendar-mode substitution filter
+letter with this option, then the usual calendar-mode substitution filter
 is disabled and the %"...%" sequences are preserved in the output.
 .PP
 Note that to pass INFO strings to a back-end, you must use \fB\-pp\fR
@@ -509,11 +532,29 @@ information.
 \fBRemind\fR supports the following long options, which \fIare\fR
 case-sensitive:
 
-.PP
+.TP
 .B \-\-version
 The \fB\-\-version\fR option causes \fBRemind\fR to print its version number
 to standard output and then exit.
 .TP
+.B \-\-hide-completed-todos
+In Calendar Mode, \fBRemind\fR normally shows all TODOs.  If you supply
+this option, the it will not show TODOs that have been marked as
+completed.
+.TP
+.B \-\-only-todos
+Only issue TODO-type reminders.
+.TP
+.B \-\-only-events
+Do not issue TODO-type reminders.
+.TP
+.B \-\-json
+In Agenda Mode, output JSON instead of the normal text-mode output.
+\fB\-\-json\fR also disables sorting (the \fB-g\fR option) and
+disables queueing (the \fB-q\fR option).  See the section
+"AGENDA MODE JSON OUTPUT" for more details.  The \fB\-\-json\fR option
+is ignored in Calendar Mode.
+.TP
 .B \-\-print-errs
 The \fB\-\-print-errs\fR option causes \fBRemind\fR to print all
 possible error messages to standard output and then exit.  The
@@ -626,6 +667,8 @@ Its syntax is:
 [\fIback\fR]
 [\fIdelta\fR]
 [\fIrepeat\fR]
+[\fBTODO\fR]
+[\fBCOMPLETE-THROUGH\fR \fIcomplete_date\fR]
 [\fBPRIORITY\fR \fIprio\fR]
 [\fBSKIP\fR | \fBBEFORE\fR | \fBAFTER\fR]
 [\fBOMIT\fR \fIomit_list\fR]
@@ -1777,8 +1820,16 @@ is replaced with "s" if the value produced by \fB%8\fR is not 1.
 is replaced with "s" if the value produced by \fB%7\fR is not 1.
 .TP
 .B %!
-is replaced with "is" if the current time is before the \fBAT\fR time,
-or "was" if it is after.
+is replaced with "is" if the current date and time is before the
+trigger date and the \fBAT\fR time, or "was" if it is after.  The %!
+sequence may be used in a non-timed reminder, in which case only dates
+are compared.
+.TP
+.B %?
+is replaced with "are" if the current date and time is before the
+trigger date and the \fBAT\fR time, or "were" if it is after.  The %!
+sequence may be used in a non-timed reminder, in which case only dates
+are compared.
 .TP
 .B %@
 is similar to \fB%2\fR but displays the current time.
@@ -1817,15 +1868,20 @@ be preceded by an asterisk (for example, %*c) which causes the word
 omitted.
 .TP
 o
-Any of the substitutions dealing with time (0 through 9 and '!')
-produce undefined results if used in a reminder that does not have
-an \fBAT\fR keyword.  Also, if a reminder has a \fIdelta\fR and may
-be triggered on several days, the time substitutions ignore the date.  Thus,
-the \fB%1\fR substitution may report that a meeting is in 15 minutes, for
-example, even though it may only be in 2 days time, because a \fIdelta\fR has
-triggered the reminder.  It is recommended that you use the time substitutions
-only in timed reminders with no \fIdelta\fR that are designed to be
-queued for timed activation.
+The ! and ? substitutions may be preceded by an asterisk (%*! or %*?),
+in which case the comparison is made between the trigger date and
+realtoday() instead of today().
+.TP
+o
+Any of the substitutions dealing with time (0 through 9) produce
+undefined results if used in a reminder that does not have an \fBAT\fR
+keyword.  Also, if a reminder has a \fIdelta\fR and may be triggered
+on several days, the time substitutions ignore the date.  Thus, the
+\fB%1\fR substitution may report that a meeting is in 15 minutes, for
+example, even though it may only be in 2 days time, because a
+\fIdelta\fR has triggered the reminder.  It is recommended that you
+use the time substitutions only in timed reminders with no \fIdelta\fR
+that are designed to be queued for timed activation.
 .TP
 o
 Capital letters can be used in the substitution sequence, in which case
@@ -1843,6 +1899,110 @@ normally scans for the first non-space character after a
 or
 .B RUN
 token.
+.PP
+.SH EVENTS AND TODOS
+.PP
+The \fBREM\fR command is normally used to create an \fIEVENT\fR.  This
+is something that happens at a certain time, possibly recurring, and
+happens no matter what action you take.  Events include things like
+birthdays, holidays, meetings, etc... pretty much everything that occurs
+on a particular schedule.  Once the date of an event has passed,
+\fBRemind\fR will no longer remind you about the event.
+.PP
+A \fITODO\fR is different; it is a task that you have to complete by a
+specific date or date and time.  If you don't explicitly mark a TODO
+as done, \fBRemind\fR will keep reminding you about it \fIeven past
+the due date.\fR.
+.PP
+To mark a \fBREM\fR as a TODO, simply include the TODO keyword.  For example:
+.PP
+.nf
+    REM TODO 15 August 2025 ++5 MSG Buy cat food %b.
+.fi
+.PP
+In Agenda Mode, \fBRemind\fR will start warning you on 10 Aug 2025 that
+you have to but cat food in 5 days' time, 4 days' time, etc...
+.PP
+However, on 16 Aug 2025, \fBRemind\fR will say "Buy cat food yesterday."
+and it will keep reminding you of your need to buy cat food until the end
+of time, or until you mark the TODO as done.
+.PP
+.SH MARKING TODOS AS DONE
+.PP
+There are two ways to mark a TODO as done.  If the TODO is not recurring,
+the simplest way is simply to remove the TODO designator from the REM
+command (or indeed, to completely delete it.)  The former keeps the
+reminder on the calendar while the latter completely removes it.
+.PP
+If a TODO is recurring, use the \fBCOMPLETE-THROUGH\fR clause to mark
+which recurrences have been completed.  For example:
+.PP
+.nf
+    REM TODO 30 April ++15 COMPLETE-THROUGH 2025-04-30 MSG File taxes
+.fi
+.PP
+Canadian income taxes must be filed every 30 April.  The above command
+will remind you to pay taxes in 2026.  If you don't update the
+COMPLETE-THROUGH date, then after 30 April 2026, \fBRemind\fR will
+keep reminding you until the end of time that my taxes were due on 30
+April 2026.  To indicate that you've paid them, simply update the
+COMPLETE-THROUGH date to 2026-04-30 and then \fBRemind\fR will start
+reminding you of your 2027 taxes (starting 15 days before the due
+date.)
+.PP
+It is an error to specify COMPLETE-THROUGH without also specifying TODO.
+.PP
+.SH MORE DETAILS ABOUT TODOS
+.PP
+TODOs are treated specially only in Agenda Mode.  In Calendar Mode,
+they appear in the calendar exactly as a normal event would.
+.PP
+TODOs are implemented internally by using the COMPLETE-THROUGH date
+plus one day as the starting point for \fBRemind\fR's date-scanning
+algorithm.  If you have a recurring TODO without a COMPLETE-THROUGH
+clause, then \fBRemind\fR starts scanning from the beginning of time,
+which we all know is 1 January 1990.  Consider this command:
+.PP
+.nf
+    REM TODO Wed +7 MSG Take out the trash %a (%b)
+.fi
+.PP
+Running that command in Agenda Mode on 2025-08-13 yields the following output:
+.PP
+.nf
+    Take out the trash on Wednesday, 3 January, 1990 (13006 days ago)
+.fi
+.PP
+\fBRemind\fR is very persistent about reminding you of tasks!  If you take
+out the trash and mark it done:
+.PP
+.nf
+    REM TODO Wed +7 COMPLETE-THROUGH 2025-08-13 MSG Take out the trash %a (%b)
+.fi
+.PP
+then you get this:
+.PP
+.nf
+    Take out the trash on Wednesday, 20 August, 2025 (in 7 days' time)
+.fi
+.PP
+You can use \fBFROM\fR and \fBUNTIL\fR to limit the recurrence interval of
+tasks just as you can with events.  For example, if you are house-sitting
+for the month of August and need to water plants every Wednesday:
+.PP
+.nf
+    REM TODO Wed +7 FROM 2025-08-06 UNTIL 2025-08-27 MSG Plants %b.
+.fi
+.PP
+Running that command on 13 Aug yields: "Plants 7 days ago." because you
+have not told \fBRemind\fR that you completed the first watering.  If you finish
+your duties and add a COMMPLETE-THROUGH date of 2025-08-27, then \fBRemind\fR
+never reminds you of that task in the future.
+.PP
+In Purge Mode, \fBRemind\fR will not purge TODOs unless they have been marked
+as complete.  In the case of a recurring TODO, \fBRemind\fR will not purge
+it until the last occurrence is marked as complete.
+.PP
 .SH THE OMIT COMMAND
 .PP
 In addition to being a keyword in the \fBREM\fR command,
@@ -2068,6 +2228,24 @@ relative pathnames under the system directory containing standard reminder
 scripts.  For this version of \fBRemind\fR, the system directory is
 "@prefix@/share/remind".
 .PP
+.SH THE RETURN COMMAND
+.PP
+The \fBRETURN\fR command causes \fBRemind\fR to ignore the remaining
+contents of the file currently being processed.  It can be used as a
+quick way to "exit" from an included file (though it also works at
+the top-level.)
+.PP
+Here is an example of how \fBRETURN\fR might be used:
+.PP
+.nf
+        IF already_done
+            RETURN
+        ENDIF
+        set already_done 1
+        preserve already_done
+        # Do expensive processing here
+.fi
+.PP
 .SH THE RUN COMMAND
 .PP
 If you include other files in your reminder script, you may not always
@@ -2579,7 +2757,7 @@ For example, to delete all the variables declared above, use:
 	UNSET a b mydir time date
 .fi
 .PP
-.B SYSTEM VARIABLES
+.SH SYSTEM VARIABLES
 .PP
 In addition to the regular user variables, \fBRemind\fR has several
 "system variables" that are used to query or control the operating
@@ -3125,7 +3303,43 @@ Note:  If any of the calendar modes are in effect, then the
 values of $Daemon, $DontFork, $DontTrigAts, $DontQueue, $HushMode,
 $IgnoreOnce, $InfDelta, and $NextMode are not meaningful.
 .PP
-.B BUILT-IN FUNCTIONS
+.SH SAVING AND RESTORING VARIABLES
+.PP
+Just as with the OMIT context, you can save and restore the values of
+global variables and all (modifiable) system variables.  For example:
+.PP
+.nf
+        SET a 1
+        UNSET b
+
+        # Save variables
+        PUSH-VARS $DefaultColor $AddBlankLines a b
+
+        SET $DefaultColor "255 0 0"
+        SET $AddBlankLines 0
+        SET a 3
+        SET b 4
+        REM MSG Hello
+
+        # Restore all the variables we pushed earlier
+        POP-VARS
+
+        # Now the changes to $DefaultColor and $AddBlankLines
+        # have been undone.  Additionally, a is restored to 1
+        # and b is unset
+.fi
+.PP
+As you see from the example, PUSH-VARS takes a list of global variable
+names and/or system variable names.  You can save the values of any
+\fImodifiable\fR system variables and any global variable.  You can
+even push global variables that are not set.
+.PP
+The POP-VARS command restores the values of all system variables and
+global variables that were pushed by the most recent PUSH-VARS
+command.  If you push an undefined global variable, then that variable
+is unset by the POP-VARS command.
+.PP
+.SH BUILT-IN FUNCTIONS
 .PP
 \fBRemind\fR has a plethora of built-in functions.  The syntax for a function
 call is the same as in C - the function name, followed a comma-separated list
@@ -3269,8 +3483,8 @@ calendar mode:
             FSET fg(r,g,b) ansicolor(r,g,b)
             FSET bg(r,g,b) ansicolor(r,g,b,1)
         ENDIF
-        REM [fg(255,0,0)][bg(64,64,64)]Red on Gray[fg(-1,-1,-1)] in normal mode
-        REM SPECIAL COLOR 0 255 0 Green in normal and calendar mode
+        REM [fg(255,0,0)][bg(64,64,64)]Red on Gray[fg(-1,-1,-1)] in agenda mode
+        REM SPECIAL COLOR 0 255 0 Green in agenda and calendar mode
 .fi
 .PP
 If you use the \fBansicolor\fR function, don't forget to reset the color
@@ -4042,6 +4256,13 @@ the actual time, or a time supplied on the command line.
 .B ord(i_num)
 Returns a string that is the ordinal number \fInum\fR.  For example,
 \fBord(2)\fR returns "2nd", and \fBord(213)\fR returns "213th".
+.RS
+.PP
+In order to help with localization, if you define a function called
+\fBordx\fR that takes a single parameter, then calling
+\fBord\fR(\fIn\fR) invokes \fBordx\fR(\fIn\fR) and returns whatever
+it does.
+.RE
 .TP
 .B orthodoxeaster([dqi_arg])
 If \fIarg\fR is an \fBINT\fR, then returns the date of Orthodox Easter Sunday
@@ -4664,7 +4885,7 @@ midnight, 1 January 1970 UTC.  If the \fBtime_t\fR type is only
 19 January 2038 at 03:14:07 UTC.
 .PP
 To work around this limitation, \fBRemind\fR will "fold" years greater than 2037
-to a smaller year that begins on the same day and has the same numebr of
+to a smaller year that begins on the same day and has the same number of
 days.  This results in a year that's very likely to have the same
 daylight saving rules as the original year, unless the rules have changed
 in the interim (in which case the rule change could not even be represented
@@ -5072,22 +5293,6 @@ it is defined.  However, if \fIfunc_a\fR exists, then it is renamed to
 was defined prior to the \fBFRENAME\fR command, then that old
 definition is lost.
 .PP
-\fBFRENAME\fR is useful if you want to save and restore the definition
-of a user-defined function.  For example, you might want to define
-a \fBmsgprefix\fR function for a block of reminders, but not permanently
-overwrite any existing definition.  You could do something like this:
-.PP
-.nf
-        FRENAME msgprefix saved_msgprefix
-        FSET msgprefix(x) "My new prefix: "
-        INCLUDE block_of_reminders.rem
-        FRENAME saved_msgprefix msgprefix
-.PP
-The file \fBblock_of_reminders.rem\fR would be executed with the
-\fBmsgprefix\fR function defined above.  After the second FRENAME,
-\fBmsgprefix\fR would be restored to its previous definition if
-it had one, or simply unset if it was not previously defined.
-.PP
 If either argument to the \fBFRENAME\fR command is the name of a built-in
 function, the command fails with an error message and does nothing.
 .PP
@@ -5107,6 +5312,51 @@ following example:
 .PP
 to define a function and suppress any "redefined function" warning.
 .PP
+.SH SAVING AND RESTORING FUNCTIONS
+.PP
+Occasionally, it is useful to redefine a function for a specific block of
+reminders, but to restore its original definition at the end of that
+block.  Just as with variables, functions can be pushed onto and popped
+off an internal stack.  Here is an example:
+.PP
+.nf
+        PUSH-FUNCS msgprefix
+        FSET msgprefix(x) "My new prefix: "
+        INCLUDE block_of_reminders.rem
+        POP-FUNCS
+.fi
+.PP
+The file \fBblock_of_reminders.rem\fR would be executed with the
+\fBmsgprefix\fR function defined above.  After the POP-FUNCS
+\fBmsgprefix\fR would be restored to its previous definition if
+it had one, or simply unset if it was not previously defined.
+.PP
+The command PUSH-FUNCS takes a space-separated list of function names.
+All of the named user-defined functions will be saved to an internal
+stack.  You can even push names that are not defined as any function.
+.PP
+After a function name has been pushed, \fBRemind\fR will not issue a
+warning if you redefine it, because presumably the purpose of pushing
+it in the first place is to redefine it.
+.PP
+The command POP-FUNCS restores the definitions of all the user-defined
+functions in the corresponding PUSH-FUNCS command.  If undefined functions
+were pushed onto the stack, then POP-FUNCS makes those functions undefined
+again.  Here's one more example:
+.PP
+.nf
+        FUNSET a
+        FSET b(x) 2*x
+        REM MSG [b(3)]   # Outputs 6
+        PUSH-FUNCS a b
+        FSET a(x) 22*x
+        FSET b(x) 3*x
+        REM MSG [a(3)] [b(3)] # Outputs 66 9
+        POP-FUNCS
+        REM MSG [a(3)]   # Undefined function "a"
+        REM MSG [b(3)]   # Outputs 6
+.fi
+.PP
 .SH PRECISE SCHEDULING
 .PP
 The \fBWARN\fR keyword allows precise control over advance warning in
@@ -5460,6 +5710,35 @@ streams used by \fBRemind\fR.  This is not terribly useful to most
 people, but may be useful if you run \fBRemind\fR as a subprocess of
 another program, and want to use pipes for communication.
 .PP
+.SH AGENDA MODE JSON OUTPUT
+.PP
+If you supply the \fB\-\-json\fR argument, then Remind outputs JSON
+instead of the normal text output.  The JSON output consists of
+a single JSON array of zero or more objects.  There are three
+possible types of objects in the array:
+.TP
+.B banner
+The \fBbanner\fR object, if present, will be the first object in the array.
+There will be at most one \fBbanner\fR object.  It contains a single
+key, \fBbanner\fR, whose value is the banner that \fBRemind\fR would normally
+print in Agenda Mode.
+.TP
+.B noreminders
+The \fBnoreminders\fR object, if present, will be the final object in the
+array.  There will be at most one \fBnoreminders\fR object.  It contains
+a single keym, \fBnoreminders\fR, whose value is the phrase "No reminders.",
+possibly localized into a different language.
+.TP
+.B event
+All other objects in the array are \fBevent\fR objects.  They are JSON
+objects that contain all of the keys described in the \fBrem2ps\fR(1)
+man page section "CALENDAR ENTRIES".  However, the \fBcalendar_body\fR,
+\fBplain_body\fR and \fBraw_body\fR keys will not be present.
+.PP
+JSON output can be used by a front-end to display an attractive list of
+reminders in Agenda Mode.  The "show today's reminders" feature of
+\fBtkremind\fR uses the JSON output.
+.PP
 .SH CALENDAR MODE
 .PP
 If you supply the \fB\-c\fR, \fB\-s\fR or \fB\-p\fR
@@ -5504,7 +5783,7 @@ example, consider the following:
 	REM 6 Jan MSG %"Dianne's birthday%" is %b
 .fi
 .PP
-In the normal mode, \fBRemind\fR would print "Dianne's birthday is today"
+In agenda mode, \fBRemind\fR would print "Dianne's birthday is today"
 on 6 January.  However, in the calendar mode, only the text "Dianne's birthday"
 is inserted into the box for 6 January.
 .PP
@@ -5984,7 +6263,7 @@ You can define two functions in your script called \fBmsgprefix()\fR
 and \fBmsgsuffix()\fR.  They should each accept one argument, a number
 from 0 to 9999.
 .PP
-In normal mode, for \fBMSG\fR- and \fBMSF\fR-type reminders,
+In agenda mode, for \fBMSG\fR- and \fBMSF\fR-type reminders,
 the following sequence occurs when
 \fBRemind\fR triggers a reminder:
 .TP
@@ -6509,8 +6788,8 @@ Calculations" by E. M. Reingold and Nachum Dershowitz.
 The \fBSPECIAL\fR keyword is used to transmit "out-of-band" information
 to \fBRemind\fR backends, such as \fBtkremind\fR or \fBRem2PS\fR.
 They are used only when piping data from a \fBremind \-p\fR line.
-(Note that the COLOR special is an exception; it downgrades to the
-equivalent of MSG in \fBRemind's\fR normal mode of operation.)
+(Note that the COLOR special is an exception; it works similarly
+to MSG when the \fB\-p\fR option is not supplied.)
 .PP
 The various \fBSPECIAL\fRs recognized are particular for each
 backend; however, there are four \fBSPECIAL\fRs that all backends
@@ -6579,10 +6858,10 @@ Immediately following COLOR should be three decimal numbers ranging
 from 0 to 255 specifying red, green and blue intensities, respectively.
 The rest of the line is the text to put in the calendar.
 .PP
-The COLOR special is "doubly special", because in its normal operating
-mode, \fBremind\fR treats a COLOR special just like a MSG-type reminder.
-Also, if you invoke \fBRemind\fR with \fB\-@\fR[\fIn\fR], then it approximates
-SPECIAL COLOR reminders on your terminal.
+The COLOR special is "doubly special", because in agenda mode,
+\fBremind\fR treats a COLOR special just like a MSG-type reminder.
+Also, if you invoke \fBRemind\fR with \fB\-@\fR[\fIn\fR], then it
+approximates SPECIAL COLOR reminders on your terminal.
 .PP
 See also the documentation of the \fB$DefaultColor\fR system variable
 in the section "SYSTEM VARIABLES".
@@ -6745,6 +7024,10 @@ the previous example could also be written like this:
 	REM Mon AFTER MSG Hello
 .fi
 .PP
+A SCANFROM that specifies a full date is called an \fIabsolute SCANFROM\fR
+and a SCANFROM that specifies a negative number is called a
+\fIrelative SCANFROM\fR.
+.PP
 In general, use \fBSCANFROM\fR as shown for safe movable \fBOMITs\fR.  The
 amount you should scan back by (7 days in the example above) depends on
 the number of possible consecutive \fBOMITted\fR days that may occur, and

man/tkremind.1.in

@@ -20,18 +20,16 @@ or the tkpng extension to handle PNG images.
 
 .SH COMMAND-LINE OPTIONS
 \fBTkRemind\fR itself has no command-line options.  However, it passes
-certain options on to \fBRemind\fR.  The options it passes are
-\fB\-b\fR, \fB\-g\fR, \fB\-x\fR, \fB\-i\fR and \fB\-m\fR.  See the
-\fBRemind\fR man page for details about the options.  Note that
-\fBTkRemind\fR will respect the \fB\-m\fR and \fB\-b1\fR options and
-adjust its appearance accordingly.
-
+any command-line argument starting with \fB\-\fR to \fBRemind\fR as an
+option.  In addition, \fBTkRemind\fR will respect the \fB\-m\fR and
+\fB\-b1\fR options and adjust its appearance accordingly.
+.PP
 \fIRead_file\fR is the file from which \fBTkRemind\fR reads reminders.
 It is in standard \fBRemind\fR format.  \fIWrite_file\fR is the file
 to which \fBTkRemind\fR writes reminders which you add using the GUI.
 If \fIRead_file\fR is omitted, it defaults to \fB$HOME/.reminders\fR.
 If \fIWrite_file\fR is omitted, it defaults to \fIRead_file\fR.
-
+.PP
 You may wish to have a different \fIWrite_file\fR from \fIRead_file\fR if
 you want to collect all of \fBTkRemind\fR's reminders in one place.  Suppose
 your main file is \fI$HOME/.reminders\fR and you want \fBTkRemind\fR to put
@@ -96,10 +94,16 @@ The fourth control specifies which days \fBRemind\fR considers
 as part of the weekend.  This can affect the interpretation of "weekday"
 in the second and third types of reminders.
 
-The fifth control associates a time with the reminder.
-You can also specify advance notice, possibly repeating.
+The fifth group of controls associates a time and possible duration
+with the reminder.  You can also specify advance notice, possibly
+repeating.
 
-The sixth control specifies what \fBRemind\fR should do if a reminder
+The sixth control allows you to specify whether the reminder is a TODO,
+and if so, its completion date.  Double-clicking in the "Complete through"
+field automatically fills in the date of the calendar entry.  Otherwise,
+enter a possible completion date in the form YYYY-MM-DD.
+
+The seventh control specifies what \fBRemind\fR should do if a reminder
 falls on a holiday or weekend.
 
 Enter the body of the reminder into the \fBSummary:\fR text entry.  If
@@ -121,6 +125,16 @@ edit the reminder, thereby gaining access to advanced features of
 \fBRemind\fR.  You can also use it simply to play around and discover
 \fBRemind\fR's idioms for expressing different types of reminders.
 
+.SH SEEING A SINGLE DAY'S REMINDERS
+Right-click on any day number in the calendar to pop up a window with
+that day's reminders in Agenda Mode.  You can left- or right-click the
+current date and time indicator at the bottom of the window to see today's
+reminders in Agenda Mode.
+
+In the Agenda Mode display, hovering over a reminder will show ancillary
+information such as a Location, URL or Description.  Clicking on a reminder
+will open an editor on the REM command that created the reminder.
+
 .SH PRINTING
 To print the current month's calendar, click \fBPrint...\fR on the
 main calendar window.  This brings up the print dialog.  Printing

rem2pdf/lib/Remind/PDF.pm

@@ -517,7 +517,7 @@ sub render
                 }
         }
 
-        if ($so_far > $settings->{height} - $settings->{margin_bottom}) {
+        if ($so_far > $settings->{height} - $settings->{margin_bottom} + 1) {
                 print STDERR "WARNING: overfull calendar box\n";
         }
         # The vertical lines
@@ -583,7 +583,7 @@ sub draw_row
                 $self->draw_day($cr, $settings, $so_far, $day, $col, $height);
         }
 
-        return $so_far + $height + $settings->{border_size};
+        return $so_far + $height + $settings->{border_size} * 2;
 }
 
 =head2 col_box_coordinates($so_far, $col, $height, $settings)

scripts/tkremind.in

@@ -158,11 +158,6 @@ if {[catch {package require json}]} {
     missing_tcllib json
 }
 
-if {$tcl_platform(platform) == "windows"} {
-    tk_messageBox -message "Please do not port Remind to Windows" -icon error -type ok
-    exit 1
-}
-
 #---------------------------------------------------------------------------
 # GetRemindVersion
 # Arguments:
@@ -317,6 +312,8 @@ set TodayDay [string trim [clock format $now -format %e]]
 set CurMonth $TodayMonth
 set CurYear $TodayYear
 
+set DateOfEventBeingEdited ""
+
 # Reminder option types and skip types
 set OptionType 1
 set SkipType 1
@@ -364,8 +361,8 @@ set HighestTagSoFar 0
 # Check Remind version
 set ver [GetRemindVersion]
 
-if {"$ver" < "04.03.03"} {
-    tk_messageBox -message "This version of TkRemind requires Remind version 04.03.03 or newer; you have version $ver" -icon error -type ok
+if {"$ver" < "06.00.00"} {
+    tk_messageBox -message "This version of TkRemind requires Remind version 06.00.00 or newer; you have version $ver" -icon error -type ok
     exit 1
 }
 
@@ -447,7 +444,10 @@ proc Initialize {} {
 	    if {"[lindex $argv $i]" == "-b1"} {
 		set TwentyFourHourMode 1
 	    }
-	} else {
+	} elseif { [regexp -- {-.*} [lindex $argv $i]]} {
+	    append CommandLine " [lindex $argv $i]"
+	    append PSCmd " [lindex $argv $i]"
+        } else {
 	    break
 	}
 	incr i
@@ -583,7 +583,7 @@ proc CreateCalFrame { w dayNames } {
 	    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) \
                 -highlightthickness 0
-            frame $w.f$f -padx 0 -pady 0 -highlightthickness 0 -relief flat -bd 0
+            frame $w.f$f -padx 0 -pady 0 -highlightthickness 0 -relief flat -bd 0  -background $Option(BackgroundColor)
 	    $w.t$f tag bind TAGGED <ButtonPress-1> "EditTaggedReminder $w.t$f"
 	    $w.t$f tag bind REM <ButtonPress-2> "OpenUrl $w.t$f"
 	    $w.t$f tag bind REM <ButtonPress-3> "FireEditor $w.t$f"
@@ -650,7 +650,8 @@ proc ConfigureCalFrame { w firstDay numDays } {
         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) -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
+            -command "ModifyDay $d $firstDay" -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
+        bind $w.l$i <ButtonPress-3> [list ShowSpecificDayReminders $d]
 	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
@@ -753,7 +754,13 @@ proc CreateCalWindow { dayNames } {
     button .b.quit -text {Quit} -command {Quit} -bd 0 -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
     balloon_add_help .b.quit "Quit TkRemind"
     label .b.status -text "" -width 25 -relief flat -bd 0 -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 0
+    bind .b.status <ButtonPress-1> [list ShowTodaysReminders 1 ""]
+    bind .b.status <ButtonPress-3> [list ShowTodaysReminders 1 ""]
+    balloon_add_help .b.status "Show Today's Reminders"
     label .b.nqueued -text "" -width 20 -relief flat -bd 0 -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightthickness 0
+    balloon_add_help .b.nqueued "See the queue of pending reminders (debugging purposes only)"
+    bind .b.nqueued <ButtonPress-1> [list DoQueue]
+    bind .b.nqueued <ButtonPress-3> [list DoQueue]
     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
@@ -968,6 +975,7 @@ proc CancelOptions { } {
     global Option
     font configure CalboxFont {*}$Option(CalboxFont)
     font configure HeadingFont {*}$Option(HeadingFont)
+    font configure BoldFont {*}$Option(HeadingFont) -weight bold
 }
 
 #***********************************************************************
@@ -1105,6 +1113,7 @@ proc LoadOptions {} {
     }
     font configure CalboxFont {*}$Option(CalboxFont)
     font configure HeadingFont {*}$Option(HeadingFont)
+    font configure BoldFont {*}$Option(HeadingFont) -weight bold
 }
 
 
@@ -1694,6 +1703,36 @@ proc Quit {} {
     }
 }
 
+#---------------------------------------------------------------------------
+# ShowSpecificDayReminders - show reminders for a specific day
+# Arguments:
+#    d - day whose reminders should be shown
+#---------------------------------------------------------------------------
+proc ShowSpecificDayReminders { d } {
+    global CurYear CurMonth
+    set date [format "%04d-%02d-%02d" $CurYear [expr 1 + $CurMonth] $d]
+    ShowTodaysReminders 1 $date
+}
+
+proc toggle_complete_through { w } {
+    global todobut
+        if {$todobut} {
+            $w.complete_through configure -state normal
+        } else {
+            $w.complete_through configure -state disabled
+        }
+}
+
+proc complete_through_today { w } {
+    global DateOfEventBeingEdited
+    $w.complete_through delete 0 end
+    if {"$DateOfEventBeingEdited" != ""} {
+        $w.complete_through insert end $DateOfEventBeingEdited
+    } else {
+        $w.complete_through insert end [clock format [clock seconds] -format %Y-%m-%d]
+    }
+}
+
 #---------------------------------------------------------------------------
 # CreateModifyDialog -- create dialog for adding a reminder
 # Arguments:
@@ -1707,7 +1746,9 @@ proc CreateModifyDialog {w day firstDay args} {
 
     # Set up: Year, Month, Day, WeekdayName
     global CurYear CurMonth EnglishDayNames MonthNames OptionType SkipType
-    global ModifyDialogResult TwentyFourHourMode
+    global ModifyDialogResult TwentyFourHourMode DateOfEventBeingEdited
+
+    set DateOfEventBeingEdited ""
 
     set OptionType 1
     set SkipType 1
@@ -1724,12 +1765,13 @@ proc CreateModifyDialog {w day firstDay args} {
     frame $w.adv -bd 4
     frame $w.weekend -bd 4
     frame $w.durationbox -bd 4
+    frame $w.todobox
     frame $w.time -bd 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
-    pack $w.o $w.exp $w.adv $w.weekend $w.time $w.durationbox $w.hol $w.msg -side top -anchor w -pady 4 -expand 0 -fill both
+    pack $w.o $w.exp $w.adv $w.weekend $w.time $w.durationbox $w.todobox $w.hol $w.msg -side top -anchor w -pady 4 -expand 0 -fill both
     pack $w.msg -side top -anchor w -pady 4 -padx 4 -expand true -fill both
     pack $w.buttons -side top -anchor w -pady 4 -expand 0 -fill x
 
@@ -1919,6 +1961,17 @@ proc CreateModifyDialog {w day firstDay args} {
     }
     pack $w.durationbut $w.durationh $w.durationcolon $w.durationm -side left -anchor w -in $w.durationbox
 
+    # TODO?
+    checkbutton $w.todobut -text "This is a TODO     " -command [list toggle_complete_through $w]
+
+    balloon_add_help $w.todobut "Select if this is a TODO-type reminder"
+    $w.todobut deselect
+    label $w.lcomplete -text "Complete through: "
+    entry $w.complete_through -width 20
+    bind $w.complete_through <Double-Button-1> [list complete_through_today $w]
+    balloon_add_help $w.complete_through "Enter the date of completed TODO in the form YYYY-MM-DD"
+    pack $w.todobut $w.lcomplete $w.complete_through -side left -anchor w -in $w.todobox
+
     # SKIP TYPE
     label $w.labhol -text "On holidays or weekends:"
     radiobutton $w.issue -variable SkipType -value 1 -text "Issue reminder as usual"
@@ -1930,7 +1983,7 @@ proc CreateModifyDialog {w day firstDay args} {
     # TEXT ENTRY
     label $w.msglab -text "Summary: "
     entry $w.entry
-    balloon_add_help $w.entry "Enter the text of the reminder"
+    balloon_add_help $w.entry "Enter the text of the reminder (required)"
     grid $w.msglab -row 0 -column 0 -in $w.msg -sticky e
     grid $w.entry -row 0 -column 1 -in $w.msg -sticky nsew
 
@@ -1987,7 +2040,7 @@ proc CreateModifyDialog {w day firstDay args} {
 #***********************************************************************
 proc RemindDialogToOptions { w } {
     global OptionType SkipType repbut expbut advbut advcount
-    global timebut timeadvbut timerepbut durationbut
+    global timebut timeadvbut timerepbut durationbut todobut
     global dSaturday dSunday dMonday dTuesday dWednesday dThursday dFriday
     set ans {}
     lappend ans "-global-OptionType" $OptionType
@@ -2021,10 +2074,11 @@ proc RemindDialogToOptions { w } {
 #***********************************************************************
 proc OptionsToRemindDialog { w opts } {
     global OptionType SkipType repbut expbut advbut advcount
-    global timebut timeadvbut timerepbut TwentyFourHourMode durationbut
-    global dSaturday dSunday dMonday dTuesday dWednesday dThursday dFriday
+    global timebut timeadvbut timerepbut TwentyFourHourMode durationbut todobut
+    global dSaturday dSunday dMonday dTuesday dWednesday dThursday dFriday DateOfEventBeingEdited
     set hour ""
     set ampm ""
+    $w.complete_through configure -state normal
     foreach {flag value} $opts {
 	switch -glob -- $flag {
 	    "-text-*" {
@@ -2072,6 +2126,7 @@ proc OptionsToRemindDialog { w opts } {
 	    }
 	}
     }
+    toggle_complete_through $w
 }
 
 #---------------------------------------------------------------------------
@@ -2163,6 +2218,7 @@ proc ModifyDay {d firstDay} {
     wm iconname .mod "Add Reminder"
     tkwait visibility .mod
     set oldFocus [focus]
+    toggle_complete_through .mod
     while {1} {
 	grab .mod
         raise .mod
@@ -2243,7 +2299,7 @@ proc CreateReminder {w} {
     set body [string trim [$w.entry get]]
 
     if {"$body" == ""} {
-	error "Blank body in reminder"
+	error "Summary is required"
     }
 
     set DidOmit 0
@@ -2251,7 +2307,7 @@ proc CreateReminder {w} {
     # Delegate the first part to CreateReminder1, CreateReminder2, or
     # CreateReminder3
     global OptionType SkipType repbut expbut advbut advcount
-    global timebut timeadvbut timerepbut durationbut
+    global timebut timeadvbut timerepbut durationbut todobut
 
     set rem [CreateReminder$OptionType $w]
 
@@ -2299,6 +2355,13 @@ proc CreateReminder {w} {
 	}
     }
 
+    if {$todobut} {
+        append rem " TODO"
+        set ct [string trim [$w.complete_through get]]
+        if {"$ct" != ""} {
+            append rem " COMPLETE-THROUGH $ct"
+        }
+    }
     global SkipType
     if {$SkipType == 2} {
 	append rem " SKIP"
@@ -2845,14 +2908,15 @@ proc RestartBackgroundRemindDaemon {} {
 #    Dumps the debugging queue listing
 #---------------------------------------------------------------------------
 proc ShowQueue { queue } {
+    global Option
     set w .queuedbg
     catch { destroy $w }
-    toplevel $w
+    toplevel $w -background $Option(WinBackground)
     wm title $w "Queue (Debugging Output)"
     wm iconname $w "Queue Dbg"
-    text $w.t -fg black -bg white -width 80 -height 30 -wrap word -yscrollcommand "$w.sb set"
+    text $w.t -fg black -bg white -width 80 -height 30 -wrap word -yscrollcommand "$w.sb set" -foreground $Option(TextColor) -background $Option(BackgroundColor) -font CalBoxFont
     scrollbar $w.sb -orient vertical -command "$w.text yview"
-    button $w.ok -text "OK" -command "destroy $w"
+    button $w.ok -text "OK" -command "destroy $w" -foreground $Option(TextColor) -background $Option(BackgroundColor) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
     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 -sticky w
@@ -2864,7 +2928,6 @@ proc ShowQueue { queue } {
     set obj [lsort -command sort_q $queue]
     set did 0
     $w.t tag configure grey -background "#DDDDDD" -selectbackground "#999999"
-    set toggle 0
     foreach q $obj {
         if { $did > 0 } {
             $w.t insert end "\n"
@@ -2887,24 +2950,17 @@ proc ShowQueue { queue } {
         }
         foreach key [list time nexttime body] {
             set r [dict get $q $key]
-            if { $toggle != 0 } {
-                $w.t insert end "$key=$r" [list grey $fntag]
-                if {"$key" != "body"} {
-                    $w.t insert end "; " [list grey $fntag]
-                }
-            } else {
-                $w.t insert end "$key=$r" [list $fntag]
-                if {"$key" != "body"} {
-                    $w.t insert end "; " [list $fntag]
-                }
+            $w.t insert end "$key=$r" [list $fntag]
+            if {"$key" != "body"} {
+                $w.t insert end "; " [list $fntag]
             }
         }
         $w.t insert end "\n"
-        set toggle [expr 1 - $toggle]
         set did 1
     }
     if { $did == 0 } {
-        $w.t insert end "(Queue is empty)\n"
+        $w.t tag configure bold -font BoldFont
+        $w.t insert end "(Queue is empty)\n" bold
     } else {
         $w.t insert end "\n\nClick on a queue item to open an editor on the corresponding REM command.\n"
     }
@@ -3014,7 +3070,7 @@ proc DaemonReadable { file } {
             catch { unset Ignore }
 	    Initialize
 	    FillCalWindow
-	    ShowTodaysReminders
+	    ShowTodaysReminders 0 ""
         }
         "reread" {
             if {[dict exists $obj command]} {
@@ -3195,6 +3251,7 @@ proc main {} {
 
     font create CalboxFont {*}[font actual TkFixedFont]
     font create HeadingFont {*}[font actual TkDefaultFont]
+    font create BoldFont {*}[font actual TkDefaultFont] -weight bold
 
     global AppendFile HighestTagSoFar DayNames
     catch {
@@ -3212,7 +3269,7 @@ proc main {} {
     }
     FindConfigFile
     LoadOptions
-    ShowTodaysReminders
+    ShowTodaysReminders 0 ""
     ScanForTags $AppendFile
     CreateCalWindow $DayNames
     FillCalWindow
@@ -3284,6 +3341,9 @@ proc ReadTaggedOptions { tag date } {
 	}
     }
 
+    if {[dict exists $obj date]} {
+        lappend ans -global-DateOfEventBeingEdited $date
+    }
     if {[dict exists $obj d]} {
 	lappend ans -text-day1 [dict get $obj d]
 	lappend ans -text-day2 [dict get $obj d]
@@ -3509,6 +3569,18 @@ proc ReadTaggedOptions { tag date } {
 	lappend ans -entry-entry [dict get $obj body]
     }
 
+    # Is this a TODO?
+    if {[dict exists $obj is_todo]} {
+        lappend ans -global-todobut [dict get $obj is_todo]
+    } else {
+        lappend ans -global-todobut 0
+    }
+    if {[dict exists $obj complete_through]} {
+        lappend ans -entry-complete_through [dict get $obj complete_through]
+    } else {
+        lappend ans -entry-complete_through ""
+    }
+
     # Figure out the reminder type
     if {[dict exists $obj rep]} {
 	# Repeat must be type 1
@@ -3818,7 +3890,7 @@ proc EditTaggedReminder { w } {
     wm title .mod "TkRemind Edit Reminder..."
     wm iconname .mod "Edit Reminder"
     OptionsToRemindDialog .mod $opts
-
+    toggle_complete_through .mod
     tkwait visibility .mod
     set oldFocus [focus]
     while {1} {
@@ -4240,47 +4312,67 @@ proc DisplayTimeContinuously {} {
 }
 
 
+proc daily_rem_enter { lines } {
+    global Balloon
+    balloon_cancel_timer
+    set Balloon(HelpId) [after $Balloon(HelpTime) [list details_popup $lines]]
+}
+
 #***********************************************************************
 # %PROCEDURE: ShowTodaysReminders
 # %ARGUMENTS:
-#  None
+#  force -- if true, show today's reminders even if option is disabled.
+#  date -- if non-blank, show reminders for specified date rather than today.
 # %RETURNS:
 #  Nothing
 # %DESCRIPTION:
 #  Shows all of today's non-timed reminders in a window
 #***********************************************************************
-proc ShowTodaysReminders {} {
+proc ShowTodaysReminders { force date } {
     global Option
     global Remind
     global ReminderFile
     global TwentyFourHourMode
-    if {!$Option(ShowTodaysReminders)} {
+    if {!$force && !$Option(ShowTodaysReminders)} {
 	return
     }
 
     set w .today
     catch { destroy $w }
-    toplevel $w
-    wm title $w "Today's Reminders"
+    toplevel $w -background $Option(WinBackground)
+    if {"$date" == ""} {
+        set wtitle "Today's Reminders"
+    } else {
+        set wtitle "Reminders for $date"
+    }
     wm iconname $w "Reminders"
-    text $w.text -width 80 -height 20 -wrap word -yscrollcommand "$w.sb set"
+    text $w.text -width 80 -height 20 -wrap word -yscrollcommand "$w.sb set" -foreground $Option(TextColor) -background $Option(BackgroundColor) -font CalboxFont -spacing1 3
     scrollbar $w.sb -orient vertical -command "$w.text yview"
-    button $w.ok -text "OK" -command "destroy $w"
+    button $w.ok -text "OK" -command "destroy $w" -foreground $Option(TextColor) -background $Option(BackgroundColor) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
 
     grid $w.text -row 0 -column 0 -sticky nsew
     grid $w.sb -row 0 -column 1 -sticky ns
     grid $w.ok -row 1 -column 0 -sticky w
-
+    grid rowconfigure $w 0 -weight 1
+    grid rowconfigure $w 1 -weight 0
+    grid columnconfigure $w 0 -weight 1
+    grid columnconfigure $w 1 -weight 0
     CenterWindow $w .
 
     # Grab the reminders
     set stuff ""
-    set cmdline "|$Remind -itkremind=1 -g -q -r "
+    set cmdline "|$Remind -itkremind=1 --json -q -r "
     if {$TwentyFourHourMode} {
         append cmdline "-b1 "
     }
     append cmdline $Option(ExtraRemindArgs);
-    append cmdline " $ReminderFile 2>@1"
+    append cmdline " $ReminderFile"
+    if {"$date" != ""} {
+        append cmdline " $date"
+    } else {
+        set date [clock format [clock seconds] -format "%Y-%m-%d" -locale C]
+    }
+    append cmdline " 2>@1"
     set f [open $cmdline r]
     while {[gets $f line] >= 0} {
 	append stuff "$line\n"
@@ -4290,12 +4382,163 @@ proc ShowTodaysReminders {} {
 	$w.text insert end $stuff
 	$w.text insert end "\n"
 	$w.text insert end $err
-    } else {
-	$w.text insert end $stuff
+        $w.text configure -state disabled
+        return
     }
+
+    if {[catch {set arr [::json::json2dict $stuff]} err]} {
+	$w.text insert end "Error converting JSON\n\n"
+	$w.text insert end $err
+        $w.text configure -state disabled
+        return
+    }
+
+    # If first element is banner, set window title
+    set first [lindex $arr 0]
+    $w.text tag configure bold -font BoldFont
+    if {"[lindex $first 0]" == "banner"} {
+        set banner [lindex $first 1]
+        # Trim trailing colon
+        set wtitle [string trimright $banner ":"]
+        set arr [lreplace $arr 0 0]
+        $w.text insert end "$banner" bold
+        $w.text insert end "\n\n"
+    }
+
+    # At this point, we can set the window title
+    wm title $w $wtitle
+
+    # If first element is no reminders, FINE.
+    set first [lindex $arr 0]
+    if {"[lindex $first 0]" == "noreminders"} {
+        $w.text insert end [lindex $first 1] bold
+        $w.text insert end "\n"
+        $w.text configure -state disabled
+        return
+    }
+
+    set arr [lsort -command compare_reminders $arr]
+    set old_date {}
+    set did_a_date 0
+    set t_index 0
+    foreach thing $arr {
+        incr t_index
+        set mydate [dict get $thing date]
+        if {"$mydate" != "$old_date"} {
+            if {"$old_date" != ""} {
+                $w.text insert end "\n"
+            }
+            if {$did_a_date || "$mydate" != "$date"} {
+                $w.text insert end "> $mydate\n" bold
+                set did_a_date 1
+            }
+        }
+        set old_date $mydate
+        set tags [list "l_$t_index"]
+        if {[dict exists $thing r] && [dict exists $thing g] && [dict exists $thing g]} {
+            set r [dict get $thing r]
+            set g [dict get $thing g]
+            set b [dict get $thing b]
+            if {$r > 255} {
+                set r 255
+            } elseif {$r < 0} {
+                set r 0
+            }
+            if {$g > 255} {
+                set g 255
+            } elseif {$g < 0} {
+                set g 0
+            }
+            if {$b > 255} {
+                set b 255
+            } elseif {$b < 0} {
+                set b 0
+            }
+            set color [format "%02X%02X%02X" $r $g $b]
+            lappend tags "clr$color"
+            $w.text tag configure "clr$color" -foreground "#$color"
+        }
+
+        set help_lines {}
+        if {[dict exists $thing info]} {
+            set info [dict get $thing info]
+            if {[dict exists $info location]} {
+                lappend help_lines [list "Location:" [dict get $info location]]
+            }
+            if {[dict exists $info description]} {
+                lappend help_lines [list "Description:" [dict get $info description]]
+            }
+            if {[dict exists $info url]} {
+                lappend help_lines [list "URL:" "Middle-click to open [dict get $info url]"]
+                $w.text tag bind "l_$t_index" <ButtonPress-2> [list exec xdg-open [dict get $info url]]
+            }
+        }
+        if {[llength $help_lines] >= 1} {
+            $w.text tag bind "l_$t_index" <Enter> +[list daily_rem_enter $help_lines]
+            $w.text tag bind "l_$t_index" <Leave> +[list details_leave $w]
+        }
+	if {[dict exists $thing filename]} {
+            set fname [dict get $thing filename]
+            # Don't make INCLUDECMD output editable
+            if {![string match "*|" $fname]} {
+                if {[dict exists $thing lineno_start]} {
+                    set l [dict get $thing lineno_start]
+                } else {
+                    set l [dict get $thing lineno]
+                }
+                set fntag [string cat "FILE_" $l "_" $fname]
+                $w.text tag bind "l_$t_index" <Enter> +[list $w.text tag configure "l_$t_index" -underline 1]
+                $w.text tag bind "l_$t_index" <Leave> +[list $w.text tag configure "l_$t_index" -underline 0]
+                $w.text tag bind "l_$t_index" <ButtonPress-1> [list FireEditor $w.text $fntag]
+                $w.text tag bind "l_$t_index" <ButtonPress-3> [list FireEditor $w.text $fntag]
+            }
+	}
+        $w.text insert end [dict get $thing body] $tags
+        $w.text insert end "\n"
+    }
+
+    #$w.text insert end "\n\n$stuff\n"
     $w.text configure -state disabled
 }
 
+proc compare_reminders { a b } {
+    set a_date [dict get $a date]
+    set b_date [dict get $b date]
+    #puts "Comparing $a_date $b_date"
+    if {"$a_date" < "$b_date"} {
+        return -1
+    }
+    if {"$a_date" > "$b_date"} {
+        return 1
+    }
+
+    if {[dict exists $a time]} {
+        set a_time [dict get $a time]
+    } else {
+        set a_time 1441
+    }
+    if {[dict exists $b time]} {
+        set b_time [dict get $b time]
+    } else {
+        set b_time 1441
+    }
+    if {$a_time < $b_time} {
+        return -1
+    }
+    if {$a_time > $b_time} {
+        return 1
+    }
+    set a_prio [dict get $a priority]
+    set b_prio [dict get $b priority]
+    if {$a_prio < $b_prio} {
+        return -1;
+    }
+    if {$a_prio > $b_prio} {
+        return 1;
+    }
+    return 0
+}
+
 #***********************************************************************
 # %PROCEDURE: InteractiveDeleteReminder
 # %ARGUMENTS:
@@ -4516,6 +4759,7 @@ proc ChooseHeadingFont {} {
 proc SetHeadingFont {font} {
     global tmpOpt
     font configure HeadingFont {*}[font actual $font]
+    font configure BoldFont {*}$Option(HeadingFont) -weight bold
     set tmpOpt(HeadingFont) [font actual $font]
     raise .opt
 }
@@ -4616,13 +4860,13 @@ proc set_button_to_errors {} {
 }
 
 proc ShowErrors {} {
-    global RemindErrors
+    global RemindErrors Option
     set w ".errors"
     catch { destroy $w }
-    toplevel $w
-    text $w.t -width 80 -height 30 -wrap word -yscrollcommand "$w.sb set"
+    toplevel $w -background $Option(WinBackground)
+    text $w.t -width 80 -height 30 -wrap word -yscrollcommand "$w.sb set" -foreground $Option(TextColor) -background $Option(BackgroundColor) -font CalBoxFont
     scrollbar $w.sb -orient vertical -command "$w.t yview"
-    button $w.ok -text OK -command DoneShowingErrors
+    button $w.ok -text OK -command DoneShowingErrors -foreground $Option(TextColor) -background $Option(BackgroundColor) -highlightthickness 1 -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
     grid $w.t -row 0 -column 0 -sticky nsew
     grid $w.sb -row 0 -column 1 -sticky ns
     grid $w.ok -row 1 -column 0 -stick w

src/Makefile.in

@@ -46,10 +46,12 @@ test: all
 .c.o:
 	@CC@ -c @CPPFLAGS@ @CFLAGS@ @DEFS@ $(CEXTRA) -DSYSDIR=$(datarootdir)/remind -I. -I$(srcdir) $<
 
+# Extract all tr() strings into a file.  NOTE: SOURCE CODE MUST NOT HAVE
+# MORE THAN ONE tr() PER LINE!!!
 xlat.c: $(REMINDSRCS)
 	@echo "#include <stddef.h>" > xlat.c
 	@echo "char const *translatables[] = {" >> xlat.c
-	@cat $(REMINDSRCS) | grep 'tr(".*")' | sed -e 's/.*tr."/"/' -e 's/").*/"/' | LANG=C LC_ALL=C sort | uniq | grep -E -v '^"(am|at|from now|hour|minute|now|on|pm|today|tomorrow|was)"$$' | sed -e 's/^/    /' -e 's/$$/,/' >> xlat.c
+	@cat $(REMINDSRCS) | grep 'tr(".*")' | sed -e 's/.*tr."/"/' -e 's/").*/"/' | LANG=C LC_ALL=C sort | uniq | grep -E -v '^"(ago|am|and|at|from now|is|hour|minute|now|on|pm|today|tomorrow|was)"$$' | sed -e 's/^/    /' -e 's/$$/,/' >> xlat.c
 	@echo "    NULL" >> xlat.c
 	@echo "};" >> xlat.c
 
@@ -102,7 +104,7 @@ depend:
 # distributions, etc.
 
 cppcheck:
-	cppcheck -j`nproc` -v --force --enable=all --suppress=ConfigurationNotChecked --suppress=unmatchedSuppression --suppress=variableScope --inline-suppr .
+	cppcheck -j`nproc` -v --force --enable=all --suppress=missingIncludeSystem --suppress=ConfigurationNotChecked --suppress=unmatchedSuppression --suppress=variableScope --inline-suppr --check-level=exhaustive .
 
 # Build a tar file based on all files checked into git.
 distro:

src/calendar.c

@@ -279,6 +279,7 @@ static int DidAMonth;
 static int DidAWeek;
 static int DidADay;
 
+static char const *CalendarTime(int tim, int duration);
 static void ColorizeEntry(CalEntry const *e, int clamp);
 static void SortCol (CalEntry **col);
 static void DoCalendarOneWeek (int nleft);
@@ -288,7 +289,7 @@ static int WriteCalendarRow (void);
 static void WriteWeekHeaderLine (void);
 static void WritePostHeaderLine (void);
 static void PrintLeft (char const *s, int width, char pad);
-static void PrintCentered (char const *s, int width, char *pad);
+static void PrintCentered (char const *s, int width, char const *pad);
 static int WriteOneCalLine (int dse, int wd);
 static int WriteOneColLine (int col);
 static void GenerateCalEntries (int col);
@@ -380,7 +381,7 @@ despace(char const *s)
     return buf;
 }
 
-void PrintJSONChar(char c) {
+static void PrintJSONChar(char c) {
     switch(c) {
     case '\b': printf("\\b"); break;
     case '\f': printf("\\f"); break;
@@ -422,7 +423,7 @@ void PrintJSONString(char const *s)
     }
 }
 
-void PrintJSONStringLC(char const *s)
+static void PrintJSONStringLC(char const *s)
 {
     while (*s) {
         switch(*s) {
@@ -466,7 +467,7 @@ void PrintJSONKeyPairString(char const *name, char const *val)
     printf("\",");
 }
 
-void PrintJSONKeyPairDate(char const *name, int dse)
+static void PrintJSONKeyPairDate(char const *name, int dse)
 {
     int y, m, d;
     if (dse == NO_DATE) {
@@ -480,7 +481,7 @@ void PrintJSONKeyPairDate(char const *name, int dse)
 
 }
 
-void PrintJSONKeyPairDateTime(char const *name, int dt)
+static void PrintJSONKeyPairDateTime(char const *name, int dt)
 {
     int y, m, d, h, i, k;
     if (dt == NO_TIME) {
@@ -498,7 +499,7 @@ void PrintJSONKeyPairDateTime(char const *name, int dt)
 
 }
 
-void PrintJSONKeyPairTime(char const *name, int t)
+static void PrintJSONKeyPairTime(char const *name, int t)
 {
     int h, i;
     if (t == NO_TIME) {
@@ -646,7 +647,7 @@ Colorize256(int r, int g, int b, int bg, int clamp)
     int best = -1;
     int best_dist = 0;
     int dist;
-    struct xterm256_colors *cur;
+    struct xterm256_colors const *cur;
     size_t i;
 
     if (clamp) {
@@ -1387,7 +1388,7 @@ static void PrintLeft(char const *s, int width, char pad)
 /*  Center a piece of text                                      */
 /*                                                             */
 /***************************************************************/
-static void PrintCentered(char const *s, int width, char *pad)
+static void PrintCentered(char const *s, int width, char const *pad)
 {
 #ifndef REM_USE_WCHAR
     int len = strlen(s);
@@ -1776,6 +1777,7 @@ static void GenerateCalEntries(int col)
             case T_ErrMsg:  r=DoErrMsg(&p);  break;
             case T_Rem:     r=DoCalRem(&p, col); break;
             case T_If:      r=DoIf(&p);      break;
+            case T_Return:  r=DoReturn(&p);  break;
             case T_IfTrig:  r=DoIfTrig(&p);  break;
             case T_Else:    r=DoElse(&p);    break;
             case T_EndIf:   r=DoEndif(&p);   break;
@@ -1805,6 +1807,18 @@ static void GenerateCalEntries(int col)
                 break;
             case T_Pop:     r=PopOmitContext(&p);     break;
             case T_Push:    r=PushOmitContext(&p);    break;
+            case T_PushVars:
+                r=PushVars(&p);
+                break;
+            case T_PopVars:
+                r=PopVars(&p);
+                break;
+            case T_PushFuncs:
+                r=PushUserFuncs(&p);
+                break;
+            case T_PopFuncs:
+                r=PopUserFuncs(&p);
+                break;
             case T_Preserve: r=DoPreserve(&p);        break;
             case T_Expr: r = DoExpr(&p);              break;
             case T_Translate: r = DoTranslate(&p); break;
@@ -2005,7 +2019,7 @@ static int DoCalRem(ParsePtr p, int col)
         }
     } else {
         /* Calculate the trigger date */
-        dse = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 1);
+        dse = ComputeTrigger(get_scanfrom(&trig), &trig, &tim, &r, 1);
         if (r) {
             if (r == E_CANT_TRIG && trig.maybe_uncomputable) {
                 r = OK;
@@ -2036,6 +2050,13 @@ static int DoCalRem(ParsePtr p, int col)
         return OK;
     }
 
+    /* Filter unwanted events/todos */
+    if ((TodoFilter == ONLY_TODOS && !trig.is_todo) ||
+        (TodoFilter == ONLY_EVENTS && trig.is_todo)) {
+        FreeTrig(&trig);
+        return OK;
+    }
+
     /* Save nonconst_expr flag */
     nonconst_expr = p->nonconst_expr;
     /* Convert PS and PSF to PASSTHRU */
@@ -2135,14 +2156,18 @@ static int DoCalRem(ParsePtr p, int col)
             }
             (void) sscanf(DBufValue(&pre_buf), "%d %d %d",
                           &col_r, &col_g, &col_b);
-            if (col_r < 0) col_r = 0;
-            else if (col_r > 255) col_r = 255;
-            if (col_g < 0) col_g = 0;
-            else if (col_g > 255) col_g = 255;
-            if (col_b < 0) col_b = 0;
-            else if (col_b > 255) col_b = 255;
-            if (!PsCal && !DoSimpleCalendar) {
+            if (col_r < 0 || col_g < 0 || col_b < 0 ||
+                col_r > 255 || col_g > 255 || col_b > 255) {
+                is_color = 0;
+                col_r = -1;
+                col_g = -1;
+                col_b = -1;
+                trig.passthru[0] = 0;
                 DBufFree(&pre_buf);
+            } else {
+                if (!PsCal && !DoSimpleCalendar) {
+                    DBufFree(&pre_buf);
+                }
             }
         }
     }
@@ -2342,7 +2367,7 @@ static int DoCalRem(ParsePtr p, int col)
     return OK;
 }
 
-static void WriteSimpleEntryProtocol1(CalEntry *e)
+static void WriteSimpleEntryProtocol1(CalEntry const *e)
 {
         if (e->passthru[0]) {
             printf(" %s", e->passthru);
@@ -2413,7 +2438,7 @@ WriteJSONInfoChain(TrigInfo *ti)
     }
     printf("},");
 }
-void WriteJSONTrigger(Trigger const *t, int include_tags, int today)
+void WriteJSONTrigger(Trigger const *t, int include_tags)
 {
     /* wd is an array of days from 0=monday to 6=sunday.
        We convert to array of strings */
@@ -2441,6 +2466,8 @@ void WriteJSONTrigger(Trigger const *t, int include_tags, int today)
     if (t->y != NO_YR) {
         PrintJSONKeyPairInt("y", t->y);
     }
+    PrintJSONKeyPairInt("is_todo", t->is_todo);
+    PrintJSONKeyPairDate("complete_through", t->complete_through);
     if (t->back) {
         PrintJSONKeyPairInt("back", t->back);
     }
@@ -2486,8 +2513,12 @@ void WriteJSONTrigger(Trigger const *t, int include_tags, int today)
     if (t->once != NO_ONCE) {
         PrintJSONKeyPairInt("once", t->once);
     }
-    if (t->scanfrom != today) {
-        PrintJSONKeyPairDate("scanfrom", t->scanfrom);
+    if (t->scanfrom != NO_SCANFROM) {
+        if (t->scanfrom >= 0) {
+            PrintJSONKeyPairDate("scanfrom", t->scanfrom);
+        } else {
+            PrintJSONKeyPairInt("scanfrom", t->scanfrom);
+        }
     }
     PrintJSONKeyPairDate("from", t->from);
     PrintJSONKeyPairInt("priority", t->priority);
@@ -2515,7 +2546,7 @@ void WriteJSONTrigger(Trigger const *t, int include_tags, int today)
     }
 }
 
-static void WriteSimpleEntryProtocol2(CalEntry *e, int today)
+static void WriteSimpleEntryProtocol2(CalEntry *e)
 {
     char const *s;
     if (DoPrefixLineNo) {
@@ -2542,7 +2573,7 @@ static void WriteSimpleEntryProtocol2(CalEntry *e, int today)
             PrintJSONKeyPairInt("trep", e->tt.rep);
         }
     }
-    WriteJSONTrigger(&e->trig, 0, today);
+    WriteJSONTrigger(&e->trig, 0);
     if (e->nonconst_expr) {
         PrintJSONKeyPairInt("nonconst_expr", e->nonconst_expr);
     }
@@ -2647,7 +2678,7 @@ static void WriteSimpleEntries(int col, int dse)
             }
             DidADay = 1;
             printf("{\"date\":\"%04d-%02d-%02d\",", y, m+1, d);
-            WriteSimpleEntryProtocol2(e, dse);
+            WriteSimpleEntryProtocol2(e);
             printf("}");
             if (PsCal != PSCAL_LEVEL3) {
                 printf("\n");
@@ -2782,7 +2813,7 @@ static void WriteCalDays(void)
 /*  This takes into account duration                           */
 /*                                                             */
 /***************************************************************/
-char const *
+static char const *
 CalendarTime(int tim, int duration)
 {
     static char buf[128];
@@ -2880,7 +2911,8 @@ char const *SimpleTime(int tim)
             if (h == 0) hh=12;
             else if (h > 12) hh=h-12;
             else hh=h;
-            snprintf(buf, sizeof(buf), "%d%c%02d%.64s ", hh, TimeSep, min, (h>=12) ? tr("pm") : tr("am"));
+            snprintf(buf, sizeof(buf), "%d%c%02d%.64s ", hh, TimeSep, min, (h>=12) ? tr("pm") :
+                                                                                     tr("am"));
         }
         break;
 

src/dedupe.c

@@ -28,9 +28,9 @@ typedef struct dedupe_entry {
 
 static hash_table DedupeTable;
 
-static unsigned int DedupeHashFunc(void *x)
+static unsigned int DedupeHashFunc(void const *x)
 {
-    DedupeEntry *e = (DedupeEntry *) x;
+    DedupeEntry const *e = (DedupeEntry const *) x;
     unsigned int hashval = (unsigned int) e->trigger_date;
     if (e->trigger_time != NO_TIME) {
         hashval += (unsigned int) e->trigger_time;
@@ -39,10 +39,10 @@ static unsigned int DedupeHashFunc(void *x)
     return hashval;
 }
 
-static int CompareDedupes(void *x, void *y)
+static int CompareDedupes(void const *x, void const *y)
 {
-    DedupeEntry *a = (DedupeEntry *) x;
-    DedupeEntry *b = (DedupeEntry *) y;
+    DedupeEntry const *a = (DedupeEntry const *) x;
+    DedupeEntry const *b = (DedupeEntry const *) y;
     if (a->trigger_date != b->trigger_date) return a->trigger_date - b->trigger_date;
     if (a->trigger_time != b->trigger_time) return a->trigger_time - b->trigger_time;
     return strcmp(a->body, b->body);
@@ -122,7 +122,7 @@ InsertDedupeEntry(int trigger_date, int trigger_time, char const *body)
 int
 ShouldDedupe(int trigger_date, int trigger_time, char const *body)
 {
-    DedupeEntry *e = FindDedupeEntry(trigger_date, trigger_time, body);
+    DedupeEntry const *e = FindDedupeEntry(trigger_date, trigger_time, body);
 
     if (e) {
         return 1;

src/dorem.c

@@ -29,8 +29,82 @@ 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, int type);
-static int ShouldTriggerBasedOnWarn (Trigger *t, int dse, int *err);
-static int ComputeTrigDuration(TimeTrig *t);
+static int ShouldTriggerBasedOnWarn (Trigger const *t, int dse, int *err);
+static int ComputeTrigDuration(TimeTrig const *t);
+
+void remove_trailing_newlines(DynamicBuffer *buf)
+{
+    char *s = (char *) DBufValue(buf) + DBufLen(buf) - 1;
+    while (s >= DBufValue(buf)) {
+        if (*s == '\n') {
+            *s = 0;
+            s--;
+        } else {
+            break;
+        }
+    }
+}
+static int todo_filtered(Trigger const *t)
+{
+    if (t->is_todo && TodoFilter == ONLY_EVENTS) return 1;
+    if (!t->is_todo && TodoFilter == ONLY_TODOS) return 1;
+    return 0;
+}
+
+static int
+get_raw_scanfrom(Trigger const *t)
+{
+    if (t->from != NO_DATE) {
+        if (t->from > DSEToday) return t->from;
+        return DSEToday;
+    }
+    if (t->scanfrom == NO_SCANFROM) return NO_SCANFROM;
+    if (t->scanfrom > 0) return t->scanfrom;
+
+    /* Relative SCANFROM is negative, so subtract from today() */
+    return DSEToday + t->scanfrom;
+}
+
+int
+get_scanfrom(Trigger const *t)
+{
+    int calmode = (DoSimpleCalendar || DoCalendar) ? 1 : 0;
+
+    /* TODOs are treated just like events in calendar mode */
+    if (!calmode && t->is_todo && t->from != NO_DATE) {
+        if (t->complete_through != NO_DATE) {
+            if (t->complete_through+1 > t->from) {
+                return t->complete_through+1;
+            } else {
+                return t->from;
+            }
+        } else {
+            return t->from;
+        }
+    }
+    if (get_raw_scanfrom(t) != NO_SCANFROM) {
+        if (!calmode && t->complete_through != NO_DATE) {
+            if (t->complete_through+1 > get_raw_scanfrom(t)) {
+                return t->complete_through+1;
+            } else {
+                return get_raw_scanfrom(t);
+            }
+        } else {
+            return get_raw_scanfrom(t);
+        }
+    }
+    if (!calmode) {
+        if (t->complete_through != NO_DATE) {
+            return t->complete_through+1;
+        }
+        if (t->is_todo) {
+            /* TODO with no COMPLETE-THROUGH.
+               Scan from the beginning of time */
+            return 0;
+        }
+    }
+    return DSEToday;
+}
 
 static int
 ensure_expr_references_first_local_arg(expr_node *node)
@@ -179,7 +253,7 @@ static void ensure_satnode_mentions_trigdate(expr_node *node)
 
 
 static int
-ComputeTrigDuration(TimeTrig *t)
+ComputeTrigDuration(TimeTrig const *t)
 {
     if (t->ttime == NO_TIME ||
         t->duration == NO_TIME) {
@@ -213,6 +287,12 @@ int DoRem(ParsePtr p)
         return r;
     }
 
+    if (trig.complete_through != NO_DATE && !trig.is_todo) {
+        PurgeEchoLine("%s\n", CurLine);
+        FreeTrig(&trig);
+        return E_COMPLETE_WITHOUT_TODO;
+    }
+
     if (trig.typ == NO_TYPE) {
         if (!Hush) {
             PurgeEchoLine("%s\n", "#!P! Cannot parse next line");
@@ -286,7 +366,7 @@ int DoRem(ParsePtr p)
         }
     } else {
         /* Calculate the trigger date */
-        dse = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 1);
+        dse = ComputeTrigger(get_scanfrom(&trig), &trig, &tim, &r, 1);
         if (r) {
             if (PurgeMode) {
                 if (!Hush) {
@@ -311,7 +391,7 @@ int DoRem(ParsePtr p)
         }
     }
     if (PurgeMode) {
-        if (trig.expired || dse < DSEToday) {
+        if (trig.expired || (!trig.is_todo && dse < DSEToday)) {
             if (p->expr_happened) {
                 if (p->nonconst_expr) {
                     if (!Hush) {
@@ -339,8 +419,11 @@ int DoRem(ParsePtr p)
     if (dse == DSEToday &&
         !(!IgnoreOnce &&
           trig.once != NO_ONCE &&
-          GetOnceDate() == DSEToday))
-        QueueReminder(p, &trig, &tim, trig.sched);
+          GetOnceDate() == DSEToday)) {
+        if (!todo_filtered(&trig)) {
+            QueueReminder(p, &trig, &tim, trig.sched);
+        }
+    }
     /* If we're in daemon mode, do nothing over here */
     if (Daemon) {
         FreeTrig(&trig);
@@ -349,7 +432,72 @@ int DoRem(ParsePtr p)
 
     r = OK;
     if (ShouldTriggerReminder(&trig, &tim, dse, &err)) {
-        if ( (r=TriggerReminder(p, &trig, &tim, dse, 0, NULL)) ) {
+        /* Filter unwanted events/todos */
+        if (todo_filtered(&trig)) {
+            FreeTrig(&trig);
+            return OK;
+        }
+
+        if (JSONMode) {
+            DynamicBuffer body;
+            int y, m, d;
+            int if_depth = get_if_pointer() - get_base_if_pointer();
+            DBufInit(&body);
+            int red=-1, green=-1, blue=-1;
+            r=TriggerReminder(p, &trig, &tim, dse, 0, &body, &red, &green, &blue);
+            if (r) {
+                FreeTrig(&trig);
+                return r;
+            }
+            /* Remove trailing newlines from body */
+            remove_trailing_newlines(&body);
+
+            if (!*DBufValue(&body)) {
+                FreeTrig(&trig);
+                return r;
+            }
+            if (JSONLinesEmitted) {
+                printf("},\n");
+            }
+            JSONLinesEmitted++;
+            FromDSE(dse, &y, &m, &d);
+            printf("{\"date\":\"%04d-%02d-%02d\",", y, m+1, d);
+            PrintJSONKeyPairString("filename", GetCurrentFilename());
+            PrintJSONKeyPairInt("lineno", LineNo);
+            if (LineNoStart != LineNo) {
+                PrintJSONKeyPairInt("lineno_start", LineNoStart);
+            }
+            PrintJSONKeyPairString("passthru", trig.passthru);
+            if (trig.duration_days) {
+                PrintJSONKeyPairInt("duration", trig.duration_days);
+            }
+            if (tim.ttime != NO_TIME) {
+                PrintJSONKeyPairInt("time", tim.ttime);
+            }
+            if (p->nonconst_expr) {
+                PrintJSONKeyPairInt("nonconst_expr", 1);
+            }
+            if (if_depth) {
+                PrintJSONKeyPairInt("if_depth", if_depth);
+            }
+            if (tim.delta) {
+                PrintJSONKeyPairInt("tdelta", tim.delta);
+            }
+            if (tim.rep) {
+                PrintJSONKeyPairInt("trep", tim.rep);
+            }
+            if (red >= 0 && red <= 255 && green >= 0 && green <= 255 && blue >=0 && blue <= 255) {
+                PrintJSONKeyPairInt("r", red);
+                PrintJSONKeyPairInt("g", green);
+                PrintJSONKeyPairInt("b", blue);
+            }
+
+            WriteJSONTrigger(&trig, 1);
+            printf("\"body\":\"");
+            PrintJSONString(DBufValue(&body));
+            printf("\"");
+        } else {
+            r=TriggerReminder(p, &trig, &tim, dse, 0, NULL, NULL, NULL, NULL);
             FreeTrig(&trig);
             return r;
         }
@@ -369,6 +517,106 @@ int DoRem(ParsePtr p)
     return r;
 }
 
+/***************************************************************/
+/*                                                             */
+/*  GetFullDate - get a full date, either YYYY-MM-DD or        */
+/*                YEAR MON DAY                                 */
+/*                                                             */
+/*  Returns OK on success or an error code on failure.  Sets   */
+/*  *dse on success.                                           */
+/*                                                             */
+/***************************************************************/
+static int GetFullDate(ParsePtr s, char const *prefix, int *dse)
+{
+    Token tok;
+    DynamicBuffer buf;
+    int y = NO_YR, m = NO_MON, d = NO_DAY;
+    int r;
+    *dse = NO_DATE;
+
+    DBufInit(&buf);
+
+    while(1) {
+        r = ParseToken(s, &buf);
+        if (r) return r;
+        FindToken(DBufValue(&buf), &tok);
+        switch(tok.type) {
+        case T_Year:
+            DBufFree(&buf);
+            if (y != NO_YR) {
+                Eprint("%s: %s", prefix, GetErr(E_YR_TWICE));
+                return E_YR_TWICE;
+            }
+            y = tok.val;
+            break;
+
+        case T_Month:
+            DBufFree(&buf);
+            if (m != NO_MON) {
+                Eprint("%s: %s", prefix, GetErr(E_MON_TWICE));
+                return E_MON_TWICE;
+            }
+            m = tok.val;
+            break;
+
+        case T_Day:
+            DBufFree(&buf);
+            if (d != NO_DAY) {
+                Eprint("%s: %s", prefix, GetErr(E_DAY_TWICE));
+                return E_DAY_TWICE;
+            }
+            d = tok.val;
+            break;
+
+        case T_Date:
+            DBufFree(&buf);
+            if (y != NO_YR) {
+                Eprint("%s: %s", prefix, GetErr(E_YR_TWICE));
+                return E_YR_TWICE;
+            }
+            if (m != NO_MON) {
+                Eprint("%s: %s", prefix, GetErr(E_MON_TWICE));
+                return E_MON_TWICE;
+            }
+            if (d != NO_DAY) {
+                Eprint("%s: %s", prefix, GetErr(E_DAY_TWICE));
+                return E_DAY_TWICE;
+            }
+            if (*dse != NO_DATE) {
+                return E_DAY_TWICE;
+            }
+            *dse = tok.val;
+            /* We're done here! */
+            return OK;
+
+        default:
+            if (tok.type == T_Illegal && tok.val < 0) {
+                Eprint("%s: `%s'", GetErr(-tok.val), DBufValue(&buf));
+                DBufFree(&buf);
+                return -tok.val;
+            }
+            if (*dse == NO_DATE && (y == NO_YR || m == NO_MON || d == NO_DAY)) {
+                Eprint("%s: %s", prefix, GetErr(E_INCOMPLETE));
+                DBufFree(&buf);
+                return E_INCOMPLETE;
+            }
+            if (*dse != NO_DATE) {
+                PushToken(DBufValue(&buf), s);
+                DBufFree(&buf);
+                return OK;
+            }
+            if (!DateOK(y, m, d)) {
+                DBufFree(&buf);
+                return E_BAD_DATE;
+            }
+            *dse = DSE(y, m, d);
+            PushToken(DBufValue(&buf), s);
+            DBufFree(&buf);
+            return OK;
+        }
+    }
+}
+
 /***************************************************************/
 /*                                                             */
 /*  ParseRem                                                   */
@@ -383,6 +631,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
     DynamicBuffer buf;
     Token tok;
     int y, m, d;
+    int dse;
     int seen_delta = 0;
 
     DBufInit(&buf);
@@ -401,7 +650,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
     trig->addomit = 0;
     trig->noqueue = 0;
     trig->typ = NO_TYPE;
-    trig->scanfrom = NO_DATE;
+    trig->scanfrom = NO_SCANFROM;
     trig->from = NO_DATE;
     trig->priority = DefaultPrio;
     trig->sched[0] = 0;
@@ -418,6 +667,8 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
     tim->rep   = NO_REP;
     tim->duration = NO_TIME;
     trig->need_wkday = 0;
+    trig->is_todo = 0;
+    trig->complete_through = NO_DATE;
     trig->adj_for_last = 0;
     trig->infos = NULL;
 
@@ -430,6 +681,11 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
         /* Figure out what we've got */
         FindToken(DBufValue(&buf), &tok);
         switch(tok.type) {
+        case T_Todo:
+            if (trig->is_todo) return E_TODO_TWICE;
+            trig->is_todo = 1;
+            break;
+
         case T_In:
             /* Completely ignored */
             DBufFree(&buf);
@@ -556,6 +812,13 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
             if (r) return r;
             break;
 
+        case T_CompleteThrough:
+            if (trig->complete_through != NO_DATE) return E_COMPLETE_THROUGH_TWICE;
+            r = GetFullDate(s, "COMPLETE-THROUGH", &dse);
+            if (r != OK) return r;
+            trig->complete_through = dse;
+            break;
+
         case T_Until:
             DBufFree(&buf);
             r=ParseUntil(s, trig, tok.type);
@@ -767,8 +1030,8 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
             if (trig->until != NO_UNTIL && trig->until < trig->from) {
                 Wprint(tr("Warning: UNTIL/THROUGH date earlier than FROM date"));
             }
-        } else if (trig->scanfrom != NO_DATE) {
-            if (trig->until != NO_UNTIL && trig->until < trig->scanfrom) {
+        } else if (get_raw_scanfrom(trig) != NO_SCANFROM) {
+            if (trig->until != NO_UNTIL && trig->until < get_raw_scanfrom(trig)) {
                 Wprint(tr("Warning: UNTIL/THROUGH date earlier than SCANFROM date"));
             }
         }
@@ -778,11 +1041,6 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
         Wprint(tr("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 = DSEToday;
-    }
-
     /* Check that any SCHED / WARN / OMITFUNC functions refer to
        their arguments */
     check_trigger_function(trig->sched, "SCHED");
@@ -884,93 +1142,25 @@ static int ParseLocalOmit(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;
+    int dse;
+
     if (type == T_Until) {
         which = "UNTIL";
     } else {
         which = "THROUGH";
     }
-    Token tok;
-    int r;
-    DynamicBuffer buf;
-    DBufInit(&buf);
 
     if (t->until != NO_UNTIL) return E_UNTIL_TWICE;
 
-    while(1) {
-        r = ParseToken(s, &buf);
-        if (r) return r;
-        FindToken(DBufValue(&buf), &tok);
-        switch(tok.type) {
-        case T_Year:
-            DBufFree(&buf);
-            if (y != NO_YR) {
-                Eprint("%s: %s", which, GetErr(E_YR_TWICE));
-                return E_YR_TWICE;
-            }
-            y = tok.val;
-            break;
-
-        case T_Month:
-            DBufFree(&buf);
-            if (m != NO_MON) {
-                Eprint("%s: %s", which, GetErr(E_MON_TWICE));
-                return E_MON_TWICE;
-            }
-            m = tok.val;
-            break;
-
-        case T_Day:
-            DBufFree(&buf);
-            if (d != NO_DAY) {
-                Eprint("%s: %s", which, GetErr(E_DAY_TWICE));
-                return E_DAY_TWICE;
-            }
-            d = tok.val;
-            break;
-
-        case T_Date:
-            DBufFree(&buf);
-            if (y != NO_YR) {
-                Eprint("%s: %s", which, GetErr(E_YR_TWICE));
-                return E_YR_TWICE;
-            }
-            if (m != NO_MON) {
-                Eprint("%s: %s", which, GetErr(E_MON_TWICE));
-                return E_MON_TWICE;
-            }
-            if (d != NO_DAY) {
-                Eprint("%s: %s", which, GetErr(E_DAY_TWICE));
-                return E_DAY_TWICE;
-            }
-            FromDSE(tok.val, &y, &m, &d);
-            break;
-
-        default:
-            if (tok.type == T_Illegal && tok.val < 0) {
-                Eprint("%s: `%s'", GetErr(-tok.val), DBufValue(&buf));
-                DBufFree(&buf);
-                return -tok.val;
-            }
-            if (y == NO_YR || m == NO_MON || d == NO_DAY) {
-                Eprint("%s: %s", which, GetErr(E_INCOMPLETE));
-                DBufFree(&buf);
-                return E_INCOMPLETE;
-            }
-            if (!DateOK(y, m, d)) {
-                DBufFree(&buf);
-                return E_BAD_DATE;
-            }
-            t->until = DSE(y, m, d);
-            PushToken(DBufValue(&buf), s);
-            DBufFree(&buf);
-            return OK;
-        }
+    int r = GetFullDate(s, which, &dse);
+    if (r != OK) {
+        return r;
     }
+
+    t->until = dse;
+    return OK;
 }
 
 /***************************************************************/
@@ -980,12 +1170,9 @@ static int ParseUntil(ParsePtr s, Trigger *t, int type)
 /***************************************************************/
 static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
 {
-    int y = NO_YR,
-        m = NO_MON,
-        d = NO_DAY;
-
-    Token tok;
     int r;
+    int y = NO_YR, m = NO_MON, d = NO_DAY;
+    Token tok;
     DynamicBuffer buf;
     char const *word;
 
@@ -996,8 +1183,8 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
         word = "FROM";
     }
 
-    if (t->scanfrom != NO_DATE) return E_SCAN_TWICE;
-
+    if (t->scanfrom != NO_SCANFROM) return E_SCAN_TWICE;
+    if (t->from != NO_DATE) return E_SCAN_TWICE;
     while(1) {
         r = ParseToken(s, &buf);
         if (r) return r;
@@ -1044,8 +1231,12 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
                 Eprint("%s: %s", word, GetErr(E_DAY_TWICE));
                 return E_DAY_TWICE;
             }
-            FromDSE(tok.val, &y, &m, &d);
-            break;
+            if (type == FROM_TYPE) {
+                t->from = tok.val;
+            } else {
+                t->scanfrom = tok.val;
+            }
+            return OK;
 
         case T_Back:
             DBufFree(&buf);
@@ -1065,15 +1256,14 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
                 Eprint("%s: %s", word, GetErr(E_DAY_TWICE));
                 return E_DAY_TWICE;
             }
-            if (tok.val < 0) {
+            if (tok.val > 0) {
                 tok.val = -tok.val;
             }
-            FromDSE(DSEToday - tok.val, &y, &m, &d);
-            /* Don't purge reminders with a relative scanfrom */
+            t->scanfrom = tok.val;
             s->expr_happened = 1;
             nonconst_debug(s->nonconst_expr, tr("Relative SCANFROM counts as a non-constant expression"));
             s->nonconst_expr = 1;
-            break;
+            return OK;
 
         default:
             if (tok.type == T_Illegal && tok.val < 0) {
@@ -1090,14 +1280,10 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
                 DBufFree(&buf);
                 return E_BAD_DATE;
             }
-            t->scanfrom = DSE(y, m, d);
             if (type == FROM_TYPE) {
-                t->from = t->scanfrom;
-                if (t->scanfrom < DSEToday) {
-                    t->scanfrom = DSEToday;
-                }
+                t->from = DSE(y, m, d);
             } else {
-                t->from = NO_DATE;
+                t->scanfrom = DSE(y, m, d);
             }
 
             PushToken(DBufValue(&buf), s);
@@ -1115,7 +1301,7 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
 /*  Trigger the reminder if it's a RUN or MSG type.            */
 /*                                                             */
 /***************************************************************/
-int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int dse, int is_queued, DynamicBuffer *output)
+int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig const *tim, int dse, int is_queued, DynamicBuffer *output, int *rr, int *gg, int *bb)
 {
     int r, y, m, d;
     int adjusted_for_newline = 0;
@@ -1180,17 +1366,37 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int dse, int is_queue
         DBufFree(&buf);
         if (r) return r;
         t->typ = MSG_TYPE;
+
+        if (red < 0 || green < 0 || blue < 0 || red > 255 || green > 255 || blue > 255) {
+            red = -1;
+            green = -1;
+            blue = -1;
+            t->passthru[0] = 0;
+        }
     }
 /* If it's a MSG-type reminder, and no -k option was used, issue the banner. */
     if ((t->typ == MSG_TYPE || t->typ == MSF_TYPE) 
         && !DidMsgReminder && !NextMode && !msg_command && !is_queued) {
+        DynamicBuffer buf2;
+        DBufInit(&buf2);
         DidMsgReminder = 1;
-        if (!DoSubstFromString(DBufValue(&Banner), &buf,
+        if (!DoSubstFromString(DBufValue(&Banner), &buf2,
                                DSEToday, NO_TIME) &&
-            DBufLen(&buf)) {
-            printf("%s\n", DBufValue(&buf));
+            DBufLen(&buf2)) {
+            if (!JSONMode) {
+                printf("%s\n", DBufValue(&buf2));
+            } else {
+                if (JSONLinesEmitted) {
+                    printf("},\n");
+                }
+                JSONLinesEmitted++;
+                printf("{\"banner\":\"");
+                remove_trailing_newlines(&buf2);
+                PrintJSONString(DBufValue(&buf2));
+                printf("\"");
+            }
         }
-        DBufFree(&buf);
+        DBufFree(&buf2);
     }
 
 /* If it's NextMode, process as a ADVANCE_MODE-type entry, and issue
@@ -1265,7 +1471,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int dse, int is_queue
     }
 
     /* Correct colors */
-    if (UseVTColors) {
+    if (JSONMode || UseVTColors) {
         if (red == -1 && green == -1 && blue == -1) {
             if (DefaultColorR != -1 && DefaultColorG != -1 && DefaultColorB != -1) {
                 red = DefaultColorR;
@@ -1279,6 +1485,17 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int dse, int is_queue
             if (green > 255) green = 255;
             if (blue > 255) blue = 255;
         }
+        if (rr) *rr = red;
+        if (gg) *gg = green;
+        if (bb) *bb = blue;
+
+        /* Don't ANSI-colorize JSON output! */
+        if (JSONMode) {
+            is_color = 0;
+            red = -1;
+            green = -1;
+            blue = -1;
+        }
     }
 
     /* Put the substituted string into the substitution buffer */
@@ -1427,16 +1644,38 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int dse, int is_queue
 /*  triggered.  Sets *err non-zero in event of an error.       */
 /*                                                             */
 /***************************************************************/
-int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int dse, int *err)
+int ShouldTriggerReminder(Trigger const *t, TimeTrig const *tim, int dse, int *err)
 {
     int r, omit;
+    int calmode = (DoSimpleCalendar || DoCalendar) ? 1 : 0;
+    if (HideCompletedTodos) calmode = 0;
+
     *err = 0;
 
     /* Handle the ONCE modifier in the reminder. */
     if (!IgnoreOnce && t->once !=NO_ONCE && GetOnceDate() == DSEToday)
         return 0;
 
-    if (dse < DSEToday) return 0;
+    /* TODOs are handled differently */
+    if (t->is_todo && !calmode) {
+        /* Do NOT trigger if TODO has been completed through today (or later) */
+        if (t->complete_through != NO_DATE && t->complete_through >= DSEToday && dse <= t->complete_through) {
+            return 0;
+        }
+        /* DO trigger if has not been completed through trigger date */
+        if (t->complete_through == NO_DATE || t->complete_through < dse) {
+            /* Trigger date is in the past - overdue */
+            if (dse < DSEToday) {
+                return 1;
+            }
+            /* Trigger date in future - use normal Remind rules */
+        } else {
+            /* We're complete as of trigger date */
+            return 0;
+        }
+    } else {
+        if (dse < DSEToday) return 0;
+    }
 
     /* Don't trigger timed reminders if DontIssueAts is true, and if the
        reminder is for today */
@@ -1530,7 +1769,7 @@ int DoSatRemind(Trigger *trig, TimeTrig *tt, ParsePtr p)
     ensure_satnode_mentions_trigdate(sat_node);
 
     iter = 0;
-    start = trig->scanfrom;
+    start = get_scanfrom(trig);
     while (iter++ < MaxSatIter) {
         dse = ComputeTriggerNoAdjustDuration(start, trig, tt, &r, 1, 0);
         if (r) {
@@ -1569,7 +1808,7 @@ int DoSatRemind(Trigger *trig, TimeTrig *tt, ParsePtr p)
         }
         if ((v.type == INT_TYPE && v.v.val) ||
             (v.type == STR_TYPE && *v.v.str)) {
-            AdjustTriggerForDuration(trig->scanfrom, dse, trig, tt, 1);
+            AdjustTriggerForDuration(get_scanfrom(trig), dse, trig, tt, 1);
             if (DebugFlag & DB_PRTTRIG) {
                 int y, m, d;
                 FromDSE(LastTriggerDate, &y, &m, &d);
@@ -1704,7 +1943,7 @@ finished:
 /*  function.                                                  */
 /*                                                             */
 /***************************************************************/
-static int ShouldTriggerBasedOnWarn(Trigger *t, int dse, int *err)
+static int ShouldTriggerBasedOnWarn(Trigger const *t, int dse, int *err)
 {
     char buffer[VAR_NAME_LEN+32];
     int i;
@@ -1712,6 +1951,26 @@ static int ShouldTriggerBasedOnWarn(Trigger *t, int dse, int *err)
     int r, omit;
     Value v;
     int lastReturnVal = 0; /* Silence compiler warning */
+    int calmode = (DoSimpleCalendar || DoCalendar) ? 1 : 0;
+
+    /* TODOs are handled differently */
+    if (t->is_todo && !calmode) {
+        /* Do NOT trigger if TODO has been completed through today (or later) */
+        if (t->complete_through != NO_DATE && t->complete_through >= DSEToday) {
+            return 0;
+        }
+        /* DO trigger if has not been completed through trigger date */
+        if (t->complete_through == NO_DATE || t->complete_through < dse) {
+            /* Trigger date is in the past - overdue */
+            if (dse < DSEToday) {
+                return 1;
+            }
+            /* Trigger date in future - use normal Remind rules */
+        } else {
+            /* We're complete as of trigger date */
+            return 0;
+        }
+    }
 
     /* If no proper function exists, barf... */
     if (UserFuncExists(t->warn) != 1) {

src/dosubst.c

@@ -54,9 +54,11 @@ check_subst_args(UserFunc *f, int n)
 /*  If mode==ADVANCE_MODE, ignore %" but don't add newline     */
 /*                                                             */
 /***************************************************************/
-int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse, int mode)
+int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig const *tt, int dse, int mode)
 {
     int diff = dse - DSEToday;
+    int rdiff = dse - RealToday;
+    int bangdiff = diff;
     int curtime = MinutesPastMidnight(0);
     int err, done;
     int c;
@@ -67,6 +69,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
     char const *pm, *cpm;
     int tdiff, adiff, mdiff, hdiff;
     char const *mplu, *hplu, *when, *plu;
+    char const *is, *was;
     int has_quote = 0;
     char *ss;
     char const *expr;
@@ -98,7 +101,8 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
     mplu = (mdiff == 1 ? "" : DynamicMplu);
     hplu = (hdiff == 1 ? "" : DynamicHplu);
 
-    when = (tdiff < 0) ? tr("ago") : tr("from now");
+    when = (tdiff < 0) ? tr("ago") :
+                         tr("from now");
 
     h = tim / 60;
     min = tim % 60;
@@ -122,7 +126,8 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
         }
     }
     if (r != OK) {
-        pm = (h < 12) ? tr("am") : tr("pm");
+        pm = (h < 12) ? tr("am") :
+                        tr("pm");
     }
 
     hh = (h == 12 || h == 0) ? 12 : h % 12;
@@ -149,7 +154,8 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
         }
     }
     if (r != OK) {
-        cpm = (h < 12) ? tr("am") : tr("pm");
+        cpm = (h < 12) ? tr("am") :
+                         tr("pm");
     }
     chh = (ch == 0 || ch == 12) ? 12 : ch % 12;
 
@@ -358,7 +364,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
             }
         }
 
-        if (diff <= 1) {
+        if (abs(diff) <= 1) {
             switch(UPPER(c)) {
             case 'A':
             case 'B':
@@ -373,7 +379,9 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
             case 'L':
             case 'U':
             case 'V':
-                snprintf(s, sizeof(s), "%s", (diff ? tr("tomorrow") : tr("today")));
+                snprintf(s, sizeof(s), "%s", (diff == 1 ? tr("tomorrow") :
+                                              diff == -1 ? tr("yesterday") :
+                                              tr("today")));
                 SHIP_OUT(s);
                 done = 1;
                 break;
@@ -408,7 +416,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
                 }
             }
             if (origtime == NO_TIME) {
-                if ((c >= '0' && c <= '9') || (c == '!')) {
+                if ((c >= '0' && c <= '9')) {
                     Wprint(tr("`%%%c' substitution sequence should not be used without an AT clause"), c);
                 }
             }
@@ -426,7 +434,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
                 break;
 
             case 'B':
-                snprintf(s, sizeof(s), "in %d days' time", diff);
+                if (diff > 0) {
+                    snprintf(s, sizeof(s), "in %d days' time", diff);
+                } else {
+                    snprintf(s, sizeof(s), "%d days ago", -diff);
+                }
                 SHIP_OUT(s);
                 break;
 
@@ -614,7 +626,8 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
                     snprintf(s, sizeof(s), "%d %s%s %s", hdiff, tr("hour"), hplu, when);
                 else
                     snprintf(s, sizeof(s), "%d %s%s %s %d %s%s %s", hdiff, tr("hour"), hplu,
-                             tr("and"), mdiff, tr("minute"), mplu, when);
+                             tr("and"), mdiff,
+                             tr("minute"), mplu, when);
                 SHIP_OUT(s);
                 break;
 
@@ -672,7 +685,26 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
                 break;
 
             case '!':
-                snprintf(s, sizeof(s), "%s", (tdiff >= 0 ? tr("is") : tr("was")));
+            case '?':
+                if (c == '!') {
+                    is = tr("is");
+                    was = tr("was");
+                } else {
+                    is = tr("are");
+                    was = tr("were");
+                }
+                if (altmode) {
+                    bangdiff = rdiff;
+                } else {
+                    bangdiff = diff;
+                }
+                if (bangdiff > 0) {
+                    snprintf(s, sizeof(s), "%s", is);
+                } else if (bangdiff < 0) {
+                    snprintf(s, sizeof(s), "%s", was);
+                } else {
+                    snprintf(s, sizeof(s), "%s", (tdiff >= 0 ? is : was));
+                }
                 SHIP_OUT(s);
                 break;
 

src/err.h

@@ -30,18 +30,18 @@
 #define E_CANT_PARSE_WKDAY    8
 #define E_NO_MEM              9
 #define E_BAD_NUMBER         10
-/* #define E_OP_STK_UNDER       11 */
-/* #define E_VA_STK_UNDER       12 */
+#define E_PUSHV_NO_POP       11
+#define E_POPV_NO_PUSH       12
 #define E_CANT_COERCE        13
 #define E_BAD_TYPE           14
 #define E_DATE_OVER          15
-/* #define E_STACK_ERR          16 */
+#define E_POPF_NO_PUSH       16
 #define E_DIV_ZERO           17
 #define E_NOSUCH_VAR         18
 #define E_EOLN               19
 #define E_EOF                20
 #define E_IO_ERR             21
-/* #define E_LINE_2_LONG        22 */
+#define E_PUSHF_NO_POP       22
 #define E_SWERR              23
 #define E_BAD_DATE           24
 #define E_2FEW_ARGS          25
@@ -76,7 +76,7 @@
 #define E_DAY_TWICE          52
 #define E_UNKNOWN_TOKEN      53
 #define E_SPEC_MON           54
-/* #define E_2MANY_PART         55 */
+#define E_TODO_TWICE         55
 #define E_2MANY_FULL         56
 #define E_PUSH_NOPOP         57
 #define E_ERR_READING        58
@@ -114,7 +114,7 @@
 #define E_MISS_EQ            90
 #define E_MISS_VAR           91
 #define E_MISS_EXPR          92
-/* #define M_CANTSET_ACCESS     93 */
+#define E_COMPLETE_THROUGH_TWICE 93
 #define M_I_OPTION           94
 #define E_NOREMINDERS        95
 #define M_QUEUED             96
@@ -129,6 +129,7 @@
 #define E_REPEATED_ARG      105
 #define E_EXPR_DISABLED     106
 #define E_TIME_EXCEEDED     107
+#define E_COMPLETE_WITHOUT_TODO 108
 
 #ifdef MK_GLOBALS
 #undef EXTERN
@@ -158,18 +159,18 @@ EXTERN char *ErrMsg[]
 /* E_CANT_PARSE_WKDAY*/   "Invalid weekday name",
 /* E_NO_MEM */            "Out of memory",
 /* E_BAD_NUMBER */        "Ill-formed number",
-/* E_OP_STK_UNDER */      "",
-/* E_VA_STK_UNDER */      "",
+/* E_PUSHV_NO_POP */      "Warning: PUSH-VARS without matching POP-VARS",
+/* E_POPV_NO_PUSH */      "POP-VARS without matching PUSH-VARS",
 /* E_CANT_COERCE */       "Can't coerce",
 /* E_BAD_TYPE */          "Type mismatch",
 /* E_DATE_OVER */         "Date overflow",
-/* E_STACK_ERR */         "",
+/* E_POPF_NO_PUSH */      "POP-FUNCS without matching PUSH-FUNCS",
 /* E_DIV_ZERO */          "Division by zero",
 /* E_NOSUCH_VAR */        "Undefined variable",
 /* E_EOLN */              "Unexpected end of line",
 /* E_EOF */               "Unexpected end of file",
 /* E_IO_ERR */            "I/O error",
-/* E_LINE_2_LONG */       "",
+/* E_PUSHF_NO_POP */      "Warning: PUSH-FUNCS without matching POP-FUNCS",
 /* E_SWERR */             "Internal error",
 /* E_BAD_DATE */          "Bad date specification",
 /* E_2FEW_ARGS */         "Not enough arguments",
@@ -202,7 +203,7 @@ EXTERN char *ErrMsg[]
 /* E_DAY_TWICE */         "Day specified twice",
 /* E_UNKNOWN_TOKEN */     "Unknown token",
 /* E_SPEC_MON */          "Must specify month in OMIT command",
-/* E_2MANY_PART */        "",
+/* E_TODO_TWICE */        "TODO specified twice",
 /* E_2MANY_FULL */        "Too many full OMITs (max. " STR(MAX_FULL_OMITS) ")",
 /* E_PUSH_NOPOP */        "Warning: PUSH-OMIT-CONTEXT without matching POP-OMIT-CONTEXT",
 /* E_ERR_READING */       "Error reading",
@@ -240,7 +241,7 @@ EXTERN char *ErrMsg[]
 /* E_MISS_EQ */           "Missing '=' sign",
 /* E_MISS_VAR */          "Missing variable name",
 /* E_MISS_EXPR */         "Missing expression",
-/* M_CANTSET_ACCESS */    "",
+/* E_COMPLETE_THROUGH_TWICE */ "COMPLETE-THROUGH specified twice",
 /* M_I_OPTION */          "Remind: '-i' option: %s",
 /* E_NOREMINDERS */       "No reminders.",
 /* M_QUEUED */            "%d reminder(s) queued for later today.",
@@ -255,6 +256,7 @@ EXTERN char *ErrMsg[]
 /* E_REPEATED_ARG */      "Duplicate argument name",
 /* E_EXPR_DISABLED */     "Expression evaluation is disabled",
 /* E_TIME_EXCEEDED */     "Time limit for expression evaluation exceeded",
+/* E_COMPLETE_WITHOUT_TODO */ "COMPLETE-THROUGH specified without TODO",
 }
 #endif /* MK_GLOBALS */
 ;

src/expr.c

@@ -191,6 +191,7 @@ static int ExprNodesUsed = 0;
 /* Forward references */
 static expr_node * parse_expression_aux(char const **e, int *r, Var *locals, int level);
 static char const *get_operator_name(expr_node *node);
+static void print_expr_tree(expr_node *node, FILE *fp);
 
 /* This is super-skanky... we keep track of the currently-executing
    user-defined function in a global var */
@@ -443,7 +444,7 @@ get_var(expr_node *node, Value *ans, int *nonconst)
 /*                                                             */
 /***************************************************************/
 static int
-get_sysvar(expr_node *node, Value *ans)
+get_sysvar(expr_node const *node, Value *ans)
 {
     if (node->type == N_SHORT_SYSVAR) {
         return GetSysVar(node->u.name, ans);
@@ -833,7 +834,7 @@ evaluate_expression(expr_node *node, Value *locals, Value *ans, int *nonconst)
     return r;
 }
 
-static int CopyShortStr(Value *ans, expr_node *node)
+static int CopyShortStr(Value *ans, expr_node const *node)
 {
     size_t len = strlen(node->u.name);
     ans->v.str = malloc(len+1);
@@ -1835,6 +1836,78 @@ expr_node * free_expr_tree(expr_node *node)
     return NULL;
 }
 
+/***************************************************************/
+/*                                                             */
+/*  clone_expr_tree                                            */
+/*                                                             */
+/*  Clone an entire expr_tree.  The clone shares no memory     */
+/*  with the original.  Returns NULL and sets *r on failure.   */
+/*                                                             */
+/***************************************************************/
+expr_node * clone_expr_tree(expr_node const *src, int *r)
+{
+    int rc;
+    expr_node *dest = alloc_expr_node(r);
+    if (!dest) return NULL;
+
+    dest->type = src->type;
+    dest->num_kids = src->num_kids;
+    switch(dest->type) {
+    case N_FREE:
+    case N_ERROR:
+        *r = E_SWERR;
+        free_expr_tree(dest);
+        return NULL;
+
+    case N_CONSTANT:
+    case N_VARIABLE:
+    case N_SYSVAR:
+    case N_USER_FUNC:
+        rc = CopyValue(&(dest->u.value), &(src->u.value));
+        if (rc != OK) {
+            *r = rc;
+            free_expr_tree(dest);
+            return NULL;
+        }
+        break;
+
+    case N_SHORT_STR:
+    case N_SHORT_VAR:
+    case N_SHORT_SYSVAR:
+    case N_SHORT_USER_FUNC:
+        strcpy(dest->u.name, src->u.name);
+        break;
+
+    case N_LOCAL_VAR:
+        dest->u.arg = src->u.arg;
+        break;
+
+    case N_BUILTIN_FUNC:
+        dest->u.builtin_func = src->u.builtin_func;
+        break;
+
+    case N_OPERATOR:
+        dest->u.operator_func = src->u.operator_func;
+        break;
+    }
+
+    if (src->child) {
+        dest->child = clone_expr_tree(src->child, r);
+        if (!dest->child) {
+            free_expr_tree(dest);
+            return NULL;
+        }
+    }
+    if (src->sibling) {
+        dest->sibling = clone_expr_tree(src->sibling, r);
+        if (!dest->sibling) {
+            free_expr_tree(dest);
+            return NULL;
+        }
+    }
+    return dest;
+}
+
 /***************************************************************/
 /*                                                             */
 /*  set_long_name - set a long name in an expr_node            */
@@ -2712,7 +2785,7 @@ static void print_kids(expr_node *node, FILE *fp)
 /* file.  Used for debugging (the "-ds" flag.)                 */
 /*                                                             */
 /***************************************************************/
-void print_expr_tree(expr_node *node, FILE *fp)
+static void print_expr_tree(expr_node *node, FILE *fp)
 {
     if (!node) {
         return;
@@ -2961,7 +3034,7 @@ int CopyValue(Value *dest, const Value *src)
 /*  4:00PM                                                     */
 /*                                                             */
 /***************************************************************/
-int ParseLiteralTime(char const **s, int *tim)
+static int ParseLiteralTime(char const **s, int *tim)
 {
     int h=0;
     int m=0;

src/files.c

@@ -114,16 +114,16 @@ static int CheckSafetyAux (struct stat *statbuf);
 static int PopFile (void);
 static int IncludeCmd(char const *);
 
-static unsigned int FnHashFunc(void *x)
+static unsigned int FnHashFunc(void const *x)
 {
-    FilenameHashEntry *e = (FilenameHashEntry *) x;
+    FilenameHashEntry const *e = (FilenameHashEntry const *) x;
     return HashVal_preservecase(e->fname);
 }
 
-static int FnCompareFunc(void *a, void *b)
+static int FnCompareFunc(void const *a, void const *b)
 {
-    FilenameHashEntry *e1 = (FilenameHashEntry *) a;
-    FilenameHashEntry *e2 = (FilenameHashEntry *) b;
+    FilenameHashEntry const *e1 = (FilenameHashEntry const *) a;
+    FilenameHashEntry const *e2 = (FilenameHashEntry const *) b;
     return strcmp(e1->fname, e2->fname);
 }
 
@@ -179,7 +179,7 @@ got_a_fresh_line(void)
     WarnedAboutImplicit = 0;
 }
 
-void set_cloexec(FILE *fp)
+static void set_cloexec(FILE *fp)
 {
     int flags;
     int fd;
@@ -381,7 +381,7 @@ static int ReadLineFromFile(int use_pclose)
 /*  ShouldCache is 1, cache the file                           */
 /*                                                             */
 /***************************************************************/
-int OpenFile(char const *fname)
+static int OpenFile(char const *fname)
 {
     CachedFile *h = CachedFiles;
     int r;
@@ -1151,7 +1151,7 @@ int IncludeFile(char const *fname)
 int GetAccessDate(char const *file)
 {
     struct stat statbuf;
-    struct tm *t1;
+    struct tm const *t1;
 
     if (stat(file, &statbuf)) return -1;
     t1 = localtime(&(statbuf.st_atime));

src/funcs.c

@@ -234,7 +234,7 @@ static int CacheHebYear, CacheHebMon, CacheHebDay;
 #define GETMON(x) get_month(&(ARG(x)))
 
 /* Macro for copying a value while destroying original copy */
-#define DCOPYVAL(x, y) ( (x) = (y), (y).type = ERR_TYPE )
+#define DCOPYVAL(x, y) ( (x) = (y), (y).type = ERR_TYPE, (y).v.val = 0 )
 
 /* Get at RetVal.v.val easily */
 #define RETVAL info->retval.v.val
@@ -1150,6 +1150,7 @@ static int FAmpm(func_info *info)
 /***************************************************************/
 static int FOrd(func_info *info)
 {
+    static int in_ford = 0;
     int t, u, v;
     char const *s;
 
@@ -1157,6 +1158,36 @@ static int FOrd(func_info *info)
 
     ASSERT_TYPE(0, INT_TYPE);
 
+    if (!in_ford && UserFuncExists("ordx") == 1) {
+        expr_node *n;
+        int r;
+        char const *e = buf;
+        Value val;
+        int nonconst;
+
+        val.type = ERR_TYPE;
+        snprintf(buf, sizeof(buf), "ordx(%d)", ARGV(0));
+        n = parse_expression(&e, &r, NULL);
+        if (r != OK) {
+            return r;
+        }
+        in_ford = 1;
+        r = evaluate_expr_node(n, NULL, &val, &nonconst);
+        in_ford = 0;
+        free_expr_tree(n);
+        if (r != OK) {
+            return r;
+        }
+        if (nonconst) info->nonconst = nonconst;
+        r = DoCoerce(STR_TYPE, &val);
+        if (r != OK) {
+            DestroyValue(val);
+            return r;
+        }
+        DCOPYVAL(RetVal, val);
+        return OK;
+    }
+
     v = ARGV(0);
     if (v < 0) {
         t = (-v) % 100;
@@ -1184,7 +1215,7 @@ static int FOrd(func_info *info)
 static int FPad(func_info *info)
 {
     int r;
-    char *s;
+    char const *s;
     DynamicBuffer dbuf;
     size_t len;
     size_t wantlen;
@@ -1967,12 +1998,12 @@ static int FTriguntil(func_info *info)
 
 static int FTrigscanfrom(func_info *info)
 {
-    if (LastTrigger.scanfrom == NO_DATE) {
+    if (get_scanfrom(&LastTrigger) == NO_DATE) {
         RetVal.type = INT_TYPE;
         RETVAL = -1;
     } else {
         RetVal.type = DATE_TYPE;
-        RETVAL = LastTrigger.scanfrom;
+        RETVAL = get_scanfrom(&LastTrigger);
     }
     return OK;
 }
@@ -2990,7 +3021,8 @@ static int FTimeStuff(int wantmins, func_info *info)
 static int FTimezone(func_info *info)
 {
     int yr, mon, day, hr, min, dse, now;
-    struct tm local, *withzone;
+    struct tm local;
+    struct tm const * withzone;
     time_t t;
     char buf[64];
 
@@ -3379,7 +3411,7 @@ static int FADusk(func_info *info)
 static int FFiledate(func_info *info)
 {
     struct stat statbuf;
-    struct tm *t1;
+    struct tm const *t1;
 
     RetVal.type = DATE_TYPE;
 
@@ -3410,7 +3442,7 @@ static int FFiledate(func_info *info)
 static int FFiledatetime(func_info *info)
 {
     struct stat statbuf;
-    struct tm *t1;
+    struct tm const *t1;
 
     RetVal.type = DATETIME_TYPE;
 
@@ -3821,7 +3853,7 @@ static int tz_convert(int year, int month, int day,
 {
     int r;
     time_t t;
-    struct tm *res;
+    struct tm const *res;
     char const *old_tz;
 
     /* init tm struct */
@@ -4146,10 +4178,10 @@ FEvalTrig(func_info *info)
         return E_PARSE_ERR;
     }
     if (scanfrom == NO_DATE) {
-        dse = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 0);
+        dse = ComputeTrigger(get_scanfrom(&trig), &trig, &tim, &r, 0);
     } else {
         /* Hokey... */
-        if (trig.scanfrom != DSEToday) {
+        if (get_scanfrom(&trig) != DSEToday) {
             Wprint(tr("Warning: SCANFROM is ignored in two-argument form of evaltrig()"));
         }
         dse = ComputeTrigger(scanfrom, &trig, &tim, &r, 0);
@@ -4208,7 +4240,7 @@ FMultiTrig(func_info *info)
             Eprint(tr("Cannot use AT clause in multitrig() function"));
             return E_PARSE_ERR;
         }
-        dse = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 0);
+        dse = ComputeTrigger(get_scanfrom(&trig), &trig, &tim, &r, 0);
         DestroyParser(&p);
 
         if (r != E_CANT_TRIG) {
@@ -4261,7 +4293,7 @@ FTrig(func_info *info)
             FreeTrig(&trig);
             return E_PARSE_ERR;
         }
-        dse = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 0);
+        dse = ComputeTrigger(get_scanfrom(&trig), &trig, &tim, &r, 0);
         DestroyParser(&p);
 
         if (r == E_CANT_TRIG) {

src/globals.h

@@ -35,6 +35,10 @@ EXTERN  FILE *ErrFp;
 
 #define MINUTES_PER_DAY 1440
 
+#define TODOS_AND_EVENTS 0
+#define ONLY_TODOS       1
+#define ONLY_EVENTS      2
+
 #define DaysInYear(y) (((y) % 4) ? 365 : ((!((y) % 100) && ((y) % 400)) ? 365 : 366 ))
 #define IsLeapYear(y) (((y) % 4) ? 0 : ((!((y) % 100) && ((y) % 400)) ? 0 : 1 ))
 #define DaysInMonth(m, y) ((m) != 1 ? MonthDays[m] : 28 + IsLeapYear(y))
@@ -52,6 +56,8 @@ EXTERN  int     FreshLine;
 EXTERN  int     WarnedAboutImplicit;
 EXTERN  uid_t   TrustedUsers[MAX_TRUSTED_USERS];
 
+EXTERN  INIT(   int     JSONMode, 0);
+EXTERN  INIT(   int     JSONLinesEmitted, 0);
 EXTERN  INIT(   int     MaxLateMinutes, 0);
 EXTERN  INIT(   int     NumTrustedUsers, 0);
 EXTERN  INIT(   char    const *MsgCommand, NULL);
@@ -61,6 +67,7 @@ EXTERN  INIT(   int     DebugFlag, 0);
 EXTERN  INIT(   int     DoCalendar, 0);
 EXTERN  INIT(   int     DoSimpleCalendar, 0);
 EXTERN  INIT(   int     DoSimpleCalDelta, 0);
+EXTERN  INIT(   int     HideCompletedTodos, 0);
 EXTERN  INIT(   int     DoPrefixLineNo, 0);
 EXTERN  INIT(   int     MondayFirst, 0);
 EXTERN  INIT(   int     AddBlankLines, 1);
@@ -72,6 +79,7 @@ EXTERN  INIT(   int     CalMonths, 0);
 EXTERN  INIT(   char const *CalType, "none");
 EXTERN  INIT(   int     Hush, 0);
 EXTERN  INIT(   int     NextMode, 0);
+EXTERN  INIT(   int     TodoFilter, TODOS_AND_EVENTS);
 EXTERN  INIT(   int     InfiniteDelta, 0);
 EXTERN  INIT(   int     DefaultTDelta, 0);
 EXTERN  INIT(   int     DefaultDelta, NO_DELTA);

src/hashtab.c

@@ -99,8 +99,8 @@ static size_t bucket_choices[] = {
 int
 hash_table_init(hash_table *t,
                 size_t link_offset,
-                unsigned int (*hashfunc)(void *x),
-                int (*compare)(void *a, void *b))
+                unsigned int (*hashfunc)(void const *x),
+                int (*compare)(void const *a, void const *b))
 {
     t->bucket_choice_index = 0;
     t->num_entries         = 0;
@@ -141,7 +141,7 @@ hash_table_free(hash_table *t)
  * \return The number of items in the hash table
  */
 size_t
-hash_table_num_entries(hash_table *t)
+hash_table_num_entries(hash_table const *t)
 {
     return t->num_entries;
 }
@@ -154,7 +154,7 @@ hash_table_num_entries(hash_table *t)
  * \return The number of buckets in the hash table
  */
 size_t
-hash_table_num_buckets(hash_table *t)
+hash_table_num_buckets(hash_table const *t)
 {
     if (t->bucket_choice_index >= NUM_BUCKET_CHOICES) {
         return 0;
@@ -321,7 +321,7 @@ hash_table_find(hash_table *t, void *candidate)
  *
  * \return 0 on success, -1 on failure
  */
-int
+static int
 hash_table_delete_helper(hash_table *t, void *item, int resize_ok)
 {
     if (!item) {

src/hashtab.h

@@ -34,8 +34,8 @@ typedef struct {
     size_t num_entries;       /**< Number of entries in the hash table */
     size_t hash_link_offset;  /**< Offset of the struct hash_link in the container */
     void **buckets;           /**< Array of buckets */
-    unsigned int (*hashfunc)(void *x); /**< Pointer to the hashing function */
-    int (*compare)(void *a, void *b); /**< Pointer to the comparison function */
+    unsigned int (*hashfunc)(void const *x); /**< Pointer to the hashing function */
+    int (*compare)(void const *a, void const *b); /**< Pointer to the comparison function */
 } hash_table;
 
 /**
@@ -56,11 +56,11 @@ struct hash_table_stats {
 
 int hash_table_init(hash_table *t,
                     size_t link_offset,
-                    unsigned int (*hashfunc)(void *x),
-                    int (*compare)(void *a, void *b));
+                    unsigned int (*hashfunc)(void const *x),
+                    int (*compare)(void const *a, void const *b));
 void hash_table_free(hash_table *t);
-size_t hash_table_num_entries(hash_table *t);
-size_t hash_table_num_buckets(hash_table *t);
+size_t hash_table_num_entries(hash_table const *t);
+size_t hash_table_num_buckets(hash_table const *t);
 size_t hash_table_chain_len(hash_table *t, size_t i);
 int hash_table_insert(hash_table *t, void *item);
 void *hash_table_find(hash_table *t, void *candidate);
@@ -68,7 +68,6 @@ int hash_table_delete(hash_table *t, void *item);
 int hash_table_delete_no_resize(hash_table *t, void *item);
 void *hash_table_next(hash_table *t, void *cur);
 void hash_table_dump_stats(hash_table *t, FILE *fp);
-void hash_table_get_stats(hash_table *t, struct hash_table_stats *stat);
 
 /**
  * \brief Iterate over all items in a hash table

src/hashtab_stats.c

@@ -22,6 +22,8 @@
 #include <stdio.h>
 #include <math.h>
 
+static void hash_table_get_stats(hash_table *t, struct hash_table_stats *stat);
+
 /**
  * \brief Dump hash table statistics to a stdio FILE
  *
@@ -53,7 +55,7 @@ hash_table_dump_stats(hash_table *t, FILE *fp)
  * \param t A pointer to a hash_table object
  * \param stat A pointer to a hash_table_stats object that will be filled in
  */
-void
+static void
 hash_table_get_stats(hash_table *t, struct hash_table_stats *stat)
 {
     size_t n = hash_table_num_buckets(t);

src/hbcal.c

@@ -70,6 +70,8 @@ static char MaxMonLen[] = {
 
 static char HebIsLeap[] = {0,0,1,0,0,1,0,1,0,0,1,0,0,1,0,0,1,0,1};
 
+static long DaysToHebYear(int y);
+
 /***************************************************************/
 /*                                                             */
 /*  RoshHashana                                                */
@@ -78,7 +80,7 @@ static char HebIsLeap[] = {0,0,1,0,0,1,0,1,0,0,1,0,0,1,0,0,1,0,1};
 /*  Hebrew year.  (ie, 5751, not 1990)                         */
 /*                                                             */
 /***************************************************************/
-int RoshHashana(int i)
+static int RoshHashana(int i)
 {
     long j;
     j = DaysToHebYear(i-3744) - CORRECTION;
@@ -93,7 +95,7 @@ int RoshHashana(int i)
 /*  from new moon before Tishrey 1 5701.                       */
 /*                                                             */
 /***************************************************************/
-long DaysToHebYear(int y)
+static long DaysToHebYear(int y)
 {
     long m, nm, dw, s, l;
 
@@ -126,7 +128,7 @@ long DaysToHebYear(int y)
 /*                                                             */
 /*                                                             */
 /***************************************************************/
-int DaysInHebYear(int y)
+static int DaysInHebYear(int y)
 {
     long thisyear, nextyear;
 
@@ -143,7 +145,7 @@ int DaysInHebYear(int y)
 /*  given the LENGTH of the Hebrew year.                       */
 /*                                                             */
 /***************************************************************/
-char const *DaysInHebMonths(int ylen)
+static char const *DaysInHebMonths(int ylen)
 {
     static char monlen[14] =
         {30, 29, 30, 29, 30, 0, 29, 30, 29, 30, 29, 30, 29, 29};

src/ifelse.c

@@ -24,6 +24,9 @@ static int if_pointer = 0;
 /* The base pointer for the current file */
 static int base_pointer = 0;
 
+/* True if a "RETURN" statement was encountered in current file */
+static int return_encountered = 0;
+
 /*
  * The current state of the IF...ELSE...ENDIF context is stored in
  * an array of "ifentry" objects, from the outermost to the
@@ -103,6 +106,19 @@ encounter_else(void)
     return OK;
 }
 
+/***************************************************************/
+/*                                                             */
+/* DoReturn - handle the RETURN command                        */
+/*                                                             */
+/***************************************************************/
+int
+DoReturn(ParsePtr p)
+{
+    int r = VerifyEoln(p);
+    return_encountered = 1;
+    return r;
+}
+
 /***************************************************************/
 /*                                                             */
 /* encounter_endif - note that the most-recently-pushed IF     */
@@ -162,6 +178,10 @@ int
 should_ignore_line(void)
 {
     int i;
+
+    if (return_encountered) {
+        return 1;
+    }
     for (i=base_pointer; i<if_pointer; i++) {
         if (( IfArray[i].if_true && !IfArray[i].before_else) ||
             (!IfArray[i].if_true &&  IfArray[i].before_else)) {
@@ -193,11 +213,13 @@ in_constant_context(void)
 /*                                                             */
 /* pop_excess_ifs - pop excess IFs from the stack, printing    */
 /*                  error messages as needed.                  */
+/*                  Also resets return_encountered             */
 /*                                                             */
 /***************************************************************/
 void
 pop_excess_ifs(char const *fname)
 {
+    return_encountered = 0;
     if (if_pointer <= base_pointer) {
         return;
     }

src/init.c

@@ -798,6 +798,13 @@ void InitRemind(int argc, char const *argv[])
 
     }
 
+    /* JSON mode turns off sorting */
+    if (JSONMode) {
+        SortByTime = SORT_NONE;
+        SortByDate = SORT_NONE;
+        SortByPrio = SORT_NONE;
+    }
+
     /* Figure out the offset from UTC */
     if (CalculateUTC) {
         (void) CalcMinsFromUTC(DSEToday, MinutesPastMidnight(0),
@@ -848,6 +855,16 @@ void Usage(void)
     fprintf(ErrFp, " -m     Start calendar with Monday rather than Sunday\n");
     fprintf(ErrFp, " -y     Synthesize tags for tagless reminders\n");
     fprintf(ErrFp, " -j[n]  Run in 'purge' mode.  [n = INCLUDE depth]\n");
+    fprintf(ErrFp, "\nLong Options:\n");
+    fprintf(ErrFp, " --version                Print Remind version\n");
+    fprintf(ErrFp, " --hide-completed-todos   Don't show completed todos on calendar\n");
+    fprintf(ErrFp, " --only-todos             Only issue TODO reminders\n");
+    fprintf(ErrFp, " --only-events            Do not issue TODO reminders\n");
+    fprintf(ErrFp, " --json                   Use JSON output instead of plain-text\n");
+    fprintf(ErrFp, " --max-execution-time=n   Limit execution time to n seconds\n");
+    fprintf(ErrFp, " --print-config-cmd       Print ./configure cmd used to build Remind\n");
+    fprintf(ErrFp, " --print-errs             Print all possible error messages\n");
+    fprintf(ErrFp, " --print-tokens           Print all possible Remind tokens\n");
     fprintf(ErrFp, "\nRemind home page: %s\n", PACKAGE_URL);
     exit(EXIT_FAILURE);
 }
@@ -1017,11 +1034,6 @@ static void InitializeVar(char const *str)
         return;
     }
 
-    if (!*varname) {
-        fprintf(ErrFp, GetErr(M_I_OPTION), GetErr(E_MISS_VAR));
-        fprintf(ErrFp, "\n");
-        return;
-    }
     expr = str+1;
     if (!*expr) {
         fprintf(ErrFp, GetErr(M_I_OPTION), GetErr(E_MISS_EXPR));
@@ -1063,7 +1075,7 @@ static void InitializeVar(char const *str)
 static void
 AddTrustedUser(char const *username)
 {
-    struct passwd *pwent;
+    struct passwd const *pwent;
     if (NumTrustedUsers >= MAX_TRUSTED_USERS) {
         fprintf(ErrFp, "Too many trusted users (%d max)\n",
                 MAX_TRUSTED_USERS);
@@ -1136,6 +1148,20 @@ ProcessLongOption(char const *arg)
 
         return;
     }
+    if (!strcmp(arg, "only-todos")) {
+        TodoFilter = ONLY_TODOS;
+        return;
+    }
+    if (!strcmp(arg, "only-events")) {
+        TodoFilter = ONLY_EVENTS;
+        return;
+    }
+    if (!strcmp(arg, "json")) {
+        JSONMode = 1;
+        DontQueue = 1;
+        return;
+    }
+
     if (!strcmp(arg, "version")) {
         printf("%s\n", VERSION);
         exit(EXIT_SUCCESS);
@@ -1154,6 +1180,11 @@ ProcessLongOption(char const *arg)
         exit(EXIT_SUCCESS);
     }
 
+    if (!strcmp(arg, "hide-completed-todos")) {
+        HideCompletedTodos = 1;
+        return;
+    }
+
     if (!strcmp(arg, "print-tokens")) {
         print_remind_tokens();
         print_builtinfunc_tokens();

src/json.c

@@ -47,19 +47,8 @@
    #include <stdint.h>
 #endif
 
-#ifndef JSON_INT_T_OVERRIDDEN
-   #if defined(_MSC_VER)
-      /* https://docs.microsoft.com/en-us/cpp/cpp/data-type-ranges */
-      #define JSON_INT_MAX 9223372036854775807LL
-   #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-      /* C99 */
-      #define JSON_INT_MAX INT_FAST64_MAX
-   #else
-      /* C89 */
-      #include <limits.h>
-      #define JSON_INT_MAX LONG_MAX
-   #endif
-#endif
+#include <limits.h>
+#define JSON_INT_MAX LONG_MAX
 
 #ifndef JSON_INT_MAX
 #define JSON_INT_MAX (json_int_t)(((unsigned json_int_t)(-1)) / (unsigned json_int_t)2);
@@ -69,6 +58,8 @@ typedef unsigned int json_uchar;
 
 const struct _json_value json_value_none;
 
+static void json_value_free_ex (json_settings * settings, json_value * value);
+
 static unsigned char hex_value (json_char c)
 {
    if (isdigit((unsigned char)c))
@@ -252,10 +243,10 @@ static const long
    flag_block_comment    = 1 << 14,
    flag_num_got_decimal  = 1 << 15;
 
-json_value * json_parse_ex (json_settings * settings,
-                            const json_char * json,
-                            size_t length,
-                            char * error_buf)
+static json_value * json_parse_ex (json_settings const * settings,
+                                   const json_char * json,
+                                   size_t length,
+                                   char * error_buf)
 {
    char error [json_error_max];
    const json_char * end;
@@ -999,7 +990,7 @@ json_value * json_parse (const json_char * json, size_t length)
    return json_parse_ex (&settings, json, length, 0);
 }
 
-void json_value_free_ex (json_settings * settings, json_value * value)
+static void json_value_free_ex (json_settings * settings, json_value * value)
 {
    json_value * cur_value;
 

src/json.h

@@ -266,21 +266,9 @@ json_value * json_parse (const json_char * json,
                          size_t length);
 
 #define json_error_max 128
-json_value * json_parse_ex (json_settings * settings,
-                            const json_char * json,
-                            size_t length,
-                            char * error);
-
 void json_value_free (json_value *);
 
 
-/* Not usually necessary, unless you used a custom mem_alloc and now want to
- * use a custom mem_free.
- */
-void json_value_free_ex (json_settings * settings,
-                         json_value *);
-
-
 #ifdef __cplusplus
    } /* extern "C" */
 #endif

src/main.c

@@ -50,11 +50,15 @@
 #include "err.h"
 
 static void DoReminders(void);
+static int DoDebug(ParsePtr p);
+static void ClearLastTriggers(void);
+static int DoBanner(ParsePtr p);
+static void SaveLastTimeTrig(TimeTrig const *t);
 
 /* Macro for simplifying common block so as not to litter code */
 #define OUTPUT(c) do { if (output) { DBufPutc(output, c); } else { putchar(c); } } while(0)
 
-void
+static void
 exitfunc(void)
 {
     /* Kill any execution-time-limiter process */
@@ -168,6 +172,9 @@ int main(int argc, char *argv[])
     ShouldCache = (Iterations > 1);
 
     while (Iterations--) {
+        if (JSONMode) {
+            printf("[\n");
+        }
         PerIterationInit();
         DoReminders();
 
@@ -177,10 +184,48 @@ int main(int argc, char *argv[])
         }
 
         if (!Hush) {
-            if (DestroyOmitContexts(1))
+            if (DestroyOmitContexts(1)) {
+                FreshLine = 1;
                 Eprint("%s", GetErr(E_PUSH_NOPOP));
+            }
+            if (EmptyVarStack(1)) {
+                FreshLine = 1;
+                Eprint("%s", GetErr(E_PUSHV_NO_POP));
+            }
+            if (EmptyUserFuncStack(1)) {
+                FreshLine = 1;
+                Eprint("%s", GetErr(E_PUSHF_NO_POP));
+            }
             if (!Daemon && !NextMode && !NumTriggered && !NumQueued) {
-                printf("%s\n", GetErr(E_NOREMINDERS));
+                if (!JSONMode) {
+                    printf("%s\n", GetErr(E_NOREMINDERS));
+                } else {
+                    if (!DidMsgReminder) {
+                        DynamicBuffer buf;
+                        DBufInit(&buf);
+                        /* Do a banner in JSON mode*/
+                        if (!DoSubstFromString(DBufValue(&Banner), &buf,
+                                               DSEToday, NO_TIME) &&
+                            DBufLen(&buf)) {
+                            if (JSONLinesEmitted) {
+                                printf("},\n");
+                            }
+                            JSONLinesEmitted++;
+                            printf("{\"banner\":\"");
+                            remove_trailing_newlines(&buf);
+                            PrintJSONString(DBufValue(&buf));
+                            printf("\"");
+                        }
+                        DBufFree(&buf);
+                    }
+                    if (JSONLinesEmitted) {
+                        printf("},\n");
+                    }
+                    printf("{\"noreminders\":\"");
+                    PrintJSONString(GetErr(E_NOREMINDERS));
+                    printf("\"");
+                    JSONLinesEmitted++;
+                }
             } else if (!Daemon && !NextMode && !NumTriggered) {
                 printf(GetErr(M_QUEUED), NumQueued);
                 printf("\n");
@@ -190,6 +235,12 @@ int main(int argc, char *argv[])
         /* If there are sorted reminders, handle them */
         if (SortByDate) IssueSortedReminders();
 
+        if (JSONMode) {
+            if (JSONLinesEmitted) {
+                printf("}\n");
+            }
+            printf("]\n");
+        }
         /* If there are any background reminders queued up, handle them */
         if (NumQueued || Daemon) {
 
@@ -231,11 +282,14 @@ PerIterationInit(void)
 {
     ClearGlobalOmits();
     DestroyOmitContexts(1);
+    EmptyVarStack(1);
+    EmptyUserFuncStack(1);
     DestroyVars(0);
     DefaultColorR = -1;
     DefaultColorG = -1;
     DefaultColorB = -1;
     NumTriggered = 0;
+    JSONLinesEmitted = 0;
     ClearLastTriggers();
     ClearDedupeTable();
 }
@@ -317,6 +371,7 @@ static void DoReminders(void)
             case T_Rem:     r=DoRem(&p); purge_handled = 1; break;
             case T_ErrMsg:  r=DoErrMsg(&p);  break;
             case T_If:      r=DoIf(&p);      break;
+            case T_Return:  r=DoReturn(&p);  break;
             case T_IfTrig:  r=DoIfTrig(&p);  break;
             case T_Else:    r=DoElse(&p);    break;
             case T_EndIf:   r=DoEndif(&p);   break;
@@ -362,6 +417,18 @@ static void DoReminders(void)
             case T_Pop:     r=PopOmitContext(&p);     break;
             case T_Preserve: r=DoPreserve(&p);  break;
             case T_Push:    r=PushOmitContext(&p);    break;
+            case T_PushVars:
+                r=PushVars(&p);
+                break;
+            case T_PopVars:
+                r=PopVars(&p);
+                break;
+            case T_PushFuncs:
+                r=PushUserFuncs(&p);
+                break;
+            case T_PopFuncs:
+                r=PopUserFuncs(&p);
+                break;
             case T_Expr: r = DoExpr(&p); break;
             case T_Translate: r = DoTranslate(&p); break;
             case T_RemType: if (tok.val == RUN_TYPE) {
@@ -1067,7 +1134,7 @@ int PushToken(char const *tok, ParsePtr p)
 int SystemTime(int realtime)
 {
     time_t now;
-    struct tm *t;
+    struct tm const *t;
 
     if (!realtime && (SysTime != -1)) return SysTime;
 
@@ -1107,7 +1174,7 @@ int MinutesPastMidnight(int realtime)
 int SystemDate(int *y, int *m, int *d)
 {
     time_t now;
-    struct tm *t;
+    struct tm const *t;
 
     /* In test mode, always return 6 January 2025 */
     if (TestMode) {
@@ -1223,7 +1290,7 @@ int DoIfTrig(ParsePtr p)
     } else {
         if ( (r=ParseRem(p, &trig, &tim)) ) return r;
         if (trig.typ != NO_TYPE) return E_PARSE_ERR;
-        dse = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 1);
+        dse = ComputeTrigger(get_scanfrom(&trig), &trig, &tim, &r, 1);
         if (r) {
             if (r != E_CANT_TRIG || !trig.maybe_uncomputable) {
                 if (!Hush || r != E_RUN_DISABLED) {
@@ -1281,7 +1348,7 @@ int VerifyEoln(ParsePtr p)
 /*  Set the debug options under program control.               */
 /*                                                             */
 /***************************************************************/
-int DoDebug(ParsePtr p)
+static int DoDebug(ParsePtr p)
 {
     int err;
     int ch;
@@ -1387,7 +1454,7 @@ int DoDebug(ParsePtr p)
 /*  reminder is issued.                                        */
 /*                                                             */
 /***************************************************************/
-int DoBanner(ParsePtr p)
+static int DoBanner(ParsePtr p)
 {
     int err;
     int c;
@@ -1571,7 +1638,8 @@ int CalcMinsFromUTC(int dse, int tim, int *mins, int *isdst)
 /* Convert dse and tim to an Unix tm struct */
     int yr, mon, day;
     int tdiff;
-    struct tm local, utc, *temp;
+    struct tm local, utc;
+    struct tm const * temp;
     time_t loc_t, utc_t;
     int isdst_tmp;
 
@@ -1965,7 +2033,7 @@ FreeTrig(Trigger *t)
     t->infos = NULL;
 }
 
-void
+static void
 ClearLastTriggers(void)
 {
     LastTrigger.expired = 0;
@@ -2025,7 +2093,7 @@ SaveLastTrigger(Trigger const *t)
     }
 }
 
-void
+static void
 SaveLastTimeTrig(TimeTrig const *t)
 {
     memcpy(&LastTimeTrig, t, sizeof(LastTimeTrig));

src/md5.c

@@ -20,6 +20,7 @@
 #include "md5.h"
 
 static void byteReverse(unsigned char *buf, unsigned longs);
+static void MD5Transform(uint32 buf[4], uint32 const in[16]);
 
 /*
  * Note: this code is harmless on little-endian machines.
@@ -163,7 +164,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
  * reflect the addition of 16 longwords of new data.  MD5Update blocks
  * the data and converts bytes into longwords for this routine.
  */
-void MD5Transform(uint32 buf[4], uint32 const in[16])
+static void MD5Transform(uint32 buf[4], uint32 const in[16])
 {
     register uint32 a, b, c, d;
 

src/md5.h

@@ -29,6 +29,5 @@ void MD5Init(struct MD5Context *context);
 void MD5Update(struct MD5Context *context, unsigned char const *buf,
                unsigned len);
 void MD5Final(unsigned char digest[16], struct MD5Context *context);
-void MD5Transform(uint32 buf[4], uint32 const in[16]);
 
 #endif /* !MD5_H */

src/moon.c

@@ -636,7 +636,7 @@ static time_t time_t_from_dse(int dse)
 
 static int datetime_from_time_t(time_t t)
 {
-    struct tm *local;
+    struct tm const *local;
     int ans;
 
     /* Round to nearest minute */
@@ -665,7 +665,7 @@ static double interpolate(double f0, double f1, double f2, double p)
 
 /* Moon position using fundamental arguments
    Van Flandern & Pulkkinen, 1979) */
-void moon_position(double dayOffset, double *ra, double *declination, double *distance)
+static void moon_position(double dayOffset, double *ra, double *declination, double *distance)
 {
     double l = 0.606434 + 0.03660110129 * dayOffset;
     double m = 0.374897 + 0.03629164709 * dayOffset;

src/omit.c

@@ -121,12 +121,9 @@ int PushOmitContext(ParsePtr p)
     context = NEW(OmitContext);
     if (!context) return E_NO_MEM;
 
-    if (GetCurrentFilename()) {
-        context->filename = GetCurrentFilename();
-    } else {
-        context->filename = "";
-    }
+    context->filename = GetCurrentFilename();
     context->lineno = LineNo;
+
     context->numfull = NumFullOmits;
     context->numpart = NumPartialOmits;
     context->weekdaysave = WeekdayOmits;

src/protos.h

@@ -47,32 +47,29 @@ int DoFrename (ParsePtr p);
 void UnsetAllUserFuncs(void);
 void ProduceCalendar (void);
 char const *SimpleTime (int tim);
-char const *CalendarTime (int tim, int duration);
 int DoRem (ParsePtr p);
 int DoFlush (ParsePtr p);
 void DoExit (ParsePtr p);
 int ParseRem (ParsePtr s, Trigger *trig, TimeTrig *tim);
-int TriggerReminder (ParsePtr p, Trigger *t, TimeTrig *tim, int dse, int is_queued, DynamicBuffer *output);
-int ShouldTriggerReminder (Trigger *t, TimeTrig *tim, int dse, int *err);
-int DoSubst (ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse, int mode);
+int TriggerReminder (ParsePtr p, Trigger *t, TimeTrig const *tim, int dse, int is_queued, DynamicBuffer *output, int *r, int *g, int *b);
+int ShouldTriggerReminder (Trigger const *t, TimeTrig const *tim, int dse, int *err);
+int DoSubst (ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig const *tt, int dse, int mode);
 int DoSubstFromString (char const *source, DynamicBuffer *dbuf, int dse, int tim);
 int ParseLiteralDateOrTime (char const **s, int *dse, int *tim);
-int ParseLiteralTime (char const **s, int *tim);
 expr_node *parse_expression(char const **e, int *r, Var *locals);
 
 int evaluate_expression(expr_node *node, Value *locals, Value *ans, int *nonconst);
 int evaluate_expr_node(expr_node *node, Value *locals, Value *ans, int *nonconst);
 int truthy(Value const *v);
 
-void print_expr_tree(expr_node *node, FILE *fp);
 void unlimit_execution_time(void);
 expr_node *free_expr_tree(expr_node *node);
+expr_node *clone_expr_tree(expr_node const *node, int *r);
 int EvalExpr (char const **e, Value *v, ParsePtr p);
 int DoCoerce (char type, Value *v);
 char const *PrintValue  (Value *v, FILE *fp);
 int CopyValue (Value *dest, const Value *src);
 int ReadLine (void);
-int OpenFile (char const *fname);
 int DoInclude (ParsePtr p, enum TokTypes tok);
 int DoIncludeCmd (ParsePtr p);
 int IncludeFile (char const *fname);
@@ -106,11 +103,9 @@ int SystemDate (int *y, int *m, int *d);
 int DoIf (ParsePtr p);
 int DoElse (ParsePtr p);
 int DoEndif (ParsePtr p);
+int DoReturn (ParsePtr p);
 int DoIfTrig (ParsePtr p);
-int ShouldIgnoreLine (void);
 int VerifyEoln (ParsePtr p);
-int DoDebug (ParsePtr p);
-int DoBanner (ParsePtr p);
 int DoRun (ParsePtr p);
 int DoExpr (ParsePtr p);
 int DoTranslate (ParsePtr p);
@@ -124,13 +119,12 @@ int PushOmitContext (ParsePtr p);
 int PopOmitContext (ParsePtr p);
 int IsOmitted (int dse, int localomit, char const *omitfunc, int *omit);
 int DoOmit (ParsePtr p);
-int QueueReminder (ParsePtr p, Trigger *trig, TimeTrig *tim, char const *sched);
+int QueueReminder (ParsePtr p, Trigger *trig, TimeTrig const *tim, char const *sched);
 void HandleQueuedReminders (void);
 char const *FindInitialToken (Token *tok, char const *s);
 void FindToken (char const *s, Token *tok);
-void FindNumericToken (char const *s, Token *t);
 int ComputeTrigger (int today, Trigger *trig, TimeTrig *tim, int *err, int save_in_globals);
-int ComputeTriggerNoAdjustDuration (int today, Trigger *trig, TimeTrig *tim, int *err, int save_in_globals, int duration_days);
+int ComputeTriggerNoAdjustDuration (int today, Trigger *trig, TimeTrig const *tim, int *err, int save_in_globals, int duration_days);
 int AdjustTriggerForDuration(int today, int r, Trigger *trig, TimeTrig *tim, int save_in_globals);
 char *StrnCpy (char *dest, char const *source, int n);
 
@@ -150,12 +144,16 @@ void strtolower(char *s);
 
 Var *FindVar (char const *str, int create);
 SysVar *FindSysVar (char const *name);
-int DeleteVar (char const *str);
 int SetVar (char const *str, Value const *val, int nonconst_expr);
-int GetVarValue (char const *str, Value *val);
 int DoSet  (Parser *p);
 int DoUnset  (Parser *p);
 int DoDump (ParsePtr p);
+int PushVars(ParsePtr p);
+int EmptyVarStack(int print_unmatched);
+int PopVars(ParsePtr p);
+int PushUserFuncs(ParsePtr p);
+int EmptyUserFuncStack(int print_unmatched);
+int PopUserFuncs(ParsePtr p);
 void DumpVarTable (int dump_constness);
 void DumpUnusedVars(void);
 void DestroyVars (int all);
@@ -164,7 +162,6 @@ int DoPreserve  (Parser *p);
 int DoSatRemind (Trigger *trig, TimeTrig *tt, ParsePtr p);
 int DoMsgCommand (char const *cmd, char const *msg, int is_queued);
 int ParseNonSpaceChar (ParsePtr p, int *err, int peek);
-unsigned int HashVal_ignorecase(char const *str);
 unsigned int HashVal_preservecase(char const *str);
 int DateOK (int y, int m, int d);
 BuiltinFunc *FindBuiltinFunc (char const *name);
@@ -175,10 +172,6 @@ int UserFuncExists (char const *fn);
 void DSEToHeb (int dse, int *hy, int *hm, int *hd);
 int HebNameToNum (char const *mname);
 char const *HebMonthName (int m, int y);
-int RoshHashana (int i);
-long DaysToHebYear (int y);
-int DaysInHebYear (int y);
-char const *DaysInHebMonths (int ylen);
 int HebToDSE (int hy, int hm, int hd);
 int GetValidHebDate (int yin, int min, int din, int adarbehave, int *mout, int *dout, int yahr);
 int GetNextHebrewDate (int dsestart, int hm, int hd, int yahr, int adarbehave, int *ans);
@@ -199,9 +192,7 @@ void PurgeEchoLine(char const *fmt, ...);
 void FreeTrig(Trigger *t);
 void AppendTag(DynamicBuffer *buf, char const *s);
 char const *SynthesizeTag(void);
-void ClearLastTriggers(void);
 void SaveLastTrigger(Trigger const *t);
-void SaveLastTimeTrig(TimeTrig const *t);
 void SaveAllTriggerInfo(Trigger const *t, TimeTrig const *tt, int trigdate, int trigtime, int valid);
 
 void PerIterationInit(void);
@@ -210,13 +201,9 @@ char const *Colorize(int r, int g, int b, int bg, int clamp);
 void PrintJSONString(char const *s);
 void PrintJSONKeyPairInt(char const *name, int val);
 void PrintJSONKeyPairString(char const *name, char const *val);
-void PrintJSONKeyPairDate(char const *name, int dse);
-void PrintJSONKeyPairDateTime(char const *name, int dt);
-void PrintJSONKeyPairTime(char const *name, int t);
 void System(char const *cmd, int queued);
 int ShellEscape(char const *in, DynamicBuffer *out);
 int AddGlobalOmit(int dse);
-void set_lat_and_long_from_components(void);
 void set_components_from_lat_and_long(void);
 
 void DebugExitFunc(void);
@@ -226,13 +213,12 @@ int GetTerminalBackground(void);
 char const *get_day_name(int wkday);
 char const *get_month_name(int mon);
 
-void set_cloexec(FILE *fp);
 int push_call(char const *filename, char const *func, int lineno, int lineno_start);
 void clear_callstack(void);
 int print_callstack(FILE *fp);
 void pop_call(void);
 void FixSpecialType(Trigger *trig);
-void WriteJSONTrigger(Trigger const *t, int include_tags, int today);
+void WriteJSONTrigger(Trigger const *t, int include_tags);
 void WriteJSONTimeTrigger(TimeTrig const *tt);
 int GetOnceDate(void);
 #ifdef REM_USE_WCHAR
@@ -279,12 +265,8 @@ void print_escaped_string(FILE *fp, char const *s);
 void print_escaped_string_helper(FILE *fp, char const *s, int esc_for_remind, int json);
 void GenerateSysvarTranslationTemplates(void);
 void TranslationTemplate(char const *msg);
-TrigInfo *NewTrigInfo(char const *i);
-void FreeTrigInfo(TrigInfo *ti);
 void FreeTrigInfoChain(TrigInfo *ti);
 int AppendTrigInfo(Trigger *t, char const *info);
-int TrigInfoHeadersAreTheSame(char const *i1, char const *i2);
-int TrigInfoIsValid(char const *info);
 char const *FindTrigInfo(Trigger *t, char const *header);
 void WriteJSONInfoChain(TrigInfo *ti);
 char const *line_range(int lineno_start, int lineno);
@@ -308,3 +290,5 @@ void pop_excess_ifs(char const *fname);
 
 void SetCurrentFilename(char const *fname);
 char const *GetCurrentFilename(void);
+int get_scanfrom(Trigger const *t);
+void remove_trailing_newlines(DynamicBuffer *buf);

src/queue.c

@@ -85,7 +85,7 @@ static void chomp(DynamicBuffer *buf)
     }
 }
 
-char const *SimpleTimeNoSpace(int tim)
+static char const *SimpleTimeNoSpace(int tim)
 {
     char *s = (char *) SimpleTime(tim);
     if (s && *s) {
@@ -97,7 +97,7 @@ char const *SimpleTimeNoSpace(int tim)
     return s;
 }
 
-static void del_reminder(QueuedRem *qid)
+static void del_reminder(QueuedRem const *qid)
 {
     QueuedRem *q = QueueHead;
     QueuedRem *next;
@@ -137,7 +137,7 @@ static void del_reminder_ul(unsigned long qid) {
 /*                                                             */
 /***************************************************************/
 int QueueReminder(ParsePtr p, Trigger *trig,
-                  TimeTrig *tim, char const *sched)
+                  TimeTrig const *tim, char const *sched)
 {
     QueuedRem *qelem;
 
@@ -209,7 +209,7 @@ maybe_close(int fd)
     (void) close(new_fd);
 }
 
-void
+static void
 SigContHandler(int d)
 {
     UNUSED(d);
@@ -436,7 +436,7 @@ void HandleQueuedReminders(void)
             if (DaemonJSON) {
                 DynamicBuffer out;
                 DBufInit(&out);
-                (void) TriggerReminder(&p, &tcopy, &q->tt, DSEToday, 1, &out);
+                (void) TriggerReminder(&p, &tcopy, &q->tt, DSEToday, 1, &out, NULL, NULL, NULL);
                 if (q->typ != RUN_TYPE) {
                     printf("\"body\":\"");
                     chomp(&out);
@@ -445,7 +445,7 @@ void HandleQueuedReminders(void)
                 }
                 DBufFree(&out);
             } else {
-                (void) TriggerReminder(&p, &tcopy, &q->tt, DSEToday, 1, NULL);
+                (void) TriggerReminder(&p, &tcopy, &q->tt, DSEToday, 1, NULL, NULL, NULL, NULL);
             }
             if (IsServerMode() && !DaemonJSON && q->typ != RUN_TYPE) {
                 printf("NOTE endreminder\n");
@@ -704,7 +704,7 @@ json_queue(QueuedRem const *q)
         }
         done = 1;
         printf("{");
-        WriteJSONTrigger(&(q->t), 1, DSEToday);
+        WriteJSONTrigger(&(q->t), 1);
         WriteJSONTimeTrigger(&(q->tt));
         if (TestMode) {
             snprintf(idbuf, sizeof(idbuf), "42424242");

src/rem2ps.c

@@ -131,16 +131,16 @@ int LeftMarg, RightMarg, TopMarg, BotMarg;
 int FillPage;
 int Verbose = 0;
 
-void Init (int argc, char *argv[]);
-void Usage (char const *s);
-void DoPsCal (void);
-int DoQueuedPs (void);
-void DoSmallCal (char const *m, int days, int first, int col, int which);
-void WriteProlog (void);
-void WriteCalEntry (void);
-void WriteOneEntry (CalEntry *c);
-void GetSmallLocations (void);
-char const *EatToken(char const *in, char *out, int maxlen);
+static void Init (int argc, char const *argv[]);
+static void Usage (char const *s);
+static void DoPsCal (void);
+static int DoQueuedPs (void);
+static void DoSmallCal (char const *m, int days, int first, int col, int which);
+static void WriteProlog (void);
+static void WriteCalEntry (void);
+static void WriteOneEntry (CalEntry const *c);
+static void GetSmallLocations (void);
+static char const *EatToken(char const *in, char *out, int maxlen);
 
 static void
 put_escaped_string(char const *s)
@@ -161,7 +161,7 @@ put_escaped_string(char const *s)
 /*  Compare strings, case insensitive.                         */
 /*                                                             */
 /***************************************************************/
-int StrCmpi(char const *s1, char const *s2)
+static int StrCmpi(char const *s1, char const *s2)
 {
     int r;
     while (*s1 && *s2) {
@@ -178,7 +178,7 @@ int StrCmpi(char const *s1, char const *s2)
 /*                                                             */
 /***************************************************************/
 static CalEntry *
-JSONToCalEntry(DynamicBuffer *buf)
+JSONToCalEntry(DynamicBuffer const *buf)
 {
     CalEntry *c;
     json_value *val;
@@ -325,7 +325,7 @@ TextToCalEntry(DynamicBuffer *buf)
 /*   MAIN PROGRAM                                              */
 /*                                                             */
 /***************************************************************/
-int main(int argc, char *argv[])
+int main(int argc, char const *argv[])
 {
     /* If stdin is a tty - probably wrong. */
 
@@ -375,7 +375,7 @@ int main(int argc, char *argv[])
 /*  DoPsCal - emit PostScript for the calendar.                */
 /*                                                             */
 /***************************************************************/
-void DoPsCal(void)
+static void DoPsCal(void)
 {
     char month[40], year[40];
     char prevm[40], nextm[40];
@@ -595,7 +595,7 @@ void DoPsCal(void)
 /*  WriteProlog - write the PostScript prologue                */
 /*                                                             */
 /***************************************************************/
-void WriteProlog(void)
+static void WriteProlog(void)
 {
     int i;
     int x = CurPage->xsize;
@@ -702,7 +702,7 @@ void WriteProlog(void)
 /*  WriteCalEntry - write all entries for one day              */
 /*                                                             */
 /***************************************************************/
-void WriteCalEntry(void)
+static void WriteCalEntry(void)
 {
     CalEntry *c = CurEntries;
     CalEntry *d;
@@ -789,7 +789,7 @@ void WriteCalEntry(void)
 /*  WriteOneEntry - write an entry for one day                 */
 /*                                                             */
 /***************************************************************/
-void WriteOneEntry(CalEntry *c)
+static void WriteOneEntry(CalEntry const *c)
 {
     int ch, i;
     char const *s = c->entry;
@@ -851,7 +851,7 @@ void WriteOneEntry(CalEntry *c)
 /*  Init - set up parameters                                   */
 /*                                                             */
 /***************************************************************/
-void Init(int argc, char *argv[])
+static void Init(int argc, char const *argv[])
 {
     char const *s;
     char const *t;
@@ -1043,7 +1043,7 @@ void Usage(char const *s)
 /*  month.                                                     */
 /*                                                             */
 /***************************************************************/
-void DoSmallCal(char const *m, int days, int first, int col, int which)
+static void DoSmallCal(char const *m, int days, int first, int col, int which)
 {
     /* Do the small calendar */
     int i, j;
@@ -1097,7 +1097,7 @@ void DoSmallCal(char const *m, int days, int first, int col, int which)
 /*  DoQueuedPs - do the queued PS and PSFILE reminders.        */
 /*                                                             */
 /***************************************************************/
-int DoQueuedPs(void)
+static int DoQueuedPs(void)
 {
     int i;
     int HadPS = 0;
@@ -1305,7 +1305,7 @@ int DoQueuedPs(void)
 /* Set up the locations for the small calendars.               */
 /*                                                             */
 /***************************************************************/
-void GetSmallLocations(void)
+static void GetSmallLocations(void)
 {
     char c;
     char const *s = SmallLocation;
@@ -1370,7 +1370,7 @@ void GetSmallLocations(void)
 /* Read a space-delimited token into an output buffer.         */
 /*                                                             */
 /***************************************************************/
-char const *EatToken(char const *in, char *out, int maxlen)
+static char const *EatToken(char const *in, char *out, int maxlen)
 {
     int i = 0;
 

src/token.c

@@ -46,7 +46,8 @@ Token TokArray[] = {
     { "banner",         3,      T_Banner,       0 },
     { "before",         6,      T_Skip,         BEFORE_SKIP },
     { "cal",            3,      T_RemType,      CAL_TYPE },
-    { "clear-omit-context", 5,   T_Clr,         0 },
+    { "clear-omit-context", 5,  T_Clr,         0 },
+    { "complete-through", 16,   T_CompleteThrough, 0 },
     { "debug",          5,      T_Debug,        0 },
     { "december",       3,      T_Month,       11 },
     { "do",             2,      T_IncludeR,     0 },
@@ -90,13 +91,18 @@ Token TokArray[] = {
     { "omit",           4,      T_Omit,         0 },
     { "omitfunc",       8,      T_OmitFunc,     0 },
     { "once",           4,      T_Once,         0 },
+    { "pop-funcs",      9,      T_PopFuncs,     0 },
     { "pop-omit-context", 3,    T_Pop,          0 },
+    { "pop-vars",       8,      T_PopVars,      0 },
     { "preserve",       8,      T_Preserve,     0 },
     { "priority",       8,      T_Priority,     0 },
     { "ps",             2,      T_RemType,      PS_TYPE },
-    { "psfile", 6,      T_RemType,      PSF_TYPE },
+    { "psfile",         6,      T_RemType,      PSF_TYPE },
+    { "push-funcs",     10,     T_PushFuncs,    0 },
     { "push-omit-context", 4,   T_Push,         0 },
+    { "push-vars",      9,      T_PushVars,     0 },
     { "rem",            3,      T_Rem,          0 },
+    { "return",         6,      T_Return,       0 },
     { "run",            3,      T_RemType,      RUN_TYPE },
     { "satisfy",        7,      T_RemType,      SAT_TYPE },
     { "saturday",       3,      T_WkDay,        5 },
@@ -113,6 +119,7 @@ Token TokArray[] = {
     { "third",          5,      T_Ordinal,      2 },
     { "through",        7,      T_Through,      0 },
     { "thursday",       3,      T_WkDay,        3 },
+    { "todo",           4,      T_Todo,         0 },
     { "translate",      5,      T_Translate,    0 },
     { "tuesday",        3,      T_WkDay,        1 },
     { "unset",          5,      T_UnSet,        0 },
@@ -122,6 +129,7 @@ Token TokArray[] = {
 };
 
 static int TokStrCmp (Token const *t, char const *s);
+static void FindNumericToken(char const *s, Token *t);
 
 static void
 init_token(Token *t)
@@ -247,7 +255,7 @@ void FindToken(char const *s, Token *tok)
 /*  Rep - *n                                                   */
 /*                                                             */
 /***************************************************************/
-void FindNumericToken(char const *s, Token *t)
+static void FindNumericToken(char const *s, Token *t)
 {
     int mult = 1, hour, min;
     char const *s_orig = s;
@@ -443,7 +451,7 @@ static int TokStrCmp(Token const *t, char const *s)
 }
 
 static void
-print_token(Token *tok)
+print_token(Token const *tok)
 {
     if (tok->MinLen < (int) strlen(tok->name)) {
         printf("%.*s\n", tok->MinLen, tok->name);
@@ -455,7 +463,7 @@ void
 print_remind_tokens(void)
 {
     int i;
-    Token *tok;
+    Token const *tok;
     int num = (int) (sizeof(TokArray) / sizeof(TokArray[0]));
     printf("# Remind Tokens\n\n");
     for (i=0; i<num; i++) {

src/trans.c

@@ -272,17 +272,17 @@ DumpTranslationTable(FILE *fp, int json)
 }
 
 static unsigned int
-HashXlateItem(void *x)
+HashXlateItem(void const *x)
 {
-    XlateItem *item = (XlateItem *) x;
+    XlateItem const *item = (XlateItem const *) x;
     return HashVal_preservecase(item->orig);
 }
 
 static int
-CompareXlateItems(void *a, void *b)
+CompareXlateItems(void const *a, void const *b)
 {
-    XlateItem *i = (XlateItem *) a;
-    XlateItem *j = (XlateItem *) b;
+    XlateItem const *i = (XlateItem const *) a;
+    XlateItem const *j = (XlateItem const *) b;
     return strcmp(i->orig, j->orig);
 }
 
@@ -339,7 +339,7 @@ InsertTranslation(char const *orig, char const *translated)
 char const *
 GetTranslatedString(char const *orig)
 {
-    XlateItem *item = FindTranslation(orig);
+    XlateItem const *item = FindTranslation(orig);
     if (!item) return NULL;
     return item->translated;
 }

src/trigger.c

@@ -29,8 +29,10 @@
 
 static int DSEYear(int dse);
 static int DSEMonth(int dse);
-static int NextSimpleTrig(int startdate, Trigger *trig, int *err);
+static int NextSimpleTrig(int startdate, Trigger const *trig, int *err);
 static int GetNextTriggerDate(Trigger *trig, int start, int *err, int *nextstart);
+static int TrigInfoIsValid(char const *info);
+static int TrigInfoHeadersAreTheSame(char const *i1, char const *i2);
 
 /***************************************************************/
 /*                                                             */
@@ -44,7 +46,7 @@ static int GetNextTriggerDate(Trigger *trig, int start, int *err, int *nextstart
 /*  so that dates with a REP can be handled properly.          */
 /*                                                             */
 /***************************************************************/
-static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
+static int NextSimpleTrig(int startdate, Trigger const *trig, int *err)
 {
     int typ = 0;
     int d, m, y, j, d2, m2, y2;
@@ -309,14 +311,26 @@ static int DSEYear(int dse)
 static int GetNextTriggerDate(Trigger *trig, int start, int *err, int *nextstart)
 {
     int simple, mod, omit;
+    int calmode = (DoSimpleCalendar || DoCalendar) ? 1 : 0;
+    if (HideCompletedTodos) calmode = 0;
 
     /* First:  Have we passed the UNTIL date? */
-    if (trig->until != NO_UNTIL &&
+    if (!trig->is_todo &&
+        trig->until != NO_UNTIL &&
         trig->until < start) {
         trig->expired = 1;
         return -1; /* expired */
     }
 
+    /* If it's a TODO and complete_through is past today, we're good */
+    if (!calmode &&
+        trig->is_todo &&
+        trig->complete_through != NO_DATE &&
+        trig->complete_through >= start) {
+        trig->expired = 1;
+        return -1;
+    }
+
     /* Next: If it's an "AFTER"-type skip, back up
        until we're at the start of a block of holidays */
     if (trig->skip == AFTER_SKIP) {
@@ -529,7 +543,7 @@ int ComputeTrigger(int today, Trigger *trig, TimeTrig *tim,
 /*  duration.                                                  */
 /*                                                             */
 /***************************************************************/
-int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig *tim,
+int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig const *tim,
                                    int *err, int save_in_globals, int duration_days)
 {
     int nattempts = 0,
@@ -683,7 +697,7 @@ int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig *tim,
 /*  Returns NULL if memory allocation fails.                   */
 /*                                                             */
 /***************************************************************/
-TrigInfo *
+static TrigInfo *
 NewTrigInfo(char const *i)
 {
     TrigInfo *ti = malloc(sizeof(TrigInfo));
@@ -707,7 +721,7 @@ NewTrigInfo(char const *i)
 /*  Free a TrigInfo objects.                                   */
 /*                                                             */
 /***************************************************************/
-void
+static void
 FreeTrigInfo(TrigInfo *ti)
 {
     if (ti->info) {
@@ -774,7 +788,7 @@ AppendTrigInfo(Trigger *t, char const *info)
     return OK;
 }
 
-int
+static int
 TrigInfoHeadersAreTheSame(char const *i1, char const *i2)
 {
     char const *c1 = strchr(i1, ':');
@@ -785,7 +799,7 @@ TrigInfoHeadersAreTheSame(char const *i1, char const *i2)
     return 0;
 }
 
-int
+static int
 TrigInfoIsValid(char const *info)
 {
     char const *t;

src/types.h

@@ -136,6 +136,8 @@ typedef struct {
     int from;
     int adj_for_last;            /* Adjust month/year for use of LAST */
     int need_wkday;              /* Set if we *need* a weekday */
+    int is_todo;                 /* This is a TODO reminder */
+    int complete_through;        /* DSE of complete-through date */
     int priority;
     int duration_days;           /* Duration converted to days to search */
     int eventstart;              /* Original event start (datetime) */
@@ -194,6 +196,7 @@ typedef Parser *ParsePtr;  /* Pointer to parser structure */
 #define AFTER_SKIP 3
 
 #define NO_TIME INT_MAX
+#define NO_SCANFROM INT_MIN
 
 #define NO_PRIORITY 5000 /* Default priority is midway between 0 and 9999 */
 
@@ -226,15 +229,17 @@ typedef Parser *ParsePtr;  /* Pointer to parser structure */
 /* Enumeration of the tokens */
 enum TokTypes
 { T_Illegal,
-  T_AddOmit, T_At, T_Back, T_BackAdj, T_Banner, T_Clr, T_Comment,
+  T_AddOmit, T_At, T_Back, T_BackAdj, T_Banner, T_Clr, T_Comment, T_CompleteThrough,
   T_Date, T_DateTime, T_Day, T_Debug, T_Delta, T_Dumpvars, T_Duration,
-  T_Else, T_Empty, T_EndIf, T_ErrMsg, T_Exit, T_Expr,
-  T_Flush, T_Frename, T_Fset, T_Funset, T_If, T_IfTrig, T_In,
-  T_Include, T_IncludeCmd, T_IncludeR, T_IncludeSys, T_Info, T_LastBack,
-  T_LongTime, T_MaybeUncomputable, T_Month, T_NoQueue, T_Number, T_Omit,
-  T_OmitFunc, T_Once, T_Ordinal, T_Pop, T_Preserve, T_Priority, T_Push,T_Rem,
-  T_RemType, T_Rep, T_Scanfrom, T_Sched, T_Set, T_Skip, T_Tag, T_Through,
-  T_Time, T_Translate, T_UnSet, T_Until, T_Warn, T_WkDay, T_Year
+  T_Else, T_Empty, T_EndIf, T_ErrMsg, T_Exit, T_Expr, T_Flush,
+  T_Frename, T_Fset, T_Funset, T_If, T_IfTrig, T_In, T_Include,
+  T_IncludeCmd, T_IncludeR, T_IncludeSys, T_Info, T_LastBack,
+  T_LongTime, T_MaybeUncomputable, T_Month, T_NoQueue, T_Number,
+  T_Omit, T_OmitFunc, T_Once, T_Ordinal, T_Pop, T_PopFuncs, T_PopVars,
+  T_Preserve, T_Priority, T_Push, T_PushFuncs, T_PushVars, T_Rem,
+  T_RemType, T_Rep, T_Return, T_Scanfrom, T_Sched, T_Set, T_Skip, T_Tag,
+  T_Through, T_Time, T_Todo, T_Translate, T_UnSet, T_Until, T_Warn, T_WkDay,
+  T_Year
 };
 
 /* The structure of a token */
@@ -310,4 +315,11 @@ typedef struct udf_struct {
     int lineno;
     int lineno_start;
     int recurse_flag;
+    int been_pushed;
 } UserFunc;
+
+/* A pushed systtem variable */
+typedef struct {
+    char const *name;
+    Value v;
+} PushedSysvar;

src/userfns.c

@@ -36,16 +36,16 @@ static void FUnset (char const *name);
 static void FSet (UserFunc *f);
 static void RenameUserFunc(char const *oldname, char const *newname);
 
-static unsigned int HashUserFunc(void *x)
+static unsigned int HashUserFunc(void const *x)
 {
-    UserFunc *f = (UserFunc *) x;
+    UserFunc const *f = (UserFunc const *) x;
     return HashVal_preservecase(f->name);
 }
 
-static int CompareUserFuncs(void *a, void *b)
+static int CompareUserFuncs(void const *a, void const *b)
 {
-    UserFunc *f = (UserFunc *) a;
-    UserFunc *g = (UserFunc *) b;
+    UserFunc const *f = (UserFunc const *) a;
+    UserFunc const *g = (UserFunc const *) b;
     return strcmp(f->name, g->name);
 }
 
@@ -244,7 +244,7 @@ int DoFset(ParsePtr p)
             return OK;
         }
         /* Warn about redefinition */
-        if (!suppress_redefined_function_warning) {
+        if (!suppress_redefined_function_warning && !existing->been_pushed) {
             Wprint(tr("Function `%s' redefined: previously defined at %s(%s)"),
                    existing->name, existing->filename, line_range(existing->lineno_start, existing->lineno));
         }
@@ -274,6 +274,7 @@ int DoFset(ParsePtr p)
     func->lineno = LineNo;
     func->lineno_start = LineNoStart;
     func->recurse_flag = 0;
+    func->been_pushed = 0;
     if (in_constant_context()) {
         func->is_constant = 1;
     } else {
@@ -378,6 +379,10 @@ int DoFset(ParsePtr p)
     /* Save the argument names */
     if (func->nargs) {
         func->args = calloc(func->nargs, sizeof(char *));
+        if (!func->args) {
+            DestroyUserFunc(func);
+            return E_NO_MEM;
+        }
         for (i=0; i<func->nargs; i++) {
             func->args[i] = StrDup(local_array[i].name);
             if (!func->args[i]) {
@@ -549,3 +554,223 @@ dump_userfunc_hash_stats(void)
     hash_table_dump_stats(&FuncHash, ErrFp);
 }
 
+typedef struct pushed_userfuncs {
+    struct pushed_userfuncs *next;
+    char const *filename;
+    int lineno;
+    int num_funcs;
+    int alloc_funcs;
+    UserFunc **funcs;
+} PushedUserFuncs;
+
+static PushedUserFuncs *UserFuncStack = NULL;
+static UserFunc *clone_userfunc(char const *name, int *r)
+{
+    int i;
+    UserFunc *src;
+    UserFunc *dest = NEW(UserFunc);
+    *r = E_NO_MEM;
+    if (!dest) {
+        return NULL;
+    }
+
+    /* Find the source function */
+    src = FindUserFunc(name);
+
+    /* If it doesn't exist, use sentinal values to indicate that */
+    if (!src) {
+        *r = OK;
+        StrnCpy(dest->name, name, VAR_NAME_LEN);
+        dest->is_constant = 0;
+        dest->node = NULL;
+        dest->args = NULL;
+        dest->nargs = -1;
+        dest->filename = NULL;
+        dest->lineno = -1;
+        dest->lineno_start = -1;
+        dest->recurse_flag = 0;
+        dest->been_pushed = 0;
+        return dest;
+    }
+    /* Copy the whole thing; then adjust */
+    *dest = *src;
+
+    /* Allow warning-free redefinition of original function */
+    src->been_pushed = 1;
+
+    /* For safety */
+    dest->node = NULL;
+    dest->args = NULL;
+
+    /* Copy args */
+    if (dest->nargs) {
+        dest->args = calloc(dest->nargs, sizeof(char *));
+        if (!dest->args) {
+            DestroyUserFunc(dest);
+            return NULL;
+        }
+        for (i=0; i<dest->nargs; i++) {
+            dest->args[i] = StrDup(src->args[i]);
+            if (!dest->args[i]) {
+                DestroyUserFunc(dest);
+                return NULL;
+            }
+        }
+    }
+
+    /* Copy expr */
+    dest->node = clone_expr_tree(src->node, r);
+    if (!dest->node) {
+        DestroyUserFunc(dest);
+        return NULL;
+    }
+    *r = OK;
+    return dest;
+}
+
+static int add_func_to_push(char const *name, PushedUserFuncs *pf)
+{
+    int r;
+    UserFunc *clone = clone_userfunc(name, &r);
+    if (!clone) {
+        return r;
+    }
+    if (!pf->alloc_funcs) {
+        pf->funcs = calloc(4, sizeof(UserFunc *));
+        if (!pf->funcs) {
+            DestroyUserFunc(clone);
+            return E_NO_MEM;
+        }
+        pf->alloc_funcs = 4;
+    } else {
+        if (pf->num_funcs == pf->alloc_funcs) {
+            pf->funcs = realloc(pf->funcs, 2 * pf->alloc_funcs * sizeof(UserFunc *));
+            if (!pf->funcs) {
+                DestroyUserFunc(clone);
+                return E_NO_MEM;
+            }
+            pf->alloc_funcs *= 2;
+        }
+    }
+    pf->funcs[pf->num_funcs] = clone;
+    pf->num_funcs++;
+    return OK;
+}
+
+static void free_pushed_funcs(PushedUserFuncs *pf)
+{
+    int i;
+    if (pf->funcs) {
+        for(i=0; i<pf->num_funcs; i++) {
+            if (pf->funcs[i]) {
+                DestroyUserFunc(pf->funcs[i]);
+            }
+        }
+        free(pf->funcs);
+    }
+    free(pf);
+}
+
+int PushUserFuncs(ParsePtr p)
+{
+    int r;
+    DynamicBuffer buf;
+    char const *name;
+
+    DBufInit(&buf);
+    PushedUserFuncs *pf = NEW(PushedUserFuncs);
+    if (!pf) {
+        return E_NO_MEM;
+    }
+    pf->next = NULL;
+    pf->funcs = NULL;
+    pf->filename = GetCurrentFilename();
+    pf->lineno = LineNo;
+    pf->num_funcs = 0;
+    pf->alloc_funcs = 0;
+
+    while(1) {
+        r = ParseIdentifier(p, &buf);
+        if (r == E_EOLN) {
+            break;
+        }
+        if (r) {
+            DBufFree(&buf);
+            free_pushed_funcs(pf);
+            return r;
+        }
+        name = DBufValue(&buf);
+        if (*name == '$') {
+            DBufFree(&buf);
+            free_pushed_funcs(pf);
+            return E_BAD_ID;
+        }
+
+        r = add_func_to_push(name, pf);
+
+        DBufFree(&buf);
+        if (r != OK) {
+            free_pushed_funcs(pf);
+            return r;
+        }
+    }
+    if (pf->num_funcs == 0) {
+        free_pushed_funcs(pf);
+        return E_EOLN;
+    }
+    pf->next = UserFuncStack;
+    UserFuncStack = pf;
+    return OK;
+}
+
+int PopUserFuncs(ParsePtr p)
+{
+    int i;
+    PushedUserFuncs *pf = UserFuncStack;
+    int r = VerifyEoln(p);
+    if (r != OK) {
+        return r;
+    }
+    if (!pf) {
+        return E_POPF_NO_PUSH;
+    }
+    UserFuncStack = UserFuncStack->next;
+    if (strcmp(pf->filename, GetCurrentFilename())) {
+        Wprint(tr("POP-FUNCS at %s:%d matches PUSH-FUNCS in different file: %s:%d"), GetCurrentFilename(), LineNo, pf->filename, pf->lineno);
+    }
+    for (i=0; i<pf->num_funcs; i++) {
+        UserFunc *clone = pf->funcs[i];
+        FUnset(clone->name);
+        if (clone->nargs < 0 && !clone->node) {
+            /* Popping a function that should simply be unset... we are done */
+            continue;
+        }
+
+        /* Insert the clone into the hash table */
+        FSet(clone);
+
+        /* Make sure we don't free the clone! */
+        pf->funcs[i] = NULL;
+    }
+    free_pushed_funcs(pf);
+    return OK;
+}
+
+int EmptyUserFuncStack(int print_unmatched)
+{
+    int j = 0;
+    PushedUserFuncs *next;
+    while(UserFuncStack) {
+        if (print_unmatched) {
+            Wprint(tr("Unmatched PUSH-FUNCS at %s(%d)"),
+                   UserFuncStack->filename,
+                   UserFuncStack->lineno);
+        }
+        j++;
+        next = UserFuncStack->next;
+        free_pushed_funcs(UserFuncStack);
+        UserFuncStack = next;
+    }
+    return j;
+}
+

src/utils.c

@@ -247,7 +247,7 @@ print_callstack_aux(FILE *fp, cs *entry)
 {
     int i = 0;
     char const *in = tr("In");
-    cs *prev = NULL;
+    cs const *prev = NULL;
     while(entry) {
         if (prev) {
             in = tr("Called from");

src/var.c

@@ -37,14 +37,16 @@ static int IntMax = INT_MAX;
 
 static hash_table VHashTbl;
 static int SetSysVarHelper(SysVar *v, Value *value);
+static unsigned int HashVal_ignorecase(char const *str);
+static void set_lat_and_long_from_components(void);
 
-static unsigned int VarHashFunc(void *x)
+static unsigned int VarHashFunc(void const *x)
 {
-    Var *v = (Var *) x;
+    Var const *v = (Var const *) x;
     return HashVal_ignorecase(v->name);
 }
 
-static int VarCompareFunc(void *a, void *b)
+static int VarCompareFunc(void const *a, void const *b)
 {
     Var *x = (Var *) a;
     Var *y = (Var *) b;
@@ -153,7 +155,7 @@ static int latitude_longitude_func(int do_set, Value *val, double *var, double m
         if (loc) {
             setlocale(LC_NUMERIC, "C");
         }
-        snprintf(buf, sizeof(buf), "%f", *var);
+        snprintf(buf, sizeof(buf), "%.8f", *var);
         if (loc) {
             setlocale(LC_NUMERIC, loc);
         }
@@ -523,7 +525,7 @@ static int time_sep_func(int do_set, Value *val)
 /*  Given a string, compute the hash value case-insensitively  */
 /*                                                             */
 /***************************************************************/
-unsigned int HashVal_ignorecase(char const *str)
+static unsigned int HashVal_ignorecase(char const *str)
 {
     unsigned int h = 0, high;
     while(*str) {
@@ -576,7 +578,7 @@ Var *FindVar(char const *str, int create)
 /*  string and delete it.                                      */
 /*                                                             */
 /***************************************************************/
-int DeleteVar(char const *str)
+static int DeleteVar(char const *str)
 {
     Var *v;
 
@@ -622,27 +624,6 @@ int SetVar(char const *str, Value const *val, int nonconst_expr)
     return OK;
 }
 
-/***************************************************************/
-/*                                                             */
-/*  GetVarValue                                                */
-/*                                                             */
-/*  Get a copy of the value of the variable.                   */
-/*                                                             */
-/***************************************************************/
-int GetVarValue(char const *str, Value *val)
-{
-    Var *v;
-
-    v=FindVar(str, 0);
-
-    if (!v) {
-        Eprint("%s: `%s'", GetErr(E_NOSUCH_VAR), str);
-        return E_NOSUCH_VAR;
-    }
-    v->used_since_set = 1;
-    return CopyValue(val, &v->v);
-}
-
 /***************************************************************/
 /*                                                             */
 /*  DoSet - set a variable.                                    */
@@ -1098,14 +1079,263 @@ static SysVar SysVarArr[] = {
 };
 
 #define NUMSYSVARS ( sizeof(SysVarArr) / sizeof(SysVar) )
+
+typedef struct pushed_vars {
+    struct pushed_vars *next;
+    char const *filename;
+    int lineno;
+    int num_sysvars;
+    int num_vars;
+    int alloc_sysvars;
+    int alloc_vars;
+    PushedSysvar *sysvars;
+    Var *vars;
+} PushedVars;
+
+static void free_pushedvars(PushedVars *pv);
+
+static PushedVars *VarStack = NULL;
+
+int EmptyVarStack(int print_unmatched)
+{
+    int j=0;
+    PushedVars *next;
+    while(VarStack) {
+        if (print_unmatched) {
+            Wprint(tr("Unmatched PUSH-VARS at %s(%d)"),
+                   VarStack->filename,
+                   VarStack->lineno);
+        }
+        j++;
+        next = VarStack->next;
+        free_pushedvars(VarStack);
+        VarStack = next;
+    }
+    return j;
+}
+
+static int add_sysvar_to_push(char const *name, PushedVars *pv)
+{
+    int n = pv->alloc_sysvars;
+    if (*name == '$') {
+        name++;
+    }
+    SysVar *v = FindSysVar(name);
+    if (!v) {
+        return E_NOSUCH_VAR;
+    }
+    if (!v->modifiable) {
+        Eprint("%s: `$%s'", GetErr(E_CANT_MODIFY), v->name);
+        return E_CANT_MODIFY;
+    }
+    if (!n) {
+        n = 4;
+        pv->sysvars = malloc(n * sizeof(PushedSysvar));
+        pv->alloc_sysvars = n;
+    } else {
+        if (pv->num_sysvars >= n) {
+            n *= 2;
+            pv->sysvars = realloc(pv->sysvars, n * sizeof(PushedSysvar));
+            pv->alloc_sysvars = n;
+        }
+    }
+    if (!pv->sysvars) {
+        return E_NO_MEM;
+    }
+    n = pv->num_sysvars;
+    pv->num_sysvars++;
+    pv->sysvars[n].name = v->name;
+    pv->sysvars[n].v.type = ERR_TYPE;
+    return GetSysVar(name, &(pv->sysvars[n].v));
+}
+
+static int add_var_to_push(char const *name, PushedVars *pv)
+{
+    int n = pv->alloc_vars;
+    if (!n) {
+        n = 4;
+        pv->vars = malloc(n * sizeof(Var));
+        pv->alloc_vars = n;
+    } else {
+        if (pv->num_vars >= n) {
+            n *= 2;
+            pv->vars = realloc(pv->vars, n * sizeof(Var));
+            pv->alloc_vars = n;
+        }
+    }
+    if (!pv->vars) {
+        return E_NO_MEM;
+    }
+    n = pv->num_vars;
+    pv->num_vars++;
+    Var *v = FindVar(name, 0);
+    Var *dest = &(pv->vars[n]);
+    int r = OK;
+    if (!v) {
+        StrnCpy(dest->name, name, VAR_NAME_LEN);
+        dest->preserve = 0;
+        dest->is_constant = 0;
+        dest->used_since_set = 0;
+        dest->filename = NULL;
+        dest->lineno = -1;
+        dest->v.type = ERR_TYPE;
+        dest->v.v.val = E_NOSUCH_VAR;
+    } else {
+        StrnCpy(dest->name, v->name, VAR_NAME_LEN);
+        dest->preserve = v->preserve;
+        dest->is_constant = v->is_constant;
+        dest->used_since_set = v->used_since_set;
+        dest->filename = v->filename;
+        dest->lineno = v->lineno;
+        r = CopyValue(&(dest->v), &(v->v));
+        /* Pretend we've used v */
+        v->used_since_set = 1;
+    }
+    return r;
+}
+
+static void free_pushedvars(PushedVars *pv)
+{
+    int i;
+    for (i=0; i<pv->num_sysvars; i++) {
+        DestroyValue(pv->sysvars[i].v);
+    }
+    for (i=0; i<pv->num_vars; i++) {
+        DestroyValue(pv->vars[i].v);
+    }
+    if (pv->sysvars) {
+        free(pv->sysvars);
+    }
+    if (pv->vars) {
+        free(pv->vars);
+    }
+    free(pv);
+}
+
+int
+PushVars(ParsePtr p)
+{
+    int r;
+    DynamicBuffer buf;
+    char const *name;
+
+    PushedVars *pv = NEW(PushedVars);
+    if (!pv) {
+        return E_NO_MEM;
+    }
+    pv->next = NULL;
+    pv->filename = GetCurrentFilename();
+    pv->lineno = LineNo;
+    pv->num_sysvars = 0;
+    pv->num_vars = 0;
+    pv->alloc_sysvars = 0;
+    pv->alloc_vars = 0;
+    pv->sysvars = NULL;
+    pv->vars = NULL;
+
+    DBufInit(&buf);
+    while(1) {
+        r = ParseIdentifier(p, &buf);
+        if (r == E_EOLN) {
+            break;
+        }
+        if (r) {
+            DBufFree(&buf);
+            free_pushedvars(pv);
+            return r;
+        }
+        name = DBufValue(&buf);
+        if (*name == '$') {
+            r = add_sysvar_to_push(name+1, pv);
+        } else {
+            r = add_var_to_push(name, pv);
+        }
+        DBufFree(&buf);
+        if (r != OK) {
+            free_pushedvars(pv);
+            return r;
+        }
+    }
+    if ((pv->num_vars + pv->num_sysvars) == 0) {
+        free_pushedvars(pv);
+        return E_EOLN;
+    }
+    pv->next = VarStack;
+    VarStack = pv;
+    return OK;
+}
+
+int
+PopVars(ParsePtr p)
+{
+    int r = VerifyEoln(p);
+    int i;
+    int ret = OK;
+    PushedVars *pv = VarStack;
+    if (r != OK) {
+        return r;
+    }
+    if (!pv) {
+        return E_POPV_NO_PUSH;
+    }
+    VarStack = VarStack->next;
+    if (strcmp(pv->filename, GetCurrentFilename())) {
+        Wprint(tr("POP-VARS at %s:%d matches PUSH-VARS in different file: %s:%d"), GetCurrentFilename(), LineNo, pv->filename, pv->lineno);
+    }
+
+    /* Pop the sysvars */
+    for (i=0; i<pv->num_sysvars; i++) {
+        r = SetSysVar(pv->sysvars[i].name, &(pv->sysvars[i].v));
+        if (r != OK) {
+            ret = r;
+        }
+    }
+
+    /* Pop the vars */
+    for (i=0; i<pv->num_vars; i++) {
+        Var *src = &(pv->vars[i]);
+        if (src->v.type == ERR_TYPE && src->v.v.val == E_NOSUCH_VAR) {
+            /* Delete the variable if it exists */
+            (void) DeleteVar(src->name);
+        } else {
+            Var *dest = FindVar(src->name, 0);
+            if ((DebugFlag & DB_UNUSED_VARS) && dest && !dest->used_since_set) {
+                Eprint(tr("`%s' UNSET without being used (previous SET: %s:%d)"), dest->name, dest->filename, dest->lineno);
+            }
+            if (!dest) {
+                dest = FindVar(src->name, 1);
+            }
+            if (!dest) {
+                ret = E_NO_MEM;
+                continue;
+            }
+            dest->preserve = src->preserve;
+            dest->is_constant = src->is_constant;
+            dest->used_since_set = src->used_since_set;
+            dest->filename = src->filename;
+            dest->lineno = src->lineno;
+            DestroyValue(dest->v);
+
+            /* Destructively copy value */
+            dest->v = src->v;
+
+            /* Make sure free_pushedvars doesn't destroy our value! */
+            src->v.type = ERR_TYPE;
+            src->v.v.val = 0;
+        }
+    }
+    free_pushedvars(pv);
+    return ret;
+}
+
 static void DumpSysVar (char const *name, const SysVar *v);
 
-static int SetTranslatableVariable(SysVar *v, Value *value)
+static int SetTranslatableVariable(SysVar const *v, Value const *value)
 {
     return InsertTranslation((char const *) v->value, value->v.str);
 }
 
-static int GetTranslatableVariable(SysVar *v, Value *value)
+static int GetTranslatableVariable(SysVar const *v, Value *value)
 {
     char const *translated = tr((char const *) v->value);
     if (translated) {
@@ -1256,7 +1486,7 @@ SysVar *FindSysVar(char const *name)
 void DumpSysVarByName(char const *name)
 {
     size_t i;
-    SysVar *v;
+    SysVar const *v;
 
     if (!name || !*name) {
         for (i=0; i<NUMSYSVARS; i++) DumpSysVar(name, SysVarArr + i);
@@ -1333,7 +1563,7 @@ static void DumpSysVar(char const *name, const SysVar *v)
     return;
 }
 
-void
+static void
 set_lat_and_long_from_components(void)
 {
     Latitude = (double) LatDeg + ((double) LatMin) / 60.0 + ((double) LatSec) / 3600.0;

tests/purge_dir/f3.rem

@@ -83,6 +83,8 @@ UNSET a
 CLEAR-OMIT-CONTEXT
 PUSH-OMIT-CONTEXT
 POP-OMIT-CONTEXT
+PUSH-VARS foo
+POP-VARS
 BANNER wow
 DEBUG +x
 DEBUG -x

tests/ret1.rem

@@ -0,0 +1,5 @@
+DO ret2.rem
+IF ($Ud % 5) != 0
+    RETURN
+ENDIF
+REM MSG On days divisible by 5

tests/ret2.rem

@@ -0,0 +1,7 @@
+REM MSG Always
+IF $Ud % 2
+    REM MSG On odd days
+    RETURN
+    REM MSG Won't appear
+ENDIF
+REM MSG On even days

tests/test-rem

@@ -704,7 +704,7 @@ EOF
 
 # Test diagnostics when using a timed substitution without an AT clause
 ../src/remind - 1 Feb 2024 1:00 <<EOF >> ../tests/test.out 2>&1
-REM MSG %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 %! hahaha
+REM MSG %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 hahaha
 EOF
 
 # Test translate table dumping
@@ -716,6 +716,11 @@ EOF
 ../src/remind -ppp - 1 Feb 2024 <<EOF >> ../tests/test.out 2>&1
 TRANSLATE "\x03" "BREAK"
 EOF
+
+# SCANFROM should be preserved even if it is today
+../src/remind -ppp - 1 Feb 2024 <<EOF >> ../tests/test.out 2>&1
+REM SCANFROM 2024-02-01 MSG Preserve SCANFROM
+EOF
 # Languages
 for i in ../include/lang/??.rem ; do
     ../src/remind -r -q "-ii=\"$i\"" ../tests/tstlang.rem 1 Feb 2024 13:34 >> ../tests/test.out 2>&1
@@ -745,9 +750,26 @@ set y 1000
 unset y
 EOF
 
+# Test RETURN statement
+../src/remind ../tests/ret1.rem 4 June 2000 >> ../tests/test.out 2>&1
+../src/remind ../tests/ret1.rem 5 June 2000 >> ../tests/test.out 2>&1
+../src/remind ../tests/ret1.rem 7 June 2000 >> ../tests/test.out 2>&1
+../src/remind -s ../tests/ret1.rem 1 June 2000 >> ../tests/test.out 2>&1
+
 # Make sure all the include files are ok
 find ../include -type f -name '*.rem' | while read x; do ../src/remind -du -n $x 1 Jan 2024 2>>../tests/test.out 1>/dev/null; done
 
+# Test todos
+echo "" >> ../tests/test.out 2>&1
+echo "Testing TODOS in agenda mode" >> ../tests/test.out 2>&1
+../src/remind ../tests/todos.rem 2025-08-13 >> ../tests/test.out 2>&1
+echo "" >> ../tests/test.out 2>&1
+echo "Testing TODOS in calendar mode" >> ../tests/test.out 2>&1
+../src/remind -s ../tests/todos.rem 2025-08-13 >> ../tests/test.out 2>&1
+echo "" >> ../tests/test.out 2>&1
+echo "Testing TODOS in calendar mode with completed todos hidden" >> ../tests/test.out 2>&1
+../src/remind -s --hide-completed-todos ../tests/todos.rem 2025-08-13 >> ../tests/test.out 2>&1
+
 cmp -s ../tests/test.out ../tests/test.cmp
 if [ "$?" = "0" ]; then
    echo "Remind:  Acceptance test PASSED"

tests/test.rem

@@ -272,7 +272,7 @@ set $LatDeg 30
 set $LatMin 30
 set $LatSec 0
 set $LongDeg -25
-set $LongMin 15
+set $LongMin -15
 set $LongSec 0
 
 set a000 abs(1)
@@ -478,7 +478,16 @@ REM MAYBE-UNCOMPUTABLE Mon OMIT Mon SKIP MSG Never ever ever...
 REM MAYBE-UNCOMPUTABLE Mon SATISFY [wkdaynum($T) == 3] MSG Nope nope...
 
 dump
-dump $
+set axx 1
+PUSH-VARS $Tomorrow $Latitude $DefaultColor axx bxbxbx
+set $Tomorrow "HAHA, tomorrow"
+set $Latitude "0"
+set $DefaultColor "42 42 42"
+set bxbxbx 1
+dump $Tomorrow $Latitude $DefaultColor axx bxbxbx a136 $Today
+POP-VARS
+dump $Tomorrow $Latitude $DefaultColor axx bxbxbx a136 $Today
+
 msg [$April]%
 msg [$August]%
 msg [$CalcUTC]%
@@ -1658,6 +1667,46 @@ DEBUG -x
 # Output expression-node stats
 DEBUG +h
 
+# Long list of pushing/popping variables
+PUSH-VARS $AddBlankLines $Ago $Am $And $April $At $August $CalcUTC $DateSep $DateTimeSep $December $DedupeReminders $DefaultColor $DefaultDelta $DefaultPrio $DefaultTDelta $EndSent $EndSentIg $ExpressionTimeLimit $February $FirstIndent $FoldYear $FormWidth $Friday $Fromnow $Hour $Hplu $Is $January $July $June $LatDeg $Latitude $LatMin $LatSec $Location $LongDeg $Longitude $LongMin $LongSec $March $MaxLateMinutes $MaxSatIter $MaxStringLen $May $MinsFromUTC $Minute $Monday $Mplu $November $Now $October $On $OnceFile $ParseUntriggered $Pm $Saturday $September $SubsIndent $Sunday $SuppressImplicitWarnings $SuppressLRM $Thursday $TimeSep $Today $Tomorrow $Tuesday $Was $Wednesday  a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20 a21 a22 a23 a24 a25 a26 a27 a28 a29 a30 a31 a32 a33 a34 a35 a36 a37 a38 a39 a40 a41 a42 a43 a44 a45 a46 a47 a48 a49 a50 a51 a52 a53 a54 a55 a56 a57 a58 a59 a60 a61 a62 a63 a64 a65 a66 a67 a68 a69 a70 a71 a72 a73 a74 a75 a76 a77 a78 a79 a80 a81 a82 a83 a84 a85 a86 a87 a88 a89 a90 a91 a92 a93 a94 a95 a96 a97 a98 a99 a100 a101 a102 a103 a104 a105 a106 a107 a108 a109 a110 a111 a112 a113 a114 a115 a116 a117 a118 a119 a120 a121 a122 a123 a124 a125 a126 a127 a128 a129 a130 a131 a132 a133 a134 a135 a136 a137 a138 a139 a140 a141 a142 a143 a144 a145 a146 a147 a148 a149 a150 a151 a152 a153 a154 a155 a156 a157 a158 a159 a160 a161 a162 a163 a164 a165 a166 a167 a168 a169 a170 a171 a172 a173 a174 a175 a176 a177 a178 a179 a180 a181 a182 a183 a184 a185 a186 a187 a188 a189 a190 a191 a192 a193 a194 a195 a196 a197 a198 a199 a200 a201 a202 a203 a204 a205 a206 a207 a208 a209 a210 a211 a212 a213 a214 a215 a216 a217 a218 a219 a220 a221 a222 a223 a224 a225 a226 a227 a228 a229 a230 a231 a232 a233 a234 a235 a236 a237 a238 a239 a240 a241 a242 a243 a244 a245 a246 a247 a248 a249 a250 a251 a252 a253 a254 a255 a256 a257 a258 a259 a260 a261 a262 a263 a264 a265 a266 a267 a268 a269 a270 a271 a272 a273 a274 a275 a276 a277 a278 a279 a280 a281 a282 a283 a284 a285 a286 a287 a288 a289 a290 a291 a292 a293 a294 a295 a296 a297 a298 a299 a300
+POP-VARS
+
+# Try pushing a read-only one
+PUSH-VARS $NumTrig
+POP-VARS
+
+# Test push/pop of functions
+DEBUG +xe
+
+FUNSET a
+FSET b(x, y) x*y
+FSET c() 33
+
+set a a(2)
+set a b(2)
+set a b(2, 3)
+set a c()
+
+PUSH-FUNCS a b c
+
+FSET a(x) 42
+FSET b(x, y) x*y*2
+FSET c() 66
+
+set a a(2)
+set a b(2)
+set a b(2, 3)
+set a c()
+
+POP-FUNCS
+
+set a a(2)
+set a b(2)
+set a b(2, 3)
+set a c()
+
+DEBUG -xe
+
 # Don't want Remind to queue reminders
 EXIT
 

tests/todos.rem

@@ -0,0 +1,12 @@
+BANNER %
+SET $AddBlankLines 0
+
+REM TODO 1 Aug 2025 MSG %"First%" %l
+REM TODO 1 Aug COMPLETE-THROUGH 2022-07-31 MSG %"Second%" %l
+REM TODO 1 Aug COMPLETE-THROUGH 2022-08-01 MSG %"Third%" %l
+REM TODO 20 Aug 2025 +7 MSG %"Fourth%" %l
+REM TODO 13 Aug 2025 +7 MSG %"Fifth%" %l
+REM TODO 6 Aug 2025 +7 MSG %"Sixth%" %l
+REM TODO COMPLETE-THROUGH 2025-08-06 6 Aug 2025 +7 MSG %"Seventh%" %l
+REM TODO Wed +7 COMPLETE-THROUGH 2025-08-13 MSG %"Eighth%" %l
+REM TODO Wed +7 COMPLETE-THROUGH 2025-08-12 MSG %"Ninth%" %l

tests/tstlang.rem

@@ -29,6 +29,7 @@ if !$RunOff || !$DontQueue || $DontTrigAts
    exit
 endif
 
+set $AddBlankLines 0
 # Include a language file, if that's given as "-ii=/path"
 
 if defined("i")
@@ -37,7 +38,7 @@ endif
 
 REM MSG Language: %(LANGID)
 # Set up a few useful definitions
-fset show(x) "%%" + x + " yields: " + char(34) + "%" + x + char(34) + "% and %%*" + x + " yields: " + char(34) + "%*" + x + char(34) + "%"
+fset show(x) iif(x == "!" || x == "?", "%%" + x + " yields: " + char(34) + "%" + x + char(34), "%%" + x + " yields: " + char(34) + "%" + x + char(34) + "% and %%*" + x + " yields: " + char(34) + "%*" + x + char(34) + "%")
 set a trigger(today()+2) + " ++2"
 set l language()
 set tt now()+134
@@ -298,6 +299,14 @@ REM [a] MSG [show("x")]
 REM [a] MSG [show("y")]
 REM [a] MSG [show("z")]
 
+MSG %_%_The %%b substitutions for 1, 2 and 3 days ago
+SET a today()-1
+REM TODO [a] MSG [show("b")]
+SET a today()-2
+REM TODO [a] MSG [show("b")]
+SET a today()-3
+REM TODO [a] MSG [show("b")]
+
 MSG %_Time substitutions for [now()] where now() = [now()]
 REM AT [now()] MSG [show("1")]
 REM AT [now()] MSG [show("2")]
@@ -310,6 +319,7 @@ REM AT [now()] MSG [show("8")]
 REM AT [now()] MSG [show("9")]
 REM AT [now()] MSG [show("0")]
 REM AT [now()] MSG [show("!")]
+REM AT [now()] MSG [show("?")]
 REM AT [now()] MSG [show("@")]
 REM AT [now()] MSG [show("#")]
 MSG %_Time substitutions for [now()+134] where now() = [now()]
@@ -324,6 +334,7 @@ REM AT [now()+134] MSG [show("8")]
 REM AT [now()+134] MSG [show("9")]
 REM AT [now()+134] MSG [show("0")]
 REM AT [now()+134] MSG [show("!")]
+REM AT [now()+134] MSG [show("?")]
 REM AT [now()+134] MSG [show("@")]
 REM AT [now()+134] MSG [show("#")]
 MSG %_Time substitutions for [now()-134] where now() = [now()]
@@ -338,6 +349,7 @@ REM AT [now()-134] MSG [show("8")]
 REM AT [now()-134] MSG [show("9")]
 REM AT [now()-134] MSG [show("0")]
 REM AT [now()-134] MSG [show("!")]
+REM AT [now()-134] MSG [show("?")]
 REM AT [now()-134] MSG [show("@")]
 REM AT [now()-134] MSG [show("#")]
 MSG %_Time substitutions for [now()+60] where now() = [now()]
@@ -352,6 +364,7 @@ REM AT [now()+60] MSG [show("8")]
 REM AT [now()+60] MSG [show("9")]
 REM AT [now()+60] MSG [show("0")]
 REM AT [now()+60] MSG [show("!")]
+REM AT [now()+60] MSG [show("?")]
 REM AT [now()+60] MSG [show("@")]
 REM AT [now()+60] MSG [show("#")]
 MSG %_Time substitutions for [now()-60] where now() = [now()]
@@ -366,6 +379,7 @@ REM AT [now()-60] MSG [show("8")]
 REM AT [now()-60] MSG [show("9")]
 REM AT [now()-60] MSG [show("0")]
 REM AT [now()-60] MSG [show("!")]
+REM AT [now()-60] MSG [show("?")]
 REM AT [now()-60] MSG [show("@")]
 REM AT [now()-60] MSG [show("#")]
 MSG %_Time substitutions for [now()+120] where now() = [now()]
@@ -380,6 +394,7 @@ REM AT [now()+120] MSG [show("8")]
 REM AT [now()+120] MSG [show("9")]
 REM AT [now()+120] MSG [show("0")]
 REM AT [now()+120] MSG [show("!")]
+REM AT [now()+120] MSG [show("?")]
 REM AT [now()+120] MSG [show("@")]
 REM AT [now()+120] MSG [show("#")]
 MSG %_Time substitutions for [now()-120] where now() = [now()]
@@ -394,6 +409,7 @@ REM AT [now()-120] MSG [show("8")]
 REM AT [now()-120] MSG [show("9")]
 REM AT [now()-120] MSG [show("0")]
 REM AT [now()-120] MSG [show("!")]
+REM AT [now()-120] MSG [show("?")]
 REM AT [now()-120] MSG [show("@")]
 REM AT [now()-120] MSG [show("#")]
 MSG %_Time substitutions for [now()+1] where now() = [now()]
@@ -408,6 +424,7 @@ REM AT [now()+1] MSG [show("8")]
 REM AT [now()+1] MSG [show("9")]
 REM AT [now()+1] MSG [show("0")]
 REM AT [now()+1] MSG [show("!")]
+REM AT [now()+1] MSG [show("?")]
 REM AT [now()+1] MSG [show("@")]
 REM AT [now()+1] MSG [show("#")]
 MSG %_Time substitutions for [now()-1] where now() = [now()]
@@ -422,6 +439,7 @@ REM AT [now()-1] MSG [show("8")]
 REM AT [now()-1] MSG [show("9")]
 REM AT [now()-1] MSG [show("0")]
 REM AT [now()-1] MSG [show("!")]
+REM AT [now()-1] MSG [show("?")]
 REM AT [now()-1] MSG [show("@")]
 REM AT [now()-1] MSG [show("#")]
 MSG %_Time substitutions for [now()+2] where now() = [now()]
@@ -436,6 +454,7 @@ REM AT [now()+2] MSG [show("8")]
 REM AT [now()+2] MSG [show("9")]
 REM AT [now()+2] MSG [show("0")]
 REM AT [now()+2] MSG [show("!")]
+REM AT [now()+2] MSG [show("?")]
 REM AT [now()+2] MSG [show("@")]
 REM AT [now()+2] MSG [show("#")]
 MSG %_Time substitutions for [now()-2] where now() = [now()]
@@ -450,6 +469,7 @@ REM AT [now()-2] MSG [show("8")]
 REM AT [now()-2] MSG [show("9")]
 REM AT [now()-2] MSG [show("0")]
 REM AT [now()-2] MSG [show("!")]
+REM AT [now()-2] MSG [show("?")]
 REM AT [now()-2] MSG [show("@")]
 REM AT [now()-2] MSG [show("#")]
 MSG %_Time substitutions for [0:00] where now() = [now()]
@@ -464,6 +484,7 @@ REM AT [0:00] MSG [show("8")]
 REM AT [0:00] MSG [show("9")]
 REM AT [0:00] MSG [show("0")]
 REM AT [0:00] MSG [show("!")]
+REM AT [0:00] MSG [show("?")]
 REM AT [0:00] MSG [show("@")]
 REM AT [0:00] MSG [show("#")]
 MSG %_Time substitutions for [1:00] where now() = [now()]
@@ -478,6 +499,7 @@ REM AT [1:00] MSG [show("8")]
 REM AT [1:00] MSG [show("9")]
 REM AT [1:00] MSG [show("0")]
 REM AT [1:00] MSG [show("!")]
+REM AT [1:00] MSG [show("?")]
 REM AT [1:00] MSG [show("@")]
 REM AT [1:00] MSG [show("#")]
 MSG %_Time substitutions for [2:00] where now() = [now()]
@@ -492,6 +514,7 @@ REM AT [2:00] MSG [show("8")]
 REM AT [2:00] MSG [show("9")]
 REM AT [2:00] MSG [show("0")]
 REM AT [2:00] MSG [show("!")]
+REM AT [2:00] MSG [show("?")]
 REM AT [2:00] MSG [show("@")]
 REM AT [2:00] MSG [show("#")]
 MSG %_Time substitutions for [3:00] where now() = [now()]
@@ -506,6 +529,7 @@ REM AT [3:00] MSG [show("8")]
 REM AT [3:00] MSG [show("9")]
 REM AT [3:00] MSG [show("0")]
 REM AT [3:00] MSG [show("!")]
+REM AT [3:00] MSG [show("?")]
 REM AT [3:00] MSG [show("@")]
 REM AT [3:00] MSG [show("#")]
 MSG %_Time substitutions for [4:00] where now() = [now()]
@@ -520,6 +544,7 @@ REM AT [4:00] MSG [show("8")]
 REM AT [4:00] MSG [show("9")]
 REM AT [4:00] MSG [show("0")]
 REM AT [4:00] MSG [show("!")]
+REM AT [4:00] MSG [show("?")]
 REM AT [4:00] MSG [show("@")]
 REM AT [4:00] MSG [show("#")]
 MSG %_Time substitutions for [5:00] where now() = [now()]
@@ -534,6 +559,7 @@ REM AT [5:00] MSG [show("8")]
 REM AT [5:00] MSG [show("9")]
 REM AT [5:00] MSG [show("0")]
 REM AT [5:00] MSG [show("!")]
+REM AT [5:00] MSG [show("?")]
 REM AT [5:00] MSG [show("@")]
 REM AT [5:00] MSG [show("#")]
 MSG %_Time substitutions for [6:00] where now() = [now()]
@@ -548,6 +574,7 @@ REM AT [6:00] MSG [show("8")]
 REM AT [6:00] MSG [show("9")]
 REM AT [6:00] MSG [show("0")]
 REM AT [6:00] MSG [show("!")]
+REM AT [6:00] MSG [show("?")]
 REM AT [6:00] MSG [show("@")]
 REM AT [6:00] MSG [show("#")]
 MSG %_Time substitutions for [7:00] where now() = [now()]
@@ -562,6 +589,7 @@ REM AT [7:00] MSG [show("8")]
 REM AT [7:00] MSG [show("9")]
 REM AT [7:00] MSG [show("0")]
 REM AT [7:00] MSG [show("!")]
+REM AT [7:00] MSG [show("?")]
 REM AT [7:00] MSG [show("@")]
 REM AT [7:00] MSG [show("#")]
 MSG %_Time substitutions for [8:00] where now() = [now()]
@@ -576,6 +604,7 @@ REM AT [8:00] MSG [show("8")]
 REM AT [8:00] MSG [show("9")]
 REM AT [8:00] MSG [show("0")]
 REM AT [8:00] MSG [show("!")]
+REM AT [8:00] MSG [show("?")]
 REM AT [8:00] MSG [show("@")]
 REM AT [8:00] MSG [show("#")]
 MSG %_Time substitutions for [9:00] where now() = [now()]
@@ -590,6 +619,7 @@ REM AT [9:00] MSG [show("8")]
 REM AT [9:00] MSG [show("9")]
 REM AT [9:00] MSG [show("0")]
 REM AT [9:00] MSG [show("!")]
+REM AT [9:00] MSG [show("?")]
 REM AT [9:00] MSG [show("@")]
 REM AT [9:00] MSG [show("#")]
 MSG %_Time substitutions for [10:00] where now() = [now()]
@@ -604,6 +634,7 @@ REM AT [10:00] MSG [show("8")]
 REM AT [10:00] MSG [show("9")]
 REM AT [10:00] MSG [show("0")]
 REM AT [10:00] MSG [show("!")]
+REM AT [10:00] MSG [show("?")]
 REM AT [10:00] MSG [show("@")]
 REM AT [10:00] MSG [show("#")]
 MSG %_Time substitutions for [11:00] where now() = [now()]
@@ -618,6 +649,7 @@ REM AT [11:00] MSG [show("8")]
 REM AT [11:00] MSG [show("9")]
 REM AT [11:00] MSG [show("0")]
 REM AT [11:00] MSG [show("!")]
+REM AT [11:00] MSG [show("?")]
 REM AT [11:00] MSG [show("@")]
 REM AT [11:00] MSG [show("#")]
 MSG %_Time substitutions for [11:59] where now() = [now()]
@@ -632,6 +664,7 @@ REM AT [11:59] MSG [show("8")]
 REM AT [11:59] MSG [show("9")]
 REM AT [11:59] MSG [show("0")]
 REM AT [11:59] MSG [show("!")]
+REM AT [11:59] MSG [show("?")]
 REM AT [11:59] MSG [show("@")]
 REM AT [11:59] MSG [show("#")]
 MSG %_Time substitutions for [12:00] where now() = [now()]
@@ -646,6 +679,7 @@ REM AT [12:00] MSG [show("8")]
 REM AT [12:00] MSG [show("9")]
 REM AT [12:00] MSG [show("0")]
 REM AT [12:00] MSG [show("!")]
+REM AT [12:00] MSG [show("?")]
 REM AT [12:00] MSG [show("@")]
 REM AT [12:00] MSG [show("#")]
 MSG %_Time substitutions for [12:01] where now() = [now()]
@@ -660,6 +694,7 @@ REM AT [12:01] MSG [show("8")]
 REM AT [12:01] MSG [show("9")]
 REM AT [12:01] MSG [show("0")]
 REM AT [12:01] MSG [show("!")]
+REM AT [12:01] MSG [show("?")]
 REM AT [12:01] MSG [show("@")]
 REM AT [12:01] MSG [show("#")]
 MSG %_Time substitutions for [13:00] where now() = [now()]
@@ -674,6 +709,7 @@ REM AT [13:00] MSG [show("8")]
 REM AT [13:00] MSG [show("9")]
 REM AT [13:00] MSG [show("0")]
 REM AT [13:00] MSG [show("!")]
+REM AT [13:00] MSG [show("?")]
 REM AT [13:00] MSG [show("@")]
 REM AT [13:00] MSG [show("#")]
 MSG %_Time substitutions for [14:00] where now() = [now()]
@@ -688,6 +724,7 @@ REM AT [14:00] MSG [show("8")]
 REM AT [14:00] MSG [show("9")]
 REM AT [14:00] MSG [show("0")]
 REM AT [14:00] MSG [show("!")]
+REM AT [14:00] MSG [show("?")]
 REM AT [14:00] MSG [show("@")]
 REM AT [14:00] MSG [show("#")]
 MSG %_Time substitutions for [15:00] where now() = [now()]
@@ -702,6 +739,7 @@ REM AT [15:00] MSG [show("8")]
 REM AT [15:00] MSG [show("9")]
 REM AT [15:00] MSG [show("0")]
 REM AT [15:00] MSG [show("!")]
+REM AT [15:00] MSG [show("?")]
 REM AT [15:00] MSG [show("@")]
 REM AT [15:00] MSG [show("#")]
 MSG %_Time substitutions for [16:00] where now() = [now()]
@@ -716,6 +754,7 @@ REM AT [16:00] MSG [show("8")]
 REM AT [16:00] MSG [show("9")]
 REM AT [16:00] MSG [show("0")]
 REM AT [16:00] MSG [show("!")]
+REM AT [16:00] MSG [show("?")]
 REM AT [16:00] MSG [show("@")]
 REM AT [16:00] MSG [show("#")]
 MSG %_Time substitutions for [17:00] where now() = [now()]
@@ -730,6 +769,7 @@ REM AT [17:00] MSG [show("8")]
 REM AT [17:00] MSG [show("9")]
 REM AT [17:00] MSG [show("0")]
 REM AT [17:00] MSG [show("!")]
+REM AT [17:00] MSG [show("?")]
 REM AT [17:00] MSG [show("@")]
 REM AT [17:00] MSG [show("#")]
 MSG %_Time substitutions for [18:00] where now() = [now()]
@@ -744,6 +784,7 @@ REM AT [18:00] MSG [show("8")]
 REM AT [18:00] MSG [show("9")]
 REM AT [18:00] MSG [show("0")]
 REM AT [18:00] MSG [show("!")]
+REM AT [18:00] MSG [show("?")]
 REM AT [18:00] MSG [show("@")]
 REM AT [18:00] MSG [show("#")]
 MSG %_Time substitutions for [19:00] where now() = [now()]
@@ -758,6 +799,7 @@ REM AT [19:00] MSG [show("8")]
 REM AT [19:00] MSG [show("9")]
 REM AT [19:00] MSG [show("0")]
 REM AT [19:00] MSG [show("!")]
+REM AT [19:00] MSG [show("?")]
 REM AT [19:00] MSG [show("@")]
 REM AT [19:00] MSG [show("#")]
 MSG %_Time substitutions for [20:00] where now() = [now()]
@@ -772,6 +814,7 @@ REM AT [20:00] MSG [show("8")]
 REM AT [20:00] MSG [show("9")]
 REM AT [20:00] MSG [show("0")]
 REM AT [20:00] MSG [show("!")]
+REM AT [20:00] MSG [show("?")]
 REM AT [20:00] MSG [show("@")]
 REM AT [20:00] MSG [show("#")]
 MSG %_Time substitutions for [21:00] where now() = [now()]
@@ -786,6 +829,7 @@ REM AT [21:00] MSG [show("8")]
 REM AT [21:00] MSG [show("9")]
 REM AT [21:00] MSG [show("0")]
 REM AT [21:00] MSG [show("!")]
+REM AT [21:00] MSG [show("?")]
 REM AT [21:00] MSG [show("@")]
 REM AT [21:00] MSG [show("#")]
 MSG %_Time substitutions for [22:00] where now() = [now()]
@@ -800,6 +844,7 @@ REM AT [22:00] MSG [show("8")]
 REM AT [22:00] MSG [show("9")]
 REM AT [22:00] MSG [show("0")]
 REM AT [22:00] MSG [show("!")]
+REM AT [22:00] MSG [show("?")]
 REM AT [22:00] MSG [show("@")]
 REM AT [22:00] MSG [show("#")]
 MSG %_Time substitutions for [23:00] where now() = [now()]
@@ -814,6 +859,7 @@ REM AT [23:00] MSG [show("8")]
 REM AT [23:00] MSG [show("9")]
 REM AT [23:00] MSG [show("0")]
 REM AT [23:00] MSG [show("!")]
+REM AT [23:00] MSG [show("?")]
 REM AT [23:00] MSG [show("@")]
 REM AT [23:00] MSG [show("#")]
 MSG %_Time substitutions for [23:59] where now() = [now()]
@@ -828,6 +874,7 @@ REM AT [23:59] MSG [show("8")]
 REM AT [23:59] MSG [show("9")]
 REM AT [23:59] MSG [show("0")]
 REM AT [23:59] MSG [show("!")]
+REM AT [23:59] MSG [show("?")]
 REM AT [23:59] MSG [show("@")]
 REM AT [23:59] MSG [show("#")]
 
@@ -857,6 +904,49 @@ msg [showmon(10)]
 msg [showmon(11)]
 msg [showmon(12)]
 
+msg %_Here are some ordinal numbers for %(LANGID):
+MSG ord(0) = [ord(0)]
+MSG ord(1) = [ord(1)]
+MSG ord(2) = [ord(2)]
+MSG ord(3) = [ord(3)]
+MSG ord(4) = [ord(4)]
+MSG ord(5) = [ord(5)]
+MSG ord(6) = [ord(6)]
+MSG ord(7) = [ord(7)]
+MSG ord(8) = [ord(8)]
+MSG ord(9) = [ord(9)]
+MSG ord(10) = [ord(10)]
+MSG ord(11) = [ord(11)]
+MSG ord(12) = [ord(12)]
+MSG ord(13) = [ord(13)]
+MSG ord(14) = [ord(14)]
+MSG ord(15) = [ord(15)]
+MSG ord(16) = [ord(16)]
+MSG ord(17) = [ord(17)]
+MSG ord(18) = [ord(18)]
+MSG ord(19) = [ord(19)]
+MSG ord(20) = [ord(20)]
+MSG ord(21) = [ord(21)]
+MSG ord(22) = [ord(22)]
+MSG ord(23) = [ord(23)]
+MSG ord(24) = [ord(24)]
+MSG ord(25) = [ord(25)]
+MSG ord(26) = [ord(26)]
+MSG ord(27) = [ord(27)]
+MSG ord(28) = [ord(28)]
+MSG ord(29) = [ord(29)]
+MSG ord(30) = [ord(30)]
+MSG ord(31) = [ord(31)]
+MSG ord(32) = [ord(32)]
+MSG ord(33) = [ord(33)]
+MSG ord(34) = [ord(34)]
+MSG ord(35) = [ord(35)]
+MSG ord(36) = [ord(36)]
+MSG ord(37) = [ord(37)]
+MSG ord(38) = [ord(38)]
+MSG ord(39) = [ord(39)]
+MSG ord(40) = [ord(40)]
+
 MSG $Ago is [$Ago]%
 MSG $Am is [$Am]%
 MSG $And is [$And]%