From 37e3d3d1d155685dcbe7178eacf6df79b35125fa Mon Sep 17 00:00:00 2001
From: Dianne Skoll <dianne@skoll.ca>
Date: Sat, 19 Mar 2022 15:17:18 -0400
Subject: [PATCH] Add $Today and $Tomorrow system variables.

---
 src/dosubst.c  |  7 ++-----
 src/globals.h  | 12 ++++++++++++
 src/var.c      |  2 ++
 tests/test.cmp |  2 ++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/dosubst.c b/src/dosubst.c
index 4eb3a66c..e5a5407a 100644
--- a/src/dosubst.c
+++ b/src/dosubst.c
@@ -29,9 +29,6 @@
 #define NL "\n"
 #endif
 
-static char TODAY[] = L_TODAY;
-static char TOMORROW[] = L_TOMORROW;
-
 #define SHIP_OUT(s) if(DBufPuts(dbuf, s) != OK) return E_NO_MEM
 
 /***************************************************************/
@@ -204,7 +201,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifndef L_NOTOMORROW_V
 	    case 'V':
 #endif
-		sprintf(s, "%s", (diff ? TOMORROW : TODAY));
+		sprintf(s, "%s", (diff ? DynamicTomorrow: DynamicToday));
 		SHIP_OUT(s);
 		done = 1;
 		break;
@@ -392,7 +389,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_O_OVER
 	    L_O_OVER
 #else
-	    if (RealToday == JulianToday) sprintf(s, " (%s)", L_TODAY);
+            if (RealToday == JulianToday) sprintf(s, " (%s)", DynamicToday);
 	    else *s = 0;
 #endif
 	    SHIP_OUT(s);
diff --git a/src/globals.h b/src/globals.h
index 9cb1dceb..bc7c569a 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -197,6 +197,18 @@ EXTERN	char	*DayName[]
 ;
 #endif
 
+EXTERN char *DynamicToday
+#ifdef MK_GLOBALS
+= L_TODAY
+#endif
+;
+
+EXTERN char *DynamicTomorrow
+#ifdef MK_GLOBALS
+= L_TOMORROW
+#endif
+;
+
 EXTERN char *DynamicDayName []
 #ifdef MK_GLOBALS
 #if LANG == ENGLISH
diff --git a/src/var.c b/src/var.c
index c7864d6d..869f717d 100644
--- a/src/var.c
+++ b/src/var.c
@@ -841,6 +841,8 @@ static SysVar SysVarArr[] = {
     {"Thursday",       1,  STR_TYPE,     &DynamicDayName[3],   0,      0,    NULL },
     {"TimeSep",        1,  SPECIAL_TYPE, time_sep_func,        0,      0,    NULL },
     {"Tm",             0,  SPECIAL_TYPE, trig_mon_func,        0,      0,    NULL },
+    {"Today",          1,  STR_TYPE,     &DynamicToday,        0,      0,    NULL },
+    {"Tomorrow",       1,  STR_TYPE,     &DynamicTomorrow,     0,      0,    NULL },
     {"Tuesday",        1,  STR_TYPE,     &DynamicDayName[1],   0,      0,    NULL },
     {"Tw",             0,  SPECIAL_TYPE, trig_wday_func,       0,      0,    NULL },
     {"Ty",             0,  SPECIAL_TYPE, trig_year_func,       0,      0,    NULL },
diff --git a/tests/test.cmp b/tests/test.cmp
index 11c6016d..12ad68a9 100644
--- a/tests/test.cmp
+++ b/tests/test.cmp
@@ -2752,6 +2752,8 @@ Variable  Value
        $Thursday  "Thursday"
         $TimeSep  ":"
              $Tm  -1
+          $Today  "today"
+       $Tomorrow  "tomorrow"
         $Tuesday  "Tuesday"
              $Tw  -1
              $Ty  -1