mirror of
https://salsa.debian.org/dskoll/remind.git
synced 2026-04-23 09:42:56 +02:00
Compare commits
23 Commits
05.00.04
...
5b7d4a07ec
| Author | SHA1 | Date | |
|---|---|---|---|
| 5b7d4a07ec | |||
| 8c3d2c4003 | |||
| f485d607ff | |||
| a0effa5f0b | |||
| 7d501cda6f | |||
| 5d7f55c8d5 | |||
| 097bf92bea | |||
| b9dea59206 | |||
| 46aa144b65 | |||
| 914971308d | |||
| a22e81040f | |||
| 72f74f03cf | |||
| d0e45e727e | |||
| ce2b2e80da | |||
| 11771b7d3d | |||
| 01cb028532 | |||
| 58b6f43b9c | |||
| 1dedb667e8 | |||
| 8a96236788 | |||
| 2a13163659 | |||
| 336a9684d4 | |||
| 86945c6e18 | |||
| 684280db5e |
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.71 for remind 05.00.04.
|
||||
# Generated by GNU Autoconf 2.71 for remind 05.00.05.
|
||||
#
|
||||
#
|
||||
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
|
||||
@@ -608,8 +608,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='remind'
|
||||
PACKAGE_TARNAME='remind'
|
||||
PACKAGE_VERSION='05.00.04'
|
||||
PACKAGE_STRING='remind 05.00.04'
|
||||
PACKAGE_VERSION='05.00.05'
|
||||
PACKAGE_STRING='remind 05.00.05'
|
||||
PACKAGE_BUGREPORT=''
|
||||
PACKAGE_URL='https://dianne.skoll.ca/projects/remind/'
|
||||
|
||||
@@ -1264,7 +1264,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures remind 05.00.04 to adapt to many kinds of systems.
|
||||
\`configure' configures remind 05.00.05 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1326,7 +1326,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of remind 05.00.04:";;
|
||||
short | recursive ) echo "Configuration of remind 05.00.05:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1414,7 +1414,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
remind configure 05.00.04
|
||||
remind configure 05.00.05
|
||||
generated by GNU Autoconf 2.71
|
||||
|
||||
Copyright (C) 2021 Free Software Foundation, Inc.
|
||||
@@ -1864,7 +1864,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by remind $as_me 05.00.04, which was
|
||||
It was created by remind $as_me 05.00.05, which was
|
||||
generated by GNU Autoconf 2.71. Invocation command line was
|
||||
|
||||
$ $0$ac_configure_args_raw
|
||||
@@ -4703,7 +4703,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by remind $as_me 05.00.04, which was
|
||||
This file was extended by remind $as_me 05.00.05, which was
|
||||
generated by GNU Autoconf 2.71. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -4768,7 +4768,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config='$ac_cs_config_escaped'
|
||||
ac_cs_version="\\
|
||||
remind config.status 05.00.04
|
||||
remind config.status 05.00.05
|
||||
configured by $0, generated by GNU Autoconf 2.71,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_INIT(remind, 05.00.04, , , https://dianne.skoll.ca/projects/remind/)
|
||||
AC_INIT(remind, 05.00.05, , , https://dianne.skoll.ca/projects/remind/)
|
||||
AC_CONFIG_SRCDIR([src/queue.c])
|
||||
|
||||
cat <<'EOF'
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
The upstream GitHub project for ical2rem is:
|
||||
|
||||
https://github.com/jbalcorn/ical2rem
|
||||
@@ -0,0 +1,21 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2019 Justin B. Alcorn
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
@@ -0,0 +1,103 @@
|
||||
# ical2rem
|
||||
The original iCal to Remind script, first released in 2005.
|
||||
|
||||
Reads iCal files and outputs remind-compatible files. Tested ONLY with
|
||||
calendar files created by Mozilla Calendar/Sunbird. Use at your own risk.
|
||||
|
||||
## License
|
||||
In 2005, this was released with the Gnu Public License V2. However, I am changing it to the MIT License, since that provides greater freedom to do with this code what you want.
|
||||
|
||||
Copyright (c) 2005, 2007, 2019 Justin B. Alcorn
|
||||
|
||||
## How I use Remind and Google Calendar together
|
||||
|
||||
- My family has a Google Email domain, and our email addresses all end in the same domain. We all use Google Calendars and I want to mail reminders to each of the family members containing both Google Calendar and .reminder information.
|
||||
- Under my ~/.rem/ directory each family member has a directory. Each directory contains a standard remind file called 'reminders' that at the very least has the line "INCLUDE /home/jalcorn/.rem/<username>/ical2rem" and flag files indicating whether they want Daily or Weekly reminders. My reminders files references my standard .reminders file, and I also have a flag so if I run a Test run I'll get it. There's actually a lot more files (I have a big family).
|
||||
````
|
||||
./rem
|
||||
./son1:
|
||||
drwxrwxr-x 2 jalcorn jalcorn 4096 Dec 12 14:02 .
|
||||
drwxr-xr-x 12 jalcorn jalcorn 4096 Dec 12 14:13 ..
|
||||
-rw-rw-r-- 1 jalcorn jalcorn 51 Mar 3 06:10 ical2rem
|
||||
lrwxrwxrwx 1 jalcorn jalcorn 33 Oct 27 2016 son1.ics -> /home/jalcorn/calendars/son1.ics
|
||||
-rw-rw-r-- 1 jalcorn jalcorn 976 Dec 12 14:02 reminders
|
||||
-rw-rw-r-- 1 jalcorn jalcorn 0 Oct 27 2016 Weekly
|
||||
|
||||
./justin:
|
||||
drwxrwxr-x 2 jalcorn jalcorn 4096 Feb 27 08:29 .
|
||||
drwxr-xr-x 12 jalcorn jalcorn 4096 Dec 12 14:13 ..
|
||||
lrwxrwxrwx 1 jalcorn jalcorn 32 Oct 27 2016 son1.ics -> /home/jalcorn/calendars/son1.ics
|
||||
-rw-rw-r-- 1 jalcorn jalcorn 0 Nov 7 2016 Daily
|
||||
lrwxrwxrwx 1 jalcorn jalcorn 34 Oct 27 2016 family.ics -> /home/jalcorn/calendars/family.ics
|
||||
-rw-rw-r-- 1 jalcorn jalcorn 37320 Mar 3 06:10 ical2rem
|
||||
lrwxrwxrwx 1 jalcorn jalcorn 34 Oct 27 2016 justin.ics -> /home/jalcorn/calendars/justin.ics
|
||||
lrwxrwxrwx 1 jalcorn jalcorn 24 Nov 7 2016 reminders -> /home/jalcorn/.reminders
|
||||
lrwxrwxrwx 1 jalcorn jalcorn 34 Oct 27 2016 vmd.ics -> /home/jalcorn/calendars/vmd.ics
|
||||
-rw-rw-r-- 1 jalcorn jalcorn 0 Oct 27 2016 Test
|
||||
-rw-rw-r-- 1 jalcorn jalcorn 0 Nov 7 2016 Weekly
|
||||
````
|
||||
- bin/getgooglecals.sh runs out of crontab and downloads whatever calendars I want. Note that we can also download organization calendars, I've included a public one here (Cleveland Heights Vocal Music Department calendar).
|
||||
- dailyreminders.sh is linked to weeklyreminders.sh and testreminders.sh so I can run it in different modes. The concatenate the various calendar outputs as a single remind file then send the reminders via email.
|
||||
### Example: .rem/son1/reminders file:
|
||||
````
|
||||
INCLUDE /home/jalcorn/.rem/defs.rem
|
||||
INCLUDE /home/jalcorn/.rem/float
|
||||
INCLUDE /home/jalcorn/.rem/son1/ical2rem
|
||||
fset _weeks() coerce("STRING", (trigdate()-today())/7) + plural((trigdate()-today())/7, " week")
|
||||
FSET _sfun(x) choose(x, -60, 30, 5, 0)
|
||||
FSET oldfloat(y,m,d) trigger(MAX(realtoday(), date(y,m,d)))
|
||||
FSET due(y,m,d) "(" + (date(y,m,d)-trigdate()) + ")"
|
||||
SET fullmoon moondate(2)
|
||||
REM [trigger(realtoday())] SPECIAL SHADE 145 70 100 %
|
||||
REM [float(2019,4,15,105)] MSG File tax return [due(2017,4,15)]%
|
||||
REM PRIORITY 9999 MSG %"%"%
|
||||
INCLUDE /home/jalcorn/.rem/bdays
|
||||
SET $LongDeg 81
|
||||
SET $LongMin 11
|
||||
SET $LongSec 11
|
||||
SET $LatDeg 41
|
||||
SET $LatMin 11
|
||||
SET $LatSec 11
|
||||
REM [trigger(moondate(2))] +1 MSG %"Full Moon%" %b%
|
||||
fset _srtd() coerce("STRING", _no_lz(_am_pm(sunrise(today()))))
|
||||
fset _sstd() coerce("STRING", _no_lz(_am_pm(sunset(today()))))
|
||||
MSG Sun is up today from [_srtd()] to [_sstd()].%"%"%
|
||||
````
|
||||
## Revision History
|
||||
### Version 0.7 2024-09-04
|
||||
- ISSUE 8: New version of remind complains if _sfun isn't defined. Output a header
|
||||
to define a function that does nothing if the function doesn't exist.
|
||||
### Version 0.6 2019-03-01
|
||||
- Publish on GitHub and change license to MIT License
|
||||
- Add supporting files and explanation of how I use it
|
||||
### version 0.5.2 2007-03-23
|
||||
- BUG: leadtime for recurring events had a max of 4 instead of DEFAULT_LEAD_TIME
|
||||
- remove project-lead-time, since Category was a non-standard attribute
|
||||
- NOTE: There is a bug in iCal::Parser v1.14 that causes multiple calendars to
|
||||
fail if a calendar with recurring events is followed by a calendar with no
|
||||
recurring events. This has been reported to the iCal::Parser author.
|
||||
### version 0.5.1 2007-03-21
|
||||
- BUG: Handle multiple calendars on STDIN
|
||||
- add --heading option for priority on section headers
|
||||
### version 0.5 2007-03-21
|
||||
- Add more help options
|
||||
- --project-lead-time option
|
||||
- Supress printing of heading if there are no todos to print
|
||||
### version 0.4
|
||||
- Version 0.4 changes all written or inspired by, and thanks to Mark Stosberg
|
||||
- Change to GetOptions
|
||||
- Change to pipe
|
||||
- Add --label, --help options
|
||||
- Add Help Text
|
||||
- Change to subroutines
|
||||
- Efficiency and Cleanup
|
||||
### version 0.3
|
||||
- Convert to GPL (Thanks to Mark Stosberg)
|
||||
- Add usage
|
||||
### version 0.2
|
||||
- add command line switches
|
||||
- add debug code
|
||||
- add SCHED _sfun keyword
|
||||
- fix typos
|
||||
### version 0.1 - ALPHA CODE.
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
#!/usr/bin/perl -w
|
||||
#
|
||||
# cal_futureonly.pl -
|
||||
# Reads iCal files and outputs events between 1 month ago and 1 year from now.
|
||||
# Copyright (c) 2005, 2007, 2019 Justin B. Alcorn
|
||||
|
||||
=head1 SYNOPSIS
|
||||
|
||||
cal_futureonly.pl --file=filname.ics > output.ics
|
||||
|
||||
--help Usage
|
||||
--man Complete man page
|
||||
--infile (REQUIRED) name of input calendar file
|
||||
--file (REQUIRED) name of output calendar file
|
||||
|
||||
Expects an ICAL stream on STDIN. Converts it to the format
|
||||
used by the C<remind> script and prints it to STDOUT.
|
||||
|
||||
=head2 --infile
|
||||
|
||||
Input file
|
||||
|
||||
=head2 --file
|
||||
|
||||
Output File
|
||||
|
||||
=cut
|
||||
|
||||
use strict;
|
||||
use Data::ICal;
|
||||
use Data::ICal::Entry;
|
||||
use DateTime::Span;
|
||||
use Data::ICal::DateTime;
|
||||
use DateTime;
|
||||
use Getopt::Long 2.24 qw':config auto_help';
|
||||
use Pod::Usage;
|
||||
use Data::Dumper;
|
||||
use vars '$VERSION';
|
||||
$VERSION = "0.1";
|
||||
|
||||
my $help;
|
||||
my $man;
|
||||
my $infile;
|
||||
my $file;
|
||||
my $debug = 0;
|
||||
|
||||
GetOptions (
|
||||
"help|?" => \$help,
|
||||
"man" => \$man,
|
||||
"debug" => \$debug,
|
||||
"infile=s" => \$infile,
|
||||
"file=s" => \$file
|
||||
);
|
||||
pod2usage(1) if $help;
|
||||
pod2usage(1) if (! $file);
|
||||
pod2usage(-verbose => 2) if $man;
|
||||
|
||||
my $limit = DateTime->now();
|
||||
$limit->subtract( months => 1);
|
||||
my $endlimit = DateTime->now()->add(years =>1);
|
||||
print STDERR "including events from: ",$limit->ymd," to: ".$endlimit->ymd,"\n" if $debug;
|
||||
my $span = DateTime::Span->from_datetimes( start => $limit, end => $endlimit );
|
||||
print STDERR "Parsing $infile\n" if $debug;
|
||||
my $cal = Data::ICal->new(filename => $infile);
|
||||
if (! $cal) {
|
||||
die "Died Trying to read $infile :".$cal->error_message;
|
||||
}
|
||||
#my $archive = Data::ICal->new(filename => 'archive.ics');
|
||||
print "Output = $file\n" if $debug;
|
||||
my $new = Data::ICal->new();
|
||||
if (! $new) {
|
||||
die $new->error_message;
|
||||
}
|
||||
|
||||
my @events = $cal->events($span);
|
||||
$new->add_entries(@events);
|
||||
|
||||
open(NEW, ">$file");
|
||||
print NEW $new->as_string;
|
||||
close NEW;
|
||||
exit 0;
|
||||
#:vim set ft=perl ts=4 sts=4 expandtab :
|
||||
@@ -0,0 +1,45 @@
|
||||
#!/bin/bash
|
||||
|
||||
r=`basename $0`
|
||||
|
||||
if [ $r == 'weeklyreminders.sh' ];
|
||||
then
|
||||
t=14;
|
||||
w=Weekly;
|
||||
elif [ $r == 'dailyreminders.sh' ];
|
||||
then
|
||||
t=3;
|
||||
w=Daily;
|
||||
else
|
||||
t=5
|
||||
w=Test;
|
||||
fi
|
||||
|
||||
cd .rem
|
||||
for d in * ;
|
||||
do
|
||||
if [ "$( ls -A $d/$w 2>/dev/null )" ];
|
||||
then
|
||||
echo "Sending a $w reminder to $d"
|
||||
ft=/tmp/$d-t-$$.txt
|
||||
f=/tmp/$d-$$.txt
|
||||
echo "Reminders for next $t days:" >> $f
|
||||
cat /dev/null > $d/ical2rem
|
||||
for c in $d/*.ics
|
||||
do
|
||||
calname=`basename $c .ics | tr a-z A-Z`
|
||||
cat $c 2>/dev/null | sed -e "s/^SUMMARY:/SUMMARY: {${calname}} /" \
|
||||
| sed -e 's/DT\([A-Z]*\);TZID=UTC:\([0-9T]*\)/DT\1:\2Z/' >> $ft
|
||||
done
|
||||
cat $ft | ~/bin/ical2rem.pl --label "Online Calendar" --heading "PRIORITY 9999" --lead-time $t >> $d/ical2rem
|
||||
if [ -e $d/reminders ];then r="${d}/reminders"; else r="${d}/ical2rem";fi
|
||||
/usr/bin/remind -q -iplain=1 $r >> $f
|
||||
echo "
|
||||
All calendars can be accessed by logging into https://calendar.google.com/ as $d@jalcorn.net
|
||||
" >> $f
|
||||
cat $f | mail -s "$w Reminders for $d" $d@jalcorn.net;
|
||||
cat $f
|
||||
rm $f
|
||||
rm $ft
|
||||
fi;
|
||||
done
|
||||
@@ -0,0 +1,21 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Get google calendars, fix issues caused by changes in Google calendars, and remove all past events.
|
||||
#
|
||||
# Obviously, I've removed the private hashes from private calendars.
|
||||
#
|
||||
cd ~/calendars
|
||||
wget -q -O full/justin.ics --no-check-certificate https://www.google.com/calendar/ical/jbalcorn\%40gmail.com/private-aaaaaaaaaaaaaaaaaaaaaaaaaa/basic.ics
|
||||
wget -q -O full/family.ics --no-check-certificate https://www.google.com/calendar/ical/jalcorn.net_aaaaaaaaaaaaaaaaaaaaaaaaaa\%40group.calendar.google.com/private-6c42a79dec0b3b3bb7b9b0ebf9776bc1/basic.ics
|
||||
wget -q -O full/son1.ics --no-check-certificate https://www.google.com/calendar/ical/son1\%40jalcorn.net/private-aaaaaaaaaaaaaaaaaaaaaaaaaa/basic.ics
|
||||
wget -q -O full/vmd.ics --no-check-certificate https://calendar.google.com/calendar/ical/chuh.org_0pmkefjkiqc4snoel7occlslh8%40group.calendar.google.com/public/basic.ics
|
||||
|
||||
for i in full/*.ics;do
|
||||
cat $i 2>/dev/null | sed -e 's/DT\([A-Z]*\);TZID=UTC:\([0-9T]*\)/DT\1:\2Z/' > /tmp/temp.ics
|
||||
cp /tmp/temp.ics $i
|
||||
done
|
||||
|
||||
~/bin/cal_futureonly.pl --infile=full/justin.ics --file=justin.ics
|
||||
~/bin/cal_futureonly.pl --infile=full/family.ics --file=family.ics
|
||||
~/bin/cal_futureonly.pl --infile=full/son1.ics --file=son1.ics
|
||||
~/bin/cal_futureonly.pl --infile=full/vmd.ics --file=vmd.ics
|
||||
@@ -19,7 +19,8 @@
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
#
|
||||
# version 0.6 2019-03-01
|
||||
# - Updates to put on GitHub
|
||||
# version 0.5.2 2007-03-23
|
||||
# - BUG: leadtime for recurring events had a max of 4 instead of DEFAULT_LEAD_TIME
|
||||
# - remove project-lead-time, since Category was a non-standard attribute
|
||||
@@ -32,7 +33,7 @@
|
||||
# version 0.5 2007-03-21
|
||||
# - Add more help options
|
||||
# - --project-lead-time option
|
||||
# - Suppress printing of heading if there are no todos to print
|
||||
# - Supress printing of heading if there are no todos to print
|
||||
# version 0.4
|
||||
# - Version 0.4 changes all written or inspired by, and thanks to Mark Stosberg
|
||||
# - Change to GetOptions
|
||||
@@ -56,12 +57,19 @@
|
||||
cat /path/to/file*.ics | ical2rem.pl > ~/.ical2rem
|
||||
|
||||
All options have reasonable defaults:
|
||||
--label Calendar name (Default: Calendar)
|
||||
--label Calendar name (Default: Calendar)
|
||||
--start Start of time period to parse (parsed by str2time)
|
||||
--end End of time period to parse
|
||||
--lead-time Advance days to start reminders (Default: 3)
|
||||
--todos, --no-todos Process Todos? (Default: Yes)
|
||||
--heading Define a priority for static entries
|
||||
--help Usage
|
||||
--man Complete man page
|
||||
--iso8601 Use YYYY-MM-DD date format
|
||||
--locations, --no-locations Include location? (Default: Yes)
|
||||
--end-times, --no-end-times Include event end times in reminder text
|
||||
(Default: No)
|
||||
--heading Define a priority for static entries
|
||||
--help Usage
|
||||
--debug Enable debug output
|
||||
--man Complete man page
|
||||
|
||||
Expects an ICAL stream on STDIN. Converts it to the format
|
||||
used by the C<remind> script and prints it to STDOUT.
|
||||
@@ -74,6 +82,14 @@ The syntax generated includes a label for the calendar parsed.
|
||||
By default this is "Calendar". You can customize this with
|
||||
the "--label" option.
|
||||
|
||||
=head2 --iso8601
|
||||
|
||||
Use YYYY-MM-DD date format in output instead of Mmm DD YYYY
|
||||
|
||||
=head2 --locations, --no-locations
|
||||
|
||||
Whether or not to include locations in events
|
||||
|
||||
=head2 --lead-time
|
||||
|
||||
ical2rem.pl --lead-time 3
|
||||
@@ -84,7 +100,7 @@ How may days in advance to start getting reminders about the events. Defaults to
|
||||
|
||||
ical2rem.pl --no-todos
|
||||
|
||||
If you don't care about the ToDos the calendar, this will suppress
|
||||
If you don't care about the ToDos the calendar, this will surpress
|
||||
printing of the ToDo heading, as well as skipping ToDo processing.
|
||||
|
||||
=head2 --heading
|
||||
@@ -98,6 +114,7 @@ the calendar entries. See the file defs.rem from the remind distribution for mo
|
||||
|
||||
use strict;
|
||||
use iCal::Parser;
|
||||
use Date::Parse;
|
||||
use DateTime;
|
||||
use Getopt::Long 2.24 qw':config auto_help';
|
||||
use Pod::Usage;
|
||||
@@ -108,19 +125,31 @@ $VERSION = "0.5.2";
|
||||
# Declare how many days in advance to remind
|
||||
my $DEFAULT_LEAD_TIME = 3;
|
||||
my $PROCESS_TODOS = 1;
|
||||
my $HEADING = "";
|
||||
my $HEADING = "";
|
||||
my $help;
|
||||
my $debug;
|
||||
my $man;
|
||||
my $iso8601;
|
||||
my $do_location = 1;
|
||||
my $do_end_times;
|
||||
my $start;
|
||||
my $end;
|
||||
|
||||
my $label = 'Calendar';
|
||||
GetOptions (
|
||||
"label=s" => \$label,
|
||||
"start=s" => \$start,
|
||||
"end=s" => \$end,
|
||||
"lead-time=i" => \$DEFAULT_LEAD_TIME,
|
||||
"todos!" => \$PROCESS_TODOS,
|
||||
"iso8601!" => \$iso8601,
|
||||
"locations!" => \$do_location,
|
||||
"end-times!" => \$do_end_times,
|
||||
"heading=s" => \$HEADING,
|
||||
"help|?" => \$help,
|
||||
"debug" => \$debug,
|
||||
"man" => \$man
|
||||
);
|
||||
) or pod2usage(1);
|
||||
pod2usage(1) if $help;
|
||||
pod2usage(-verbose => 2) if $man;
|
||||
|
||||
@@ -136,8 +165,22 @@ while (<>) {
|
||||
$in = "";
|
||||
}
|
||||
}
|
||||
my $parser = iCal::Parser->new();
|
||||
print STDERR "Read all calendars\n" if $debug;
|
||||
my(%parser_opts) = ("debug" => $debug);
|
||||
if ($start) {
|
||||
my $t = str2time($start);
|
||||
die "Invalid time $start\n" if (! $t);
|
||||
$parser_opts{'start'} = DateTime->from_epoch(epoch => $t);
|
||||
}
|
||||
if ($end) {
|
||||
my $t = str2time($end);
|
||||
die "Invalid time $end\n" if (! $t);
|
||||
$parser_opts{'end'} = DateTime->from_epoch(epoch => $t);
|
||||
}
|
||||
print STDERR "About to parse calendars\n" if $debug;
|
||||
my $parser = iCal::Parser->new(%parser_opts);
|
||||
my $hash = $parser->parse_strings(@calendars);
|
||||
print STDERR "Calendars parsed\n" if $debug;
|
||||
|
||||
##############################################################
|
||||
#
|
||||
@@ -209,6 +252,13 @@ sub _process_todos {
|
||||
#
|
||||
######################################################################
|
||||
|
||||
# Issue 8 https://github.com/jbalcorn/ical2rem/issues/8
|
||||
# Make sure there is a _sfun function declared in the reminder file. We'll just make it do nothing here.
|
||||
print 'IF args("_sfun") < 1
|
||||
FSET _sfun(x) choose(x,0)
|
||||
ENDIF
|
||||
';
|
||||
|
||||
print _process_todos($hash->{'todos'}) if $PROCESS_TODOS;
|
||||
|
||||
my ($leadtime, $yearkey, $monkey, $daykey,$uid,%eventsbyuid);
|
||||
@@ -260,20 +310,67 @@ foreach $yearkey (sort keys %{$events} ) {
|
||||
$leadtime = "+".$DEFAULT_LEAD_TIME;
|
||||
}
|
||||
my $start = $event->{'DTSTART'};
|
||||
print "REM ".$start->month_abbr." ".$start->day." ".$start->year." $leadtime ";
|
||||
if ($start->hour > 0) {
|
||||
print " AT ";
|
||||
print $start->strftime("%H:%M");
|
||||
print " SCHED _sfun MSG %a %2 ";
|
||||
} else {
|
||||
print " MSG %a ";
|
||||
my $end = $event->{'DTEND'};
|
||||
my $duration = "";
|
||||
if ($end and ($start->hour or $start->minute or $end->hour or $end->minute)) {
|
||||
# We need both an HH:MM version of the delta, to put in the
|
||||
# DURATION specifier, and a human-readable version of the
|
||||
# delta, to put in the message if the user requested it.
|
||||
my $seconds = $end->epoch - $start->epoch;
|
||||
my $minutes = int($seconds / 60);
|
||||
my $hours = int($minutes / 60);
|
||||
$minutes -= $hours * 60;
|
||||
$duration = sprintf("DURATION %d:%02d ", $hours, $minutes);
|
||||
}
|
||||
print "%\"$event->{'SUMMARY'}";
|
||||
print " at $event->{'LOCATION'}" if $event->{'LOCATION'};
|
||||
print "\%\"%\n";
|
||||
print "REM ";
|
||||
if ($iso8601) {
|
||||
print $start->strftime("%F ");
|
||||
} else {
|
||||
print $start->month_abbr." ".$start->day." ".$start->year." ";
|
||||
}
|
||||
print "$leadtime ";
|
||||
if ($duration or $start->hour > 0 or $start->minute > 0) {
|
||||
print "AT ";
|
||||
print $start->strftime("%H:%M");
|
||||
print " SCHED _sfun ${duration}MSG %a %2 ";
|
||||
} else {
|
||||
print "MSG %a ";
|
||||
}
|
||||
print "%\"", "e($event->{'SUMMARY'});
|
||||
print(" at ", "e($event->{'LOCATION'}))
|
||||
if ($do_location and $event->{'LOCATION'});
|
||||
print "\%\"";
|
||||
if ($do_end_times and ($start->hour or $start->minute or
|
||||
$end->hour or $end->minute)) {
|
||||
my $start_date = $start->strftime("%F");
|
||||
my $start_time = $start->strftime("%k:%M");
|
||||
my $end_date = $end->strftime("%F");
|
||||
my $end_time = $end->strftime("%k:%M");
|
||||
# We don't want leading whitespace; some strftime's support
|
||||
# disabling the pdding in the format string, but not all,
|
||||
# so for maximum portability we do it ourselves.
|
||||
$start_time =~ s/^\s+//;
|
||||
$end_time =~ s/^\s+//;
|
||||
my(@pieces);
|
||||
if ($start_date ne $end_date) {
|
||||
push(@pieces, $end_date);
|
||||
}
|
||||
if ($start_time ne $end_time) {
|
||||
push(@pieces, $end_time);
|
||||
}
|
||||
print " (-", join(" ", @pieces), ")";
|
||||
}
|
||||
print "%\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sub quote {
|
||||
local($_) = @_;
|
||||
s/\[/["["]/g;
|
||||
return $_;
|
||||
}
|
||||
|
||||
exit 0;
|
||||
#:vim set ft=perl ts=4 sts=4 expandtab :
|
||||
@@ -111,11 +111,11 @@
|
||||
(sort
|
||||
(list "ADDOMIT" "AFTER" "AT" "BANNER" "BEFORE"
|
||||
"CAL" "CLEAR-OMIT-CONTEXT" "DEBUG" "DO" "DUMPVARS"
|
||||
"DURATION" "ELSE" "ENDIF" "ERRMSG" "EXIT" "FIRST"
|
||||
"FLUSH" "FOURTH" "FROM" "FSET" "IF" "IFTRIG" "IN"
|
||||
"DURATION" "ELSE" "ENDIF" "ERRMSG" "EXIT" "EXPR" "FIRST"
|
||||
"FLUSH" "FOURTH" "FROM" "FSET" "FUNSET" "IF" "IFTRIG" "IN"
|
||||
"INCLUDE" "INCLUDECMD" "LAST" "LASTDAY"
|
||||
"LASTWORKDAY" "MAYBE-UNCOMPUTABLE" "MSF"
|
||||
"MSG" "OMIT" "OMITFUNC" "ONCE"
|
||||
"MSG" "NOQUEUE" "OMIT" "OMITFUNC" "ONCE"
|
||||
"POP-OMIT-CONTEXT" "PRESERVE" "PRIORITY" "PS" "PSFILE"
|
||||
"PUSH-OMIT-CONTEXT" "REM" "RUN" "SATISFY" "SCANFROM"
|
||||
"SCHED" "SECOND" "SET" "SKIP" "SPECIAL"
|
||||
@@ -131,50 +131,58 @@
|
||||
|
||||
(defconst remind-builtin-variables
|
||||
(sort
|
||||
(list "$Ago" "$Am" "$And" "$April" "$At" "$August" "$CalcUTC" "$CalMode" "$Daemon" "$DateSep"
|
||||
"$DateTimeSep" "$December" "$DefaultColor" "$DefaultPrio"
|
||||
"$DefaultTDelta" "$DeltaOffset" "$DontFork" "$DontQueue"
|
||||
"$DontTrigAts" "$EndSent" "$EndSentIg" "$February" "$FirstIndent"
|
||||
"$FoldYear" "$FormWidth" "$Friday" "$Fromnow" "$Hour" "$Hplu" "$HushMode" "$IgnoreOnce"
|
||||
"$InfDelta" "$IntMax" "$IntMin" "$Is" "$January" "$July" "$June" "$LatDeg"
|
||||
"$Latitude" "$LatMin" "$LatSec" "$Location" "$LongDeg" "$Longitude"
|
||||
"$LongMin" "$LongSec" "$March" "$MaxSatIter" "$MaxStringLen" "$May"
|
||||
"$MinsFromUTC" "$Minute" "$Monday" "$Mplu" "$NextMode" "$November" "$Now" "$NumQueued"
|
||||
"$NumTrig" "$October" "$On" "$Pm" "$PrefixLineNo" "$PSCal" "$RunOff" "$Saturday"
|
||||
"$September" "$SimpleCal" "$SortByDate" "$SortByPrio" "$SortByTime"
|
||||
"$SubsIndent" "$Sunday" "$SysInclude" "$T" "$Td" "$Thursday" "$TimeSep" "$Tm"
|
||||
"$Today" "$Tomorrow" "$Tuesday" "$Tw" "$Ty" "$U" "$Ud" "$Um" "$UntimedFirst" "$Uw" "$Uy"
|
||||
"$Was" "$Wednesday")
|
||||
(list
|
||||
"$AddBlankLines" "$Ago" "$Am" "$And" "$April" "$At" "$August"
|
||||
"$CalMode" "$CalcUTC" "$Daemon" "$DateSep" "$DateTimeSep" "$December"
|
||||
"$DefaultColor" "$DefaultPrio" "$DefaultTDelta" "$DeltaOverride"
|
||||
"$DontFork" "$DontQueue" "$DontTrigAts" "$EndSent" "$EndSentIg"
|
||||
"$ExpressionTimeLimit" "$February" "$FirstIndent" "$FoldYear"
|
||||
"$FormWidth" "$Friday" "$Fromnow" "$Hour" "$Hplu" "$HushMode"
|
||||
"$IgnoreOnce" "$InfDelta" "$IntMax" "$IntMin" "$Is" "$January" "$July"
|
||||
"$June" "$LatDeg" "$LatMin" "$LatSec" "$Latitude" "$Location"
|
||||
"$LongDeg" "$LongMin" "$LongSec" "$Longitude" "$March" "$MaxFullOmits"
|
||||
"$MaxLateMinutes" "$MaxPartialOmits" "$MaxSatIter" "$MaxStringLen"
|
||||
"$May" "$MinsFromUTC" "$Minute" "$Monday" "$Mplu" "$NextMode"
|
||||
"$November" "$Now" "$NumFullOmits" "$NumPartialOmits" "$NumQueued"
|
||||
"$NumTrig" "$October" "$On" "$OnceFile" "$PSCal" "$ParseUntriggered"
|
||||
"$Pm" "$PrefixLineNo" "$RunOff" "$Saturday" "$September" "$SimpleCal"
|
||||
"$SortByDate" "$SortByPrio" "$SortByTime" "$SubsIndent" "$Sunday"
|
||||
"$SuppressLRM" "$SysInclude" "$T" "$Td" "$TerminalBackground"
|
||||
"$Thursday" "$TimeSep" "$Tm" "$Today" "$Tomorrow" "$Tt" "$Tuesday"
|
||||
"$Tw" "$Ty" "$U" "$Ud" "$Um" "$UntimedFirst" "$Use256Colors"
|
||||
"$UseBGVTColors" "$UseTrueColors" "$UseVTColors" "$Uw" "$Uy" "$Was"
|
||||
"$Wednesday")
|
||||
#'(lambda (a b) (> (length a) (length b)))))
|
||||
|
||||
|
||||
(defconst remind-time-words
|
||||
(sort
|
||||
(list "Jan" "January" "Feb" "Mar" "Apr" "Jun" "Jul" "Aug" "Sept" "Sep" "Oct" "Nov" "Dec"
|
||||
(list
|
||||
"Jan" "January" "Feb" "Mar" "Apr" "Jun" "Jul" "Aug" "Sept" "Sep" "Oct" "Nov" "Dec"
|
||||
"February" "March" "April" "May" "June" "July" "August" "September" "October"
|
||||
"November" "December" "Mon" "Monday" "Tue" "Tues" "Tuesday" "Wed" "Wednesday"
|
||||
"Thu" "Thursday" "Thurs" "Fri" "Friday" "Saturday" "Sat" "Sun" "Sunday")
|
||||
#'(lambda (a b) (> (length a) (length b)))))
|
||||
|
||||
|
||||
(defconst remind-builtin-functions
|
||||
(sort
|
||||
(list "abs" "access" "adawn" "adusk" "ampm" "args" "asc" "baseyr" "char"
|
||||
"choose" "coerce" "current" "date" "datepart" "datetime" "dawn" "day"
|
||||
"daysinmon" "defined" "dosubst" "dusk" "easterdate" "evaltrig"
|
||||
"filedate" "filedatetime" "filedir" "filename" "getenv" "hebdate"
|
||||
"hebday" "hebmon" "hebyear" "hour" "iif" "index" "isany" "isdst"
|
||||
"isleap" "isomitted" "language" "lower" "max" "min" "minsfromutc"
|
||||
(list "abs" "access" "adawn" "adusk" "ampm" "ansicolor" "args" "asc"
|
||||
"baseyr" "char" "choose" "coerce" "columns" "current" "date"
|
||||
"datepart" "datetime" "dawn" "day" "daysinmon" "defined" "dosubst"
|
||||
"dusk" "easterdate" "evaltrig" "filedate" "filedatetime" "filedir"
|
||||
"filename" "getenv" "hebdate" "hebday" "hebmon" "hebyear" "hour"
|
||||
"htmlescape" "htmlstriptags" "iif" "index" "isany" "isdst" "isleap"
|
||||
"isomitted" "language" "localtoutc" "lower" "max" "min" "minsfromutc"
|
||||
"minute" "mon" "monnum" "moondate" "moondatetime" "moonphase"
|
||||
"moontime" "ndawn" "ndusk" "nonomitted" "now" "ord" "ostype" "pad" "plural"
|
||||
"psmoon" "psshade" "realcurrent" "realnow" "realtoday" "sgn" "shell"
|
||||
"shellescape" "slide" "strlen" "substr" "sunrise" "sunset" "time"
|
||||
"timepart" "today" "trig" "trigback" "trigdate" "trigdatetime"
|
||||
"trigdelta" "trigduration" "trigeventduration" "trigeventstart"
|
||||
"trigfrom" "trigger" "trigpriority" "trigrep" "trigscanfrom"
|
||||
"trigtime" "trigtimedelta" "trigtimerep" "triguntil" "trigvalid"
|
||||
"typeof" "tzconvert" "upper" "value" "version" "weekno" "wkday"
|
||||
"wkdaynum" "year")
|
||||
"moontime" "multitrig" "ndawn" "ndusk" "nonomitted" "now" "ord"
|
||||
"orthodoxeaster" "ostype" "pad" "plural" "psmoon" "psshade"
|
||||
"realcurrent" "realnow" "realtoday" "rows" "sgn" "shell" "shellescape"
|
||||
"slide" "soleq" "stdout" "strlen" "substr" "sunrise" "sunset" "time"
|
||||
"timepart" "timezone" "today" "trig" "trigback" "trigdate"
|
||||
"trigdatetime" "trigdelta" "trigduration" "trigeventduration"
|
||||
"trigeventstart" "trigfrom" "trigger" "trigpriority" "trigrep"
|
||||
"trigscanfrom" "trigtags" "trigtime" "trigtimedelta" "trigtimerep"
|
||||
"triguntil" "trigvalid" "typeof" "tzconvert" "upper" "utctolocal"
|
||||
"value" "version" "weekno" "wkday" "wkdaynum" "year")
|
||||
#'(lambda (a b) (> (length a) (length b)))))
|
||||
|
||||
;;; faces
|
||||
|
||||
@@ -1,5 +1,35 @@
|
||||
CHANGES TO REMIND
|
||||
|
||||
* VERSION 5.0 Patch 5 - 2024-09-02
|
||||
|
||||
* CHANGE: remind: When using the "-c" option and with the SHADE special
|
||||
enabled, shade the entire calendar box including the line containing the
|
||||
day number.
|
||||
|
||||
* IMPROVEMENT: remind: Better error messages when diagnosing certain
|
||||
errors in expressions.
|
||||
|
||||
* IMPROVEMENT: include/holidays/jewish.rem: Remove unnecessary _h()
|
||||
function definition.
|
||||
|
||||
* BUG FIX: remind: In a couple of spots when we parsed a character, we did
|
||||
not check for an error return. This has been fixed.
|
||||
|
||||
* BUG FIX: remind: Fix edge-case bugs in "remind -c" output formatting.
|
||||
|
||||
* BUG FIX: make test: Fix a test that was broken for all of September 2024.
|
||||
|
||||
* BUG FIX: remind: Fix a couple of potential file-descriptor leaks.
|
||||
|
||||
* BUG FIX: contrib/ical2rem.pl: Replace "SCHED _sfun" with "+15" to
|
||||
hard-code 15-minutes advance warning rather than using an undefined
|
||||
scheduling function. If this is not what you want, you should edit
|
||||
ical2rem.pl to suit your taste; it's not officially part of Remind and
|
||||
is meant more as a starting point for you to customize than a finished
|
||||
product.
|
||||
|
||||
* DOCUMENTATION FIX: Remove obsolete info from Remind man page.
|
||||
|
||||
* VERSION 5.0 Patch 4 - 2024-08-29
|
||||
|
||||
* IMPROVEMENT: remind: When checking if a SATISFY expression refers to the
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ RUN OFF
|
||||
# Ensure required version of remind is used... #
|
||||
################################################
|
||||
IF version() < "03.04.02"
|
||||
ERRMSG This file requires at least version 03.01.10 of Remind.%
|
||||
ERRMSG This file requires at least version 03.04.02 of Remind.%
|
||||
ERRMSG This version is version [version()].
|
||||
EXIT
|
||||
ENDIF
|
||||
|
||||
+22
-23
@@ -10,7 +10,6 @@ SET InIsrael value("InIsrael", 0)
|
||||
SET Reform value("Reform", 0)
|
||||
|
||||
# Convenient function definition to save typing
|
||||
FSET _h(x, y) HEBDATE(x,y)
|
||||
FSET _h2(x, y) HEBDATE(x, y, $U-7)
|
||||
FSET _PastSat(x, y) IIF(WKDAYNUM(_h2(x,y))!=6, _h2(x,y), _h2(x,y)+1)
|
||||
FSET _BackTwoFri(x, y) IIF(WKDAYNUM(_h2(x,y))!=5, _h2(x,y), _h2(x,y)-2)
|
||||
@@ -19,28 +18,28 @@ FSET _BackTwoSat(x, y) IIF(WKDAYNUM(_h2(x,y))!=6, _h2(x,y), _h2(x,y)-2)
|
||||
SET InIsrael VALUE("InIsrael", 0)
|
||||
SET Reform VALUE("Reform", 0)
|
||||
|
||||
REM [_h(1, "Tishrey")] ++4 MSG %"Rosh Hashana 1%" is %b.
|
||||
REM [hebdate(1, "Tishrey")] ++4 MSG %"Rosh Hashana 1%" is %b.
|
||||
|
||||
# No RH-2 or Tzom Gedalia in Reform
|
||||
IF !Reform
|
||||
REM [_h(2, "Tishrey")] ++4 MSG %"Rosh Hashana 2%" is %b.
|
||||
REM [hebdate(2, "Tishrey")] ++4 MSG %"Rosh Hashana 2%" is %b.
|
||||
REM [_PastSat(3, "Tishrey")] ++4 MSG %"Tzom Gedalia%" is %b.
|
||||
ENDIF
|
||||
|
||||
REM [_h(10, "Tishrey")] ++4 MSG %"Yom Kippur%" is %b.
|
||||
REM [_h(15, "Tishrey")] ++4 MSG %"Sukkot 1%" is %b.
|
||||
REM [hebdate(10, "Tishrey")] ++4 MSG %"Yom Kippur%" is %b.
|
||||
REM [hebdate(15, "Tishrey")] ++4 MSG %"Sukkot 1%" is %b.
|
||||
|
||||
IF !InIsrael
|
||||
REM [_h(16, "Tishrey")] MSG %"Sukkot 2%"
|
||||
REM [hebdate(16, "Tishrey")] MSG %"Sukkot 2%"
|
||||
ENDIF
|
||||
|
||||
REM [_h(21, "Tishrey")] ++4 MSG %"Hoshana Rabba%" is %b.
|
||||
REM [_h(22, "Tishrey")] ++4 MSG %"Shemini Atzeret%" is %b.
|
||||
REM [hebdate(21, "Tishrey")] ++4 MSG %"Hoshana Rabba%" is %b.
|
||||
REM [hebdate(22, "Tishrey")] ++4 MSG %"Shemini Atzeret%" is %b.
|
||||
|
||||
IF InIsrael
|
||||
REM [_h(22, "Tishrey")] ++4 MSG %"Simchat Torah%" is %b.
|
||||
REM [hebdate(22, "Tishrey")] ++4 MSG %"Simchat Torah%" is %b.
|
||||
ELSE
|
||||
REM [_h(23, "Tishrey")] ++4 MSG %"Simchat Torah%" is %b.
|
||||
REM [hebdate(23, "Tishrey")] ++4 MSG %"Simchat Torah%" is %b.
|
||||
ENDIF
|
||||
|
||||
# Because Kislev can change length, we must be more careful about Chanukah
|
||||
@@ -58,11 +57,11 @@ REM [_chan(8)] MSG %"Chanukah 8%"
|
||||
IF !Reform
|
||||
# 10 Tevet will never be a Saturday, so whether or not to
|
||||
# move it is moot. (Thanks to Art Werschulz.)
|
||||
REM [_h(10, "Tevet")] MSG %"Tzom Tevet%" is %b.
|
||||
REM [hebdate(10, "Tevet")] MSG %"Tzom Tevet%" is %b.
|
||||
ENDIF
|
||||
|
||||
REM [_h(15, "Shvat")] ++4 MSG %"Tu B'Shvat%" is %b.
|
||||
REM [_h(14, "Adar A")] ++4 MSG %"Purim Katan%" is %b.
|
||||
REM [hebdate(15, "Shvat")] ++4 MSG %"Tu B'Shvat%" is %b.
|
||||
REM [hebdate(14, "Adar A")] ++4 MSG %"Purim Katan%" is %b.
|
||||
|
||||
# If Purim is on Sunday, then Fast of Esther is 11 Adar.
|
||||
IF WKDAYNUM(_h2(13, "Adar")) != 6
|
||||
@@ -70,33 +69,33 @@ IF WKDAYNUM(_h2(13, "Adar")) != 6
|
||||
ELSE
|
||||
REM [_h2(11, "Adar")] ++4 MSG %"Fast of Esther%" is %b.
|
||||
ENDIF
|
||||
REM [_h(14, "Adar")] ++4 MSG %"Purim%" is %b.
|
||||
REM [_h(15, "Nisan")] ++4 MSG %"Pesach%" is %b.
|
||||
REM [hebdate(14, "Adar")] ++4 MSG %"Purim%" is %b.
|
||||
REM [hebdate(15, "Nisan")] ++4 MSG %"Pesach%" is %b.
|
||||
|
||||
IF !InIsrael
|
||||
REM [_h(16, "Nisan")] MSG %"Pesach 2%"
|
||||
REM [hebdate(16, "Nisan")] MSG %"Pesach 2%"
|
||||
ENDIF
|
||||
|
||||
REM [_h(21, "Nisan")] MSG %"Pesach 7%"
|
||||
REM [hebdate(21, "Nisan")] MSG %"Pesach 7%"
|
||||
|
||||
IF !InIsrael && !Reform
|
||||
REM [_h(22, "Nisan")] MSG %"Pesach 8%"
|
||||
REM [hebdate(22, "Nisan")] MSG %"Pesach 8%"
|
||||
ENDIF
|
||||
|
||||
REM [_h(27, "Nisan")] ++4 MSG %"Yom HaShoah%" is %b.
|
||||
REM [hebdate(27, "Nisan")] ++4 MSG %"Yom HaShoah%" is %b.
|
||||
REM [_BackTwoFri(4, "Iyar")] ++4 MSG %"Yom HaZikaron%" is %b.
|
||||
REM [_BackTwoSat(5, "Iyar")] ++4 MSG %"Yom Ha'atzmaut%" is %b.
|
||||
|
||||
# Not sure about Reform's position on Lag B'Omer
|
||||
IF !Reform
|
||||
REM [_h(18, "Iyar")] ++4 MSG %"Lag B'Omer%" is %b.
|
||||
REM [hebdate(18, "Iyar")] ++4 MSG %"Lag B'Omer%" is %b.
|
||||
ENDIF
|
||||
|
||||
REM [_h(28, "Iyar")] ++4 MSG %"Yom Yerushalayim%" is %b.
|
||||
REM [_h(6, "Sivan")] ++4 MSG %"Shavuot%" is %b.
|
||||
REM [hebdate(28, "Iyar")] ++4 MSG %"Yom Yerushalayim%" is %b.
|
||||
REM [hebdate(6, "Sivan")] ++4 MSG %"Shavuot%" is %b.
|
||||
|
||||
IF !InIsrael && !Reform
|
||||
REM [_h(7, "Sivan")] MSG %"Shavuot 2%"
|
||||
REM [hebdate(7, "Sivan")] MSG %"Shavuot 2%"
|
||||
ENDIF
|
||||
|
||||
# Fairly sure Reform Jews don't observe the next two
|
||||
|
||||
+1
-4
@@ -4706,10 +4706,7 @@ This is really useful only if \fIexpr\fR involves a call to the
|
||||
\fIexpr\fR will not change as \fBRemind\fR iterates. In fact, if
|
||||
\fIexpr\fR is not a constant and does not call \fBtrigdate()\fR or
|
||||
related functions or system variables, then \fBRemind\fR will issue a
|
||||
warning. If you have a user-defined function that calls
|
||||
\fBtrigdate()\fR, this can result in an unwanted warning. In that
|
||||
case, pass \fBtrigdate()\fR or some related function or system
|
||||
variable into your user-defined function from the SATISFY expression.
|
||||
warning.
|
||||
.PP
|
||||
An example of the usefulness of \fBSATISFY\fR: Suppose you wish to
|
||||
be warned of every Friday the 13th. Your first attempt may be:
|
||||
|
||||
+42
-20
@@ -338,6 +338,7 @@ UnBackgroundize(int d)
|
||||
printf("%s", Decolorize());
|
||||
}
|
||||
|
||||
#ifdef REM_USE_WCHAR
|
||||
static void
|
||||
send_lrm(void)
|
||||
{
|
||||
@@ -352,6 +353,7 @@ send_lrm(void)
|
||||
printf("\xE2\x80\x8E");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static char const *
|
||||
despace(char const *s)
|
||||
@@ -526,9 +528,9 @@ get_month_abbrev(char const *mon)
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef REM_USE_WCHAR
|
||||
static int make_wchar_versions(CalEntry *e)
|
||||
{
|
||||
#ifdef REM_USE_WCHAR
|
||||
size_t len;
|
||||
wchar_t *buf;
|
||||
len = mbstowcs(NULL, e->text, 0);
|
||||
@@ -542,10 +544,8 @@ static int make_wchar_versions(CalEntry *e)
|
||||
e->wc_text = buf;
|
||||
e->wc_pos = buf;
|
||||
return 1;
|
||||
#else
|
||||
return 1;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
static void gon(void)
|
||||
{
|
||||
@@ -900,13 +900,17 @@ static void DoCalendarOneWeek(int nleft)
|
||||
if (UseVTColors) {
|
||||
printf("\x1B[1m"); /* Bold */
|
||||
}
|
||||
Backgroundize(d);
|
||||
PrintLeft(buf, ColSpaces-1, '*');
|
||||
putchar(' ');
|
||||
UnBackgroundize(d);
|
||||
if (UseVTColors) {
|
||||
printf("\x1B[0m"); /* Normal */
|
||||
}
|
||||
putchar(' ');
|
||||
} else {
|
||||
Backgroundize(d);
|
||||
PrintLeft(buf, ColSpaces, ' ');
|
||||
UnBackgroundize(d);
|
||||
}
|
||||
gon();
|
||||
DRAW(tb);
|
||||
@@ -1122,13 +1126,17 @@ static int WriteCalendarRow(void)
|
||||
if (UseVTColors) {
|
||||
printf("\x1B[1m"); /* Bold */
|
||||
}
|
||||
Backgroundize(d+i-wd);
|
||||
PrintLeft(buf, ColSpaces-1, '*');
|
||||
putchar(' ');
|
||||
if (UseVTColors) {
|
||||
printf("\x1B[0m"); /* Normal */
|
||||
}
|
||||
putchar(' ');
|
||||
UnBackgroundize(d+i-wd);
|
||||
} else {
|
||||
Backgroundize(d+i-wd);
|
||||
PrintLeft(buf, ColSpaces, ' ');
|
||||
UnBackgroundize(d+i-wd);
|
||||
}
|
||||
}
|
||||
gon();
|
||||
@@ -1196,15 +1204,17 @@ static void PrintLeft(char const *s, int width, char pad)
|
||||
{
|
||||
#ifndef REM_USE_WCHAR
|
||||
int len = strlen(s);
|
||||
printf("%s", s);
|
||||
while (len++ < width) putchar(pad);
|
||||
int i;
|
||||
for (i=0; i<len && i<width; i++) {
|
||||
fputc(*(s+i), stdout);
|
||||
}
|
||||
while (i++ < width) putchar(pad);
|
||||
#else
|
||||
size_t len = mbstowcs(NULL, s, 0);
|
||||
int i;
|
||||
wchar_t static_buf[128];
|
||||
wchar_t *buf;
|
||||
wchar_t *ws;
|
||||
int display_len;
|
||||
|
||||
if (!len) {
|
||||
for (i=0; i<width; i++) {
|
||||
@@ -1223,13 +1233,16 @@ static void PrintLeft(char const *s, int width, char pad)
|
||||
}
|
||||
}
|
||||
(void) mbstowcs(buf, s, len+1);
|
||||
display_len = wcswidth(buf, len+1);
|
||||
|
||||
ws = buf;
|
||||
for (i=0; i<width;) {
|
||||
i=0;
|
||||
while (i<width) {
|
||||
if (*ws) {
|
||||
if (i + wcwidth(*ws) > width) {
|
||||
break;
|
||||
}
|
||||
i += wcwidth(*ws);
|
||||
PutWideChar(*ws++, NULL);
|
||||
i+= wcwidth(*ws);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
@@ -1242,7 +1255,10 @@ static void PrintLeft(char const *s, int width, char pad)
|
||||
/* Possibly send lrm control sequence */
|
||||
send_lrm();
|
||||
|
||||
for (i=display_len; i<width; i++) fputc(pad, stdout);
|
||||
while (i<width) {
|
||||
fputc(pad, stdout);
|
||||
i++;
|
||||
}
|
||||
if (buf != static_buf) free(buf);
|
||||
#endif
|
||||
|
||||
@@ -1263,7 +1279,7 @@ static void PrintCentered(char const *s, int width, char *pad)
|
||||
int i;
|
||||
|
||||
for (i=0; i<d; i++) fputs(pad, stdout);
|
||||
for (i=0; i<width; i++) {
|
||||
for (i=0; i<width-d; i++) {
|
||||
if (*s) {
|
||||
if (isspace(*s)) {
|
||||
putchar(' ');
|
||||
@@ -1307,13 +1323,14 @@ static void PrintCentered(char const *s, int width, char *pad)
|
||||
if (d < 0) d = 0;
|
||||
ws = buf;
|
||||
for (i=0; i<d; i++) fputs(pad, stdout);
|
||||
for (i=0; i<width; i++) {
|
||||
i=0;
|
||||
while (i+d < width) {
|
||||
if (*ws) {
|
||||
PutWideChar(*ws++, NULL);
|
||||
if (wcwidth(*ws) == 0) {
|
||||
/* Don't count this character... it's zero-width */
|
||||
i--;
|
||||
if (i+d + wcwidth(*ws) > width) {
|
||||
break;
|
||||
}
|
||||
i += wcwidth(*ws);
|
||||
PutWideChar(*ws++, NULL);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
@@ -1325,7 +1342,10 @@ static void PrintCentered(char const *s, int width, char *pad)
|
||||
/* Possibly send lrm control sequence */
|
||||
send_lrm();
|
||||
|
||||
for (i=d+display_len; i<width; i++) fputs(pad, stdout);
|
||||
while (i+d<width) {
|
||||
fputs(pad, stdout);
|
||||
i++;
|
||||
}
|
||||
if (buf != static_buf) free(buf);
|
||||
#endif
|
||||
}
|
||||
@@ -2143,7 +2163,9 @@ static int DoCalRem(ParsePtr p, int col)
|
||||
FreeTrig(&trig);
|
||||
return E_NO_MEM;
|
||||
}
|
||||
#ifdef REM_USE_WCHAR
|
||||
make_wchar_versions(e);
|
||||
#endif
|
||||
DBufInit(&(e->tags));
|
||||
DBufPuts(&(e->tags), DBufValue(&(trig.tags)));
|
||||
if (SynthesizeTags) {
|
||||
|
||||
+50
-14
@@ -1555,9 +1555,11 @@ static int parse_expr_token_aux(DynamicBuffer *buf, char const **in)
|
||||
return E_NO_MEM;
|
||||
}
|
||||
(*in)++;
|
||||
}
|
||||
return OK;
|
||||
|
||||
} else {
|
||||
Eprint("%s `%c'", ErrMsg[E_PARSE_ERR], c);
|
||||
return E_PARSE_ERR;
|
||||
}
|
||||
return OK;
|
||||
case '!':
|
||||
case '>':
|
||||
case '<':
|
||||
@@ -1778,6 +1780,7 @@ static expr_node * parse_function_call(char const **e, int *r, Var *locals, int
|
||||
expr_node *node;
|
||||
expr_node *arg;
|
||||
char *s;
|
||||
char const *ptr;
|
||||
CHECK_PARSE_LEVEL();
|
||||
|
||||
node = alloc_expr_node(r);
|
||||
@@ -1850,6 +1853,7 @@ static expr_node * parse_function_call(char const **e, int *r, Var *locals, int
|
||||
}
|
||||
}
|
||||
if (TOKEN_IS(")")) {
|
||||
ptr = *e;
|
||||
*r = GET_TOKEN();
|
||||
if (*r != OK) {
|
||||
return free_expr_tree(node);
|
||||
@@ -1858,8 +1862,14 @@ static expr_node * parse_function_call(char const **e, int *r, Var *locals, int
|
||||
/* Check args for builtin funcs */
|
||||
if (node->type == N_BUILTIN_FUNC) {
|
||||
f = node->u.builtin_func;
|
||||
if (node->num_kids < f->minargs) *r = E_2FEW_ARGS;
|
||||
if (node->num_kids > f->maxargs && f->maxargs != NO_MAX) *r = E_2MANY_ARGS;
|
||||
if (node->num_kids < f->minargs) {
|
||||
*e = ptr;
|
||||
*r = E_2FEW_ARGS;
|
||||
}
|
||||
if (node->num_kids > f->maxargs && f->maxargs != NO_MAX) {
|
||||
*e = ptr;
|
||||
*r = E_2MANY_ARGS;
|
||||
}
|
||||
}
|
||||
if (*r != OK) {
|
||||
if (node->type == N_BUILTIN_FUNC) {
|
||||
@@ -1909,8 +1919,14 @@ static int set_constant_value(expr_node *atom)
|
||||
return OK;
|
||||
} else if (*s == '\'') { /* It's a literal date */
|
||||
s++;
|
||||
if ((r=ParseLiteralDate(&s, &dse, &tim)) != 0) return r;
|
||||
if (*s != '\'') return E_BAD_DATE;
|
||||
if ((r=ParseLiteralDate(&s, &dse, &tim)) != 0) {
|
||||
Eprint("%s: %s", ErrMsg[r], DBufValue(&ExprBuf));
|
||||
return r;
|
||||
}
|
||||
if (*s != '\'') {
|
||||
Eprint("%s: %s", ErrMsg[E_BAD_DATE], DBufValue(&ExprBuf));
|
||||
return E_BAD_DATE;
|
||||
}
|
||||
if (tim == NO_TIME) {
|
||||
atom->u.value.type = DATE_TYPE;
|
||||
atom->u.value.v.val = dse;
|
||||
@@ -1934,7 +1950,10 @@ static int set_constant_value(expr_node *atom)
|
||||
}
|
||||
if (*s == ':' || *s == '.' || *s == TimeSep) { /* Must be a literal time */
|
||||
s++;
|
||||
if (!isdigit(*s)) return E_BAD_TIME;
|
||||
if (!isdigit(*s)) {
|
||||
Eprint("%s: `%s'", ErrMsg[E_BAD_TIME], DBufValue(&ExprBuf));
|
||||
return E_BAD_TIME;
|
||||
}
|
||||
h = val;
|
||||
m = 0;
|
||||
while (isdigit(*s)) {
|
||||
@@ -1950,9 +1969,15 @@ static int set_constant_value(expr_node *atom)
|
||||
s++;
|
||||
}
|
||||
}
|
||||
if (*s || h>23 || m>59) return E_BAD_TIME;
|
||||
if (*s || h>23 || m>59) {
|
||||
Eprint("%s: `%s'", ErrMsg[E_BAD_TIME], DBufValue(&ExprBuf));
|
||||
return E_BAD_TIME;
|
||||
}
|
||||
if (ampm) {
|
||||
if (h < 1 || h > 12) return E_BAD_TIME;
|
||||
if (h < 1 || h > 12) {
|
||||
Eprint("%s: `%s'", ErrMsg[E_BAD_TIME], DBufValue(&ExprBuf));
|
||||
return E_BAD_TIME;
|
||||
}
|
||||
if (ampm == 'a') {
|
||||
if (h == 12) {
|
||||
h = 0;
|
||||
@@ -1968,7 +1993,10 @@ static int set_constant_value(expr_node *atom)
|
||||
return OK;
|
||||
}
|
||||
/* Not a time - must be a number */
|
||||
if (*s) return E_BAD_NUMBER;
|
||||
if (*s) {
|
||||
Eprint("%s: `%s'", ErrMsg[E_BAD_NUMBER], DBufValue(&ExprBuf));
|
||||
return E_BAD_NUMBER;
|
||||
}
|
||||
atom->u.value.type = INT_TYPE;
|
||||
atom->u.value.v.val = val;
|
||||
return OK;
|
||||
@@ -2016,7 +2044,7 @@ static int make_atom(expr_node *atom, Var *locals)
|
||||
/* System Variable */
|
||||
if (*(s) == '$' && isalpha(*(s+1))) {
|
||||
if (!FindSysVar(s+1)) {
|
||||
Eprint("`%s': %s", s, ErrMsg[E_NOSUCH_VAR]);
|
||||
Eprint("%s: `%s'", ErrMsg[E_NOSUCH_VAR], s);
|
||||
return E_NOSUCH_VAR;
|
||||
}
|
||||
if (strlen(s+1) < SHORT_NAME_BUF) {
|
||||
@@ -2502,15 +2530,23 @@ expr_node *parse_expression(char const **e, int *r, Var *locals)
|
||||
}
|
||||
}
|
||||
if (*r == E_EXPECT_COMMA ||
|
||||
*r == E_PARSE_ERR ||
|
||||
*r == E_MISS_RIGHT_PAREN ||
|
||||
*r == E_EXPECTING_EOL ||
|
||||
*r == E_2MANY_ARGS ||
|
||||
*r == E_2FEW_ARGS ||
|
||||
*r == E_PARSE_ERR ||
|
||||
*r == E_EOLN ||
|
||||
*r == E_ILLEGAL_CHAR) {
|
||||
orig = o2;
|
||||
while (*orig) {
|
||||
fprintf(ErrFp, "%c", *orig++);
|
||||
if (*orig == '\n') {
|
||||
fprintf(ErrFp, " ");
|
||||
orig++;
|
||||
} else if (*orig == ']' && ! *(orig+1)) {
|
||||
break;
|
||||
} else {
|
||||
fprintf(ErrFp, "%c", *orig++);
|
||||
}
|
||||
}
|
||||
fprintf(ErrFp, "\n");
|
||||
orig = o2;
|
||||
|
||||
@@ -1119,6 +1119,8 @@ guess_terminal_background(int *r, int *g, int *b)
|
||||
|
||||
if (n != 8) {
|
||||
/* write failed... WTF? Not much we can do */
|
||||
tty_reset(ttyfd);
|
||||
close(ttyfd);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1142,6 +1144,7 @@ guess_terminal_background(int *r, int *g, int *b)
|
||||
return;
|
||||
}
|
||||
tty_reset(ttyfd);
|
||||
close(ttyfd);
|
||||
buf[n+1] = 0;
|
||||
if (n < 25) {
|
||||
/* Too short */
|
||||
|
||||
+11
-1
@@ -207,6 +207,11 @@ int DoFset(ParsePtr p)
|
||||
local_array[i+1].next = NULL;
|
||||
func->nargs++;
|
||||
c = ParseNonSpaceChar(p, &r, 0);
|
||||
if (r) {
|
||||
DBufFree(&buf);
|
||||
DestroyUserFunc(func);
|
||||
return r;
|
||||
}
|
||||
if (c == ')') break;
|
||||
else if (c != ',') {
|
||||
DestroyUserFunc(func);
|
||||
@@ -217,6 +222,10 @@ int DoFset(ParsePtr p)
|
||||
|
||||
/* Allow an optional = sign: FSET f(x) = x*x */
|
||||
c = ParseNonSpaceChar(p, &r, 1);
|
||||
if (r) {
|
||||
DestroyUserFunc(func);
|
||||
return r;
|
||||
}
|
||||
if (c == '=') {
|
||||
(void) ParseNonSpaceChar(p, &r, 0);
|
||||
}
|
||||
@@ -241,8 +250,9 @@ int DoFset(ParsePtr p)
|
||||
}
|
||||
|
||||
c = ParseNonSpaceChar(p, &r, 1);
|
||||
if (c != 0) {
|
||||
if (c != 0 || r != 0) {
|
||||
DestroyUserFunc(func);
|
||||
if (r != 0) return r;
|
||||
return E_EXPECTING_EOL;
|
||||
}
|
||||
|
||||
|
||||
@@ -572,7 +572,7 @@ int GetVarValue(char const *str, Value *val)
|
||||
v=FindVar(str, 0);
|
||||
|
||||
if (!v) {
|
||||
Eprint("%s: %s", ErrMsg[E_NOSUCH_VAR], str);
|
||||
Eprint("%s: `%s'", ErrMsg[E_NOSUCH_VAR], str);
|
||||
return E_NOSUCH_VAR;
|
||||
}
|
||||
return CopyValue(val, &v->v);
|
||||
@@ -587,7 +587,7 @@ int DoSet (Parser *p)
|
||||
{
|
||||
Value v;
|
||||
int r;
|
||||
|
||||
int ch;
|
||||
DynamicBuffer buf;
|
||||
DynamicBuffer buf2;
|
||||
DBufInit(&buf);
|
||||
@@ -597,8 +597,11 @@ int DoSet (Parser *p)
|
||||
if (r) return r;
|
||||
|
||||
/* Allow optional equals-sign: SET var = value */
|
||||
if (ParseNonSpaceChar(p, &r, 1) == '=') {
|
||||
ch = ParseNonSpaceChar(p, &r, 1);
|
||||
if (r) return r;
|
||||
if (ch == '=') {
|
||||
ParseNonSpaceChar(p, &r, 0);
|
||||
if (r) return r;
|
||||
}
|
||||
|
||||
if (p->isnested) {
|
||||
|
||||
+1
-1
@@ -584,7 +584,7 @@ tail +2 ../tests/once.timestamp >> ../tests/test.out 2>&1
|
||||
rm -f ../tests/once.timestamp
|
||||
|
||||
# Newlines in calendar output
|
||||
(echo 'REM 16 MSG foo%_bar%_baz wookie quux apple %_ %_ %_ blech'; echo "REM 16 MSG ANOTHER") | ../src/remind -c -w80 - 1 sep 2024 >> ../tests/test.out 2>&1
|
||||
(echo 'REM 16 MSG foo%_bar%_baz wookie quux apple %_ %_ %_ blech'; echo "REM 16 MSG ANOTHER") | ../src/remind -c -w80 - 1 sep 1990 >> ../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
|
||||
|
||||
+50
-38
@@ -1007,7 +1007,7 @@ a049 => 21
|
||||
substr(21, 2) => Type mismatch
|
||||
../tests/test.rem(326): substr(): Type mismatch
|
||||
set a051 substr(a050, 2, 6)
|
||||
../tests/test.rem(327): Undefined variable: a050
|
||||
../tests/test.rem(327): Undefined variable: `a050'
|
||||
a050 => Undefined variable
|
||||
set a052 time(1+2, 3+4)
|
||||
1 + 2 => 3
|
||||
@@ -1029,7 +1029,7 @@ set a057 value("a05"+"6")
|
||||
"a05" + "6" => "a056"
|
||||
value("a056") => "SDFJHSDF KSJDFH KJSDFH KSJDFH"
|
||||
set a058 version()
|
||||
version() => "05.00.04"
|
||||
version() => "05.00.05"
|
||||
set a059 wkday(today())
|
||||
today() => 1991-02-16
|
||||
wkday(1991-02-16) => "Saturday"
|
||||
@@ -2619,7 +2619,7 @@ a086 4
|
||||
a109 2012-01-01
|
||||
a128 2018-02-03@16:45
|
||||
a039 "February"
|
||||
a058 "05.00.04"
|
||||
a058 "05.00.05"
|
||||
a077 "1992 92\n"
|
||||
a096 -4
|
||||
a119 -1
|
||||
@@ -3486,7 +3486,7 @@ REM AT 13:00PM MSG foo 13p
|
||||
|
||||
DEBUG +x
|
||||
SET x 0:00am + 0
|
||||
../tests/test.rem(625): Ill-formed time
|
||||
../tests/test.rem(625): Ill-formed time: `0:00am'
|
||||
SET x 1:00AM + 0
|
||||
01:00 + 0 => 01:00
|
||||
SET x 2:00am + 0
|
||||
@@ -3512,10 +3512,10 @@ SET x 11:00AM + 0
|
||||
SET x 12:00am + 0
|
||||
00:00 + 0 => 00:00
|
||||
SET x 13:00AM + 0
|
||||
../tests/test.rem(638): Ill-formed time
|
||||
../tests/test.rem(638): Ill-formed time: `13:00AM'
|
||||
|
||||
SET x 0:00pm + 0
|
||||
../tests/test.rem(640): Ill-formed time
|
||||
../tests/test.rem(640): Ill-formed time: `0:00pm'
|
||||
SET x 1:00PM + 0
|
||||
13:00 + 0 => 13:00
|
||||
SET x 2:00pm + 0
|
||||
@@ -3541,10 +3541,10 @@ SET x 11:00PM + 0
|
||||
SET x 12:00pm + 0
|
||||
12:00 + 0 => 12:00
|
||||
SET x 13:00PM + 0
|
||||
../tests/test.rem(653): Ill-formed time
|
||||
../tests/test.rem(653): Ill-formed time: `13:00PM'
|
||||
|
||||
SET x '2015-02-03@0:00am' + 0
|
||||
../tests/test.rem(655): Ill-formed time
|
||||
../tests/test.rem(655): Ill-formed time: '2015-02-03@0:00am'
|
||||
SET x '2015-02-03@1:00AM' + 0
|
||||
2015-02-03@01:00 + 0 => 2015-02-03@01:00
|
||||
SET x '2015-02-03@2:00am' + 0
|
||||
@@ -3570,10 +3570,10 @@ SET x '2015-02-03@11:00AM' + 0
|
||||
SET x '2015-02-03@12:00am' + 0
|
||||
2015-02-03@00:00 + 0 => 2015-02-03@00:00
|
||||
SET x '2015-02-03@13:00AM' + 0
|
||||
../tests/test.rem(668): Ill-formed time
|
||||
../tests/test.rem(668): Ill-formed time: '2015-02-03@13:00AM'
|
||||
|
||||
SET x '2015-02-03@0:00pm' + 0
|
||||
../tests/test.rem(670): Ill-formed time
|
||||
../tests/test.rem(670): Ill-formed time: '2015-02-03@0:00pm'
|
||||
SET x '2015-02-03@1:00PM' + 0
|
||||
2015-02-03@13:00 + 0 => 2015-02-03@13:00
|
||||
SET x '2015-02-03@2:00pm' + 0
|
||||
@@ -3599,7 +3599,7 @@ SET x '2015-02-03@11:00PM' + 0
|
||||
SET x '2015-02-03@12:00pm' + 0
|
||||
2015-02-03@12:00 + 0 => 2015-02-03@12:00
|
||||
SET x '2015-02-03@13:00PM' + 0
|
||||
../tests/test.rem(683): Ill-formed time
|
||||
../tests/test.rem(683): Ill-formed time: '2015-02-03@13:00PM'
|
||||
|
||||
# Test the ampm function
|
||||
set x ampm(0:12) + ""
|
||||
@@ -5459,8 +5459,8 @@ SATSIFY ""
|
||||
REM SATISFY [version() > "01.00.00"]
|
||||
../tests/test.rem(1045): SATISFY: expression has no reference to trigdate() or $T...
|
||||
../tests/test.rem(1045): Trig = Saturday, 16 February, 1991
|
||||
version() => "05.00.04"
|
||||
"05.00.04" > "01.00.00" => 1
|
||||
version() => "05.00.05"
|
||||
"05.00.05" > "01.00.00" => 1
|
||||
../tests/test.rem(1045): Trig(satisfied) = Saturday, 16 February, 1991
|
||||
REM SATISFY [max(x, max(x, 1, 2, 3), 4, 5, 6) * 5]
|
||||
../tests/test.rem(1046): SATISFY: expression has no reference to trigdate() or $T...
|
||||
@@ -5681,8 +5681,12 @@ set xyz ! "0"
|
||||
|
||||
set zxk version(1)
|
||||
../tests/test.rem(1114): version: Too many arguments
|
||||
version(1)
|
||||
^-- here
|
||||
set zxk max()
|
||||
../tests/test.rem(1115): max: Not enough arguments
|
||||
max()
|
||||
^-- here
|
||||
|
||||
fset dooby(x) 1
|
||||
set zxk dooby()
|
||||
@@ -11848,7 +11852,7 @@ STDOUT is a: PIPE
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[0;30mBLACK[0m |[0;34mBLUE[0m |[0;32mGREEN[0m |[0;36mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|5 |[0;43m6 [0m|[0;45m7 [0m|[0;46m8 [0m|9 |10 |11 |
|
||||
|-@0 |[0;43m [0m|[0;45m [0m|[0;46m[0;30mBLACK[0m[0;46m [0m|[34;1mBRIGHT[0m |[32;1mBRIGHT[0m |[36;1mBRIGHT[0m |
|
||||
| |[0;43m [0m|[0;45m [0m|[0;46m [0m|[34;1mBLUE[0m |[32;1mGREEN[0m |[36;1mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
@@ -11870,7 +11874,7 @@ STDOUT is a: PIPE
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[30;1mBLACK[0m |[0;34mBLUE[0m |[0;32mGREEN[0m |[0;36mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|5 |[0;43m6 [0m|[0;45m7 [0m|[0;46m8 [0m|9 |10 |11 |
|
||||
|-@0,0 |[0;43m [0m|[0;45m [0m|[0;46m[0;30mBLACK[0m[0;46m [0m|[34;1mBRIGHT[0m |[32;1mBRIGHT[0m |[36;1mBRIGHT[0m |
|
||||
| |[0;43m [0m|[0;45m [0m|[0;46m [0m|[34;1mBLUE[0m |[32;1mGREEN[0m |[36;1mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
@@ -11892,7 +11896,7 @@ STDOUT is a: PIPE
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[0;30mBLACK[0m |[0;34mBLUE[0m |[0;32mGREEN[0m |[0;36mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|5 |[0;43m6 [0m|[0;45m7 [0m|[0;46m8 [0m|9 |10 |11 |
|
||||
|-@0,1 |[0;43m [0m|[0;45m [0m|[0;46m[0;30mBLACK[0m[0;46m [0m|[34;1mBRIGHT[0m |[32;1mBRIGHT[0m |[36;1mBRIGHT[0m |
|
||||
| |[0;43m [0m|[0;45m [0m|[0;46m [0m|[34;1mBLUE[0m |[32;1mGREEN[0m |[36;1mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
@@ -11914,7 +11918,7 @@ STDOUT is a: PIPE
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[38;5;0mBLACK[0m |[38;5;17mBLUE[0m |[38;5;22mGREEN[0m |[38;5;23mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|5 |[48;5;11m6 [0m|[48;5;13m7 [0m|[48;5;14m8 [0m|9 |10 |11 |
|
||||
|-@1 |[48;5;11m [0m|[48;5;13m [0m|[48;5;14m[38;5;0mBLACK[0m[48;5;14m [0m|[38;5;20mBRIGHT[0m |[38;5;40mBRIGHT[0m |[38;5;44mBRIGHT[0m |
|
||||
| |[48;5;11m [0m|[48;5;13m [0m|[48;5;14m [0m|[38;5;20mBLUE[0m |[38;5;40mGREEN[0m |[38;5;44mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
@@ -11936,7 +11940,7 @@ STDOUT is a: PIPE
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[38;5;238mBLACK[0m |[38;5;17mBLUE[0m |[38;5;22mGREEN[0m |[38;5;23mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|5 |[48;5;11m6 [0m|[48;5;13m7 [0m|[48;5;14m8 [0m|9 |10 |11 |
|
||||
|-@1,0 |[48;5;11m [0m|[48;5;13m [0m|[48;5;14m[38;5;0mBLACK[0m[48;5;14m [0m|[38;5;20mBRIGHT[0m |[38;5;40mBRIGHT[0m |[38;5;44mBRIGHT[0m |
|
||||
| |[48;5;11m [0m|[48;5;13m [0m|[48;5;14m [0m|[38;5;20mBLUE[0m |[38;5;40mGREEN[0m |[38;5;44mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
@@ -11958,7 +11962,7 @@ STDOUT is a: PIPE
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[38;5;0mBLACK[0m |[38;5;17mBLUE[0m |[38;5;22mGREEN[0m |[38;5;23mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|5 |[48;5;11m6 [0m|[48;5;13m7 [0m|[48;5;14m8 [0m|9 |10 |11 |
|
||||
|-@1,1 |[48;5;11m [0m|[48;5;13m [0m|[48;5;14m[38;5;0mBLACK[0m[48;5;14m [0m|[38;5;20mBRIGHT[0m |[38;5;40mBRIGHT[0m |[38;5;44mBRIGHT[0m |
|
||||
| |[48;5;11m [0m|[48;5;13m [0m|[48;5;14m [0m|[38;5;20mBLUE[0m |[38;5;40mGREEN[0m |[38;5;44mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
@@ -11980,7 +11984,7 @@ STDOUT is a: PIPE
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[38;2;0;0;0mBLACK[0m |[38;2;0;0;65mBLUE[0m |[38;2;0;65;0mGREEN[0m |[38;2;0;65;65mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|5 |[48;2;255;255;0m6 [0m|[48;2;255;0;255m7 [0m|[48;2;0;255;255m8 [0m|9 |10 |11 |
|
||||
|-@2 |[48;2;255;255;0m [0m|[48;2;255;0;255m [0m|[48;2;0;255;255m[38;2;0;0;0mBLACK[0m[48;2;0;255;255m [0m|[38;2;0;0;200mBRIGHT[0m |[38;2;0;200;0mBRIGHT[0m |[38;2;0;200;200mBRIGHT[0m |
|
||||
| |[48;2;255;255;0m [0m|[48;2;255;0;255m [0m|[48;2;0;255;255m [0m|[38;2;0;0;200mBLUE[0m |[38;2;0;200;0mGREEN[0m |[38;2;0;200;200mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
@@ -12002,7 +12006,7 @@ STDOUT is a: PIPE
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[38;2;65;65;65mBLACK[0m |[38;2;0;0;65mBLUE[0m |[38;2;0;65;0mGREEN[0m |[38;2;0;65;65mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|5 |[48;2;255;255;0m6 [0m|[48;2;255;0;255m7 [0m|[48;2;0;255;255m8 [0m|9 |10 |11 |
|
||||
|-@2,0 |[48;2;255;255;0m [0m|[48;2;255;0;255m [0m|[48;2;0;255;255m[38;2;0;0;0mBLACK[0m[48;2;0;255;255m [0m|[38;2;0;0;200mBRIGHT[0m |[38;2;0;200;0mBRIGHT[0m |[38;2;0;200;200mBRIGHT[0m |
|
||||
| |[48;2;255;255;0m [0m|[48;2;255;0;255m [0m|[48;2;0;255;255m [0m|[38;2;0;0;200mBLUE[0m |[38;2;0;200;0mGREEN[0m |[38;2;0;200;200mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
@@ -12024,7 +12028,7 @@ STDOUT is a: PIPE
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[38;2;0;0;0mBLACK[0m |[38;2;0;0;65mBLUE[0m |[38;2;0;65;0mGREEN[0m |[38;2;0;65;65mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|5 |[48;2;255;255;0m6 [0m|[48;2;255;0;255m7 [0m|[48;2;0;255;255m8 [0m|9 |10 |11 |
|
||||
|-@2,1 |[48;2;255;255;0m [0m|[48;2;255;0;255m [0m|[48;2;0;255;255m[38;2;0;0;0mBLACK[0m[48;2;0;255;255m [0m|[38;2;0;0;200mBRIGHT[0m |[38;2;0;200;0mBRIGHT[0m |[38;2;0;200;200mBRIGHT[0m |
|
||||
| |[48;2;255;255;0m [0m|[48;2;255;0;255m [0m|[48;2;0;255;255m [0m|[38;2;0;0;200mBLUE[0m |[38;2;0;200;0mGREEN[0m |[38;2;0;200;200mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
@@ -12592,7 +12596,7 @@ SECURITY: Won't read world-writable file or directory!
|
||||
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
|
||||
05.00.04
|
||||
05.00.05
|
||||
NOTE JSONQUEUE
|
||||
[{"priority":2,"eventstart":"VOLATILE","time":"23:59","nexttime":"23:59","tdelta":0,"trep":0,"rundisabled":0,"ntrig":1,"filename":"../tests/queue2.rem","lineno":1,"type":"MSG_TYPE","body":"XXXX"},{"priority":999,"eventstart":"VOLATILE","time":"23:58","nexttime":"23:58","tdelta":0,"trep":0,"rundisabled":0,"ntrig":1,"filename":"../tests/queue1.rem","lineno":5,"type":"MSG_TYPE","body":"quux"},{"priority":42,"eventstart":"VOLATILE","time":"23:57","nexttime":"23:57","tdelta":0,"trep":0,"rundisabled":0,"ntrig":1,"filename":"../tests/queue1.rem","lineno":4,"type":"MSG_TYPE","body":"bar"},{"priority":5000,"eventstart":"VOLATILE","time":"23:56","nexttime":"23:56","tdelta":0,"trep":0,"rundisabled":0,"ntrig":1,"filename":"../tests/queue1.rem","lineno":3,"type":"MSG_TYPE","body":"foo"}]
|
||||
NOTE ENDJSONQUEUE
|
||||
@@ -13176,11 +13180,11 @@ No reminders.
|
||||
# This is a timestamp file used by Remind to track ONCE reminders.
|
||||
# Do not edit or delete it.
|
||||
+----------------------------------------------------------------------------+
|
||||
| September 2024 |
|
||||
| September 1990 |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
| Sunday | Monday | Tuesday |Wednesday | Thursday | Friday | Saturday |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|1 |2 |3 |4 |5 |6 |7 |
|
||||
| | | | | | |1 |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
@@ -13188,7 +13192,7 @@ No reminders.
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|8 |9 |10 |11 |12 |13 |14 |
|
||||
|2 |3 |4 |5 |6 |7 |8 |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
@@ -13196,17 +13200,7 @@ No reminders.
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|15 |16 |17 |18 |19 |20 |21 |
|
||||
| | | | | | | |
|
||||
| |foo | | | | | |
|
||||
| |bar | | | | | |
|
||||
| |baz wookie| | | | | |
|
||||
| |quux apple| | | | | |
|
||||
| |blech | | | | | |
|
||||
| | | | | | | |
|
||||
| |ANOTHER | | | | | |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|22 |23 |24 |25 |26 |27 |28 |
|
||||
|9 |10 |11 |12 |13 |14 |15 |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
@@ -13214,7 +13208,25 @@ No reminders.
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|29 |30 | | | | | |
|
||||
|16 |17 |18 |19 |20 |21 |22 |
|
||||
| | | | | | | |
|
||||
|foo | | | | | | |
|
||||
|bar | | | | | | |
|
||||
|baz wookie| | | | | | |
|
||||
|quux apple| | | | | | |
|
||||
|blech | | | | | | |
|
||||
| | | | | | | |
|
||||
|ANOTHER | | | | | | |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|23 |24 |25 |26 |27 |28 |29 |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|30 | | | | | | |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
| | | | | | | |
|
||||
|
||||
Reference in New Issue
Block a user