Update docs.

Makefile

@@ -23,8 +23,7 @@ install:
 	@$(MAKE) -C rem2html install
 	@$(MAKE) -C rem2pdf -f Makefile.top install INSTALL_BASE=$(INSTALL_BASE)
 clean:
-	find . -name '*~' -exec rm {} \;
-	-rm man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1 scripts/tkremind
+	-find . -name '*~' -exec rm {} \;
 	-$(MAKE) -C src clean
 	-$(MAKE) -C rem2pdf clean
 
@@ -44,7 +43,8 @@ test:
 	@$(MAKE) -C src -s test
 
 distclean: clean
-	rm -f config.cache config.log config.status src/Makefile 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 config.cache config.log config.status src/Makefile 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
 
 src/Makefile: src/Makefile.in
 	./configure

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

@@ -177,7 +177,7 @@
          "slide" "soleq" "stdout" "strlen" "substr" "sunrise" "sunset" "time"
          "timepart" "timezone" "today" "trig" "trigback" "trigdate"
          "trigdatetime" "trigdelta" "trigduration" "trigeventduration"
-         "trigeventstart" "trigfrom" "trigger" "trigpriority" "trigrep"
+         "trigeventstart" "trigfrom" "trigger" "triginfo" "trigpriority" "trigrep"
          "trigscanfrom" "trigtags" "trigtime" "trigtimedelta" "trigtimerep"
          "triguntil" "trigvalid" "typeof" "tzconvert" "upper" "utctolocal"
          "value" "version" "weekno" "wkday" "wkdaynum" "year")

docs/WHATSNEW

@@ -7,6 +7,10 @@ CHANGES TO REMIND
   the location and a longer description.  The intention is to make
   Remind <-> iCal conversions preserve as much information as possible.
 
+- NEW FEATURE: remind: Add the triginfo() built-in function so a reminder
+  body can refer to INFO data.  Add the %<...> substitution filter as a
+  shorthand for [triginfo("...")]
+
 - NEW FEATURE: TkRemind: Add "Location" and "Description" fields when
   creating a reminder; these are converted to INFO clauses.  Also support
   a popup window with the extra information when hovering over a reminder

man/remind.1.in

@@ -1661,6 +1661,11 @@ is replaced with "\fIyy\fR", the last two digits of the year.
 is replaced with the lookup of \fIany_text\fR in the translation table.
 It is the equivalent of [_("any_text")] but is more convenient to type.
 .TP
+.B %<\fIany_text\fR\fB>
+is replaced with the INFO value associated with the header \fIany_text\fR
+or the empty string if no such INFO value exists.  It is the
+equivalent of [triginfo("any_text")] but is more convenient to type.
+.TP
 .B %_
 (percent-underscore) is replaced with a newline.  You can use this to
 achieve multi-line reminders.  Note that calendar back-ends vary in
@@ -4292,7 +4297,23 @@ whose value is the maximum of "yyyy-mm-dd" and today.
 .B trigfrom()
 Returns (as a \fBDATE\fR type) the \fBFROM\fR parameter of the last \fBREM\fR or
 \fBIFTRIG\fR command.  If there was no \fBFROM\fR parameter, returns the integer -1.
-
+.TP
+.B triginfo(s_header)
+Returns a \fBSTRING\fR that is the INFO item associated with the header
+\fIheader\fR.  The header should \fInot\fR contain a colon.  Header name
+comparisons are case-insensitive.
+.RS
+.PP
+For example, the following will assign "At home" to the variable a and
+the empty string to variable b:
+.PP
+.nf
+        REM INFO "Location: At home" MSG test
+        SET a triginfo("location")
+        SET b triginfo("no_such_header")
+.fi
+.PP
+.RE
 .TP
 .B trigger(d_date [,t_time [,i_utcflag]]) \fRor\fB trigger(q_datetime [,i_utcflag])
 Returns a string suitable for use in a \fBREM\fR command or a

scripts/tkremind.in

@@ -2969,11 +2969,16 @@ proc DaemonReadable { file } {
                 set tag [dict get $obj tags]
             }
             set body [dict get $obj body]
