-- Fixed bug in configure.in

without function prototypes.

ACKNOWLEDGEMENTS

@@ -1,4 +1,4 @@
-$Id: ACKNOWLEDGEMENTS,v 1.1 1998-01-19 03:33:34 dfs Exp $
+$Id: ACKNOWLEDGEMENTS,v 1.2 2000-02-18 03:45:11 dfs Exp $
 
 I would like to thank the following people:
 
@@ -45,7 +45,7 @@ Finally, all those who donated money to support the production of
 REMIND.  Your donations were gratefully appreciated.
 
 --
-David F. Skoll <dfs@doe.carleton.ca> <aa775@freenet.carleton.ca>
+David F. Skoll <dfs@roaringpenguin.com> <aa775@freenet.carleton.ca>
 986 Eiffel Avenue
 Ottawa, Ontario K2C 0J2
 CANADA

COPYRIGHT

@@ -1,10 +1,10 @@
-$Id: COPYRIGHT,v 1.11 1999-04-05 17:34:27 dfs Exp $
+$Id: COPYRIGHT,v 1.13 2000-03-15 15:51:33 dfs Exp $
 THE REMIND COPYRIGHT
 
 1. REMIND refers to the entire set of files and documentation in the
 REMIND package.
 
-2. REMIND is Copyright 1999 by Roaring Penguin Software Inc.,
+2. REMIND is Copyright 1999-2000 Roaring Penguin Software Inc.,
 except where noted in individual files.
 
 3. DISTRIBUTION AND USE
@@ -294,7 +294,7 @@ POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
 --
-David F. Skoll <dskoll@iname.com>
+David F. Skoll <dfs@roaringpenguin.com>
 986 Eiffel Avenue
 Ottawa, Ontario K2C 0J2
 CANADA

README

@@ -27,8 +27,13 @@ If you do NOT have Tcl/Tk or are NOT running X Windows:
 
 2) Edit the file "src/lang.h" to choose a language.
 
-3) Type: "make"
+3) Type: "./configure"
 
-4) Type: "make install" -- you may need to be root to do this.
+4) Type: "make"
 
-$Id: README,v 1.4 1998-01-19 03:24:03 dfs Exp $
+5) Type: "make install" -- you may need to be root to do this.
+
+$Id: README,v 1.6 2000-03-13 17:40:38 dfs Exp $
+
+Contact info: mailto:dfs@roaringpenguin.com
+Home page:    http://www.roaringpenguin.com/remind.html

build.tk

@@ -7,12 +7,12 @@
 #   A cheesy graphical front-end for building and installing REMIND.
 #
 #   This file is part of REMIND.
-#   Copyright (C) 1992-1999 by David F. Skoll
-#   Copyright (C) 1999 by Roaring Penguin Software Inc.
+#   Copyright (C) 1992-1999 David F. Skoll
+#   Copyright (C) 1999-2000 Roaring Penguin Software Inc.
 #
 #--------------------------------------------------------------
 
-# $Id: build.tk,v 1.9 1999-04-13 01:24:40 dfs Exp $
+# $Id: build.tk,v 1.10 2000-02-18 03:45:14 dfs Exp $
 
 # the next line restarts using wish \
 exec wish "$0" "$@"

configure.in

@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.5 1998-02-16 03:41:39 dfs Exp $
+dnl $Id: configure.in,v 1.8 2000-03-15 16:05:19 dfs Exp $
 
-AC_INIT(src/amiga.c)
+AC_INIT(src/queue.c)
 
 cat <<'EOF'
 
