Revert "Guess terminal background even if stdout is not a tty"

This reverts commit 887cd83ebe.

configure

@@ -4174,7 +4174,7 @@ then :
 
 fi
 
-VERSION=04.02.06
+VERSION=04.02.07
 
 
 

configure.in

@@ -81,7 +81,7 @@ if test "$?" != 0 ; then
     exit 1
 fi
 AC_CHECK_FUNCS(setenv unsetenv glob mbstowcs setlocale initgroups)
-VERSION=04.02.06
+VERSION=04.02.07
 AC_SUBST(VERSION)
 AC_SUBST(PERL)
 AC_SUBST(PERLARTIFACTS)

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

@@ -514,6 +514,7 @@ Acts on the region or places point where it needs to be."
   (set (make-local-variable 'comment-start) ";")
   (set (make-local-variable 'comment-start) "#")
   (set (make-local-variable 'comment-end) "\n")
+  (set (make-local-variable 'comment-end-skip) "[ \t]*\\(\\s>\\||#\\)")
   (set (make-local-variable 'skeleton-end-hook) nil) ; so the skeletons will not automatically go to a new line.
   (set (make-local-variable 'fill-column) '100);cause I was having problems with autofill.
   (set (make-local-variable 'indent-line-function) 'remind-indent-line)

docs/WHATSNEW

@@ -1,5 +1,27 @@
 CHANGES TO REMIND
 
+* VERSION 4.2 Patch 7 - 2023-XX-XX
+
+- MINOR NEW FEATURE: remind: Attempt to obtain the terminal background
+  color using an OSC sequence.
+
+- MINOR NEW FEATURE: remind: Add "--version" long option to print out
+  Remind's version and exit.
+
+- MINOR IMPROVEMENT: tkremind: Use a higher-resolution PNG image for
+  the icon.
+
+- MINOR IMPROVEMENT: remind-conf-mode.el: Update highlighting rules
+  courtesy of Bill Benedetto
+
+- MINOR CHANGE: Make AT optional.  If we encounter a TIME in a REM
+  command, implicitly begin an AT clause.
+
+- DOCUMENTATION: Many minor fixes and improvements courtesy of Dan Jacobson.
+
+- BUG FIX: Make "-w0" set the calendar width based on standard output
+  rather than setting it to zero and causing an infinite loop.
+
 * VERSION 4.2 Patch 6 - 2023-09-12
 
 - NEW FEATURE: remind: The "nonomitted()" function takes an optional

examples/astro

@@ -8,15 +8,13 @@
 # Set this variable to 1 if your terminal has a dark background or 0 if
 # it: light.
 
-bg_dark=1
-
 # Set your latitude and longitude correctly for Sunrise/Sunset/Equinox/Solstice
 #
 # The values below are for Ottawa, Ontario, Canada
 latitude="45.420556"
 longitude="-75.689722"
 
-remind -g -ibg_dark="$bg_dark" "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
+remind -g "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
 SET $AddBlankLines 0
 BANNER %
 
@@ -24,24 +22,25 @@ INCLUDE [$SysInclude]/ansitext.rem
 
 MSG Today is [ansi_bold][$T][ansi_normal], being the [ord($T-date(year($T),1,1)+1)] day of [year($T)].%_
 
-IF bg_dark
+IF $TerminalBackground == 0
    SPECIAL COLOR 255 255 0 Sunrise:               🌅 [sunrise()] today and [sunrise($T+1)] tomorrow
    SPECIAL COLOR 255 128 0 Sunset:                🌇 [sunset()] today and [sunset($T+1)] tomorrow%_
+ELSE
+   SPECIAL COLOR 128 128 0 Sunrise:               🌅 [sunrise()] today and [sunrise($T+1)] tomorrow
+   SPECIAL COLOR 128 32 0 Sunset:                🌇 [sunset()] today and [sunset($T+1)] tomorrow%_
+
 ENDIF
 EOF
 
-remind -g -ibg_dark="$bg_dark" "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
+remind -g "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
 SET $AddBlankLines 0
 BANNER %
-IF bg_dark
+IF $TerminalBackground == 0
    REM [moondatetime(0)] +60 SPECIAL COLOR 255 255 0 New moon:              🌑 [$T] %3 (%b)
    REM [moondatetime(1)] +60 SPECIAL COLOR 255 255 128 First Quarter:         🌓 [$T] %3 (%b)
    REM [moondatetime(2)] +60 SPECIAL COLOR 255 255 255 Full moon:             🌕 [$T] %3 (%b)
    REM [moondatetime(3)] +60 SPECIAL COLOR 255 255 128 Last Quarter:          🌗 [$T] %3 (%b)
 ELSE
-   SPECIAL COLOR 128 128 0 Sunrise:               🌅 [sunrise()] today and [sunrise($T+1)] tomorrow
-   SPECIAL COLOR 128 32 0 Sunset:                🌇 [sunset()] today and [sunset($T+1)] tomorrow%_
-
    REM [moondatetime(0)] +60 SPECIAL COLOR 128 128 0 New moon:              🌑 [$T] %3 (%b)
    REM [moondatetime(1)] +60 SPECIAL COLOR 128 128 64 First Quarter:         🌓 [$T] %3 (%b)
    REM [moondatetime(2)] +60 SPECIAL COLOR 0 0 0 Full moon:             🌕 [$T] %3 (%b)
@@ -51,7 +50,7 @@ EOF
 
 echo ""
 
-remind -g -ibg_dark="$bg_dark" "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
+remind -g "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
 SET $AddBlankLines 0
 BANNER %
 

man/rem.1.in

@@ -19,4 +19,4 @@ Remind was written by Dianne Skoll <dianne@skoll.ca>
 .SH HOME PAGE
 https://dianne.skoll.ca/projects/remind/
 .SH SEE ALSO
-\fBremind\fR
+\fBremind\fR(1)

man/remind.1.in

@@ -28,6 +28,10 @@ Anything after the __EOF__ marker is completely ignored.
 \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".
 .TP
+.B \-\-version
+The \fB\-\-version\fR option causes \fBRemind\fR to print its version number
+to standard output and then exit.
+.TP
 .B \-n
 The \fB\-n\fR option causes \fBRemind\fR to print the \fBnext\fR occurrence
 of each reminder in a simple calendar format.  You can sort this by
@@ -105,11 +109,15 @@ If the optional \fIm\fR parameter is supplied following a comma, then
 \fIm\fR=0 tells \fBRemind\fR that the terminal background is dark, and
 \fBRemind\fR will brighten up dark colors to make them visible.  If
 \fIm\fR=1, then \fBRemind\fR assumes the terminal background is light
-and it will darken bright colors to make them visible.  If no \fIm\fR
-is supplied, or it is supplied as \fIm\fR=2, then \fBRemind\fR does
-not perform any adjustments, and some reminders may be hard or
-impossible to see if the color is too close to the terminal background
-color.
+and it will darken bright colors to make them visible.  If \fIm\fR is
+specified as 2, then \fBRemind\fR does not perform any adjustments,
+and some reminders may be hard or impossible to see if the color is
+too close to the terminal background color.
+.PP
+On startup, if the standard output is a terminal, \fBRemind\fR
+attempts to determine if the terminal background is dark or light by
+sending a special escape sequence to determine the background color.
+The \fIm\fR parameter can override this check.
 .PP
 If the optional \fIb\fR parameter is supplied following a comma, then
 \fIb=0\fR tells \fBRemind\fR to ignore SPECIAL SHADE reminders (the
@@ -610,6 +618,11 @@ The following examples show how date specifications are interpreted.
 .PP
 1. Null date specification - the reminder is triggered every day.
 The trigger date for a specific run is simply the current system date.
+For example:
+.PP
+.nf
+        REM MSG This is triggered every time Remind runs
+.fi
 .PP
 2. Only
 .I day
@@ -2398,6 +2411,10 @@ is normally 0, but can be set with the \fB\-tt\fR option or explicitly
 set in your script.  If \fB$DefaultDelta\fR is non-zero, you can use an
 explicit delta of +0 in an AT clause to countermand the default delta.
 .TP
+.B $DeltaOverride (read-only)
+If non-zero, corresponds to the \fIn\fR argument given to a
+\fB\-t\fR\fIn\fR command-line option.
+.TP
 .B $DontFork (read-only)
 If non-zero, then the \fB\-c\fR option was supplied on the command line.
 .TP
@@ -2464,7 +2481,8 @@ or a date different from today's true date was supplied.  If non-zero,
 then \fBONCE\fR directives will be ignored.
 .TP
 .B $InfDelta (read-only)
-If non-zero, then the \fB\-t\fR option was supplied on the command line.
+If non-zero, then the \fB\-t\fR option was supplied on the command line,
+with no \fIn\fR argument.
 .TP
 .B $IntMax (read-only)
 The largest representable \fBINT\fR.  On a machine with 32-bit signed integers
@@ -2708,9 +2726,13 @@ Set to 1 if the \fB\-@1\fR option was used; 0 otherwise.
 Set to 1 if the \fB\-@2\fR option was used; 0 otherwise.
 .TP
 .B $TerminalBackground (read-only)
-Returns -1 if the terminal background color was not specified,
-0 if it was specified as dark with the \fB\-@,0\fR option or
-1 if it was specified as light with the \fB\-@,1\fR option.
+Returns -1 if the terminal background color could not be determined, 0
+if it was found to be dark (or was specified as dark with the
+\fB\-@,0\fR option) or 1 if it was found to be light (or specified as
+light with the \fB\-@,1\fR option.)  The terminal background is considered
+to be "dark" if the average of the red, green and blue components is
+at most 85 out of 255, and if the maximum of any component is at most
+128 out of 255.
 .PP
 Note:  If any of the calendar modes are in effect, then the
 values of $Daemon, $DontFork, $DontTrigAts, $DontQueue, $HushMode,
@@ -3294,7 +3316,7 @@ This function returns the number of \fInon-\fRomitted days between
 counted.  \fIend\fR is never counted.
 .RS
 .PP
-Note that if \fIend\fR is less than \ffIstart\fR, the arguments
+Note that if \fIend\fR is less than \fIstart\fR, the arguments
 are effectively swapped, so counting always begins from the older
 date.
 .PP
@@ -5816,6 +5838,25 @@ components, then \fBRemind\fR will correctly compute a trigger date, even
 if it happens to be before the start of scanning.
 Note that this behaviour is not true for
 versions of \fBRemind\fR prior to 03.00.01.
+.SH FILES
+.PP
+The traditional location of your reminders file or directory is:
+.PP
+.nf
+        $HOME/.reminders
+.fi
+.PP
+where \fB$HOME\fR is your home directory.
+.PP
+Remind ships with some preinstalled files for holidays and language
+packs.  These are located in the following directory:
+.PP
+.nf
+        @prefix@/share/remind/
+.fi
+.PP
+Do not hard-code the above directory in your reminder files.  Instead,
+use the value of the $SysInclude system variable.
 .SH AUTHOR
 .PP
 Dianne Skoll <dianne@skoll.ca> wrote \fBRemind\fR.  The moon code
@@ -5866,6 +5907,8 @@ Rafa Couto
 Bj\(:orn Dav\('i\[Sd]sson
 .SH BUGS
 .PP
+If you find a bug in Remind, please report it to: dianne@skoll.ca
+.PP
 There's no good reason why read-only system variables are not
 implemented as functions, or why functions like \fBversion()\fR, etc.
 are not implemented as read-only system variables.
@@ -5888,6 +5931,8 @@ Richard Siegel and Michael and Sharon Strassfeld, \fIThe First Jewish
 Catalog\fR, Jewish Publication Society of America.
 .SH HOME PAGE
 https://dianne.skoll.ca/projects/remind/
+.SH MAILING LIST
+https://dianne.skoll.ca/mailman/listinfo/remind-fans
 .SH SEE ALSO
 .PP
 \fBrem\fR(1), \fBrem2ps\fR(1), \fBrem2pdf\fR(1), \fBtkremind\fR(1), \fBrem2html\fR(1)

scripts/tkremind

@@ -29,31 +29,62 @@ set Hostname [exec hostname]
 # Our icon photo
 catch {
     image create photo rpicon -data {
-R0lGODlhFwAgAOecABUTERYTERYUERcVEhgWExkXFBkXFRoXFRsZFhwZFxwa
-GB0bGR4cGR4cGh8dGiAeHCEfHCEfHSIgHSIgHiQiHyYkISknJCooJispJywq
-Jy4sKTIwLjUzMDUzMTo4Njs5Nzs5ODw7ODw7OT07OT48OkE/PUJAPkNBP0RC
-QEVDQUVEQkdFQ0lIRkpJR01LSU5MSlBPTVFQTlNSUFRSUFRSUVVTUlVUUllY
-VltZV1xaWF1cWmBfXmJgX2RiYGZlY2dmZGppZ2tqaG1ram9tbHFwb3Jwb3Rz
-cXV0c3Z0c3Z1c3Z1dHd1dHh2dXh3dnt5eHx7eXx7en18en59e4B/foGAf4KB
-f4SDgYWEgoWEg4eGhIiHhouKiI2Mio6Ni46NjJCQj5KRkJSTkZeWlpiXlpmY
-l5qZmJybmp6dnKCfnqGgoKKhoKOioaSjoqinp6qpqKurqq+urbCvrrCwr7Gw
-r7OysbW1tLi3tri3t7u6ur28vMTDw8TEw8XFxMbFxcfGxsfHxsrJycrKyczM
-y83My83MzM3NzdDQz9LR0dPS0tPT09fX19jY19ra2dvb29zc29zc3Ojn5+jo
-6Orq6uzs7O/v7/T09PX19fb29vf39/r6+vv7+/7+/v//////////////////
-////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////
-/////////////////////yH5BAEKAP8ALAAAAAAXACAAAAj+AP8JHEiwoMGD
-CAcusRAAQEKDBQIcEBAAwUODAQJAsBGAwsWCBzJuUBLgI0ENGVM2dACg5UWV
-KU+Y/JfRQBknPoq8ATQz4wxOQIFa6vMx5ZSgQetczJDSClKgcF6mFDEnE9I2
-D0fADOChUdA1D7dmTBEUTditDQRQAnomIQaxICpoAmomoUoAGS2YIBIUDEIu
-YndI8FAJaBaEMlIuSEkloxugUBBOSLkh44AvGfkAPYJQpYqMLIQEILB205DO
-KW9kJHMhQAmgkaKgzsgjggM5GbEAxaNmdoAPOoz8CCAgEVAtg3wPEPMnQQAU
-QWsg5AAzDZSMbIBeaoHwAUwSDAI2XMAENA8ThAPEBvAStEkc3yonrOW0aUMk
-+BkBVAlaKATC8Fsp8Igid5ABgxMHtaTgggy6ZFBAADs=    }
+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 }
 
     wm iconphoto . -default rpicon
 }

src/dorem.c

@@ -350,6 +350,16 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    if (r) return r;
 	    break;
 
+        /* A time implicitly introduces an AT if AT is not explicit */
+        case T_Time:
+            DBufFree(&buf);
+            if (tim->ttime != NO_TIME) return E_TIME_TWICE;
+            tim->ttime = tok.val;
+            r = ParseTimeTrig(s, tim, save_in_globals);
+            if (r) return r;
+	    trig->duration_days = ComputeTrigDuration(tim);
+	    break;
+
 	case T_At:
 	    DBufFree(&buf);
 	    r=ParseTimeTrig(s, tim, save_in_globals);

src/funcs.c

@@ -3574,6 +3574,8 @@ rows_or_cols(func_info *info, int want_rows)
     struct winsize w;
     int fd = STDOUT_FILENO;
 
+    int opened = 0;
+
     RetVal.type = INT_TYPE;
     if (!isatty(fd)) {
         fd = open("/dev/tty", O_RDONLY);
@@ -3581,6 +3583,7 @@ rows_or_cols(func_info *info, int want_rows)
             RETVAL = -1;
             return OK;
         }
+        opened = 1;
     }
     if (ioctl(fd, TIOCGWINSZ, &w) == 0) {
         if (want_rows) RETVAL = w.ws_row;
@@ -3588,7 +3591,7 @@ rows_or_cols(func_info *info, int want_rows)
     } else {
         RETVAL = -1;
     }
-    if (fd != STDOUT_FILENO) {
+    if (opened) {
         close(fd);
     }
     return OK;

src/init.c

@@ -25,10 +25,11 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
-
+#include <poll.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#include <termios.h>
 
 #ifdef HAVE_INITGROUPS
 #include <grp.h>
@@ -40,6 +41,12 @@
 #include "expr.h"
 #include "err.h"
 
+static void guess_terminal_background(int *r, int *g, int *b);
+static int tty_init(int fd);
+static void tty_raw(int fd);
+static void tty_reset(int fd);
+
+static void ProcessLongOption(char const *arg);
 /***************************************************************
  *
  *  Command line options recognized:
@@ -167,6 +174,16 @@ void InitRemind(int argc, char const *argv[])
     int x;
     int dse;
     int ttyfd;
+    int r, g, b;
+
+    guess_terminal_background(&r, &g, &b);
+    if (r >= 0 && g >= 0 && b >= 0) {
+        if (r+g+b <= 85*3 && r <= 128 && g <= 128 && b <= 128) {
+            TerminalBackground = TERMINAL_BACKGROUND_DARK;
+        } else {
+            TerminalBackground = TERMINAL_BACKGROUND_LIGHT;
+        }
+    }
 
     dse = NO_DATE;
 
@@ -243,6 +260,11 @@ void InitRemind(int argc, char const *argv[])
                 while(*arg) arg++;
                 break;
 
+            case '-':
+                ProcessLongOption(arg);
+                while(*arg) arg++;
+                break;
+
 	    case '@':
 		UseVTColors = 1;
 		if (*arg) {
@@ -265,7 +287,7 @@ void InitRemind(int argc, char const *argv[])
                         } else if (x == 1) {
                             TerminalBackground = TERMINAL_BACKGROUND_LIGHT;
                         } else if (x == 2) {
-                            TerminalBackground = TERMINAL_BACKGROUND_UNKNOWN;
+                            /* do nothing */
                         } else {
                             fprintf(ErrFp, "%s: -@n,m,b: m must be 0, 1 or 2 (assuming 2)\n",
                                     argv[0]);
@@ -537,7 +559,7 @@ void InitRemind(int argc, char const *argv[])
                         arg++;
                         /* -wt means get width from /dev/tty */
                         ttyfd = open("/dev/tty", O_RDONLY);
-                        if (!ttyfd) {
+                        if (ttyfd < 0) {
                             fprintf(stderr, "%s: `-wt': Cannot open /dev/tty: %s\n",
                                     argv[0], strerror(errno));
                         } else {
@@ -548,7 +570,12 @@ void InitRemind(int argc, char const *argv[])
                         PARSENUM(CalWidth, arg);
                         if (CalWidth != 0 && CalWidth < 71) CalWidth = 71;
                         if (CalWidth == 0) {
-                            CalWidth = -1;
+                            /* Cal width of 0 means obtain from stdout */
+                            if (isatty(STDOUT_FILENO)) {
+                                InitCalWidthAndFormWidth(STDOUT_FILENO);
+                            } else {
+                                CalWidth = 80;
+                            }
                         }
                         FormWidth = CalWidth - 8;
                         if (FormWidth < 20) FormWidth = 20;
@@ -958,3 +985,114 @@ AddTrustedUser(char const *username)
     NumTrustedUsers++;
 }
 
+static void
+ProcessLongOption(char const *arg)
+{
+    if (!strcmp(arg, "version")) {
+        printf("%s\n", VERSION);
+        exit(0);
+    }
+    fprintf(ErrFp, "%s: Unknown long option --%s\n", ArgV[0], arg);
+}
+
+static void
+guess_terminal_background(int *r, int *g, int *b)
+{
+    int ttyfd;
+    struct pollfd p;
+    int rr, gg, bb;
+    char buf[128];
+    int n;
+
+    *r = -1;
+    *g = -1;
+    *b = -1;
+
+    /* Don't guess if stdout not a terminal */
+    if (!isatty(STDOUT_FILENO)) {
+        return;
+    }
+
+    ttyfd = open("/dev/tty", O_RDWR);
+    if (ttyfd < 0) {
+        return;
+    }
+
+    if (!isatty(ttyfd)) {
+        /* Not a TTY: Can't guess the color */
+        close(ttyfd);
+        return;
+    }
+
+    if (!tty_init(ttyfd)) {
+        return;
+    }
+    tty_raw(ttyfd);
+    write(ttyfd, "\033]11;?\033\\", 8);
+
+    /* Wait up to 0.1s for terminal to respond */
+    p.fd = ttyfd;
+    p.events = POLLIN;
+    if (poll(&p, 1, 100) < 0) {
+        tty_reset(ttyfd);
+        close(ttyfd);
+        return;
+    }
+    if (!p.revents & POLLIN) {
+        tty_reset(ttyfd);
+        close(ttyfd);
+        return;
+    }
+    n = read(ttyfd, buf, 127);
+    if (n <= 0) {
+        tty_reset(ttyfd);
+        close(ttyfd);
+        return;
+    }
+    tty_reset(ttyfd);
+    buf[n+1] = 0;
+    if (n < 25) {
+        /* Too short */
+        return;
+    }
+    if (sscanf(buf+5, "rgb:%x/%x/%x", &rr, &gg, &bb) != 3) {
+        /* Couldn't scan color codes */
+        return;
+    }
+    *r = (rr >> 8) & 255;
+    *g = (gg >> 8) & 255;
+    *b = (bb >> 8) & 255;
+}
+
+static struct termios orig_termios;
+
+static int
+tty_init(int fd)
+{
+    if (tcgetattr(fd, &orig_termios) < 0) {
+        return 0;
+    }
+    return 1;
+}
+
+static void
+tty_raw(int fd)
+{
+    struct termios raw;
+
+    raw = orig_termios;
+
+    raw.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON);
+    raw.c_oflag &= ~(OPOST);
+    raw.c_cflag |= (CS8);
+    raw.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG);
+
+    /* put terminal in raw mode after flushing */
+    tcsetattr(fd,TCSAFLUSH,&raw);
+}
+
+static void
+tty_reset(int fd)
+{
+    tcsetattr(fd, TCSAFLUSH, &orig_termios);
+}

tests/test-rem

@@ -437,6 +437,9 @@ rm -rf include_dir/ww
 # This segfaulted in 04.02.03
 ../src/remind -h '-imsgprefix(x)="foo"' /dev/null >> ../tests/test.out 2>&1
 
+# Test --version long option
+../src/remind --version >> ../tests/test.out 2>&1
+
 # Remove references to SysInclude, which is build-specific
 grep -F -v '$SysInclude' < ../tests/test.out > ../tests/test.out.1 && mv -f ../tests/test.out.1 ../tests/test.out
 cmp -s ../tests/test.out ../tests/test.cmp

tests/test.cmp

@@ -1060,7 +1060,7 @@ set a057 value("a05"+"6")
 "a05" + "6" => "a056"
 value("a056") => "SDFJHSDF KSJDFH KJSDFH KSJDFH"
 set a058 version()
-version() => "04.02.06"
+version() => "04.02.07"
 set a059 wkday(today())
 today() => 1991-02-16
 wkday(1991-02-16) => "Saturday"
@@ -2644,7 +2644,7 @@ a086  4
 a109  2012-01-01
 a128  2018-02-03@16:45
 a039  "February"
-a058  "04.02.06"
+a058  "04.02.07"
 a077  "1992 92\n"
 a096  -4
 a119  -1
@@ -11695,3 +11695,4 @@ Can't open file: include_dir/ww
 Error reading include_dir/ww: Can't open file
 SECURITY: Won't read world-writable file or directory!
 Error reading include_dir/ww: No files matching *.rem
+04.02.07