+            if {[dict exists $obj info]} {
+                set info [dict get $obj info]
+            } else {
+                set info [dict create]
+            }
             set qid "*"
             if {[dict exists $obj qid]} {
                 set qid [dict get $obj qid]
             }
-            IssueBackgroundReminder $body $time $now $tag $qid
+            IssueBackgroundReminder $body $time $now $tag $qid $info
         }
         "queue" {
             set queue [dict get $obj queue]
@@ -3017,7 +3022,7 @@ proc DaemonReadable { file } {
 # Description:
 #    Reads a background reminder from daemon and pops up window.
 #---------------------------------------------------------------------------
-proc IssueBackgroundReminder { body time now tag qid } {
+proc IssueBackgroundReminder { body time now tag qid info } {
     global BgCounter Option Ignore DaemonFile HAVE_SYSNOTIFY NOTIFY_SEND_PATH
     if {$Option(Deiconify)} {
 	wm deiconify .
@@ -3046,7 +3051,7 @@ proc IssueBackgroundReminder { body time now tag qid } {
     wm iconname $w "Reminder"
     wm title $w "Timed reminder ($time)"
     label $w.l -text "Reminder for $time issued at $now"
-    message $w.msg -width 6i -text $body
+    message $w.msg -aspect 2000 -text $body -justify left -anchor w -font {-weight bold} -relief groove -bd 2
     frame $w.b
 
     # Automatically shut down window after a minute if option says so
@@ -3062,7 +3067,24 @@ proc IssueBackgroundReminder { body time now tag qid } {
 	button $w.nomore -text "Don't remind me again today" -command [list ClosePopup $w $after_token "" 1 "ignore" $tag $body $time $qid]
     }
     pack $w.l -side top
-    pack $w.msg -side top -expand 1 -fill both
+    pack $w.msg -side top -expand 1 -fill both -anchor w
+    frame $w.f
+    pack $w.f -side top -expand 1 -fill both
+    set row 0
+    if {[dict exists $info location]} {
+        label $w.f.l1 -text "Location: "  -padx 1 -pady 1 -highlightthickness 0 -relief flat -bd 0 -font {-weight bold}
+        message $w.f.l2 -text [dict get $info location] -justify left -anchor w -aspect 2000 -padx 1 -pady 1 -highlightthickness 0 -relief flat -bd 0 -font {-weight normal}
+        grid $w.f.l1 -row $row -column 0 -sticky nw
+        grid $w.f.l2 -row $row -column 1 -sticky new
+        incr row
+    }
+    if {[dict exists $info description]} {
+        label $w.f.m1 -text "Description: " -padx 1 -pady 1 -highlightthickness 0 -relief flat -bd 0 -font {-weight bold}
+        message $w.f.m2 -text [dict get $info description] -justify left -anchor w -aspect 2000 -padx 1 -pady 1 -highlightthickness 0 -relief flat -bd 0 -font {-weight normal}
+        grid $w.f.m1 -row $row -column 0 -sticky nw
+        grid $w.f.m2 -row $row -column 1 -sticky new
+        incr row
+    }
     pack $w.b -side top
     pack $w.ok -in $w.b -side left
     if {$qid != "*"} {
@@ -3678,42 +3700,22 @@ proc details_popup { pairs } {
     global Balloon
     set maxwid 80
     set h .balloonhelp
+    set c 0
     toplevel $h -bg #000000
-    text $h.l -width $maxwid -height 16 -bd 0 -wrap word -relief flat -bg #FFFFC0
-    $h.l tag configure bold -font {-weight bold}
-    $h.l tag configure medium -font {-weight normal}
+    frame $h.l -padx 0 -pady 0 -highlightthickness 0 -relief flat -bd 0 -bg #FFFFC0
+    pack $h.l -side top -padx 1 -pady 1 -ipadx 2 -ipady 1
     foreach pair $pairs {
-        $h.l insert end [lindex $pair 0] bold " " medium [lindex $pair 1] medium "\n" medium
+        label $h.lab$c -text "[lindex $pair 0] " -padx 1 -pady 1 -highlightthickness 0 -relief flat -bd 0 -bg #FFFFC0 -font {-weight bold}
+        message $h.m$c -text "[lindex $pair 1] " -justify left -anchor w -aspect 2000 -padx 1 -pady 1 -highlightthickness 0 -relief flat -bd 0 -bg #FFFFC0 -font {-weight normal}
+        grid $h.lab$c -in $h.l -row $c -column 0 -sticky nw
+        grid $h.m$c -in $h.l -row $c -column 1 -sticky new
+        incr c
     }
-    # Now calculate actual text window size
-    set wid 0
-    set height 0
-    set text [$h.l get 1.0 end]
-    set text [string trim $text]
-    set lines [split $text "\n"]
-    foreach line $lines {
-        incr height
-        set len [string length $line]
-        incr len
-        if {$len > $wid} {
-            set wid $len
-        }
-    }
-    if {$wid > $maxwid} {
-        set wid $maxwid
-    }
-    ### NOTE: I should be using "count -displaylines" to size
-    ### the window, but Tk gives the wrong answer.  I think
-    ### there is a bug in the text widget.  So we count the
-    ### number of lines and add 5 and hope for the best...
-    incr height 5
-    $h.l configure -width $wid -height $height
-    pack $h.l -padx 1 -pady 1 -ipadx 2 -ipady 1
-    $h.l configure -state disabled
+
     wm overrideredirect $h 1
     set geom [balloon_calculate_geometry $h]
     wm geometry $h $geom
-    set Balloon(HelpId) [after $Balloon(StayTime) [list catch { destroy $h }]]
+    set Balloon(HelpId) [after 10000 "catch { destroy $h }"]
     set Balloon(MustLeave) 1
 }
 

src/calendar.c

@@ -2389,7 +2389,7 @@ void WriteJSONTimeTrigger(TimeTrig const *tt)
     }
 }
 
-static void
+void
 WriteJSONInfoChain(TrigInfo *ti)
 {
     printf("\"info\":{");

src/dosubst.c

@@ -215,6 +215,33 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
         if (!c) {
             break;
         }
+        if (c == '<') {
+            DynamicBuffer header;
+            char const *val;
+            DBufInit(&header);
+
+            while(1) {
+                c = ParseChar(p, &err, 0);
+                if (err) {
+                    DBufFree(&header);
+                    return err;
+                }
+                if (!c || c == '>') {
+                    break;
+                }
+                DBufPutc(&header, c);
+            }
+            if (!c) {
+                Wprint(tr("Warning: Unterminated %%<...> substitution sequence"));
+            }
+            err = OK;
+            val = FindTrigInfo(t, DBufValue(&header));
+            DBufFree(&header);
+            if (val) {
+                SHIP_OUT(val);
+            }
+            continue;
+        }
         if (c == '(') {
             DynamicBuffer orig;
             DynamicBuffer translated;
@@ -755,6 +782,8 @@ int DoSubstFromString(char const *source, DynamicBuffer *dbuf,
     if (tim == NO_TIME) tim=MinutesPastMidnight(0);
     CreateParser(source, &tempP);
     tempP.allownested = 0;
+    tempTrig.infos = NULL;
+    DBufInit(&tempTrig.tags);
     tempTrig.typ = MSG_TYPE;
     tempTime.ttime = tim;
 

src/funcs.c

@@ -162,6 +162,7 @@ static int FTrigdate       (func_info *);
 static int FTrigdatetime   (func_info *);
 static int FTrigdelta      (func_info *);
 static int FTrigduration   (func_info *);
+static int FTriginfo       (func_info *);
 static int FTrigeventduration(func_info *);
 static int FTrigeventstart (func_info *);
 static int FTrigfrom       (func_info *);
@@ -326,6 +327,7 @@ BuiltinFunc Func[] = {
     {   "trigeventstart", 0,    0,      0,          FTrigeventstart, NULL },
     {   "trigfrom",     0,      0,      0,          FTrigfrom, NULL },
     {   "trigger",      1,      3,      0,          FTrigger, NULL },
+    {   "triginfo",     1,      1,      1,          FTriginfo, NULL },
     {   "trigpriority", 0,      0,      0,          FTrigpriority, NULL },
     {   "trigrep",      0,      0,      0,          FTrigrep, NULL },
     {   "trigscanfrom", 0,      0,      0,          FTrigscanfrom, NULL },
@@ -1620,6 +1622,17 @@ static int FTrigeventduration(func_info *info)
     return OK;
 }
 
+static int FTriginfo(func_info *info)
+{
+    char const *s;
+    ASSERT_TYPE(0, STR_TYPE);
+    s = FindTrigInfo(&LastTrigger, ARGSTR(0));
+    if (!s) {
+        return RetStrVal("", info);
+    }
+    return RetStrVal(s, info);
+}
+
 static int FTrigeventstart(func_info *info)
 {
     if (LastTrigger.eventstart == NO_TIME) {

src/main.c

@@ -145,6 +145,7 @@ int main(int argc, char *argv[])
     }
 
     DBufInit(&(LastTrigger.tags));
+    LastTrigger.infos = NULL;
     ClearLastTriggers();
 
     atexit(exitfunc);
@@ -1945,7 +1946,9 @@ void
 FreeTrig(Trigger *t)
 {
     DBufFree(&(t->tags));
-    FreeTrigInfoChain(t->infos);
+    if (t->infos) {
+        FreeTrigInfoChain(t->infos);
+    }
     t->infos = NULL;
 }
 
@@ -1972,8 +1975,7 @@ ClearLastTriggers(void)
     LastTrigger.warn[0] = 0;
     LastTrigger.omitfunc[0] = 0;
     LastTrigger.passthru[0] = 0;
-    DBufFree(&(LastTrigger.tags));
-    LastTrigger.infos = NULL;
+    FreeTrig(&LastTrigger);
     LastTimeTrig.ttime = NO_TIME;
     LastTimeTrig.delta = NO_DELTA;
     LastTimeTrig.rep   = NO_REP;
@@ -1993,10 +1995,19 @@ SaveAllTriggerInfo(Trigger const *t, TimeTrig const *tt, int trigdate, int trigt
 void
 SaveLastTrigger(Trigger const *t)
 {
-    DBufFree(&(LastTrigger.tags));
+    FreeTrig(&LastTrigger);
     memcpy(&LastTrigger, t, sizeof(LastTrigger));
+
+    /* DON'T hang on to the invalid info chain! */
+    LastTrigger.infos = NULL;
     DBufInit(&(LastTrigger.tags));
+
     DBufPuts(&(LastTrigger.tags), DBufValue(&(t->tags)));
+    TrigInfo *cur = t->infos;
+    while(cur) {
+        AppendTrigInfo(&LastTrigger, cur->info);
+        cur = cur->next;
+    }
 }
 
 void

src/protos.h

@@ -282,3 +282,5 @@ 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);

src/queue.c

@@ -474,6 +474,9 @@ void HandleQueuedReminders(void)
                     PrintJSONKeyPairString("qid", qid);
                     PrintJSONKeyPairString("ttime", SimpleTimeNoSpace(q->tt.ttime));
                     PrintJSONKeyPairString("now", SimpleTimeNoSpace(MinutesPastMidnight(1)));
+                    if (q->t.infos) {
+                        WriteJSONInfoChain(q->t.infos);
+                    }
                     PrintJSONKeyPairString("tags", DBufValue(&q->t.tags));
                 } else {
                     printf("NOTE reminder %s",

src/trigger.c

@@ -706,7 +706,9 @@ FreeTrigInfo(TrigInfo *ti)
 {
     if (ti->info) {
         free( (void *) ti->info);
+        ti->info = NULL;
     }
+    ti->next = NULL;
     free(ti);
 }
 
@@ -792,3 +794,26 @@ TrigInfoIsValid(char const *info)
     }
     return 1;
 }
+
+char const *
+FindTrigInfo(Trigger *t, char const *header)
+{
+    TrigInfo *ti;
+    size_t len;
+    char const *s;
+
+    if (!t || !header || !*header) return NULL;
+
+    ti = t->infos;
+    len = strlen(header);
+    while(ti) {
+        if (!strncasecmp(ti->info, header, len) &&
+            ti->info[len] == ':') {
+            s = ti->info + len + 1;
+            while(isspace(*s)) s++;
+            return s;
+        }
+        ti = ti->next;
+    }
+    return NULL;
+}

tests/test-rem

@@ -647,7 +647,7 @@ EOF
 
 # The INFO keyword
 ../src/remind -pp - 1 Feb 2024 <<'EOF' >> ../tests/test.out 2>&1
-REM Wed INFO "Location: here" INFO "Summary: Nope" MSG Meeting
+REM Wed INFO "Location: here" INFO "Summary: Nope" MSG Meeting [triginfo("location")] %<summary> %<nonexist> [triginfo("cabbage")]
 EOF
 
 # Invalid info strings

tests/test.cmp

@@ -24164,6 +24164,7 @@ trigeventduration
 trigeventstart
 trigfrom
 trigger
+triginfo
 trigpriority
 trigrep
 trigscanfrom
@@ -24541,6 +24542,7 @@ TRANSLATE "Warning: UNTIL/THROUGH date earlier than SCANFROM date" ""
 TRANSLATE "Warning: UNTIL/THROUGH date earlier than start date" ""
 TRANSLATE "Warning: Unable to save ONCE timestamp to %s: %s" ""
 TRANSLATE "Warning: Unterminated %%(...) substitution sequence" ""
+TRANSLATE "Warning: Unterminated %%<...> substitution sequence" ""
 TRANSLATE "Warning: Unterminated %%{...} substitution sequence" ""
 TRANSLATE "Warning: Useless use of UNTIL with fully-specified date and no *rep" ""
 TRANSLATE "Warning: Variable name `%.*s...' truncated to `%.*s'" ""
@@ -24659,10 +24661,10 @@ February 2024 29 4 0
 Sunday Monday Tuesday Wednesday Thursday Friday Saturday
 January 31
 March 31
-{"date":"2024-02-07","filename":"-","lineno":1,"info":{"location":"here","summary":"Nope"},"wd":["Wednesday"],"priority":5000,"body":"Meeting"}
-{"date":"2024-02-14","filename":"-","lineno":1,"info":{"location":"here","summary":"Nope"},"wd":["Wednesday"],"priority":5000,"body":"Meeting"}
-{"date":"2024-02-21","filename":"-","lineno":1,"info":{"location":"here","summary":"Nope"},"wd":["Wednesday"],"priority":5000,"body":"Meeting"}
-{"date":"2024-02-28","filename":"-","lineno":1,"info":{"location":"here","summary":"Nope"},"wd":["Wednesday"],"priority":5000,"body":"Meeting"}
+{"date":"2024-02-07","filename":"-","lineno":1,"info":{"location":"here","summary":"Nope"},"wd":["Wednesday"],"priority":5000,"rawbody":"Meeting [triginfo(\"location\")] %<summary> %<nonexist> [triginfo(\"cabbage\")]","body":"Meeting here Nope  "}
+{"date":"2024-02-14","filename":"-","lineno":1,"info":{"location":"here","summary":"Nope"},"wd":["Wednesday"],"priority":5000,"rawbody":"Meeting [triginfo(\"location\")] %<summary> %<nonexist> [triginfo(\"cabbage\")]","body":"Meeting here Nope  "}
+{"date":"2024-02-21","filename":"-","lineno":1,"info":{"location":"here","summary":"Nope"},"wd":["Wednesday"],"priority":5000,"rawbody":"Meeting [triginfo(\"location\")] %<summary> %<nonexist> [triginfo(\"cabbage\")]","body":"Meeting here Nope  "}
+{"date":"2024-02-28","filename":"-","lineno":1,"info":{"location":"here","summary":"Nope"},"wd":["Wednesday"],"priority":5000,"rawbody":"Meeting [triginfo(\"location\")] %<summary> %<nonexist> [triginfo(\"cabbage\")]","body":"Meeting here Nope  "}
 # rem2ps2 end
 -stdin-(1): Invalid INFO string: Must be of the form "Header: Value"
 -stdin-(2): Invalid INFO string: Must be of the form "Header: Value"