@@ -28,7 +28,7 @@ AC_CHECK_LIB(m, sqrt)
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(sys/file.h sys/time.h sys/types.h unistd.h malloc.h stdarg.h stdlib.h pwd.h)
+AC_CHECK_HEADERS(sys/file.h sys/select.h sys/time.h sys/types.h unistd.h malloc.h stdarg.h stdlib.h pwd.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -43,4 +43,8 @@ AC_HEADER_TIME
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(mktime putenv strstr timegm difftime)
 
+if test "$GCC" = yes; then
+	CFLAGS="$CFLAGS -Wall -Wstrict-prototypes"
+fi
+
 AC_OUTPUT(src/Makefile)

docs/README.AMIGA

@@ -1,6 +1,9 @@
-$Id: README.AMIGA,v 1.2 1998-01-17 04:50:33 dfs Exp $
+$Id: README.AMIGA,v 1.3 2000-02-18 03:45:29 dfs Exp $
 REMIND version 3.0 for AmigaDOS
 
+I DO NOT SUPPORT REMIND ON AmigaDOS.  THE AmigaDOS PORT HAS NOT BEEN MAINTAINED
+FOR QUITE A WHILE.
+
 REMIND is a sophisticated alarm/calendar program.  Details are given
 in the man page, "remind.1".
 
@@ -20,12 +23,12 @@ This will create remind, which is ready to be executed.
 
 See README.UNIX for more info.
 
-
 --
-David F. Skoll <dfs@doe.carleton.ca>
+David F. Skoll <dfs@roaringpenguin.com>
 986 Eiffel Avenue
 Ottawa, Ontario K2C 0J2
 CANADA
 
 Tel. (613) 225-8687
+http://www.roaringpenguin.com/remind.html
 

docs/README.BCC

@@ -1,4 +1,4 @@
-$Id: README.BCC,v 1.2 1998-01-17 04:50:33 dfs Exp $
+$Id: README.BCC,v 1.3 2000-02-18 03:45:30 dfs Exp $
 REMIND version 3.0 for Borland C++
 
 IMPORTANT NOTE: BCC SUPPORT MAY BE BROKEN.  I DON'T CARE.  I'M NOT
@@ -24,10 +24,10 @@ directories.
 See README.UNIX for more info.
 
 --
-David F. Skoll <dfs@doe.carleton.ca>
+David F. Skoll <dfs@roaringpenguin.com>
 986 Eiffel Avenue
 Ottawa, Ontario K2C 0J2
 CANADA
 
 Tel. (613) 225-8687
-
+http://www.roaringpenguin.com/remind.html

docs/README.DOS

@@ -1,4 +1,4 @@
-$Id: README.DOS,v 1.2 1998-01-17 04:50:33 dfs Exp $
+$Id: README.DOS,v 1.3 2000-02-18 03:45:31 dfs Exp $
 REMIND version 3.0 for MS-DOS
 
 IMPORTANT NOTE:  DOS SUPPORT MAY BE BROKEN.  I DON'T CARE.  I NO LONGER
@@ -29,10 +29,10 @@ as well as U.S. and Jewish holidays.
 See README.UNIX for more info.
 
 --
-David F. Skoll <dfs@doe.carleton.ca>
+David F. Skoll <dfs@roaringpenguin.com>
 986 Eiffel Avenue
 Ottawa, Ontario K2C 0J2
 CANADA
 
 Tel. (613) 225-8687
-
+http://www.roaringpenguin.com/remind.html

docs/README.OS2

@@ -1,6 +1,9 @@
-$Id: README.OS2,v 1.2 1998-01-17 04:50:34 dfs Exp $
+$Id: README.OS2,v 1.3 2000-02-18 03:45:32 dfs Exp $
 REMIND version 3.0 for OS/2
 
+I DO NOT SUPPORT REMIND ON OS/2.  THE OS/2 PORT HAS NOT BEEN MAINTAINED
+FOR QUITE A WHILE.
+
 This file contains instructions for compiling Remind under OS/2 with
 Eberhard Mattes' emx/gcc compiler and with the Microsoft C compiler.
 There are a number of targets in Makefile.os2, including OS/2-only 
@@ -99,11 +102,13 @@ exit
 
 See README.UNIX for some more information about Remind.
 
---
-David F. Skoll <dfs@doe.carleton.ca>
+David F. Skoll <dfs@roaringpenguin.com>
 986 Eiffel Avenue
 Ottawa, Ontario K2C 0J2
 CANADA
 
 Tel. (613) 225-8687
+http://www.roaringpenguin.com/remind.html
+
+
 

docs/README.UNIX

@@ -1,4 +1,4 @@
-$Id: README.UNIX,v 1.4 1998-01-19 03:24:09 dfs Exp $
+$Id: README.UNIX,v 1.5 2000-02-18 03:45:33 dfs Exp $
 REMIND version 3.0 for UNIX
 
 REMIND is a sophisticated alarm/calendar program.  Details are given
@@ -125,9 +125,10 @@ exit
 
 
 --
-David F. Skoll <dfs@doe.carleton.ca>
+David F. Skoll <dfs@roaringpenguin.com>
 986 Eiffel Avenue
 Ottawa, Ontario K2C 0J2
 CANADA
 
 Tel. (613) 225-8687
+http://www.roaringpenguin.com/remind.html

docs/README_QDOS

@@ -1,6 +1,9 @@
-$Id: README_QDOS,v 1.3 1998-03-01 20:43:04 dfs Exp $
+$Id: README_QDOS,v 1.4 2000-02-18 03:45:34 dfs Exp $
 REMIND version 3.0.19 for QDOS / SMSQ
 
+I DO NOT SUPPORT REMIND ON QDOS.  THE QDOS PORT HAS NOT BEEN MAINTAINED
+FOR QUITE A WHILE.
+
 REMIND is a sophisticated alarm/calendar program.  Details are given
 in the documentation file, "remind_doc" (QUILL format).
 [Note from David Skoll -- I was not sent the file `remind_doc', so

docs/WHATSNEW.30

@@ -1,5 +1,36 @@
 CHANGES TO REMIND
 
+* Version 3.0 Patch 21
+
++ MINOR ENHANCEMENTS
+
+- Updated copyright years and contact info.
+
+- Changed GIF images to PNG to avoid patent problems.
+
+- Added "cm2trem.tcl" to convert from CDE's "cm" calendar manager to Remind
+  format.  It handles only an older version of "cm" data; there is a utility
+  available (under Solaris anyway) to convert newer files to the older "cm"
+  format.
+
+- Fixed the scripts in the "www" directory to install and work properly.
+
+- Added "remind.vim" file for Vim syntax highlighting of Remind files,
+  thanks to Davide Alberani.
+
+- Added "dusk" and "dawn" built-in functions, thanks to Ron Aaron.
+
++ BUG FIXES
+
+- Files for no-longer-supported platforms (OS/2, amiga, MS-DOS) have been
+  moved to OBSOLETE subdirectory.  They will disappear unless someone
+  wants to maintain them.
+
+- Fixed typo which caused compilation failure on compilers without function
+  prototypes.  Thanks to Ian Darwin for the patch.
+
+- Fixed compilation problem on FreeBSD, IRIX, Tru64 and other UNIXes.
+
 * Version 3.0 Patch 20
 
 + NEWS

examples/defs.rem

@@ -17,13 +17,13 @@
 #  "#COLORS" for examples of ANSI color escape sequences.                   #
 # 									    #
 # This file is part of REMIND.						    #
-# Copyright (C) 1992-1997 by David F. Skoll        			    #
-# Copyright (C) 1999 by Roaring Penguin Software Inc.                       #
+# Copyright (C) 1992-1997 David F. Skoll                                    #
+# Copyright (C) 1999-2000 Roaring Penguin Software Inc.                     #
 # 									    #
 #############################################################################
 
 #
-# $Id: defs.rem,v 1.3 1999-04-05 17:34:38 dfs Exp $
+# $Id: defs.rem,v 1.4 2000-02-18 03:45:36 dfs Exp $
 #
 
 RUN OFF

examples/remind.vim

@@ -0,0 +1,53 @@
+" Vim syntax file
+" Language:	Remind
+" Maintainer:	Davide Alberani <alberanid@bigfoot.com>
+" Last change:	03 Dec 1999
+" Version:	0.1
+" URL:		http://members.xoom.com/alberanid/vim/syntax/remind.vim
+"
+" remind is a sophisticated reminder service
+" you can download remind from ftp://ftp.doe.carleton.ca/pub/remind-3.0/
+
+" clear any unwanted syntax defs
+syn clear
+
+" shut case off
+syn case ignore
+
+syn keyword remindCommands	REM OMIT SET FSET UNSET
+syn keyword remindExpiry	UNTIL SCANFROM SCAN WARN SCHED
+syn keyword remindTag		PRIORITY TAG
+syn keyword remindTimed		AT DURATION
+syn keyword remindMove		ONCE SKIP BEFORE AFTER
+syn keyword remindSpecial	INCLUDE INC BANNER PUSH-OMIT-CONTEXT PUSH CLEAR-OMIT-CONTEXT CLEAR POP-OMIT-CONTEXT POP
+syn keyword remindRun		MSG MSF RUN CAL SATISFY SPECIAL PS PSFILE SHADE MOON
+syn keyword remindConditional	IF ELSE ENDIF IFTRIG
+syn match remindComment		"#.*$"
+syn region remindString		start=+'+ end=+'+ skip=+\\\\\|\\'+ oneline
+syn region remindString		start=+"+ end=+"+ skip=+\\\\\|\\"+ oneline
+syn keyword remindDebug		DEBUG DUMPVARS DUMP ERRMSG FLUSH PRESERVE
+syn match remindVar		"\$[_a-zA-Z][_a-zA-Z0-9]*"
+syn match remindSubst		"%[^ ]"
+syn match remindAdvanceNumber	"\(\*\|+\|-\|++\|--\)[0-9]\+"
+
+if !exists("did_remind_syntax_inits")
+  let did_remind_syntax_inits = 1
+  hi link remindCommands	Function
+  hi link remindExpiry		Repeat
+  hi link remindTag		Label
+  hi link remindTimed		Statement
+  hi link remindMove		Statement
+  hi link remindSpecial		Include
+  hi link remindRun		Function
+  hi link remindConditional	Conditional
+  hi link remindComment		Comment
+  hi link remindString		String
+  hi link remindDebug		Debug
+  hi link remindVar		Identifier
+  hi link remindSubst		Constant
+  hi link remindAdvanceNumber	Number
+endif
+
+let b:current_syntax = "remind"
+
+"EOF	vim: ts=8 noet tw=100 sw=8 sts=0

man/cm2rem.1

@@ -0,0 +1,29 @@
+.\" $Id: cm2rem.1,v 1.2 2000-03-15 15:51:36 dfs Exp $
+.TH CM2REM 1 "18 October 1999"
+.UC4
+.SH NAME
+cm2rem.tcl \- Convert Sun's "cm" input file to Remind format
+.SH SYNOPSIS
+.B cm2rem.tcl < cm_file > remind_file
+.SH DESCRIPTION
+\fBcm2rem.tcl\fR reads the Sun calendar manager data file and converts
+it into a \fBRemind\fR script.  Note that \fBcm2rem.tcl\fR can convert
+\fIonly\fR version 3 calendar manager files.  If you are using version 4
+files, there should be a system utility to convert them to version 3 files.
+.SH AUTHOR
+\fBcm2rem.tcl\fR is supported by Roaring Penguin Software
+Inc. (http://www.roaringpenguin.com)
+.PP
+\fBcm2rem.tcl\fR was written by David F. Skoll <dfs@roaringpenguin.com>.
+.SH BUGS
+Not all of the Sun calendar manager options are respected.  In particular,
+nothing is done for e-mail actions.  Also, the resulting Remind script
+is not editable with \fBTkRemind\fR; you can only edit it with a text
+editor.
+.PP
+\fBcm2rem.tcl\fR requires Tcl/Tk version 8.0 or higher.  The
+\fBtclsh\fR interpreter must be on your \fBpath\fR.
+
+.SH SEE ALSO
+\fBremind(1)\fR, \fBtkremind(1)\fR
+

man/rem2ps.1

@@ -1,4 +1,4 @@
-.\" $Id: rem2ps.1,v 1.3 1999-04-13 01:46:18 dfs Exp $
+.\" $Id: rem2ps.1,v 1.4 2000-03-15 15:51:37 dfs Exp $
 .TH REM2PS 1 "1 February 1998"
 .UC4
 .SH NAME
@@ -374,7 +374,7 @@ subsequent months is forthcoming.
 Rem2PS is now supported by Roaring Penguin Software
 Inc. (http://www.roaringpenguin.com)
 .PP
-Rem2PS was written by David F. Skoll (dskoll@iname.com).
+Rem2PS was written by David F. Skoll <dfs@roaringpenguin.com>.
 .SH BUGS
 All \fBRem2ps\fR options are case-sensitive, unlike \fBRemind\fR.
 Any time you supply

man/remind.1

@@ -1,5 +1,5 @@
-.\" $Id: remind.1,v 1.10 1999-04-13 01:46:19 dfs Exp $
-.TH REMIND 1 "1 February 1998"
+.\" $Id: remind.1,v 1.12 2000-03-15 15:51:38 dfs Exp $
+.TH REMIND 1 "17 February 2000"
 .UC 4
 .SH NAME
 remind \- a sophisticated reminder service
@@ -1068,7 +1068,7 @@ is similar to \fB%3\fR but displays the current time.
 .TP
 .B 
 %"
-(percent-doublequote) is removed.  This sequence is not 
+(percent-doublequote - ") is removed.  This sequence is not 
 used by the substitution filter,
 but is used to tell \fBRemind\fR which text to include in a calendar
 entry when the \fB\-c\fR, \fB\-s\fR or \fB\-p\fR option is chosen.
@@ -1885,6 +1885,10 @@ converted using the reverse of procedures described above.  A
 The \fBdate()\fR function returns a \fBDATE\fR object with the year,
 month and day components specified by \fIy\fR, \fIm\fR and \fId\fR.
 .TP
+.B dawn([d_date])
+Returns the time of "civil dawn" on the specified \fIdate\fR.  If \fIdate\fR
+is omitted, defaults to \fBtoday()\fR.
+.TP
 .B day(d_date)
 This function takes a \fBDATE\fR as an argument, and returns an \fBINT\fR
 which is the day-of-month component of \fIdate\fR.
@@ -1929,6 +1933,10 @@ will produce undefined results.
 \fBRemind\fR.
 .RE
 .TP
+.B dusk([d_date])
+Returns the time of "civil twilight" on the specified \fIdate\fR.  If
+\fIdate\fR is omitted, defaults to \fBtoday()\fR.
+.TP
 .B easterdate(di_arg)
 If \fIarg\fR is an \fBINT\fR, then returns the date of Easter Sunday
 for the specified year.  If \fIarg\fR is a \fBDATE\fR, then returns the
@@ -3713,7 +3721,7 @@ versions of \fBRemind\fR prior to 03.00.01.
 Remind is now supported by Roaring Penguin Software
 Inc. (http://www.roaringpenguin.com)
 .PP
-David F. Skoll (dskoll@iname.com) wrote \fBRemind\fR.  The moon code
+David F. Skoll <dfs@roaringpenguin.com> wrote \fBRemind\fR.  The moon code
 was copied largely unmodified from "moontool" by John Walker.  The
 sunrise and sunset functions use ideas from programs by Michael
 Schwartz and Marc T. Kaufman.  The Hebrew calendar support was taken

man/tkremind.1

@@ -1,4 +1,4 @@
-.\" $Id: tkremind.1,v 1.8 1999-04-13 01:46:20 dfs Exp $ "
+.\" $Id: tkremind.1,v 1.9 2000-03-15 15:51:39 dfs Exp $ "
 .TH TKREMIND 1 "15 February 1998"
 .UC 4
 .SH NAME
@@ -309,7 +309,7 @@ This line is emitted in response to a \fBSTATUS\fR command.  The number
 TkRemind is now supported by Roaring Penguin Software
 Inc. (http://www.roaringpenguin.com)
 .PP
-TkRemind was written by David F. Skoll (dskoll@iname.com)
+TkRemind was written by David F. Skoll <dfs@roaringpenguin.com>.
 
 \fBTkRemind\fR is Copyright 1996-1998 by David F. Skoll, Copyright
 1999 by Roaring Penguin Software Inc.

remind.lsm

@@ -1,7 +1,7 @@
 Begin3
 Title:		Remind          
-Version:	03.00.19
-Entered-date:   9 May 1998
+Version:	03.00.21
+Entered-date:   12 Apr 1999
 Description:    Full-featured calendar/reminder program featuring
 		sophisticated date calculation, moon phases, sunrise/sunset,
 		Hebrew calendar, alarms, PostScript output, X-Windows
@@ -10,14 +10,14 @@ Description:    Full-featured calendar/reminder program featuring
 		platforms.  Includes scripts for making a nice WWW
 		calendar server.
 Keywords:       calendar reminder alarm datebook PostScript www
-Author:         aa775@freenet.carleton.ca (David F. Skoll)
-Maintained-by:  aa775@freenet.carleton.ca (David F. Skoll)
+Author:         dskoll@iname.com (David F. Skoll)
+Maintained-by:  dskoll@iname.com (David F. Skoll)
 Primary-site:   ftp.doe.carleton.ca /pub/Remind-3.0
-		266kB remind-3.0.19.tgz
+		304kB remind-3.0.21.tgz
 Alternate-site: 
 Original-site:  
 Platform:       Linux, Solaris, SunOS, HP-UX -- virtually any UN*X-like
 		system.  Wish 8.x required for TCL/Tk front-end, but
 		this is not essential to use the software.
-Copying-policy: GPL (No ports to MS Windows allowed)
+Copying-policy: GPL
 End

scripts/cm2rem.tcl

@@ -0,0 +1,361 @@
+#!/bin/sh
+# -*-Mode: TCL;-*-
+
+#--------------------------------------------------------------
+#   cm2rem.tcl
+#
+#   A cheesy Tcl script to convert Sun's "cm" calendar manager
+#   files (version 3 only) to Remind format.
+#
+#   This file is part of REMIND.
+#   Copyright (C) 1992-1998 by David F. Skoll
+#   Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+#
+#--------------------------------------------------------------
+
+# $Id: cm2rem.tcl,v 1.3 2000-02-18 03:45:38 dfs Exp $
+
+# the next line restarts using tclsh \
+exec tclsh "$0" "$@"
+
+set i 0
+foreach month {January February March April May June
+    July August September October November December} {
+    incr i
+    set MonthNum($month) $i
+    set FullMonth([string range $month 0 2]) $month
+}
+
+#***********************************************************************
+# %PROCEDURE: convertParens
+# %ARGUMENTS:
+#  line -- a line read from a cm file
+# %RETURNS:
+#  A new line with all ( and ) outside quotes converted to { and }.
+#  This cheap trick allows us to use Tcl's built-in list manipulation
+#  functions to munge the line.
+#***********************************************************************
+proc convertParens { line } {
+    # Convert all ( and ) to { and } unless they are inside a quoted
+    # string
+    set out ""
+    set len [string length $line]
+    set inQuotes 0
+    for {set i 0} {$i < $len} {incr i} {
+	set char [string range $line $i $i]
+	if {$char == "\\" && $inQuotes} {
+	    append out $char
+	    incr i
+	    set char [string range $line $i $i]
+	    append out $char
+	    continue
+	}
+
+	if {$char == "(" && !$inQuotes} {
+	    set char \{
+	}
+
+	if {$char == ")" && !$inQuotes} {
+	    set char \}
+	}
+
+	if {$char == "\""} {
+	    set inQuotes [expr !$inQuotes]
+	}
+
+	append out $char
+    }
+    return $out
+}
+
+#***********************************************************************
+# %PROCEDURE: processLine
+# %ARGUMENTS:
+#  line -- a line read from a cm file
+# %RETURNS:
+#  Nothing
+# %DESCRIPTION:
+#  Processes a single line from the file, possibly writing a reminder
+#  in Remind format to stdout
+#***********************************************************************
+proc processLine { line } {
+    global Attributes
+    global FullMonth
+
+    catch {unset Attributes}
+
+    # Only convert lines which start with "(add"
+    if {[string range $line 0 3] != "(add"} {
+	return
+    }
+    set line [convertParens $line]
+    # Convert it to a list.  CAREFUL:  Potential security problem if
+    # $line contains something nasty.
+
+    eval set line $line
+
+    set Attributes(body) ""
+    foreach {key val} $line {
+	switch -exact -- $key {
+	    "add" {
+		set Attributes(date) $val
+	    }
+	    "what:" {
+		append Attributes(body) $val
+	    }
+	    "details:" {
+		append Attributes(body) $val
+	    }
+	    "duration:" {
+		set Attributes(duration) $val
+	    }
+	    "period:" {
+		set Attributes(period) $val
+	    }
+	    "ntimes:" {
+		set Attributes(ntimes) $val
+	    }
+	    "attributes:" {
+		set Attributes(action) $val
+	    }
+		
+	}
+    }
+
+    if {[info exists Attributes(action)]} {
+	# Nuke quotes and commas in action
+	regsub -all {[,\"]} $Attributes(action) { } Attributes(action)
+
+	# Add spaces to pairs
+	regsub -all \}\{  $Attributes(action) \}\ \{ Attributes(action)
+
+	# Add another pair of brackets to make a proper list
+	set Attributes(action) "{$Attributes(action)}"
+
+	# Convert to a real Tcl list
+	eval set Attributes(action) $Attributes(action)
+    }
+    # Split out date into month, day, year, time parts
+    scan $Attributes(date) "%s%s%s%s%s" wkday month day time year
+    set time [string range $time 0 4]
+    set Attributes(wkday) $wkday
+    set Attributes(month) $FullMonth($month)
+    set Attributes(day) $day
+    set Attributes(time) $time
+    set Attributes(year) $year
+
+    # Convert newlines in body to spaces
+    set body $Attributes(body)
+    regsub -all "\n" $body " " body
+
+    # TODO: Escape BODY to get rid of [] chars.
+    set Attributes(body) $body
+
+    # Convert to Reminder format
+    convertReminder
+}
+
+#***********************************************************************
+# %PROCEDURE: convertReminder
+# %ARGUMENTS:
+#  None -- uses global Attributes variable which must be filled in
+# %RETURNS:
+#  Nothing
+# %DESCRIPTION:
+#  Converts a reminder to Remind format.
+#***********************************************************************
+proc convertReminder {} {
+    global Attributes
+    switch -exact $Attributes(period) {
+	single { convertSingleReminder }
+	daily  { convertDailyReminder  }
+	weekly { convertWeeklyReminder }
+	monthly { convertMonthlyReminder }
+	yearly { convertYearlyReminder }
+	default {
+	    puts "\# Unable to convert reminder with period $Attributes(period)"
+	    puts "\# Body is: $Attributes(body)"
+	}
+    }
+}
+
+#***********************************************************************
+# %PROCEDURE: convertSingleReminder
+# %ARGUMENTS:
+#  None -- uses global Attributes variable which must be filled in
+# %RETURNS:
+#  Nothing
+# %DESCRIPTION:
+#  Converts a reminder with "single" period to Remind format.
+#***********************************************************************
+proc convertSingleReminder {} {
+    global Attributes
+    puts "REM $Attributes(day) $Attributes(month) $Attributes(year) [at][duration]MSG $Attributes(body)"
+}
+
+#***********************************************************************
+# %PROCEDURE: convertDailyReminder
+# %ARGUMENTS:
+#  None -- uses global Attributes variable which must be filled in
+# %RETURNS:
+#  Nothing
+# %DESCRIPTION:
+#  Converts a reminder with "daily" period to Remind format.
+#***********************************************************************
+proc convertDailyReminder {} {
+    global Attributes
+    set ntimes [expr $Attributes(ntimes) - 1]
+    if {$ntimes <= 1} {
+	convertSingleReminder
+	return
+    }
+    set until [getUntilDate $Attributes(day) $Attributes(month) $Attributes(year) $ntimes]
+
+    puts "REM $Attributes(day) $Attributes(month) $Attributes(year) *1 [at][duration]UNTIL $until MSG $Attributes(body)"
+}
+
+#***********************************************************************
+# %PROCEDURE: convertWeeklyReminder
+# %ARGUMENTS:
+#  None -- uses global Attributes variable which must be filled in
+# %RETURNS:
+#  Nothing
+# %DESCRIPTION:
+#  Converts a reminder with "daily" period to Remind format.
+#***********************************************************************
+proc convertWeeklyReminder {} {
+    global Attributes
+    set ntimes [expr $Attributes(ntimes) - 1]
+    if {$ntimes <= 1} {
+	convertSingleReminder
+	return
+    }
+    set until [getUntilDate $Attributes(day) $Attributes(month) $Attributes(year) [expr $ntimes * 7]]
+
+    puts "REM $Attributes(day) $Attributes(month) $Attributes(year) *7 [at][duration]UNTIL $until MSG $Attributes(body)"
+}
+
+#***********************************************************************
+# %PROCEDURE: convertMonthlyReminder
+# %ARGUMENTS:
+#  None -- uses global Attributes variable which must be filled in
+# %RETURNS:
+#  Nothing
+# %DESCRIPTION:
+#  Converts a reminder with "monthly" period to Remind format.
+#***********************************************************************
+proc convertMonthlyReminder {} {
+    global Attributes
+    set ntimes [expr $Attributes(ntimes) - 1]
+    if {$ntimes <= 1} {
+	convertSingleReminder
+	return
+    }
+
+    # If repetition > 1000, it's infinite
+    if {$ntimes > 1000} {
+	puts "REM $Attributes(day) [at][duration]MSG $Attributes(body)"
+	return
+    }
+
+    ### UNTIL date is fudged!
+    set until [getUntilDate $Attributes(day) $Attributes(month) $Attributes(year) [expr $ntimes * 30]]
+
+    puts "REM $Attributes(day) [at][duration]UNTIL $until MSG $Attributes(body)"
+}
+
+#***********************************************************************
+# %PROCEDURE: convertYearlyReminder
+# %ARGUMENTS:
+#  None -- uses global Attributes variable which must be filled in
+# %RETURNS:
+#  Nothing
+# %DESCRIPTION:
+#  Converts a reminder with "yearly" period to Remind format.
+#***********************************************************************
+proc convertYearlyReminder {} {
+    global Attributes
+
+    # No special handling of ntimes et al.
+    puts "REM $Attributes(day) $Attributes(month) [at][duration]MSG $Attributes(body)"
+
+}
+
+#***********************************************************************
+# %PROCEDURE: at
+# %ARGUMENTS:
+#  None -- uses Attributes global variable
+# %RETURNS:
+#  A string providing the correct AT clause for a timed reminder.
+#***********************************************************************
+proc at {} {
+    global Attributes
+    if {![info exists Attributes(time)]} {
+	return ""
+    }
+    if {"$Attributes(time)" == ""} {
+	return ""
+    }
+
+    return "AT $Attributes(time) "
+}
+
+#***********************************************************************
+# %PROCEDURE: duration
+# %ARGUMENTS:
+#  None -- uses Attributes global variable
+# %RETURNS:
+#  A string providing the correct DURATION clause for a timed reminder.
+#***********************************************************************
+proc duration {} {
+    global Attributes
+    if {![info exists Attributes(duration)]} {
+	return ""
+    }
+    if {"$Attributes(duration)" == ""} {
+	return ""
+    }
+    set h [expr $Attributes(duration) / 3600]
+    set remainder [expr $Attributes(duration) - $h*3600]
+    set m [expr $remainder / 60]
+    return "DURATION [format "%d:%02d " $h $m]"
+}
+
+#***********************************************************************
+# %PROCEDURE: getUntilDate
+# %ARGUMENTS:
+#  day, month, year -- a date
+#  days -- number of days to add to date
+# %RETURNS:
+#  The date which is "days" later than supplied date in a correct UNTIL
+#  format.
+#***********************************************************************
+proc getUntilDate { day month year days } {
+    global RemindPipe
+    global MonthNum
+    set date "'$year/$MonthNum($month)/$day'"
+    puts $RemindPipe "MSG \[trigger($date + $days)\]%"
+    puts $RemindPipe "flush"
+    flush $RemindPipe
+    gets $RemindPipe line
+    return $line
+}
+
+catch {wm withdraw .}
+# Start a Remind process to issue reminders
+if {[catch {set RemindPipe [open "|remind -" "r+"]} err]} {
+    puts stderr "Error: Cannot run Remind: $err"
+    exit 1
+}
+
+puts $RemindPipe "banner %"
+flush $RemindPipe
+
+# Write some blurb
+puts "\# Reminder file converted from \"cm\" data by cm2rem.tcl"
+puts ""
+
+while {[gets stdin line] >= 0} {
+    processLine $line
+}
+exit 0

scripts/remind-all.sh

@@ -3,10 +3,10 @@
 
 # This file is part of REMIND
 #
-# $Id: remind-all.sh,v 1.3 1999-04-05 17:34:40 dfs Exp $
+# $Id: remind-all.sh,v 1.4 2000-02-18 03:45:39 dfs Exp $
 #
 # REMIND is Copyright (C) 1992-1998 by David F. Skoll        
-# Copyright (C) 1999 by Roaring Penguin Software Inc.
+# Copyright (C) 1999-2000 Roaring Penguin Software Inc.
 # This file is Copyright (C) 1990 by Bill Aten
 
 # Thanks to Bill Aten for this script.

scripts/tkremind

@@ -7,12 +7,12 @@
 #   A cheesy graphical front/back end for Remind using Tcl/Tk
 #
 #   This file is part of REMIND.
-#   Copyright (C) 1992-1998 by David F. Skoll
-#   Copyright (C) 1999 by Roaring Penguin Software Inc.
+#   Copyright (C) 1992-1998 David F. Skoll
+#   Copyright (C) 1999-2000 Roaring Penguin Software Inc.
 #
 #--------------------------------------------------------------
 
-# $Id: tkremind,v 1.26 1999-04-13 01:39:33 dfs Exp $
+# $Id: tkremind,v 1.28 2000-02-18 03:55:47 dfs Exp $
 
 # the next line restarts using wish \
 exec wish "$0" "$@"
@@ -2071,8 +2071,8 @@ proc main {} {
     rename drawLogo {}
 
     global AppendFile HighestTagSoFar DayNames
-    puts "\nTkRemind Copyright (C) 1996-1998 by David F. Skoll"
-    puts "Copyright (C) 1999 by Roaring Penguin Software Inc."
+    puts "\nTkRemind Copyright (C) 1996-1998 David F. Skoll"
+    puts "Copyright (C) 1999-2000 Roaring Penguin Software Inc."
     LoadOptions
     CreateMoonImages
     Initialize

src/Makefile.in

@@ -1,8 +1,8 @@
 # Makefile.in for REMIND
 # 
-# $Id: Makefile.in,v 1.11 1998-05-10 02:19:20 dfs Exp $
+# $Id: Makefile.in,v 1.16 2000-03-15 16:03:39 dfs Exp $
 
-VERSION= 03.00.19
+VERSION=03.00.21
 SHELL= /bin/sh
 
 srcdir=@srcdir@
@@ -19,10 +19,11 @@ INSTALL_DATA=@INSTALL_DATA@
 
 PROGS=		remind rem2ps
 SCRIPTS=	$(srcdir)/../scripts/kall $(srcdir)/../scripts/rem \
-		$(srcdir)/../scripts/tkremind
+		$(srcdir)/../scripts/tkremind $(srcdir)/../scripts/cm2rem.tcl
+
 MANS=		$(srcdir)/../man/kall.1 $(srcdir)/../man/rem.1 \
 		$(srcdir)/../man/rem2ps.1 $(srcdir)/../man/remind.1 \
-		$(srcdir)/../man/tkremind.1
+		$(srcdir)/../man/tkremind.1 $(srcdir)/../man/cm2rem.1
 
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -39,7 +40,7 @@ test: remind
 	sh ../tests/test-rem
 
 .c.o:
-	@CC@ -c @CFLAGS@ @DEFS@ $(LANGDEF) -DUNIX -I. -I$(srcdir) $<
+	@CC@ -c @CFLAGS@ @DEFS@ $(CEXTRA) $(LANGDEF) -DUNIX -I. -I$(srcdir) $<
 
 rem2ps: rem2ps.o dynbuf.o
 	@CC@ @LDFLAGS@ -o rem2ps rem2ps.o dynbuf.o
@@ -70,18 +71,16 @@ depend:
 # distributions, etc.
 
 # Build a tar file based on all files checked into CVS.
-tgz:
+distro:
 	ln -s .. remind-$(VERSION)
 	peekentry `find remind-$(VERSION) -depth -follow -name 'Entries' -print` | xargs tar cvf remind-$(VERSION).tar
 	gzip -v -9 remind-$(VERSION).tar
-	mv remind-$(VERSION).tar.gz remind-$(VERSION).tgz
 	rm -f remind-$(VERSION)
 
 beta-tgz:
 	ln -s .. remind-$(VERSION)-BETA
 	peekentry `find remind-$(VERSION)-BETA -depth -follow -name 'Entries' -print` | xargs tar cvf remind-$(VERSION)-BETA.tar
 	gzip -v -9 remind-$(VERSION)-BETA.tar
-	mv remind-$(VERSION)-BETA.tar.gz remind-$(VERSION)-BETA.tgz
 	rm -f remind-$(VERSION)-BETA
 #---------------- Stuff after this added by "make depend" -----------------
 

src/OBSOLETE/Makefile_QDOS

@@ -1,4 +1,4 @@
-#$Id: Makefile_QDOS,v 1.2 1998-03-01 20:43:53 dfs Exp $
+#$Id: Makefile_QDOS,v 1.1 2000-03-15 16:03:57 dfs Exp $
 # Makefile for REMIND for QDOS / SMSQ
 
 #-----------------------------------------------------------------------------
@@ -24,7 +24,6 @@ LDFLAGS= -bufp200K
 # YOU SHOULDN'T EDIT ANYTHING BELOW HERE.  You may want to change some things
 # in config_h; then, you should be able to type 'make'.
 #-----------------------------------------------------------------------------
-VERSION= 03.00.19
 MATHLIB= -lm
 
 HDRS= config_h err_h expr_h globals_h protos_h types_h version_h \

src/OBSOLETE/amiga.c

@@ -8,11 +8,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Remind is Copyright (C) 1992-1998 by David F. Skoll        */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 #include "config.h"
-static char const RCSID[] = "$Id: amiga.c,v 1.3 1999-04-05 17:34:42 dfs Exp $";
+static char const RCSID[] = "$Id: amiga.c,v 1.1 2000-03-15 16:03:57 dfs Exp $";
 
 #include <stdlib.h>
 #include <string.h>

src/OBSOLETE/makefile.bcc

@@ -1,7 +1,5 @@
 # Makefile for REMIND for Borland C++
-# $Id: makefile.bcc,v 1.2 1998-03-01 20:43:56 dfs Exp $
-
-VERSION= 03.00.19
+# $Id: makefile.bcc,v 1.1 2000-03-15 16:03:57 dfs Exp $
 
 MODEL=l
 

src/OBSOLETE/makefile.msc

@@ -1,5 +1,5 @@
 # Makefile for REMIND for Microsoft C for MSDOS
-# $Id: makefile.msc,v 1.1 1998-01-15 02:50:32 dfs Exp $
+# $Id: makefile.msc,v 1.1 2000-03-15 16:03:57 dfs Exp $
 
 OBJS= calendar.obj dorem.obj dosubst.obj expr.obj files.obj funcs.obj \
 globals.obj init.obj main.obj omit.obj token.obj trigger.obj userfns.obj \

src/OBSOLETE/makefile.os2

@@ -1,6 +1,6 @@
 # Makefile for REMIND
 #
-# $Id: makefile.os2,v 1.1 1998-01-15 02:50:32 dfs Exp $
+# $Id: makefile.os2,v 1.1 2000-03-15 16:03:57 dfs Exp $
 #
 # THIS IS OUT OF DATE!
 #

src/OBSOLETE/makefile.tc

@@ -1,8 +1,7 @@
 # Makefile for REMIND for Turbo C for MSDOS
-# $Id: makefile.tc,v 1.2 1998-03-01 20:43:57 dfs Exp $
+# $Id: makefile.tc,v 1.1 2000-03-15 16:03:57 dfs Exp $
 
 CC= tcc
-VERSION= 03.00.19
 
 HDRS= config.h err.h expr.h globals.h protos.h types.h version.h \
 lang.h english.h german.h dutch.h finnish.h french.h norwgian.h \

src/OBSOLETE/os2func.c

@@ -8,12 +8,12 @@
 /*                                                             */
 /*  This file is Copyright (C) 1993 by Russ Herman.            */
 /*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: os2func.c,v 1.3 1999-04-05 17:34:54 dfs Exp $";
+static char const RCSID[] = "$Id: os2func.c,v 1.1 2000-03-15 16:03:57 dfs Exp $";
 
 #ifdef OS2_POPUP
 #define INCL_VIO

src/OBSOLETE/smakefile

@@ -1,4 +1,4 @@
-# $Id: smakefile,v 1.1 1998-01-15 02:50:36 dfs Exp $
+# $Id: smakefile,v 1.1 2000-03-15 16:03:57 dfs Exp $
 # Makefile for REMIND, suitable for SAS/C 6.50 under AmigaDOS
 # English version
 # THIS IS OUT OF DATE!

src/calendar.c

@@ -6,12 +6,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: calendar.c,v 1.8 1999-04-05 17:34:42 dfs Exp $";
+static char const RCSID[] = "$Id: calendar.c,v 1.9 2000-02-18 03:45:43 dfs Exp $";
 
 #include <stdio.h>
 #include <string.h>

src/config.h.in

@@ -1,6 +1,6 @@
 /* src/config.h.in.  Generated automatically from configure.in by autoheader.  */
 
-/* $Id: config.h.in,v 1.3 1998-02-16 03:41:44 dfs Exp $ */
+/* $Id: config.h.in,v 1.4 2000-02-18 03:45:44 dfs Exp $ */
 
 /* Define to empty if the keyword does not work.  */
 #undef const
@@ -68,6 +68,9 @@
 /* Define if you have the <sys/time.h> header file.  */
 #undef HAVE_SYS_TIME_H
 
+/* Define if you have the <sys/select.h> header file.  */
+#undef HAVE_SYS_SELECT_H
+
 /* Define if you have the <sys/types.h> header file.  */
 #undef HAVE_SYS_TYPES_H
 

src/custom.h

@@ -7,11 +7,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: custom.h,v 1.19 1999-04-05 17:42:35 dfs Exp $ */
+/* $Id: custom.h,v 1.23 2000-03-12 12:52:02 dfs Exp $ */
 
 /*---------------------------------------------------------------------*/
 /* LAT_DEG, LAT_MIN and LAT_SEC: Latitude of your location             */
@@ -229,11 +229,6 @@
 #define PUBLIC
 #define PRIVATE static
 
-#ifdef UNIX
-#define _POSIX_SOURCE
-#define _SVID_SOURCE
-#endif
-
 #define PSBEGIN "# rem2ps begin"
 #define PSEND   "# rem2ps end"
 

src/custom.h.in

@@ -7,11 +7,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: custom.h.in,v 1.6 1999-04-05 17:34:43 dfs Exp $ */
+/* $Id: custom.h.in,v 1.7 2000-02-18 03:45:46 dfs Exp $ */
 
 /*---------------------------------------------------------------------*/
 /* LAT_DEG, LAT_MIN and LAT_SEC: Latitude of your location             */
@@ -229,11 +229,6 @@
 #define PUBLIC
 #define PRIVATE static
 
-#ifdef UNIX
-#define _POSIX_SOURCE
-#define _SVID_SOURCE
-#endif
-
 #define PSBEGIN "# rem2ps begin"
 #define PSEND   "# rem2ps end"
 

src/dorem.c

@@ -8,12 +8,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: dorem.c,v 1.8 1999-04-05 17:34:44 dfs Exp $";
+static char const RCSID[] = "$Id: dorem.c,v 1.9 2000-02-18 03:45:47 dfs Exp $";
 
 #include <stdio.h>
 #include <ctype.h>

src/dosubst.c

@@ -7,12 +7,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: dosubst.c,v 1.9 1999-04-05 17:34:44 dfs Exp $";
+static char const RCSID[] = "$Id: dosubst.c,v 1.10 2000-02-18 03:45:48 dfs Exp $";
 
 #define L_IN_DOSUBST
 #include <stdio.h>
@@ -32,7 +32,7 @@ static char const RCSID[] = "$Id: dosubst.c,v 1.9 1999-04-05 17:34:44 dfs Exp $"
 #include "types.h"
 #include "protos.h"
 
-#define UPPER(c) (islower(c) ? toupper(c) : c)
+#define UPPER(c) (islower(c) ? toupper(c) : (c))
 #define ABS(x) ( (x) < 0 ? -(x) : (x) )
 #ifndef NL
 #define NL "\n"

src/dynbuf.c

@@ -7,12 +7,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 static char const RCSID[] =
-"$Id: dynbuf.c,v 1.3 1999-04-05 17:34:45 dfs Exp $";
+"$Id: dynbuf.c,v 1.5 2000-02-18 03:45:49 dfs Exp $";
 
 #include "config.h"
 #include "dynbuf.h"
@@ -182,7 +182,7 @@ PUBLIC int DBufGets(DynamicBuffer *dbuf, FILE *fp)
 #else
 int DBufGets(dbuf, fp)
 DynamicBuffer *dbuf;
-FILE *fp
+FILE *fp;
 #endif
 {
     char tmp[256]; /* Safe to hard-code */

src/dynbuf.h

@@ -6,11 +6,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: dynbuf.h,v 1.2 1999-04-05 17:34:45 dfs Exp $ */
+/* $Id: dynbuf.h,v 1.3 2000-02-18 03:45:50 dfs Exp $ */
 
 #ifndef DYNBUF_H
 #define DYNBUF_H

src/err.h

@@ -6,11 +6,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: err.h,v 1.3 1999-04-05 17:34:46 dfs Exp $ */
+/* $Id: err.h,v 1.4 2000-02-18 03:45:51 dfs Exp $ */
 
 /* Note that not all of the "errors" are really errors - some are just
    messages for information purposes.  Constants beginning with M_ should

src/expr.c

@@ -6,12 +6,12 @@
 /*  expressions.                                               */
 /*                                                             */
 /*  Copyright 1992-1998 by David F. Skoll                      */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: expr.c,v 1.7 1999-04-05 17:34:46 dfs Exp $";
+static char const RCSID[] = "$Id: expr.c,v 1.8 2000-02-18 03:45:52 dfs Exp $";
 
 #include <stdio.h>
 #include <ctype.h>

src/expr.h

@@ -6,11 +6,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: expr.h,v 1.3 1999-04-05 17:34:48 dfs Exp $ */
+/* $Id: expr.h,v 1.4 2000-02-18 03:45:53 dfs Exp $ */
 
 /* Define the types of values */
 #define ERR_TYPE 0

src/files.c

@@ -8,12 +8,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: files.c,v 1.9 1999-04-05 17:34:48 dfs Exp $";
+static char const RCSID[] = "$Id: files.c,v 1.10 2000-02-18 03:45:54 dfs Exp $";
 
 #include <stdio.h>
 

src/funcs.c

@@ -7,12 +7,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: funcs.c,v 1.7 1999-04-05 17:34:49 dfs Exp $";
+static char const RCSID[] = "$Id: funcs.c,v 1.9 2000-02-18 03:45:55 dfs Exp $";
 
 #include <stdio.h>
 
@@ -115,8 +115,10 @@ PRIVATE int	FPsshade	ARGS ((void));
 PRIVATE	int	FShell		ARGS ((void));
 PRIVATE	int	FStrlen		ARGS ((void));
 PRIVATE	int	FSubstr		ARGS ((void));
-PRIVATE	int	FSunrise	ARGS ((void));
+PRIVATE	int	FDawn		ARGS ((void));
+PRIVATE	int	FDusk	 	ARGS ((void));
 PRIVATE	int	FSunset		ARGS ((void));
+PRIVATE	int	FSunrise	ARGS ((void));
 PRIVATE	int	FTime		ARGS ((void));
 PRIVATE	int	FTrigdate	ARGS ((void));
 PRIVATE	int	FTrigtime	ARGS ((void));
@@ -210,10 +212,12 @@ Operator Func[] = {
     {   "choose",	2,	NO_MAX, FChoose },
     {   "coerce",	2,	2,	FCoerce },
     {   "date",		3,	3,	FDate	},
+    {   "dawn",		0,	1,	FDawn},
     {   "day",		1,	1,	FDay	},
     {   "daysinmon",	2,	2,	FDaysinmon },
     {   "defined",	1,	1,	FDefined },
     {   "dosubst",	1,	3,	FDosubst },
+    {   "dusk",		0,	1,	FDusk },
     {   "easterdate",	1,	1,	FEasterdate },
     {	"filedate",	1,	1,	FFiledate },
     {	"filedir",	0,	0,	FFiledir },
@@ -1011,7 +1015,10 @@ static int FUpper()
     if (ARG(0).type != STR_TYPE) return E_BAD_TYPE;
     DCOPYVAL(RetVal, ARG(0));
     s = RetVal.v.str;
-    while (*s) { *s = UPPER(*s); s++; }
+    while (*s) {
+	*s = UPPER(*s);
+	s++;
+    }
     return OK;
 }
 
@@ -1026,7 +1033,10 @@ static int FLower()
     if (ARG(0).type != STR_TYPE) return E_BAD_TYPE;
     DCOPYVAL(RetVal, ARG(0));
     s = RetVal.v.str;
-    while (*s) { *s = LOWER(*s); s++; }
+    while (*s) {
+	*s = LOWER(*s);
+	s++;
+    }
     return OK;
 }
 
@@ -2014,6 +2024,7 @@ int jul;
     int year, mon, day;
     int jan0;
     int mins, hours;
+    int dusk_or_dawn;
 
     double M, L, tanA, sinDelta, cosDelta, a, a_hr, cosH, t, H, T;
     double latitude, longdeg, UT, local;
@@ -2037,6 +2048,9 @@ int jul;
     FromJulian(jul, &year, &mon, &day);
     jan0 = jul - Julian(year, 0, 1);
 
+    dusk_or_dawn = rise;
+    if (rise > 1)
+	rise -= 2;
 /* Following formula on page B6 exactly... */
     t = (double) jan0;
     if (rise) t += (6.0 + longdeg/15.0) / 24.0;
@@ -2047,6 +2061,11 @@ int jul;
 
 /* Sun's true longitude */
     L = M + 1.916*sin(DEGRAD*M) + 0.02*sin(2*DEGRAD*M) + 282.565;
+    if (dusk_or_dawn == 2) {/* dusk */
+	L += 6;
+    } else if (dusk_or_dawn == 3) {/* dawn */
+	L -= 14;
+    }
     if (L > 360.0) L -= 360.0;
 
 /* Tan of sun's right ascension */
@@ -2065,7 +2084,7 @@ int jul;
     }
 /*   if (fabs(a - L) > 90.0)
      a += 180.0; */
-
+    
     if (a > 360.0)
 	a -= 360.0;
     a_hr = a / 15.0;
@@ -2073,10 +2092,10 @@ int jul;
 /* Sine of sun's declination */
     sinDelta = 0.39782 * sin(DEGRAD*L);
     cosDelta = sqrt(1 - sinDelta*sinDelta);
-
+    
 /* Cosine of sun's local hour angle */
     cosH = (cosz - sinDelta * sin(latitude)) / (cosDelta * cos(latitude));
-
+    
     if (cosH < -1.0) { /* Summer -- permanent daylight */
 	if (rise) return NO_TIME;
 	else      return -NO_TIME;
@@ -2092,9 +2111,9 @@ int jul;
     T = H / 15.0 + a_hr - 0.065710*t - 6.620;
     if (T >= 24.0) T -= 24.0;
     else if (T < 0.0) T+= 24.0;
-
+    
     UT = T + longdeg / 15.0;
-
+    
 
     local = UT + (double) mins / 60.0;
     if (local < 0.0) local += 24.0;
@@ -2102,7 +2121,7 @@ int jul;
 
     hours = (int) local;
     mins = (int) ((local - hours) * 60.0);
-
+    
     /* Sometimes, we get roundoff error.  Check for "reasonableness" of
        answer. */
     if (rise) {
@@ -2167,6 +2186,23 @@ static int FSunset()
     return FSun(0);
 }
 
+#ifdef HAVE_PROTOS
+PRIVATE int FDawn(void)
+#else
+static int FDawn()
+#endif
+{
+    return FSun(3);
+}
+#ifdef HAVE_PROTOS
+PRIVATE int FDusk(void)
+#else
+static int FDusk()
+#endif
+{
+    return FSun(2);
+}
+
 /***************************************************************/
 /*                                                             */
 /*  FFiledate                                                  */

src/globals.c

@@ -9,12 +9,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: globals.c,v 1.3 1999-04-05 17:34:50 dfs Exp $";
+static char const RCSID[] = "$Id: globals.c,v 1.4 2000-02-18 03:45:56 dfs Exp $";
 
 #include <stdio.h>   /* For defintion of FILE - sigh! */
 #include "types.h"

src/globals.h

@@ -8,11 +8,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: globals.h,v 1.6 1999-04-05 17:34:50 dfs Exp $ */
+/* $Id: globals.h,v 1.7 2000-02-18 03:45:57 dfs Exp $ */
 
 #ifdef MK_GLOBALS
 #undef EXTERN

src/hbcal.c

@@ -6,7 +6,7 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /*  Derived from code written by Amos Shapir in 1978; revised  */
 /*  1985.                                                      */
@@ -14,7 +14,7 @@
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: hbcal.c,v 1.3 1999-04-05 17:34:50 dfs Exp $";
+static char const RCSID[] = "$Id: hbcal.c,v 1.4 2000-02-18 03:45:58 dfs Exp $";
 
 #include <stdio.h>  /* For FILE used by protos.h - sigh. */
 #include "types.h"

src/init.c

@@ -8,12 +8,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: init.c,v 1.11 1999-04-12 19:45:27 dfs Exp $";
+static char const RCSID[] = "$Id: init.c,v 1.13 2000-02-18 03:53:45 dfs Exp $";
 
 #define L_IN_INIT 1
 #include <stdio.h>
@@ -488,8 +488,8 @@ PUBLIC void Usage(void)
 void Usage()
 #endif /* HAVE_PROTOS */
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 by David F. Skoll\n", VERSION, L_LANGNAME);
-    fprintf(ErrFp, "Copyright 1999 by Roaring Penguin Software Inc.\n");
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 David F. Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "Copyright 1999-2000 Roaring Penguin Software Inc.\n");
 #ifdef BETA
     fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
 #endif

src/lang.h

@@ -6,11 +6,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: lang.h,v 1.4 1999-04-05 17:34:51 dfs Exp $ */
+/* $Id: lang.h,v 1.5 2000-02-18 03:46:00 dfs Exp $ */
 
 /* I'm chauvinistic and name each language with its English name... */
 
@@ -27,7 +27,7 @@
 #define ROMANIAN  10 /* translated by Liviu Daia                       */
 #define SPANISH   11 /* translated by Rafa Couto                       */
 
-/* Add more languages here - but please e-mail aa775@freenet.carleton.ca
+/* Add more languages here - but please e-mail dfs@roaringpenguin.com
    to have your favorite language assigned a number.  If you add a
    language, please send me the header file, and permission to include
    it in future releases of Remind.  Note that you'll get no remuneration

src/langs/danish.h

@@ -7,12 +7,12 @@
 /*  This file is part of REMIND.                               */
 /*                                                             */
 /*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
-/*  Copyright 1999 by Roaring Penguin Software Inc.            */
+/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*  This file is Copyright (C) 1993 by Mogens Lynnerup.        */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: danish.h,v 1.6 1999-04-05 17:35:05 dfs Exp $ */
+/* $Id: danish.h,v 1.7 2000-02-18 03:46:17 dfs Exp $ */
 
 /* The very first define in a language support file must be L_LANGNAME: */
 #define L_LANGNAME "Danish"

src/langs/dutch.h

@@ -12,11 +12,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright 1999 by Roaring Penguin Software Inc.            */
+/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: dutch.h,v 1.4 1999-04-05 17:35:06 dfs Exp $ */
+/* $Id: dutch.h,v 1.5 2000-02-18 03:46:18 dfs Exp $ */
 
 /* The very first define in a language support file must be L_LANGNAME: */
 #define L_LANGNAME "Dutch"

src/langs/english.h

@@ -6,11 +6,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright 1999 by Roaring Penguin Software Inc.            */
+/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: english.h,v 1.4 1999-04-05 17:35:06 dfs Exp $ */
+/* $Id: english.h,v 1.5 2000-02-18 03:46:19 dfs Exp $ */
 
 /* The very first define in a language support file must be L_LANGNAME: */
 #define L_LANGNAME "English"

src/langs/finnish.h

@@ -12,11 +12,11 @@
 /*  This file is part of REMIND.                               */
 /*  This file is Copyright (C) 1993-1998 by Mikko Silvonen.    */
 /*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
-/*  Copyright 1999 by Roaring Penguin Software Inc.            */
+/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: finnish.h,v 1.8 1999-04-12 19:45:41 dfs Exp $ */
+/* $Id: finnish.h,v 1.10 2000-02-18 03:53:49 dfs Exp $ */
 
 /* The very first define in a language support file must be L_LANGNAME: */
 #define L_LANGNAME "Finnish"
@@ -523,8 +523,8 @@ PUBLIC void Usage(void)
 void Usage()
 #endif /* HAVE_PROTOS */
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 by David F. Skoll\n", VERSION, L_LANGNAME);
-    fprintf(ErrFp, "Copyright 1999 by Roaring Penguin Software Inc.\n");
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 David F. Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "Copyright 1999-2000 Roaring Penguin Software Inc.\n");
 #ifdef BETA
     fprintf(ErrFp, ">>>> BETAVERSIO <<<<\n");
 #endif

src/langs/french.h

@@ -9,13 +9,13 @@
 /*  This file is part of REMIND.                               */
 /*                                                             */
 /*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
-/*  Copyright 1999 by Roaring Penguin Software Inc.            */
+/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*  This file is Copyright (C) 1993 by Laurent Duperval and    */
 /*  David F. Skoll.                                            */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: french.h,v 1.7 1999-04-12 19:45:42 dfs Exp $ */
+/* $Id: french.h,v 1.9 2000-02-18 03:53:50 dfs Exp $ */
 
 /* The very first define in a language support file must be L_LANGNAME: */
 #define L_LANGNAME "French"
@@ -359,8 +359,8 @@ PUBLIC void Usage(void)
 void Usage()
 #endif /* HAVE_PROTOS */
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 by David F. Skoll\n", VERSION, L_LANGNAME);
-    fprintf(ErrFp, "Copyright 1999 by Roaring Penguin Software Inc.\n");
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 David F. Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "Copyright 1999-2000 Roaring Penguin Software Inc.\n");
 #ifdef BETA
     fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
 #endif

src/langs/german.h

@@ -10,11 +10,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright 1999 by Roaring Penguin Software Inc.            */
+/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: german.h,v 1.5 1999-04-05 17:35:08 dfs Exp $ */
+/* $Id: german.h,v 1.6 2000-02-18 03:46:22 dfs Exp $ */
 
 /* The very first define in a language support file must be L_LANGNAME: */
 #define L_LANGNAME "German"

src/langs/italian.h

@@ -8,11 +8,11 @@
 /*  It is Copyright (C) 1996 by Valerio Aimale                 */
 /*                                                             */
 /*  Remind is copyright (C) 1992-1998 by David F. Skoll        */
-/*  Copyright 1999 by Roaring Penguin Software Inc.            */
+/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: italian.h,v 1.5 1999-04-05 17:35:09 dfs Exp $ */
+/* $Id: italian.h,v 1.6 2000-02-18 03:46:23 dfs Exp $ */
 
 /* The very first define in a language support file must be L_LANGNAME: */
 #define L_LANGNAME "Italian"

src/langs/norwgian.h

@@ -7,11 +7,11 @@
 /*  This file is part of REMIND.                               */
 /*  This file is Copyright (C) 1993 by Trygve Randen.          */
 /*  Remind is Copyright (C) 1992-1998 by David F. Skoll        */
-/*  Copyright 1999 by Roaring Penguin Software Inc.            */
+/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: norwgian.h,v 1.5 1999-04-05 17:35:09 dfs Exp $ */
+/* $Id: norwgian.h,v 1.6 2000-02-18 03:46:24 dfs Exp $ */
 
 /* The very first define in a language support file must be L_LANGNAME: */
 #define L_LANGNAME "Norwegian"

src/langs/polish.h

@@ -10,11 +10,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright 1999 by Roaring Penguin Software Inc.            */
+/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: polish.h,v 1.7 1999-04-12 19:45:43 dfs Exp $ */
+/* $Id: polish.h,v 1.9 2000-02-18 03:53:51 dfs Exp $ */
 
 /* The very first define in a language support file must be L_LANGNAME: */
 #define L_LANGNAME "Polish"
@@ -394,8 +394,8 @@ PUBLIC void Usage(void)
 void Usage()
 #endif /* HAVE_PROTOS */
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 by David F. Skoll\n", VERSION, L_LANGNAME);
-    fprintf(ErrFp, "Copyright 1999 by Roaring Penguin Software Inc.\n");
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 David F. Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "Copyright 1999-2000 Roaring Penguin Software Inc.\n");
 #ifdef BETA
     fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
 #endif

src/langs/portbr.h

@@ -9,13 +9,13 @@
 /*  This file is part of REMIND.                               */
 /*                                                             */
 /*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
-/*  Copyright 1999 by Roaring Penguin Software Inc.            */
+/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*  This file is Copyright (C) 1996 by Marco Paganini and      */
 /*  David F. Skoll.                                            */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: portbr.h,v 1.6 1999-04-12 19:45:43 dfs Exp $ */
+/* $Id: portbr.h,v 1.8 2000-02-18 03:53:52 dfs Exp $ */
 
 /* The very first define in a language support file must be L_LANGNAME: */
 #define L_LANGNAME "Brazilian Portuguese"
@@ -259,8 +259,8 @@ PUBLIC void Usage(void)
 void Usage()
 #endif /* HAVE_PROTOS */
 {
-    fprintf(ErrFp, "\nREMIND %s (versao %s) (C) 1992-1998 by David F. Skoll\n", VERSION, L_LANGNAME);
-    fprintf(ErrFp, "(C) 1999 by Roaring Penguin Software Inc.\n");
+    fprintf(ErrFp, "\nREMIND %s (versao %s) (C) 1992-1998 David F. Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "(C) 1999-2000 Roaring Penguin Software Inc.\n");
 #ifdef BETA
     fprintf(ErrFp, ">>>> VERSAO BETA <<<<\n");
 #endif

src/langs/romanian.h

@@ -9,12 +9,12 @@
 /*  This file is part of REMIND.                               */
 /*                                                             */
 /*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
-/*            Copyright 1999 by Roaring Penguin Software Inc.  */
+/*       Copyright 1999-2000 by Roaring Penguin Software Inc.  */
 /*  This file is Copyright (C) 1996-1998 by Liviu Daia         */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: romanian.h,v 1.5 1999-04-05 17:35:10 dfs Exp $ */
+/* $Id: romanian.h,v 1.6 2000-02-18 03:46:27 dfs Exp $ */
 
 /* The very first define in a language support file must be L_LANGNAME: */
 #define L_LANGNAME "Romanian"

src/langs/spanish.h

@@ -8,11 +8,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright 1999 by Roaring Penguin Software Inc.            */
+/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: spanish.h,v 1.2 1999-04-05 17:35:11 dfs Exp $ */
+/* $Id: spanish.h,v 1.3 2000-02-18 03:46:28 dfs Exp $ */
 
 #define L_LANGNAME "Spanish"
 

src/main.c

@@ -7,12 +7,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: main.c,v 1.10 1999-04-05 17:34:52 dfs Exp $";
+static char const RCSID[] = "$Id: main.c,v 1.11 2000-02-18 03:46:01 dfs Exp $";
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>

src/moon.c

@@ -6,12 +6,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: moon.c,v 1.4 1999-04-05 17:34:53 dfs Exp $";
+static char const RCSID[] = "$Id: moon.c,v 1.5 2000-02-18 03:46:02 dfs Exp $";
 
 /* All of these routines were adapted from the program "moontool"
    by John Walker, February 1988.  Here's the blurb from moontool:

src/omit.c

@@ -7,12 +7,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: omit.c,v 1.5 1999-04-05 17:34:54 dfs Exp $";
+static char const RCSID[] = "$Id: omit.c,v 1.6 2000-02-18 03:46:03 dfs Exp $";
 
 #include <stdio.h>
 

src/protos.h

@@ -6,11 +6,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: protos.h,v 1.7 1999-04-05 17:34:54 dfs Exp $ */
+/* $Id: protos.h,v 1.8 2000-02-18 03:46:05 dfs Exp $ */
 
 #ifdef HAVE_PROTOS
 #define ARGS(x) x

src/queue.c

@@ -6,17 +6,16 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: queue.c,v 1.10 1999-04-05 17:34:55 dfs Exp $";
+static char const RCSID[] = "$Id: queue.c,v 1.15 2000-02-18 03:46:06 dfs Exp $";
 
 /* Solaris needs this to get select() prototype */
 #ifdef __sun__
 #define __EXTENSIONS__ 1
-#undef _POSIX_SOURCE
 #endif
 
 /* We only want object code generated if we have queued reminders */
@@ -31,6 +30,10 @@ static char const RCSID[] = "$Id: queue.c,v 1.10 1999-04-05 17:34:55 dfs Exp $";
 #include <sys/time.h>
 #endif
 
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
@@ -126,7 +129,6 @@ char *sched;
     strcpy(qelem->sched, sched);
     strcpy(qelem->tag, trig->tag);
     QueueHead = qelem;
-    NumQueued++;
     return OK;
 }
 
@@ -251,6 +253,12 @@ void HandleQueuedReminders()
 	    }
 	    printf("\n");
 	}
+
+	/* Set up global variables so some functions like trigdate()
+           and trigtime() work correctly                             */
+	LastTriggerDate = JulianToday;
+	LastTriggerTime = q->tt.ttime;
+	LastTrigValid = 1;
 #ifdef OS2_POPUP
 	(void) TriggerReminder(&p, &trig, &q->tt, JulianToday, 1);
 #else
@@ -301,8 +309,13 @@ QueuedRem *q;
 	r = CalculateNextTimeUsingSched(q);
 	if (r != NO_TIME) return r;
     }
-    if (delta == NO_DELTA)
-	if (tim < curtime) return NO_TIME; else return tim;
+    if (delta == NO_DELTA) {
+	if (tim < curtime) {
+	    return NO_TIME; 
+	} else {
+	    return tim;
+	}
+    }
 
     tim -= delta;
     if (rep == NO_REP) rep = delta;
@@ -474,7 +487,7 @@ QueuedRem *q;
 PRIVATE void DaemonWait(unsigned int sleeptime)
 #else
 static DaemonWait(sleeptime)
-unsigned int sleeptime
+unsigned int sleeptime;
 #endif
 {
     fd_set readSet;

src/rem2ps.c

@@ -6,13 +6,13 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
 #include "dynbuf.h"
-static char const RCSID[] = "$Id: rem2ps.c,v 1.9 1999-04-05 17:34:55 dfs Exp $";
+static char const RCSID[] = "$Id: rem2ps.c,v 1.10 2000-02-18 03:46:07 dfs Exp $";
 
 #include <stdio.h>
 #include <string.h>

src/rem2ps.h

@@ -6,11 +6,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: rem2ps.h,v 1.3 1999-04-05 17:34:56 dfs Exp $ */
+/* $Id: rem2ps.h,v 1.4 2000-02-18 03:46:08 dfs Exp $ */
 
 char *PSProlog1[] =
 {

src/sort.c

@@ -6,12 +6,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: sort.c,v 1.5 1999-04-05 17:34:56 dfs Exp $";
+static char const RCSID[] = "$Id: sort.c,v 1.6 2000-02-18 03:46:09 dfs Exp $";
 
 #include <stdio.h>
 #include <string.h>

src/token.c

@@ -7,12 +7,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: token.c,v 1.8 1999-04-05 17:34:57 dfs Exp $";
+static char const RCSID[] = "$Id: token.c,v 1.9 2000-02-18 03:46:10 dfs Exp $";
 
 #include <stdio.h>
 #include <string.h>

src/trigger.c

@@ -6,12 +6,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: trigger.c,v 1.4 1999-04-05 17:34:57 dfs Exp $";
+static char const RCSID[] = "$Id: trigger.c,v 1.5 2000-02-18 03:46:11 dfs Exp $";
 
 #include <stdio.h>
 

src/types.h

@@ -6,11 +6,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: types.h,v 1.4 1999-04-05 17:34:58 dfs Exp $ */
+/* $Id: types.h,v 1.5 2000-02-18 03:46:12 dfs Exp $ */
 
 #include "dynbuf.h"
 

src/userfns.c

@@ -7,12 +7,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: userfns.c,v 1.5 1999-04-05 17:34:59 dfs Exp $";
+static char const RCSID[] = "$Id: userfns.c,v 1.6 2000-02-18 03:46:13 dfs Exp $";
 
 #include <stdio.h>
 #include <ctype.h>

src/utils.c

@@ -6,12 +6,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: utils.c,v 1.4 1999-04-05 17:34:59 dfs Exp $";
+static char const RCSID[] = "$Id: utils.c,v 1.5 2000-02-18 03:46:14 dfs Exp $";
 
 #include <string.h>
 #include <stdio.h>

src/var.c

@@ -7,12 +7,12 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: var.c,v 1.6 1999-04-05 17:34:59 dfs Exp $";
+static char const RCSID[] = "$Id: var.c,v 1.7 2000-02-18 03:46:15 dfs Exp $";
 
 #include <stdio.h>
 #include <string.h>

src/version.h

@@ -6,9 +6,9 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999 by Roaring Penguin Software Inc.        */
+/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
 /*                                                             */
 /***************************************************************/
 
-/* $Id: version.h,v 1.7 1999-04-05 17:35:00 dfs Exp $ */
-#define VERSION "03.00.20"
+/* $Id: version.h,v 1.9 2000-02-18 03:46:16 dfs Exp $ */
+#define VERSION "03.00.21"

tests/test-rem

@@ -2,15 +2,15 @@
 # ---------------------------------------------------------------------------
 # TEST-REM
 #
-# $Id: test-rem,v 1.3 1999-04-05 17:35:13 dfs Exp $
+# $Id: test-rem,v 1.4 2000-02-18 03:46:29 dfs Exp $
 #
 # This file runs an acceptance test for Remind.  To use it, type:
 #      sh test-rem  OR make test
 # in the build directory.
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll        
-# Copyright (C) 1999 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-1997 David F. Skoll        
+# Copyright (C) 1999-2000 Roaring Penguin Software Inc.
 # ---------------------------------------------------------------------------
 
 TEST_GETENV="foo bar baz" ; export TEST_GETENV

tests/test-rem.bat

@@ -2,15 +2,15 @@
 rem ---------------------------------------------------------------------------
 rem TEST-REM
 rem
-rem $Id: test-rem.bat,v 1.2 1999-04-05 17:35:14 dfs Exp $
+rem $Id: test-rem.bat,v 1.3 2000-02-18 03:46:31 dfs Exp $
 rem
 rem This file runs an MSDOS acceptance test for Remind.  To use it, type:
 rem	 test-rem
 rem in the build directory.
 rem
 rem This file is part of REMIND.
-rem Copyright (C) 1992-1997 by David F. Skoll        
-rem Copyright (C) 1999 by Roaring Penguin Software Inc.
+rem Copyright (C) 1992-1997 David F. Skoll        
+rem Copyright (C) 1999-2000 Roaring Penguin Software Inc.
 rem ---------------------------------------------------------------------------
 
 del test.out > nul

tests/test-rem.cmd

@@ -2,15 +2,15 @@
 rem ---------------------------------------------------------------------------
 rem TEST-REM
 rem
-rem $Id: test-rem.cmd,v 1.2 1999-04-05 17:35:14 dfs Exp $
+rem $Id: test-rem.cmd,v 1.3 2000-02-18 03:46:32 dfs Exp $
 rem
 rem This file runs an OS/2 acceptance test for Remind.	To use it, type:
 rem	 test-rem
 rem in the build directory.
 rem
 rem This file is part of REMIND.
-rem Copyright (C) 1992-1997 by David F. Skoll        
-rem Copyright (C) 1999 by Roaring Penguin Software Inc.
+rem Copyright (C) 1992-1997 David F. Skoll        
+rem Copyright (C) 1999-2000 Roaring Penguin Software Inc.
 rem ---------------------------------------------------------------------------
 
 del /f test.out > nul

tests/test.cmp

@@ -631,7 +631,7 @@ set a057 value("a05"+"6")
 "a05" + "6" => "a056"
 value("a056") => "SDFJHSDF KSJDFH KJSDFH KSJDFH"
 set a058 version()
-version() => "03.00.20"
+version() => "03.00.21"
 set a059 wkday(today())
 today() => 1991/02/16
 wkday(1991/02/16) => "Saturday"
@@ -772,7 +772,7 @@ dump
         a048  "foo"
         a067  "INT"
         a039  "February"
-        a058  "03.00.20"
+        a058  "03.00.21"
         a077  "1992 92
 "
         a049  21

tests/tstlang.rem

@@ -3,7 +3,7 @@
 #
 # TSTLANG.REM
 #
-# $Id: tstlang.rem,v 1.2 1999-04-05 17:35:14 dfs Exp $
+# $Id: tstlang.rem,v 1.3 2000-02-18 03:46:33 dfs Exp $
 #
 # Use this file to test new language headers you may want to create.
 # Usage: remind -rq tstlang.rem
@@ -13,8 +13,8 @@
 # Use the output to verify your translations.
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll        
-# Copyright (C) 1999 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-1997 David F. Skoll        
+# Copyright (C) 1999-2000 Roaring Penguin Software Inc.
 #
 # ---------------------------------------------------------------------------
 

www/Makefile

@@ -3,31 +3,31 @@
 # Copyright (C) 1992-1997 by David F. Skoll
 # Copyright (C) 1999 by Roaring Penguin Software Inc.
 
-# $Id: Makefile,v 1.9 1999-04-05 17:35:16 dfs Exp $
+# $Id: Makefile,v 1.12 1999-10-18 20:08:54 dfs Exp $
 
 # The complete name of your www host.  Example: www.mycompany.com
-WWWHOST = shevy.skoll.ca
+WWWHOST = localhost
 # WWWHOST = www.mycompany.com
  
 # The complete path to where the scripts actually live, as seen by
 # the UNIX operating system.
-SCRIPTDIR = /var/web/cgi-bin
+SCRIPTDIR = /home/httpd/cgi-bin
 # SCRIPTDIR = /home/dfs/Remind/www/TEST
 
 # Where the scripts live as seen by the web browser.  If
 # they live in WWWHOST/cgi-bin, supply /cgi-bin
 CGIDIR = /cgi-bin
 
-# The complete path to the HTML file "calendar.html".  This is a sample
-# file containing links to all the scripts.  This path should be the
-# path as seen by the UNIX operating system
-HTMLDIR = /home/dfs/public_html
+# The complete path to the directory containing the HTML file "calendar.html".
+#  This is a sample file containing links to all the scripts.  This path
+# should be the path as seen by the UNIX operating system
+HTMLDIR = /home/httpd/html/remind
 
 # Where you stick images, as seen by UNIX
-IMAGEDIR = /home/dfs/public_html
+IMAGEDIR = /home/httpd/html/remind
 
 # Where images are, as seen by web browers
-IMAGEBASE = /~dfs
+IMAGEBASE = /remind
 
 # Location.  Typically, the name of your city or town.  Example: Ottawa
 LOCATION = Ottawa
@@ -54,6 +54,7 @@ all:
 
 # OK, it's abominable.  But it works...
 install:
+	-mkdir $(SCRIPTDIR)
 	cp rem2html calps hebdate hebps hebhtml moon sunrise sunset $(SCRIPTDIR)
 	sed $(SEDSCRIPT) < cal_dispatch-DIST  > $(SCRIPTDIR)/cal_dispatch
 	sed $(SEDSCRIPT) < hebdate.rem-DIST   > $(SCRIPTDIR)/hebdate.rem
@@ -73,8 +74,9 @@ install:
 	$(SCRIPTDIR)/hebps $(SCRIPTDIR)/moon $(SCRIPTDIR)/sunrise \
 	$(SCRIPTDIR)/sunset $(SCRIPTDIR)/hebhtml $(SCRIPTDIR)/rem2html
 
-	cp firstquarter.gif fullmoon.gif lastquarter.gif newmoon.gif $(IMAGEDIR)
-	chmod 644 $(IMAGEDIR)/firstquarter.gif $(IMAGEDIR)/fullmoon.gif $(IMAGEDIR)/lastquarter.gif $(IMAGEDIR)/newmoon.gif
+	-mkdir $(IMAGEDIR)
+	cp firstquarter.png fullmoon.png lastquarter.png newmoon.png $(IMAGEDIR)
+	chmod 644 $(IMAGEDIR)/firstquarter.png $(IMAGEDIR)/fullmoon.png $(IMAGEDIR)/lastquarter.png $(IMAGEDIR)/newmoon.png
 
 
 

www/cal_dispatch-DIST

@@ -2,12 +2,12 @@
 
 # This file is part of REMIND.
 # Copyright (C) 1992-1997 by David F. Skoll
-# Copyright (C) 1999 by Roaring Penguin Software Inc.
+# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
 
 # CAL_DISPATCH -- Shell script for CGI directory to dispatch calendar
 # commands.
 #
-# $Id: cal_dispatch-DIST,v 1.4 1999-04-05 17:35:16 dfs Exp $
+# $Id: cal_dispatch-DIST,v 1.5 2000-02-18 03:46:34 dfs Exp $
 #
 # WARNING WARNING WARNING -- If your /bin/sh is really GNU's "bash",
 # make sure you don't have a buggy version which treats char 0xFF as

www/calps

@@ -3,9 +3,9 @@
 #
 # This file is part of REMIND.
 # Copyright (C) 1992-1997 by David F. Skoll
-# Copyright (C) 1999 by Roaring Penguin Software Inc.
+# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
 
-# $Id: calps,v 1.2 1999-04-05 17:35:17 dfs Exp $
+# $Id: calps,v 1.3 2000-02-18 03:46:35 dfs Exp $
 
 echo "Content-type: application/postscript"
 echo

www/hebdate

@@ -3,9 +3,9 @@
 #
 # This file is part of REMIND.
 # Copyright (C) 1992-1997 by David F. Skoll
-# Copyright (C) 1999 by Roaring Penguin Software Inc.
+# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
 
-# $Id: hebdate,v 1.3 1999-04-05 17:35:17 dfs Exp $
+# $Id: hebdate,v 1.4 2000-02-18 03:46:36 dfs Exp $
 
 echo Content-type: text/html
 echo ""

www/hebdate.rem-DIST

@@ -2,9 +2,9 @@
 #
 # This file is part of REMIND.
 # Copyright (C) 1992-1997 by David F. Skoll
-# Copyright (C) 1999 by Roaring Penguin Software Inc.
+# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
 
-# $Id: hebdate.rem-DIST,v 1.6 1999-04-05 17:35:17 dfs Exp $
+# $Id: hebdate.rem-DIST,v 1.8 2000-02-18 03:46:37 dfs Exp $
 
 BANNER %
 IF !$PSCAL
@@ -161,7 +161,7 @@ ENDIF
 
 IF !$PSCAL
 	REM 20 ++40 msg Also available: <a HREF="http://your.machine/your.dir/cal_dispatch?hebps">a PostScript calendar</a> (about 35KB) for %m %y, complete with Hebrew dates, Jewish holidays, and moon phases for Ottawa.  (This takes a few seconds to generate.)
-	REM 20 ++40 msg And: <a HREF="http://your.machine/your.dir/cal_dispatch?hebhtml">an HTML version</a> of the above.  (No moons, and your browser must handle tables.)
+	REM 20 ++40 msg And: <a HREF="http://your.machine/your.dir/cal_dispatch?hebhtml">an HTML version</a> of the above.  (Your browser must handle tables.)
 ELSE
 	[trigger(moondate(0))] SPECIAL MOON 0
 	[trigger(moondate(1))] SPECIAL MOON 1

www/hebhtml

@@ -3,9 +3,9 @@
 #
 # This file is part of REMIND.
 # Copyright (C) 1992-1997 by David F. Skoll
-# Copyright (C) 1999 by Roaring Penguin Software Inc.
+# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
 
-# $Id: hebhtml,v 1.3 1999-04-05 17:35:18 dfs Exp $
+# $Id: hebhtml,v 1.4 2000-02-18 03:46:38 dfs Exp $
 
 echo "Content-Type: text/html"
 echo ""

www/hebps

@@ -3,9 +3,9 @@
 #
 # This file is part of REMIND.
 # Copyright (C) 1992-1997 by David F. Skoll
-# Copyright (C) 1999 by Roaring Penguin Software Inc.
+# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
 
-# $Id: hebps,v 1.4 1999-04-05 17:35:19 dfs Exp $
+# $Id: hebps,v 1.5 2000-02-18 03:46:39 dfs Exp $
 
 # Figure out the month:  If day <= 20, use this month; otherwise, use
 # next month.