Prep for 03.04.00 release.

This lets use create dynamic buffers larger than 2GB.

.gitattributes

@@ -0,0 +1,5 @@
+.gitignore		export-ignore
+.gitattributes		export-ignore
+remind.php		export-ignore
+sync-to-dianne-git	export-ignore
+php                     export-ignore

.gitignore

@@ -1,15 +1,27 @@
+rem2pdf/Makefile.old
 *.bak
+*.o
+*~
+.gitignore
+TAGS
 autom4te.cache
 config.log
 config.status
-src/Makefile
-www/Makefile
-*.o
-src/config.h
-src/remind
+rem2html/Makefile
 src/*.tar.gz*
-tests/test.out
-.gitignore
-*~
+src/Makefile
+src/config.h
 src/rem2ps
+src/remind
 src/version.h
+tests/test.out
+www/Makefile
+rem2pdf/Makefile.PL
+MYMETA.json
+MYMETA.yml
+Makefile
+blib/
+pm_to_blib
+rem2pdf/Makefile.top
+rem2pdf/bin/rem2pdf
+rem2html/rem2html.1

COPYRIGHT

@@ -3,8 +3,8 @@ THE REMIND COPYRIGHT
 1. REMIND refers to the entire set of files and documentation in the
 REMIND package.
 
-2. REMIND is Copyright 1999-2010 Roaring Penguin Software Inc.,
-except where noted in individual files.
+2. REMIND is Copyright 1992-2021 Dianne Skoll, except where noted in
+individual files.
 
 3. DISTRIBUTION AND USE
 
@@ -293,8 +293,8 @@ POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
 --
-David F. Skoll <dfs@roaringpenguin.com>
+Dianne Skoll <dianne@skoll.ca>
+
+https://dianne.skoll.ca/projects/remind
 
-Tel. (613) 231-6599
-http://www.roaringpenguin.com
 

MICROSOFT-AND-APPLE

@@ -27,4 +27,4 @@ iPhone or iPad, please don't.  Those products enforce Apple's rigorous
 controls much more stringently than Mac OS X on an Apple PC.
 
 --
-David F. Skoll
+Dianne Skoll

Makefile

@@ -8,8 +8,8 @@ all: src/Makefile
 	@echo "*                 *"
 	@echo "*******************"
 	@echo ""
-	@cd src; $(MAKE) all LANGDEF=$(LANGDEF)
-
+	@cd src && $(MAKE) all LANGDEF=$(LANGDEF)
+	@$(MAKE) -C rem2pdf -f Makefile.top
 install:
 	@echo ""
 	@echo "*********************"
@@ -18,17 +18,19 @@ install:
 	@echo "*                   *"
 	@echo "*********************"
 	@echo ""
-	cd src; $(MAKE) install
-
+	@$(MAKE) -C src install
+	@$(MAKE) -C rem2html install
+	@$(MAKE) -C rem2pdf -f Makefile.top install
 clean:
 	find . -name '*~' -exec rm {} \;
-	cd src; $(MAKE) clean
+	-$(MAKE) -C src clean
+	-$(MAKE) -C rem2pdf clean
 
 test:
-	@cd src && $(MAKE) test
+	@$(MAKE) -C src -s test
 
 distclean: clean
-	rm -f config.cache config.log config.status src/Makefile src/config.h tests/test.out www/Makefile
+	rm -f config.cache config.log config.status src/Makefile src/config.h tests/test.out www/Makefile rem2pdf/Makefile.top rem2pdf/Makefile.old rem2pdf/Makefile rem2pdf/Makefile.PL rem2pdf/bin/rem2pdf
 
 src/Makefile: src/Makefile.in
 	./configure

README

@@ -34,5 +34,5 @@ If you do NOT have Tcl/Tk or are NOT running X Windows:
 
 5) Type: "make install" -- you may need to be root to do this.
 
-Contact info: mailto:dfs@roaringpenguin.com
-Home page:    http://www.roaringpenguin.com/remind
+Contact info: mailto:dianne@skoll.ca
+Home page:    https://dianne.skoll.ca/projects/remind/

build.tk

@@ -7,8 +7,7 @@
 #   A cheesy graphical front-end for building and installing REMIND.
 #
 #   This file is part of REMIND.
-#   Copyright (C) 1992-1999 David F. Skoll
-#   Copyright (C) 1999-2000 Roaring Penguin Software Inc.
+#   Copyright (C) 1992-2018 Dianne Skoll
 #
 #--------------------------------------------------------------
 
@@ -28,16 +27,14 @@ proc SetConfigDefaults {} {
     global Config
     set Config(LAT_DEG) 45
     set Config(LAT_MIN) 24
+    set Config(LAT_SEC) 14
     set Config(LON_DEG) 75
     set Config(LON_MIN) 39
+    set Config(LON_SEC) 23
     set Config(LOCATION) "Ottawa"
     set Config(DEFAULT_PAGE) "Letter"
     set Config(DATESEP) "-"
     set Config(TIMESEP) ":"
-    set Config(ISOLATIN1) 0
-    set Config(IBMEXTENDED) 0
-    set Config(ISOLATIN2) 0
-    set Config(IBM852) 0
     set Config(NORTHERN_HEMISPHERE) 1
     set Config(WESTERN_HEMISPHERE) 1
     set Config(LANGUAGE) "English"
@@ -95,10 +92,6 @@ proc CreateMainDialog {} {
     wm title . "Remind Configuration"
     wm iconname . "Remind Config"
 
-    doLogo
-    destroy .c
-    update idletasks
-
     SetConfigFromRemind
     tabnotebook_create .tn
 
@@ -166,10 +159,14 @@ proc CreateLocationDialog { w } {
 	    -from 0 -to 89 -length 300 -variable Config(LAT_DEG)
     scale $w.latmin -label "Latitude (minutes)" -orient horizontal \
 	    -from 0 -to 59 -length 300 -variable Config(LAT_MIN)
+    scale $w.latsec -label "Latitude (seconds)" -orient horizontal \
+	    -from 0 -to 59 -length 300 -variable Config(LAT_SEC)
     scale $w.londeg -label "Longitude (degrees)" -orient horizontal \
 	    -from 0 -to 179 -length 300 -variable Config(LON_DEG)
     scale $w.lonmin -label "Longtude (minutes)" -orient horizontal \
 	    -from 0 -to 59 -length 300 -variable Config(LON_MIN)
+    scale $w.lonsec -label "Longitude (seconds)" -orient horizontal \
+	    -from 0 -to 59 -length 300 -variable Config(LON_SEC)
 
     radiobutton $w.north -text "Northern Hemisphere" \
 	    -variable Config(NORTHERN_HEMISPHERE) -value 1
@@ -185,8 +182,10 @@ proc CreateLocationDialog { w } {
     $w.location insert end $Config(LOCATION)
     grid $w.latdeg -
     grid $w.latmin -
+    grid $w.latsec -
     grid $w.londeg -
     grid $w.lonmin -
+    grid $w.lonsec -
 
     grid $w.north $w.west
     grid $w.south $w.east
@@ -238,19 +237,6 @@ proc CreateOptionsDialog { w } {
     grid configure $w.timelabel -row 2 -column 0 -sticky e
     grid configure $w.time -row 2 -column 1 -sticky nsew
 
-    label $w.charlabel -text "Character set: "
-    menubutton $w.char -text "ISO 8859-1" -indicatoron 1 -relief raised \
-	    -menu $w.char.menu
-    menu $w.char.menu -tearoff 0
-    $w.char.menu add command -label "ISO 8859-1" -command "$w.char configure -text {ISO 8859-1}"
-    $w.char.menu add command -label "ISO 8859-2" -command "$w.char configure -text {ISO 8859-2}"
-    $w.char.menu add command -label "IBM Extended" -command "$w.char configure -text {IBM Extended}"
-    $w.char.menu add command -label "IBM CPI-852" -command "$w.char configure -text {ISO 8859-2}"
-    $w.char.menu add command -label "Plain ASCII" -command "$w.char configure -text {Plain ASCII}"
-
-    grid configure $w.charlabel -row 3 -column 0 -sticky e
-    grid configure $w.char -row 3 -column 1 -sticky nsew
-
     label $w.langlabel -text "Language: "
     menubutton $w.lang -text $Config(LANGUAGE) -indicatoron 1 -relief raised \
 	    -menu $w.lang.menu
@@ -273,8 +259,8 @@ proc CreateOptionsDialog { w } {
 	$w.lang.menu add command -label $lang -command [list $w.lang configure -text $lang]
     }
 
-    grid configure $w.langlabel -row 4 -column 0 -sticky e
-    grid configure $w.lang -row 4 -column 1 -sticky nsew
+    grid configure $w.langlabel -row 3 -column 0 -sticky e
+    grid configure $w.lang -row 3 -column 1 -sticky nsew
 
 }
 
@@ -428,15 +414,19 @@ proc CreateCustomH {} {
     # modify them willy-nilly
     set LAT_DEG $Config(LAT_DEG)
     set LAT_MIN $Config(LAT_MIN)
+    set LAT_SEC $Config(LAT_SEC)
     set LON_DEG $Config(LON_DEG)
     set LON_MIN $Config(LON_MIN)
+    set LON_SEC $Config(LON_SEC)
     if {!$Config(NORTHERN_HEMISPHERE)} {
 	set LAT_DEG "-$LAT_DEG"
 	set LAT_MIN "-$LAT_MIN"
+	set LAT_SEC "-$LAT_SEC"
     }
     if {!$Config(WESTERN_HEMISPHERE)} {
 	set LON_DEG "-$LON_DEG"
 	set LON_MIN "-$LON_MIN"
+	set LON_SEC "-$LON_SEC"
     }
     set Config(LOCATION) [$Loc.location get]
 
@@ -451,38 +441,17 @@ proc CreateCustomH {} {
     set Config(DATESEP) [$Options.date cget -text]
     set Config(TIMESEP) [$Options.time cget -text]
 
-    switch -- [$Options.char cget -text] {
-	"ISO 8859-1" {
-	    set Config(ISOLATIN1) 1
-	}
-	"ISO 8859-2" {
-	    set Config(ISOLATIN2) 1
-	}
-	"IBM CPI-852" {
-	    set Config(IBM852) 1
-	}
-	"IBM Extended" {
-	    set Config(IBMEXTENDED) 1
-	}
-    }
-
     while {[gets $in line] != -1} {
 	switch -glob -- $line {
-	    "#define LAT_DEG *" {
-		puts $out "#define LAT_DEG $LAT_DEG"
-		.msgs insert end "#define LAT_DEG $LAT_DEG\n"
+	    "#define DEFAULT_LATITUDE *" {
+                set lat [expr $LAT_DEG + ($LAT_MIN/60.0) + ($LAT_SEC/3600.0)];
+		puts $out "#define DEFAULT_LATITUDE $lat"
+		.msgs insert end "#define DEFAULT_LATITUDE $lat"
 	    }
-	    "#define LAT_MIN *" {
-		puts $out "#define LAT_MIN $LAT_MIN"
-		.msgs insert end "#define LAT_MIN $LAT_MIN\n"
-	    }
-	    "#define LON_DEG *" {
-		puts $out "#define LON_DEG $LON_DEG"
-		.msgs insert end "#define LON_DEG $LON_DEG\n"
-	    }
-	    "#define LON_MIN *" {
-		puts $out "#define LON_MIN $LON_MIN"
-		.msgs insert end "#define LON_MIN $LON_MIN\n"
+	    "#define DEFAULT_LONGITUDE *" {
+                set lon [expr -1.0 * ($LON_DEG + ($LON_MIN/60.0) + ($LON_SEC/3600.0))]
+		puts $out "#define DEFAULT_LONGITUDE $lon"
+		.msgs insert end "#define DEFAULT_LONGITUDE $lon"
 	    }
 	    "#define LOCATION *" {
 		puts $out "#define LOCATION \"$Config(LOCATION)\""
@@ -500,22 +469,6 @@ proc CreateCustomH {} {
 		puts $out "#define TIMESEP '$Config(TIMESEP)'"
 		.msgs insert end "#define TIMESEP '$Config(TIMESEP)'\n"
 	    }
-	    "#define ISOLATIN1 *" {
-		puts $out "#define ISOLATIN1 $Config(ISOLATIN1)"
-		.msgs insert end "#define ISOLATIN1 $Config(ISOLATIN1)\n"
-	    }
-	    "#define ISOLATIN2 *" {
-		puts $out "#define ISOLATIN2 $Config(ISOLATIN2)"
-		.msgs insert end "#define ISOLATIN2 $Config(ISOLATIN2)\n"
-	    }
-	    "#define IBM852 *" {
-		puts $out "#define IBM852 $Config(IBM852)"
-		.msgs insert end "#define IBM852 $Config(IBM852)\n"
-	    }
-	    "#define IBMEXTENDED *" {
-		puts $out "#define IBMEXTENDED $Config(IBMEXTENDED)"
-		.msgs insert end "#define IBMEXTENDED $Config(IBMEXTENDED)\n"
-	    }
 	    default {
 		puts $out $line
 	    }
@@ -757,125 +710,6 @@ proc notebook_fix_size {win} {
     $win configure -width $maxw -height $maxh
 }
 
-#***********************************************************************
-# %PROCEDURE: drawLogo
-# %ARGUMENTS:
-#  c -- canvas to draw logo in
-#  bg -- background color of canvas
-# %RETURNS:
-#  Nothing
-# %DESCRIPTION:
-#  Draws Roaring Penguin logo in a Tcl canvas
-#***********************************************************************
-proc drawLogo { c bg } {
-    set logo_objs {
-	{polygon 558 0 557 0 556 0 554 0 551 0 550 0 549 0 547 0 546 0 544 0 542 1 539 1 537 2 535 3 534 3 533 3 532 3 530 4 528 5 525 6 523 6 522 7 521 7 519 8 516 9 514 10 512 11 510 11 509 12 507 12 507 13 506 13 505 12 502 12 500 11 498 11 497 11 496 11 495 11 493 11 491 12 489 12 488 12 488 13 487 13 485 14 483 15 482 16 481 17 480 19 478 21 477 22 476 23 476 24 475 25 474 26 473 28 472 30 470 33 467 37 464 41 462 45 459 48 457 52 456 54 455 55 454 56 454 57 453 58 452 59 452 61 451 63 449 65 448 68 447 71 445 74 443 77 442 81 440 86 438 90 436 95 435 99 434 103 433 105 433 106 432 107 432 108 432 109 431 111 431 113 430 116 429 121 428 125 427 130 425 135 425 138 424 140 424 142 424 143 424 144 424 145 423 147 423 149 423 152 422 157 421 162 421 167 420 172 420 176 419 180 419 183 419 187 419 189 419 192 418 195 418 196 418 198 418 199 417 199 416 199 415 199 414 199 413 200 412 200 411 200 411 201 410 201 410 202 409 202 409 203 408 203 407 204 407 205 408 205 410 206 413 208 416 209 418 210 419 210 419 211 420 211 421 211 422 212 424 212 426 212 429 213 432 213 435 214 439 214 442 214 444 214 445 214 446 214 447 214 449 214 452 214 457 214 461 214 464 214 466 214 467 214 468 214 469 214 470 214 472 214 474 214 477 213 482 213 486 213 490 212 494 212 497 212 500 211 502 211 505 211 507 211 508 210 509 210 510 210 510 208 511 206 512 203 513 198 514 194 515 189 516 185 517 182 517 179 518 178 518 177 518 176 518 175 519 174 519 171 520 169 520 166 521 163 522 160 522 157 523 153 524 149 524 144 525 139 526 135 526 132 526 130 526 129 526 128 526 127 527 127 527 126 527 124 527 122 527 119 527 115 527 110 527 106 527 102 527 99 527 96 527 95 527 94 527 93 527 92 527 91 527 88 527 85 526 81 526 77 525 72 524 67 524 64 523 60 522 57 521 54 521 51 520 49 520 47 519 45 519 44 518 43 520 42 521 42 523 41 524 40 525 40 526 40 527 40 528 39 530 39 532 39 533 38 534 38 536 38 538 37 539 37 540 37 541 36 543 35 544 34 545 33 546 32 545 32 543 33 542 33 541 34 540 34 539 34 537 34 536 34 534 34 532 34 531 34 530 34 529 34 527 33 525 33 524 33 523 33 522 33 520 32 518 32 517 32 515 31 514 31 514 30 516 29 517 27 519 25 520 24 521 23 521 22 522 22 523 21 524 20 526 19 528 17 530 15 533 14 534 13 535 12 536 12 537 11 538 10 541 9 543 7 545 6 546 6 546 5 547 5 549 4 551 3 553 2 555 1 556 0 557 0 -outline {} -fill \#000000 -width 0}
-	{line 558 0 557 0 556 0 554 0 551 0 550 0 549 0 547 0 546 0 544 0 542 1 539 1 537 2 535 3 534 3 533 3 532 3 530 4 528 5 525 6 523 6 522 7 521 7 519 8 516 9 514 10 512 11 510 11 509 12 507 12 507 13 506 13 505 12 502 12 500 11 498 11 497 11 496 11 495 11 493 11 491 12 489 12 488 12 488 13 487 13 485 14 483 15 482 16 481 17 480 19 478 21 477 22 476 23 476 24 475 25 474 26 473 28 472 30 470 33 467 37 464 41 462 45 459 48 457 52 456 54 455 55 454 56 454 57 453 58 452 59 452 61 451 63 449 65 448 68 447 71 445 74 443 77 442 81 440 86 438 90 436 95 435 99 434 103 433 105 433 106 432 107 432 108 432 109 431 111 431 113 430 116 429 121 428 125 427 130 425 135 425 138 424 140 424 142 424 143 424 144 424 145 423 147 423 149 423 152 422 157 421 162 421 167 420 172 420 176 419 180 419 183 419 187 419 189 419 192 418 195 418 196 418 198 418 199 417 199 416 199 415 199 414 199 413 200 412 200 411 200 411 201 410 201 410 202 409 202 409 203 408 203 407 204 407 205 408 205 410 206 413 208 416 209 418 210 419 210 419 211 420 211 421 211 422 212 424 212 426 212 429 213 432 213 435 214 439 214 442 214 444 214 445 214 446 214 447 214 449 214 452 214 457 214 461 214 464 214 466 214 467 214 468 214 469 214 470 214 472 214 474 214 477 213 482 213 486 213 490 212 494 212 497 212 500 211 502 211 505 211 507 211 508 210 509 210 510 210 510 208 511 206 512 203 513 198 514 194 515 189 516 185 517 182 517 179 518 178 518 177 518 176 518 175 519 174 519 171 520 169 520 166 521 163 522 160 522 157 523 153 524 149 524 144 525 139 526 135 526 132 526 130 526 129 526 128 526 127 527 127 527 126 527 124 527 122 527 119 527 115 527 110 527 106 527 102 527 99 527 96 527 95 527 94 527 93 527 92 527 91 527 88 527 85 526 81 526 77 525 72 524 67 524 64 523 60 522 57 521 54 521 51 520 49 520 47 519 45 519 44 518 43 520 42 521 42 523 41 524 40 525 40 526 40 527 40 528 39 530 39 532 39 533 38 534 38 536 38 538 37 539 37 540 37 541 36 543 35 544 34 545 33 546 32 545 32 543 33 542 33 541 34 540 34 539 34 537 34 536 34 534 34 532 34 531 34 530 34 529 34 527 33 525 33 524 33 523 33 522 33 520 32 518 32 517 32 515 31 514 31 514 30 516 29 517 27 519 25 520 24 521 23 521 22 522 22 523 21 524 20 526 19 528 17 530 15 533 14 534 13 535 12 536 12 537 11 538 10 541 9 543 7 545 6 546 6 546 5 547 5 549 4 551 3 553 2 555 1 556 0 557 0 558 0 -joinstyle bevel}
-	{polygon 490 94 490 95 490 96 489 99 489 103 489 106 488 109 488 111 488 112 488 113 488 115 487 117 487 119 487 121 486 123 485 126 485 130 484 133 483 136 483 137 483 138 483 139 482 139 482 140 482 141 481 144 480 147 479 150 478 153 477 154 477 155 477 156 476 157 476 159 475 161 473 164 472 167 471 170 470 172 468 175 467 176 467 178 466 179 466 180 465 180 465 179 464 177 463 174 462 171 461 169 461 168 461 167 460 166 460 165 460 163 459 161 458 158 458 155 457 152 457 151 457 150 457 149 457 148 456 146 456 143 456 141 456 139 456 138 456 137 456 136 456 134 456 132 456 129 457 126 457 124 457 123 457 121 458 121 458 120 458 121 458 123 458 125 458 127 457 129 457 130 457 131 457 132 458 134 458 136 458 139 458 141 458 143 458 144 459 145 459 148 460 150 460 151 460 152 460 153 461 154 461 155 462 158 462 160 463 162 464 164 464 166 465 167 465 168 465 169 466 169 466 168 467 166 468 163 470 160 470 158 471 157 471 156 472 155 472 154 473 152 474 150 475 147 476 144 477 141 478 139 478 138 479 137 479 136 480 134 480 132 481 129 482 126 483 124 483 122 483 121 484 121 484 120 484 118 485 116 486 112 487 109 487 106 488 103 488 101 489 99 489 97 490 95 490 94 -outline {} -fill $bg -width 0}
-	{line 490 94 490 95 490 96 489 99 489 103 489 106 488 109 488 111 488 112 488 113 488 115 487 117 487 119 487 121 486 123 485 126 485 130 484 133 483 136 483 137 483 138 483 139 482 139 482 140 482 141 481 144 480 147 479 150 478 153 477 154 477 155 477 156 476 157 476 159 475 161 473 164 472 167 471 170 470 172 468 175 467 176 467 178 466 179 466 180 465 180 465 179 464 177 463 174 462 171 461 169 461 168 461 167 460 166 460 165 460 163 459 161 458 158 458 155 457 152 457 151 457 150 457 149 457 148 456 146 456 143 456 141 456 139 456 138 456 137 456 136 456 134 456 132 456 129 457 126 457 124 457 123 457 121 458 121 458 120 458 121 458 123 458 125 458 127 457 129 457 130 457 131 457 132 458 134 458 136 458 139 458 141 458 143 458 144 459 145 459 148 460 150 460 151 460 152 460 153 461 154 461 155 462 158 462 160 463 162 464 164 464 166 465 167 465 168 465 169 466 169 466 168 467 166 468 163 470 160 470 158 471 157 471 156 472 155 472 154 473 152 474 150 475 147 476 144 477 141 478 139 478 138 479 137 479 136 480 134 480 132 481 129 482 126 483 124 483 122 483 121 484 121 484 120 484 118 485 116 486 112 487 109 487 106 488 103 488 101 489 99 489 97 490 95 490 94 -joinstyle bevel}
-	{polygon 503 22 503 23 504 23 504 24 505 24 505 25 505 26 505 27 505 28 505 29 504 29 504 30 503 30 502 30 502 31 501 31 501 30 500 30 499 30 499 29 499 28 499 27 499 26 499 25 499 24 500 24 500 23 501 23 502 22 503 22 -outline {} -fill $bg -width 0}
-	{line 503 22 503 23 504 23 504 24 505 24 505 25 505 26 505 27 505 28 505 29 504 29 504 30 503 30 502 30 502 31 501 31 501 30 500 30 499 30 499 29 499 28 499 27 499 26 499 25 499 24 500 24 500 23 501 23 502 22 503 22 -joinstyle bevel}
-	{polygon 517 44 516 45 515 46 513 47 513 48 512 48 511 48 510 49 508 49 506 50 505 50 504 50 503 50 501 50 498 50 497 51 496 51 495 50 492 50 490 50 487 50 486 49 484 49 483 49 482 48 481 48 481 49 480 51 479 53 479 54 478 55 478 56 477 58 477 59 477 61 477 62 477 63 477 65 477 67 476 68 476 69 477 71 477 72 477 74 477 75 477 76 478 76 479 77 481 77 484 78 485 79 486 79 487 79 488 80 490 81 491 82 493 83 494 84 495 85 496 87 498 88 498 89 499 90 500 92 500 94 500 96 501 98 501 99 501 100 501 101 500 102 500 103 500 104 500 105 499 106 499 107 498 108 498 109 498 110 497 111 497 112 497 113 497 114 497 115 498 115 498 116 499 117 499 118 500 118 500 119 501 120 502 121 502 122 503 122 503 123 502 125 502 128 501 132 501 136 500 139 500 141 500 142 499 143 499 144 499 146 498 148 497 151 496 153 495 156 494 160 493 163 492 165 491 167 491 168 491 169 490 169 490 171 489 174 487 177 486 180 485 182 484 184 484 185 483 185 483 186 482 188 481 190 479 193 478 197 477 199 476 202 475 204 474 206 473 208 472 209 472 210 474 210 476 209 479 209 483 209 488 208 492 207 496 207 499 206 502 206 503 206 504 205 504 204 505 201 506 198 507 193 509 188 510 183 512 179 513 176 514 173 514 172 514 171 514 170 515 169 515 167 516 165 516 162 517 160 518 157 518 154 519 150 520 146 521 142 521 137 522 133 523 129 523 126 523 124 523 122 524 122 524 121 524 120 524 118 524 116 524 113 524 109 524 105 525 101 525 97 525 94 525 92 525 91 525 90 525 89 525 88 525 87 524 85 524 82 524 78 523 74 523 70 522 66 522 62 521 59 521 56 520 54 519 51 519 49 518 47 518 46 518 45 518 44 -outline {} -fill $bg -width 0}
-	{line 517 44 516 45 515 46 513 47 513 48 512 48 511 48 510 49 508 49 506 50 505 50 504 50 503 50 501 50 498 50 497 51 496 51 495 50 492 50 490 50 487 50 486 49 484 49 483 49 482 48 481 48 481 49 480 51 479 53 479 54 478 55 478 56 477 58 477 59 477 61 477 62 477 63 477 65 477 67 476 68 476 69 477 71 477 72 477 74 477 75 477 76 478 76 479 77 481 77 484 78 485 79 486 79 487 79 488 80 490 81 491 82 493 83 494 84 495 85 496 87 498 88 498 89 499 90 500 92 500 94 500 96 501 98 501 99 501 100 501 101 500 102 500 103 500 104 500 105 499 106 499 107 498 108 498 109 498 110 497 111 497 112 497 113 497 114 497 115 498 115 498 116 499 117 499 118 500 118 500 119 501 120 502 121 502 122 503 122 503 123 502 125 502 128 501 132 501 136 500 139 500 141 500 142 499 143 499 144 499 146 498 148 497 151 496 153 495 156 494 160 493 163 492 165 491 167 491 168 491 169 490 169 490 171 489 174 487 177 486 180 485 182 484 184 484 185 483 185 483 186 482 188 481 190 479 193 478 197 477 199 476 202 475 204 474 206 473 208 472 209 472 210 474 210 476 209 479 209 483 209 488 208 492 207 496 207 499 206 502 206 503 206 504 205 504 204 505 201 506 198 507 193 509 188 510 183 512 179 513 176 514 173 514 172 514 171 514 170 515 169 515 167 516 165 516 162 517 160 518 157 518 154 519 150 520 146 521 142 521 137 522 133 523 129 523 126 523 124 523 122 524 122 524 121 524 120 524 118 524 116 524 113 524 109 524 105 525 101 525 97 525 94 525 92 525 91 525 90 525 89 525 88 525 87 524 85 524 82 524 78 523 74 523 70 522 66 522 62 521 59 521 56 520 54 519 51 519 49 518 47 518 46 518 45 518 44 517 44 -joinstyle bevel}
-	{polygon 11 126 12 126 13 126 16 126 19 126 23 126 27 126 32 126 36 126 39 126 41 126 43 126 45 126 47 126 50 127 51 127 52 127 53 128 54 128 56 129 57 130 58 132 59 132 59 133 60 134 61 135 61 137 62 138 62 139 62 140 62 142 62 144 62 145 62 147 62 148 62 149 62 150 61 152 61 154 61 155 61 156 60 157 60 158 59 159 58 161 57 162 57 163 56 164 55 165 54 166 53 167 51 168 49 169 48 169 47 170 46 170 47 171 49 171 51 172 52 172 53 173 54 174 55 175 56 177 56 178 57 180 57 181 57 182 57 183 57 184 57 185 57 187 57 189 57 190 57 191 56 192 56 194 56 196 56 199 56 200 56 201 56 202 55 203 55 205 55 206 55 207 55 208 55 209 56 209 56 210 56 211 57 212 58 212 58 213 57 213 56 213 55 213 51 213 47 213 43 213 40 213 38 213 37 213 37 212 37 211 36 210 36 209 36 208 36 207 36 206 36 205 37 204 37 203 37 202 37 201 37 199 37 198 37 197 37 196 37 195 37 194 38 192 38 189 38 188 38 187 38 186 38 185 38 184 38 182 37 181 37 180 37 179 36 179 36 178 35 178 34 177 33 177 32 177 31 177 30 177 28 177 26 177 24 177 24 178 24 179 24 182 23 186 23 190 22 195 22 200 21 205 21 208 20 211 20 213 19 213 17 213 14 213 10 213 7 213 4 213 2 213 1 213 1 212 1 211 2 208 2 205 2 201 3 196 4 190 4 184 5 177 6 169 7 162 8 155 9 149 9 143 10 138 10 134 11 131 11 129 11 127 11 126 -outline {} -fill \#000000 -width 0}
-	{polygon 26 163 27 163 29 163 31 163 32 163 33 162 35 162 36 162 37 161 38 161 39 160 40 159 40 158 41 157 42 156 42 154 43 153 43 152 43 151 43 150 43 149 43 148 43 147 43 146 42 145 42 144 42 143 41 143 41 142 40 142 40 141 39 141 38 141 37 141 36 140 35 140 34 140 33 140 31 140 30 140 29 140 28 141 28 142 28 145 28 148 27 151 27 155 26 158 26 161 26 162 26 163 -outline {} -fill \#000000 -width 0}
-	{line 11 126 12 126 13 126 16 126 19 126 23 126 27 126 32 126 36 126 39 126 41 126 43 126 45 126 47 126 50 127 51 127 52 127 53 128 54 128 56 129 57 130 58 132 59 132 59 133 60 134 61 135 61 137 62 138 62 139 62 140 62 142 62 144 62 145 62 147 62 148 62 149 62 150 61 152 61 154 61 155 61 156 60 157 60 158 59 159 58 161 57 162 57 163 56 164 55 165 54 166 53 167 51 168 49 169 48 169 47 170 46 170 47 171 49 171 51 172 52 172 53 173 54 174 55 175 56 177 56 178 57 180 57 181 57 182 57 183 57 184 57 185 57 187 57 189 57 190 57 191 56 192 56 194 56 196 56 199 56 200 56 201 56 202 55 203 55 205 55 206 55 207 55 208 55 209 56 209 56 210 56 211 57 212 58 212 58 213 57 213 56 213 55 213 51 213 47 213 43 213 40 213 38 213 37 213 37 212 37 211 36 210 36 209 36 208 36 207 36 206 36 205 37 204 37 203 37 202 37 201 37 199 37 198 37 197 37 196 37 195 37 194 38 192 38 189 38 188 38 187 38 186 38 185 38 184 38 182 37 181 37 180 37 179 36 179 36 178 35 178 34 177 33 177 32 177 31 177 30 177 28 177 26 177 24 177 24 178 24 179 24 182 23 186 23 190 22 195 22 200 21 205 21 208 20 211 20 213 19 213 17 213 14 213 10 213 7 213 4 213 2 213 1 213 1 212 1 211 2 208 2 205 2 201 3 196 4 190 4 184 5 177 6 169 7 162 8 155 9 149 9 143 10 138 10 134 11 131 11 129 11 127 11 126 -joinstyle bevel}
-	{polygon 26 163 27 163 29 163 31 163 32 163 33 162 35 162 36 162 37 161 38 161 39 160 40 159 40 158 41 157 42 156 42 154 43 153 43 152 43 151 43 150 43 149 43 148 43 147 43 146 42 145 42 144 42 143 41 143 41 142 40 142 40 141 39 141 38 141 37 141 36 140 35 140 34 140 33 140 31 140 30 140 29 140 28 141 28 142 28 145 28 148 27 151 27 155 26 158 26 161 26 162 26 163 -outline {} -fill $bg -width 0}
-	{polygon 90 215 89 215 86 214 84 214 81 213 79 213 78 213 77 213 77 212 75 212 74 211 72 209 70 207 69 205 68 204 68 203 68 202 67 202 67 200 66 198 66 195 66 193 66 192 66 191 66 190 66 188 66 185 66 182 66 180 66 177 66 175 66 174 67 172 67 171 67 170 67 169 67 167 68 165 68 162 68 159 69 156 69 155 69 154 70 152 70 151 70 149 71 147 72 144 73 142 74 139 75 138 75 137 76 136 76 135 77 134 79 132 81 130 82 129 83 129 83 128 84 128 85 127 88 126 91 125 93 125 95 124 97 124 99 124 100 124 101 124 102 124 104 125 107 125 110 126 112 126 113 126 114 127 115 127 116 128 117 129 118 130 120 131 121 133 122 135 123 136 123 137 123 138 123 139 124 141 124 143 125 146 125 148 125 149 125 150 125 152 125 156 125 159 124 162 124 164 124 166 124 168 124 169 123 169 123 170 123 171 123 173 122 177 122 180 122 182 121 183 121 184 121 185 121 187 120 189 120 191 119 193 118 196 117 199 116 200 116 201 116 202 115 203 114 204 112 206 111 208 109 209 109 210 108 210 107 211 106 211 103 213 100 213 98 214 96 214 94 215 92 215 91 215 90 215 -outline {} -fill \#000000 -width 0}
-	{polygon 91 201 92 201 94 200 95 200 96 200 96 199 97 198 98 197 99 196 99 195 100 194 100 193 100 191 101 189 101 188 101 187 102 185 102 182 103 179 103 177 103 175 103 173 104 171 104 170 104 169 104 168 104 166 104 163 105 160 105 158 105 157 105 156 105 154 105 153 106 150 106 148 105 146 105 145 105 144 105 143 105 142 104 141 104 140 103 139 101 138 100 138 99 138 98 138 96 138 95 139 94 139 94 140 93 141 92 142 91 143 91 144 91 145 91 146 90 148 89 150 89 151 89 152 89 154 88 157 88 160 87 162 87 164 87 166 87 168 86 169 86 170 86 171 86 173 86 176 85 179 85 181 85 182 85 183 85 185 85 186 85 189 85 191 85 193 85 194 85 195 85 196 86 197 86 198 86 199 87 199 88 200 89 201 90 201 91 201 -outline {} -fill $bg -width 0}
-	{line 90 215 89 215 86 214 84 214 81 213 79 213 78 213 77 213 77 212 75 212 74 211 72 209 70 207 69 205 68 204 68 203 68 202 67 202 67 200 66 198 66 195 66 193 66 192 66 191 66 190 66 188 66 185 66 182 66 180 66 177 66 175 66 174 67 172 67 171 67 170 67 169 67 167 68 165 68 162 68 159 69 156 69 155 69 154 70 152 70 151 70 149 71 147 72 144 73 142 74 139 75 138 75 137 76 136 76 135 77 134 79 132 81 130 82 129 83 129 83 128 84 128 85 127 88 126 91 125 93 125 95 124 97 124 99 124 100 124 101 124 102 124 104 125 107 125 110 126 112 126 113 126 114 127 115 127 116 128 117 129 118 130 120 131 121 133 122 135 123 136 123 137 123 138 123 139 124 141 124 143 125 146 125 148 125 149 125 150 125 152 125 156 125 159 124 162 124 164 124 166 124 168 124 169 123 169 123 170 123 171 123 173 122 177 122 180 122 182 121 183 121 184 121 185 121 187 120 189 120 191 119 193 118 196 117 199 116 200 116 201 116 202 115 203 114 204 112 206 111 208 109 209 109 210 108 210 107 211 106 211 103 213 100 213 98 214 96 214 94 215 92 215 91 215 90 215 -joinstyle bevel}
-	{polygon 149 126 173 126 182 213 163 213 162 197 142 197 138 213 118 213 -outline {} -fill \#000000 -width 0}
-	{polygon 158 142 147 181 161 181 -outline {} -fill \#000000 -width 0}
-	{line 149 126 173 126 182 213 163 213 162 197 142 197 138 213 118 213 149 126}
-	{polygon 158 142 147 181 161 181 -outline {} -fill $bg -width 0}
-	{polygon 196 126 197 126 198 126 201 126 204 126 208 126 212 126 217 126 221 126 224 126 226 126 228 126 230 126 232 126 235 127 236 127 237 127 238 128 239 128 241 129 242 130 244 132 244 133 245 133 245 134 246 135 246 137 247 138 247 139 247 140 247 142 247 144 247 145 247 147 247 148 247 149 247 150 246 152 246 154 246 155 246 156 245 157 245 158 244 159 244 161 242 162 242 163 241 164 240 165 239 166 238 167 236 168 235 169 233 169 232 169 232 170 231 170 232 171 234 171 236 172 237 172 238 172 238 173 239 174 240 175 241 177 241 178 242 180 242 181 242 182 242 183 242 184 242 185 242 187 242 189 242 190 242 191 241 192 241 194 241 196 241 199 241 200 241 201 241 202 241 203 240 205 240 206 240 207 240 208 241 208 241 209 241 210 241 211 242 212 243 212 243 213 242 213 240 213 236 213 232 213 228 213 225 213 223 213 222 213 222 212 222 211 221 210 221 209 221 208 221 207 221 206 221 205 221 204 221 203 221 202 222 201 222 199 222 198 222 197 222 196 222 195 222 194 223 192 223 189 223 188 223 187 223 186 223 185 223 184 223 182 222 181 222 180 222 179 221 178 220 178 218 177 217 177 216 177 215 177 213 177 211 177 209 177 209 178 209 179 209 182 208 186 208 190 207 195 206 200 206 205 206 208 205 211 205 213 204 213 202 213 199 213 196 213 192 213 189 213 187 213 186 213 186 212 186 211 187 208 187 205 188 201 188 196 189 190 190 184 190 177 191 169 192 162 193 155 194 149 194 143 195 138 196 134 196 131 196 129 196 127 196 126 -outline {} -fill \#000000 -width 0}
-	{polygon 211 163 212 163 214 163 216 163 217 163 218 162 220 162 221 162 222 161 223 161 224 160 225 159 225 158 226 157 227 157 227 156 227 154 228 153 228 152 228 151 228 150 228 149 228 148 228 147 228 146 227 145 227 144 227 143 226 142 225 142 225 141 224 141 223 141 222 141 221 140 220 140 219 140 218 140 217 140 215 140 214 140 214 141 213 142 213 145 213 148 212 151 212 155 212 158 211 161 211 162 211 163 -outline {} -fill \#000000 -width 0}
-	{line 196 126 197 126 198 126 201 126 204 126 208 126 212 126 217 126 221 126 224 126 226 126 228 126 230 126 232 126 235 127 236 127 237 127 238 128 239 128 241 129 242 130 244 132 244 133 245 133 245 134 246 135 246 137 247 138 247 139 247 140 247 142 247 144 247 145 247 147 247 148 247 149 247 150 246 152 246 154 246 155 246 156 245 157 245 158 244 159 244 161 242 162 242 163 241 164 240 165 239 166 238 167 236 168 235 169 233 169 232 169 232 170 231 170 232 171 234 171 236 172 237 172 238 172 238 173 239 174 240 175 241 177 241 178 242 180 242 181 242 182 242 183 242 184 242 185 242 187 242 189 242 190 242 191 241 192 241 194 241 196 241 199 241 200 241 201 241 202 241 203 240 205 240 206 240 207 240 208 241 208 241 209 241 210 241 211 242 212 243 212 243 213 242 213 240 213 236 213 232 213 228 213 225 213 223 213 222 213 222 212 222 211 221 210 221 209 221 208 221 207 221 206 221 205 221 204 221 203 221 202 222 201 222 199 222 198 222 197 222 196 222 195 222 194 223 192 223 189 223 188 223 187 223 186 223 185 223 184 223 182 222 181 222 180 222 179 221 178 220 178 218 177 217 177 216 177 215 177 213 177 211 177 209 177 209 178 209 179 209 182 208 186 208 190 207 195 206 200 206 205 206 208 205 211 205 213 204 213 202 213 199 213 196 213 192 213 189 213 187 213 186 213 186 212 186 211 187 208 187 205 188 201 188 196 189 190 190 184 190 177 191 169 192 162 193 155 194 149 194 143 195 138 196 134 196 131 196 129 196 127 196 126 -joinstyle bevel}
-	{polygon 211 163 212 163 214 163 216 163 217 163 218 162 220 162 221 162 222 161 223 161 224 160 225 159 225 158 226 157 227 157 227 156 227 154 228 153 228 152 228 151 228 150 228 149 228 148 228 147 228 146 227 145 227 144 227 143 226 142 225 142 225 141 224 141 223 141 222 141 221 140 220 140 219 140 218 140 217 140 215 140 214 140 214 141 213 142 213 145 213 148 212 151 212 155 212 158 211 161 211 162 211 163 -outline {} -fill $bg -width 0}
-	{polygon 259 126 278 126 268 213 249 213 -outline {} -fill \#000000 -width 0}
-	{line 259 126 278 126 268 213 249 213 259 126}
-	{polygon 288 126 310 126 319 183 326 126 343 126 333 213 311 213 302 153 295 213 278 213 -outline {} -fill \#000000 -width 0}
-	{line 288 126 310 126 319 183 326 126 343 126 333 213 311 213 302 153 295 213 278 213 288 126}
-	{polygon 383 152 384 151 384 150 384 149 384 148 384 147 384 146 384 145 384 144 383 143 383 142 383 141 382 140 382 139 381 139 380 138 379 138 378 138 377 138 376 138 375 139 374 139 373 139 373 140 372 141 371 142 370 144 370 145 369 145 369 146 368 148 368 151 368 152 368 153 367 154 367 157 366 160 366 162 366 164 366 166 365 168 365 169 365 170 365 171 365 173 365 176 364 179 364 181 364 182 364 183 364 185 364 186 364 189 364 191 364 193 364 194 364 195 364 196 364 197 365 198 365 199 366 199 366 200 368 201 369 201 370 201 371 201 373 201 373 200 374 200 375 200 375 199 376 198 377 197 377 196 378 196 378 195 379 193 379 192 379 191 380 189 380 187 380 186 381 185 381 184 381 183 381 182 381 181 381 180 380 180 377 180 374 180 373 180 372 180 373 179 373 176 373 173 374 170 374 168 374 166 375 166 376 166 379 166 383 166 387 166 392 166 395 166 398 166 400 166 401 166 401 167 400 168 400 171 400 174 399 179 398 184 398 190 397 196 397 201 396 205 395 209 395 211 395 213 394 213 392 213 389 213 385 213 383 213 382 213 382 212 382 209 382 207 383 205 382 205 381 206 380 208 380 209 379 209 378 210 377 211 376 212 375 213 374 213 372 214 371 214 370 214 368 215 367 215 365 215 364 215 363 215 361 214 359 214 356 213 355 213 354 213 353 213 352 212 351 211 349 209 348 207 346 205 346 204 346 203 345 201 345 198 344 196 344 194 344 193 344 192 344 190 344 186 344 184 344 181 345 179 345 177 345 175 345 174 345 172 345 171 346 171 346 169 346 166 347 163 347 160 347 158 347 156 348 156 348 155 348 153 348 152 349 150 349 148 350 145 351 142 352 140 353 138 353 137 354 137 354 136 355 134 357 132 359 131 360 130 361 129 362 128 364 127 366 126 369 125 371 125 374 124 376 124 378 124 379 124 380 124 381 124 383 125 386 125 388 125 390 126 391 126 392 126 392 127 394 127 395 128 397 129 398 131 400 133 400 134 400 135 401 136 401 138 402 140 402 141 402 142 402 143 402 146 402 148 402 150 402 151 402 152 401 152 399 152 396 152 393 152 389 152 386 152 384 152 -outline {} -fill \#000000 -width 0}
-	{line 383 152 384 151 384 150 384 149 384 148 384 147 384 146 384 145 384 144 383 143 383 142 383 141 382 140 382 139 381 139 380 138 379 138 378 138 377 138 376 138 375 139 374 139 373 139 373 140 372 141 371 142 370 144 370 145 369 145 369 146 368 148 368 151 368 152 368 153 367 154 367 157 366 160 366 162 366 164 366 166 365 168 365 169 365 170 365 171 365 173 365 176 364 179 364 181 364 182 364 183 364 185 364 186 364 189 364 191 364 193 364 194 364 195 364 196 364 197 365 198 365 199 366 199 366 200 368 201 369 201 370 201 371 201 373 201 373 200 374 200 375 200 375 199 376 198 377 197 377 196 378 196 378 195 379 193 379 192 379 191 380 189 380 187 380 186 381 185 381 184 381 183 381 182 381 181 381 180 380 180 377 180 374 180 373 180 372 180 373 179 373 176 373 173 374 170 374 168 374 166 375 166 376 166 379 166 383 166 387 166 392 166 395 166 398 166 400 166 401 166 401 167 400 168 400 171 400 174 399 179 398 184 398 190 397 196 397 201 396 205 395 209 395 211 395 213 394 213 392 213 389 213 385 213 383 213 382 213 382 212 382 209 382 207 383 205 382 205 381 206 380 208 380 209 379 209 378 210 377 211 376 212 375 213 374 213 372 214 371 214 370 214 368 215 367 215 365 215 364 215 363 215 361 214 359 214 356 213 355 213 354 213 353 213 352 212 351 211 349 209 348 207 346 205 346 204 346 203 345 201 345 198 344 196 344 194 344 193 344 192 344 190 344 186 344 184 344 181 345 179 345 177 345 175 345 174 345 172 345 171 346 171 346 169 346 166 347 163 347 160 347 158 347 156 348 156 348 155 348 153 348 152 349 150 349 148 350 145 351 142 352 140 353 138 353 137 354 137 354 136 355 134 357 132 359 131 360 130 361 129 362 128 364 127 366 126 369 125 371 125 374 124 376 124 378 124 379 124 380 124 381 124 383 125 386 125 388 125 390 126 391 126 392 126 392 127 394 127 395 128 397 129 398 131 400 133 400 134 400 135 401 136 401 138 402 140 402 141 402 142 402 143 402 146 402 148 402 150 402 151 402 152 401 152 399 152 396 152 393 152 389 152 386 152 384 152 383 152 -joinstyle bevel}
-	{polygon 118 229 119 229 121 229 124 229 128 229 133 229 137 229 142 229 145 229 146 229 147 229 148 229 150 229 152 230 155 230 156 230 157 231 158 231 159 231 160 232 162 233 163 235 165 236 165 237 166 237 166 238 166 239 167 241 167 243 168 243 168 244 168 245 168 247 168 249 168 251 168 252 168 253 168 254 167 255 167 258 166 261 166 262 166 263 165 264 165 265 164 267 162 269 161 271 160 272 159 273 157 274 155 275 154 276 153 276 153 277 152 277 149 278 147 278 145 279 143 279 142 279 140 279 139 279 137 279 135 279 132 279 131 279 130 280 130 281 130 283 130 286 129 291 128 295 128 300 127 304 127 307 127 309 127 310 127 311 126 311 124 311 121 311 117 311 113 311 110 311 109 311 108 311 108 310 108 308 108 305 109 301 109 297 110 291 111 284 112 277 113 270 114 263 115 255 115 249 116 243 117 238 117 235 118 232 118 230 118 229 -outline {} -fill \#1892ff -width 0}
-	{polygon 132 265 133 265 134 265 136 265 137 265 138 265 139 265 140 264 141 264 142 264 143 264 143 263 144 263 145 262 146 262 146 261 146 260 147 259 148 258 148 256 148 255 148 254 148 253 148 252 148 251 148 250 148 249 148 248 147 247 147 246 146 245 145 244 144 244 143 243 142 243 141 243 140 243 138 243 137 243 135 243 135 244 135 245 134 247 134 250 134 254 133 257 133 261 133 263 133 264 132 265 -outline {} -fill \#1892ff -width 0}
-	{line 118 229 119 229 121 229 124 229 128 229 133 229 137 229 142 229 145 229 146 229 147 229 148 229 150 229 152 230 155 230 156 230 157 231 158 231 159 231 160 232 162 233 163 235 165 236 165 237 166 237 166 238 166 239 167 241 167 243 168 243 168 244 168 245 168 247 168 249 168 251 168 252 168 253 168 254 167 255 167 258 166 261 166 262 166 263 165 264 165 265 164 267 162 269 161 271 160 272 159 273 157 274 155 275 154 276 153 276 153 277 152 277 149 278 147 278 145 279 143 279 142 279 140 279 139 279 137 279 135 279 132 279 131 279 130 280 130 281 130 283 130 286 129 291 128 295 128 300 127 304 127 307 127 309 127 310 127 311 126 311 124 311 121 311 117 311 113 311 110 311 109 311 108 311 108 310 108 308 108 305 109 301 109 297 110 291 111 284 112 277 113 270 114 263 115 255 115 249 116 243 117 238 117 235 118 232 118 230 118 229 -joinstyle bevel -fill \#1892ff}
-	{polygon 176 229 223 229 221 244 193 244 191 261 217 261 215 277 189 277 187 295 215 295 214 311 166 311 -outline {} -fill \#1892ff -width 0}
-	{line 176 229 223 229 221 244 193 244 191 261 217 261 215 277 189 277 187 295 215 295 214 311 166 311 176 229 -fill \#1892ff}
-	{polygon 232 229 254 229 263 282 270 229 288 229 277 311 256 311 246 254 239 311 222 311 -outline {} -fill \#1892ff -width 0}
-	{line 232 229 254 229 263 282 270 229 288 229 277 311 256 311 246 254 239 311 222 311 232 229 -fill \#1892ff}
-	{polygon 328 254 328 253 328 251 328 250 328 249 328 248 328 247 328 246 328 245 328 244 327 243 327 242 326 242 325 241 324 241 323 240 322 240 321 240 319 241 318 241 317 242 316 243 315 244 314 246 314 247 314 248 313 250 312 252 312 253 312 254 312 256 311 259 311 261 311 263 310 265 310 267 310 268 310 270 310 271 309 273 309 276 309 279 308 281 308 282 308 283 308 284 308 286 308 288 308 290 308 292 308 293 308 294 309 296 309 297 310 298 311 299 312 300 313 300 314 300 315 300 316 300 317 299 318 299 319 299 319 298 320 298 321 297 322 296 322 295 323 293 323 292 324 291 324 289 325 287 325 285 325 284 325 283 325 282 326 282 326 281 326 280 325 280 324 280 321 280 319 280 317 280 317 279 317 276 318 273 318 270 318 268 319 267 321 267 324 267 327 267 332 267 336 267 340 267 343 267 344 267 345 267 345 268 345 269 344 271 344 274 343 279 343 284 342 289 341 294 341 300 340 304 340 307 340 309 339 310 339 311 338 311 336 311 333 311 330 311 328 311 327 311 326 311 327 310 327 307 327 305 327 304 327 303 326 304 325 306 324 307 324 308 323 308 322 309 321 310 320 311 319 311 318 311 317 312 316 312 315 312 314 312 313 312 311 313 310 313 309 313 308 313 307 313 306 312 303 312 301 311 299 311 298 311 298 310 296 310 295 309 294 308 292 306 291 304 290 302 290 301 290 300 289 297 289 295 289 293 289 292 289 291 289 289 289 286 289 283 289 280 289 278 289 275 290 274 290 273 290 272 290 271 290 270 291 267 291 264 291 261 292 259 292 258 292 257 292 256 292 255 293 253 293 252 294 249 295 247 296 244 297 242 298 240 298 239 299 238 300 237 301 235 303 234 304 232 305 232 306 231 308 230 311 229 313 228 316 228 318 227 320 227 322 227 323 227 324 227 325 227 327 228 330 228 333 229 335 229 336 229 337 229 338 230 340 231 341 232 343 234 344 236 345 237 345 238 346 240 346 242 347 244 347 246 347 247 347 250 347 251 346 252 346 253 346 254 345 254 343 254 341 254 337 254 334 254 331 254 329 254 328 254 -outline {} -fill \#1892ff -width 0}
-	{line 328 254 328 253 328 251 328 250 328 249 328 248 328 247 328 246 328 245 328 244 327 243 327 242 326 242 325 241 324 241 323 240 322 240 321 240 319 241 318 241 317 242 316 243 315 244 314 246 314 247 314 248 313 250 312 252 312 253 312 254 312 256 311 259 311 261 311 263 310 265 310 267 310 268 310 270 310 271 309 273 309 276 309 279 308 281 308 282 308 283 308 284 308 286 308 288 308 290 308 292 308 293 308 294 309 296 309 297 310 298 311 299 312 300 313 300 314 300 315 300 316 300 317 299 318 299 319 299 319 298 320 298 321 297 322 296 322 295 323 293 323 292 324 291 324 289 325 287 325 285 325 284 325 283 325 282 326 282 326 281 326 280 325 280 324 280 321 280 319 280 317 280 317 279 317 276 318 273 318 270 318 268 319 267 321 267 324 267 327 267 332 267 336 267 340 267 343 267 344 267 345 267 345 268 345 269 344 271 344 274 343 279 343 284 342 289 341 294 341 300 340 304 340 307 340 309 339 310 339 311 338 311 336 311 333 311 330 311 328 311 327 311 326 311 327 310 327 307 327 305 327 304 327 303 326 304 325 306 324 307 324 308 323 308 322 309 321 310 320 311 319 311 318 311 317 312 316 312 315 312 314 312 313 312 311 313 310 313 309 313 308 313 307 313 306 312 303 312 301 311 299 311 298 311 298 310 296 310 295 309 294 308 292 306 291 304 290 302 290 301 290 300 289 297 289 295 289 293 289 292 289 291 289 289 289 286 289 283 289 280 289 278 289 275 290 274 290 273 290 272 290 271 290 270 291 267 291 264 291 261 292 259 292 258 292 257 292 256 292 255 293 253 293 252 294 249 295 247 296 244 297 242 298 240 298 239 299 238 300 237 301 235 303 234 304 232 305 232 306 231 308 230 311 229 313 228 316 228 318 227 320 227 322 227 323 227 324 227 325 227 327 228 330 228 333 229 335 229 336 229 337 229 338 230 340 231 341 232 343 234 344 236 345 237 345 238 346 240 346 242 347 244 347 246 347 247 347 250 347 251 346 252 346 253 346 254 345 254 343 254 341 254 337 254 334 254 331 254 329 254 328 254 -joinstyle bevel -fill \#1892ff}
-	{polygon 405 284 404 286 404 289 403 291 403 293 403 294 402 295 402 297 401 299 400 301 398 303 397 304 397 305 396 306 394 307 392 309 391 309 391 310 390 310 389 310 386 311 384 312 381 312 380 312 378 313 376 313 375 313 374 313 372 312 369 312 367 312 365 311 364 311 363 311 362 310 360 310 358 309 356 307 355 306 354 305 354 304 353 303 353 301 352 299 352 298 352 297 351 295 351 293 351 290 351 288 352 286 352 285 352 284 352 283 352 282 352 280 353 277 353 273 354 268 355 262 355 256 356 250 357 245 357 240 358 236 358 233 359 231 359 229 360 229 362 229 365 229 368 229 372 229 375 229 377 229 378 229 377 230 377 232 377 234 376 238 376 242 375 247 375 253 374 259 373 265 372 271 372 276 371 280 371 284 370 287 370 288 370 289 370 290 370 291 370 292 370 293 370 294 370 295 370 296 371 297 372 298 372 299 373 299 374 299 374 300 375 300 376 300 377 300 378 300 379 299 380 299 381 299 381 298 382 297 383 297 383 296 383 295 384 295 384 294 384 293 385 292 385 291 385 290 385 289 385 288 386 287 386 284 386 280 387 276 388 271 388 265 389 259 390 253 390 247 391 242 392 238 392 234 392 232 393 230 393 229 394 229 396 229 399 229 402 229 406 229 409 229 411 229 412 229 412 231 411 233 411 236 410 240 410 245 409 250 408 256 407 262 407 268 406 273 406 277 405 280 405 282 405 283 -outline {} -fill \#1892ff -width 0}
-	{line 405 284 404 286 404 289 403 291 403 293 403 294 402 295 402 297 401 299 400 301 398 303 397 304 397 305 396 306 394 307 392 309 391 309 391 310 390 310 389 310 386 311 384 312 381 312 380 312 378 313 376 313 375 313 374 313 372 312 369 312 367 312 365 311 364 311 363 311 362 310 360 310 358 309 356 307 355 306 354 305 354 304 353 303 353 301 352 299 352 298 352 297 351 295 351 293 351 290 351 288 352 286 352 285 352 284 352 283 352 282 352 280 353 277 353 273 354 268 355 262 355 256 356 250 357 245 357 240 358 236 358 233 359 231 359 229 360 229 362 229 365 229 368 229 372 229 375 229 377 229 378 229 377 230 377 232 377 234 376 238 376 242 375 247 375 253 374 259 373 265 372 271 372 276 371 280 371 284 370 287 370 288 370 289 370 290 370 291 370 292 370 293 370 294 370 295 370 296 371 297 372 298 372 299 373 299 374 299 374 300 375 300 376 300 377 300 378 300 379 299 380 299 381 299 381 298 382 297 383 297 383 296 383 295 384 295 384 294 384 293 385 292 385 291 385 290 385 289 385 288 386 287 386 284 386 280 387 276 388 271 388 265 389 259 390 253 390 247 391 242 392 238 392 234 392 232 393 230 393 229 394 229 396 229 399 229 402 229 406 229 409 229 411 229 412 229 412 231 411 233 411 236 410 240 410 245 409 250 408 256 407 262 407 268 406 273 406 277 405 280 405 282 405 283 405 284 -joinstyle bevel -fill \#1892ff}
-	{polygon 421 229 439 229 429 311 410 311 -outline {} -fill \#1892ff -width 0}
-	{line 421 229 439 229 429 311 410 311 421 229 -fill \#1892ff}
-	{polygon 449 229 471 229 480 282 487 229 504 229 494 311 473 311 463 254 456 311 439 311 -outline {} -fill \#1892ff -width 0}
-	{line 449 229 471 229 480 282 487 229 504 229 494 311 473 311 463 254 456 311 439 311 449 229 -fill \#1892ff}
-	{polygon 114 354 114 355 114 356 114 357 114 358 114 359 115 359 115 360 116 360 117 360 118 360 119 359 119 358 120 358 120 357 120 356 119 355 119 354 118 353 117 352 116 352 115 351 114 350 113 350 112 349 110 348 109 347 109 346 108 345 108 343 107 342 107 341 107 340 107 339 107 338 108 337 108 336 108 335 109 334 109 333 110 333 110 332 111 331 112 331 113 331 114 330 115 330 116 330 117 330 118 330 119 330 120 330 121 331 122 331 123 332 124 332 124 333 125 334 125 335 125 336 126 336 126 337 126 338 126 339 126 340 125 340 123 340 121 340 119 340 119 339 119 338 119 337 119 336 118 336 118 335 117 335 116 335 116 336 115 336 115 337 114 337 114 338 114 339 115 340 115 341 115 342 116 343 117 343 118 344 120 345 121 345 122 346 123 347 124 347 124 348 125 349 126 351 126 352 126 353 126 354 126 355 126 356 126 358 126 359 126 360 125 361 125 362 124 363 123 364 122 364 122 365 121 365 120 365 119 366 118 366 117 366 116 366 115 366 114 365 113 365 112 365 111 364 110 364 109 363 108 362 108 361 108 360 107 359 107 358 107 357 107 356 107 355 107 354 108 354 110 354 112 354 113 354 -outline {} -fill \#000000 -width 0}
-	{polygon 152 366 151 365 149 365 148 365 147 364 146 364 145 363 144 361 143 360 143 359 143 357 142 357 142 356 142 354 142 352 142 351 142 349 142 348 142 347 142 345 142 343 142 342 142 341 142 340 143 339 143 337 143 336 144 335 144 334 145 333 146 332 146 331 148 331 149 330 150 330 151 330 152 330 154 330 155 331 157 331 158 332 159 333 160 334 161 335 161 336 161 337 162 339 162 340 162 341 162 342 162 344 162 345 162 346 162 347 162 348 162 349 162 351 162 352 162 353 162 354 162 355 162 357 161 358 161 360 161 361 160 362 159 363 159 364 158 364 157 365 155 365 154 366 153 366 152 366 -outline {} -fill \#000000 -width 0}
-	{polygon 152 360 153 360 154 360 154 359 155 358 155 357 155 356 155 355 155 354 155 353 155 351 155 350 155 349 155 348 155 346 155 344 155 343 155 342 155 341 155 339 155 338 154 337 154 336 153 336 153 335 152 335 152 336 151 336 150 336 150 337 150 338 149 338 149 339 149 340 149 341 149 342 149 343 149 345 149 346 149 347 149 348 149 349 149 351 149 352 149 353 149 354 149 355 149 356 149 357 149 358 150 358 150 359 151 360 152 360 -outline {} -fill $bg -width 0}
-	{polygon 179 331 195 331 195 337 185 337 185 344 195 344 195 351 185 351 185 365 179 365 -outline {} -fill \#000000 -width 0}
-	{polygon 215 337 209 337 209 331 228 331 228 337 222 337 222 365 215 365 -outline {} -fill \#000000 -width 0}
-	{polygon 241 331 248 331 251 355 254 331 260 331 263 355 266 331 272 331 267 365 260 365 257 341 254 365 247 365 -outline {} -fill \#000000 -width 0}
-	{polygon 293 331 301 331 308 365 302 365 301 358 294 358 293 365 286 365 -outline {} -fill \#000000 -width 0}
-	{polygon 297 337 295 352 299 352 -outline {} -fill $bg -width 0}
-	{polygon 324 331 325 331 327 331 329 331 332 331 334 331 335 331 336 331 337 331 338 331 339 332 340 332 340 333 341 333 341 334 342 334 342 335 342 336 343 337 343 338 343 339 343 340 343 341 343 342 343 343 342 343 342 344 342 345 341 345 341 346 340 347 339 348 338 348 339 349 340 349 341 349 341 350 342 351 342 352 342 353 342 354 342 355 343 356 343 357 343 358 343 359 343 360 343 361 343 362 343 363 343 364 344 364 344 365 342 365 340 365 338 365 337 365 336 365 336 364 336 363 336 362 336 361 336 360 336 359 336 358 336 357 336 356 336 355 336 354 335 353 335 352 335 351 334 351 333 351 332 351 331 351 330 351 330 352 330 355 330 358 330 361 330 364 330 365 329 365 327 365 325 365 324 365 324 364 324 363 324 360 324 357 324 353 324 348 324 343 324 339 324 335 324 333 324 331 -outline {} -fill \#000000 -width 0}
-	{polygon 330 345 331 345 332 345 333 345 334 345 335 345 335 344 335 343 336 343 336 342 336 341 336 340 336 339 335 338 335 337 334 337 333 336 332 336 331 336 330 336 330 337 330 338 330 341 330 343 330 345 -outline {} -fill $bg -width 0}
-	{polygon 360 331 376 331 376 337 367 337 367 344 376 344 376 351 367 351 367 358 377 358 377 365 360 365 -outline {} -fill \#000000 -width 0}
-	{polygon 416 331 423 331 423 365 416 365 -outline {} -fill \#000000 -width 0}
-	{polygon 440 331 448 331 454 353 454 331 460 331 460 365 452 365 446 341 446 365 440 365 -outline {} -fill \#000000 -width 0}
-	{polygon 485 343 485 342 485 341 485 340 485 339 485 338 485 337 484 337 484 336 483 336 483 335 482 335 482 336 481 336 480 337 480 338 480 339 480 340 480 341 479 341 479 343 479 344 479 346 479 347 479 348 479 349 479 351 479 352 479 353 480 354 480 355 480 356 480 357 480 358 480 359 481 359 481 360 482 360 483 360 484 360 484 359 485 359 485 358 485 357 485 356 485 355 485 354 485 353 485 352 487 352 489 352 491 352 492 352 492 353 492 354 492 356 492 357 491 357 491 358 491 359 491 360 490 361 490 362 490 363 489 363 488 364 487 364 486 365 485 365 484 366 482 366 480 365 479 365 478 365 477 365 477 364 476 364 476 363 475 362 474 361 474 360 473 358 473 357 473 356 473 355 473 353 472 352 472 350 472 349 472 348 472 347 472 346 473 344 473 343 473 342 473 341 473 339 473 338 474 336 474 335 475 334 476 333 476 332 478 331 479 330 481 330 482 330 483 330 485 330 486 330 486 331 487 331 488 332 489 332 489 333 490 333 490 334 491 335 491 336 491 337 491 338 492 340 492 341 492 342 492 343 491 343 490 343 488 343 486 343 485 343 -outline {} -fill \#000000 -width 0}
-	{polygon 500 356 506 356 506 365 500 365 -outline {} -fill \#000000 -width 0}
-	{polygon 132 265 133 265 134 265 136 265 137 265 138 265 139 265 140 264 141 264 142 264 143 264 143 263 144 263 145 262 146 262 146 261 146 260 147 259 148 258 148 256 148 255 148 254 148 253 148 252 148 251 148 250 148 249 148 248 147 247 147 246 146 245 145 244 144 244 143 243 142 243 141 243 140 243 138 243 137 243 135 243 135 244 135 245 134 247 134 250 134 254 133 257 133 261 133 263 133 264 132 265 -outline {} -fill $bg -width 0}
-    }
-    foreach obj $logo_objs {
-	eval $c create $obj -tags logo
-    }
-}
-
-#***********************************************************************
-# %PROCEDURE: doLogo
-# %ARGUMENTS:
-#  None
-# %RETURNS:
-#  Nothing
-# %DESCRIPTION:
-#  Does the logo thing
-#***********************************************************************
-proc doLogo {} {
-    canvas .c -width 600 -height 400 -bg #FFFFFF
-    pack .c
-    drawLogo .c #FFFFFF
-
-    # Funky effect
-    .c create text 4 4 -anchor nw -text "Welcome to Remind" \
-	    -fill red -font {-family times -size -24 -weight bold} -tags remind
-    .c lower remind
-
-    .c move logo -300 20
-
-    update idletasks
-
-    for {set i 0} {$i < 16} {incr i} {
-	.c move logo 20 0
-	update idletasks
-	after 30
-    }
-
-    .c create text 4 28 -anchor nw -text "http://www.roaringpenguin.com" \
-	    -fill red -font {-family courier -size -14 -weight bold}
-
-    set rem [FindRemind]
-    if {$rem != ""} {
-	.c create text 4 52 -anchor nw -text "Found existing Remind... reusing settings" -fill red -font  {-family courier -size -14 -weight bold}
-	.c create text 4 66 -anchor nw -text "from $rem" -fill red -font  {-family courier -size -14 -weight bold}
-    }
-    update idletasks
-    after 2500
-}
-
 #***********************************************************************
 # %PROCEDURE: FindRemind
 # %ARGUMENTS:
@@ -930,14 +764,17 @@ proc SetConfigFromRemind {} {
     # Query Remind for the rest
     QueryRemind $rem LAT_DEG {$LatDeg}
     QueryRemind $rem LAT_MIN {$LatMin}
+    QueryRemind $rem LAT_SEC {$LatSec}
     QueryRemind $rem LON_DEG {$LongDeg}
     QueryRemind $rem LON_MIN {$LongMin}
+    QueryRemind $rem LON_SEC {$LongSec}
     QueryRemind $rem LOCATION {$Location}
     QueryRemind $rem DATESEP {$DateSep}
     QueryRemind $rem TIMESEP {$TimeSep}
     QueryRemind $rem LANGUAGE {language()}
 
     set $Config(LAT_MIN) [expr abs($Config(LAT_MIN))]
+    set $Config(LAT_SEC) [expr abs($Config(LAT_SEC))]
     if {$Config(LAT_DEG) >= 0} {
 	set Config(NORTHERN_HEMISPHERE) 1
     } else {
@@ -946,6 +783,7 @@ proc SetConfigFromRemind {} {
     }
 
     set $Config(LON_MIN) [expr abs($Config(LON_MIN))]
+    set $Config(LON_SEC) [expr abs($Config(LON_SEC))]
     if {$Config(LON_DEG) >= 0} {
 	set Config(WESTERN_HEMISPHERE) 1
     } else {

configure.in

@@ -13,42 +13,14 @@ cat <<'EOF'
 EOF
 
 AC_CONFIG_HEADER(src/config.h)
-
-if test "`uname -s`" = "Darwin" ; then
-   trap 'echo Be patient...' INT TERM
-   cat <<'EOF'
-
-Please don't use Apple products.  This script will continue in 30 seconds
-if you insist on compiling Remind on Mac OS X.
-
-EOF
-    for i in 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 ; do
-        sleep 1
-    done
-    trap - INT
-    trap - TERM
-fi
-
-if uname -s | grep -i -q 'cygwin' ; then
-   trap 'echo Be patient...' INT TERM
-   cat <<'EOF'
-
-Please don't use Microsoft products.  This script will continue in 30
-seconds if you insist on compiling Remind on Cygwin.
-
-EOF
-    for i in 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 ; do
-        sleep 1
-    done
-    trap - INT
-    trap - TERM
-fi
+AH_BOTTOM([#include <custom.h>])
 
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
+AC_PATH_PROG([PERL], [perl])
 
 dnl Checks for libraries.
 dnl Replace `main' with a function in -lm:
@@ -56,12 +28,11 @@ dnl Replace `main' with a function in -lm:
 AC_CHECK_LIB(m, sqrt)
 
 dnl Integer sizes
-AC_CHECK_SIZEOF(unsigned short)
 AC_CHECK_SIZEOF(unsigned int)
 AC_CHECK_SIZEOF(unsigned long)
 
 dnl Checks for header files.
-AC_CHECK_HEADERS(sys/file.h glob.h wctype.h locale.h)
+AC_CHECK_HEADERS(sys/types.h sys/file.h glob.h wctype.h locale.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_STRUCT_TM
@@ -71,10 +42,12 @@ AC_FUNC_UTIME_NULL
 AC_HEADER_TIME
 
 if test "$GCC" = yes; then
-	CFLAGS="$CFLAGS -Wall -Wstrict-prototypes"
+	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
 fi
 
-AC_CHECK_FUNCS(setenv unsetenv glob mbstowcs setlocale)
-VERSION=03.01.13
+AC_CHECK_FUNCS(setenv unsetenv glob mbstowcs setlocale initgroups)
+VERSION=03.04.00
 AC_SUBST(VERSION)
-AC_OUTPUT(src/Makefile www/Makefile src/version.h)
+AC_SUBST(PERL)
+AC_OUTPUT(src/Makefile www/Makefile src/version.h rem2html/Makefile rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf)
+chmod a+x rem2pdf/bin/rem2pdf

contrib/README

@@ -1,10 +1,9 @@
 This directory contains contributed scripts.  They are provided
-"as-is" with no warranty.  Please do not contact David Skoll
-or Roaring Penguin Software Inc. for help with these scripts;
-instead, contact the script authors.
+"as-is" with no warranty.  Please do not contact Dianne Skoll for help
+with these scripts; instead, contact the script authors.
 
 You should check the upstream sources; there may be newer versions
 of these scripts available.
 
 --
-David F. Skoll
+Dianne Skoll

contrib/rem2ics-0.93/rem2ics

@@ -238,7 +238,7 @@ L<http://en.wikipedia.org/wiki/ICalendar>
 
 L<http://tools.ietf.org/html/rfc2445>
 
-L<http://www.roaringpenguin.com/en/penguin/openSourceProducts/remind>
+L<https://dianne.skoll.ca/projects/remind/>
 
 L<remind(1)>
 
@@ -251,7 +251,7 @@ Please report bugs (with patches, if possible).
 Inspired by Anthony J. Chivetta E<lt>achivetta@gmail.comE<gt>'s
 rem2ics in awk.
 
-Thank you to David Skoll E<lt>dfs@roaringpengiun.com<gt> for Remind,
+Thank you to Dianne Skoll E<lt>dianne@skoll.ca<gt> for Remind,
 and to the IETF calsch wg for the iCalendar specification.
 
 =cut

contrib/remind-conf-mode/README

@@ -0,0 +1,13 @@
+Remind-conf-mode is a configuration mode designed to make it a little easier to configure remind using emacs.
+
+It offers a vibrant colour syntax highlighting for those who like lots of colour, simple indentation and some hopefully useful functions for entering times and dates. Those functions have been exposed in a special menu for remind for those who have not turned off the emacs menu system.
+
+Just copy remind-conf-mode.el to your elisp folder (whatever it is called) make sure it is in your path so emacs know where to look for it, and put (require 'remind-conf-mode) in your dotemacs file.
+
+There are some more complex instructions in the file itself.
+
+Have fun and if you can think of any improvements let me know, or fork it to your own git repository and experiment away.
+
+The faux-locale branch has code for choosing the language you use remind in. Please try it out and let me know if there are any problems with it.
+
+Shelagh

contrib/remind-conf-mode/gpl.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

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

@@ -1,11 +1,11 @@
 ;;; remind-conf-mode.el --- A mode to help configure remind.
 
-;; Copyright (C) 2008  Shelagh Manton <shelagh.manton@gmail.com>
+;; Copyright (C) 2008 - 2011  Shelagh Manton <shelagh.manton@gmail.com>
 
 ;; Author: Shelagh Manton <shelagh.manton@gmail.com> with help from
-;; David F. Skoll
-;; Keywords: remind configure mode
-;; Version: .04
+;; Dianne Skoll
+;; Keywords: remind configure convenience
+;; Version: 0.14
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License
@@ -34,7 +34,7 @@
 
 ;; If you want to use the auto-complete stuff, you will need to download and install the
 ;; auto-complete library from  http://www.cx4a.org/pub/auto-complete.el and put
-;; (require 'auto-complete) in your emacs with
+;; (require 'auto-complete) in your Emacs with
 ;; (add-hook 'remind-conf-mode-hook
 ;;  (lambda ()
 ;;    (make-local-variable 'ac-sources)
@@ -42,10 +42,13 @@
 ;;    (auto-complete t)))
 ;;   in your .emacs file
 
-;;   PS. you could add ac-source-abbrev ac-source-words-in-buffer to have abbrevs and
+;;   PS.  you could add ac-source-abbrev ac-source-words-in-buffer to have abbrevs and
 ;;   other words in buffer auto-complete too
 
 ;;; History:
+;;Thu, Nov 26, 2009 
+;; sorted out why the rem-save-file was not working. fixed. 
+;;
 ;; Thu, Feb 14, 2008
 ;; Based mode on wpld-mode tutorial and sample-mode on emacs wiki.
 ;; Ideas from mupad.el for font-lock styles.
@@ -54,14 +57,14 @@
 ;; Added a demo skeleton for people to copy for easy entry of coloured remind entries.
 ;; tried to hook in the auto-complete library so that all known functions and keywords can be easily entered.
 ;; EXPERIMENTAL, but seems to work well here (emacs cvs).
-;; Seems to work without case folding which is nice. wonder why it didn't yesterday?
+;; Seems to work without case folding which is nice.
 
 ;;; Code:
 
 
 (require 'font-lock); this goes in the define-derived-mode part.
 (when (featurep 'xemacs)
-  (require 'overlay)) ;I wonder if this will help with font-lock and xemacs?
+  (require 'overlay)) ;supposed to make it compatible with Xemacs.
 
 
 (defgroup remind-conf nil
@@ -80,12 +83,13 @@
     remind-conf-mode-map)
   "Keymap for `remind-conf-mode'.")
 
-(define-key remind-conf-mode-map "\C-cr" 'rem-skel)
-(define-key remind-conf-mode-map "\C-ct" 'rem-today)
-(define-key remind-conf-mode-map "\C-cd" 'rem-today-skel)
-(define-key remind-conf-mode-map "\C-cw" 'rem-week-away)
-(define-key remind-conf-mode-map "\C-cx" 'rem-tomorrow)
-(define-key remind-conf-mode-map "\C-ca" 'rem-days-away)
+(define-key remind-conf-mode-map "\C-c\C-r" 'rem-skel)
+(define-key remind-conf-mode-map "\C-c\C-t" 'rem-today)
+(define-key remind-conf-mode-map "\C-c\C-d" 'rem-today-skel)
+(define-key remind-conf-mode-map "\C-c\C-w" 'rem-week-away)
+(define-key remind-conf-mode-map "\C-c\C-W" 'rem-weeks-away)
+(define-key remind-conf-mode-map "\C-c\C-x" 'rem-tomorrow)
+(define-key remind-conf-mode-map "\C-c\C-a" 'rem-days-away)
 (define-key remind-conf-mode-map "\M-j" 'remind-indent-line)
 (define-key remind-conf-mode-map (kbd "RET") 'remind-indent-line)
 (define-key remind-conf-mode-map "\C-c\C-c" 'rem-save-file)
@@ -107,41 +111,51 @@
 
 (defconst remind-keywords
   (sort
-   (list "RUN" "REM" "ONCE" "SATISFY" "BEFORE" "UNSET" "OMIT"
+   (list "RUN" "REM" "ONCE" "SATISFY" "BEFORE" "UNSET" "OMIT" "FIRST" "SATISFY"
 	 "OMIT" "DATE" "SKIP" "ONCE" "AFTER" "WARN" "PRIORITY" "AT" "SCHED" "IF" "ELSE" "ENDIF"
 	 "WARN" "UNTIL" "THROUGH" "SCANFROM" "DURATION" "TAG" "MSG" "MSF" "CAL" "SPECIAL" "IFTRIG"
-	 "PS" "PSFILE" "BANNER" "INCLUDE" "PUSH-OMIT-CONTEXT" "DEBUG" "DUMPVARS"
-	 "CLEAR-OMIT-CONTEXT" "POP-OMIT-CONTEXT"  "SET" "ERRMSG" "FSET"
-	 "EXIT" "FLUSH" "PRESERVE" "MOON" "COLOR" "COLOUR")
+	 "PS" "PSFILE" "BANNER" "INCLUDE" "PUSH-OMIT-CONTEXT" "DEBUG" "DUMPVARS" "PUSH" "CLEAR" "POP"
+	 "CLEAR-OMIT-CONTEXT" "POP-OMIT-CONTEXT"  "SET" "ERRMSG" "FSET" "DUMP" "BAN" "INC" "SCAN"
+	 "EXIT" "FLUSH" "PRESERVE" "MOON" "COLOR" "UNSET")
    #'(lambda (a b) (> (length a) (length b)))))
 
+
 (defconst remind-type-keywords
   (sort
-   (list "INT" "STRING" "TIME" "DATE" "SHADE")
+   (list "INT" "STRING" "TIME" "DATE" "SHADE" "DATETIME")
      #'(lambda (a b) (> (length a) (length b)))))
 
 (defconst remind-builtin-variables
   (sort
-   (list "$CalcUTC" "$CalMode" "$DefaultPrio" "$EndSent" "$EndSentIg" "$NumTrig"
-	 "$FirstIndent" "$FoldYear" "$FormWidth" "$MinsFromUTC" "$LatDeg" "$LatMin" "$LatSec"
-	 "$Location" "$LongDeg" "$LongMin" "$LongSec" "$MaxSatIter" "$SubsIndent")
+   (list "$CalcUTC" "$CalMode" "$Daemon" "$DateSep" "$DefaultPrio" "$DontFork" "$DontTrigAts" "$DontQueue"
+	 "$EndSent" "$EndSentIg" "$NumTrig" "$FirstIndent" "$FoldYear" "$FormWidth" "$HushMode"
+	 "$IgnoreOnce" "$InfDelta" "$NextMode" "$NumQueued" "$NumTrig" "$PrefixLineNo" "$PSCal" "$RunOff"
+	 "$SimpleCal" "$SortByDate" "$SortByPrio" "$MinsFromUTC" "$LatDeg" "$LatMin" "$LatSec" "$EndSent"
+	 "$EndSentIg" "$Location" "$LongDeg" "$LongMin" "$LongSec" "$MaxSatIter" "$SubsIndent" "$T" "$Td"
+	 "$Tm" "$Tw" "$Ty" "$TimeSep" "$UntimedFirst" "$U" "$Ud" "$Um" "$Uw" "$Uy")
    #'(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" "February" "March" "April" "May" "June" "July" "August" "September" "October" "November" "December" "Mon" "Monday" "Tue" "Tues" "Tuesday" "Wed" "Wednesday" "Thu" "Thursday" "Fri" "Friday" "Saturday" "Sat" "Sun" "Sunday")
+   (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" "shell" "args" "asc" "baseyr" "char" "choose" "coerce" "date"
-	 "dawn" "today" "day" "daysinmon" "defined" "dosubst" "dusk" "easterdate" "easter"
-	 "filedir" "filename" "getenv" "hour" "iif" "trigger" "index" "isdst" "isleap"
-	 "isomitted" "hebdate" "hebday" "hebmon" "hebyear" "language" "ord" "thisyear"
-	 "sunrise" "sunset" "lower" "max" "min" "minute" "mon" "moondate" "moontime"
-	 "moonphase" "now" "ostype" "plural" "realnow" "realtoday" "sgn" "strlen" "psshade"
-	 "substr" "trigdate" "trigger" "trigtime" "trigvalid" "typeof" "upper" "psmoon"
-	 "value" "version" "wkday" "wkdaynum" "msgprefix" "msgsuffix" "year")
+   (list "abs" "access" "args" "asc" "baseyr" "char" "choose" "coerce" "current" "date" "datetime" "datepart" 
+	 "dawn" "day" "daysinmon" "defined" "dosubst" "dusk" "easter" "easterdate" "evaltrig" "filedate" 
+	 "filedatetime" "filedir" "filename" "getenv" "hebdate" "hebday" "hebmon" "hebyear" "hour" "iif" "index" "isdst" 
+	 "isleap" "isomitted" "language" "lower" "max" "min" "minute" "minsfromutc" "mon" "monnum" "moondate" "moondatetime"
+	 "moonphase" "moontime" "msgprefix" "msgsuffix" "nonomitted" "now" "ord" "ostype" "plural" 
+	 "psmoon" "psshade" "realcurrent" "realnow" "realtoday" "sgn" "shell" "slide" "strlen" "substr" "sunrise" "sunset" "time" "timepart" 
+	 "thisyear" "today" "trigdate" "trigdatetime" "trigger" "trigger" "trigtime" "trigvalid" "typeof" "tzconvert" "upper" "value" 
+	 "version" "weekno" "wkday" "wkdaynum" "year"
+	 )
    #'(lambda (a b) (> (length a) (length b)))))
 
 ;;; faces
@@ -225,10 +239,7 @@
   :group 'remind-conf)
 
 (defcustom rem-post-save-function ""
-  "Name of shell function that can be run when you save and close a remind file.
-
-If you put a & after the name of the function, it will run asyncronously.  This might
-be useful if the process takes a long time."
+  "Name of shell function that can be run when you save and close a remind file."
 :type 'string
 :group 'remind-conf
 )
@@ -258,18 +269,22 @@ be useful if the process takes a long time."
 	   (cons (regexp-opt remind-type-keywords 'words) remind-conf-type-face)
 	   '("\[[a-zA-Z]\\{3,6\\}\]" . remind-conf-color-face)
 	   '("\\s-+\\([12][0-9]\\|3[01]\\|0?[0-9]\\)\\s-+" . remind-conf-substitutes-face);better date regexp
+	   '("\\s-+\\([12][09][0-9][0-9][-/]\\(0[1-9]\\|1[0-2]\\)[-/]\\([12][0-9]\\|0[1-9]\\|3[01]\\)\\)\\s-+" . remind-time-face) ;; pseudo ISO 8601 date format.
+	   '("\\s-+\\([12][09][0-9][0-9][-/]\\(0[1-9]\\|1[0-2]\\)[-/]\\([12][0-9]\\|0[1-9]\\|3[01]\\)\\)@\\(2[0-4]\\|[01]?[0-9][.:][0-5][0-9]\\)\\s-+" . remind-time-face) ;;extended pseudo ISO time format
 	   '("\\s-+\\(\\(?:20\\|19\\)[0-9][0-9]\\)\\s-+" . remind-conf-substitutes-face);years
 	   '("\\s-+\\(2[0-4]\\|[01]?[0-9][.:][0-5][0-9]\\)\\s-+" . remind-conf-substitutes-face);24hour clock, more precise
 	   '("\\s-+\\([+-][+-]?[1-9][0-9]*\\)\\s-+" 1 remind-conf-delta-face prepend)
 	   (cons (regexp-opt remind-builtin-variables 'words) remind-conf-variable-face)))
   "The ultimate in highlighting experiences for `remind-conf-mode'.")
 
+;;YYYY-MM-DD@hh:mm, YYYY-MM-DD@hh.mm, YYYY/MM/DD@hh:mm and YYYY/MM/DD@hh.mm
+
 (defcustom remind-conf-font-lock-keywords 'remind-conf-font-lock-keywords-3
   "Font-lock highlighting level for `remind-conf-mode'."
   :group 'remind-conf
   :type '(choice (const :tag "Barest minimum of highlighting." remind-conf-font-lock-keywords-1)
 		 (const :tag "Medium highlighting." remind-conf-font-lock-keywords-2)
-		 (const :tag "Highlighting deluxe." remind-conf-font-lock-keywords-3)))
+		 (const :tag "Fruit salad." remind-conf-font-lock-keywords-3)))
 
 ;;; Indentation (I'm sure this could be made more simple. But at least it works.)
 
@@ -289,8 +304,8 @@ be useful if the process takes a long time."
      	(if (looking-at "^[ \t]*\\<\\(ENDIF\\|POP\\(?:-OMIT-CONTEXT\\)?\\)\\>")
 	   (progn
 	     (save-excursion
-	     (forward-line -1) 
-	     (setq cur-indent (- (current-indentation) remind-indent-level))) ;note that not-indented is still t
+	       (forward-line -1) 
+	       (setq cur-indent (- (current-indentation) remind-indent-level))) ;note that not-indented is still t
 	     (if (< cur-indent 0) (setq cur-indent 0)))
 	  (save-excursion
 	    (while not-indented
@@ -313,14 +328,17 @@ be useful if the process takes a long time."
 ;;; Convenience functions
 
 (define-skeleton rem-skel
-  "Skeleton to insert a rem line in a remind configuration file."
-  nil
-  "REM "(skeleton-read "Date? " )
-  ("Optional: How many days ahead? " " +" str )
+  "Skeleton to insert a rem line in a remind configuration file.
+
+If you don't want an optional feature just RET and move on."
+nil
+    '(setq v1 (skeleton-read "How many days in future?: "))
+  "REM " (rem-days-away (string-to-number v1))
+  ("Optional: How many days warning? " " +" str )
   resume:
   ("Optional: At what time? Format eg 13:00. " " AT " str)
   resume:
-  ("Optional: How many minutes ahead? " " +" str )
+  ("Optional: How many minutes warning? " " +" str )
   resume:
   ("Optional: At what priority? eg 0-9999" " PRIORITY " str )
   resume:
@@ -333,7 +351,7 @@ be useful if the process takes a long time."
   "REM " (format-time-string "%d %b %Y")
   ("Optional: At what time? Format eg 13:20. " " AT " str)
   resume:
-  ("Optional: How many minutes ahead? " " +" str )
+  ("Optional: How many minutes warning? " " +" str )
   resume:
   ("Optional: At what priority? eg 0-9999" " PRIORITY " str )
   resume:
@@ -351,9 +369,7 @@ be useful if the process takes a long time."
   (insert (format-time-string "%e %b %Y" (time-add (current-time) (days-to-time 1)))))
 
 (defun rem-days-away (arg)
-  "Insert a day N number of days in the future.
-
-Takes a prefix argument, but defaults to 4."
+  "Insert a day ARG number of days in the future."
   (interactive "nHow many Days?: ")
   (insert (format-time-string "%e %b %Y" (time-add (current-time) (days-to-time arg)))))
 
@@ -362,11 +378,10 @@ Takes a prefix argument, but defaults to 4."
   (interactive)
   (insert (format-time-string "%e %b %Y" (time-add (current-time) (days-to-time 7)))))
 
-(setq skeleton-end-hook nil) ; so the skeletons will not automatically go to a new line.
-
-;;; private function
-;; could make it useful for others. Put somethin like the following in your .emacs
-;(setq rem-post-save-function "~/bin/dailypic &")
+(defun rem-weeks-away (arg)
+  "Insert a day ARG many weeks in future."
+(interactive "nHow many weeks?: ")
+(insert (format-time-string "%e %b %Y" (time-add (current-time) (days-to-time (* 7 arg))))))
 
 (defun rem-save-file ()
   "Save the file and start the shell function in one go.
@@ -374,7 +389,7 @@ Takes a prefix argument, but defaults to 4."
 This function will close the window after running. It needs the
 variable `rem-post-save-function' to be set. It will be most
 useful to people who have some sort of function they run to use
-remind data ie procucing calendars."
+remind data ie producing calendars."
   (interactive)
   (if (boundp 'rem-post-save-function)
       (progn (save-buffer)
@@ -383,7 +398,9 @@ remind data ie procucing calendars."
     (error "`rem-post-save-function' variable is not set")))
 
 (defun rem-setup-colors ()
-  "Insert set of variables for coloured output in remind messages."
+  "Insert set of variables for coloured output in remind messages.
+
+You would only need to do this once in your main reminders file."
   (interactive)
   (find-file (expand-file-name "~/.reminders"))
   (goto-char 0) ;we do want it somewhere near the top of the file.
@@ -410,12 +427,38 @@ SET BrWht Esc + \"[37;1m\" \n \n")))
 
     ;; So now you can do things like:
 
-(define-skeleton birthcol
+(define-skeleton rem-birthday
   "Make birthdays magenta.
 Acts on the region or places point where it needs to be."
   nil
   "[Mag]" _ " [Nrm]")
 
+(define-skeleton rem-urgent
+  "Colour urgent notices red.
+Acts on the region or places point where it needs to be."
+  nil
+  "[Red]" _ " [Nrm]")
+
+;; menu anyone?
+
+(easy-menu-define remind-menu
+   remind-conf-mode-map
+   "Menu used in remind-conf-mode."
+   (append '("Remind")
+	   '([ "Insert a reminder" rem-skel t])
+	   '([ "Insert todays date" rem-today t])
+	   '([ "Insert tomorrows date" rem-tomorrow t])
+	   '([ "How many days away?" rem-days-away t])
+	   '([ "A week away" rem-week-away t])
+	   '([ "How many weeks away?" rem-weeks-away t])
+	   '([ "Birthday color" rem-birthday t])
+	   '([ "Urgent color" rem-urgent t])
+	   '([ "Save the file and run a script" rem-save-file t])
+	   '("-----")
+	   '([ "Setting up the colors - once-off" rem-setup-colors t])
+	  ))
+
+
 ;; finally the derived mode.
 
 ;;;###autoload
@@ -429,6 +472,7 @@ Acts on the region or places point where it needs to be."
   (set (make-local-variable 'comment-start) ";")
   (set (make-local-variable 'comment-start) "#")
   (set (make-local-variable 'comment-end) "\n")
+  (set (make-local-variable 'skeleton-end-hook) nil) ; so the skeletons will not automatically go to a new line.
   (set (make-local-variable 'fill-column) '100);cause I was having problems with autofill.
   (set (make-local-variable 'indent-line-function) 'remind-indent-line)
   (use-local-map remind-conf-mode-map)
@@ -438,7 +482,5 @@ Acts on the region or places point where it needs to be."
     (provide 'remind-conf-mode)
 ;;; remind-conf-mode.el ends here
 
-;;; Indentation code
-;;; work out how to make the syntax highlighting work only before the (MSG|MSF)
-;;; keywords and not after. 
-;;; for my own use. keymap to save file and do dailypic C-c C-c in time honoured tradition?
+;;;  work out how to make the syntax highlighting work only before the
+;;; (MSG|MSF) keywords and not after.

docs/README.UNIX

@@ -1,4 +1,4 @@
-REMIND version 3.1 for UNIX
+REMIND version 3.2 for UNIX
 
 REMIND is a sophisticated alarm/calendar program.  Details are given
 in the man page, "remind.1".
@@ -6,16 +6,16 @@ in the man page, "remind.1".
 INSTALLING REMIND:
 -----------------
 
-If you have Tcl/Tk (wish 4.1 or higher) installed and are running X Windows:
---------------------------------------------------------------
+If you have Tcl/Tk (wish 4.1 or higher) installed and are running X11:
+----------------------------------------------------------------------
 
 1) Type: wish ./build.tk from the top-level Remind directory.
    Fill in the various options and hit "Build Remind"
 
 2) Type: "make install" -- you may need to be root to do this.
 
-If you do NOT have Tcl/Tk or are NOT running X Windows:
--------------------------------------------------------
+If you do NOT have Tcl/Tk or are NOT running X11:
+-------------------------------------------------
 
 1) Edit the file "src/custom.h" according to your preferences.
 
@@ -69,16 +69,18 @@ know!  Here are the basic guidelines:
 
 - You can test your language file with the script "tests/tstlang.rem"
 
+- Your localized strings must be encoded using UTF-8.
+
 RELEASE NOTES -- miscellaneous info that couldn't go anywhere else!
 
 1. POPUP REMINDERS
 
-If you're running under X-Windows and you have the TCL tools,
-you can create simple pop-up reminders by creating the following
-TCL script called 'popup'.  It pops a message on to the screen and
-waits for you to press the 'OK' button.  If you don't press the OK button
-within 15 seconds, it exits anyway.  To use it, you can use the '-k' option
-for Remind as follows:
+If you're running under X11 and you have the Tcl tools, you can create
+simple pop-up reminders by creating the following Tcl script called
+'popup'.  It pops a message on to the screen and waits for you to
+press the 'OK' button.  If you don't press the OK button within 15
+seconds, it exits anyway.  To use it, you can use the '-k' option for
+Remind as follows:
 
 	remind "-kpopup '%s'&" .reminders
 
@@ -93,12 +95,12 @@ Norman Walsh.
 #!/usr/local/bin/wish
 wm withdraw .
 after 15000 { destroy . ; exit }
-tk_dialog .d { Message } $argv warning 0 { OK } 
+tk_dialog .d { Message } $argv warning 0 { OK }
 destroy .
 exit
 -------------- Cut Here ---------- Cut Here ---------- Cut Here -------------
 
 
 --
-David F. Skoll <dfs@roaringpenguin.com>
-http://www.roaringpenguin.com/remind/
+Dianne Skoll <dianne@skoll.ca>
+https://dianne.skoll.ca/projects/remind/

docs/WHATSNEW

@@ -1,5 +1,489 @@
 CHANGES TO REMIND
 
+* VERSION 3.4 Patch 0 - 2022-02-10
+
+- MAJOR CHANGE: Remind and its helpers (except for rem2ps) fully support
+  UTF-8.  If your system locale is a UTF-8 locale and your terminal
+  can handle UTF-8 encoding, you can enjoy full Unicode support in Remind.
+
+- NEW FEATURE: Added a rem2pdf Remind-to-PDF converter.  It can handle
+  the full UTF-8 character set and features a new PANGO special reminder
+  type that lets you format the text in the PDF calendar (by changing the
+  font size, color, underlining, etc.)
+
+  rem2pdf requires the Pango and Cairo Perl modules.  On Debian or
+  Debian-derived systems, these may be installed with:
+
+      apt install libpango-perl libcairo-perl
+
+  Unlike rem2ps, the default font in rem2pdf is "Sans" rather than
+  "Helvetica", as Sans seems to be typeset better by the Pango library.
+
+- NEW FEATURE: remind:  New system variables $Sunday through $Saturday
+  and $January through $December let you set weekday and month names
+  to whatever you like, permitting you to produce calendars in your
+  local language, even if it's not one of the languages Remind supports
+  by default.
+
+- NEW FEATURE: tkremind: If rem2pdf installed, TkRemind offers you the
+  choice of PDF or PostScript output in the Print dialog.
+
+- CHANGE: remind: Increase the number of allowed "full OMITs" from 500
+  to 1000.
+
+- CHANGE: Remove the annoying code that slowed compilation and running
+  on Windows and Mac OS X.  I believe the point has been made and free
+  OSes have enough of a critical mass that the annoyances are
+  counter-productive.
+
+- CLEANUP: remind: C source code: Replace the LAT_DEG, LAT_MIN,
+  LAT_SEC and LON_DEG, LON_MIN, LON_SEC macros with DEFAULT_LATITUDE
+  and DEFAULT_LONGITUDE.
+
+- CLEANUP: remind: C source code: Remove various unused or obsolete macros.
+
+- BUG FIXES: Minor fixups to groff source and Makefiles courtesy of
+  Jochen Sprickerhof.
+
+- BUG FIX: Properly support formatting of double-wide characters in the
+  terminal mode "remind -c" calendar.
+
+- BUG FIX: rem2html: Document how to highlight today with a red border
+
+- BUG FIX: rem2html: Generate and install a man page for rem2html
+
+- BUG FIX: remind: Get rid of LAT_DEG/LAT_MIN/LAT_SEC and
+  LON_DEG/LON_MIN/LON_SEC macros in favour of DEFAULT_LATITUDE and
+  DEFAULT_LONGITUDE.
+
+- IMPROVEMENT: All localized languages now use UTF-8 exclusively.
+  Support for old character encodings like ISO-8859-1 and ISO-8859-2
+  has been dropped since modern UNIXes have pretty much standardized
+  on UTF-8.
+
+- CHANGE: remind: Non-English versions of remind *no longer* accept
+  non-English month- and weekday-names in trigger specifications.  This
+  was a misfeature.  NOTE INCOMPATIBILITY.
+
+* VERSION 3.3 Patch 12 - 2022-01-24
+
+- UPDATE: rem2html: Use JSON::MaybeXS instead of JSON::Any, since JSON::Any
+  is deprecated.  NOTE INCOMPATIBILITY: If you don't have JSON::MaybeXS
+  installed, you'll need to install it before trying to install or update
+  rem2html
+
+- NEW FEATURE: Add a DO command.  This is just like INCLUDE, but relative
+  paths are interpreted relative to the directory containing the current
+  file.  That is:
+
+      DO somefile.rem
+
+  is equivalent to:
+
+      INCLUDE [filedir()]/somefile.rem
+
+- NEW FEATURE: Add the $DefaultTDelta system variable and associated
+  -tt[N] command-line option to set a default time delta for timed
+  reminder without an explicit +N delta.
+
+- IMPROVEMENT: TkRemind: Store .tkremindrc in $XDG_CONFIG_HOME/tkremindrc
+  or $HOME/.config/tkremindrc as per the XDG Base Directory Specification.
+
+- BUG FIX: remind: Make the shell() built-in function respect
+  $MaxStringLen
+
+- BUG FIX: Use size_t to track the size of dynamic buffers rather than int.
+  This permits Remind to read in files with lines longer than 1GB and to
+  consume more than 1GB of output from the shell() command, both of which
+  will surely be massively useful.  (The old limit was 1GB rather than 2GB
+  because of details of the dynamic buffer resizing algorithm.)
+
+* VERSION 3.3 Patch 11 - 2021-12-30
+
+- IMPROVEMENT: TkRemind: Save the print dialog settings so they persist.
+
+- IMPROVEMENT: TkRemind: Show queue in sorted order.
+
+- IMPROVEMENT: TkRemind: Pass "-r" flag to inotifywait
+
+- IMPROVEMENT: TkRemind: Draw moon phases with Tk canvas items rather than
+  using PNG images.  This lets them change color along with other TkRemind
+  preferences.
+
+- IMPROVEMENT: TkRemind: Underline editable reminders when the pointer enters
+  them; fire up the editor with either Button-1 or Button-3 for
+  non-TkRemind-generated reminders.
+
+- NEW FUNCTION: Remind: Add the isany() built-in function.
+
+- IMPROVEMENT: rem2html: Add class names indicating number of rows in calendar
+
+- IMPROVEMENT: remind: In -z0 mode, sleep with higher precision to ensure we
+  wake as close to possible to each 1-minute boundary.
+
+- IMPROVEMENT: rem2html: Coalesce table.rem-cal CSS into one block.  Thanks
+  to Ian! D. Allen for pointing this out.
+
+- IMPROVEMENT: examples/defs.rem: Modernize the examples and get rid of some
+  cruft.
+
+- CHANGE: Add $Latitude and $Longitude system variables.  Deprecate
+  $LatDeg, $LatMin, $LatSec, $LongDeg, $LongMin and $LongSec.
+
+- CHANGE: Test: Add "dump $" to test.rem.
+
+* VERSION 3.3 Patch 10 - 2021-11-30
+
+- IMPROVEMENT: TkRemind: Apply window and text colors to all GUI elements
+  including buttons and status labels.
+
+- NEW FEATURE: The new ADDOMIT keyword can shorten reminder files.
+  The command:
+
+      REM ...whatever... ADDOMIT MSG Foo
+
+  behaves identically to:
+
+      REM ...whatever... SATISFY 1
+      IF trigvalid()
+          OMIT [trigdate()] MSG Foo
+      ENDIF
+
+  For example, Labour Day can be displayed and omitted as follows:
+
+      REM Mon 1 Sep SCANFROM -7 ADDOMIT MSG Labour Day
+
+- UPDATE: Update contrib/remind-conf-mode to latest release
+
+- CHANGE: The parser does not auto-convert numbers 90-99 to 1990-1999.  This
+  was messing up things like "DURATION 90".  It also means you can no longer
+  abbreviate the years 1990-1999 as 90-99.
+
+- BUG FIX: Various documentation fixes
+
+- BUG FIX: When switching users with the "-u" option, call initgroups()
+  to properly set group membership list.
+
+* VERSION 3.3 Patch 9 - 2021-10-14
+
+- NEW FEATURE: Add "-+username" option to tell Remind to trust files owned by
+  "username" and allow RUN directives in them.  Idea courtesy of Ian! D. Allen
+
+- NEW FEATURE: Add "-u+username" variant to tell Remind to switch users to
+  "username" without disabling RUN directives.  Idea courtesy of Ian! D. Allen
+
+- CHANGE: rem2html: rem2html has been moved out of the www/ directory into
+  its own rem2html/ directory.  If your system has the prerequisites
+  (namely Perl, Getopt::Long and JSON::Any) then rem2html will be installed
+  by "make install".
+
+- CHANGE: Remove "cm2rem".  It was about 20 years obsolete.
+
+- CHANGE: rem2html: Use inline data: URL images for moon images by default,
+  thus producing a completely stand-alone HTML file.
+
+- CHANGE: Remove unnecessary spaces from "remind -pp" JSON output.
+
+- DOCUMENTATION FIX: Various man page fixes and tweaks.
+
+- BUG FIX: rem2html: Tweak the default CSS stylesheet; more rational
+  handling of rem2html command-line options.
+
+- BUG FIX: remind: "remind -c" would sometimes highlight *two* days as
+  "today"; this has been fixed.
+
+- BUG FIX: Add a missing #ifdef...#endif and remove a C99-ism.  This once again
+  allows Remind to be compiled with some very old C compilers.
+
+* VERSION 3.3 Patch 8 - 2021-09-13
+
+- NEW FEATURE: remind: Add INCLUDECMD command
+
+- NEW FEATURE: remind: Add shellescape() built-in function
+
+- BUG FIX: tkremind: TkRemind would sometimes fill in incorrect initial
+  values for the reminder-editing form if you clicked on a TkRemind-created
+  reminder to edit it.  This has been fixed.
+
+- BUG FIX: tkremind: Get back better error messages from Remind if you
+  try to create a reminder with an invalid date specification.
+
+- BUG FIX: remind: Catch integer overflow if we try to evaluate $IntMin * -1
+
+- DOC UPDATES: remind: Minor man page fixes
+
+* VERSION 3.3 Patch 7 - 2021-05-10
+
+- MINOR FIX: Refuse to run "make test" as root --- it would fail
+  anyway with an obscure message.
+
+- BUG FIX: Remind would sometimes compute incorrect trigger date for:
+  REM Tue 29 Feb MSG ...
+
+- BUG FIX: Remind would sometimes compute incorrect trigger date for
+  a date spec like: Tue 31 2021 MSG ...
+
+* VERSION 3.3 Patch 6 - 2021-03-30
+
+- test/test.rem: Change local to en_US.utf-8 only if current locale
+  is not a UTF-8 locale.
+
+- MINOR CHANGE: Remind's arithmetic operators (+, -, *, /) give errors
+  on overflow rather than silently giving the wrong answer.
+
+- MINOR CHANGE: Add $IntMin and $IntMax system variables.
+
+- DOCUMENTATION FIX: Document that TkRemind now requires Tcl/Tk version
+  8.5 or newer.
+
+* VERSION 3.3 Patch 5 - 2021-01-21
+
+- NEW FEATURE: tkremind: Add ability to change fonts and colors from
+  within TkRemind "Options" dialog.
+
+- CHANGE: tkremind: TkRemind now requires Tcl/Tk 8.5 or newer.
+
+- CHANGE: tkremind: You can specify the location of the options
+  file on the command-line if you want to use one other than ~/.tkremindrc
+
+- CLEANUP: tkremind: Remove "Apply Options" from Options dialog; we only
+  need "Save Options".
+
+- DOC FIX: Add missing release note in 3.3.4 notes regarding
+  setpagedevice patch
+
+- DOC FIX: tkremind: Document shortcut keys.
+
+* VERSION 3.3 Patch 4 - 2021-01-12
+
+- NEW FEATURE: If "inotifywait" is installed, TkRemind uses it to refresh
+  the calendar display right away when the reminders file/directory is updated.
+  This makes TkRemind react almost instantly if external tools are editing
+  or updating reminders.
+
+- MINOR NEW FEATURE: rem2ps has a new '-x' option; this puts the day numbers
+  on the top-left of the day's box instead of the top-right.
+
+- MINOR FIXES: A typo in remind.1 was fixed; additional comments regarding
+  UNTIL were added.
+
+- BUG FIX: rem2ps: Call setpagedevice to set page size.  Based on a patch
+  from Jonathan Kamens.
+
+* VERSION 3.3 Patch 3 - 2020-11-09
+
+- BUG FIX: Fix startup crash in TkRemind if "Show Today's Reminders on
+  Startup" is enabled (which, unfortunately, is the default.)  Bug reported
+  by Martin Ziemer.
+
+* VERSION 3.3 Patch 2 - 2020-11-08
+
+- MINOR NEW FEATURE: Add MAYBE-UNCOMPUTABLE keyword; see the man page
+  and discussion at
+  https://dianne.skoll.ca/pipermail/remind-fans/2020/003745.html
+
+- CHANGE: TkRemind always invokes Remind with the "-itkremind=1" option,
+  even when printing.  NOTE INCOMPATIBILITY: This is a behavior change!
+  When you print from TkRemind, we also invoke Remind with "-itkprint=1"
+  so you can detect that PostScript is being generated.
+
+- CHANGE: The maximum length of a variable name has been increased from
+  16 characters to 64 characters.  Modern computers have plenty of memory.
+
+- BUG FIXES: Minor documentation updates, typo fixes, clarifications, etc.
+
+- BUG FIX: Fix calendar-drawing alignment errors when displaying UTF-8
+  strings with zero-width combining characters and strings with tabs.
+
+- BUG FIX: TkRemind would mess up placement of the WEEK special if invoked
+  with the "-m" option.  This has been fixed.
+
+- BUG FIX: TkRemind would sometimes fail with an error message when editing
+  a reminder; this is because it was interpreting months 08 and 09 as
+  illegal octal numbers.  This has been fixed.
+
+* VERSION 3.3 Patch 1 - 2020-03-20
+
+- CHANGE: For overlapping multi-day events, issue a reminder for the
+  most *recent* event rather than the earliest event.  NOTE
+  INCOMPATIBILITY: This is a behavior change!
+
+- CHANGE: Do not convert 90-99 to 1990-1999 when parsing numbers to
+  recognize years.  NOTE INCOMPATIBILITY: This is a behavior change!
+
+- CHANGE: Revert change to -y option that included filename and line
+  number in the hash.
+
+- CHANGE: Retain newlines (produced by %_) in JSON output.
+
+- FIX: Document $FormWidth system variable
+
+- FIX: Highlight today's date in "remind -c" output
+
+- FIX: Eliminate compiler warnings on Ubuntu 18.04.
+
+- IMPROVEMENT: Allow times to be specified either in 24-hour mode
+  (HH:MM or HH.MM) or AM/PM mode (HH:MMam; HH:MMpm, etc.)
+
+- IMPROVEMENT: Allow DURATION to be specified as a time (1:30) or a
+  number of minutes (90).
+
+- IMPROVEMENT: If terminal size can be determined, set $FormWidth to
+  terminal width - 8; if not, set $FormWidth to 72.
+
+- MINOR IMPROVEMENT: Add the "ampm()" built-in function.
+
+* Version 3.3 Patch 0 - 2020-01-31
+
+- FIX: rem2ps: Add a %%PageBoundingBox: document structuring convention
+  comment.
+
+- FIX: rem2ps: Ignore unknown SPECIAL-type reminders.
+
+- IMPROVEMENT: In calendar mode ("-c" option), Remind automatically adjusts
+  the width of the calendar to fit the terminal window if standard output
+  is a TTY.
+
+- IMPROVEMENT: Add JSON-based output with "remind -pp" and "remind -ppp"
+  The JSON-based intermediate format preserves a lot more information
+  about the original reminder, allowing back-ends more insight into
+  the intent of the reminder, the recurrence used, etc.  See the documentation
+  in "man rem2ps"
+
+- IMPROVEMENT: TkRemind can "reverse-engineer" reminders that it creates
+  using the additional information in the "remind -pp" format, so it
+  doesn't create or use ugly comment blocks to delimit the reminders
+  it creates.
+
+- IMPROVEMENT: TkRemind: Add popup help to most buttons and controls.
+
+- NEW FEATURE: Add support for $DefaultColor system variable, suggested
+  by Tim Chase.
+
+- NEW FEATURE: The "-@[n][,m]" command-line option allows colored reminders
+  in Agenda Mode as well as in Calendar Mode.  It also adds support for
+  terminal emulators that can handle the xterm 256-color escape sequences
+  as well as the true 24-bit color escape sequences.
+
+- CHANGE: SPECIALs are now case-insensitive.  Before, only SPECIAL COLOR
+  would work.  Now you can use Special Color, special color, etc.
+
+* Version 3.2 Patch 0 - 2020-01-03
+
+- IMPROVEMENT: Add support for events spanning multiple days (with AT
+  and DURATION).  Add trigeventstart() and trigeventduration()
+  introspection functions; see "MULTI-DAY EVENTS" in the man page.
+
+- IMPROVEMENT: Add introspection functions trigback(), trigdelta(),
+  trigduration(), trigfrom(), trigpriority(), trigrep(),
+  trigscanfrom(), trigtimedelta(), trigtimerep(), and triguntil().  See
+  man page for details; thanks to Tim Chase for the suggestion.
+
+- IMPROVEMENT: TkRemind: Use PNG images for the next month / previous
+  month buttons rather than -> and <-.  Also use nice anti-aliased
+  moon phase images instead of ugly blocky bitmaps.
+
+- CHANGE: Modify addition so that previously-illegal combinations
+  TIME + TIME, TIME + DATETIME and DATETIME + TIME are now allowed.
+  Also allow DATETIME - TIME.  If t1 and t2 are expressions of type TIME
+  and dt is an expression of type DATETIME, then the following are now
+  equivalent (before, the expressions on the left-hand side would fail
+  with a "Type mismatch" error.)
+
+  t1 + t2     ==     t1                + coerce("INT", t2)
+  dt + t2     ==     dt                + coerce("INT", t2)
+  t1 + dt     ==     coerce("INT", t1) + dt
+  dt - t2     ==     dt                - coerce("INT", t2)
+
+- DOC FIX: Document previously-undocumented $MaxStringLen system variable
+
+- DOC FIX: Various minor documentation fixes.
+
+- BUG FIX: Specifying a DURATION without an AT clause results in an error.
+  Before, it would be accepted but not do anything useful.
+
+- BUG FIX: Catch potential date overflow in slide() function
+
+- BUG FIX: Fix compile error when compiling Romanian version; eliminate
+  compiler warning when compiling non-English versions.
+
+- BUG FIX: TkRemind: Fix startup failure of TkRemind if options are at
+  default. :(
+
+* Version 3.1 Patch 17 - 2019-11-15
+
+- IMPROVEMENT: Add "Extra Remind Options" setting to TkRemind.
+
+- IMPROVEMENT: Enable warning-free compilation even with gcc -Wextra flag.
+
+- IMPROVEMENT: Warn if "OMIT a THROUGH b" has a > b.
+
+- SYNTACTIC SUGAR: Make "SCANFROM -n" the same as "SCANFROM [today() - n]"
+
+- BUG FIX: Don't dump expired reminders when dumping queue.
+
+- BUG FIX: Fix failure when specifying a Jahrzeit in Adar.  Fix
+  courtesy of Dov Feldstern
+
+- BUG FIX: Fix various documentation errors and update man page.
+
+* Version 3.1 Patch 16 - 2018-11-09
+
+- IMPROVEMENT: Add patch from Stephen Morgan to calculate astronomical and
+  nautical twilight in addition to civil twilight.
+
+- BUG FIX: The rem2html script correctly handles a SHADE special with only
+  one number (a grey level).
+
+- IMPROVEMENT: Remind accepts DATETIME constants in ISO-8601 format and can
+  optionally be configured to output them that way too.
+
+- MINOR IMPROVEMENT: TkRemind puts its hostname in the window title bar.
+
+- MINOR IMPROVEMENT: TkRemind restarts the background remind daemon if
+  the .reminders file changes
+
+- MINOR IMPROVEMENT: TkRemind has a "Queue" button that lets you see details
+  of upcoming queued reminders.  This is mostly for debugging and the output
+  is not particularly readable.
+
+- BUG FIX: The definitions form Yom Hazikaron and Yom Ha'atzmaut were not
+  quite right; they have been fixed.
+
+- MINOR IMPROVEMENT: TkRemind centers popups over the main calendar
+  window rather than over the desktop background.  This is better
+  behavior in multi-monitor setups.
+
+- BUG FIX: In "remind -z0" mode, remind wakes up exactly on the minute instead
+  of sleeping for 60 seconds each time, which could cause it to fall behind.
+
+* Version 3.1 Patch 15 - 2015-07-27
+
+- BUG FIX: Fix a buffer overflow found by Alexander Keller
+
+- BUG FIX: Fix a typo in this file: was 2014 instead of 2015.
+
+- BUG FIX: Make parser reject an AT followed by more than one time.
+
+- BUG FIX: Make parser reject repeated delta or *repeat values.
+
+* Version 3.1 Patch 14 - 2015-04-24
+
+- NEW FEATURE: Putting the line __EOF__ in a .rem file causes Remind
+  to treat it as end-of-file.
+
+- IMPROVEMENT: Use better PNG images for moons in the HTML display
+
+- CHANGE: Author name updated from "David" to "Dianne"
+
+- BUG FIX: The "-n" command-line option should really run in "ADVANCE_MODE"
+  rather than "CAL_MODE" internally; otherwise, the substitution sequences
+  may be misinterpreted.
+
+- BUG FIX: A typo in clearing out MD5 sum context has been fixed.
+
+- BUG FIX: Typo in Spanish translation was fixed.
+
 * Version 3.1 Patch 13 - 2013-03-22
 
 - BUG FIX: Sunrise/Sunset calculations greatly improved thanks to John
@@ -172,7 +656,7 @@ CHANGES TO REMIND
 
 * Version 3.1 Patch 4 - 2008-02-03
 
-- ENHANCMENT: tkremind respects the "-b1" option and operates in 24-hour
+- ENHANCEMENT: tkremind respects the "-b1" option and operates in 24-hour
   clock mode if the option is supplied.
 
 - ENHANCEMENT: tkremind has been tweaked to look better with Tcl/Tk 8.5.
@@ -239,7 +723,7 @@ CHANGES TO REMIND
 
   *** THIS MAY AFFECT BACKENDS ***
 
-  Backends supplied by Roaring Penguin (rem2ps, rem2html and tkremind)
+  Backends supplied with Remind (rem2ps, rem2html and tkremind)
   are known to work properly.
 
 - "remind -p" no longer suppresses any AT-time associated with SPECIAL
@@ -247,7 +731,7 @@ CHANGES TO REMIND
 
   *** THIS MAY AFFECT BACKENDS ***
 
-  Backends supplied by Roaring Penguin (rem2ps, rem2html and tkremind)
+  Backends supplied with Remind (rem2ps, rem2html and tkremind)
   are known to work properly.
 
 + BUG FIXES
@@ -311,7 +795,7 @@ CHANGES TO REMIND
 
 - The SPECIAL COLOR reminder type has been hacked to behave more like
   a MSG type.  It sorts properly and is emitted as a normal reminder
-  in non-calendar mode.  Simlarly, SPECIAL HTML sorts with -g as well.
+  in non-calendar mode.  Similarly, SPECIAL HTML sorts with -g as well.
 
 + MINOR ENHANCEMENTS
 
@@ -460,11 +944,6 @@ CHANGES TO REMIND
 
 * Version 3.0 Patch 20 - 1999-04-12
 
-+ NEWS
-
-- I have started a company, Roaring Penguin Software
-  Inc. (http://www.roaringpenguin.com) and it now holds the Remind copyright.
-
 + LICENSE CHANGE
 
 - Remind is now distributed under the pure GPL.  See the file WINDOWS for my
@@ -480,8 +959,6 @@ CHANGES TO REMIND
 
 + BUG FIXES
 
-- Changed copyright notices to Roaring Penguin Software Inc.
-
 - Rem2PS was passing specials like HTML, etc. in PostScript output.
   YECH!  Fix courtesty of Derek J. Decker.
 
@@ -1254,7 +1731,7 @@ CHANGES TO REMIND
 
 - Improved debugging of reminder scripts
 
-- Took out the "purge" option - it is in general too dificult to tell when
+- Took out the "purge" option - it is in general too difficult to tell when
   a reminder has expired for good, so now it's up to you to do this
   by hand.
 

examples/defs.rem

@@ -14,11 +14,9 @@
 #  "#USHOLS" for U.S. holidays						    #
 #  "#JHOLS"  for Jewish holidays					    #
 #  "#PSSTUFF" for nifty PostScript examples				    #
-#  "#COLORS" for examples of ANSI color escape sequences.                   #
 # 									    #
 # This file is part of REMIND.						    #
-# Copyright (C) 1992-1997 David F. Skoll                                    #
-# Copyright (C) 1999-2000 Roaring Penguin Software Inc.                     #
+# Copyright (C) 1992-2018 Dianne Skoll                                      #
 # 									    #
 #############################################################################
 
@@ -27,8 +25,8 @@ RUN OFF
 ################################################
 # Ensure required version of remind is used... #
 ################################################
-IF version() < "03.01.08"
-   ERRMSG This file requires at least version 03.01.08 of Remind.%
+IF version() < "03.01.10"
+   ERRMSG This file requires at least version 03.01.10 of Remind.%
    ERRMSG This version is version [version()].
    EXIT
 ENDIF
@@ -85,7 +83,6 @@ SET December  12
 ###########################################################
 # Other symbolic constants and functions for "pasting"... #
 ###########################################################
-
 SET Quote CHAR(34)
 
 # Handy constants/function for specifing week of month...
@@ -95,30 +92,15 @@ SET  Week_3		15
 SET  Week_4		22
 FSET _last(mo)		"1 " + MON((mo%12)+1) + " --7"
 
-# Handy function to provide SCANFROM dates...
-FSET _back(days)	TODAY()-days
-
-###########################################################
-# Function which returns a string in "am/pm" format based #
-# on the time.  For example, set a am_pm(NOW())...        #
-###########################################################
-
-FSET _am_pm(tm)	IIF(tm<01:00, tm+12*60+"am", \
-                    tm<12:00, tm+"am", \
-                    tm<13:00, tm+"pm", \
-                              tm-12*60+"pm")
-
 #################################################################
-# Function which removes a single leading zero from a string... #
+# Function that removes a single leading zero from a string...  #
 #################################################################
-
 FSET _no_lz(s) IIF(SUBSTR(s, 1, 1)=="0", SUBSTR(s, 2), s)
 
 #################################################################
 # Return the length of the daylight/night portion of a date,    #
 # in minutes.                                                   #
 #################################################################
-
 FSET _light_len(date) MAX(SUNSET(date)-SUNRISE(date), 0)
 FSET _dark_len(date) 1440-_light_len(date)
 
@@ -126,26 +108,12 @@ FSET _dark_len(date) 1440-_light_len(date)
 # Function to calculate number of years since a given year #
 # or number of months since a given month and year...      #
 ############################################################
-
-FSET _yr_num(yr)		ORD(YEAR(TRIGDATE()) - yr)
-FSET _mo_num(mo, yr)		ORD(12 * (YEAR(TRIGDATE()) - yr) + \
-					MONNUM(TRIGDATE()) - mo)
+FSET _yr_num(yr)		ORD($Ty - yr)
+FSET _mo_num(mo, yr)		ORD(12 * ($Ty - yr) + $Tm - mo)
 
 # Here's an example of how to use them:
-REM 1 Nov ++12 MSG %"Dean's [_yr_num(1984)] birthday%" is %b.
-REM 1 MSG Dean's [_mo_num(11, 1984)] 'monthly' anniversary
-
-###########################################################
-# Function to send mail via elm's "fastmail" (by GMS!)... #
-###########################################################
-
-#FSET _mail(from, subj)	"mailx -s " + \
-#				Quote + from + " : " + subj + Quote \
-#				GETENV("LOGNAME") + " < /dev/null 1>&0"
-FSET _mail(from, subj)	"fastmail -f " + \
-				Quote + from + Quote + \
-				" -s " + Quote + subj + Quote + \
-				" /dev/null " + GETENV("LOGNAME")
+REM 1 Nov ++12 MSG %"John's [_yr_num(1984)] birthday%" is %b.
+REM 1 MSG John's [_mo_num(11, 1984)] 'monthly' anniversary
 
 #############################################################################
 # Here's a tricky problem:  The 4th of July is a holiday in the U.S.
@@ -159,29 +127,28 @@ FSET _mail(from, subj)	"fastmail -f " + \
 # dependent upon the current date, it's tricky and results may not be
 # what you expect.  You should try to make sure that the OMIT context
 # "near" any current reminders will not change during a calendar run.
-# The SCANFROM clause should help make these OMITs very safe.
+# The SCANFROM clause will make these OMITs safe.
 ############################################################################
 
 # Calculate the weekday of the holiday.
-REM 4 July SCANFROM [_back(7)] SATISFY 1
+REM 4 July SCANFROM -7 SATISFY 1
 
-IF WKDAYNUM(TRIGDATE()) == Sat
-	REM [TRIGDATE()] MSG Independence day (actual)
-	OMIT [TRIGDATE()-1] MSG Independence day (observed)
+SET iday $T
+IF WKDAYNUM(iday) == Sat
+	REM [iday] MSG Independence day (actual)
+	OMIT [iday-1] MSG Independence day (observed)
 ELSE
-	IF WKDAYNUM(TRIGDATE()) == Sun
-		REM [TRIGDATE()] MSG Independence day (actual)
-		OMIT [TRIGDATE()+1] MSG Independence day (observed)
+	IF WKDAYNUM(iday) == Sun
+		REM [iday] MSG Independence day (actual)
+		OMIT [iday+1] MSG Independence day (observed)
 	ELSE
-		OMIT [TRIGDATE()] MSG Independence day
+		OMIT [iday] MSG Independence day
 	ENDIF
 ENDIF
 
 ############################################################################
-#									   #
 # A meeting on the first Monday of every month which is moved to the       #
 # second Monday in the event of a holiday.                                 #
-#									   #
 ############################################################################
 
 # First, the normal meeting.  However, the SKIP keyword means this
@@ -193,68 +160,21 @@ REM Mon 8 SATISFY 1
 
 # But only actually trigger the delayed meeting if the previous
 # Monday was a holiday
-IF ISOMITTED(TRIGDATE()-7)
-   REM [TRIGDATE()] MSG Delayed meeting
+IF ISOMITTED($T-7)
+   REM [$T] MSG Delayed meeting
 ENDIF
 
-############################################################################
-#									   #
-# A very complicated reminder sent in by a Remind user.			   #
-# This person gets paid every two weeks, starting from 8 January 1993.	   #
-# If a pay date occurs before the twelfth of a month, then that		   #
-# he pays his mortgage on that pay date.  Otherwise, he pays the mortgage  #
-# on the previous pay date.  Furthermore, he has to schedule his	   #
-# mortgage payment six days before it is due.  He wants to be reminded	   #
-# a further four days before the scheduling deadline.  He also		   #
-# wants to be mailed a notice two weeks before the scheduling deadline.	   #
-#									   #
-# Here's the solution - if you can follow this, consider yourself a	   #
-# Remind programmer extraordinaire!					   #
-#									   #
-############################################################################
-
-# A function to determine whether or not a pay-date is a mortgage-date.
-
-FSET _IsMortDate(x) DAY(x) < 12 || (DAY(x+14) >= 12 && DAY(x+14) <= 14)
-
-# Paydays - for reference
-
-REM 8 Jan 1993 *14 MSG Payday
-
-# Calculate the mortgage payment six days ahead of time.  Note that this
-# is done "implicitly" by subtracting 6 from the starting date - we start
-# on 2 Jan rather than 8 Jan.  We add 6 to TRIGDATE() in _IsMortDate to
-# compensate.
-
-REM 2 Jan 1993 *14 ++4 SATISFY [_IsMortDate(TRIGDATE()+6)] \
-	MSG %"Schedule mortgage payment%" for %a.
-
-# Now the mail reminder two weeks before the payment date - because two
-# weeks before a payment date is also a payment date, no pre-compensation
-# in the starting date of 8 Jan is necessary - convince yourself of this!
-# This uses the _mail() function defined earlier.
-
-REM ONCE 8 Jan 1993 *14 SATISFY [_IsMortDate(TRIGDATE()+14)] \
-	RUN [_mail("Decatur Federal", \
-		"Pay mortgage by the " + ORD(DAY(TRIGDATE()+14)))]
-
-# Make an entry on the calendar when the mortgage should be paid
-
-REM 8 Jan 1993 *14 SATISFY [_IsMortDate(TRIGDATE())] \
-	CAL Mortgage payment
-
 ##########################################################################
 #								         #
-# On our UNIX system, I run a program which queries the university       #
+# On our UNIX system, I run a program that queries the university       #
 # library and creates a file called ".booksdue".  This file is           #
 # a REMIND script to tell me when my library books are due.  Here's      #
 # an example from my reminder file - it shows the use of filedate().     #
 # When the .booksdue file is at least 7 days old, I create a new version #
 # by querying the library computer.  Note the use of realtoday() rather  #
-# than today.   						         #
+# than today().  						         #
 #								         #
 ##########################################################################
-
 IF !$RunOff && !$CalMode && !$SimpleCal
    IF REALTODAY()-FILEDATE("/home/dfs/.booksdue") >= 7
       REM RUN /home/dfs/bilge/library/getbooks
@@ -284,7 +204,7 @@ REM Sat Sun SPECIAL SHADE 220
 #############################################################################
 
 SET SaveTrig $NumTrig
-SET easter EASTERDATE(YEAR(TODAY()))
+SET easter EASTERDATE($Uy)
 REM  [easter-46] MSG %"Ash Wednesday%"
 REM  [easter-7]  MSG %"Palm Sunday%"
 OMIT [easter-2]  MSG %"Good Friday%"
@@ -293,73 +213,55 @@ REM  [easter+39] MSG %"Ascension Day%"
 REM  [easter+49] MSG %"Pentecost%"
 
 # Some holidays are omitted, some are not.  You may want to change
-# which ones are omitted - use the general forms shown below.
-# You'll need the _back() function and the Week_n variables defined
-# way up in the file.
+# which ones are omitted - use the general forms shown below.  You'll
+# need the Week_n variables defined way up in the file.
 
-OMIT     Jan  1		MSG %"New Year's%" Day
-REM  Mon Jan [Week_3]	MSG Martin Luther King - %"MLK Day%"
-REM      Feb  2		MSG %"Ground Hog Day%"
-REM      Feb 14		MSG %"Valentine's%" Day
-REM  Mon Feb [Week_3]	SCANFROM [_back(7)] SATISFY 1
-OMIT [trigdate()] MSG %"President's Day%"
-REM      Mar 17		MSG %"St. Patrick's%" Day
+OMIT    Jan  1		MSG %"New Year's%" Day
+REM Mon Jan [Week_3]	MSG Martin Luther King - %"MLK Day%"
+REM     Feb  2		MSG %"Ground Hog Day%"
+REM     Feb 14		MSG %"Valentine's%" Day
+REM Mon Feb [Week_3]	SCANFROM -7 ADDOMIT MSG %"President's Day%"
+REM     Mar 17		MSG %"St. Patrick's%" Day
 
 # The DST rules are accurate for most locations in
 # North America
 REM Sun Apr 1 ++2 UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST starts%" %b
 REM Sun Mar 8 ++2 FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST starts%" %b
 
-REM      Apr  1		MSG %"April Fool's%" Day
-REM  Mon Tue Wed Thu Fri Sat 15 Apr MSG %"Income tax%" due
-REM      May  5		MSG %"Cinco de Mayo%"
-REM  Sat May [Week_1]	MSG %"Kentucky Derby%"
-REM  Sun May [Week_2]	MSG %"Mother's Day%"
-REM  Sat May [Week_3]	MSG %"Armed Forces Day%"
-REM  Mon [_last(May)]	SCANFROM [_back(7)] SATISFY 1
-OMIT [trigdate()] MSG %"Memorial Day%"
-REM      Jun 14		MSG %"Flag Day%"
-REM  Sun Jun [Week_3]	MSG %"Father's Day%"
-REM  Mon Sep [Week_1]	SCANFROM [_back(7)] SATISFY 1
-OMIT [trigdate()] MSG %"Labor Day%"
-REM  Mon Oct [Week_2]	MSG %"Columbus Day%"
-REM      Nov 11		MSG %"Veterans Day%"
+REM Sun [_last(Oct)] ++2 UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST ends%" %b
+REM Sun 1 Nov ++2 FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST ends%" %b
 
-# The DST rules are accurate for most locations in
-# North America
-REM Sun [_last(Oct)] UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST over%"
-REM Sun 1 Nov FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST over%"
+REM     Apr  1		MSG %"April Fool's%" Day
+REM Mon Tue Wed Thu Fri Sat 15 Apr MSG %"Income tax%" due
+REM     May  5		MSG %"Cinco de Mayo%"
+REM Sat May [Week_1]	MSG %"Kentucky Derby%"
+REM Sun May [Week_2]	MSG %"Mother's Day%"
+REM Sat May [Week_3]	MSG %"Armed Forces Day%"
+REM Mon [_last(May)]	SCANFROM -7 ADDOMIT MSG %"Memorial Day%"
+REM     Jun 14		MSG %"Flag Day%"
+REM Sun Jun [Week_3]	MSG %"Father's Day%"
+REM Mon Sep [Week_1]	SCANFROM -7 ADDOMIT MSG %"Labor Day%"
+REM Mon Oct [Week_2]	MSG %"Columbus Day%"
+REM     Nov 11		MSG %"Veterans Day%"
 
-REM      Oct 30		MSG %"Mischief Night%"
-REM      Oct 31		MSG %"Halloween%"
-REM  Tue Nov  2		SCANFROM [_back(7)] \
-	SATISFY [(YEAR(TRIGDATE()) % 4) == 0] \
-	MSG %"Election%" Day
-REM  Thu Nov [Week_4]	SCANFROM [_back(7)] SATISFY 1
-OMIT [trigdate()] MSG %"Thanksgiving%" Day
-REM  Fri Nov [Week_4+1]	SCANFROM [_back(7)] SATISFY 1
-OMIT [trigdate()] MSG %"Thanksgiving%" (cont.)
-OMIT     Dec 24		MSG %"Christmas Eve%"
-OMIT     Dec 25		MSG %"Christmas%" Day
+REM     Oct 30		MSG %"Mischief Night%"
+REM     Oct 31		MSG %"Halloween%"
+REM Tue Nov  2 SCANFROM -7 SATISFY [($Ty % 4) == 0] MSG %"Election Day%"
+REM Thu Nov [Week_4]	SCANFROM -7 ADDOMIT MSG %"Thanksgiving Day%"
+REM Fri Nov [Week_4+1]	SCANFROM -7 ADDOMIT MSG %"Thanksgiving (cont.)%"
+OMIT    Dec 24		MSG %"Christmas Eve%"
+OMIT    Dec 25		MSG %"Christmas%" Day
 
 ##########################################################################
 #								         #
 # If any US holidays were triggered above, shade in the calendar         #
-# entry in PostScript.  This is not quite correct, as it blots out any   #
-# other PostScript stuff above.  I was too lazy to do it properly :-)    #
+# entry in PostScript.                                                   #
 #								         #
 ##########################################################################
 if $NumTrig > SaveTrig
 	REM SPECIAL SHADE 220
 endif
 
-# Seasons (valid from 1992 to 2000)...
-REM Mar 20 MSG %"Spring%" begins
-REM Jun [IIF(YEAR(TODAY())%4, 21, 20)] MSG %"Summer%" begins
-REM Sep [CHOOSE(YEAR(TODAY())-1991, 22,22,23,23,22,22,22,23,22)] \
-	MSG %"Fall%" begins
-REM Dec [IIF((YEAR(TODAY())+1)%4, 21, 22)] MSG %"Winter%" begins
-
 #PSSTUFF2
 ##########################################################################
 #									 #
@@ -373,7 +275,7 @@ REM Dec [IIF((YEAR(TODAY())+1)%4, 21, 22)] MSG %"Winter%" begins
 # example, I recommend that you use the -sd 10 option for Rem2PS.
 REM PS Border Border moveto \
    /DayFont findfont DaySize scalefont setfont \
-   ([hebday(today())] [hebmon(today())]) show
+   ([hebday($U)] [hebmon($U)]) show
 
 # Fill in the phases of the moon on the PostScript calendar
 [moondate(0)] SPECIAL MOON 0
@@ -385,7 +287,7 @@ REM PS Border Border moveto \
 # calendar - the sizes are hard-coded, however, and work best in landscape.
 REM PS Border Border 5 sub moveto \
 	/SmallFont findfont 4 scalefont setfont \
-	(Sunrise: [sunrise(trigdate())] Sunset: [sunset(trigdate())]) show
+	(Sunrise: [sunrise($T)] Sunset: [sunset($T)]) show
 
 # The next one puts the day number (1-366) and days left in the year at the
 # bottom of the post-script calendar.  Again, the hard-coded sizes work best
@@ -393,7 +295,7 @@ REM PS Border Border 5 sub moveto \
 FSET _DayOfYear(x) x-(date(year(x),1,1) - 1)
 REM PS BoxWidth 3 mul 4 div Border 5 sub moveto \
 	/SmallFont findfont 4 scalefont setfont \
-	([_DayOfYear(today())]([365+isleap(today())-_DayOfYear(today())])) show
+	([_DayOfYear($U)]([365+isleap($U)-_DayOfYear($U)])) show
 
 #JHOLS
 ##########################################################################
@@ -402,7 +304,7 @@ REM PS BoxWidth 3 mul 4 div Border 5 sub moveto \
 # dates were obtained from "The First Jewish Catalog" by Richard Siegel	 #
 # and Michael and Sharon Strassfeld, published by the Jewish Publication #
 # Society of America.  The Reform version of the calendar was guessed	 #
-# at by David Skoll based on experience.  There is probably no standard  #
+# at by Dianne Skoll based on experience.  There is probably no standard  #
 # Reform position on many of the holidays, so you may have to adjust     #
 # the file as required.                                                  #
 #									 #
@@ -433,7 +335,7 @@ SET Reform 0
 
 # Convenient function definition to save typing
 FSET _h(x, y) HEBDATE(x,y)
-FSET _h2(x, y) HEBDATE(x, y, TODAY()-7)
+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 _PastSun(x, y) IIF(WKDAYNUM(_h2(x,y))!=0, _h2(x,y), _h2(x,y)+1)
 FSET _PastMon(x, y) IIF(WKDAYNUM(_h2(x,y))!=1, _h2(x,y), _h2(x,y)+1)
@@ -467,7 +369,7 @@ ELSE
 ENDIF
 
 # Because Kislev can change length, we must be more careful about Chanukah
-FSET _chan(x) HEBDATE(24, "Kislev", today()-9)+x
+FSET _chan(x) HEBDATE(24, "Kislev", $U-9)+x
 [_chan(1)] ++4 MSG %"Chanukah 1%" is %b.
 [_chan(2)] MSG %"Chanukah 2%"
 [_chan(3)] MSG %"Chanukah 3%"
@@ -516,11 +418,11 @@ ELSE
    REM [_PastSun(27, "Nisan")] ++4 MSG %"Yom HaShoah%" is %b.
 ENDIF
 
-# If 4 Iyar is a Friday, then Yom Hazikaron is
+# If 4 Iyar is a Thursday or Friday, then Yom Hazikaron is
 # the Wednesday before and Yom Ha'atzmaut is on
 # Thursday.  If 4 Iyar is a Sunday, then Yom Hazikaron
 # moves to 5 Iyar and Yom Ha'atzmaut to 6 Iyar.
-IF WKDAYNUM(_h2(4, "Iyar")) == 5
+IF WKDAYNUM(_h2(4, "Iyar")) == 4 || WKDAYNUM(_h2(4, "Iyar")) == 5
 	[_h(2, "Iyar")] ++4 MSG %"Yom Hazikaron%" is %b.
 	[_h(3, "Iyar")] ++4 MSG %"Yom Ha'atzmaut%" is %b.
 ELSE
@@ -556,9 +458,9 @@ ENDIF
 # Counting the omer - do the whole spiel, i.e:
 # "This is the xth day of the omer, being y weeks and z days of the omer."
 # Nice Remind programming example here!
-SET ostart HEBDATE(16, "Nisan", TODAY()-50)
-IF ostart <= TODAY() && (TODAY() - ostart < 49)
-   SET odays TODAY()-ostart+1
+SET ostart HEBDATE(16, "Nisan", $U-50)
+IF ostart <= $U && ($U - ostart < 49)
+   SET odays $U-ostart+1
    IF odays < 7
       MSG %"%"Today is the [ORD(odays)] day of the Omer.
    ELSE
@@ -576,52 +478,14 @@ ENDIF
 ### for Friday and Saturday.  Note:  You must set your latitude, longitude
 ### and possibly time zone for these to work properly!
 
-REM Friday   CAL Candle lighting at [sunset(trigdate())-18]
-REM Saturday CAL Havdalah at [sunset(trigdate())+42]
+REM Friday   CAL Candle lighting at [sunset($T)-18]
+REM Saturday CAL Havdalah at [sunset($T)+42]
 
 #COLORS
-##########################################################################
-#								         #
-# This contains sample ANSI escape sequences for coloring messages.      #
-# It should work on an IBM PC with the ANSI.SYS driver, and on           #
-# other terminals which use the ANSI sequences.                          #
-#								         #
-# This information was provided by Gail Gurman.
-#								         #
-##########################################################################
-# Colors - use Nrm to reset to normal text.
-SET Esc   CHAR(27)
-
-SET Nrm   Esc + "[0m"
-SET Blk   Esc + "[0;30m"
-SET Red   Esc + "[0;31m"
-SET Grn   Esc + "[0;32m"
-SET Ylw   Esc + "[0;33m"
-SET Blu   Esc + "[0;34m"
-SET Mag   Esc + "[0;35m"
-SET Cyn   Esc + "[0;36m"
-SET Wht   Esc + "[0;37m"
-SET Gry   Esc + "[30;1m"
-SET BrRed Esc + "[31;1m"
-SET BrGrn Esc + "[32;1m"
-SET BrYlw Esc + "[33;1m"
-SET BrBlu Esc + "[34;1m"
-SET BrMag Esc + "[35;1m"
-SET BrCyn Esc + "[36;1m"
-SET BrWht Esc + "[37;1m"
 
 # Examples
-REM MSG A [Blu]blue[Nrm] reminder.
-REM MSG [Red]%"A red reminder%" safe to use in the calendar mode.[Nrm]
-
-# Here is an example of how to use msgprefix() and msgsuffix().  These
-# will highlight priority-0 reminders in bright red,
-# priority-2500 in red, and priority-7500 in blue.  All others
-# will be in the normal colors
-FSET msgprefix(x) iif(x==0, BrRed, x==2500, Red, x==7500, Blu, Nrm)
-
-# Don't forget to return to normal color set at the end of reminder!
-FSET msgsuffix(x) Nrm
+REM 1 SPECIAL COLOR 0 0 255 A blue reminder.
+REM 2 SPECIAL COLOR 255 0 0 %"A red reminder%" safe to use in the calendar mode.
 
 # The next examples are great for putting right at the end of the reminder
 # file.  They make queued reminders more eye-catching when they pop up.

examples/remind.vim

@@ -7,7 +7,7 @@
 "
 " remind is a sophisticated reminder service
 " you can download remind from:
-"   http://www.roaringpenguin.com/penguin/open_source_remind.php
+"   https://dianne.skoll.ca/projects/remind/
 
 if version < 600
   syntax clear

man/cm2rem.1

@@ -1,28 +0,0 @@
-.TH CM2REM 1 "18 October 1999"
-.UC 4
-.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/rem.1

@@ -1,4 +1,4 @@
-.TH REM 1 "30 August 2007"
+.TH REM 1 "1 January 2021"
 .UC 4
 .SH NAME
 rem \- Invoke Remind with a default filename
@@ -15,6 +15,6 @@ value of DOTREMINDERS as the filename.  Otherwise, \fBremind\fR uses
 the filename $HOME/.reminders
 .PP
 .SH AUTHOR
-Remind was written by David F. Skoll <dfs@roaringpenguin.com>
+Remind was written by Dianne Skoll <dianne@skoll.ca>
 .SH SEE ALSO
 \fBremind\fR

man/rem2ps.1

@@ -1,17 +1,21 @@
-.TH REM2PS 1 "11 April 2005"
+.TH REM2PS 1 "5 January 2021"
 .UC 4
 .SH NAME
 rem2ps \- draw a PostScript calendar from Remind output
 .SH SYNOPSIS
 .B rem2ps [\fIoptions\fR]
 .SH DESCRIPTION
-\fBRem2ps\fR reads the standard input, which should be the results of running
-\fBRemind\fR with the \fB\-p\fR option.  It emits PostScript code (which
-draws a calendar) to the standard output.
+\fBRem2ps\fR reads the standard input, which should be the results of
+running \fBRemind\fR with the \fB\-p\fR or \fB\-pp\fR option.  It
+emits PostScript code (which draws a calendar) to the standard output.
 .PP
 See the section "Rem2PS Input Format" for details about the \fB\-p\fR
 data.  This may be useful if you wish to create other \fBRemind\fR
 back-ends.
+.PP
+Note that \fBRem2PS\fR does not handle UTF-8 input.  If you need to
+render characters outside the ASCII character set, see
+\fBrem2pdf\fR instead.
 
 .SH OPTIONS
 .TP
@@ -29,6 +33,11 @@ include any document structuring comments in your prologue.
 Produce the calendar in landscape mode rather than the default
 portrait mode.
 .TP
+.B \-x
+When printing the calendar, place the day numbers in the top-left of each
+day's box.  If this option is omitted, the day numbers appear in the
+top-right.
+.TP
 \fB\-c\fR[\fIn\fR]
 If \fIn\fR is omitted, disables the small calendars for next and previous
 months which are normally generated.  If \fIn\fR is supplied, it can range
@@ -56,7 +65,9 @@ there is room and otherwise follows \fIn\fR=2 yields the same results as
 .TP
 .B \-i
 Use ISO 8859-1 standard encoding for the PostScript fonts.  If you do
-not use this option, the default encoding is used.
+not use this option, the default encoding is used.  If you use this option,
+you probably also need to convert Remind's output (typically UTF-8)
+to ISO-8859-1 using \fBiconv\fR(1).
 .TP
 .B \-e
 Make the calendar fill the entire page.  By default, the calendar is
@@ -267,7 +278,7 @@ hold:
 .TP
 o
 The PostScript origin is at the bottom left-hand corner of the page, and
-PostScript units of 1/72" are in effect.
+PostScript units of 1/72 inch are in effect.
 .TP
 o
 The variables MinX, MinY, MaxX and MaxY define the bounding box within
@@ -313,7 +324,13 @@ Use that file with the \fBRem2ps\fR \fB\-p\fR option to create calendars
 with the year and month in large grey letters in the background of the
 calendar.
 .PP
-.SH REM2PS INPUT FORMAT
+.SH REM2PS INPUT FORMAT (-P OPTION)
+The \fB\-p\fR option is an older, simpler interchange format used by
+\fBRemind\fR to communicate with back-ends.  New back-ends are
+encoraged to support the new \fB\-pp\fR format preferably, though they
+are encouraged to support the older \fB\-p\fR format as well if the
+older format contains enough information for them to work properly.
+.PP
 \fBRemind \-p\fR sends the following lines to standard output.
 The information is designed to be easily parsed by back-end programs:
 .TP
@@ -329,6 +346,10 @@ month (0 = Sunday, 1 = Monday, 6 = Saturday.)  And \fImonday_first\fR is
 1 if the \fB\-m\fR flag was supplied to \fBRemind\fR, or 0 if it was not.
 All this information is supplied so back-ends don't need any date calculation
 facilities.
+
+Note that all spaces in \fImonth_name\fR will be replaced with
+underscores.  Back-ends should undo this replacement.
+
 .TP
 \fIsun mon tue wed thu fri sat\fR
 This line consists of
@@ -336,6 +357,9 @@ space-separated names of days in whatever language \fBRemind\fR was
 compiled for.  This information can be used by back-ends to annotate
 calendars, and means they don't have to be created for a specific
 language.
+
+Note that all spaces in day names will be replaced with
+underscores.  Back-ends should undo this replacement.
 .TP
 \fInext_mon next_days\fR
 The name of the next month and the number of days in it.
@@ -375,6 +399,9 @@ was provided.
 .PP
 \fIbody\fR is the body of the reminder.
 .PP
+Future versions of \fBRemind\fR may add additional keys to the JSON
+object.  Back-ends \fImust\fR ignore keys they don't recognize.
+.PP
 After a month's worth of reminders have been emitted, \fBRemind\fR
 emits the line:
 .PP
@@ -393,11 +420,249 @@ the line number and file name of the file containing the reminder.  Back-ends
 that don't care about this information should ignore lines starting with
 "#" (except, of course, for the # rem2ps lines.)
 .PP
-.SH AUTHOR
-Rem2PS is now supported by Roaring Penguin Software
-Inc. (http://www.roaringpenguin.com)
+.SH REM2PS PARTIAL JSON INPUT FORMAT (-PP OPTION)
+\fBRemind \-pp\fR sends the following lines to standard output.  They
+are designed to be easily parsed, but contain much more information
+than the old-style \fBremind -p\fR output.  The extra information
+contains a representation of the parsed "REM" statement, which could
+allow converters to better preserve semantics of a reminder.  For
+example, this format passes enough information to allow a back-end to
+(in many cases) determine a reminder's recurrence rather than just treating
+each reminder as a one-off event.
 .PP
-Rem2PS was written by David F. Skoll <dfs@roaringpenguin.com>.
+The lines emitted by \fBremind \-pp\fR are as follows:
+.TP
+.B # rem2ps2 begin
+This line signifies the start of calendar data.  Back-ends can search
+for it to verify they are being fed correct information.  Note the
+"2" after "rem2ps", which distinguishes this format from the older \fB\-p\fR
+format.
+.TP
+\fImonth_name year num_days first_day monday_first\fR
+Same as the \fB\-p\fR format
+.TP
+\fIsun mon tue wed thu fri sat\fR
+Same as the \fB\-p\fR format
+.TP
+\fInext_mon next_days\fR
+Same as the \fB\-p\fR format
+.TP
+\fIprev_mon prev_days\fR
+Same as the \fB\-p\fR format
+.PP
+.B CALENDAR ENTRIES
+.PP
+The remaining data consists of calendar entries expressed as a JSON object
+on a single line.  Each such line will begin with "{" and will be a well-formed
+JSON object.  The keys that may be present in the JSON object are as
+follows:
+.TP
+.B date \fIYYYY-MM-DD\fR
+The \fbdate\fR key will \fIalways\fR be present; it is the trigger date
+of the reminder expressed as a string in the format \fIYYYY-MM-DD\fR
+.TP
+.B filename \fIf\fR
+The filename in which the reminder was found.
+.TP
+.B lineno \fIn\fR
+The line number within the file on which the reminder was found.
+.TP
+.B nonconst_expr 1
+If the reminder contained a non-constant expression that had to be evaluated
+to determine the trigger date, this key will be present with the value 1.
+If this key is present, then it is unsafe for a back-end to rely on
+recurrence semantics or even the semantics of any part of the parsed
+reminder, as they may have been computed in a way that cannot be expressed
+in JSON.
+.TP
+.B if_depth \fIn\fR
+If the reminder is inside one or more IF or ELSE statements, this key
+will be present and the value will be the number of nested IFs from
+the top-level to the reminder.  Back-ends should be wary of
+interpreting recurrence semantics of reminders within an IF or ELSE
+block.
+.TP
+.B passthru \fIspecial\fR
+If the reminder was a SPECIAL reminder, the \fBpassthru\fR key will be
+present and the value will be the type of SPECIAL (such as SHADE, COLOR,
+MOON, etc.)
+.TP
+.B tags \fIdata\fR
+If any TAG clauses are present, the \fBtags\fR key will be present and consist
+of a comma-separated list of tags.
+.TP
+.B time \fIt\fR
+If an AT clause was present, this key will contain the time of the AT clause
+in minutes after midnight.
+.TP
+.B tdelta \fIn\fR
+If a time delta (+n after an AT clause) was present, this key contains the
+delta value in minutes.
+.TP
+.B trep \fIn\fR
+If a time repeat (*n after an AT clause) was present, this key contains the
+repeat value in minutes.
+.TP
+.B eventduration \fIn\fR
+If a DURATION clause was present, this key contains the event duration in
+minutes.
+.TP
+.B duration \fIn\fR
+If a DURATION clause was present, this key contains today's duration in
+minutes.  See the \fBremind(1)\fR man page, "MULTI-DAY EVENTS", for a
+discussion of duration vs. event duration.
+.TP
+.B eventstart \fIdt\fR
+If an AT clause was present, this key contains the event start time in
+the format \fIYYYY-MM-DDTHH:MM\fR.
+.TP
+.B back \fIn\fR
+If the reminder contained a "back" clause (\-n or \-\-n), this key
+contains the back value.  If the "back" value was \-n, the value will
+be positive; if it was \-\-n, the value will be negative.
+.TP
+.B delta \fIn\fR
+If the reminder contained a "delta" clause (\+n or \+\+n), this key
+contains the delta value.  If the "delta" value was \+n, the value will
+be positive; if it was \+\+n, the value will be negative.
+.TP
+.B rep \fIn\fR
+If the reminder contained a "repeat" clause (*n), this key contains
+the repeat value.
+.TP
+.B skip \fItype\fR
+If the reminder contained a SKIP, BEFORE or AFTER keyword, then this
+key will contain that keyword.
+.TP
+.B localomit \fIarray\fR
+If the reminder contains a local OMIT keyword, this key will be present.
+Its value will be an array of English day names that are OMITted.
+.TP
+.B wd \fIarray\fR
+If the reminder contains one or more weekdays, this key will be present.
+Its value will be an array of English day names that are present.
+.TP
+.B d \fIn\fR
+If a day-of-month is present in the reminder specification, this key
+will be present and its value will be the day number.
+.TP
+.B m \fIn\fR
+If a month is present in the reminder specification, this key
+will be present and its value will be the month number.
+.TP
+.B y \fIn\fR
+If a year is present in the reminder specification, this key
+will be present and its value will be the year.
+.TP
+.B until \fIYYYY-MM-DD\fR
+If the reminder contains an UNTIL or THROUGH clause, this key
+will be present.  Its value will be a string of the form YYYY-MM-DD.
+.TP
+.B once 1
+If the reminder contains a ONCE keyword, this key will be present
+with a value of 1.
+.TP
+.B scanfrom \fIYYYY-MM-DD\fR
+If the reminder contains a SCANFROM keyword, this key will be present
+and its value will be a string of the form YYYY-MM-DD.
+.TP
+.B from \fIYYYY-MM-DD\fR
+If the reminder contains a FROM keyword, this key will be present
+and its value will be a string of the form YYYY-MM-DD.
+.TP
+.B priority \fIn\fR
+The priority of the reminder.  Always present; if no PRIORITY keyword
+is specified, then a reminder has a default priority of 5000.
+.TP
+.B r \fIn\fR
+For a SHADE or COLOR special, the red color component.
+.TP
+.B g \fIn\fR
+For a SHADE or COLOR special, the green color component.
+.TP
+.B b \fIn\fR
+For a SHADE or COLOR special, the blue color component.
+.TP
+.B body \fIbody\fR
+The body of the reminder to issue.  Always present.
+.TP
+.B rawbody \fIraw\fR
+The "raw" body of the reminder, before any expression-pasting or
+substitution-sequence processing.  If the raw body would be the same
+as the processed body, then this key is not present.
+.PP
+After a month's worth of reminders have been emitted, \fBRemind\fR
+emits the line:
+.PP
+\fB# rem2ps2 end
+.PP
+However, back-ends should keep reading until EOF in case more data for
+subsequent months is forthcoming.
+.PP
+
+.SH REM2PS PURE JSON INPUT FORMAT (-PPP OPTION)
+\fBRemind \-ppp\fR emits \fIpure JSON\fR output.  The format is
+as follows:
+.PP
+\fBRemind\fR outputs a JSON array.  Each element of the array is a
+\fImonth descriptor\fR.
+.PP
+Each month descriptor is a JSON object with the following elements:
+.TP
+.B monthname \fIname\fR
+The name of the month.
+.TP
+.B year \fIyyyy\fR
+The year.
+.TP
+.B daysinmonnth \fIn\fR
+The number of days in the current month.
+.TP
+.B firstwkday \fIn\fR
+The weekday of the first day of the month (0 = Sunday, 1 = Monday, 6 = Saturday).
+.TP
+.B mondayfirst \fIn\fR
+An indicator of whether or not the calendar week should start with
+Sunday (n=0) or Monday (n=1).
+.TP
+.B daynames \fR[\fIdays\fR]
+A seven-element array of day names; each element is a string representing
+the names of the days from Sunday through Saturday.
+.TP
+.B prevmonthname \fIname\fR
+The name of the previous month.
+.TP
+.B daysinprevmonth \fIn\fR
+The number of days in the previous month.
+.TP
+.B prevmonthyear \fIyyyy\fR
+The year of the previous month.  (The same as \fByear\fR unless the current
+month is January.)
+.TP
+.B nextmonthname \fIname\fR
+The name of the following month.
+.TP
+.B daysinnextmonth \fIn\fR
+The number of days in the following month.
+.TP
+.B nextmonthyear \fIyyyy\fR
+The year of the following month.  (The same as \fByear\fR unless the
+current month is December.)
+.TP
+.B entries \fR[\fIarray\fR]
+The \fBentries\fR key consists of an array of calendar entries; each
+entry is a JSON object that has the same format as described in the
+\fBCALENDAR ENTRIES\fR section in the \fB\-PP FORMAT\fR section,
+\fIwith the following difference\fR: In \fB\-PP\fR mode, if a reminder
+has \fB%"\fR markers, only the text between the markers
+is included in the \fBbody\fR element.  In \fB\-PPP\fR mode, the
+entire text \fIincluding\fR the \fB%"\fR markers is included and it's up to
+the back-end to extract the portion between the markers if that
+is desired.
+
+
+.SH AUTHOR
+Rem2PS was written by Dianne Skoll <dianne@skoll.ca>
 .SH BUGS
 All \fBRem2ps\fR options are case-sensitive, unlike \fBRemind\fR.
 Any time you supply
@@ -410,4 +675,5 @@ You should ensure that the values you supply for margin widths are sensible.
 If they are too big for the media size, \fBRem2ps\fR will not complain,
 but again, the PostScript output will probably not work.
 .SH SEE ALSO
-\fBremind\fR
+\fBremind\fR, \fBrem2pdf\fR, \fBrem2html\fR, \fBtkremind\fR.
+

man/tkremind.1

@@ -1,9 +1,9 @@
-.TH TKREMIND 1 "15 February 1998"
+.TH TKREMIND 1 "15 January 2021"
 .UC 4
 .SH NAME
 tkremind \- graphical front-end to Remind calendar program
 .SH SYNOPSIS
-.B tkremind \fR[\fIoptions\fR] [\fIread_file\fR] [\fIwrite_file\fR]
+.B tkremind \fR[\fIoptions\fR] [\fIread_file\fR] [\fIwrite_file\fR] [\fIconfig_file\fR]
 .SH DESCRIPTION
 \fBTkRemind\fR is a graphical front-end to the \fBRemind\fR program.
 It provides a friendly graphical interface which allows you to view
@@ -13,8 +13,10 @@ Although not all of \fBRemind\fR's features are available with \fBTkRemind\fR,
 it creates.  This allows you to learn \fBRemind\fR's syntax and then add
 extra features as you become a more sophisticated \fBRemind\fR programmer.
 
-\fBTkRemind\fR is written in Tcl, and requires version 8.0
-(or higher).  It also requires a \fBwish\fR binary.
+\fBTkRemind\fR is written in Tcl, and requires version 8.5 (or higher)
+as well as the tcllib extension.  It also requires a \fBwish\fR
+binary.  If you are using Tcl/Tk 8.5, you may also need either the Img
+or the tkpng extension to handle PNG images.
 
 .SH OPTIONS
 \fBTkRemind\fR itself has no options.  However, it passes certain options
@@ -41,6 +43,9 @@ include the line:
 .fi
 .PP
 
+\fIConfig_file\fR is the file in which \fBTkRemind\fR stores
+its options.  If it is omitted, it defaults to \fI$HOME/.tkremindrt\fR.
+
 .SH THE CALENDAR WINDOW
 When you start \fBTkRemind\fR, it displays a calendar for the current
 month, with today's date highlighted.  Reminders are filled into each
@@ -51,11 +56,14 @@ notice that the box appears completely full.
 
 .SH NAVIGATING
 To change to the previous or next month, click the \fB<\-\fR
-or \fB\->\fR button, respectively.  To change back to
-the current month, click \fBToday\fR.  To go to a specific month,
-click \fBGo To Date...\fR.  This pops up a dialog box which allows you
-to select a month and enter a year.  Once you've done this, click
-\fBGo\fR to go to the date, or \fBCancel\fR to cancel.
+or \fB\->\fR button, respectively.  You can also use the left/right arrow
+keys or PageUp/PageDown to navigate.
+
+To change back to the current month, click \fBToday\fR or press the
+Home key.  To go to a specific month, click \fBGo To Date...\fR.  This
+pops up a dialog box which allows you to select a month and enter a
+year.  Once you've done this, click \fBGo\fR to go to the date, or
+\fBCancel\fR to cancel.
 
 To exit \fBTkRemind\fR, click \fBQuit\fR.
 
@@ -104,9 +112,11 @@ edit the reminder, thereby gaining access to advanced features of
 \fBRemind\fR's idioms for expressing different types of reminders.
 
 .SH PRINTING
-To print the current month's calender, click \fBPrint...\fR on the
+To print the current month's calendar, click \fBPrint...\fR on the
 main calendar window.  This brings up the print dialog.  Printing
 either produces a PostScript file or sends PostScript to a UNIX command.
+(If you have \fBrem2pdf\fR installed, you can choose to produce
+PDF output rather than PostScript.)
 
 Select the print destination by choosing either \fBTo file:\fR or
 \fBTo command:\fR in the print dialog.  Press \fBBrowse...\fR to bring
@@ -123,12 +133,14 @@ the directory.
 Select the appropriate paper size and orientation.  Activate
 \fBFill page\fR if you want the calendar to fill the page.  This should
 be the normal case unless you have many reminders in a particular
-day.  (See the \fBRem2PS\fR documentation.)
+day.  (See the \fBRem2PS\fR or \fBrem2pdf\fR documentation.)
+
+Finally, click \fBPrint\fR to print or \fBCancel\fR to cancel.  Note
+that during printing, \fBRemind\fR is called with the
+\fB-itkremind=1\fR option and also an additional \fB-itkprint=1\fR
+option.  If you are producing PDF output, then the option \fB-itkpdf=1\fR
+is also supplied to \fBRemind\fR.
 
-Finally, click \fBPrint\fR to print or \fBCancel\fR to cancel.
-Note that during printing, \fBRemind\fR is \fInot\fR called with
-the \fB-itkremind=1\fR option, because it is operated in normal
-PostScript-producing mode.
 
 .SH EDITING REMINDERS
 
@@ -155,7 +167,11 @@ it with \fBTkRemind\fR.
 If you have set the "text editor" option correctly, right-clicking
 on a reminder will bring up a text editor on the file containing
 the reminder.  The cursor will be positioned on the line that
-generated the reminder.
+generated the reminder.  In addition, if you have a reminder that
+is editable with an editor but was not created using \fBTkRemind\fR,
+it will be underlined when you move the cursor over it, and
+you can edit it in a text editor by either left- or right-clicking
+on the reminder.
 
 .SH BACKGROUND REMINDERS
 
@@ -210,7 +226,8 @@ background reminder pops up.
 .TP
 .B Feed popped-up reminder to command's standard input
 If selected, feeds the text of the reminder to the command described
-above.
+above.  The text of the reminder is prefixed by "HH:MM ", where HH:MM
+is the time of the reminder.
 
 .TP
 .B E-mail reminders here if popup not dismissed
@@ -231,6 +248,22 @@ The characters "%d" are replaced with the lined number of the file
 containing the reminder, and "%s" are replaced with the file name.
 Useful strings might be "emacs +%d %s" or "gvim +%d %s"
 
+.TP
+.B Extra Argument for Remind
+This specifies any extra arguments that should be passed to Remind
+when \BTkRemind\fR invokes \fBremind\fR.  Unless you know what
+you are doing, leave this blank.
+
+.TP
+.B Change entry font...
+This button pops up a font selection dialog that lets you change the
+font used to draw calendar items in the calendar boxes.
+
+.TP
+.B Change heading font...
+Similar to Change entry font, but applies to calendar heading
+(the month and day names and the day numbers.)
+
 .PP
 Once you've configured the options the way you like them,
 press \fBApply Options\fR to put them into effect, \fBSave Options\fR
@@ -358,13 +391,9 @@ This line is emitted in response to a \fBSTATUS\fR command.  The number
 \fIn\fR is the number of reminders in the queue.
 
 .SH AUTHOR
-TkRemind is now supported by Roaring Penguin Software
-Inc. (http://www.roaringpenguin.com)
-.PP
-TkRemind was written by David F. Skoll <dfs@roaringpenguin.com>.
+TkRemind was written by Dianne Skoll <dianne@skoll.ca>
 
-\fBTkRemind\fR is Copyright 1996-1998 by David F. Skoll, Copyright
-1999 by Roaring Penguin Software Inc.
+\fBTkRemind\fR is Copyright 1996-2020 by Dianne Skoll.
 
 .SH FILES
 
@@ -373,4 +402,5 @@ $HOME/.reminders -- default reminder file.
 $HOME/.tkremindrc -- \fBTkRemind\fR saved options.
 
 .SH SEE ALSO
-remind, rem2ps
+\fBremind\fR, \fBrem2ps\fR, \fBrem2pdf\fR, \fBrem2html\fR
+

rem2html/Makefile.in

@@ -0,0 +1,30 @@
+# Set by configure - don't touch.
+srcdir=@srcdir@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+mandir=@mandir@
+bindir=@bindir@
+datadir=@datadir@
+datarootdir=@datarootdir@
+PERL=@PERL@
+PERLMODS_NEEDED=JSON::MaybeXS Getopt::Long
+all:
+	true
+
+install:
+	@if test "$(PERL)" = "" ; then \
+	    echo "Not installing rem2html; Perl is required"; exit 0; fi; \
+	 for m in $(PERLMODS_NEEDED) ; \
+         do \
+	    $(PERL) -M$$m -e 1 > /dev/null 2>&1; \
+	    if test $$? != 0 ; then echo "Not installing rem2html; missing $$m"; exit 0; fi; \
+	done; \
+	pod2man rem2html > rem2html.1 && mkdir -p $(DESTDIR)$(mandir)/man1 && cp rem2html.1 $(DESTDIR)$(mandir)/man1/rem2html.1 || true; \
+	echo "Installing rem2html in $(DESTDIR)$(bindir)"; \
+	mkdir -p $(DESTDIR)$(bindir) && sed -e 's|^#!perl|#!$(PERL)|' < rem2html > $(DESTDIR)$(bindir)/rem2html && chmod 755 $(DESTDIR)$(bindir)/rem2html && exit 0; \
+	exit 1;
+
+
+
+
+

rem2html/README.rem2html

@@ -0,0 +1,12 @@
+REM2HTML
+--------
+
+rem2html is a Perl script that transforms the output of `remind -pp
+...' to HTML.  Type `perl rem2html --help' for usage information.
+
+rem2html requires the Perl modules `JSON::Any' and `Getopt::Long'.  It
+will not be installed unless you have those modules as well as Perl
+itself.
+
+--
+Dianne Skoll

rem2html/rem2html

@@ -1,13 +1,14 @@
-#!/usr/bin/perl
+#!perl
 
 use strict;
 use warnings;
 
 use Getopt::Long;
+use JSON::MaybeXS;
 
 my %Options;
 
-my $rem2html_version = '2.0';
+my $rem2html_version = '2.1';
 
 my($days, $shades, $moons, $classes, $Month, $Year, $Numdays, $Firstwkday, $Mondayfirst, $weeks,
     @Daynames, $Nextmon, $Nextlen, $Prevmon, $Prevlen);
@@ -15,15 +16,20 @@ my($days, $shades, $moons, $classes, $Month, $Year, $Numdays, $Firstwkday, $Mond
 my $TIDY_PROGNAME = $0;
 $TIDY_PROGNAME =~ s|^.*/||;
 
-# rem2html -- convert the output of "remind -p" to HTML
+# rem2html -- convert the output of "remind -pp" to HTML
 
 =head1 NAME
 
-rem2html - Convert the output of "remind -p" to HTML
+rem2html - Convert the output of "remind -pp" to HTML
 
 =head1 SYNOPSIS
 
-remind -p ... | rem2html [options]
+    remind -pp ... | rem2html [options]
+
+You can also use the old interchange format as below, but the -pp
+version is preferred.
+
+    remind -p ... | rem2html [options]
 
 =head1 OPTIONS
 
@@ -49,13 +55,21 @@ month name a link to I<url>.
 
 =item --imgbase I<url>
 
-When creating URLs for images and the stylesheet, use
-I<url> as the base URL.
+When creating URLs for the stylesheet or external images, use I<url>
+as the base URL.
+
+=item --pngs
+
+Normally, rem2html uses inline "data:" URLs for the moon phase images,
+yielding a standalone HTML file.  The C<--pngs> option makes it use
+external images named firstquarter.png, fullmoon.png, lastquarter.png
+and newmoon.png, which are expected to live in C<--imgbase>.
 
 =item --stylesheet I<url.css>
 
 Use I<url.css> as the stylesheet.  If this option is used,
-I<url.css> is I<not> interpreted relative to B<imgbase>.
+I<url.css> is interpreted relative to B<imgbase> I<unless> it starts
+with a "/".
 
 =item --nostyle
 
@@ -82,11 +96,43 @@ Insert I<html_text> right before the E<lt>/bodyE<gt> tag.
 
 =back
 
+=head1 SPECIALS SUPPORTED
+
+The rem2html back-end supports the following SPECIAL reminders:
+
+=over
+
+=item HTML
+
+Add an HTML reminder to the calendar.  All HTML tags are available.
+
+=item HTMLCLASS
+
+Add a CSS class to the box representing the trigger date.  See
+"HIGHLIGHTING TODAY" for an example
+
+=item WEEK, MOON, SHARE, COLOR
+
+The standard SPECIALs supported by all back-ends
+
+=back
+
+=head1 HIGHLIGHTING TODAY
+
+Older versions of rem2html used to highlight today's date with a red outline.
+The current version does not do that by default.  If you wish to highlight
+today's date, add the following reminder to your reminders file:
+
+    REM [realtoday()] SPECIAL HTMLCLASS rem-today
+
 =head1 AUTHOR
 
-rem2html was written by David F. Skoll with much inspiration from an
+rem2html was written by Dianne Skoll with much inspiration from an
 earlier version by Don Schwarz.
 
+=head1 SEE ALSO
+
+B<remind>, B<rem2ps>, B<rem2pdf>, B<tkremind>
 =cut
 
 sub usage
@@ -96,9 +142,9 @@ sub usage
 	    $exit_status = 1;
     }
     print STDERR <<"EOM";
-$TIDY_PROGNAME: Produce an HTML calendar from the output of "remind -p"
+$TIDY_PROGNAME: Produce an HTML calendar from the output of "remind -pp"
 
-Usage: remind -p ... | rem2html [options]
+Usage: remind -pp ... | rem2html [options]
 
 Options:
 
@@ -109,6 +155,8 @@ Options:
                       entry a link to <url>
 --forwurl url         Same as --backurl, but for the next month's small calendar
 --imgbase url         Base URL of images and default stylesheet file
+--pngs                Use external .PNG images for moon phases rater than
+                      inline data: URLs
 --stylesheet url.css  URL of CSS stylesheet.  If specified, imgbase is NOT
                       prepended to url.css
 --nostyle             Produce basic HTML that does not use a CSS stylesheet
@@ -120,11 +168,31 @@ EOM
     exit($exit_status);
 }
 
+sub smoosh
+{
+        my ($first, $second) = @_;
+        return $second unless defined ($first);
+        return $second if $first eq '';
+        return $second if ($second =~ m|^/|);  # Absolute path given for second
+
+        # Squash multiple slashes
+        $first =~ s|/+|/|g;
+
+        # Special case
+        return "/$second" if ($first eq '/');
+
+        # Delete trailing slash
+        $first =~ s|/$||;
+
+        return "$first/$second";
+}
+
 sub parse_options
 {
     local $SIG{__WARN__} = sub { print STDERR "$TIDY_PROGNAME: $_[0]\n"; };
     if (!GetOptions(\%Options, "help|h",
 		    "man",
+                    "pngs",
 		    "version",
 		    "stylesheet=s",
 		    "nostyle",
@@ -137,45 +205,40 @@ sub parse_options
 		    "tableonly")) {
 	usage(1);
     }
-    $Options{'title'} ||= 'HTML Calendar';
+    $Options{title} ||= 'HTML Calendar';
 
-    # Fix up imgbase
-    my $imgbase = '%IMAGEBASE%';
-    if ($imgbase ne '%' . 'IMAGEBASE' . '%') {
-	    $Options{'imgbase'} ||= $imgbase;
-    } else {
-	    $Options{'imgbase'} ||= '';
+    my $stylesheet = $Options{stylesheet};
+    if ($stylesheet) {
+            $Options{stylesheet} = smoosh($Options{imgbase}, $stylesheet);
     }
-
-    $Options{'imgbase'} =~ s|/+$||;
-    my $stylesheet = $Options{'imgbase'};
-    $stylesheet .= '/' if ($stylesheet ne '');
-    $stylesheet .= 'rem-default.css';
-    $Options{'stylesheet'} ||= $stylesheet;
 }
 
 sub start_output
 {
-    return if ($Options{'tableonly'});
+    return if ($Options{tableonly});
 
-    print("<html>\n<head>\n<title>" . $Options{'title'} . "</title>\n");
-    if (!$Options{'nostyle'}) {
-	if ($Options{'stylesheet'}) {
-	    print('<link rel="stylesheet" type="text/css" href="' .
-		  $Options{'stylesheet'} . '">' . "\n");
-	}
+    print("<html>\n<head>\n<title>" . $Options{title} . "</title>\n");
+    if (!$Options{nostyle}) {
+	if ($Options{stylesheet}) {
+                print('<link rel="stylesheet" type="text/css" href="' .
+                      $Options{stylesheet} . '">' . "\n");
+	} else {
+                print("<style>\n");
+                print default_stylesheet();
+                print("</style>\n");
+        }
     }
     print("</head>\n<body>\n");
-    if ($Options{'prologue'}) {
-	print $Options{'prologue'} . "\n";
+    if ($Options{prologue}) {
+	print $Options{prologue} . "\n";
     }
 }
 
 sub end_output
 {
-    return if ($Options{'tableonly'});
-    if ($Options{'epilogue'}) {
-	print $Options{'epilogue'} . "\n";
+    return if ($Options{tableonly});
+    if ($Options{epilogue}) {
+	print $Options{epilogue} . "\n";
     }
     print("</body>\n</html>\n");
 }
@@ -191,7 +254,7 @@ sub parse_input
     my $found_data = 0;
     while(<STDIN>) {
 	chomp;
-	last if /^\# rem2ps begin$/;
+	last if /^\# rem2ps2? begin$/;
     }
 
     my $line;
@@ -201,40 +264,63 @@ sub parse_input
     chomp($line);
     ($Month, $Year, $Numdays, $Firstwkday, $Mondayfirst) = split(' ', $line);
 
+    $Month =~ s/_/ /g;
     # Day names
     $line = <STDIN>;
     return 0 unless $line;
     chomp($line);
     @Daynames = split(' ', $line);
 
+    for (my $i=0; $i<7; $i++) {
+            $Daynames[$i] =~ s/_/ /g;
+    }
+
     # Prevmon prevlen
     $line = <STDIN>;
     return 0 unless $line;
     chomp($line);
     ($Prevmon, $Prevlen) = split(' ', $line);
+    $Prevmon =~ s/_/ /g;
 
     # Nextmon nextlen
     $line = <STDIN>;
     return 0 unless $line;
     chomp($line);
     ($Nextmon, $Nextlen) = split(' ', $line);
+    $Nextmon =~ s/_/ /g;
 
     $found_data = 1;
     my $class;
-    if ($Options{'nostyle'}) {
+    if ($Options{nostyle}) {
 	$class = '';
     } else {
 	$class = ' class="rem-entry"';
     }
     while(<STDIN>) {
 	chomp;
-	last if /^\# rem2ps end$/;
+	last if /^\# rem2ps2? end$/;
 	next if /^\#/;
-	next unless m/^(\d*).(\d*).(\d*)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s*(.*)$/;
-	my ($y, $m, $d, $special, $tag, $duration, $time, $body) =
-	    ($1, $2, $3, $4, $5, $6, $7, $8);
+	my ($y, $m, $d, $special, $tag, $duration, $time, $body);
+	if (m/^(\d*).(\d*).(\d*)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s*(.*)$/) {
+		($y, $m, $d, $special, $tag, $duration, $time, $body) =
+		    ($1, $2, $3, $4, $5, $6, $7, $8);
+	} elsif (/\{/) {
+		my $obj = decode_json($_);
+		next unless ($obj->{date} =~ /^(\d+)-(\d+)-(\d+)$/);
+		$y = $1;
+		$m = $2;
+		$d = $3;
+		$special = $obj->{passthru} || '*';
+		$tag = $obj->{tags} || '*';
+		$duration = $obj->{duration} || '*';
+		$time = $obj->{time} || '*';
+		$body = $obj->{body};
+	} else {
+		next;
+	}
 	my $d1 = $d;
 	$d1 =~ s/^0+//;
+	$special = uc($special);
 	if ($special eq 'HTML') {
 	    push(@{$days->[$d]}, $body);
 	} elsif ($special eq 'HTMLCLASS') {
@@ -256,6 +342,9 @@ sub parse_input
 		if ($body =~ /(\d+)\s+(\d+)\s+(\d+)/) {
 			$shades->[$d] = sprintf("#%02X%02X%02X",
 						($1 % 256), ($2 % 256), ($3 % 256));
+		} elsif ($body =~ /(\d+)/) {
+			$shades->[$d] = sprintf("#%02X%02X%02X",
+						($1 % 256), ($1 % 256), ($1 % 256));
 		}
 	} elsif ($special eq 'COLOR' || $special eq 'COLOUR') {
 		if ($body =~ /(\d+)\s+(\d+)\s+(\d+)\s+(.*)$/) {
@@ -281,7 +370,7 @@ sub small_calendar
 		}
 	}
 
-	if ($Options{'nostyle'}) {
+	if ($Options{nostyle}) {
 	    print "<td width=\"14%\">\n";
 	    print "<table border=\"0\">\n";
 	    print "<caption>";
@@ -296,7 +385,7 @@ sub small_calendar
 	print "</caption>\n";
 
 	my $class;
-	if ($Options{'nostyle'}) {
+	if ($Options{nostyle}) {
 	    print '<tr>';
 	    $class = ' align="right"';
 	} else {
@@ -318,7 +407,7 @@ sub small_calendar
 		if ($col == 0) {
 			print("<tr>\n");
 		}
-		if ($Options{'nostyle'}) {
+		if ($Options{nostyle}) {
 		    print("<td align=\"right\" width=\"14%\">&nbsp;</td>");
 		} else {
 		    print("<td class=\"rem-sc-empty-cell\">&nbsp;</td>");
@@ -330,7 +419,7 @@ sub small_calendar
 			print("<tr>\n");
 		}
 		$col++;
-		if ($Options{'nostyle'}) {
+		if ($Options{nostyle}) {
 		    print("<td align=\"right\" width=\"14%\">$day</td>");
 		} else {
 		    print("<td class=\"rem-sc-cell\">$day</td>");
@@ -342,7 +431,7 @@ sub small_calendar
 	}
 	if ($col) {
 	    while ($col < 7) {
-		if ($Options{'nostyle'}) {
+		if ($Options{nostyle}) {
 		    print("<td align=\"right\" width=\"14%\">&nbsp;</td>");
 		} else {
 		    print("<td class=\"rem-sc-empty-cell\">&nbsp;</td>");
@@ -369,9 +458,17 @@ sub output_calendar
     # Last column
     my $last_col = ($first_col + $Numdays - 1) % 7;
 
+    # Figure out how many rows
+    my $number_of_rows = int(($first_col + $Numdays ) / 7 + 0.999);
+
+    # Add a row for small calendars if necessary
+    if ($first_col == 0 && $last_col == 6) {
+            $number_of_rows++;
+    }
+
     # Start the table
     my $class;
-    if ($Options{'nostyle'}) {
+    if ($Options{nostyle}) {
 	print '<table width="100%" border="1" cellspacing=\"0\"><caption>' .
 	    $Month . ' ' . $Year . '</caption>' . "\n";
 	print '<tr>';
@@ -395,26 +492,26 @@ sub output_calendar
 
     # Start the calendar rows
     my $col = 0;
-    if ($Options{'nostyle'}) {
+    if ($Options{nostyle}) {
 	print "<tr>\n";
     } else {
-	print "<tr class=\"rem-cal-row\">\n";
+	print "<tr class=\"rem-cal-row rem-cal-row-$number_of_rows-rows\">\n";
     }
     if ($first_col > 0) {
-	small_calendar($Prevmon, $Prevlen, $Options{'backurl'},
+	small_calendar($Prevmon, $Prevlen, $Options{backurl},
 		       ($Firstwkday - $Prevlen + 35) % 7);
 	$col++;
     }
 
     if ($last_col == 6 && $first_col > 0) {
-	small_calendar($Nextmon, $Nextlen, $Options{'forwurl'},
+	small_calendar($Nextmon, $Nextlen, $Options{forwurl},
 		       ($Firstwkday + $Numdays) % 7);
 	$col++;
     }
-    if ($Options{'nostyle'}) {
+    if ($Options{nostyle}) {
 	$class = ' width="14%"';
     } else {
-	$class = ' class="rem-empty"';
+	$class = ' class="rem-empty rem-empty-$number_of_rows-rows"';
     }
     while ($col < $first_col) {
 	print("<td$class>&nbsp;</td>\n");
@@ -422,16 +519,16 @@ sub output_calendar
     }
 
     for (my $day=1; $day<=$Numdays; $day++) {
-	draw_day_cell($day);
+        draw_day_cell($day, $number_of_rows);
 	$col++;
 	if ($col == 7) {
 	    $col = 0;
 	    print "</tr>\n";
 	    if ($day < $Numdays) {
-		if ($Options{'nostyle'}) {
+		if ($Options{nostyle}) {
 		    print "<tr>\n";
 		} else {
-		    print "<tr class=\"rem-cal-row\">\n";
+                    print "<tr class=\"rem-cal-row rem-cal-row-$number_of_rows-rows\">\n";
 		}
 	    }
 	}
@@ -441,13 +538,13 @@ sub output_calendar
 	while ($col < 7) {
 	    if ($col == 5) {
 		if ($first_col == 0) {
-		    small_calendar($Prevmon, $Prevlen, $Options{'backurl'},
+		    small_calendar($Prevmon, $Prevlen, $Options{backurl},
 				   ($Firstwkday - $Prevlen + 35) % 7);
 		} else {
 		    print("<td$class>&nbsp;</td>\n");
 		}
 	    } elsif ($col == 6) {
-		small_calendar($Nextmon, $Nextlen, $Options{'forwurl'},
+		small_calendar($Nextmon, $Nextlen, $Options{forwurl},
 			       ($Firstwkday + $Numdays) % 7);
 	    } else {
 		print("<td$class>&nbsp;</td>\n");
@@ -459,17 +556,17 @@ sub output_calendar
 
     # Add a row for small calendars if they were not yet done!
     if ($first_col == 0 && $last_col == 6) {
-	    if ($Options{'nostyle'}) {
+	    if ($Options{nostyle}) {
 		    print "<tr>\n";
 	    } else {
-		    print "<tr class=\"rem-cal-row\">\n";
+                    print "<tr class=\"rem-cal-row rem-cal-row-$number_of_rows-rows\">\n";
 	    }
-	    small_calendar($Prevmon, $Prevlen, $Options{'backurl'},
+	    small_calendar($Prevmon, $Prevlen, $Options{backurl},
 			   ($Firstwkday - $Prevlen + 35) % 7);
 	    for (my $i=0; $i<5; $i++) {
 		print("<td$class>&nbsp;</td>\n");
 	    }
-	    small_calendar($Nextmon, $Nextlen, $Options{'forwurl'},
+	    small_calendar($Nextmon, $Nextlen, $Options{forwurl},
 			   ($Firstwkday + $Numdays) % 7);
 	    print("</tr>\n");
     }
@@ -479,17 +576,17 @@ sub output_calendar
 
 sub draw_day_cell
 {
-    my($day) = @_;
+    my($day, $number_of_rows) = @_;
     my $shade = $shades->[$day];
     my $week = '';
     if (exists($weeks->{$day})) {
 	    $week = ' ' . $weeks->{$day};
     }
     my $class;
-    if ($Options{'nostyle'}) {
+    if ($Options{nostyle}) {
 	$class = $classes->[$day] || '';
     } else {
-	$class = $classes->[$day] || "rem-cell";
+	$class = $classes->[$day] || "rem-cell rem-cell-$number_of_rows-rows";
     }
     if ($shade) {
 	    $shade = " style=\"background: $shade;\"";
@@ -512,33 +609,46 @@ sub draw_day_cell
 	    my $alt;
 	    my $title;
 	    if ($phase == 0) {
-		    $img = 'newmoon.png';
+                    if ($Options{pngs}) {
+                            $img = smoosh($Options{imgbase}, 'newmoon.png');
+                    } else {
+                            $img = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAGQAAABkABchkaRQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAC6SURBVDiNpdNNbsIwFATgL0HKolchHKBX6yFaBOEyoPYUabvOIVKJRaCL2JX5TRNGGvnJ8ozGz89cYoElPvET+BX2yivn/1Bggw5HHMKa1h2qcPZC/JEIhvh+brIZIY6sorhMYo9hh3KGFzzfa84NZNjDt9OG/ZcH1BlaPE1IAG0+URhxzNGESKPFaHJs9Q0Ziww7HnvGeXSrJhis0jiFfjwnj3I0WRv+TKtr4hQl3lDrZ6QN9Wt654hfWfGDmBpUwDkAAAAASUVORK5CYII=';
+                    }
 		    $title = 'New Moon';
 		    $alt = 'new';
 	    } elsif ($phase == 1) {
-		    $img = 'firstquarter.png';
+                    if ($Options{pngs}) {
+                            $img = smoosh($Options{imgbase}, 'firstquarter.png');
+                    } else {
+                            $img = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAGQAAABkABchkaRQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAADfSURBVDiNndM9TsNAFATgzy5yjZSAE85JBygETgENUPF3iBCitHAFQkcIhZ/Ryn9gRlrZmp2Z3ef3TBOHOMULPrDBMrhpi/4HI5xjix2+4nmJRbx/Yh7ahvkpRPVV4QDXwT3UQy46zGkAZDgK/iytefvHgCrkJsqZUH6cLnNbABSxd5Jhhf1IbkMXv8Qux7hH1Ic1xvk/jBWy6gavumvtwx7ectwZXkKh7MA95XgObeOtpI2U4zl0kGbpxgiPvwQUcXLrKFchc82f6Ur0PK49azOnmOI4TBu84zm4SV38DeIVYkrYJyNbAAAAAElFTkSuQmCC';
+                    }
 		    $title = 'First Quarter';
 		    $alt = '1st';
 	    } elsif ($phase == 2) {
-		    $img = 'fullmoon.png';
+                    if ($Options{pngs}) {
+                            $img = smoosh($Options{imgbase}, 'fullmoon.png');
+                    } else {
+                            $img = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAGQAAABkABchkaRQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAADlSURBVDiNrdNBUsJAEAXQlyw4hq4hwWPqTixET6ELkZ16CcAq7oFLqXExjaYgQVNlV/Viev7/6XT/4TjGuME7PiLXUatb8N8xwB12SFjiIXIZtU/MAntEfgvQE4YtHxhiHpjXQ5H7uLhEcaLLAleBvd0Xx9Ha/BdyU+Q5OBV5OKmj7a4YBWdSyNPe4aKHAHkzqcQZNj3JgnNexqE8heyIAulffuFF3kTfIVbBVeu/xoXGGsn2TLJJ/mqkafNiINszySYZdbS90GHlvcgsWktY4TFy7ecxTdvIzahxHQLbyFXUqkPwF2ASRNYgB/PXAAAAAElFTkSuQmCC';
+                    }
 		    $alt = 'full';
 		    $title = 'Full Moon';
 	    } else {
-		    $img = 'lastquarter.png';
+                    if ($Options{pngs}) {
+                            $img = smoosh($Options{imgbase}, 'lastquarter.png');
+                    } else {
+                            $img = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAGQAAABkABchkaRQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAADmSURBVDiNndMxTsNAEIXhzy5yCyQ6FAgcE7oQheQWUAAl5BIkREoZrgB0GFNkHBl7bURGsryaee/3jHeXdpxjghU+8InXyI0S+n0MMEeBEi+4jfV3vAvMQtsyL0J0j2GtViaeRRMyj8IlsgY8BSijE2Kur/hy09wHKMJrEolhwtwHKDHOsI4OLnoAXfl1jiNsOkR9keE4P8D4q4scbzg5xIxtjie709f1E7siC+9+Gx/8fxvPKtEsklcJSBdgWhcN8ByFR5z+AWgd5QpyE+OUWOJO+zJNU+Z6jHAdgHe7K73CuD5zFT9nCmRDIssCaAAAAABJRU5ErkJggg==';
+                    }
 		    $alt = 'last';
 		    $title = 'Last Quarter';
 	    }
-	    if ($Options{'imgbase'}) {
-		    $img = $Options{'imgbase'} . '/' . $img;
-	    }
-	    if ($Options{'nostyle'}) {
+	    if ($Options{nostyle}) {
 		print("<div style=\"float: left\"><img border=\"0\" width=\"16\" height=\"16\" alt=\"$alt\" title=\"$title\" src=\"$img\">$msg</div>");
 	    } else {
 		print("<div class=\"rem-moon\"><img width=\"16\" height=\"16\" alt=\"$alt\" title=\"$title\" src=\"$img\">$msg</div>");
 	    }
     }
 
-    if ($Options{'nostyle'}) {
+    if ($Options{nostyle}) {
 	print "<div style=\"float: right\">$day$week</div>\n";
 	print "<p>&nbsp;</p>\n";
     } else {
@@ -561,13 +671,13 @@ sub escape_html
 }
 
 parse_options();
-if ($Options{'help'}) {
+if ($Options{help}) {
     usage(0);
     exit(0);
-} elsif ($Options{'man'}) {
+} elsif ($Options{man}) {
     system("perldoc $0");
     exit(0);
-} elsif ($Options{'version'}) {
+} elsif ($Options{version}) {
     print "rem2html version $rem2html_version.\n";
     exit(0);
 }
@@ -592,3 +702,81 @@ if ($found_something) {
     exit(1);
 }
 
+sub default_stylesheet
+{
+        return <<'EOF';
+table.rem-cal {
+  font-family: helvetica, arial, sans-serif;
+  font-size: 12pt;
+}
+
+table.rem-sc-table {
+  font-family: helvetica, arial, sans-serif;
+  font-size: 10pt;
+  width: 95%;
+  float: left;
+}
+
+caption.rem-cal-caption {
+  font-size: 14pt;
+  font-weight: bold;
+}
+
+th.rem-cal-hdr {
+  width: 14%;
+  border-style: solid;
+  border-width: 1px;
+  vertical-align: top;
+}
+td.rem-empty, td.rem-cell, td.rem-small-calendar {
+  width: 14%;
+  height: 7em;
+  border-style: solid;
+  border-width: 1px;
+  vertical-align: top;
+}
+td.rem-today {
+  width: 14%;
+  height: 7em;
+  border-style: solid;
+  border-width: 2px;
+  border-color: #EE3333;
+  vertical-align: top;
+}
+
+table.rem-cal {
+  width: 100%;
+  border-collapse: collapse;
+}
+
+div.rem-daynumber {
+  float: right;
+  text-align: right;
+  vertical-align: top;
+  font-size: 14pt;
+}
+
+p.rem-entry {
+    clear: both;
+}
+
+div.rem-moon {
+  float: left;
+  text-align: left;
+  vertical-align: top;
+}
+
+th.rem-sc-hdr {
+  text-align: right;
+}
+
+td.rem-sc-empty-cell, td.rem-sc-cell {
+  text-align: right;
+  width: 14%;
+}
+
+caption.rem-sc-caption {
+  font-size: 12pt;
+}
+EOF
+}

rem2pdf/Makefile.PL.in

@@ -0,0 +1,12 @@
+use ExtUtils::MakeMaker;
+WriteMakefile(
+	NAME               => 'Remind::PDF',
+	AUTHOR             => q{Dianne Skoll <dianne@skoll.ca>},
+	VERSION            => '@VERSION@',
+	PREREQ_PM          => {
+		'Getopt::Long' => 0,
+                'Cairo' => 0,
+                'Pango' => 0,
+	},
+	EXE_FILES => [ 'bin/rem2pdf' ]
+    );

rem2pdf/Makefile.top.in

@@ -0,0 +1,40 @@
+# Set by configure - don't touch.
+srcdir=@srcdir@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+mandir=@mandir@
+bindir=@bindir@
+datadir=@datadir@
+datarootdir=@datarootdir@
+PERL=@PERL@
+PERLMODS_NEEDED=Getopt::Long Cairo Pango
+
+all: Makefile
+	@if test "$(PERL)" = "" ; then \
+	    echo "Not building rem2pdf; Perl is required"; exit 0; fi; \
+	 for m in $(PERLMODS_NEEDED) ; \
+	do \
+	    $(PERL) -M$$m -e 1 > /dev/null 2>&1; \
+	    if test $$? != 0 ; then echo "Not building rem2pdf; missing $$m"; exit 0; fi; \
+	done; \
+	$(MAKE) all && exit 0; \
+	exit 1;
+
+install:
+	@if test "$(PERL)" = "" ; then \
+	    echo "Not installing rem2pdf; Perl is required"; exit 0; fi; \
+	 for m in $(PERLMODS_NEEDED) ; \
+         do \
+	    $(PERL) -M$$m -e 1 > /dev/null 2>&1; \
+	    if test $$? != 0 ; then echo "Not installing rem2pdf; missing $$m"; exit 0; fi; \
+	done; \
+	echo "Installing rem2pdf"; \
+        if test "$(prefix)" = "/usr" ; then \
+		$(MAKE) install DESTDIR=$(DESTDIR) INSTALLDIRS=vendor && exit 0; \
+        else \
+		$(MAKE) install DESTDIR=$(DESTDIR) && exit 0; \
+        fi; \
+	exit 1;
+
+Makefile: Makefile.PL
+	$(PERL) Makefile.PL || true

rem2pdf/README

@@ -0,0 +1,22 @@
+rem2pdf is a Perl program that takes the output of "remind -p" and
+produces a PDF calendar.  See "man rem2pdf" for details.
+
+rem2pdf has the following Perl modules as prerequisites:
+
+        Pango - https://metacpan.org/pod/Pango
+        Cairo - https://metacpan.org/pod/Cairo
+
+On Debian or Debian-derived systems, these can be installed with:
+
+        apt install libpango-perl libcairo-perl
+
+On Red Hat or Red Hat-derived systems, you need to install the perl-Pango
+and perl-Cairo RPMs, which may require adding other repos to your list of
+RPM sources.
+
+rem2pdf is built and installed in the usual Perl program way:
+
+        perl Makefile.PL && make && sudo make install
+
+--
+Dianne Skoll - <dianne@skoll.ca>

rem2pdf/bin/rem2pdf.in

@@ -0,0 +1,509 @@
+#!@PERL@
+use strict;
+use warnings;
+
+use Encode;
+use Cairo;
+use Pango;
+use Getopt::Long;
+
+my $VERSION = '@VERSION@';
+
+use Remind::PDF;
+
+my $media_to_size = {
+    "Letter"    => [ 612,  792],
+    "Tabloid"   => [ 792, 1224],
+    "Ledger"    => [1224,  792],
+    "Legal"     => [ 612, 1008],
+    "Statement" => [ 396,  612],
+    "Executive" => [ 540,  720],
+    "A3"        => [ 842, 1190],
+    "A4"        => [ 595,  842],
+    "A5"        => [ 420,  595],
+    "B4"        => [ 729, 1032],
+    "B5"        => [ 519,  729],
+    "Folio"     => [ 612,  936],
+    "Quarto"    => [ 612,  780],
+    "10x14"     => [ 720, 1008],
+};
+
+my $help = 0;
+
+my $settings = {
+        landscape => 0,
+        numbers_on_left => 0,
+        small_calendars => 0,
+        fill_entire_page => 0,
+
+        media => 'Letter',
+        width => 0,
+        height => 0,
+
+        title_font => 'Sans',
+        header_font => 'Sans',
+        daynum_font => 'Sans Bold Oblique',
+        entry_font => 'Sans',
+        small_cal_font => 'Sans',
+
+        title_size => 14,
+        header_size => 12,
+        daynum_size => 14,
+        entry_size => 8,
+
+        border_size => 4,
+        line_thickness => 1,
+
+        margin_top => 36,
+        margin_bottom => 36,
+        margin_left => 36,
+        margin_right => 36,
+
+        verbose => 0,
+};
+
+my $me = $0;
+$me =~ s/^.*\///;
+
+set_default_media();
+
+sub usage
+{
+        print <<"EOF";
+$me (version $VERSION): Convert Remind -pp output to a PDF calendar.
+
+Usage: remind -pp [options] filename | $me [options] > out.pdf
+
+Options:
+
+--landscape, -l         Print in landscape orientation
+--small-calendars=N     Choose location for small calendars
+-cN                     Synonym for --small-calendars=N
+--left-numbers, -x      Print day numbers on the left
+--fill-page, -e         Fill the entire page
+--media=MEDIA, -mMEDIA  Size for specified media
+--width=W, -wW          Specify media width in 1/72nds of an inch
+--height=H, -hH         Specify media height in 1/72nds of an inch
+--title-font=FONT       Specify font for calendar title
+--header-font=FONT      Specify font for weekday names
+--daynum-font=FONT      Specify font for day numbers
+--entry-font=FONT       Specify font for calendar entries
+--small-cal-font=FONT   Specify font for small calendars
+--title-size=S          Specify size of font for calendar title in points
+--header-size=S         Specify size of font for weekday names
+--daynum-size=S         Specify size of font for day numbers
+--entry-size=S          Specify size of font for calendar entries
+--border-size=S         Specify size of gaps between items in 1/72nds of an inch
+--line-thickness=S      Specify line thickness in 1/72nds of an inch
+--margin-top=S          Specify top margin size in 1/72nds of an inch
+--margin-bottom=S       Specify bottom margin size in 1/72nds of an inch
+--margin-left=S         Specify left margin size in 1/72nds of an inch
+--margin-right=S        Specify right margin size in 1/72nds of an inch
+--verbose, -v           Print progress messages
+--help                  Display this help
+EOF
+}
+
+Getopt::Long::Configure('bundling_values');
+
+my $ret = GetOptions('landscape|l' =>        \$settings->{landscape},
+                     'small-calendars|c=i' =>  \$settings->{small_calendars},
+                     'left-numbers|x' =>     \$settings->{numbers_on_left},
+                     'fill-page|e' =>        \$settings->{fill_entire_page},
+                     'media|m=s' =>          \$settings->{media},
+                     'width|w=i' =>          \$settings->{width},
+                     'height|h=i' =>         \$settings->{height},
+                     'title-font=s' =>       \$settings->{title_font},
+                     'header-font=s' =>      \$settings->{header_font},
+                     'daynum-font=s' =>      \$settings->{daynum_font},
+                     'entry-font=s' =>       \$settings->{entry_font},
+                     'small-cal-font=s' =>   \$settings->{small_cal_font},
+                     'title-size=f' =>       \$settings->{title_size},
+                     'header-size=f' =>      \$settings->{header_size},
+                     'daynum-size=f' =>      \$settings->{daynum_size},
+                     'entry-size=f' =>       \$settings->{entry_size},
+                     'border-size=f' =>      \$settings->{border_size},
+                     'line-thickness=f' =>   \$settings->{line_thickness},
+                     'margin-top=f' =>       \$settings->{margin_top},
+                     'margin-bottom=f' =>    \$settings->{margin_bottom},
+                     'margin-left=f' =>      \$settings->{margin_left},
+                     'margin-right=f' =>     \$settings->{margin_right},
+                     'verbose|v' =>          \$settings->{verbose},
+                     'help' =>               \$help
+    );
+if (!$ret) {
+        usage();
+        exit(1);
+}
+
+if ($help) {
+        usage();
+        exit(0);
+}
+
+if ($settings->{width} <= 0 ||
+    $settings->{height} <= 0) {
+        my $size = $media_to_size->{ucfirst($settings->{media})};
+        if (!$size) {
+                if (lc($settings->{media}) ne 'help') {
+                        print STDERR "Unknown media " . $settings->{media} . "\n";
+                }
+                set_default_media();
+                printf("%-12s   Size in 1/72 in\n", "Valid media:");
+                foreach my $m (sort { $a cmp $b } (keys(%$media_to_size))) {
+                        if ($m eq $settings->{media}) {
+                                print "* ";
+                        } else {
+                                print "  ";
+                        }
+                        printf("%-12s   %4d x %4d\n", $m,
+                               $media_to_size->{$m}->[0],
+                               $media_to_size->{$m}->[1]);
+                }
+                exit(1);
+        }
+        $settings->{width} = $size->[0];
+        $settings->{height} = $size->[1];
+}
+
+if ($settings->{landscape}) {
+        my $tmp = $settings->{width};
+        $settings->{width} = $settings->{height};
+        $settings->{height} = $tmp;
+}
+
+# Don't read from a terminal
+if (-t STDIN) {
+        print STDERR "I can't read data from a terminal.  Please run like this:\n";
+        print STDERR "  remind -pp [options] filename | $me [options] > out.pdf\n";
+        exit(1);
+}
+
+my $done_one = 0;
+
+my $errored_out = 0;
+
+my $surface = Cairo::PdfSurface->create_for_stream(sub { print $_[1] unless $errored_out; }, undef,
+                                                   $settings->{width}, $settings->{height});
+
+# set_metadata not available in older versions of Cairo
+eval { $surface->set_metadata('title', 'Calendar'); };
+eval { $surface->set_metadata('author', 'Remind (https://dianne.skoll.ca/projects/remind/)'); };
+eval { $surface->set_metadata('creator', 'rem2pdf (https://dianne.skoll.ca/projects/remind/)'); };
+eval { $surface->set_metadata('subject', 'Calendar'); };
+
+my $cr = Cairo::Context->create($surface);
+$cr->set_line_width($settings->{line_thickness});
+
+while(1) {
+        my ($obj, $err) = Remind::PDF->create_from_stream(*STDIN,
+                                                          {color => 1,
+                                                           shade => 1,
+                                                           moon => 1,
+                                                           pango => 1,
+                                                           week => 1,});
+
+        if (!$obj) {
+                if (!$done_one) {
+                        $errored_out = 1;
+                        print STDERR "$me: $err\n";
+                        exit(1);
+                }
+                last;
+        }
+        $done_one = 1;
+        $obj->render($cr, $settings);
+}
+
+$surface->finish();
+
+sub set_default_media
+{
+        my $paper;
+        $paper = $ENV{PAPERSIZE};
+        if ($paper && set_media(ucfirst($paper))) {
+                return 1;
+        }
+        if ($ENV{PAPERCONF}) {
+                if (set_media_from_file($ENV{PAPERCONF})) {
+                        return 1;
+                }
+        }
+        if (set_media_from_file('/etc/papersize')) {
+                return 1;
+        }
+        return set_media('Letter');
+}
+
+sub set_media
+{
+        my ($m) = @_;
+
+        return 0 unless $media_to_size->{$m};
+        $settings->{media} = $m;
+        return 1;
+}
+
+sub set_media_from_file
+{
+        my ($fn) = @_;
+        if (!open(IN, '<', $fn)) {
+                return 0;
+        }
+        while(<IN>) {
+                chomp;
+                s/^\s+//;
+                s/\s+$//;
+                next if ($_ eq '');
+                next if ($_ =~ /^#/);
+                my $m = $_;
+                close(IN);
+                return set_media($m);
+        }
+        close(IN);
+        return 0;
+}
+
+__END__
+
+=head1 NAME
+
+rem2pdf - draw a PDF calendar from Remind output
+
+=head1 SYNOPSIS
+
+    remind -pp [options] file | rem2pdf [options] > output.pdf
+
+=head1 DESCRIPTION
+
+B<rem2pdf> reads the standard input, which should be the results of
+running B<remind> with the B<-p>, B<-pp> or B<-ppp> options.  It emits
+PDF code that draws a calendar to standard output.
+
+B<rem2pdf> uses the Pango text formatting library (L<https://pango.gnome.org/>)
+and the Cairo graphics library (L<https://www.cairographics.org/>) to produce
+its output.  The CPAN modules Pango (L<https://metacpan.org/pod/Pango>)
+and Cairo (L<https://metacpan.org/pod/Cairo>) are prerequisites.
+
+B<rem2pdf> assumes that its input stream is valid UTF-8.  If this is not
+the case, it may render output incorrectly or even fail to render
+output at all.
+
+=head1 OPTIONS
+
+=over
+
+=item --landscape, -l
+
+Print the calendar in landscape orientation.  Essentially, this swaps
+the width and height of the output media.
+
+=item --small-calendars=I<n>, -cI<n>
+
+Control the inclusion of small calendars for the previous and next
+month.  Possible values for I<n> are:
+
+=over
+
+=item Z<>0
+
+Do not draw any small calendares
+
+=item Z<>1
+
+Place the small calendars at the bottom-right if there is room;
+otherwise, place them at the top-left.
+
+=item Z<>2
+
+Place the small calendars at the top-left if there is room; otherwise,
+place them at the bottom-right.
+
+=item Z<>3
+
+Place the previous month's small calendar at the top-left and the next
+month's at the bottom-right if there is room; otherwise, follow
+I<n>=1.  A moment's thought reveals that an option which splits the
+calendars if there is room and otherwise follows I<n>=2 yields the
+same results.
+
+=back
+
+=item --left-numbers, -x
+
+Draw the day numbers in the top-left corner of each day's box rather than
+the default top-right.
+
+=item --fill-page, -e
+
+Make the calendar fill the available space on the page.
+
+=item --media=I<media>, -mI<media>
+
+Specify the paper size (Letter, A4, etc.)  For a list of valid media sizes,
+run:
+
+    rem2pdf --media=help
+
+The default media size will be marked with an asterisk.
+
+=item --width=I<n>, -wI<n>, --height=I<m>, -hI<m>
+
+Rather than specifying a named media size, directly specify the width
+and height of the output in 1/72ths of an inch.  You must specify both
+width and height for the options to be respected.
+
+=item --title-font=I<font>
+
+Specify the font used for the calendar title.  It can be any font that
+the Pango library on your system can use.  The default is Sans.  If
+you choose a font with spaces in its name, you may need to quote this
+argument.
+
+=item --header-font=I<font>
+
+Specify the font used for the weekday names.  The default is Sans.
+
+=item --daynum-font=I<font>
+
+Specify the font used for the day numbers.  The default is
+Sans Bold Oblique.
+
+=item --entry-font=I<font>
+
+Specify the font used for calendar entries.  The default is Sans.
+
+=item --small-cal-font=I<font>
+
+Specify the font used for the small next- and previous-month
+calendars.  The default is Sans.
+
+=item --title-size=I<n>
+
+Specify the size of the title font in 1/72ths of an inch.  The default
+is 14.  This size, and indeed all following sizes, may be specified as
+floating-point numbers.
+
+=item --header-size=I<n>
+
+Specify the size of the header font in 1/72ths of an inch.  The default is 14.
+
+=item --daynum-size=I<n>
+
+Specify the size of the day number font in 1/72ths of an inch.  The
+default is 14.
+
+=item --entry-size=I<n>
+
+Specify the size of the calendar entry font in 1/72ths of an inch.
+The default is 8.
+
+=item --border-size=I<n>
+
+Specify the size of the blank border between the contents of a calendar
+box and the centre of the lines surrounding it, in 1/72ths of an inch.
+The default is 4.
+
+=item --line-thickness=I<n>
+
+Specify the thickness of the lines drawn on the calendar.  The default is 1.
+
+=item --margin-top=I<n>
+
+The size of the margin at the top of the page in 1/72ths of an inch.
+The default is 36.
+
+=item --margin-bottom=I<n>
+
+The size of the margin at the bottom of the page in 1/72ths of an inch.
+The default is 36.
+
+=item --margin-left=I<n>
+
+The size of the margin at the left of the page in 1/72ths of an inch.
+The default is 36.
+
+=item --margin-right=I<n>
+
+The size of the margin at the right of the page in 1/72ths of an inch.
+The default is 36.
+
+=item --verbose, -v
+
+Print (on STDERR) the name of the month and year for each month that
+is rendered.
+
+=back
+
+=head1 USAGE
+
+To use B<rem2df>, pipe the output of B<remind> with one of the
+B<-p>, B<-pp> or B<-ppp> options into B<rem2pdf>.  The PDF output
+will be sent to standard output.  So for example, to print a 12-month
+calendar for the year 2030, use:
+
+  remind -pp12 /dev/null Jan 2030 | rem2pdf -e -l -c=3 | lpr
+
+You can concatenate multiple B<remind> runs.  For example, the following
+will produce a PDF calendar for January through March of 2023, and
+June of 2023 (for a total of four pages);
+
+  (remind -pp3 Jan 2023 /dev/null ; \
+   remind -p June 2023 /dev/null) | rem2pdf -e -l -c=3 > cal.pdf
+
+=head1 FORMATTED TEXT
+
+B<rem2pdf> supports a B<SPECIAL> reminder type called B<PANGO>.  This
+lets you format text using the Pango markup language, described at
+L<https://docs.gtk.org/Pango/pango_markup.html>.  Here are some
+examples:
+
+  REM Mon SPECIAL PANGO <b>Bold</b> and <i>italic</i>
+  REM Tue SPECIAL PANGO <span face="zapf chancery">Fancy</span>
+  REM Wed SPECIAL PANGO <span foreground="red"><b>Bold red</b></span>
+
+Other back-ends such as B<rem2ps> and B<rem2html> will ignore PANGO
+special reminders.
+
+Neither B<remind> nor B<rem2pdf> will check the markup to ensure
+it is syntactically correct.  If you use invalid Pango markup, the
+Pango library will print a warning and B<rem2pdf> will not render any
+output for the invalid reminder.
+
+=head1 ABSOLUTELY-POSITIONED TEXT
+
+If your B<PANGO> special reminder starts with C<@I<x>,I<y>> where I<x>
+and I<y> are floating-point numbers, then the Pango marked-up test is
+positioned absolutely with respect to the day's box (and is not
+counted when calculating the box's height.)
+
+A positive I<x> value positions the left edge of the text I<x> points
+to the right of the left side of the calender box, while a negative
+I<x> value positions the right edge of the text I<x> points to the left
+of the right side of the calender box.
+
+A positive I<y> value positions the top edge of the text I<y> points
+below the top of the calender box, while a negative I<y> value
+positions the bottom edge of the text I<y> points above the bottom of
+the calender box.
+
+If you use absolutely-positioned text, it's up to you to make sure it
+doesn't overlap other text; B<rem2pdf> takes no special precautions to
+prevent this.
+
+As an example, this places Sunrise and Sunset times at the bottom left
+of each calendar box:
+
+  REM SPECIAL PANGO @1,-1 <span size="4800"><i>Rise [sunrise($U)] Set [sunset($U)]</i></span>
+
+(Note that Pango expresses font sizes in 1024's of a point, so a size of
+4800 works out to about 4.6 points.)
+
+=head1 AUTHOR
+
+B<Rem2PDF> was written by Dianne Skoll <dianne@skoll.ca>
+
+=head1 SEE ALSO
+
+B<remind>, B<rem2ps>, B<rem2html>, B<tkremind>
+

rem2pdf/lib/Remind/PDF.pm

@@ -0,0 +1,942 @@
+package Remind::PDF;
+use strict;
+use warnings;
+
+use Cairo;
+use Pango;
+
+use Remind::PDF::Entry;
+use Encode;
+
+use JSON::MaybeXS;
+
+=head1 NAME
+
+Remind::PDF - Render a month's worth of Remind data to PDF
+
+=head1 CLASS METHODS
+
+=head2 Remind::PDF->create_from_stream($in, $specials_accepted)
+
+This method reads data from an open file handle C<$in>.  C<$specials_accepted>
+is a hashref of SPECIAL reminder types to accept; the key is the name of the
+SPECIAL (all lower-case) and the value should be 1.  Any SPECIAL reminders
+not in the hash are ignored.
+
+This function returns a two-element array: C<($obj, $err)>.  On success,
+C<$obj> will be a C<Remind::PDF> object and C<$err> will be undef.  On
+failure, C<$obj> will be undef and C<$err> will be an error message.
+
+=cut
+sub create_from_stream
+{
+        my ($class, $in, $specials_accepted) = @_;
+        while (<$in>) {
+                chomp;
+                if ($_ eq '# rem2ps begin'  ||
+                    $_ eq '# rem2ps2 begin') {
+                        my $self = bless {}, $class;
+                        return $self->read_one_month($in, $_, $specials_accepted);
+                } elsif ($_ eq '[') {
+                        return Remind::PDF::Multi->create_from_stream($in, $specials_accepted);
+                }
+        }
+        return (undef, "Could not find any remind -p output anywhere");
+}
+
+=head2 Remind::PDF->create_from_hash($hash, $specials_accepted)
+
+This method takes data from a hash C<$hash>, which must be one month's
+worth of data from C<remind -ppp> output.  C<$specials_accepted> is a
+hashref of SPECIAL reminder types to accept; the key is the name of
+the SPECIAL (all lower-case) and the value should be 1.  Any SPECIAL
+reminders not in the hash are ignored.
+
+This function returns a two-element array: C<($obj, $err)>.  On success,
+C<$obj> will be a C<Remind::PDF> object and C<$err> will be undef.  On
+failure, C<$obj> will be undef and C<$err> will be an error message.
+
+=cut
+sub create_from_hash
+{
+        my ($class, $hash, $specials_accepted) = @_;
+
+        bless $hash, $class;
+
+        my $filtered_entries = [];
+        for (my $i=0; $i<=31; $i++) {
+                $filtered_entries->[$i] = [];
+        }
+
+        foreach my $e (@{$hash->{entries}}) {
+                if ($hash->accept_special($e, $specials_accepted)) {
+                        my $day = $e->{date};
+                        $day =~ s/^\d\d\d\d-\d\d-//;
+                        $day =~ s/^0//;
+                        push(@{$filtered_entries->[$day]}, Remind::PDF::Entry->new_from_hash($e));
+                }
+        }
+        $hash->{entries} = $filtered_entries;
+        return $hash;
+}
+
+=head1 INSTANCE METHODS
+
+=head2 read_one_month($in, $first_line, $specials_accepted)
+
+This function reads one month's worth of data from the file handle
+C<$in>.  C<$first_line> is the line that was read from C<$in>
+just before calling this function.  C<$specials_accepted> is a
+hashref as documented above.
+
+The return value is the same C<($obj, $err)> two-element array
+as C<create_from_stream> returns.
+
+=cut
+sub read_one_month
+{
+        my ($self, $in, $first_line, $specials_accepted) = @_;
+        $self->{entries} = [];
+        $self->{daynames} = [];
+        $self->{monthname} = '';
+        $self->{year} = '';
+        $self->{daysinmonth} = 0;
+        $self->{firstwkday} = 0;
+        $self->{mondayfirst} = 0;
+        $self->{prevmonthname} = '';
+        $self->{nextmonthname} = '';
+        $self->{daysinprevmonth} = 0;
+        $self->{daysinnextmonth} = 0;
+        $self->{prevmonthyear} = 0;
+        $self->{nextmonthyear} = 0;
+
+        for (my $i=0; $i<=31; $i++) {
+                $self->{entries}->[$i] = [];
+        }
+
+        my $line = $in->getline();
+        chomp($line);
+
+        # Month Year Days FirstWkday MondayFirst
+        if ($line =~ /^(\S+) (\d+) (\d+) (\d+) (\d+)/) {
+                $self->{monthname} = $1;
+                $self->{year} = $2;
+                $self->{daysinmonth} = $3;
+                $self->{firstwkday} = $4;
+                $self->{mondayfirst} = $5;
+        } else {
+                return (undef, "Cannot interpret line: $line");
+        }
+
+        $self->{monthname} =~ s/_/ /g;
+        # Day names
+        $line = $in->getline();
+        chomp($line);
+        if ($line =~ /^\S+ \S+ \S+ \S+ \S+ \S+ \S+$/) {
+                @{$self->{daynames}} = map { s/_/ /g; $_; } (split(/ /, $line));
+        } else {
+                return (undef, "Cannot interpret line: $line");
+        }
+
+        # Prev month, num days
+        $line = $in->getline();
+        chomp($line);
+        if ($line =~ /^\S+ \d+$/) {
+                ($self->{prevmonthname}, $self->{daysinprevmonth}) = split(/ /, $line);
+        } else {
+                return (undef, "Cannot interpret line: $line");
+        }
+        # Next month, num days
+        $line = $in->getline();
+        chomp($line);
+        if ($line =~ /^\S+ \d+$/) {
+                ($self->{nextmonthname}, $self->{daysinnextmonth}) = split(/ /, $line);
+        } else {
+                return (undef, "Cannot interpret line: $line");
+        }
+
+        $self->{prevmonthname} =~ s/_/ /g;
+        $self->{nextmonthname} =~ s/_/ /g;
+
+        if ($first_line eq '# rem2ps2 begin') {
+                # remind -pp format
+                return $self->read_one_month_pp($in, $specials_accepted);
+        }
+
+        # Old-style "remind -p"
+        # TODO: Eventually support this?
+        return $self->read_one_month_p($in, $specials_accepted);
+}
+
+=head2 read_one_month_p($in, $specials_accepted)
+
+This function reads one month's worth of data from the file handle
+C<$in>, assuming the original "remind -p" format.
+C<$specials_accepted> is a hashref as documented above.
+
+The return value is the same C<($obj, $err)> two-element array
+as C<create_from_stream> returns.
+
+=cut
+sub read_one_month_p
+{
+        my ($self, $in, $specials_accepted) = @_;
+        my $line;
+        while ($line = $in->getline()) {
+                chomp($line);
+                if ($line eq '# rem2ps end') {
+                        return ($self, undef);
+                }
+                # Ignore comments
+                next if $line =~ /^#/;
+                my $hash = $self->parse_oldstyle_line($line);
+                next unless $hash;
+
+                my $day = $hash->{date};
+                $day =~ s/^\d\d\d\d-\d\d-//;
+                $day =~ s/^0//;
+                if ($self->accept_special($hash, $specials_accepted)) {
+                        push(@{$self->{entries}->[$day]}, Remind::PDF::Entry->new_from_hash($hash));
+                }
+        }
+        return (undef, "Missing # rem2ps end marker");
+}
+
+=head2 parse_oldstyle_line ($line)
+
+This method parses an old-style "remind -p" line
+and returns a hashref containing some or all of the
+hash keys found in the newer "remind -pp" JSON output.
+
+=cut
+sub parse_oldstyle_line
+{
+        my ($self, $line) = @_;
+        return undef unless $line =~ m|^(\d+)/(\d+)/(\d+) (\S+) (\S+) (\S+) (\S+) (.*)$|;
+
+        my $hash = {
+                date => "$1-$2-$3",
+                passthru => $4,
+                tags => $5,
+                duration => $6,
+                time => $7,
+                body => $8};
+        foreach my $key (qw(passthru tags time duration)) {
+                delete $hash->{$key} if $hash->{$key} eq '*';
+        }
+
+        if ($hash->{passthru}) {
+                if ($hash->{passthru} =~ /^(shade|color|colour)$/i) {
+                        if ($hash->{body} =~ /^\s*(\d+)\s+(\d+)\s+(\d+)/) {
+                                $hash->{r} = $1;
+                                $hash->{g} = $2;
+                                $hash->{b} = $3;
+                        } elsif ($hash->{body} =~ /^\s*(\d+)/) {
+                                $hash->{r} = $1;
+                                $hash->{g} = $1;
+                                $hash->{b} = $1;
+                        }
+                }
+        }
+        return $hash;
+}
+
+=head2 read_one_month_pp($in, $specials_accepted)
+
+This function reads one month's worth of data from the file handle
+C<$in>, assuming the "remind -pp" partial-JSON format.
+C<$specials_accepted> is a hashref as documented above.
+
+The return value is the same C<($obj, $err)> two-element array
+as C<create_from_stream> returns.
+
+=cut
+sub read_one_month_pp
+{
+        my ($self, $in, $specials_accepted) = @_;
+
+        my $json = JSON::MaybeXS->new(utf8 => 0);
+        my $line;
+        while ($line = $in->getline()) {
+                chomp($line);
+                if ($line eq '# rem2ps2 end') {
+                        return ($self, undef);
+                }
+                my $hash;
+                eval {
+                        $hash = $json->decode($line);
+                };
+                if (!$hash) {
+                        return (undef, "Unable to decode JSON: $@");
+                }
+
+                my $day = $hash->{date};
+                $day =~ s/^\d\d\d\d-\d\d-//;
+                $day =~ s/^0//;
+                if ($self->accept_special($hash, $specials_accepted)) {
+                        push(@{$self->{entries}->[$day]}, Remind::PDF::Entry->new_from_hash($hash));
+                }
+        }
+        return (undef, "Missing # rem2ps2 end marker");
+}
+
+=head2 accept_special($hash, $specials_accepted)
+
+Given a hashref C<$hash> consisting of one entry parsed
+from the "remind -p" stream and a C<$specials_accepted> hash,
+return 1 if we should include this entry in the calendar or
+0 if mot.
+
+=cut
+sub accept_special
+{
+        my ($self, $hash, $specials_accepted) = @_;
+        return 1 unless exists($hash->{passthru});
+        return 1 if $specials_accepted->{lc($hash->{passthru})};
+        return 0;
+}
+
+=head2 find_last_special($special, $entries)
+
+Given an array of Reminder entries, find the last
+C<$special>-type SPECIAL in the array.  Return
+the entry if one was found or undef if not.
+
+=cut
+sub find_last_special
+{
+        my ($self, $special, $entries) = @_;
+        my $class = "Remind::PDF::Entry::$special";
+        my $found = undef;
+        foreach my $e (@$entries) {
+                $found = $e if ($e->isa($class));
+        }
+        return $found;
+}
+
+=head2 render($cr, $settings)
+
+Render a calendar for one month.  C<$cr> is a Cairo
+drawing context, and C<$settings> is a settings hash
+passed in by the caller.  See the source code of
+C<rem2pdf> for the contents of C<$settings>
+
+=cut
+sub render
+{
+        my ($self, $cr, $settings) = @_;
+
+        $self->{horiz_lines} = [];
+        $cr->set_line_cap('square');
+        my $so_far = $self->draw_title($cr, $settings);
+
+        # Top line
+        push(@{$self->{horiz_lines}}, $so_far);
+
+        my $top_line = $so_far;
+
+        $so_far = $self->draw_daynames($cr, $settings, $so_far);
+
+        # Line under the days
+        push(@{$self->{horiz_lines}}, $so_far);
+
+        # Remaining space on page
+        $self->{remaining_space} = $settings->{height} - $settings->{margin_bottom} - $so_far;
+
+        $self->{minimum_row_height} = $self->{remaining_space} / 9;
+        # First column
+        my $first_col = $self->{firstwkday};
+        if ($self->{mondayfirst}) {
+                $first_col--;
+                if ($first_col < 0) {
+                        $first_col = 6;
+                }
+        }
+
+        # Last column
+        my $last_col = ($first_col + $self->{daysinmonth} - 1) % 7;
+
+        # Number of rows
+        my $rows = 1;
+        my $last_day_on_row = 7 - $first_col;
+        while ($last_day_on_row < $self->{daysinmonth}) {
+                $last_day_on_row += 7;
+                $rows++;
+        }
+
+        my $extra_row = 0;
+        # Add a row for small calendars if necessary
+        if (($settings->{small_calendars} != 0) && ($first_col == 0) && ($last_col == 6)) {
+                $rows++;
+                $extra_row++;
+        }
+
+        # Figure out where to draw the small calendars
+        my $prevcal_top = 0;
+        my $nextcal_top = 0;
+        my $prevcal_bottom = 0;
+        my $nextcal_bottom = 0;
+
+        if ($settings->{small_calendars} == 1) {
+                if ($last_col <= 4 || ($last_col == 6 && $extra_row)) {
+                        $prevcal_bottom = 1;
+                        $nextcal_bottom = 1;
+                } else {
+                        $prevcal_top = 1;
+                        $nextcal_top = 1;
+                }
+        } elsif ($settings->{small_calendars} == 2) {
+                if ($first_col >= 2) {
+                        $prevcal_top = 1;
+                        $nextcal_top = 1;
+                } else {
+                        $prevcal_bottom = 1;
+                        $nextcal_bottom = 1;
+                }
+        } elsif ($settings->{small_calendars} == 3) {
+                if ($first_col >= 1 && $last_col <= 5) {
+                        $prevcal_top = 1;
+                        $nextcal_bottom = 1;
+                } else {
+                        if ($last_col <= 4 || ($last_col == 6 && $extra_row)) {
+                                $prevcal_bottom = 1;
+                                $nextcal_bottom = 1;
+                        } else {
+                                $prevcal_top = 1;
+                                $nextcal_top = 1;
+                        }
+                }
+        }
+
+        # Row height if we are filling the page
+        $self->{row_height} = $self->{remaining_space} / $rows;
+
+        my ($start_col, $start_day);
+        for (my $row = 0; $row < $rows; $row++) {
+                if ($row == 0) {
+                        $start_day = 1;
+                        $start_col = $first_col;
+                } else {
+                        $start_col = 0;
+                }
+                my $old_so_far = $so_far;
+                $so_far = $self->draw_row($cr, $settings, $so_far, $row, $start_day, $start_col);
+                $start_day += 7 - $start_col;
+                push(@{$self->{horiz_lines}}, $so_far);
+                if ($row == 0) {
+                        if ($prevcal_top) {
+                                my ($x1, $y1, $x2, $y2) = $self->col_box_coordinates($old_so_far, 0, $so_far - $old_so_far, $settings);
+                                $self->draw_small_calendar($cr, $x1 + $settings->{border_size}, $y1 + $settings->{border_size},
+                                                           $x2 - $x1 - 2*$settings->{border_size}, $y2 - $y1 - 2*$settings->{border_size},
+                                                           $settings, $self->{prevmonthname}, $self->{daysinprevmonth}, ($first_col + 35 - $self->{daysinprevmonth}) % 7);
+                        }
+                        if ($nextcal_top) {
+                                my ($x1, $y1, $x2, $y2) = $self->col_box_coordinates($old_so_far, 1, $so_far - $old_so_far, $settings);
+                                $self->draw_small_calendar($cr, $x1 + $settings->{border_size}, $y1 + $settings->{border_size},
+                                                           $x2 - $x1 - 2*$settings->{border_size}, $y2 - $y1 - 2*$settings->{border_size},
+                                                           $settings, $self->{nextmonthname}, $self->{daysinnextmonth}, ($last_col + 1) % 7);
+                        }
+                } elsif ($row == $rows-1) {
+                        if ($prevcal_bottom) {
+                                my ($x1, $y1, $x2, $y2) = $self->col_box_coordinates($old_so_far, 5, $so_far - $old_so_far, $settings);
+                                $self->draw_small_calendar($cr, $x1 + $settings->{border_size}, $y1 + $settings->{border_size},
+                                                           $x2 - $x1 - 2*$settings->{border_size}, $y2 - $y1 - 2*$settings->{border_size},
+                                                           $settings, $self->{prevmonthname}, $self->{daysinprevmonth}, ($first_col + 35 - $self->{daysinprevmonth}) % 7);
+                        }
+                        if ($nextcal_bottom) {
+                                my ($x1, $y1, $x2, $y2) = $self->col_box_coordinates($old_so_far, 6, $so_far - $old_so_far, $settings);
+                                $self->draw_small_calendar($cr, $x1 + $settings->{border_size}, $y1 + $settings->{border_size},
+                                                           $x2 - $x1 - 2*$settings->{border_size}, $y2 - $y1 - 2*$settings->{border_size},
+                                                           $settings, $self->{nextmonthname}, $self->{daysinnextmonth}, ($last_col + 1) % 7);
+                        }
+                }
+        }
+
+        if ($so_far > $settings->{height} - $settings->{margin_bottom}) {
+                print STDERR "WARNING: overfull calendar box\n";
+        }
+        # The vertical lines
+        my $cell = ($settings->{width} - $settings->{margin_left} - $settings->{margin_right}) / 7;
+        for (my $i=0; $i<=7; $i++) {
+                $cr->move_to($settings->{margin_left} + $i * $cell, $top_line);
+                $cr->line_to($settings->{margin_left} + $i * $cell, $so_far);
+                $cr->stroke();
+        }
+
+        # And the horizontal lines
+        foreach my $y (@{$self->{horiz_lines}}) {
+                $cr->move_to($settings->{margin_left}, $y);
+                $cr->line_to($settings->{width} - $settings->{margin_right}, $y);
+                $cr->stroke();
+        }
+
+        if ($settings->{verbose}) {
+                print STDERR "remdp2f: Rendered " . $self->{monthname} . ' ' . $self->{year} . "\n";
+        }
+        # Done this page
+        $cr->show_page();
+}
+
+=head2 draw_row($cr, $settings, $so_far, $row, $start_day, $start_col)
+
+Draw a single row in the calendar.  C<$cr> is a Cairo drawing context
+and C<$settings> is the settings hash passed to C<render>.  C<$so_far>
+is the Y-coordinate of the top of the row; drawing starts at this
+coordinate.  C<$start_day> is the day of the month at which the
+row starts and C<$start> col is the column number (0-6) at which
+to start drawing from C<$start_day>
+
+Returns the Y coordinate at which to start drawing the I<next>
+calendar row.
+
+=cut
+sub draw_row
+{
+        my ($self, $cr, $settings, $so_far, $row, $start_day, $start_col) = @_;
+
+        my $col = $start_col;
+        my $day = $start_day;
+        my $height = 0;
+
+        # Preview them to figure out the row height...
+        if (!$settings->{fill_entire_page}) {
+                while ($col < 7) {
+                        my $h = $self->draw_day($cr, $settings, $so_far, $day, $col, 0);
+                        $height = $h if ($h > $height);
+                        $day++;
+                        $col++;
+                        last if ($day > $self->{daysinmonth});
+                }
+                $col = $start_col;
+                $day = $start_day;
+        } else {
+                $height = $self->{row_height} - $settings->{border_size} * 2;
+        }
+
+        if (!$settings->{fill_entire_page} && $height < $self->{minimum_row_height}) {
+                $height = $self->{minimum_row_height};
+        }
+        # Now draw for real
+        while ($col < 7 && $day <= $self->{daysinmonth}) {
+                $self->draw_day($cr, $settings, $so_far, $day, $col, $height);
+                $day++;
+                $col++;
+        }
+
+        return $so_far + $height + $settings->{border_size};
+}
+
+=head2 col_box_coordinates($so_far, $col, $height, $settings)
+
+Returns a four-element array C<($x1, $y1, $x2, $y2)> representing
+the bounding box of the calendar box at column C<$col> (0-6).  C<$height>
+is the height of the box and C<$settings> is the settings hashref
+passed to C<render>.
+
+=cut
+sub col_box_coordinates
+{
+        my ($self, $so_far, $col, $height, $settings) = @_;
+        my $cell = ($settings->{width} - $settings->{margin_left} - $settings->{margin_right}) / 7;
+
+        return (
+                $settings->{margin_left} + $cell * $col,
+                $so_far,
+                $settings->{margin_left} + $cell * ($col + 1),
+                $so_far + $height + $settings->{border_size},
+            );
+}
+
+=head2 draw_day($cr, $settings, $so_far, $day, $col, $height)
+
+Renders a single day's worth of reminders.  C<$cr> is a Cairo
+drawing context and C<$settings> is the settings hash passed
+to C<render>.  C<$so_far> is the Y-coordinate of the top
+of the box and C<$col> is the column number.
+
+C<$height> is the height of the box.  If C<$height> is passed
+in as zero, then do not actually render anything... instead,
+compute how high the box should be.  If C<$height> is non-zero,
+then it is the height of the box.
+
+Returns the height required for the calendar box.
+
+=cut
+sub draw_day
+{
+        my ($self, $cr, $settings, $so_far, $day, $col, $height) = @_;
+
+        my $top = $so_far;
+
+        my ($x1, $y1, $x2, $y2) = $self->col_box_coordinates($so_far, $col, $height, $settings);
+
+        # Do shading if we're in "for real" mode
+        if ($height) {
+                my $shade = $self->find_last_special('shade', $self->{entries}->[$day]);
+                if ($shade) {
+                        $cr->save;
+                        $cr->set_source_rgb($shade->{r} / 255,
+                                            $shade->{g} / 255,
+                                            $shade->{b} / 255);
+                        $cr->rectangle($x1, $y1, $x2 - $x1, $y2 - $y1);
+                        $cr->fill();
+                        $cr->restore;
+                }
+        }
+        # Draw the day number
+        my $layout = Pango::Cairo::create_layout($cr);
+        $layout->set_text($day);
+        my $desc = Pango::FontDescription->from_string($settings->{daynum_font} . ' ' . $settings->{daynum_size} . 'px');
+
+        $layout->set_font_description($desc);
+        my ($wid, $h) = $layout->get_pixel_size();
+
+
+        # Don't actually draw if we're just previewing to get the cell height
+        if ($height) {
+                $cr->save;
+                if ($settings->{numbers_on_left}) {
+                        $cr->move_to($x1 + $settings->{border_size}, $so_far + $settings->{border_size});
+                } else {
+                        $cr->move_to($x2 - $settings->{border_size} - $wid, $so_far + $settings->{border_size});
+                }
+                Pango::Cairo::show_layout($cr, $layout);
+                $cr->restore();
+        }
+
+        $so_far += $h + 2 * $settings->{border_size};
+        my $entry_height = 0;
+        my $done = 0;
+        foreach my $entry (@{$self->{entries}->[$day]}) {
+                # Moon and week should not adjust height
+                if ($entry->isa('Remind::PDF::Entry::moon') ||
+                    $entry->isa('Remind::PDF::Entry::week')) {
+                        $entry->render($self, $cr, $settings, $top, $day, $col, $height);
+                        next;
+                }
+
+                # An absolutely-positioned Pango markup should not adjust height
+                # either
+                if ($entry->isa('Remind::PDF::Entry::pango') &&
+                    defined($entry->{atx}) && defined($entry->{aty})) {
+                        $entry->render($self, $cr, $settings, $top, $day, $col, $height);
+                        next;
+                }
+
+                # Shade is done already
+                if ($entry->isa('Remind::PDF::Entry::shade')) {
+                        next;
+                }
+                if ($done) {
+                        $so_far += $settings->{border_size};
+                        $entry_height += $settings->{border_size};
+                }
+                $done = 1;
+                my $h2 = $entry->render($self, $cr, $settings, $so_far, $day, $col, $height);
+                $entry_height += $h2;
+                $so_far += $h2;
+        }
+        if ($height) {
+                if ($entry_height > $height) {
+                        print STDERR "WARNING: overfull box at $day " . $self->{monthname} . ' ' . $self->{year} . "\n";
+                        $entry_height = $height;
+                }
+        }
+        return $h + $entry_height + 2 * $settings->{border_size};
+}
+
+=head2 draw_daynames($cr, $settings, $so_far)
+
+Draw the weekday names heading.  C<$cr> is a Cairo drawing context
+and C<$settings> is the settings hash passed to C<render>.  C<$so_far>
+is the Y-coordinate of the top of the row; drawing starts at this
+coordinate.
+
+Returns the Y coordinate at which to start drawing the first
+calendar row.
+
+=cut
+sub draw_daynames
+{
+        my ($self, $cr, $settings, $so_far) = @_;
+
+        my $w = $settings->{width} - $settings->{margin_left} - $settings->{margin_right};
+        my $cell = $w/7;
+
+        $so_far += $settings->{border_size};
+        my $height = 0;
+        for (my $i=0; $i<7; $i++) {
+                my $j;
+                if ($self->{mondayfirst}) {
+                        $j = ($i + 1) % 7;
+                } else {
+                        $j = $i;
+                }
+                my $layout = Pango::Cairo::create_layout($cr);
+                $layout->set_text(Encode::decode('UTF-8', $self->{daynames}->[$j]));
+                my $desc = Pango::FontDescription->from_string($settings->{header_font} . ' ' . $settings->{header_size} . 'px');
+
+                $layout->set_font_description($desc);
+
+                my ($wid, $h) = $layout->get_pixel_size();
+                $cr->save;
+                $cr->move_to($settings->{margin_left} + $i * $cell + $cell/2 - $wid/2, $so_far);
+                Pango::Cairo::show_layout($cr, $layout);
+                $cr->restore();
+                if ($h > $height) {
+                        $height = $h;
+                }
+        }
+        return $so_far + $height + $settings->{border_size} * .75;
+}
+
+=head2 draw_title($cr, $settings)
+
+Draw the title ("Monthname Year") at the top of the calendar.
+C<$cr> is a Cairo drawing context
+and C<$settings> is the settings hash passed to C<render>.
+
+Returns the Y coordinate at which to start drawing the row
+containing the weekday names.
+
+=cut
+sub draw_title
+{
+        my ($self, $cr, $settings) = @_;
+        my $title = $self->{monthname} . ' ' . $self->{year};
+
+        # set_page_label not available in older versions of Cairo
+        eval { $cr->get_target()->set_page_label($title); };
+        my $layout = Pango::Cairo::create_layout($cr);
+        $layout->set_text(Encode::decode('UTF-8', $title));
+        my $desc = Pango::FontDescription->from_string($settings->{title_font} . ' ' . $settings->{title_size} . 'px');
+
+        $layout->set_font_description($desc);
+
+        my ($w, $h) = $layout->get_pixel_size();
+        $cr->save();
+        $cr->move_to($settings->{width}/2 - $w/2, $settings->{margin_top});
+        Pango::Cairo::show_layout($cr, $layout);
+        $cr->restore();
+        return $h + $settings->{margin_top} + $settings->{border_size};
+}
+
+=head2 draw_small_calendar($cr, $x, $y, $width, $height, $settings, $month, $days, $start_wkday)
+
+Draw a small calendar on the Cairo context C<$cr>.  The top left-hand
+corner of the box is at C<($x, $y)> and the size of the box is
+C<($width, $height>).  $settings is the settings hashref passed to
+C<render>.  C<$month> is the name of the month to draw and C<$days> is
+the number of days in the month.  Finally, C<$start_wkday> is the
+weekday (0=Sunday, 6=Saturday) on which the month starts
+
+=cut
+sub draw_small_calendar
+{
+        my ($self, $cr, $x, $y, $width, $height, $settings, $month, $days, $start_wkday) = @_;
+
+        my $first_col = $start_wkday;
+        if ($self->{mondayfirst}) {
+                $first_col--;
+                if ($first_col < 0) {
+                        $first_col = 6;
+                }
+        }
+
+        # Last column
+        my $last_col = ($first_col + $days - 1) % 7;
+
+        # Number of rows
+        my $rows = 1;
+        my $last_day_on_row = 7 - $first_col;
+        while ($last_day_on_row < $days) {
+                $last_day_on_row += 7;
+                $rows++;
+        }
+        my $layout = Pango::Cairo::create_layout($cr);
+        my $desc = Pango::FontDescription->from_string($settings->{small_cal_font} . ' ' . '10px');
+        $layout->set_font_description($desc);
+        $layout->set_text('88 88 88 88 88 88 88');
+        my ($wid, $h) = $layout->get_pixel_size();
+        $h += 1;
+        $h *= ($rows + 2); # row for month name; row for day names
+
+        my $scale = $width / $wid;
+        if (($height / $h) < $scale) {
+                $scale = $height / $h;
+        }
+        my $font_size = int($scale * 10);
+        $layout = Pango::Cairo::create_layout($cr);
+        $desc = Pango::FontDescription->from_string($settings->{small_cal_font} . ' ' . $font_size . 'px');
+        $layout->set_font_description($desc);
+        $layout->set_text('88 ');
+        ($wid, $h) = $layout->get_pixel_size();
+        $h += 1;
+
+        # Month name
+        $layout = Pango::Cairo::create_layout($cr);
+        $desc = Pango::FontDescription->from_string($settings->{small_cal_font} . ' ' . $font_size . 'px');
+        $layout->set_font_description($desc);
+        $layout->set_text(Encode::decode('UTF-8', $month));
+        my ($mw, $mh) = $layout->get_pixel_size();
+        $cr->save();
+        $cr->move_to($x + $width/2 - $mw/2, $y);
+        Pango::Cairo::show_layout($cr, $layout);
+        $cr->restore();
+
+        $y += $h;
+        # Day names
+        for (my $col=0; $col <7; $col++) {
+                my $j;
+                if ($self->{mondayfirst}) {
+                        $j = ($col + 1) % 7;
+                } else {
+                        $j = $col;
+                }
+                my $day = $self->{daynames}->[$j];
+                my $l = substr(Encode::decode('UTF-8', $day), 0, 1);
+                $layout = Pango::Cairo::create_layout($cr);
+                $desc = Pango::FontDescription->from_string($settings->{small_cal_font} . ' ' . $font_size . 'px');
+                $layout->set_font_description($desc);
+                $layout->set_text($l);
+                $cr->save();
+                $cr->move_to($x + $col*$wid, $y);
+                Pango::Cairo::show_layout($cr, $layout);
+                $cr->restore();
+        }
+        $y += $h;
+
+        my $col = $start_wkday;
+
+        for (my $d=1; $d <= $days; $d++) {
+                $desc = Pango::FontDescription->from_string($settings->{small_cal_font} . ' ' . $font_size . 'px');
+                $layout->set_font_description($desc);
+                $layout->set_text($d);
+                $cr->save();
+                $cr->move_to($x + $col*$wid, $y);
+                Pango::Cairo::show_layout($cr, $layout);
+                $cr->restore();
+                $col++;
+                if ($col > 6) {
+                        $col = 0;
+                        $y += $h;
+                }
+        }
+}
+
+package Remind::PDF::Multi;
+
+=head1 NAME
+
+Remind::PDF::Multi - A container for multiple months' worth of calendar data
+
+=head1 DESCRIPTION
+
+The C<remind -ppp> output consists of a JSON array with each element
+representing one month's worth of reminders.  C<Remind::PDF::Multi>
+reads this output and returns an instance of itself containing
+an array of C<Remind::PDF> objects, one object for each month.
+
+=head1 CLASS METHODS
+
+=head2 Remind::PDF::Multi->create_from_stream($in, $specials_accepted)
+
+This method reads data from an open file handle C<$in>.  C<$specials_accepted>
+is a hashref of SPECIAL reminder types to accept; the key is the name of the
+SPECIAL (all lower-case) and the value should be 1.  Any SPECIAL reminders
+not in the hash are ignored.
+
+This function returns a two-element array: C<($obj, $err)>.  On
+success, C<$obj> will be a C<Remind::PDF::Multi> object and C<$err>
+will be undef.  On failure, C<$obj> will be undef and C<$err> will be
+an error message.
+
+=cut
+
+
+sub create_from_stream
+{
+        my ($class, $in, $specials_accepted) = @_;
+        my $json = "[\n";
+        my $right_bracket = 0;
+        my $right_curly = 0;
+
+        while(<$in>) {
+                $json .= $_;
+                chomp;
+                if ($_ eq ']') {
+                        $right_bracket++;
+                        if ($right_bracket == 2 && $right_curly == 1) {
+                                return $class->create_from_json($json, $specials_accepted);
+                        }
+                } elsif($_ eq '}') {
+                        $right_curly++;
+                } else {
+                        $right_bracket = 0;
+                        $right_curly = 0;
+                }
+        }
+        return(undef, 'Unable to parse JSON stream');
+}
+
+=head2 Remind::PDF::Multi->create_from_stream($json, $specials_accepted)
+
+This method takes data from a JSON string <$json>.  C<$specials_accepted>
+is a hashref of SPECIAL reminder types to accept; the key is the name of the
+SPECIAL (all lower-case) and the value should be 1.  Any SPECIAL reminders
+not in the hash are ignored.
+
+This function returns a two-element array: C<($obj, $err)>.  On
+success, C<$obj> will be a C<Remind::PDF::Multi> object and C<$err>
+will be undef.  On failure, C<$obj> will be undef and C<$err> will be
+an error message.
+
+=cut
+
+sub create_from_json
+{
+        my ($class, $json, $specials_accepted) = @_;
+        my $parser = JSON::MaybeXS->new(utf8 => 0);
+
+        my $array;
+        eval {
+                $array = $parser->decode($json);
+        };
+        if (!$array) {
+                return (undef, "Unable to decode JSON: $@");
+        }
+        if (ref($array) ne 'ARRAY') {
+                return (undef, "Expecting array; found " . ref($array));
+        }
+
+        my $self = bless { months => []}, $class;
+        foreach my $m (@$array) {
+                my ($e, $error) = Remind::PDF->create_from_hash($m, $specials_accepted);
+                if (!$e) {
+                        return (undef, $error);
+                }
+                push(@{$self->{entries}}, $e);
+        }
+        return ($self, undef);
+}
+
+=head1 INSTANCE METHODS
+
+=head2 render($cr, $settings)
+
+Iterate through all the C<Remind::PDF> objects
+and call their C<render> methods.  This method
+renders as many months worth of calendar data
+as were read from the C<remind -ppp> stream
+
+=cut
+sub render
+{
+        my ($self, $cr, $settings) = @_;
+        foreach my $e (@{$self->{entries}}) {
+                $e->render($cr, $settings);
+        }
+}
+
+1;
+

rem2pdf/lib/Remind/PDF/Entry.pm

@@ -0,0 +1,311 @@
+package Remind::PDF::Entry;
+use strict;
+use warnings;
+
+use Cairo;
+use Pango;
+use Encode;
+
+=head1 NAME
+
+Remind::PDF::Entry - Representation of one calendar entry
+
+=head1 DESCRIPTION
+
+C<Remind::PDF::Entry> and its subclasses represent one calendar
+entry.  They can be normal reminder-type entries or SPECIAL reminders.
+
+=head1 CLASS METHODS
+
+=head2 Remind::PDF::Entry->new_from_hash($hash)
+
+Create and return a new C<Remind::PDF::Entry> based on one reminder's
+worth of data from C<remind -p>.  Returns a C<Remind::PDF::Entry> object,
+or in the case of SPECIAL reminders, a subclass of C<Remind::PDF::Entry>.
+
+=cut
+sub new_from_hash
+{
+        my ($class, $hash) = @_;
+        if (exists($hash->{passthru})) {
+                my $special = lc($hash->{passthru});
+                if ($special =~ /^(html|htmlclass|week|moon|shade|color|colour|postscript|psfile|pango)$/) {
+                        $special = 'color' if $special eq 'colour';
+                        $class = 'Remind::PDF::Entry::' . $special;
+                } else {
+                        $class = 'Remind::PDF::Entry::UNKNOWN';
+                }
+        }
+        bless $hash, $class;
+        $hash->_adjust();
+        return $hash;
+}
+
+# Base class: Set the color to black
+sub _adjust
+{
+        my ($self) = @_;
+        $self->{r} = 0;
+        $self->{g} = 0;
+        $self->{b} = 0;
+}
+
+=head1 INSTANCE METHODS
+
+=head2 render($pdf, $cr, $settings, $so_far, $day, $col, $height)
+
+Render a single entry.  C<$pdf> is the parent C<Remind::PDF>
+object.  C<$cr> is a Cairo drawing context and C<$settings> is the
+usual settings hash.  C<$so_far> is the Y-coordinate at which
+to start drawing.  C<$day> is the month day and C<$col> is
+the calendar column.  C<$height> is the height of the calendar
+box.
+
+If C<$height> is zero, then nothing should actually be drawn,
+but the height of the calendar entry should be computed.
+
+Returns the height of the calendar entry.
+
+=cut
+sub render
+{
+        my ($self, $pdf, $cr, $settings, $so_far, $day, $col, $height) = @_;
+
+        my ($x1, $y1, $x2, $y2) = $pdf->col_box_coordinates($so_far, $col, $height, $settings);
+        my $layout = Pango::Cairo::create_layout($cr);
+
+        $layout->set_width(1024 * ($x2 - $x1 - 2 * $settings->{border_size}));
+        $layout->set_wrap('word-char');
+        $layout->set_text(Encode::decode('UTF-8', $self->{body}));
+        my $desc = Pango::FontDescription->from_string($settings->{entry_font} . ' ' . $settings->{entry_size} . 'px');
+        $layout->set_font_description($desc);
+        my ($wid, $h) = $layout->get_pixel_size();
+
+        if ($height) {
+                $cr->save();
+                $cr->set_source_rgb($self->{r} / 255,
+                                    $self->{g} / 255,
+                                    $self->{b} / 255);
+                $cr->move_to($x1 + $settings->{border_size}, $so_far);
+                Pango::Cairo::show_layout($cr, $layout);
+                $cr->restore();
+        }
+        return $h;
+}
+
+package Remind::PDF::Entry::html;
+use base 'Remind::PDF::Entry';
+sub render {}
+
+package Remind::PDF::Entry::htmlclass;
+use base 'Remind::PDF::Entry';
+sub render {}
+
+package Remind::PDF::Entry::week;
+use base 'Remind::PDF::Entry';
+
+sub render
+{
+        my ($self, $pdf, $cr, $settings, $so_far, $day, $col, $height) = @_;
+        # Do nothing in pre-render mode
+        return 0 unless $height;
+
+        # Render in small text at bottom-right
+        my ($x1, $y1, $x2, $y2) = $pdf->col_box_coordinates($so_far, $col, $height, $settings);
+        my $layout = Pango::Cairo::create_layout($cr);
+
+        $layout->set_text(Encode::decode('UTF-8', $self->{body}));
+        my $desc = Pango::FontDescription->from_string($settings->{entry_font} . ' ' . int(0.75 * $settings->{entry_size}) . 'px');
+        $layout->set_font_description($desc);
+        my ($wid, $h) = $layout->get_pixel_size();
+
+        $cr->save();
+        $cr->move_to($x2 - $settings->{border_size}/4 - $wid, $y2 - $settings->{border_size}/4 - $h);
+        Pango::Cairo::show_layout($cr, $layout);
+        $cr->restore();
+
+        return 0;
+}
+
+package Remind::PDF::Entry::moon;
+use base 'Remind::PDF::Entry';
+
+sub _adjust {
+        my ($self) = @_;
+        my ($phase, $size, $fontsize, $msg) = split(/\s+/, $self->{body}, 4);
+        $phase = '' unless defined($phase);
+        $size = -1 unless defined($size);
+        $fontsize = -1 unless defined($fontsize);
+        $msg = '' unless defined($msg);
+        $self->{phase} = $phase;
+        $self->{size} = $size;
+        $self->{fontsize} = $fontsize;
+        $self->{body} = $msg;
+}
+sub render
+{
+        my ($self, $pdf, $cr, $settings, $so_far, $day, $col, $height) = @_;
+
+        # Do nothing in pre-render mode
+        return 0 unless $height;
+
+        my ($x1, $y1, $x2, $y2) = $pdf->col_box_coordinates($so_far, $col, $height, $settings);
+
+        my $layout;
+        my $bodywidth = 0;
+        if ($self->{fontsize} <= 0) {
+                $self->{fontsize} = $settings->{entry_size};
+        }
+        if ($self->{size} <= 0) {
+                $self->{size} = $settings->{daynum_size};
+        }
+
+        if ($self->{phase} !~ /^[0123]$/) {
+                # Invalid phase
+                return 0;
+        }
+
+        if ($self->{body} ne '') {
+                $layout = Pango::Cairo::create_layout($cr);
+                $layout->set_text(Encode::decode('UTF-8', $self->{body}));
+                my $desc = Pango::FontDescription->from_string($settings->{entry_font} . ' ' . $self->{fontsize} . 'px');
+                $layout->set_font_description($desc);
+                ($bodywidth, undef) = $layout->get_pixel_size();
+        }
+        my ($xc, $yc);
+        if ($settings->{numbers_on_left}) {
+                $yc = $so_far + $settings->{border_size} + ($self->{size} / 2);
+                $xc = $x2 - $settings->{border_size} - ($self->{size} / 2);
+                if ($bodywidth) {
+                        $xc -= ($bodywidth + $settings->{border_size});
+                }
+        } else {
+                $xc = $x1 + $settings->{border_size} + ($self->{size} / 2);
+                $yc = $so_far + $settings->{border_size} + ($self->{size} / 2);
+        }
+        $self->draw_moon($xc, $yc, $cr);
+        if ($layout) {
+                $cr->save();
+                $cr->move_to ($xc + ($self->{size}/2) + $settings->{border_size},
+                              $yc + ($self->{size}/2) - $self->{fontsize} );
+                Pango::Cairo::show_layout($cr, $layout);
+                $cr->restore();
+        }
+}
+
+sub draw_moon
+{
+        my ($self, $xc, $yc, $cr) = @_;
+        $cr->save();
+        $cr->new_path();
+        $cr->arc($xc, $yc, $self->{size}/2, 0, 2*3.1415926535);
+        if ($self->{phase} == 0) {
+                $cr->stroke_preserve();
+                $cr->fill();
+        } elsif ($self->{phase} == 1) {
+                $cr->stroke();
+                $cr->arc($xc, $yc, $self->{size}/2, 3.1415926535/2, 3 * 3.1415926535/2);
+                $cr->stroke_preserve();
+                $cr->fill();
+        } elsif ($self->{phase} == 2) {
+                $cr->stroke();
+        } elsif ($self->{phase} == 3) {
+                $cr->stroke();
+                $cr->arc($xc, $yc, $self->{size}/2, 3 * 3.1415926535/2, 3.1415926535/2);
+                $cr->stroke_preserve();
+                $cr->fill();
+        }
+        $cr->restore();
+}
+
+package Remind::PDF::Entry::shade;
+use base 'Remind::PDF::Entry';
+sub _adjust
+{
+        my ($self) = @_;
+        if ($self->{body} =~ /^(\d+)\s+(\d+)\s+(\d+)/) {
+                $self->{r} = $1;
+                $self->{g} = $2;
+                $self->{b} = $3;
+        }
+}
+
+package Remind::PDF::Entry::color;
+use base 'Remind::PDF::Entry';
+
+# Strip the RGB prefix from body
+sub _adjust
+{
+        my ($self) = @_;
+        $self->{body} =~ s/^\d+\s+\d+\s+\d+\s+//;
+}
+
+package Remind::PDF::Entry::postscript;
+use base 'Remind::PDF::Entry';
+sub render {}
+
+package Remind::PDF::Entry::psfile;
+use base 'Remind::PDF::Entry';
+sub render {}
+
+package Remind::PDF::Entry::pango;
+use base 'Remind::PDF::Entry';
+sub _adjust
+{
+        my ($self) = @_;
+        if ($self->{body} =~ /^@([-0-9.]+),\s*([-0-9.]+)\s*(.*)/) {
+                $self->{atx} = $1;
+                $self->{aty} = $2;
+                $self->{body} = $3;
+        }
+}
+
+sub render
+{
+        my ($self, $pdf, $cr, $settings, $so_far, $day, $col, $height) = @_;
+
+        my ($x1, $y1, $x2, $y2) = $pdf->col_box_coordinates($so_far, $col, $height, $settings);
+        my $layout = Pango::Cairo::create_layout($cr);
+
+        $layout->set_width(1024 * ($x2 - $x1 - 2 * $settings->{border_size}));
+        $layout->set_wrap('word-char');
+        $layout->set_markup(Encode::decode('UTF-8', $self->{body}));
+
+        if (($layout->get_text() // '') eq '') {
+                # Invalid markup
+                return 0;
+        }
+        my $desc = Pango::FontDescription->from_string($settings->{entry_font} . ' ' . $settings->{entry_size} . 'px');
+        $layout->set_font_description($desc);
+        my ($wid, $h) = $layout->get_pixel_size();
+
+        if ($height) {
+                $cr->save();
+                if (defined($self->{atx}) && defined($self->{aty})) {
+                        my ($x, $y);
+                        if ($self->{atx} < 0) {
+                                $x = $x2 + $self->{atx} - $wid;
+                        } else {
+                                $x = $x1 + $self->{atx};
+                        }
+                        if ($self->{aty} < 0) {
+                                $y = $y2 + $self->{aty} - $h;
+                        } else {
+                                $y = $y1 + $self->{aty};
+                        }
+                        $cr->move_to($x, $y);
+                } else {
+                        $cr->move_to($x1 + $settings->{border_size}, $so_far);
+                }
+                Pango::Cairo::show_layout($cr, $layout);
+                $cr->restore();
+        }
+        return $h;
+}
+
+package Remind::PDF::Entry::UNKNOWN;
+use base 'Remind::PDF::Entry';
+sub render {}
+
+1;
+

scripts/README

@@ -1,4 +1,3 @@
 Files in this directory:
 
 tkremind     -- Tcl/Tk graphical calendar using Remind as engine
-cm2rem.tcl   -- Convert Sun's "cm" calendar manager files to Remind.

scripts/cm2rem.tcl

@@ -1,359 +0,0 @@
-#!/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.
-#
-#--------------------------------------------------------------
-
-# 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

src/Makefile.in

@@ -18,11 +18,10 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
 
 PROGS=		remind rem2ps
-SCRIPTS=	$(srcdir)/../scripts/tkremind $(srcdir)/../scripts/cm2rem.tcl
+SCRIPTS=	$(srcdir)/../scripts/tkremind
 
 MANS=		$(srcdir)/../man/rem2ps.1 $(srcdir)/../man/remind.1 \
-		$(srcdir)/../man/tkremind.1 $(srcdir)/../man/cm2rem.1 \
-		$(srcdir)/../man/rem.1
+		$(srcdir)/../man/tkremind.1 $(srcdir)/../man/rem.1
 
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -43,8 +42,10 @@ test: remind
 .c.o:
 	@CC@ -c @CPPFLAGS@ @CFLAGS@ @DEFS@ $(CEXTRA) $(LANGDEF) -I. -I$(srcdir) $<
 
-rem2ps: rem2ps.o dynbuf.o
-	@CC@ @LDFLAGS@ $(LDEXTRA) -o rem2ps rem2ps.o dynbuf.o
+$(REMINDOBJS): $(REMINDHDRS)
+
+rem2ps: rem2ps.o dynbuf.o json.o
+	@CC@ @LDFLAGS@ $(LDEXTRA) -o rem2ps rem2ps.o dynbuf.o json.o -lm
 
 remind: $(REMINDOBJS)
 	@CC@ @LDFLAGS@ $(LDEXTRA) -o remind $(REMINDOBJS) @LIBS@
@@ -72,23 +73,21 @@ clobber:
 	rm -f *.o *~ remind rem2ps test.out core *.bak
 
 depend:
-	gccmakedep @DEFS@ $(REMINDSRCS) rem2ps.c
+	gccmakedep @DEFS@ $(REMINDSRCS) rem2ps.c json.c
 
 # The next targets are not very useful to you.  I use them to build
 # distributions, etc.
 
 # Build a tar file based on all files checked into git.
 distro:
-	ln -s . ../remind-$(VERSION)
-	(cd ..; git ls-files | fgrep -v .gitignore | fgrep -v remind.php) | sed -e 's/^/remind-$(VERSION)\//' | xargs tar -C .. -cvf remind-$(VERSION).tar
+	cd .. && git archive --worktree-attributes --format=tar --prefix=remind-$(VERSION)/ HEAD > src/remind-$(VERSION).tar
 	gzip -f -v -9 remind-$(VERSION).tar
-	rm -f ../remind-$(VERSION)
+	gpg --detach-sign -u dianne@skoll.ca remind-$(VERSION).tar.gz
 
 beta-tgz:
-	ln -s . ../remind-$(VERSION)-BETA-$(BETA)
-	(cd ..; git ls-files | fgrep -v .gitignore | fgrep -v remind.php) | sed -e 's/^/remind-$(VERSION)-BETA-$(BETA)\//' | xargs tar -C .. -cvf remind-$(VERSION)-BETA-$(BETA).tar
+	cd .. && git archive --worktree-attributes --format=tar --prefix=remind-$(VERSION)-BETA-$(BETA)/ HEAD > src/remind-$(VERSION)-BETA-$(BETA).tar
 	gzip -f -v -9 remind-$(VERSION)-BETA-$(BETA).tar
-	rm -f ../remind-$(VERSION)-BETA-$(BETA)
+	gpg --detach-sign -u dianne@skoll.ca remind-$(VERSION)-BETA-$(BETA).tar.gz
 
 #---------------- Stuff after this added by "make depend" -----------------
 

src/config.h.in

@@ -10,6 +10,9 @@
 /* Define if you have the <sys/file.h> header file.  */
 #undef HAVE_SYS_FILE_H
 
+/* Define if you have the <sys/types.h> header file.  */
+#undef HAVE_SYS_TYPES_H
+
 /* Define if you have the <glob.h> header file */
 #undef HAVE_GLOB_H
 
@@ -21,6 +24,8 @@
 
 #undef HAVE_SETENV
 
+#undef HAVE_INITGROUPS
+
 #undef HAVE_UNSETENV
 
 #undef HAVE_MBSTOWCS
@@ -33,7 +38,4 @@
 /* The number of bytes in a unsigned long.  */
 #undef SIZEOF_UNSIGNED_LONG
 
-/* The number of bytes in a unsigned short.  */
-#undef SIZEOF_UNSIGNED_SHORT
-
 #include "custom.h"

src/custom.h

@@ -6,28 +6,23 @@
 /*  which you can customize.                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
 /*---------------------------------------------------------------------*/
-/* LAT_DEG, LAT_MIN and LAT_SEC: Latitude of your location             */
-/* LON_DEG, LON_MIN and LON_SEC: Longitude of your location            */
+/* DEFAULT_LATITUDE: Latitude of your location                         */
+/* DEFAULT_LONGITUDE: Longitude of your location                       */
 /* LOCATION: A string identifying your location.                       */
-/* All latitude and longitude numbers should be positive for the       */
-/* northern and western hemisphere.  If you live in the southern       */
-/* hemisphere, ALL latitude values should be negative.  If you live    */
-/* in the eastern hemisphere, ALL longitude values should be negative. */
+/* Latitude and longitude should be positive for the                   */
+/* northern and eastern hemisphere and negative for the southern and   */
+/* western hemisphere.                                                 */
 /*                                                                     */
-/* The default values are initially set to Ottawa, Ontario, Canada.    */
+/* The default values are initially set to the city hall in Ottawa,    */
+/* Ontario, Canada.    */
 /*---------------------------------------------------------------------*/
-#define LAT_DEG 45
-#define LAT_MIN 24
-#define LAT_SEC  0
-#define LON_DEG 75
-#define LON_MIN 39
-#define LON_SEC  0
+#define DEFAULT_LATITUDE 45.42055555555555
+#define DEFAULT_LONGITUDE -75.68972222222223
 #define LOCATION "Ottawa"
 
 /*---------------------------------------------------------------------*/
@@ -37,7 +32,7 @@
 /*---------------------------------------------------------------------*/
 #define DEFAULT_PAGE {"Letter", 612, 792}
 /* #define DEFAULT_PAGE {"A4", 595, 842} */
-  
+
 /*---------------------------------------------------------------------*/
 /* DATESEP:  The default date separator.  Standard usage is '-';       */
 /* others may prefer '/'.                                              */
@@ -53,43 +48,11 @@
 /* #define TIMESEP '.' */
 
 /*---------------------------------------------------------------------*/
-/* ISOLATIN1: define it to 1 if you use the                            */
-/* ISO 8859-1 character set instead of ASCII.                          */
+/* DATETIMESEP:  The default datetime separator.  Default is '@';      */
+/* others may prefer 'T'.                                              */
 /*---------------------------------------------------------------------*/
-#define ISOLATIN1 1
-
-/*---------------------------------------------------------------------*/
-/* ISOLATIN2: define it to 1 if you use the                            */
-/* ISO 8859-2 character set instead of ASCII.                          */
-/* NOT ALL LANGUAGE MODULES SUPPORT THIS.  Note that at most one of    */
-/* ISOLATIN1, ISOLATIN2, IBMEXTENDED and IBM852 should be 1; if more   */
-/* then one are defined as 1, the results are unspecified.             */
-/*---------------------------------------------------------------------*/
-#define ISOLATIN2 0
-
-/*---------------------------------------------------------------------*/
-/* IBMEXTENDED: define as 1 if your system uses the  IBM extended      */
-/* character set.                                                      */
-/* NOT ALL LANGUAGE MODULES SUPPORT THIS.  Note that at most one of    */
-/* ISOLATIN1, ISOLATIN2, IBMEXTENDED and IBM852 should be 1; if more   */
-/* then one are defined as 1, the results are unspecified.             */
-/*---------------------------------------------------------------------*/
-#define IBMEXTENDED 0
-
-/*---------------------------------------------------------------------*/
-/* IBM852: define as 1 if your system uses the IBM CPI-852 extended    */
-/* character set.                                                      */
-/* NOT ALL LANGUAGE MODULES SUPPORT THIS.  Note that at most one of    */
-/* ISOLATIN1, ISOLATIN2, IBMEXTENDED and IBM852 should be 1; if more   */
-/* then one are defined as 1, the results are unspecified.             */
-/*---------------------------------------------------------------------*/
-#define IBM852 0
-
-/*---------------------------------------------------------------------*/
-/* WANT_U_OPTION: Comment out the next define to permanently disable   */
-/* the -u option.                                                      */
-/*---------------------------------------------------------------------*/
-#define WANT_U_OPTION 1
+#define DATETIMESEP '@'
+/* #define DATETIMESEP '/' */
 
 /**********************************************************************/
 /**********************************************************************/
@@ -108,16 +71,7 @@
 /* WANT_SHELL_ESCAPING:  Define this if you want special shell         */
 /* characters to be escaped with a backslash for the -k option.        */
 /*---------------------------------------------------------------------*/
-#if defined(UNIX)
 #define WANT_SHELL_ESCAPING 1
-#endif
-
-/*---------------------------------------------------------------------*/
-/* Some implementations have a broken 'putc' and 'putchar'.            */
-/*---------------------------------------------------------------------*/
-#ifdef __SASC_60
-#define BROKEN_PUTC
-#endif
 
 /*---------------------------------------------------------------------*/
 /* BASE: The base year for date calculation.  NOTE!  January 1 of the  */
@@ -140,7 +94,7 @@
 /* VAR_NAME_LEN: The maximum length of variable names.  Don't make it  */
 /*               any less than 12.                                     */
 /*---------------------------------------------------------------------*/
-#define VAR_NAME_LEN 16
+#define VAR_NAME_LEN 64
 
 /*---------------------------------------------------------------------*/
 /* MAX_PRT_LEN: The maximum number of characters to print when         */
@@ -178,12 +132,12 @@
 /*---------------------------------------------------------------------*/
 /* How many attempts to resolve a weird date spec?                     */
 /*---------------------------------------------------------------------*/
-#define TRIG_ATTEMPTS 50
+#define TRIG_ATTEMPTS 500
 
 /*---------------------------------------------------------------------*/
 /* How many global omits of the form YYYY MM DD do we handle?          */
 /*---------------------------------------------------------------------*/
-#define MAX_FULL_OMITS 500
+#define MAX_FULL_OMITS 1000
 
 /*---------------------------------------------------------------------*/
 /* How many global omits of the form MM DD do we handle?               */
@@ -214,13 +168,8 @@
 #define PSBEGIN "# rem2ps begin"
 #define PSEND   "# rem2ps end"
 
-#ifdef BROKEN_PUTC
-#define Putc SafePutc
-#define PutChar SafePutChar
-#else
-#define Putc putc
-#define PutChar putchar
-#endif
+#define PSBEGIN2 "# rem2ps2 begin"
+#define PSEND2   "# rem2ps2 end"
 
 #if defined(HAVE_MBSTOWCS) && defined(HAVE_WCTYPE_H)
 #define REM_USE_WCHAR 1

src/custom.h.in

@@ -6,28 +6,23 @@
 /*  which you can customize.                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
 /*---------------------------------------------------------------------*/
-/* LAT_DEG, LAT_MIN and LAT_SEC: Latitude of your location             */
-/* LON_DEG, LON_MIN and LON_SEC: Longitude of your location            */
+/* DEFAULT_LATITUDE: Latitude of your location                         */
+/* DEFAULT_LONGITUDE: Longitude of your location                       */
 /* LOCATION: A string identifying your location.                       */
-/* All latitude and longitude numbers should be positive for the       */
-/* northern and western hemisphere.  If you live in the southern       */
-/* hemisphere, ALL latitude values should be negative.  If you live    */
-/* in the eastern hemisphere, ALL longitude values should be negative. */
+/* Latitude and longitude should be positive for the                   */
+/* northern and eastern hemisphere and negative for the southern and   */
+/* western hemisphere.                                                 */
 /*                                                                     */
-/* The default values are initially set to Ottawa, Ontario, Canada.    */
+/* The default values are initially set to the city hall in Ottawa,    */
+/* Ontario, Canada.    */
 /*---------------------------------------------------------------------*/
-#define LAT_DEG 45
-#define LAT_MIN 24
-#define LAT_SEC  0
-#define LON_DEG 75
-#define LON_MIN 39
-#define LON_SEC  0
+#define DEFAULT_LATITUDE 45.42055555555555
+#define DEFAULT_LONGITUDE -75.68972222222223
 #define LOCATION "Ottawa"
 
 /*---------------------------------------------------------------------*/
@@ -37,7 +32,7 @@
 /*---------------------------------------------------------------------*/
 #define DEFAULT_PAGE {"Letter", 612, 792}
 /* #define DEFAULT_PAGE {"A4", 595, 842} */
-  
+
 /*---------------------------------------------------------------------*/
 /* DATESEP:  The default date separator.  Standard usage is '-';       */
 /* others may prefer '/'.                                              */
@@ -53,43 +48,11 @@
 /* #define TIMESEP '.' */
 
 /*---------------------------------------------------------------------*/
-/* ISOLATIN1: define it to 1 if you use the                            */
-/* ISO 8859-1 character set instead of ASCII.                          */
+/* DATETIMESEP:  The default datetime separator.  Default is '@';      */
+/* others may prefer 'T'.                                              */
 /*---------------------------------------------------------------------*/
-#define ISOLATIN1 1
-
-/*---------------------------------------------------------------------*/
-/* ISOLATIN2: define it to 1 if you use the                            */
-/* ISO 8859-2 character set instead of ASCII.                          */
-/* NOT ALL LANGUAGE MODULES SUPPORT THIS.  Note that at most one of    */
-/* ISOLATIN1, ISOLATIN2, IBMEXTENDED and IBM852 should be 1; if more   */
-/* then one are defined as 1, the results are unspecified.             */
-/*---------------------------------------------------------------------*/
-#define ISOLATIN2 0
-
-/*---------------------------------------------------------------------*/
-/* IBMEXTENDED: define as 1 if your system uses the  IBM extended      */
-/* character set.                                                      */
-/* NOT ALL LANGUAGE MODULES SUPPORT THIS.  Note that at most one of    */
-/* ISOLATIN1, ISOLATIN2, IBMEXTENDED and IBM852 should be 1; if more   */
-/* then one are defined as 1, the results are unspecified.             */
-/*---------------------------------------------------------------------*/
-#define IBMEXTENDED 0
-
-/*---------------------------------------------------------------------*/
-/* IBM852: define as 1 if your system uses the IBM CPI-852 extended    */
-/* character set.                                                      */
-/* NOT ALL LANGUAGE MODULES SUPPORT THIS.  Note that at most one of    */
-/* ISOLATIN1, ISOLATIN2, IBMEXTENDED and IBM852 should be 1; if more   */
-/* then one are defined as 1, the results are unspecified.             */
-/*---------------------------------------------------------------------*/
-#define IBM852 0
-
-/*---------------------------------------------------------------------*/
-/* WANT_U_OPTION: Comment out the next define to permanently disable   */
-/* the -u option.                                                      */
-/*---------------------------------------------------------------------*/
-#define WANT_U_OPTION 1
+#define DATETIMESEP '@'
+/* #define DATETIMESEP '/' */
 
 /**********************************************************************/
 /**********************************************************************/
@@ -108,16 +71,7 @@
 /* WANT_SHELL_ESCAPING:  Define this if you want special shell         */
 /* characters to be escaped with a backslash for the -k option.        */
 /*---------------------------------------------------------------------*/
-#if defined(UNIX)
 #define WANT_SHELL_ESCAPING 1
-#endif
-
-/*---------------------------------------------------------------------*/
-/* Some implementations have a broken 'putc' and 'putchar'.            */
-/*---------------------------------------------------------------------*/
-#ifdef __SASC_60
-#define BROKEN_PUTC
-#endif
 
 /*---------------------------------------------------------------------*/
 /* BASE: The base year for date calculation.  NOTE!  January 1 of the  */
@@ -140,7 +94,7 @@
 /* VAR_NAME_LEN: The maximum length of variable names.  Don't make it  */
 /*               any less than 12.                                     */
 /*---------------------------------------------------------------------*/
-#define VAR_NAME_LEN 16
+#define VAR_NAME_LEN 64
 
 /*---------------------------------------------------------------------*/
 /* MAX_PRT_LEN: The maximum number of characters to print when         */
@@ -183,7 +137,7 @@
 /*---------------------------------------------------------------------*/
 /* How many global omits of the form YYYY MM DD do we handle?          */
 /*---------------------------------------------------------------------*/
-#define MAX_FULL_OMITS 500
+#define MAX_FULL_OMITS 1000
 
 /*---------------------------------------------------------------------*/
 /* How many global omits of the form MM DD do we handle?               */
@@ -214,13 +168,8 @@
 #define PSBEGIN "# rem2ps begin"
 #define PSEND   "# rem2ps end"
 
-#ifdef BROKEN_PUTC
-#define Putc SafePutc
-#define PutChar SafePutChar
-#else
-#define Putc putc
-#define PutChar putchar
-#endif
+#define PSBEGIN2 "# rem2ps2 begin"
+#define PSEND2   "# rem2ps2 end"
 
 #if defined(HAVE_MBSTOWCS) && defined(HAVE_WCTYPE_H)
 #define REM_USE_WCHAR 1

src/dorem.c

@@ -7,8 +7,7 @@
 /*  commands.                                                  */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -19,22 +18,29 @@
 
 #include <stdlib.h>
 
+#include "types.h"
 #include "globals.h"
 #include "err.h"
-#include "types.h"
 #include "protos.h"
 #include "expr.h"
 
-/* Define the shell characters not to escape */
-static char const DontEscapeMe[] =
-"1234567890_-=+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@.,";
-
 static int ParseTimeTrig (ParsePtr s, TimeTrig *tim, int save_in_globals);
 static int ParseLocalOmit (ParsePtr s, Trigger *t);
 static int ParseScanFrom (ParsePtr s, Trigger *t, int type);
 static int ParsePriority (ParsePtr s, Trigger *t);
 static int ParseUntil (ParsePtr s, Trigger *t);
 static int ShouldTriggerBasedOnWarn (Trigger *t, int jul, int *err);
+static int ComputeTrigDuration(TimeTrig *t);
+
+static int
+ComputeTrigDuration(TimeTrig *t)
+{
+    if (t->ttime == NO_TIME ||
+	t->duration == NO_TIME) {
+	return 0;
+    }
+    return (t->ttime + t->duration - 1) / MINUTES_PER_DAY;
+}
 
 /***************************************************************/
 /*                                                             */
@@ -71,6 +77,9 @@ int DoRem(ParsePtr p)
 	PurgeEchoLine("%s\n", CurLine);
 	r=DoSatRemind(&trig, &tim, p);
 	if (r) {
+            if (r == E_CANT_TRIG && trig.maybe_uncomputable) {
+                r = OK;
+            }
 	    FreeTrig(&trig);
 	    if (r == E_EXPIRED) return OK;
 	    return r;
@@ -118,17 +127,28 @@ int DoRem(ParsePtr p)
 	}
     } else {
 	/* Calculate the trigger date */
-	jul = ComputeTrigger(trig.scanfrom, &trig, &r, 1);
+	jul = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 1);
 	if (r) {
 	    if (PurgeMode) {
 		PurgeEchoLine("%s: %s\n", "#!P! Problem calculating trigger date", ErrMsg[r]);
 		PurgeEchoLine("%s\n", CurLine);
 	    }
+            if (r == E_CANT_TRIG && trig.maybe_uncomputable) {
+                r = OK;
+            }
 	    FreeTrig(&trig);
 	    return r;
 	}
     }
 
+    /* Add to global OMITs if so indicated */
+    if (trig.addomit) {
+        r = AddGlobalOmit(jul);
+        if (r) {
+	    FreeTrig(&trig);
+            return r;
+        }
+    }
     if (PurgeMode) {
 	if (trig.expired || jul < JulianToday) {
 	    if (p->expr_happened) {
@@ -199,16 +219,22 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
     trig->localomit = NO_WD;
     trig->skip = NO_SKIP;
     trig->once = NO_ONCE;
+    trig->addomit = 0;
     trig->typ = NO_TYPE;
     trig->scanfrom = NO_DATE;
+    trig->from = NO_DATE;
     trig->priority = DefaultPrio;
     trig->sched[0] = 0;
     trig->warn[0] = 0;
     trig->omitfunc[0] = 0;
+    trig->duration_days = 0;
+    trig->eventstart = NO_TIME;
+    trig->eventduration = NO_TIME;
+    trig->maybe_uncomputable = 0;
     DBufInit(&(trig->tags));
     trig->passthru[0] = 0;
     tim->ttime = NO_TIME;
-    tim->delta = NO_DELTA;
+    tim->delta = DefaultTDelta;
     tim->rep   = NO_REP;
     tim->duration = NO_TIME;
     if (save_in_globals) {
@@ -246,6 +272,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    tim->ttime = (tok.val % MINUTES_PER_DAY);
 	    if (save_in_globals) {
 		LastTriggerTime = tim->ttime;
+		SaveLastTimeTrig(tim);
 	    }
 	    break;
 
@@ -261,6 +288,11 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    trig->m = tok.val;
 	    break;
 
+        case T_MaybeUncomputable:
+	    DBufFree(&buf);
+            trig->maybe_uncomputable = 1;
+            break;
+
 	case T_Skip:
 	    DBufFree(&buf);
 	    if (trig->skip != NO_SKIP) return E_SKIP_ERR;
@@ -277,6 +309,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    DBufFree(&buf);
 	    r=ParseTimeTrig(s, tim, save_in_globals);
 	    if (r) return r;
+	    trig->duration_days = ComputeTrigDuration(tim);
 	    break;
 
 	case T_Scanfrom:
@@ -351,6 +384,11 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    trig->once = ONCE_ONCE;
 	    break;
 
+        case T_AddOmit:
+	    DBufFree(&buf);
+            trig->addomit = 1;
+            break;
+
 	case T_Omit:
 	    DBufFree(&buf);
 	    if (trig->omitfunc[0]) {
@@ -373,6 +411,10 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    r=ParseToken(s, &buf);
 	    if (r) return r;
 	    StrnCpy(trig->omitfunc, DBufValue(&buf), VAR_NAME_LEN);
+
+	    /* An OMITFUNC counts as a nonconst_expr! */
+	    s->expr_happened = 1;
+	    s->nonconst_expr = 1;
 	    DBufFree(&buf);
 	    break;
 
@@ -397,7 +439,18 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    switch(tok.type) {
 	    case T_Time:
 	    case T_LongTime:
-		tim->duration = tok.val;
+	    case T_Year:
+	    case T_Day:
+	    case T_Number:
+		if (tok.val != 0) {
+		    tim->duration = tok.val;
+		} else {
+		    tim->duration = NO_TIME;
+		}
+		if (save_in_globals) {
+		    SaveLastTimeTrig(tim);
+		}
+		trig->duration_days = ComputeTrigDuration(tim);
 		break;
 	    default:
 		return E_BAD_TIME;
@@ -436,7 +489,7 @@ static int ParseTimeTrig(ParsePtr s, TimeTrig *tim, int save_in_globals)
 {
     Token tok;
     int r;
-
+    int seen_delta = 0;
     DynamicBuffer buf;
     DBufInit(&buf);
 
@@ -447,16 +500,20 @@ static int ParseTimeTrig(ParsePtr s, TimeTrig *tim, int save_in_globals)
 	switch(tok.type) {
 	case T_Time:
 	    DBufFree(&buf);
+	    if (tim->ttime != NO_TIME) return E_TIME_TWICE;
 	    tim->ttime = tok.val;
 	    break;
 
 	case T_Delta:
 	    DBufFree(&buf);
-	    tim->delta = (tok.val > 0) ? tok.val : -tok.val;
+            if (seen_delta) return E_DELTA_TWICE;
+            seen_delta = 1;
+	    tim->delta = (tok.val >= 0) ? tok.val : -tok.val;
 	    break;
 
 	case T_Rep:
 	    DBufFree(&buf);
+	    if (tim->rep != NO_REP) return E_REP_TWICE;
 	    tim->rep = tok.val;
 	    break;
 
@@ -466,6 +523,7 @@ static int ParseTimeTrig(ParsePtr s, TimeTrig *tim, int save_in_globals)
 	    /* Save trigger time in global variable */
 	    if (save_in_globals) {
 		LastTriggerTime = tim->ttime;
+		SaveLastTimeTrig(tim);
 	    }
 	    PushToken(DBufValue(&buf), s);
 	    DBufFree(&buf);
@@ -664,6 +722,30 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
 	    FromJulian(tok.val, &y, &m, &d);
 	    break;
 
+	case T_Back:
+	    DBufFree(&buf);
+	    if (type != SCANFROM_TYPE) {
+		Eprint("%s: %s", word, ErrMsg[E_INCOMPLETE]);
+		return E_INCOMPLETE;
+	    }
+	    if (y != NO_YR) {
+		Eprint("%s: %s", word, ErrMsg[E_YR_TWICE]);
+		return E_YR_TWICE;
+	    }
+	    if (m != NO_MON) {
+		Eprint("%s: %s", word, ErrMsg[E_MON_TWICE]);
+		return E_MON_TWICE;
+	    }
+	    if (d != NO_DAY) {
+		Eprint("%s: %s", word, ErrMsg[E_DAY_TWICE]);
+		return E_DAY_TWICE;
+	    }
+	    if (tok.val < 0) {
+		tok.val = -tok.val;
+	    }
+	    FromJulian(JulianToday - tok.val, &y, &m, &d);
+	    break;
+
 	default:
 	    if (y == NO_YR || m == NO_MON || d == NO_DAY) {
 		Eprint("%s: %s", word, ErrMsg[E_INCOMPLETE]);
@@ -676,9 +758,12 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
 	    }
 	    t->scanfrom = Julian(y, m, d);
 	    if (type == FROM_TYPE) {
+		t->from = t->scanfrom;
 		if (t->scanfrom < JulianToday) {
 		    t->scanfrom = JulianToday;
 		}
+	    } else {
+		t->from = NO_DATE;
 	    }
 
 	    PushToken(DBufValue(&buf), s);
@@ -704,20 +789,24 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
     char const *s;
     Value v;
 
+    int red = -1, green = -1, blue = -1;
+    int is_color = 0;
+
     DBufInit(&buf);
     DBufInit(&calRow);
     DBufInit(&pre_buf);
     if (t->typ == RUN_TYPE && RunDisabled) return E_RUN_DISABLED;
-    if ((t->typ == PASSTHRU_TYPE && strcmp(t->passthru, "COLOR") && strcmp(t->passthru, "COLOUR")) ||
+    if ((t->typ == PASSTHRU_TYPE && StrCmpi(t->passthru, "COLOR") && StrCmpi(t->passthru, "COLOUR")) ||
 	t->typ == CAL_TYPE ||
 	t->typ == PS_TYPE ||
 	t->typ == PSF_TYPE)
 	return OK;
 
     /* Handle COLOR types */
-    if (t->typ == PASSTHRU_TYPE && (!strcmp(t->passthru, "COLOR") || !strcmp(t->passthru, "COLOUR"))) {
+    if (t->typ == PASSTHRU_TYPE && (!StrCmpi(t->passthru, "COLOR") || !StrCmpi(t->passthru, "COLOUR"))) {
 	/* Strip off three tokens */
 	r = ParseToken(p, &buf);
+	sscanf(DBufValue(&buf), "%d", &red);
 	if (!NextMode) {
 	    DBufPuts(&pre_buf, DBufValue(&buf));
 	    DBufPutc(&pre_buf, ' ');
@@ -725,6 +814,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	DBufFree(&buf);
 	if (r) return r;
 	r = ParseToken(p, &buf);
+	sscanf(DBufValue(&buf), "%d", &green);
 	if (!NextMode) {
 	    DBufPuts(&pre_buf, DBufValue(&buf));
 	    DBufPutc(&pre_buf, ' ');
@@ -732,6 +822,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	DBufFree(&buf);
 	if (r) return r;
 	r = ParseToken(p, &buf);
+	sscanf(DBufValue(&buf), "%d", &blue);
 	if (!NextMode) {
 	    DBufPuts(&pre_buf, DBufValue(&buf));
 	    DBufPutc(&pre_buf, ' ');
@@ -751,10 +842,10 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	DBufFree(&buf);
     }
 
-/* If it's NextMode, process as a CAL-type entry, and issue simple-calendar
-   format. */
+/* If it's NextMode, process as a ADVANCE_MODE-type entry, and issue
+   simple-calendar format. */
     if (NextMode) {
-	if ( (r=DoSubst(p, &buf, t, tim, jul, CAL_MODE)) ) return r;
+	if ( (r=DoSubst(p, &buf, t, tim, jul, ADVANCE_MODE)) ) return r;
 	if (!DBufLen(&buf)) {
 	    DBufFree(&buf);
 	    DBufFree(&pre_buf);
@@ -815,6 +906,23 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	return OK;
     }
 
+    /* Correct colors */
+    if (UseVTColors) {
+	if (red == -1 && green == -1 && blue == -1) {
+	    if (DefaultColorR != -1 && DefaultColorG != -1 && DefaultColorB != -1) {
+		red = DefaultColorR;
+		green = DefaultColorG;
+		blue = DefaultColorB;
+	    }
+	}
+	if (red >= 0 && green >= 0 && blue >= 0) {
+	    is_color = 1;
+	    if (red > 255) red = 255;
+	    if (green > 255) green = 255;
+	    if (blue > 255) blue = 255;
+	}
+    }
+
     /* Put the substituted string into the substitution buffer */
 
     /* Don't use msgprefix() on RUN-type reminders */
@@ -825,6 +933,9 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	    r = EvalExpr(&s, &v, NULL);
 	    if (!r) {
 		if (!DoCoerce(STR_TYPE, &v)) {
+		    if (is_color) {
+			DBufPuts(&buf, Colorize(red, green, blue));
+		    }
 		    if (DBufPuts(&buf, v.v.str) != OK) {
 			DBufFree(&buf);
 			DestroyValue(v);
@@ -836,6 +947,9 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	}
     }
 
+    if (is_color) {
+	DBufPuts(&buf, Colorize(red, green, blue));
+    }
     if ( (r=DoSubst(p, &buf, t, tim, jul, NORMAL_MODE)) ) return r;
     if (t->typ != RUN_TYPE) {
 	if (UserFuncExists("msgsuffix") == 1) {
@@ -844,6 +958,9 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	    r = EvalExpr(&s, &v, NULL);
 	    if (!r) {
 		if (!DoCoerce(STR_TYPE, &v)) {
+		    if (is_color) {
+			DBufPuts(&buf, Colorize(red, green, blue));
+		    }
 		    if (DBufPuts(&buf, v.v.str) != OK) {
 			DBufFree(&buf);
 			DestroyValue(v);
@@ -855,6 +972,10 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	}
     }
 
+    if (is_color) {
+	DBufPuts(&buf, Decolorize(red, green, blue));
+    }
+
     if ((!MsgCommand && t->typ == MSG_TYPE) || t->typ == MSF_TYPE) {
 	if (DBufPutc(&buf, '\n') != OK) {
 	    DBufFree(&buf);
@@ -889,7 +1010,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	break;
 
     case RUN_TYPE:
-	system(DBufValue(&buf));
+	System(DBufValue(&buf));
 	break;
 
     default: /* Unknown/illegal type? */
@@ -993,21 +1114,35 @@ int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int jul, int *err)
 /*  Do the "satisfying..." remind calculation.                 */
 /*                                                             */
 /***************************************************************/
-int DoSatRemind(Trigger *trig, TimeTrig *tim, ParsePtr p)
+int DoSatRemind(Trigger *trig, TimeTrig *tt, ParsePtr p)
 {
-    int iter, jul, r;
+    int iter, jul, r, start;
     Value v;
     char const *s;
     char const *t;
 
     t = p->pos;
     iter = 0;
-    jul = trig->scanfrom;
+    start = trig->scanfrom;
     while (iter++ < MaxSatIter) {
-	jul = ComputeTrigger(jul, trig, &r, 1);
+	jul = ComputeTriggerNoAdjustDuration(start, trig, tt, &r, 1, 0);
 	if (r) {
 	    if (r == E_CANT_TRIG) return OK; else return r;
 	}
+	if (jul != start && trig->duration_days) {
+	    jul = ComputeTriggerNoAdjustDuration(start, trig, tt, &r, 1, trig->duration_days);
+	    if (r) {
+		if (r == E_CANT_TRIG) return OK; else return r;
+	    }
+	} else if (jul == start) {
+	    if (tt->ttime != NO_TIME) {
+		trig->eventstart = MINUTES_PER_DAY * r + tt->ttime;
+		if (tt->duration != NO_TIME) {
+		    trig->eventduration = tt->duration;
+		}
+	    }
+	    SaveAllTriggerInfo(trig, tt, jul, tt->ttime, 1);
+	}
 	if (jul == -1) {
 	    return E_EXPIRED;
 	}
@@ -1016,14 +1151,42 @@ int DoSatRemind(Trigger *trig, TimeTrig *tim, ParsePtr p)
 	t = p->pos;
 	if (r) return r;
 	if (v.type != INT_TYPE && v.type != STR_TYPE) return E_BAD_TYPE;
-	if (v.type == INT_TYPE && v.v.val) return OK;
-	if (v.type == STR_TYPE && *v.v.str) return OK;
+	if ((v.type == INT_TYPE && v.v.val) ||
+	    (v.type == STR_TYPE && *v.v.str)) {
+	    AdjustTriggerForDuration(trig->scanfrom, jul, trig, tt, 1);
+	    if (DebugFlag & DB_PRTTRIG) {
+		int y, m, d;
+		FromJulian(LastTriggerDate, &y, &m, &d);
+		fprintf(ErrFp, "%s(%d): Trig(satisfied) = %s, %d %s, %d",
+			FileName, LineNo,
+			get_day_name(LastTriggerDate % 7),
+			d,
+			get_month_name(m),
+			y);
+		if (tt->ttime != NO_TIME) {
+		    fprintf(ErrFp, " AT %02d:%02d",
+			    (tt->ttime / 60),
+			    (tt->ttime % 60));
+		    if (tt->duration != NO_TIME) {
+			fprintf(ErrFp, " DURATION %02d:%02d",
+				(tt->duration / 60),
+				(tt->duration % 60));
+		    }
+		}
+		fprintf(ErrFp, "\n");
+	    }
+	    return OK;
+	}
 	p->pos = s;
-	jul++;
+	if (jul+trig->duration_days < start) {
+	    start++;
+	} else {
+	    start = jul+trig->duration_days+1;
+	}
     }
     p->pos = t;
     LastTrigValid = 0;
-    return OK;
+    return E_CANT_TRIG;
 }
 
 /***************************************************************/
@@ -1079,24 +1242,16 @@ int DoMsgCommand(char const *cmd, char const *msg)
     DynamicBuffer execBuffer;
 
     DynamicBuffer buf;
-    char const *s;
 
     DBufInit(&buf);
     DBufInit(&execBuffer);
 
-    /* Escape shell characters in msg INCLUDING WHITESPACE! */
-    for (s=msg; *s; s++) {
-	if (isspace(*s) || !strchr(DontEscapeMe, *s)) {
-	    if (DBufPutc(&buf, '\\') != OK) {
-		r = E_NO_MEM;
-		goto finished;
-	    }
-	}
-	if (DBufPutc(&buf, *s) != OK) {
-	    r = E_NO_MEM;
-	    goto finished;
-	}
+    /* Escape shell characters in msg */
+    if (ShellEscape(msg, &buf) != OK) {
+        r = E_NO_MEM;
+        goto finished;
     }
+
     msg = DBufValue(&buf);
 
     /* Do "%s" substitution */
@@ -1117,7 +1272,7 @@ int DoMsgCommand(char const *cmd, char const *msg)
     }
     r = OK;
 
-    system(DBufValue(&execBuffer));
+    System(DBufValue(&execBuffer));
 
 finished:
     DBufFree(&buf);

src/dosubst.c

@@ -6,8 +6,7 @@
 /*  reminders are triggered.                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -19,9 +18,9 @@
 
 #include <stdlib.h>
 
+#include "types.h"
 #include "globals.h"
 #include "err.h"
-#include "types.h"
 #include "protos.h"
 
 #define UPPER(c) (islower(c) ? toupper(c) : (c))
@@ -220,11 +219,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    L_A_OVER
 #else
 	    if (altmode == '*') {
-		sprintf(s, "%s, %d %s, %d", DayName[jul%7], d,
-			MonthName[m], y);
+		sprintf(s, "%s, %d %s, %d", get_day_name(jul%7), d,
+			get_month_name(m), y);
 	    } else {
-		sprintf(s, "%s %s, %d %s, %d", L_ON, DayName[jul%7], d,
-			MonthName[m], y);
+		sprintf(s, "%s %s, %d %s, %d", L_ON, get_day_name(jul%7), d,
+			get_month_name(m), y);
 	    }
 #endif
 	    SHIP_OUT(s);
@@ -244,9 +243,9 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    L_C_OVER
 #else
 	    if (altmode == '*') {
-		sprintf(s, "%s", DayName[jul%7]);
+		sprintf(s, "%s", get_day_name(jul%7));
 	    } else {
-		sprintf(s, "%s %s", L_ON, DayName[jul%7]);
+		sprintf(s, "%s %s", L_ON, get_day_name(jul%7));
 	    }
 #endif
 	    SHIP_OUT(s);
@@ -294,9 +293,9 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    L_G_OVER
 #else
 	    if (altmode == '*') {
-		sprintf(s, "%s, %d %s", DayName[jul%7], d, MonthName[m]);
+		sprintf(s, "%s, %d %s", get_day_name(jul%7), d, get_month_name(m));
 	    } else {
-		sprintf(s, "%s %s, %d %s", L_ON, DayName[jul%7], d, MonthName[m]);
+		sprintf(s, "%s %s, %d %s", L_ON, get_day_name(jul%7), d, get_month_name(m));
 	    }
 #endif
 	    SHIP_OUT(s);
@@ -333,11 +332,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    L_J_OVER
 #else
 	    if (altmode == '*') {
-		sprintf(s, "%s, %s %d%s, %d", DayName[jul%7],
-			MonthName[m], d, plu, y);
+		sprintf(s, "%s, %s %d%s, %d", get_day_name(jul%7),
+			get_month_name(m), d, plu, y);
 	    } else {
-		sprintf(s, "%s %s, %s %d%s, %d", L_ON, DayName[jul%7],
-			MonthName[m], d, plu, y);
+		sprintf(s, "%s %s, %s %d%s, %d", L_ON, get_day_name(jul%7),
+			get_month_name(m), d, plu, y);
 	    }
 #endif
 	    SHIP_OUT(s);
@@ -348,11 +347,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    L_K_OVER
 #else
 	    if (altmode == '*') {
-		sprintf(s, "%s, %s %d%s", DayName[jul%7],
-			MonthName[m], d, plu);
+		sprintf(s, "%s, %s %d%s", get_day_name(jul%7),
+			get_month_name(m), d, plu);
 	    } else {
-		sprintf(s, "%s %s, %s %d%s", L_ON, DayName[jul%7],
-			MonthName[m], d, plu);
+		sprintf(s, "%s %s, %s %d%s", L_ON, get_day_name(jul%7),
+			get_month_name(m), d, plu);
 	    }
 #endif
 	    SHIP_OUT(s);
@@ -375,7 +374,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_M_OVER
 	    L_M_OVER
 #else
-	    sprintf(s, "%s", MonthName[m]);
+	    sprintf(s, "%s", get_month_name(m));
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -449,11 +448,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    L_U_OVER
 #else
 	    if (altmode == '*') {
-		sprintf(s, "%s, %d%s %s, %d", DayName[jul%7], d,
-			plu, MonthName[m], y);
+		sprintf(s, "%s, %d%s %s, %d", get_day_name(jul%7), d,
+			plu, get_month_name(m), y);
 	    } else {
-		sprintf(s, "%s %s, %d%s %s, %d", L_ON, DayName[jul%7], d,
-			plu, MonthName[m], y);
+		sprintf(s, "%s %s, %d%s %s, %d", L_ON, get_day_name(jul%7), d,
+			plu, get_month_name(m), y);
 	    }
 #endif
 	    SHIP_OUT(s);
@@ -464,11 +463,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    L_V_OVER
 #else
 	    if (altmode == '*') {
-		sprintf(s, "%s, %d%s %s", DayName[jul%7], d, plu,
-			MonthName[m]);
+		sprintf(s, "%s, %d%s %s", get_day_name(jul%7), d, plu,
+			get_month_name(m));
 	    } else {
-		sprintf(s, "%s %s, %d%s %s", L_ON, DayName[jul%7], d, plu,
-			MonthName[m]);
+		sprintf(s, "%s %s, %d%s %s", L_ON, get_day_name(jul%7), d, plu,
+			get_month_name(m));
 	    }
 #endif
 	    SHIP_OUT(s);
@@ -478,7 +477,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #ifdef L_W_OVER
 	    L_W_OVER
 #else
-	    sprintf(s, "%s", DayName[jul%7]);
+	    sprintf(s, "%s", get_day_name(jul%7));
 #endif
 	    SHIP_OUT(s);
 	    break;
@@ -645,10 +644,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    break;
 
 	case '_':
-	    if (mode != CAL_MODE && mode != ADVANCE_MODE && !MsgCommand)
+	    if (PsCal == PSCAL_LEVEL2 || PsCal == PSCAL_LEVEL3 || (mode != CAL_MODE && mode != ADVANCE_MODE && !MsgCommand)) {
 		sprintf(s, "%s", NL);
-	    else
+	    } else {
 		sprintf(s, " ");
+	    }
 	    SHIP_OUT(s);
 	    break;
 
@@ -657,8 +657,8 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 	    break;
 
 	case '"':
-	    if (DBufPutc(dbuf, QUOTE_MARKER) != OK) return E_NO_MEM;
-	    has_quote = 1;
+            if (DBufPutc(dbuf, QUOTE_MARKER) != OK) return E_NO_MEM;
+            has_quote = 1;
 	    break;
 
 	default:

src/dynbuf.c

@@ -6,8 +6,7 @@
 /*  buffers.                                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -28,11 +27,11 @@
  Doubles the size of dynamic buffer until it has room for at least
  'n' characters, not including trailing '\0'
 **********************************************************************/
-static int DBufMakeRoom(DynamicBuffer *dbuf, int n)
+static int DBufMakeRoom(DynamicBuffer *dbuf, size_t n)
 {
     /* Double size until it's greater than n (strictly > to leave room
        for trailing '\0' */
-    int size = dbuf->allocatedLen;
+    size_t size = dbuf->allocatedLen;
     char *buf;
 
     if (size > n) return OK;
@@ -151,7 +150,9 @@ int DBufGets(DynamicBuffer *dbuf, FILE *fp)
        we can usually save some unnecessary copying */
 
     *(dbuf->buffer) = 0;
-    fgets(dbuf->buffer, dbuf->allocatedLen, fp);
+    if (fgets(dbuf->buffer, dbuf->allocatedLen, fp) == NULL) {
+	return OK;
+    }
     if (!*(dbuf->buffer)) return OK;
     dbuf->len = strlen(dbuf->buffer);
     l = dbuf->len - 1;
@@ -163,7 +164,7 @@ int DBufGets(DynamicBuffer *dbuf, FILE *fp)
 
     while(busy) {
 	*tmp = 0;
-	fgets(tmp, 256, fp);
+	if (fgets(tmp, 256, fp) == NULL) return OK;
 	if (!*tmp) return OK;
 	l = strlen(tmp) - 1;
 	if (tmp[l] == '\n') {

src/dynbuf.h

@@ -5,8 +5,7 @@
 /*  Declaration of functions for manipulating dynamic buffers  */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -18,8 +17,8 @@
 #define DBUF_STATIC_SIZE 128
 typedef struct {
     char *buffer;
-    int len;
-    int allocatedLen;
+    size_t len;
+    size_t allocatedLen;
     char staticBuf[DBUF_STATIC_SIZE];
 } DynamicBuffer;
 

src/err.h

@@ -5,8 +5,7 @@
 /*  Error definitions.                                         */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -119,7 +118,8 @@
 #define E_CANT_CONVERT_TZ    99
 #define E_NO_MATCHING_REMS  100
 #define E_STRING_TOO_LONG   101
-
+#define E_TIME_TWICE        102
+#define E_DURATION_NO_AT    103
 #ifdef MK_GLOBALS
 #undef EXTERN
 #define EXTERN
@@ -234,7 +234,9 @@ EXTERN char *ErrMsg[]
     "Bad function in WARN clause",
     "Can't convert between time zones",
     "No files matching *.rem",
-    "String too long"
+    "String too long",
+    "Time specified twice",
+    "Cannot specify DURATION without specifying AT"
 }
 #endif /* MK_GLOBALS */
 ;

src/expr.c

@@ -5,8 +5,7 @@
 /*  This file contains routines to parse and evaluate          */
 /*  expressions.                                               */
 /*                                                             */
-/*  Copyright 1992-1998 by David F. Skoll                      */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright 1992-2021 by Dianne Skoll                        */
 /*                                                             */
 /***************************************************************/
 
@@ -14,6 +13,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
+#include <limits.h>
 
 #include <stdlib.h>
 
@@ -31,7 +31,6 @@
 #define LE 4
 #define NE 5
 
-static char CoerceBuf[512];
 extern int NumFuncs;
 
 static int Multiply(void), Divide(void), Mod(void), Add(void),
@@ -102,7 +101,7 @@ static int DebugPerform(Operator *op)
     fprintf(ErrFp, " => ");
     if (!r) {
 	PrintValue(&ValStack[ValStackPtr-1], ErrFp);
-	Putc('\n', ErrFp);
+	putc('\n', ErrFp);
     } else {
 	fprintf(ErrFp, "%s\n", ErrMsg[r]);
     }
@@ -494,6 +493,8 @@ static int MakeValue(char const *s, Value *v, Var *locals, ParsePtr p)
 {
     int len;
     int h, m, r;
+    int ampm = 0;
+    int prev_val;
 
     if (*s == '\"') { /* It's a literal string "*/
 	len = strlen(s)-1;
@@ -520,9 +521,15 @@ static int MakeValue(char const *s, Value *v, Var *locals, ParsePtr p)
 	return OK;
     } else if (isdigit(*s)) { /* It's a number - use len to hold it.*/
 	len = 0;
+        prev_val = 0;
 	while (*s && isdigit(*s)) {
 	    len *= 10;
 	    len += (*s++ - '0');
+            if (len < prev_val) {
+                /* We overflowed */
+                return E_2HIGH;
+            }
+            prev_val = len;
 	}
 	if (*s == ':' || *s == '.' || *s == TimeSep) { /* Must be a literal time */
 	    s++;
@@ -534,7 +541,27 @@ static int MakeValue(char const *s, Value *v, Var *locals, ParsePtr p)
 		m += *s - '0';
 		s++;
 	    }
+	    /* Check for p[m] or a[m] */
+	    if (*s == 'A' || *s == 'a' || *s == 'P' || *s == 'p') {
+		ampm = tolower(*s);
+		s++;
+		if (*s == 'm' || *s == 'M') {
+		    s++;
+		}
+	    }
 	    if (*s || h>23 || m>59) return E_BAD_TIME;
+	    if (ampm) {
+		if (h < 1 || h > 12) return E_BAD_TIME;
+		if (ampm == 'a') {
+		    if (h == 12) {
+			h = 0;
+		    }
+		} else if (ampm == 'p') {
+		    if (h < 12) {
+			h += 12;
+		    }
+		}
+	    }
 	    v->type = TIME_TYPE;
 	    v->v.val = h*60 + m;
 	    return OK;
@@ -553,7 +580,7 @@ static int MakeValue(char const *s, Value *v, Var *locals, ParsePtr p)
 	if (! (DebugFlag & DB_PRTEXPR)) return r;
 	if (r == OK) {
 	    PrintValue(v, ErrFp);
-	    Putc('\n', ErrFp);
+	    putc('\n', ErrFp);
 	}
 	return r;
     } else { /* Must be a symbol */
@@ -564,7 +591,7 @@ static int MakeValue(char const *s, Value *v, Var *locals, ParsePtr p)
     if (! (DebugFlag & DB_PRTEXPR)) return r;
     if (r == OK) {
 	PrintValue(v, ErrFp);
-	Putc('\n', ErrFp);
+	putc('\n', ErrFp);
     }
     return r;
 }
@@ -579,6 +606,8 @@ int DoCoerce(char type, Value *v)
     int h, d, m, y, i, k;
     char const *s;
 
+    char coerce_buf[128];
+
     /* Do nothing if value is already the right type */
     if (type == v->type) return OK;
 
@@ -606,12 +635,12 @@ int DoCoerce(char type, Value *v)
 	}
     case STR_TYPE:
 	switch(v->type) {
-	case INT_TYPE: sprintf(CoerceBuf, "%d", v->v.val); break;
-	case TIME_TYPE: sprintf(CoerceBuf, "%02d%c%02d", v->v.val / 60,
+	case INT_TYPE: sprintf(coerce_buf, "%d", v->v.val); break;
+	case TIME_TYPE: sprintf(coerce_buf, "%02d%c%02d", v->v.val / 60,
 			       TimeSep, v->v.val % 60);
 	break;
 	case DATE_TYPE: FromJulian(v->v.val, &y, &m, &d);
-	    sprintf(CoerceBuf, "%04d%c%02d%c%02d",
+	    sprintf(coerce_buf, "%04d%c%02d%c%02d",
 		    y, DateSep, m+1, DateSep, d);
 	    break;
 	case DATETIME_TYPE:
@@ -620,13 +649,13 @@ int DoCoerce(char type, Value *v)
 	    k = v->v.val % MINUTES_PER_DAY;
 	    h = k / 60;
 	    i = k % 60;
-	    sprintf(CoerceBuf, "%04d%c%02d%c%02d@%02d%c%02d",
-		    y, DateSep, m+1, DateSep, d, h, TimeSep, i);
+	    sprintf(coerce_buf, "%04d%c%02d%c%02d%c%02d%c%02d",
+		    y, DateSep, m+1, DateSep, d, DateTimeSep, h, TimeSep, i);
 	    break;
 	default: return E_CANT_COERCE;
 	}
 	v->type = STR_TYPE;
-	v->v.str = StrDup(CoerceBuf);
+	v->v.str = StrDup(coerce_buf);
 	if (!v->v.str) {
 	    v->type = ERR_TYPE;
 	    return E_NO_MEM;
@@ -701,26 +730,12 @@ int DoCoerce(char type, Value *v)
 	    return OK;
 
 	case STR_TYPE:
-	    h = 0;
-	    m = 0;
 	    s = v->v.str;
-	    if (!isdigit(*s)) return E_CANT_COERCE;
-	    while (isdigit(*s)) {
-		h *= 10;
-		h += *s++ - '0';
-	    }
-	    if (*s != ':' && *s != '.' && *s != TimeSep)
-		return E_CANT_COERCE;
-	    s++;
-	    if (!isdigit(*s)) return E_CANT_COERCE;
-	    while (isdigit(*s)) {
-		m *= 10;
-		m += *s++ - '0';
-	    }
-	    if (*s || h>23 || m>59) return E_CANT_COERCE;
+	    if (ParseLiteralTime(&s, &i)) return E_CANT_COERCE;
+	    if (*s) return E_CANT_COERCE;
 	    v->type = TIME_TYPE;
 	    free(v->v.str);
-	    v->v.val = h*60+m;
+	    v->v.val = i;
 	    return OK;
 
 	default: return E_CANT_COERCE;
@@ -751,35 +766,49 @@ static int Add(void)
 
 /* If both are ints, just add 'em */
     if (v2.type == INT_TYPE && v1.type == INT_TYPE) {
-	v2.v.val += v1.v.val;
-	PushValStack(v2);
+        int old = v1.v.val;
+	v1.v.val += v2.v.val;
+        /* Check for overflow */
+        if (_private_add_overflow(v1.v.val, v2.v.val, old)) {
+            return E_2HIGH;
+        }
+	PushValStack(v1);
 	return OK;
     }
 
 /* If it's a date plus an int, add 'em */
     if ((v1.type == DATE_TYPE && v2.type == INT_TYPE) ||
 	(v1.type == INT_TYPE && v2.type == DATE_TYPE)) {
+        int old = v1.v.val;
 	v1.v.val += v2.v.val;
+        if (_private_add_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
 	if (v1.v.val < 0) return E_DATE_OVER;
 	v1.type = DATE_TYPE;
 	PushValStack(v1);
 	return OK;
     }
 
-/* If it's a datetime plus an int, add 'em */
-    if ((v1.type == DATETIME_TYPE && v2.type == INT_TYPE) ||
-	(v1.type == INT_TYPE && v2.type == DATETIME_TYPE)) {
+/* If it's a datetime plus an int or a time, add 'em */
+    if ((v1.type == DATETIME_TYPE && (v2.type == INT_TYPE || v2.type == TIME_TYPE)) ||
+	((v1.type == INT_TYPE || v1.type == TIME_TYPE) && v2.type == DATETIME_TYPE)) {
+        int old = v1.v.val;
 	v1.v.val += v2.v.val;
+        if (_private_add_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
 	if (v1.v.val < 0) return E_DATE_OVER;
 	v1.type = DATETIME_TYPE;
 	PushValStack(v1);
 	return OK;
     }
 
-/* If it's a time plus an int, add 'em mod MINUTES_PER_DAY */
+/* If it's a time plus an int or a time plus a time,
+   add 'em mod MINUTES_PER_DAY */
     if ((v1.type == TIME_TYPE && v2.type == INT_TYPE) ||
-	(v1.type == INT_TYPE && v2.type == TIME_TYPE)) {
-	v1.v.val = (v1.v.val + v2.v.val) % MINUTES_PER_DAY;
+	(v1.type == INT_TYPE && v2.type == TIME_TYPE) ||
+	(v1.type == TIME_TYPE && v2.type == TIME_TYPE)) {
+        int old = v1.v.val;
+	v1.v.val += v2.v.val;
+        if (_private_add_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
+	v1.v.val = v1.v.val % MINUTES_PER_DAY;
 	if (v1.v.val < 0) v1.v.val += MINUTES_PER_DAY;
 	v1.type = TIME_TYPE;
 	PushValStack(v1);
@@ -799,7 +828,7 @@ static int Add(void)
 	v3.type = STR_TYPE;
 	l1 = strlen(v1.v.str);
 	l2 = strlen(v2.v.str);
-	if (MaxStringLen && (l1 + l2 > MaxStringLen)) {
+	if (MaxStringLen > 0 && (l1 + l2 > (size_t) MaxStringLen)) {
 	    DestroyValue(v1); DestroyValue(v2);
 	    return E_STRING_TOO_LONG;
 	}
@@ -809,7 +838,7 @@ static int Add(void)
 	    return E_NO_MEM;
 	}
 	strcpy(v3.v.str, v1.v.str);
-	strcat(v3.v.str, v2.v.str);
+	strcpy(v3.v.str+l1, v2.v.str);
 	DestroyValue(v1); DestroyValue(v2);
 	PushValStack(v3);
 	return OK;
@@ -839,22 +868,29 @@ static int Subtract(void)
 
     /* If they're both INTs, do subtraction */
     if (v1.type == INT_TYPE && v2.type == INT_TYPE) {
+        int old = v1.v.val;
 	v1.v.val -= v2.v.val;
+        if (_private_sub_overflow(v1.v.val, v2.v.val, old)) return E_2HIGH;
 	PushValStack(v1);
 	return OK;
     }
 
     /* If it's a date minus an int, do subtraction, checking for underflow */
     if (v1.type == DATE_TYPE && v2.type == INT_TYPE) {
+        int old = v1.v.val;
 	v1.v.val -= v2.v.val;
+        if (_private_sub_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
 	if (v1.v.val < 0) return E_DATE_OVER;
 	PushValStack(v1);
 	return OK;
     }
 
-    /* If it's a datetime minus an int, do subtraction, checking for underflow */
-    if (v1.type == DATETIME_TYPE && v2.type == INT_TYPE) {
+    /* If it's a datetime minus an int or a time, do subtraction,
+     * checking for underflow */
+    if (v1.type == DATETIME_TYPE && (v2.type == INT_TYPE || v2.type == TIME_TYPE)) {
+        int old = v1.v.val;
 	v1.v.val -= v2.v.val;
+        if (_private_sub_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
 	if (v1.v.val < 0) return E_DATE_OVER;
 	PushValStack(v1);
 	return OK;
@@ -872,7 +908,9 @@ static int Subtract(void)
     if ((v1.type == TIME_TYPE && v2.type == TIME_TYPE) ||
 	(v1.type == DATETIME_TYPE && v2.type == DATETIME_TYPE) ||
 	(v1.type == DATE_TYPE && v2.type == DATE_TYPE)) {
+        int old = v1.v.val;
 	v1.v.val -= v2.v.val;
+        if (_private_sub_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
 	v1.type = INT_TYPE;
 	PushValStack(v1);
 	return OK;
@@ -902,7 +940,16 @@ static int Multiply(void)
     }
 
     if (v1.type == INT_TYPE && v2.type == INT_TYPE) {
+        /* Prevent floating-point exception */
+        if ((v2.v.val == -1 && v1.v.val == INT_MIN) ||
+            (v1.v.val == -1 && v2.v.val == INT_MIN)) {
+            return E_2HIGH;
+        }
+        int old = v1.v.val;
 	v1.v.val *= v2.v.val;
+        if (v2.v.val != 0) {
+            if (_private_div(v1.v.val, v2.v.val) != old) return E_2HIGH;
+        }
 	PushValStack(v1);
 	return OK;
     }
@@ -930,6 +977,10 @@ static int Divide(void)
 
     if (v1.type == INT_TYPE && v2.type == INT_TYPE) {
 	if (v2.v.val == 0) return E_DIV_ZERO;
+        /* This is the only way it can overflow */
+        if (v2.v.val == -1 && v1.v.val == INT_MIN) {
+            return E_2HIGH;
+        }
 	v1.v.val /= v2.v.val;
 	PushValStack(v1);
 	return OK;
@@ -1104,7 +1155,9 @@ static int UnMinus(void)
 {
     Value *v = &ValStack[ValStackPtr-1];
     if (v->type != INT_TYPE) return E_BAD_TYPE;
+    int old = v->v.val;
     v->v.val = -v->v.val;
+    if (_private_unminus_overflow(old, v->v.val)) return E_2HIGH;
     return OK;
 }
 
@@ -1179,9 +1232,9 @@ void PrintValue (Value *v, FILE *fp)
 
     if (v->type == STR_TYPE) {
 	s=v->v.str;
-	Putc('"', fp);
-	for (y=0; y<MAX_PRT_LEN && *s; y++) Putc(*s++, fp);
-	Putc('"',fp);
+	putc('"', fp);
+	for (y=0; y<MAX_PRT_LEN && *s; y++) putc(*s++, fp);
+	putc('"',fp);
 	if (*s) fprintf(fp, "...");
     }
     else if (v->type == INT_TYPE) fprintf(fp, "%d", v->v.val);
@@ -1193,7 +1246,7 @@ void PrintValue (Value *v, FILE *fp)
     }
     else if (v->type == DATETIME_TYPE) {
 	FromJulian(v->v.val / MINUTES_PER_DAY, &y, &m, &d);
-	fprintf(fp, "%04d%c%02d%c%02d@%02d%c%02d", y, DateSep, m+1, DateSep, d,
+	fprintf(fp, "%04d%c%02d%c%02d%c%02d%c%02d", y, DateSep, m+1, DateSep, d, DateTimeSep,
 		(v->v.val % MINUTES_PER_DAY) / 60, TimeSep, (v->v.val % MINUTES_PER_DAY) % 60);
     }
     else fprintf(fp, "ERR");
@@ -1219,6 +1272,48 @@ int CopyValue(Value *dest, const Value *src)
     return OK;
 }
 
+int ParseLiteralTime(char const **s, int *tim)
+{
+    int h=0;
+    int m=0;
+    int ampm=0;
+    if (!isdigit(**s)) return E_BAD_TIME;
+    while(isdigit(**s)) {
+	h *= 10;
+	h += *(*s)++ - '0';
+    }
+    if (**s != ':' && **s != '.' && **s != TimeSep) return E_BAD_TIME;
+    (*s)++;
+    if (!isdigit(**s)) return E_BAD_TIME;
+    while(isdigit(**s)) {
+	m *= 10;
+	m += *(*s)++ - '0';
+    }
+    /* Check for p[m] or a[m] */
+    if (**s == 'A' || **s == 'a' || **s == 'P' || **s == 'p') {
+	ampm = tolower(**s);
+	(*s)++;
+	if (**s == 'm' || **s == 'M') {
+	    (*s)++;
+	}
+    }
+    if (h>23 || m>59) return E_BAD_TIME;
+    if (ampm) {
+	if (h < 1 || h > 12) return E_BAD_TIME;
+	if (ampm == 'a') {
+	    if (h == 12) {
+		h = 0;
+	    }
+	} else if (ampm == 'p') {
+	    if (h < 12) {
+		h += 12;
+	    }
+	}
+    }
+    *tim = h * 60 + m;
+    return OK;
+}
+
 /***************************************************************/
 /*                                                             */
 /*  ParseLiteralDate                                           */
@@ -1230,10 +1325,9 @@ int CopyValue(Value *dest, const Value *src)
 int ParseLiteralDate(char const **s, int *jul, int *tim)
 {
     int y, m, d;
-    int hour, min;
+    int r;
 
     y=0; m=0; d=0;
-    hour=0; min=0;
 
     *tim = NO_TIME;
     if (!isdigit(**s)) return E_BAD_DATE;
@@ -1261,22 +1355,11 @@ int ParseLiteralDate(char const **s, int *jul, int *tim)
     *jul = Julian(y, m, d);
 
     /* Do we have a time part as well? */
-    if (**s == ' ' || **s == '@') {
+    if (**s == ' ' || **s == '@' || **s == 'T' || **s == 't') {
 	(*s)++;
-	while(isdigit(**s)) {
-	    hour *= 10;
-	    hour += *(*s)++ - '0';
-	}
-	if (**s != ':' && **s != '.' && **s != TimeSep) return E_BAD_TIME;
-	(*s)++;
-	while(isdigit(**s)) {
-	    min *= 10;
-	    min += *(*s)++ - '0';
-	}
-	if (hour > 23 || min > 59) return E_BAD_TIME;
-	*tim = hour * 60 + min;
+	r = ParseLiteralTime(s, tim);
+	if (r != OK) return r;
     }
-
     return OK;
 }
 

src/expr.h

@@ -5,8 +5,7 @@
 /*  Contains a few definitions used by expression evaluator.   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -54,3 +53,12 @@ if (ValStackPtr <= 0) \
 return E_VA_STK_UNDER; \
 else \
 (val) = ValStack[--ValStackPtr]
+
+/* These functions are in utils.c and are used to detect overflow
+   in various arithmetic operators.  They have to be in separate
+   functions with extern linkage to defeat compiler optimizations
+   that would otherwise break the overflow checks. */
+extern int _private_div(int a, int b);
+extern int _private_add_overflow(int result, int b, int old);
+extern int _private_sub_overflow(int result, int b, int old);
+extern int _private_unminus_overflow(int a, int b);

src/files.c

@@ -7,8 +7,7 @@
 /*  files.                                                     */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -41,8 +40,9 @@
 #include "err.h"
 
 
-/* Convenient macro for closing files */
+/* Convenient macros for closing files */
 #define FCLOSE(fp) (((fp)&&((fp)!=stdin)) ? (fclose(fp),(fp)=NULL) : ((fp)=NULL))
+#define PCLOSE(fp) (((fp)&&((fp)!=stdin)) ? (pclose(fp),(fp)=NULL) : ((fp)=NULL))
 
 /* Define the structures needed by the file caching system */
 typedef struct cache {
@@ -92,12 +92,12 @@ static FILE *fp;
 static IncludeStruct IStack[INCLUDE_NEST];
 static int IStackPtr = 0;
 
-static int ReadLineFromFile (void);
-static int CacheFile (char const *fname);
+static int ReadLineFromFile (int use_pclose);
+static int CacheFile (char const *fname, int use_pclose);
 static void DestroyCache (CachedFile *cf);
 static int CheckSafety (void);
 static int PopFile (void);
-
+static int IncludeCmd(char const *);
 static void OpenPurgeFile(char const *fname, char const *mode)
 {
     DynamicBuffer fname_buf;
@@ -168,7 +168,7 @@ int ReadLine(void)
     }
 
 /* Not cached.  Read from the file. */
-    return ReadLineFromFile();
+    return ReadLineFromFile(0);
 }
 
 /***************************************************************/
@@ -178,9 +178,11 @@ int ReadLine(void)
 /*  Read a line from the file pointed to by fp.                */
 /*                                                             */
 /***************************************************************/
-static int ReadLineFromFile(void)
+static int ReadLineFromFile(int use_pclose)
 {
     int l;
+    char copy_buffer[4096];
+    size_t n;
 
     DynamicBuffer buf;
 
@@ -199,7 +201,11 @@ static int ReadLineFromFile(void)
 	    return E_IO_ERR;
 	}
 	if (feof(fp)) {
-	    FCLOSE(fp);
+            if (use_pclose) {
+                PCLOSE(fp);
+            } else {
+                FCLOSE(fp);
+            }
 	    if ((DBufLen(&buf) == 0) &&
 		(DBufLen(&LineBuffer) == 0) && PurgeMode) {
 		if (PurgeFP != NULL && PurgeFP != stdout) fclose(PurgeFP);
@@ -234,8 +240,29 @@ static int ReadLineFromFile(void)
 	    DBufFree(&LineBuffer);
 	    return E_NO_MEM;
 	}
-	FreshLine = 1;
+	DBufFree(&buf);
+
+	/* If the line is: __EOF__ treat it as end-of-file */
 	CurLine = DBufValue(&LineBuffer);
+	if (!strcmp(CurLine, "__EOF__")) {
+	    if (PurgeMode && PurgeFP) {
+		PurgeEchoLine("%s\n", "__EOF__");
+		while ((n = fread(copy_buffer, 1, sizeof(copy_buffer), fp)) != 0) {
+		    fwrite(copy_buffer, 1, n, PurgeFP);
+		}
+		if (PurgeFP != stdout) fclose(PurgeFP);
+		PurgeFP = NULL;
+	    }
+            if (use_pclose) {
+                PCLOSE(fp);
+            } else {
+                FCLOSE(fp);
+            }
+	    DBufFree(&LineBuffer);
+	    CurLine = DBufValue(&LineBuffer);
+	}
+
+	FreshLine = 1;
 	if (DebugFlag & DB_ECHO_LINE) OutputLine(ErrFp);
 	return OK;
     }
@@ -264,9 +291,6 @@ int OpenFile(char const *fname)
 	PurgeFP = NULL;
     }
 
-/* Assume we own the file for now */
-    RunDisabled &= ~RUN_NOTOWNER;
-
 /* If it's in the cache, get it from there. */
 
     while (h) {
@@ -279,7 +303,9 @@ int OpenFile(char const *fname)
 	    LineNo = 0;
 	    if (!h->ownedByMe) {
 		RunDisabled |= RUN_NOTOWNER;
-	    }
+	    } else {
+		RunDisabled &= ~RUN_NOTOWNER;
+            }
 	    if (FileName) return OK; else return E_NO_MEM;
 	}
 	h = h->next;
@@ -288,6 +314,7 @@ int OpenFile(char const *fname)
 /* If it's a dash, then it's stdin */
     if (!strcmp(fname, "-")) {
 	fp = stdin;
+        RunDisabled &= ~RUN_NOTOWNER;
 	if (PurgeMode) {
 	    PurgeFP = stdout;
 	}
@@ -307,7 +334,7 @@ int OpenFile(char const *fname)
     CLine = NULL;
     if (ShouldCache) {
 	LineNo = 0;
-	r = CacheFile(fname);
+	r = CacheFile(fname, 0);
 	if (r == OK) {
 	    fp = NULL;
 	    CLine = CachedFiles->cache;
@@ -335,7 +362,7 @@ int OpenFile(char const *fname)
 /*  Returns an indication of success or failure.               */
 /*                                                             */
 /***************************************************************/
-static int CacheFile(char const *fname)
+static int CacheFile(char const *fname, int use_pclose)
 {
     int r;
     CachedFile *cf;
@@ -348,16 +375,24 @@ static int CacheFile(char const *fname)
     cl = NULL;
 /* Create a file header */
     cf = NEW(CachedFile);
-    cf->cache = NULL;
     if (!cf) {
 	ShouldCache = 0;
-	FCLOSE(fp);
+        if (use_pclose) {
+            PCLOSE(fp);
+        } else {
+            FCLOSE(fp);
+        }
 	return E_NO_MEM;
     }
+    cf->cache = NULL;
     cf->filename = StrDup(fname);
     if (!cf->filename) {
 	ShouldCache = 0;
-	FCLOSE(fp);
+        if (use_pclose) {
+            PCLOSE(fp);
+        } else {
+            FCLOSE(fp);
+        }
 	free(cf);
 	return E_NO_MEM;
     }
@@ -370,11 +405,15 @@ static int CacheFile(char const *fname)
 
 /* Read the file */
     while(fp) {
-	r = ReadLineFromFile();
+	r = ReadLineFromFile(use_pclose);
 	if (r) {
 	    DestroyCache(cf);
 	    ShouldCache = 0;
-	    FCLOSE(fp);
+            if (use_pclose) {
+                PCLOSE(fp);
+            } else {
+                FCLOSE(fp);
+            }
 	    return r;
 	}
 /* Skip blank chars */
@@ -388,7 +427,11 @@ static int CacheFile(char const *fname)
 		    DBufFree(&LineBuffer);
 		    DestroyCache(cf);
 		    ShouldCache = 0;
-		    FCLOSE(fp);
+                    if (use_pclose) {
+                        PCLOSE(fp);
+                    } else {
+                        FCLOSE(fp);
+                    }
 		    return E_NO_MEM;
 		}
 		cl = cf->cache;
@@ -398,7 +441,11 @@ static int CacheFile(char const *fname)
 		    DBufFree(&LineBuffer);
 		    DestroyCache(cf);
 		    ShouldCache = 0;
-		    FCLOSE(fp);
+                    if (use_pclose) {
+                        PCLOSE(fp);
+                    } else {
+                        FCLOSE(fp);
+                    }
 		    return E_NO_MEM;
 		}
 		cl = cl->next;
@@ -410,7 +457,11 @@ static int CacheFile(char const *fname)
 	    if (!cl->text) {
 		DestroyCache(cf);
 		ShouldCache = 0;
-		FCLOSE(fp);
+                if (use_pclose) {
+                    PCLOSE(fp);
+                } else {
+                    FCLOSE(fp);
+                }
 		return E_NO_MEM;
 	    }
 	}
@@ -453,9 +504,6 @@ static int PopFile(void)
 {
     IncludeStruct *i;
 
-    /* Assume we own the file for now */
-    RunDisabled &= ~RUN_NOTOWNER;
-
     if (!Hush && NumIfs) Eprint("%s", ErrMsg[E_MISS_ENDIF]);
     if (!IStackPtr) return E_EOF;
     i = &IStack[IStackPtr-1];
@@ -482,8 +530,10 @@ static int PopFile(void)
     STRSET(FileName, i->filename);
     if (!i->ownedByMe) {
 	RunDisabled |= RUN_NOTOWNER;
+    } else {
+	RunDisabled &= ~RUN_NOTOWNER;
     }
-    if (!CLine && (i->offset != -1L)) {
+    if (!CLine && (i->offset != -1L || !strcmp(i->filename, "-"))) {
 	/* We must open the file, then seek to specified position */
 	if (strcmp(i->filename, "-")) {
 	    fp = fopen(i->filename, "r");
@@ -507,16 +557,119 @@ static int PopFile(void)
 /*  The INCLUDE command.                                       */
 /*                                                             */
 /***************************************************************/
-int DoInclude(ParsePtr p)
+int DoInclude(ParsePtr p, enum TokTypes tok)
 {
     DynamicBuffer buf;
+    DynamicBuffer fullname;
+    DynamicBuffer path;
     int r, e;
 
+    r = OK;
+    char const *s;
     DBufInit(&buf);
+    DBufInit(&fullname);
+    DBufInit(&path);
     if ( (r=ParseToken(p, &buf)) ) return r;
     e = VerifyEoln(p);
     if (e) Eprint("%s", ErrMsg[e]);
-    if ( (r=IncludeFile(DBufValue(&buf))) ) {
+
+    if (tok == T_IncludeR && *(DBufValue(&buf)) != '/') {
+        /* Relative include: Include relative to dir
+           containing current file */
+        if (DBufPuts(&path, FileName) != OK) {
+            r = E_NO_MEM;
+            goto bailout;
+        }
+        if (DBufLen(&path) == 0) {
+            s = DBufValue(&buf);
+        } else {
+            char *t = DBufValue(&path) + DBufLen(&path) - 1;
+            while (t > DBufValue(&path) && *t != '/') t--;
+            if (*t == '/') {
+                *t = 0;
+                if (DBufPuts(&fullname, DBufValue(&path)) != OK) {
+                    r = E_NO_MEM;
+                    goto bailout;
+                }
+                if (DBufPuts(&fullname, "/") != OK) {
+                    r = E_NO_MEM;
+                    goto bailout;
+                }
+                if (DBufPuts(&fullname, DBufValue(&buf)) != OK) {
+                    r = E_NO_MEM;
+                    goto bailout;
+                }
+                s = DBufValue(&fullname);
+            } else {
+                s = DBufValue(&buf);
+            }
+        }
+    } else {
+        s = DBufValue(&buf);
+    }
+    if ( (r=IncludeFile(s)) ) {
+        goto bailout;
+    }
+
+    NumIfs = 0;
+    IfFlags = 0;
+
+  bailout:
+    DBufFree(&buf);
+    DBufFree(&path);
+    DBufFree(&fullname);
+    return r;
+}
+
+/***************************************************************/
+/*                                                             */
+/*  DoIncludeCmd                                               */
+/*                                                             */
+/*  The INCLUDECMD command.                                    */
+/*                                                             */
+/***************************************************************/
+int DoIncludeCmd(ParsePtr p)
+{
+    DynamicBuffer buf;
+    int r;
+    int ch;
+    char append_buf[2];
+    int seen_nonspace = 0;
+
+    append_buf[1] = 0;
+
+    DBufInit(&buf);
+
+    while(1) {
+        ch = ParseChar(p, &r, 0);
+        if (r) {
+	    DBufFree(&buf);
+	    return r;
+	}
+        if (!ch) {
+            break;
+        }
+        if (isspace(ch) && !seen_nonspace) {
+            continue;
+        }
+        seen_nonspace = 1;
+        /* Convert \n to ' ' to better handle line continuation */
+        if (ch == '\n') {
+            ch = ' ';
+        }
+        append_buf[0] = (char) ch;
+	if (DBufPuts(&buf, append_buf) != OK) {
+	    DBufFree(&buf);
+	    return E_NO_MEM;
+	}
+    }
+
+    if (RunDisabled) {
+        DBufFree(&buf);
+        return E_RUN_DISABLED;
+    }
+
+    if ( (r=IncludeCmd(DBufValue(&buf))) ) {
 	DBufFree(&buf);
 	return r;
     }
@@ -646,6 +799,127 @@ static int SetupGlobChain(char const *dirname, IncludeStruct *i)
 }
 #endif
 
+/***************************************************************/
+/*                                                             */
+/*  IncludeCmd                                                 */
+/*                                                             */
+/*  Process the INCLUDECMD command - actually do the command   */
+/*  inclusion.                                                 */
+/*                                                             */
+/***************************************************************/
+static int IncludeCmd(char const *cmd)
+{
+    IncludeStruct *i;
+    DynamicBuffer buf;
+    FILE *fp2;
+    int r;
+    CachedFile *h;
+    char const *fname;
+    int old_flag;
+
+    FreshLine = 1;
+    if (IStackPtr+1 >= INCLUDE_NEST) return E_NESTED_INCLUDE;
+    i = &IStack[IStackPtr];
+
+    /* Use "cmd|" as the filename */
+    DBufInit(&buf);
+    if (DBufPuts(&buf, cmd) != OK) {
+	DBufFree(&buf);
+	return E_NO_MEM;
+    }
+    if (DBufPuts(&buf, "|") != OK) {
+	DBufFree(&buf);
+	return E_NO_MEM;
+    }
+    fname = DBufValue(&buf);
+
+    if (FileName) {
+	i->filename = StrDup(FileName);
+	if (!i->filename) {
+	    DBufFree(&buf);
+	    return E_NO_MEM;
+	}
+    } else {
+	i->filename = NULL;
+    }
+    i->ownedByMe = 1;
+    i->LineNo = LineNo;
+    i->NumIfs = NumIfs;
+    i->IfFlags = IfFlags;
+    i->CLine = CLine;
+    i->offset = -1L;
+    i->chain = NULL;
+    if (fp) {
+	i->offset = ftell(fp);
+	FCLOSE(fp);
+    }
+    IStackPtr++;
+
+    /* If the file is cached, use it */
+    h = CachedFiles;
+    while(h) {
+        if (!strcmp(fname, h->filename)) {
+            if (DebugFlag & DB_TRACE_FILES) {
+                fprintf(ErrFp, "Reading command `%s': Found in cache\n", fname);
+            }
+            CLine = h->cache;
+            STRSET(FileName, fname);
+            DBufFree(&buf);
+            LineNo = 0;
+            if (!h->ownedByMe) {
+                RunDisabled |= RUN_NOTOWNER;
+            } else {
+                RunDisabled &= ~RUN_NOTOWNER;
+            }
+            if (FileName) return OK; else return E_NO_MEM;
+        }
+        h = h->next;
+    }
+
+    if (DebugFlag & DB_TRACE_FILES) {
+        fprintf(ErrFp, "Executing `%s' for INCLUDECMD and caching as `%s'\n",
+                cmd, fname);
+    }
+
+    /* Not found in cache */
+
+    /* If cmd starts with !, then disable RUN within the cmd output */
+    if (cmd[0] == '!') {
+        fp2 = popen(cmd+1, "r");
+    } else {
+        fp2 = popen(cmd, "r");
+    }
+    if (!fp2) {
+	DBufFree(&buf);
+	return E_CANT_OPEN;
+    }
+    fp = fp2;
+    LineNo = 0;
+
+    /* Temporarily turn of file tracing */
+    old_flag = DebugFlag;
+    DebugFlag &= (~DB_TRACE_FILES);
+
+    if (cmd[0] == '!') {
+        RunDisabled |= RUN_NOTOWNER;
+    }
+    r = CacheFile(fname, 1);
+
+    DebugFlag = old_flag;
+    if (r == OK) {
+	fp = NULL;
+	CLine = CachedFiles->cache;
+	LineNo = 0;
+	STRSET(FileName, fname);
+	DBufFree(&buf);
+	return OK;
+    }
+    DBufFree(&buf);
+    /* We failed */
+    PopFile();
+    return E_CANT_OPEN;
+}
+
 /***************************************************************/
 /*                                                             */
 /*  IncludeFile                                                */
@@ -810,7 +1084,8 @@ int TopLevel(void)
 /*  root, we refuse to open files not owned by root.           */
 /*  We also reject world-writable files, no matter             */
 /*  who we're running as.                                      */
-/*  As a side effect, if we don't own the file, we disable RUN */
+/*  As a side effect, if we don't own the file, or it's not    */
+/*  owned by a trusted user, we disable RUN                    */
 /***************************************************************/
 static int CheckSafety(void)
 {
@@ -848,9 +1123,22 @@ static int CheckSafety(void)
 	return 0;
     }
 
-/* If file is not owned by me, disable RUN command */
-    if (statbuf.st_uid != geteuid()) {
-	RunDisabled |= RUN_NOTOWNER;
+    /* If file is not owned by me or a trusted user, disable RUN command */
+
+    /* Assume unsafe */
+    RunDisabled |= RUN_NOTOWNER;
+    if (statbuf.st_uid == geteuid()) {
+        /* Owned by me... safe */
+	RunDisabled &= ~RUN_NOTOWNER;
+    } else {
+        int i;
+        for (i=0; i<NumTrustedUsers; i++) {
+            if (statbuf.st_uid == TrustedUsers[i]) {
+                /* Owned by a trusted user... safe */
+                RunDisabled &= ~RUN_NOTOWNER;
+                break;
+            }
+        }
     }
 
     return 1;

src/funcs.c

@@ -6,8 +6,7 @@
 /*  expressions.                                               */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -54,90 +53,110 @@
 #define RetVal (info->retval)
 
 /* Function prototypes */
-static int FCurrent (func_info *);
-static int FNonomitted (func_info *);
-static int FTimepart(func_info *);
-static int FDatepart(func_info *);
-static int FRealCurrent(func_info *);
-static	int	FAbs		(func_info *);
-static	int	FAccess		(func_info *);
-static int     FArgs		(func_info *);
-static	int	FAsc		(func_info *);
-static	int	FBaseyr		(func_info *);
-static	int	FChar		(func_info *);
-static	int	FChoose		(func_info *);
-static	int	FCoerce		(func_info *);
-static	int	FDate		(func_info *);
-static	int	FDateTime	(func_info *);
-static	int	FDay		(func_info *);
-static	int	FDaysinmon	(func_info *);
-static	int	FDefined	(func_info *);
-static	int	FDosubst	(func_info *);
-static	int	FEasterdate	(func_info *);
-static  int     FEvalTrig       (func_info *);
-static int	FFiledate	(func_info *);
-static int	FFiledatetime	(func_info *);
-static	int	FFiledir	(func_info *);
-static	int	FFilename	(func_info *);
-static	int	FGetenv		(func_info *);
-static int     FHebdate	(func_info *);
-static int     FHebday		(func_info *);
-static int     FHebmon		(func_info *);
-static int     FHebyear	(func_info *);
-static	int	FHour		(func_info *);
-static	int	FIif		(func_info *);
-static	int	FIndex		(func_info *);
-static	int	FIsdst		(func_info *);
-static	int	FIsomitted	(func_info *);
-static	int	FSlide  	(func_info *);
-static	int	FLanguage	(func_info *);
-static	int	FMax		(func_info *);
-static	int	FMin		(func_info *);
-static	int	FMinute		(func_info *);
-static	int	FMinsfromutc	(func_info *);
-static	int	FMoondate	(func_info *);
-static	int	FMoondatetime	(func_info *);
-static	int	FMoonphase	(func_info *);
-static	int	FMoontime	(func_info *);
-static	int	FMon		(func_info *);
-static	int	FMonnum		(func_info *);
-static	int	FOrd		(func_info *);
-static	int	FOstype 	(func_info *);
-static	int	FPlural		(func_info *);
-static	int	FSgn		(func_info *);
-static int	FPsmoon		(func_info *);
-static int	FPsshade	(func_info *);
-static	int	FShell		(func_info *);
-static	int	FStrlen		(func_info *);
-static	int	FSubstr		(func_info *);
-static	int	FDawn		(func_info *);
-static	int	FDusk	 	(func_info *);
-static	int	FSunset		(func_info *);
-static	int	FSunrise	(func_info *);
-static	int	FTime		(func_info *);
-static	int	FTrigdate	(func_info *);
-static	int	FTrigdatetime	(func_info *);
-static	int	FTrigtime	(func_info *);
-static	int	FTrigvalid	(func_info *);
-static	int	FTypeof		(func_info *);
-static	int	FUpper		(func_info *);
-static	int	FValue		(func_info *);
-static	int	FVersion	(func_info *);
-static	int	FWkday		(func_info *);
-static	int	FWkdaynum	(func_info *);
-static	int	FYear		(func_info *);
-static int	FIsleap         (func_info *);
-static int	FLower          (func_info *);
-static int	FNow            (func_info *);
-static int	FRealnow            (func_info *);
-static int	FRealtoday      (func_info *);
-static int	FToday          (func_info *);
-static int	FTrigger        (func_info *);
-static int      FTzconvert      (func_info *);
-static int      FWeekno         (func_info *);
-static int	CheckArgs       (BuiltinFunc *f, int nargs);
-static int	CleanUpAfterFunc (func_info *);
-static int	SunStuff	(int rise, double cosz, int jul);
+static int FADawn          (func_info *);
+static int FADusk          (func_info *);
+static int FAbs            (func_info *);
+static int FAccess         (func_info *);
+static int FAmpm           (func_info *);
+static int FIsAny          (func_info *);
+static int FArgs           (func_info *);
+static int FAsc            (func_info *);
+static int FBaseyr         (func_info *);
+static int FChar           (func_info *);
+static int FChoose         (func_info *);
+static int FCoerce         (func_info *);
+static int FCurrent        (func_info *);
+static int FDate           (func_info *);
+static int FDateTime       (func_info *);
+static int FDatepart       (func_info *);
+static int FDawn           (func_info *);
+static int FDay            (func_info *);
+static int FDaysinmon      (func_info *);
+static int FDefined        (func_info *);
+static int FDosubst        (func_info *);
+static int FDusk           (func_info *);
+static int FEasterdate     (func_info *);
+static int FEvalTrig       (func_info *);
+static int FFiledate       (func_info *);
+static int FFiledatetime   (func_info *);
+static int FFiledir        (func_info *);
+static int FFilename       (func_info *);
+static int FGetenv         (func_info *);
+static int FHebdate        (func_info *);
+static int FHebday         (func_info *);
+static int FHebmon         (func_info *);
+static int FHebyear        (func_info *);
+static int FHour           (func_info *);
+static int FIif            (func_info *);
+static int FIndex          (func_info *);
+static int FIsdst          (func_info *);
+static int FIsleap         (func_info *);
+static int FIsomitted      (func_info *);
+static int FLanguage       (func_info *);
+static int FLower          (func_info *);
+static int FMax            (func_info *);
+static int FMin            (func_info *);
+static int FMinsfromutc    (func_info *);
+static int FMinute         (func_info *);
+static int FMon            (func_info *);
+static int FMonnum         (func_info *);
+static int FMoondate       (func_info *);
+static int FMoondatetime   (func_info *);
+static int FMoonphase      (func_info *);
+static int FMoontime       (func_info *);
+static int FNDawn          (func_info *);
+static int FNDusk          (func_info *);
+static int FNonomitted     (func_info *);
+static int FNow            (func_info *);
+static int FOrd            (func_info *);
+static int FOstype         (func_info *);
+static int FPlural         (func_info *);
+static int FPsmoon         (func_info *);
+static int FPsshade        (func_info *);
+static int FRealCurrent    (func_info *);
+static int FRealnow        (func_info *);
+static int FRealtoday      (func_info *);
+static int FSgn            (func_info *);
+static int FShell          (func_info *);
+static int FSlide          (func_info *);
+static int FStrlen         (func_info *);
+static int FSubstr         (func_info *);
+static int FSunrise        (func_info *);
+static int FSunset         (func_info *);
+static int FTime           (func_info *);
+static int FTimepart       (func_info *);
+static int FToday          (func_info *);
+static int FTrigback       (func_info *);
+static int FTrigdate       (func_info *);
+static int FTrigdatetime   (func_info *);
+static int FTrigdelta      (func_info *);
+static int FTrigduration   (func_info *);
+static int FTrigeventduration(func_info *);
+static int FTrigeventstart (func_info *);
+static int FTrigfrom       (func_info *);
+static int FTrigger        (func_info *);
+static int FTrigpriority   (func_info *);
+static int FTrigrep        (func_info *);
+static int FTrigscanfrom   (func_info *);
+static int FTrigtime       (func_info *);
+static int FTrigtimedelta  (func_info *);
+static int FTrigtimerep    (func_info *);
+static int FTriguntil      (func_info *);
+static int FTrigvalid      (func_info *);
+static int FTypeof         (func_info *);
+static int FTzconvert      (func_info *);
+static int FUpper          (func_info *);
+static int FValue          (func_info *);
+static int FVersion        (func_info *);
+static int FWeekno         (func_info *);
+static int FWkday          (func_info *);
+static int FWkdaynum       (func_info *);
+static int FYear           (func_info *);
+static int FShellescape    (func_info *);
+
+static int CleanUpAfterFunc (func_info *);
+static int CheckArgs       (BuiltinFunc *f, int nargs);
+static int SunStuff        (int rise, double cosz, int jul);
 
 /* "Overload" the struct Operator definition */
 #define NO_MAX 127
@@ -188,6 +207,9 @@ BuiltinFunc Func[] = {
 
     {   "abs",          1,      1,      1,          FAbs },
     {   "access",       2,      2,      0,          FAccess },
+    {   "adawn",        0,      1,      0,          FADawn},
+    {   "adusk",        0,      1,      0,          FADusk},
+    {   "ampm",         1,      3,      1,          FAmpm   },
     {   "args",         1,      1,      0,          FArgs   },
     {   "asc",          1,      1,      1,          FAsc    },
     {   "baseyr",       0,      0,      1,          FBaseyr },
@@ -218,6 +240,7 @@ BuiltinFunc Func[] = {
     {   "hour",         1,      1,      1,          FHour   },
     {   "iif",          1,      NO_MAX, 1,          FIif    },
     {   "index",        2,      3,      1,          FIndex  },
+    {   "isany",        1,      NO_MAX, 1,          FIsAny  },
     {   "isdst",        0,      2,      0,          FIsdst },
     {   "isleap",       1,      1,      1,          FIsleap },
     {   "isomitted",    1,      1,      0,          FIsomitted },
@@ -233,6 +256,8 @@ BuiltinFunc Func[] = {
     {   "moondatetime", 1,      3,      0,          FMoondatetime },
     {   "moonphase",    0,      2,      0,          FMoonphase },
     {   "moontime",     1,      3,      0,          FMoontime },
+    {   "ndawn",        0,      1,      0,          FNDawn},
+    {   "ndusk",        0,      1,      0,          FNDusk},
     {   "nonomitted",   2,      NO_MAX, 0,          FNonomitted },
     {   "now",          0,      0,      0,          FNow    },
     {   "ord",          1,      1,      1,          FOrd    },
@@ -245,6 +270,7 @@ BuiltinFunc Func[] = {
     {   "realtoday",    0,      0,      0,          FRealtoday },
     {   "sgn",          1,      1,      1,          FSgn    },
     {   "shell",        1,      2,      0,          FShell  },
+    {   "shellescape",  1,      1,      1,          FShellescape },
     {   "slide",        2,      NO_MAX, 0,          FSlide  },
     {   "strlen",       1,      1,      1,          FStrlen },
     {   "substr",       2,      3,      1,          FSubstr },
@@ -253,10 +279,22 @@ BuiltinFunc Func[] = {
     {   "time",         2,      2,      1,          FTime   },
     {   "timepart",     1,      1,      1,          FTimepart },
     {   "today",        0,      0,      0,          FToday  },
+    {   "trigback",     0,      0,      0,          FTrigback },
     {   "trigdate",     0,      0,      0,          FTrigdate },
     {   "trigdatetime", 0,      0,      0,          FTrigdatetime },
+    {   "trigdelta",    0,      0,      0,          FTrigdelta },
+    {   "trigduration", 0,      0,      0,          FTrigduration },
+    {   "trigeventduration", 0, 0,      0,          FTrigeventduration },
+    {   "trigeventstart", 0,    0,      0,          FTrigeventstart },
+    {   "trigfrom",     0,      0,      0,          FTrigfrom },
     {   "trigger",      1,      3,      0,          FTrigger },
+    {   "trigpriority", 0,      0,      0,          FTrigpriority },
+    {   "trigrep",      0,      0,      0,          FTrigrep },
+    {   "trigscanfrom", 0,      0,      0,          FTrigscanfrom },
     {   "trigtime",     0,      0,      0,          FTrigtime },
+    {   "trigtimedelta",0,      0,      0,          FTrigtimedelta },
+    {   "trigtimerep",  0,      0,      0,          FTrigtimerep },
+    {   "triguntil",    0,      0,      0,          FTriguntil },
     {   "trigvalid",    0,      0,      0,          FTrigvalid },
     {   "typeof",       1,      1,      1,          FTypeof },
     {   "tzconvert",    2,      3,      0,          FTzconvert },
@@ -373,8 +411,9 @@ static int RetStrVal(char const *s, func_info *info)
     if (!s) {
 	RetVal.v.str = malloc(1);
 	if (RetVal.v.str) *RetVal.v.str = 0;
-    } else
+    } else {
 	RetVal.v.str = StrDup(s);
+    }
 
     if (!RetVal.v.str) {
 	RetVal.type = ERR_TYPE;
@@ -394,7 +433,9 @@ static int FStrlen(func_info *info)
     Value *v = &ARG(0);
     if (v->type != STR_TYPE) return E_BAD_TYPE;
     RetVal.type = INT_TYPE;
-    RETVAL = strlen(v->v.str);
+    size_t l = strlen(v->v.str);
+    if (l > INT_MAX) return E_2HIGH;
+    RETVAL = (int) l;
     return OK;
 }
 
@@ -750,8 +791,8 @@ static int FWkday(func_info *info)
 	/* Convert 0=Sun to 0=Mon */
 	ARGV(0)--;
 	if (ARGV(0) < 0) ARGV(0) = 6;
-	s = DayName[ARGV(0)];
-    } else s = DayName[DATEPART(ARG(0)) % 7];
+	s = get_day_name(ARGV(0));
+    } else s = get_day_name(DATEPART(ARG(0)) % 7);
     return RetStrVal(s, info);
 }
 
@@ -778,7 +819,7 @@ static int FMon(func_info *info)
 	    CacheDay = d;
 	}
     }
-    s = MonthName[m];
+    s = get_month_name(m);
     return RetStrVal(s, info);
 }
 
@@ -832,12 +873,14 @@ static int FTime(func_info *info)
 /***************************************************************/
 static int FAbs(func_info *info)
 {
-    int v;
+    volatile int v;
 
     ASSERT_TYPE(0, INT_TYPE);
     v = ARGV(0);
     RetVal.type = INT_TYPE;
     RETVAL = (v < 0) ? (-v) : v;
+    v = RETVAL;
+    if (v < 0) return E_2HIGH;
     return OK;
 }
 
@@ -854,6 +897,76 @@ static int FSgn(func_info *info)
     return OK;
 }
 
+/***************************************************************/
+/*                                                             */
+/*  FAmpm - return a time as a string with "AM" or "PM" suffix */
+/*                                                             */
+/***************************************************************/
+static int FAmpm(func_info *info)
+{
+    int h, m;
+    int yr=0, mo=0, da=0;
+
+    char const *am = "AM";
+    char const *pm = "PM";
+    char const *ampm = NULL;
+
+    char outbuf[128];
+
+    if (ARG(0).type != DATETIME_TYPE && ARG(0).type != TIME_TYPE) {
+	return E_BAD_TYPE;
+    }
+    if (HASDATE(ARG(0))) {
+	FromJulian(DATEPART(ARG(0)), &yr, &mo, &da);
+    }
+    if (Nargs >= 2) {
+	ASSERT_TYPE(1, STR_TYPE);
+	am = ARGSTR(1);
+	if (Nargs >= 3) {
+	    ASSERT_TYPE(2, STR_TYPE);
+	    pm = ARGSTR(2);
+	}
+    }
+    h = TIMEPART(ARG(0)) / 60;
+    m = TIMEPART(ARG(0)) % 60;
+    if (h <= 11) {
+	/* AM */
+	if (h == 0) {
+	    if (ARG(0).type == DATETIME_TYPE) {
+		snprintf(outbuf, sizeof(outbuf), "%04d%c%02d%c%02d%c12%c%02d", yr, DateSep, mo+1, DateSep, da, DateTimeSep, TimeSep, m);
+	    } else {
+		snprintf(outbuf, sizeof(outbuf), "12%c%02d", TimeSep, m);
+	    }
+	} else {
+	    if (ARG(0).type == DATETIME_TYPE) {
+		snprintf(outbuf, sizeof(outbuf), "%04d%c%02d%c%02d%c%d%c%02d", yr, DateSep, mo+1, DateSep, da, DateTimeSep, h, TimeSep, m);
+	    } else {
+		snprintf(outbuf, sizeof(outbuf), "%d%c%02d", h, TimeSep, m);
+	    }
+	}
+	ampm = am;
+    } else {
+	if (h > 12) {
+	    h -= 12;
+	}
+	if (ARG(0).type == DATETIME_TYPE) {
+	    snprintf(outbuf, sizeof(outbuf), "%04d%c%02d%c%02d%c%d%c%02d", yr, DateSep, mo+1, DateSep, da, DateTimeSep, h, TimeSep, m);
+	} else {
+	    snprintf(outbuf, sizeof(outbuf), "%d%c%02d", h, TimeSep, m);
+	}
+	ampm = pm;
+    }
+    RetVal.type = STR_TYPE;
+    RetVal.v.str = malloc(strlen(outbuf) + strlen(ampm) + 1);
+    if (!RetVal.v.str) {
+	RetVal.type = ERR_TYPE;
+	return E_NO_MEM;
+    }
+    strcpy(RetVal.v.str, outbuf);
+    strcat(RetVal.v.str, ampm);
+    return OK;
+}
+
 /***************************************************************/
 /*                                                             */
 /*  FOrd - returns a string containing ordinal number.         */
@@ -925,6 +1038,36 @@ static int FPlural(func_info *info)
     }
 }
 
+/***************************************************************/
+/*                                                             */
+/*  FIsAny                                                     */
+/*  Return 1 if the first arg equals any subsequent arg, 0     */
+/*  otherwise.                                                 */
+/*                                                             */
+/***************************************************************/
+static int FIsAny(func_info *info)
+{
+    int i;
+    RetVal.type = INT_TYPE;
+    RETVAL = 0;
+    for (i=1; i<Nargs; i++) {
+        if (ARG(0).type == ARG(i).type) {
+            if (ARG(0).type == STR_TYPE) {
+                if (!strcmp(ARGSTR(0), ARGSTR(i))) {
+                    RETVAL = 1;
+                    return OK;
+                }
+            } else {
+                if (ARGV(0) == ARGV(i)) {
+                    RETVAL = 1;
+                    return OK;
+                }
+            }
+        }
+    }
+    return OK;
+}
+
 /***************************************************************/
 /*                                                             */
 /*  FChoose                                                    */
@@ -966,6 +1109,28 @@ static int FOstype(func_info *info)
     return RetStrVal("UNIX", info);
 }
 
+/***************************************************************/
+/*                                                             */
+/*  FShellescape - escape shell meta-characters                */
+/*                                                             */
+/***************************************************************/
+static int FShellescape(func_info *info)
+{
+    DynamicBuffer buf;
+    int r;
+
+    ASSERT_TYPE(0, STR_TYPE);
+    DBufInit (&buf);
+    if (ShellEscape(ARG(0).v.str, &buf) != OK) {
+        DBufFree(&buf);
+        return E_NO_MEM;
+    }
+
+    r = RetStrVal(DBufValue(&buf), info);
+    DBufFree(&buf);
+    return r;
+}
+
 /***************************************************************/
 /*                                                             */
 /*  FUpper - convert string to upper-case                      */
@@ -1130,6 +1295,120 @@ static int FTrigdate(func_info *info)
     return OK;
 }
 
+static int FTrigback(func_info *info)
+{
+    RetVal.type = INT_TYPE;
+    RETVAL = LastTrigger.back;
+    return OK;
+}
+
+static int FTrigdelta(func_info *info)
+{
+    RetVal.type = INT_TYPE;
+    RETVAL = LastTrigger.delta;
+    return OK;
+}
+
+static int FTrigtimedelta(func_info *info)
+{
+    RetVal.type = INT_TYPE;
+    RETVAL = LastTimeTrig.delta;
+    return OK;
+}
+
+static int FTrigtimerep(func_info *info)
+{
+    RetVal.type = INT_TYPE;
+    RETVAL = LastTimeTrig.rep;
+    return OK;
+}
+
+static int FTrigeventduration(func_info *info)
+{
+    if (LastTrigger.eventduration == NO_TIME) {
+	RetVal.type = INT_TYPE;
+	RETVAL = -1;
+    } else {
+	RetVal.type = TIME_TYPE;
+	RETVAL = LastTrigger.eventduration;
+    }
+    return OK;
+}
+
+static int FTrigeventstart(func_info *info)
+{
+    if (LastTrigger.eventstart == NO_TIME) {
+	RetVal.type = INT_TYPE;
+	RETVAL = -1;
+    } else {
+	RetVal.type = DATETIME_TYPE;
+	RETVAL = LastTrigger.eventstart;
+    }
+    return OK;
+}
+
+static int FTrigduration(func_info *info)
+{
+    if (LastTimeTrig.duration == NO_TIME) {
+	RetVal.type = INT_TYPE;
+	RETVAL = -1;
+    } else {
+	RetVal.type = TIME_TYPE;
+	RETVAL = LastTimeTrig.duration;
+    }
+    return OK;
+}
+
+static int FTrigrep(func_info *info)
+{
+    RetVal.type = INT_TYPE;
+    RETVAL = LastTrigger.rep;
+    return OK;
+}
+
+static int FTrigpriority(func_info *info)
+{
+    RetVal.type = INT_TYPE;
+    RETVAL = LastTrigger.priority;
+    return OK;
+}
+
+static int FTriguntil(func_info *info)
+{
+    if (LastTrigger.until == NO_UNTIL) {
+	RetVal.type = INT_TYPE;
+	RETVAL = -1;
+    } else {
+	RetVal.type = DATE_TYPE;
+	RETVAL = LastTrigger.until;
+    }
+    return OK;
+}
+
+static int FTrigscanfrom(func_info *info)
+{
+    if (LastTrigger.scanfrom == NO_DATE) {
+	RetVal.type = INT_TYPE;
+	RETVAL = -1;
+    } else {
+	RetVal.type = DATE_TYPE;
+	RETVAL = LastTrigger.scanfrom;
+    }
+    return OK;
+}
+
+static int FTrigfrom(func_info *info)
+{
+    if (LastTrigger.from == NO_DATE) {
+	RetVal.type = INT_TYPE;
+	RETVAL = -1;
+    } else {
+	RetVal.type = DATE_TYPE;
+	RETVAL = LastTrigger.from;
+    }
+    return OK;
+}
+
 static int FTrigvalid(func_info *info)
 {
     RetVal.type = INT_TYPE;
@@ -1295,6 +1574,15 @@ static int FShell(func_info *info)
 	ASSERT_TYPE(1, INT_TYPE);
 	maxlen = ARGV(1);
     }
+
+    /* Don't allow maxlen to exceed the maximum length of
+       a string variable */
+    if (MaxStringLen > 0) {
+        if (maxlen <= 0 || maxlen > MaxStringLen) {
+            maxlen = MaxStringLen;
+        }
+    }
+
     fp = popen(ARGSTR(0), "r");
     if (!fp) return E_IO_ERR;
     while (1) {
@@ -1308,7 +1596,7 @@ static int FShell(func_info *info)
 	    DBufFree(&buf);
 	    return E_NO_MEM;
 	}
-	if (maxlen > 0 && DBufLen(&buf) >= maxlen) {
+	if (maxlen > 0 && DBufLen(&buf) >= (size_t) maxlen) {
 	    break;
 	}
     }
@@ -1869,18 +2157,11 @@ static int SunStuff(int rise, double cosz, int jul)
     } else mins = MinsFromUTC;
 
 /* Get latitude and longitude */
-    longdeg = (double) LongDeg + (double) LongMin / 60.0
-	+ (double) LongSec / 3600.0;
-
-    latitude = DEGRAD * ((double) LatDeg + (double) LatMin / 60.0
-		         + (double) LatSec / 3600.0);
-
+    longdeg = -Longitude;
+    latitude = DEGRAD * Latitude;
 
     FromJulian(jul, &year, &mon, &day);
 
-    if (rise > 1)
-	rise -= 2;
-
 /* Following formula on page B6 exactly... */
     t = (double) jul;
     if (rise) {
@@ -1915,10 +2196,10 @@ static int SunStuff(int rise, double cosz, 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;
@@ -1936,9 +2217,9 @@ static int SunStuff(int rise, double cosz, int jul)
 
     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;
@@ -1949,7 +2230,7 @@ static int SunStuff(int rise, double cosz, int jul)
 
     hours = (int) local;
     mins = (int) ((local - hours) * 60.0);
-    
+
     /* Sometimes, we get roundoff error.  Check for "reasonableness" of
        answer. */
     if (rise) {
@@ -1970,19 +2251,30 @@ static int SunStuff(int rise, double cosz, int jul)
 static int FSun(int rise, func_info *info)
 {
     int jul = JulianToday;
-    double cosz = -0.014543897;  /* for sunrise and sunset */
+    /* Assignment below is not necessary, but it silences
+       a GCC warning about a possibly-uninitialized variable */
+    double cosz = 0.0;
     int r;
 
+    if (rise == 0 || rise == 1) {
+    /* Sunrise and sunset : cos(90 degrees + 50 arcminutes) */
+    cosz = -0.01454389765158243;
+    } else if (rise == 2 || rise == 3) {
     /* Civil twilight: cos(96 degrees) */
-    if (rise == 2 || rise == 3) {
-	cosz = -0.104528463268;
+	cosz = -0.10452846326765333;
+    } else if (rise == 4 || rise == 5) {
+    /* Nautical twilight: cos(102 degrees) */
+	cosz = -0.20791169081775912;
+    } else if (rise == 6 || rise == 7) {
+    /* Astronomical twilight: cos(108 degrees) */
+	cosz = -0.30901699437494734;
     }
     if (Nargs >= 1) {
 	if (!HASDATE(ARG(0))) return E_BAD_TYPE;
 	jul = DATEPART(ARG(0));
     }
 
-    r = SunStuff(rise, cosz, jul);
+    r = SunStuff(rise % 2, cosz, jul);
     if (r == NO_TIME) {
 	RETVAL = 0;
 	RetVal.type = INT_TYPE;
@@ -2014,6 +2306,24 @@ static int FDusk(func_info *info)
     return FSun(2, info);
 }
 
+static int FNDawn(func_info *info)
+{
+    return FSun(5, info);
+}
+static int FNDusk(func_info *info)
+{
+    return FSun(4, info);
+}
+
+static int FADawn(func_info *info)
+{
+    return FSun(7, info);
+}
+static int FADusk(func_info *info)
+{
+    return FSun(6, info);
+}
+
 /***************************************************************/
 /*                                                             */
 /*  FFiledate                                                  */
@@ -2102,6 +2412,7 @@ static int FPsshade(func_info *info)
     if (!psshade_warned) {
 	psshade_warned = 1;
 	Eprint("psshade() is deprecated; use SPECIAL SHADE instead.");
+        FreshLine = 1;
     }
 
     sprintf(s, "/_A LineWidth 2 div def ");
@@ -2157,6 +2468,7 @@ static int FPsmoon(func_info *info)
     if (!psmoon_warned) {
 	psmoon_warned = 1;
 	Eprint("psmoon() is deprecated; use SPECIAL MOON instead.");
+        FreshLine = 1;
     }
     if (size > 0) {
 	sprintf(sizebuf, "%d", size);
@@ -2389,16 +2701,16 @@ static int tz_set_tz(char const *tz)
        unsetenv("TZ");
        r = 0;
     } else {
-        r = setenv("TZ", tz, 1);
+	r = setenv("TZ", tz, 1);
     }
     tzset();
     return r;
 }
 
 static int tz_convert(int year, int month, int day,
-                      int hour, int minute,
-                      char const *src_tz, char const *tgt_tz,
-                      struct tm *tm)
+		      int hour, int minute,
+		      char const *src_tz, char const *tgt_tz,
+		      struct tm *tm)
 {
     int r;
     time_t t;
@@ -2419,28 +2731,28 @@ static int tz_convert(int year, int month, int day,
     /* backup old TZ env var */
     old_tz = getenv("TZ");
     if (tgt_tz == NULL) {
-        tgt_tz = old_tz;
+	tgt_tz = old_tz;
     }
 
     /* set source TZ */
     r = tz_set_tz(src_tz);
     if (r == -1) {
-        return -1;
+	return -1;
     }
 
     /* create timestamp in UTC */
     t = mktime(tm);
 
     if (t == (time_t) -1) {
-        tz_set_tz(old_tz);
-        return -1;
+	tz_set_tz(old_tz);
+	return -1;
     }
 
     /* set target TZ */
     r = tz_set_tz(tgt_tz);
     if (r == -1) {
-        tz_set_tz(old_tz);
-        return -1;
+	tz_set_tz(old_tz);
+	return -1;
     }
 
     /* convert to target TZ */
@@ -2451,9 +2763,9 @@ static int tz_convert(int year, int month, int day,
 
     /* return result */
     if (res == NULL) {
-        return -1;
+	return -1;
     } else {
-        return 1;
+	return 1;
     }
 }
 
@@ -2524,6 +2836,7 @@ FSlide(func_info *info)
     } else {
 	while(amt) {
 	    d--;
+	    if (d < 0) return E_DATE_OVER;
 	    r = IsOmitted(d, localomit, NULL,&omit);
 	    if (r) return r;
 	    if (!omit) amt++;
@@ -2664,13 +2977,17 @@ FEvalTrig(func_info *info)
 	return E_PARSE_ERR;
     }
     if (scanfrom == NO_DATE) {
-	jul = ComputeTrigger(trig.scanfrom, &trig, &r, 0);
+	jul = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 0);
     } else {
 	/* Hokey... */
 	if (trig.scanfrom != JulianToday) {
 	    Eprint("Warning: SCANFROM is ignored in two-argument form of evaltrig()");
 	}
-	jul = ComputeTrigger(scanfrom, &trig, &r, 0);
+	jul = ComputeTrigger(scanfrom, &trig, &tim, &r, 0);
+    }
+    if (r == E_CANT_TRIG && trig.maybe_uncomputable) {
+        r = 0;
+        jul = -1;
     }
     FreeTrig(&trig);
     if (r) return r;

src/globals.c

@@ -8,8 +8,7 @@
 /*  globals.h and err.h                                        */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -18,6 +17,6 @@
 #include <stdio.h>   /* For defintion of FILE - sigh! */
 #include "types.h"
 #include "custom.h"
-#define MK_GLOBALS
+#define MK_GLOBALS 1
 #include "globals.h"
 #include "err.h"

src/globals.h

@@ -7,8 +7,7 @@
 /*  MK_GLOBALS.  Also contains useful macro definitions.       */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -22,6 +21,12 @@
 #define INIT(var, val) var
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#define MAX_TRUSTED_USERS 20
+
 #define MINUTES_PER_DAY 1440
 
 #define DaysInYear(y) (((y) % 4) ? 365 : ((!((y) % 100) && ((y) % 400)) ? 365 : 366 ))
@@ -37,6 +42,9 @@ EXTERN	int	CurMon;
 EXTERN	int	CurYear;
 EXTERN  int	LineNo;
 EXTERN  int     FreshLine;
+EXTERN  uid_t   TrustedUsers[MAX_TRUSTED_USERS];
+
+EXTERN  INIT(   int     NumTrustedUsers, 0);
 EXTERN  INIT(   char    const *MsgCommand, NULL);
 EXTERN  INIT(	int     ShowAllErrors, 0);
 EXTERN  INIT(	int     DebugFlag, 0);
@@ -47,12 +55,13 @@ EXTERN  INIT(   int     DoPrefixLineNo, 0);
 EXTERN	INIT(	int	MondayFirst, 0);
 EXTERN	INIT(	int	Iterations, 1);
 EXTERN  INIT(   int     PsCal, 0);
-EXTERN  INIT(   int     CalWidth, 80);
+EXTERN  INIT(   int     CalWidth, -1);
 EXTERN  INIT(   int     CalWeeks, 0);
 EXTERN  INIT(   int     CalMonths, 0);
 EXTERN  INIT(	int 	Hush, 0);
 EXTERN  INIT(	int 	NextMode, 0);
 EXTERN  INIT(	int 	InfiniteDelta, 0);
+EXTERN  INIT(   int     DefaultTDelta, 0);
 EXTERN  INIT(   int     DeltaOffset, 0);
 EXTERN  INIT(   int     RunDisabled, 0);
 EXTERN  INIT(   int     IgnoreOnce, 0);
@@ -73,6 +82,10 @@ EXTERN  INIT(   int     DontIssueAts, 0);
 EXTERN  INIT(   int     Daemon, 0);
 EXTERN  INIT(   char    DateSep, DATESEP);
 EXTERN  INIT(   char    TimeSep, TIMESEP);
+EXTERN  INIT(   char    DateTimeSep, DATETIMESEP);
+EXTERN  INIT(   int     DefaultColorR, -1);
+EXTERN  INIT(   int     DefaultColorB, -1);
+EXTERN  INIT(   int     DefaultColorG, -1);
 EXTERN  INIT(   int     SynthesizeTags, 0);
 EXTERN  INIT(   int     ScFormat, SC_AMPM);
 EXTERN  INIT(   int     MaxSatIter, 150);
@@ -85,8 +98,10 @@ EXTERN  FILE *ErrFp;
 EXTERN  INIT(   FILE    *PurgeFP,  NULL);
 EXTERN  INIT(   int     NumIfs,    0);
 EXTERN  INIT(   unsigned int IfFlags,   0);
-EXTERN  INIT(   int     LastTriggerDate, 0);
 EXTERN  INIT(   int     LastTrigValid, 0);
+EXTERN  Trigger  LastTrigger;
+EXTERN  TimeTrig LastTimeTrig;
+EXTERN  INIT(   int     LastTriggerDate, 0);
 EXTERN  INIT(   int     LastTriggerTime, 0);
 EXTERN  INIT(   int     ShouldCache, 0);
 EXTERN  char const   *CurLine;
@@ -98,14 +113,20 @@ EXTERN  INIT(   int     CalPad, 1);
 EXTERN  INIT(   int     UseVTChars, 0);
 EXTERN  INIT(   int     UseUTF8Chars, 0);
 EXTERN  INIT(   int     UseVTColors, 0);
+EXTERN  INIT(   int     Use256Colors, 0);
+EXTERN  INIT(   int     UseTrueColors, 0);
+EXTERN  INIT(   int     TerminalBackground, TERMINAL_BACKGROUND_UNKNOWN);
 
 /* Latitude and longitude */
-EXTERN  INIT(	int	  LatDeg, LAT_DEG);
-EXTERN  INIT(	int	  LatMin, LAT_MIN);
-EXTERN  INIT(	int	  LatSec, LAT_SEC);
-EXTERN  INIT(	int	  LongDeg, LON_DEG);
-EXTERN  INIT(	int	  LongMin, LON_MIN);
-EXTERN  INIT(	int	  LongSec, LON_SEC);
+EXTERN  INIT(	int	  LatDeg, 0);
+EXTERN  INIT(	int	  LatMin, 0);
+EXTERN  INIT(	int	  LatSec, 0);
+EXTERN  INIT(	int	  LongDeg, 0);
+EXTERN  INIT(	int	  LongMin, 0);
+EXTERN  INIT(	int	  LongSec, 0);
+EXTERN  INIT(   double    Longitude, DEFAULT_LONGITUDE);
+EXTERN  INIT(   double    Latitude, DEFAULT_LATITUDE);
+
 EXTERN	INIT(	char	  *Location, LOCATION);
 
 /* UTC calculation stuff */
@@ -147,6 +168,17 @@ EXTERN	char	*MonthName[]
 ;
 #endif
 
+EXTERN char *DynamicMonthName[]
+#ifdef MK_GLOBALS
+#if LANG == ENGLISH
+= {"January", "February", "March", "April", "May", "June",
+   "July", "August", "September", "October", "November", "December"}
+#else
+= {L_JAN, L_FEB, L_MAR, L_APR, L_MAY, L_JUN,
+   L_JUL, L_AUG, L_SEP, L_OCT, L_NOV, L_DEC}
+#endif
+#endif
+;
 EXTERN  char	*EnglishDayName[]
 #ifdef MK_GLOBALS
 = {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
@@ -165,6 +197,18 @@ EXTERN	char	*DayName[]
 ;
 #endif
 
+EXTERN char *DynamicDayName []
+#ifdef MK_GLOBALS
+#if LANG == ENGLISH
+= {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
+   "Saturday", "Sunday"}
+#else
+= {L_MONDAY, L_TUESDAY, L_WEDNESDAY, L_THURSDAY, L_FRIDAY,
+   L_SATURDAY, L_SUNDAY}
+#endif
+#endif
+;
+
 EXTERN	int	MonthDays[]
 #ifdef MK_GLOBALS
 = {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}

src/hbcal.c

@@ -5,8 +5,7 @@
 /*  Support for the Hebrew calendar                            */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /*  Derived from code written by Amos Shapir in 1978; revised  */
 /*  1985.                                                      */
@@ -139,8 +138,8 @@ int DaysInHebYear(int y)
 /***************************************************************/
 char const *DaysInHebMonths(int ylen)
 {
-    static char monlen[13] =
-    {30, 29, 30, 29, 30, 0, 29, 30, 29, 30, 29, 30, 29};
+    static char monlen[14] =
+	{30, 29, 30, 29, 30, 0, 29, 30, 29, 30, 29, 30, 29, 29};
 
 
     if (ylen > 355) {

src/init.c

@@ -7,8 +7,7 @@
 /*  in normal mode.                                            */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2011 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -24,6 +23,11 @@
 #include <sys/types.h>
 #include <pwd.h>
 #include <unistd.h>
+#include <sys/ioctl.h>
+
+#ifdef HAVE_INITGROUPS
+#include <grp.h>
+#endif
 
 #include "types.h"
 #include "protos.h"
@@ -39,6 +43,7 @@
  *             simple calendar format.
  *  -r       = Disallow RUN mode
  *  -c[n]    = Produce a calendar for n months (default = 1)
+ *  -@[n,m]  = Colorize n=0 VT100 n=1 85 n=2 True m=0 dark terminal m=1 light
  *  -w[n,n,n] = Specify output device width, padding and spacing
  *  -s[n]    = Produce calendar in "simple calendar" format
  *  -p[n]    = Produce calendar in format compatible with rem2ps
@@ -71,9 +76,6 @@
  *  A minus sign alone indicates to take input from stdin
  *
  **************************************************************/
-#if defined(__APPLE__) || defined(__CYGWIN__)
-static void rkrphgvba(int x);
-#endif
 
 /* For parsing an integer */
 #define PARSENUM(var, s)   \
@@ -88,6 +90,7 @@ static void ChgUser(char const *u);
 static void InitializeVar(char const *str);
 
 static char const *BadDate = "Illegal date on command line\n";
+static void AddTrustedUser(char const *username);
 
 static DynamicBuffer default_filename_buf;
 
@@ -113,7 +116,7 @@ static char const *DefaultFilename(void)
     s = getenv("HOME");
     if (!s) {
 	fprintf(stderr, "HOME environment variable not set.  Unable to determine reminder file.\n");
-	exit(1);
+	exit(EXIT_FAILURE);
     }
     DBufPuts(&default_filename_buf, s);
     DBufPuts(&default_filename_buf, "/.reminders");
@@ -136,17 +139,22 @@ void InitRemind(int argc, char const *argv[])
     int InvokedAsRem = 0;
     char const *s;
     int weeks;
-
+    int x;
     int jul;
 
-#if defined(__APPLE__)
-    rkrphgvba(0);
-#elif defined(__CYGWIN__)
-    rkrphgvba(1);
-#endif
-
     jul = NO_DATE;
 
+    /* If stdout is a terminal, initialize $FormWidth to terminal width-8,
+       but clamp to [20, 500] */
+    if (isatty(STDOUT_FILENO)) {
+	struct winsize w;
+	if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) == 0) {
+	    FormWidth = w.ws_col - 8;
+	    if (FormWidth < 20) FormWidth = 20;
+	    if (FormWidth > 500) FormWidth = 500;
+	}
+    }
+    
     /* Initialize global dynamic buffers */
     DBufInit(&Banner);
     DBufInit(&LineBuffer);
@@ -160,7 +168,7 @@ void InitRemind(int argc, char const *argv[])
     if (getgid() != getegid() ||
 	getuid() != geteuid()) {
 	fprintf(ErrFp, "\nRemind should not be installed set-uid or set-gid.\nCHECK YOUR SYSTEM SECURITY.\n");
-	exit(1);
+	exit(EXIT_FAILURE);
     }
 
     y = NO_YR;
@@ -171,11 +179,14 @@ void InitRemind(int argc, char const *argv[])
     RealToday = SystemDate(&CurYear, &CurMon, &CurDay);
     if (RealToday < 0) {
 	fprintf(ErrFp, ErrMsg[M_BAD_SYS_DATE], BASE);
-	exit(1);
+	exit(EXIT_FAILURE);
     }
     JulianToday = RealToday;
     FromJulian(JulianToday, &CurYear, &CurMon, &CurDay);
 
+    /* Initialize Latitude and Longitude */
+    set_components_from_lat_and_long();
+
     /* See if we were invoked as "rem" rather than "remind" */
     if (argv[0]) {
 	s = strrchr(argv[0], '/');
@@ -187,10 +198,14 @@ void InitRemind(int argc, char const *argv[])
 	if (!strcmp(s, "rem")) {
 	    InvokedAsRem = 1;
 	}
+    } else {
+        fprintf(stderr, "Invoked with a NULL argv[0]; bailing because that's just plain bizarre.\n");
+        exit(1);
     }
 
     /* Parse the command-line options */
     i = 1;
+
     while (i < argc) {
 	arg = argv[i];
 	if (*arg != '-') break; /* Exit the loop if it's not an option */
@@ -204,6 +219,31 @@ void InitRemind(int argc, char const *argv[])
 	}
 	while (*arg) {
 	    switch(*arg++) {
+            case '+':
+                AddTrustedUser(arg);
+                while(*arg) arg++;
+                break;
+
+	    case '@':
+		UseVTColors = 1;
+		if (*arg) {
+		    PARSENUM(x, arg);
+		    if (x == 1) {
+			Use256Colors = 1;
+		    } else if (x == 2) {
+			UseTrueColors = 1;
+		    }
+		}
+		if (*arg == ',') {
+		    arg++;
+		    PARSENUM(x, arg);
+		    if (x == 0) {
+			TerminalBackground = TERMINAL_BACKGROUND_DARK;
+		    } else if (x == 1) {
+			TerminalBackground = TERMINAL_BACKGROUND_LIGHT;
+		    }
+		}
+		break;
 
 	    case 'j':
 	    case 'J':
@@ -247,7 +287,19 @@ void InitRemind(int argc, char const *argv[])
 
 	    case 't':
 	    case 'T':
-		if (!*arg) {
+                if (*arg == 'T' || *arg == 't') {
+                    arg++;
+                    if (!*arg) {
+                        DefaultTDelta = 5;
+                    } else {
+                        PARSENUM(DefaultTDelta, arg);
+                        if (DefaultTDelta < 0) {
+                            DefaultTDelta = 0;
+                        } else if (DefaultTDelta > 1440) {
+                            DefaultTDelta = 1440;
+                        }
+                    }
+                } else if (!*arg) {
 		    InfiniteDelta = 1;
 		} else {
 		    PARSENUM(DeltaOffset, arg);
@@ -296,8 +348,12 @@ void InitRemind(int argc, char const *argv[])
 
 	    case 'u':
 	    case 'U':
-		ChgUser(arg);
-		RunDisabled = RUN_CMDLINE;
+                if (*arg == '+') {
+                    ChgUser(arg+1);
+                } else {
+                    RunDisabled = RUN_CMDLINE;
+                    ChgUser(arg);
+                }
 		while (*arg) arg++;
 		break;
 	    case 'z':
@@ -401,9 +457,21 @@ void InitRemind(int argc, char const *argv[])
 	    case 'p':
 	    case 'P':
 		DoSimpleCalendar = 1;
-		PsCal = 1;
-		if (*arg == 'a' || *arg == 'A') {
-		    DoSimpleCalDelta = 1;
+		PsCal = PSCAL_LEVEL1;
+		while (*arg == 'a' || *arg == 'A' ||
+		       *arg == 'p' || *arg == 'P') {
+		    if (*arg == 'a' || *arg == 'A') {
+			DoSimpleCalDelta = 1;
+		    } else if (*arg == 'p' || *arg == 'P') {
+			/* JSON interchange formats always include
+			   file and line number info */
+			DoPrefixLineNo = 1;
+			if (PsCal == PSCAL_LEVEL1) {
+			    PsCal = PSCAL_LEVEL2;
+			} else {
+			    PsCal = PSCAL_LEVEL3;
+			}
+		    }
 		    arg++;
 		}
 		PARSENUM(CalMonths, arg);
@@ -419,7 +487,10 @@ void InitRemind(int argc, char const *argv[])
 	    case 'W':
 		if (*arg != ',') {
 		    PARSENUM(CalWidth, arg);
-		    if (CalWidth < 71) CalWidth = 71;
+		    if (CalWidth != 0 && CalWidth < 71) CalWidth = 71;
+		    if (CalWidth == 0) {
+			CalWidth = -1;
+		    }
 		}
 		if (*arg == ',') {
 		    arg++;
@@ -486,7 +557,7 @@ void InitRemind(int argc, char const *argv[])
     if (!InvokedAsRem) {
 	if (i >= argc) {
 	    Usage();
-	    exit(1);
+	    exit(EXIT_FAILURE);
 	}
 	InitialFile = argv[i++];
     } else {
@@ -584,9 +655,10 @@ void InitRemind(int argc, char const *argv[])
 	}
 
     }
+
 /* Figure out the offset from UTC */
     if (CalculateUTC)
-	(void) CalcMinsFromUTC(JulianToday, SystemTime(1)/60,
+	(void) CalcMinsFromUTC(JulianToday, SystemTime(0)/60,
 			       &MinsFromUTC, NULL);
 }
 
@@ -600,8 +672,7 @@ void InitRemind(int argc, char const *argv[])
 #ifndef L_USAGE_OVERRIDE
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 David F. Skoll\n", VERSION, L_LANGNAME);
-    fprintf(ErrFp, "Copyright 1999-2011 Roaring Penguin Software Inc.\n");
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2021 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
     fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
 #endif
@@ -609,6 +680,7 @@ void Usage(void)
     fprintf(ErrFp, "Options:\n");
     fprintf(ErrFp, " -n     Output next occurrence of reminders in simple format\n");
     fprintf(ErrFp, " -r     Disable RUN directives\n");
+    fprintf(ErrFp, " -@[n,m] Colorize COLOR reminders\n");
     fprintf(ErrFp, " -c[a][n] Produce a calendar for n (default 1) months\n");
     fprintf(ErrFp, " -c[a]+[n] Produce a calendar for n (default 1) weeks\n");
     fprintf(ErrFp, " -w[n[,p[,s]]]  Specify width, padding and spacing of calendar\n");
@@ -633,7 +705,7 @@ void Usage(void)
     fprintf(ErrFp, " -m     Start calendar with Monday rather than Sunday\n");
     fprintf(ErrFp, " -y     Synthesize tags for tagless reminders\n");
     fprintf(ErrFp, " -j[n]  Run in 'purge' mode.  [n = INCLUDE depth]\n");
-    exit(1);
+    exit(EXIT_FAILURE);
 }
 #endif /* L_USAGE_OVERRIDE */
 /***************************************************************/
@@ -648,7 +720,7 @@ void Usage(void)
 /***************************************************************/
 static void ChgUser(char const *user)
 {
-    uid_t myuid;
+    uid_t myeuid;
 
     struct passwd *pwent;
     static char *home;
@@ -656,29 +728,38 @@ static void ChgUser(char const *user)
     static char *username;
     static char *logname;
 
-    myuid = getuid();
+    myeuid = geteuid();
 
     pwent = getpwnam(user);
 
     if (!pwent) {
 	fprintf(ErrFp, ErrMsg[M_BAD_USER], user);
-	exit(1);
+	exit(EXIT_FAILURE);
     }
 
-    if (!myuid && setgid(pwent->pw_gid)) {
-	fprintf(ErrFp, ErrMsg[M_NO_CHG_GID], pwent->pw_gid);
-	exit(1);
-    }
+    if (!myeuid) {
+        /* Started as root, so drop privileges */
+#ifdef HAVE_INITGROUPS
+        if (initgroups(pwent->pw_name, pwent->pw_gid) < 0) {
+            fprintf(ErrFp, ErrMsg[M_NO_CHG_GID], pwent->pw_gid);
+            exit(EXIT_FAILURE);
+        };
+#endif
+        if (setgid(pwent->pw_gid) < 0) {
+            fprintf(ErrFp, ErrMsg[M_NO_CHG_GID], pwent->pw_gid);
+            exit(EXIT_FAILURE);
+        }
 
-    if (!myuid && setuid(pwent->pw_uid)) {
-	fprintf(ErrFp, ErrMsg[M_NO_CHG_UID], pwent->pw_uid);
-	exit(1);
+        if (setuid(pwent->pw_uid) < 0) {
+            fprintf(ErrFp, ErrMsg[M_NO_CHG_UID], pwent->pw_uid);
+            exit(EXIT_FAILURE);
+        }
     }
 
     home = malloc(strlen(pwent->pw_dir) + 6);
     if (!home) {
 	fprintf(ErrFp, "%s", ErrMsg[M_NOMEM_ENV]);
-	exit(1);
+	exit(EXIT_FAILURE);
     }
     sprintf(home, "HOME=%s", pwent->pw_dir);
     putenv(home);
@@ -686,7 +767,7 @@ static void ChgUser(char const *user)
     shell = malloc(strlen(pwent->pw_shell) + 7);
     if (!shell) {
 	fprintf(ErrFp, "%s", ErrMsg[M_NOMEM_ENV]);
-	exit(1);
+	exit(EXIT_FAILURE);
     }
     sprintf(shell, "SHELL=%s", pwent->pw_shell);
     putenv(shell);
@@ -695,14 +776,14 @@ static void ChgUser(char const *user)
 	username = malloc(strlen(pwent->pw_name) + 6);
 	if (!username) {
 	    fprintf(ErrFp, "%s", ErrMsg[M_NOMEM_ENV]);
-	    exit(1);
+	    exit(EXIT_FAILURE);
 	}
 	sprintf(username, "USER=%s", pwent->pw_name);
 	putenv(username);
 	logname= malloc(strlen(pwent->pw_name) + 9);
 	if (!logname) {
 	    fprintf(ErrFp, "%s", ErrMsg[M_NOMEM_ENV]);
-	    exit(1);
+	    exit(EXIT_FAILURE);
 	}
 	sprintf(logname, "LOGNAME=%s", pwent->pw_name);
 	putenv(logname);
@@ -775,6 +856,7 @@ static void InitializeVar(char const *str)
 
     if (*varname == '$') {
 	r=SetSysVar(varname+1, &val);
+        DestroyValue(val);
 	if (r) fprintf(ErrFp, ErrMsg[M_I_OPTION], ErrMsg[r]);
 	return;
     }
@@ -789,46 +871,22 @@ static void InitializeVar(char const *str)
     return;
 }
 
-#if defined(__APPLE__) || defined(__CYGWIN__)
-static char const pmsg1[] = {
-    0x4c, 0x62, 0x68, 0x20, 0x6e, 0x63, 0x63, 0x72, 0x6e, 0x65, 0x20,
-    0x67, 0x62, 0x20, 0x6f, 0x72, 0x20, 0x65, 0x68, 0x61, 0x61, 0x76,
-    0x61, 0x74, 0x20, 0x45, 0x72, 0x7a, 0x76, 0x61, 0x71, 0x20, 0x62,
-    0x61, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x63, 0x63, 0x79, 0x72, 0x20,
-    0x63, 0x65, 0x62, 0x71, 0x68, 0x70, 0x67, 0x2e, 0x20, 0x20, 0x56,
-    0x27, 0x71, 0x20, 0x65, 0x6e, 0x67, 0x75, 0x72, 0x65, 0x20, 0x67,
-    0x75, 0x6e, 0x67, 0x0a, 0x6c, 0x62, 0x68, 0x20, 0x71, 0x76, 0x71,
-    0x61, 0x27, 0x67, 0x2e, 0x20, 0x20, 0x45, 0x72, 0x7a, 0x76, 0x61,
-    0x71, 0x20, 0x72, 0x6b, 0x72, 0x70, 0x68, 0x67, 0x76, 0x62, 0x61,
-    0x20, 0x6a, 0x76, 0x79, 0x79, 0x20, 0x70, 0x62, 0x61, 0x67, 0x76,
-    0x61, 0x68, 0x72, 0x20, 0x7a, 0x62, 0x7a, 0x72, 0x61, 0x67, 0x6e,
-    0x65, 0x76, 0x79, 0x6c, 0x2e, 0x0a, 0x00
-};
-
-static char const pmsg2[] = {
-    0x4c, 0x62, 0x68, 0x20, 0x6e, 0x63, 0x63, 0x72, 0x6e, 0x65, 0x20,
-    0x67, 0x62, 0x20, 0x6f, 0x72, 0x20, 0x65, 0x68, 0x61, 0x61, 0x76,
-    0x61, 0x74, 0x20, 0x45, 0x72, 0x7a, 0x76, 0x61, 0x71, 0x20, 0x62,
-    0x61, 0x20, 0x6e, 0x20, 0x5a, 0x76, 0x70, 0x65, 0x62, 0x66, 0x62,
-    0x73, 0x67, 0x20, 0x66, 0x6c, 0x66, 0x67, 0x72, 0x7a, 0x2e, 0x20,
-    0x20, 0x56, 0x27, 0x71, 0x20, 0x65, 0x6e, 0x67, 0x75, 0x72, 0x65,
-    0x20, 0x67, 0x75, 0x6e, 0x67, 0x0a, 0x6c, 0x62, 0x68, 0x20, 0x71,
-    0x76, 0x71, 0x61, 0x27, 0x67, 0x2e, 0x20, 0x20, 0x45, 0x72, 0x7a,
-    0x76, 0x61, 0x71, 0x20, 0x72, 0x6b, 0x72, 0x70, 0x68, 0x67, 0x76,
-    0x62, 0x61, 0x20, 0x6a, 0x76, 0x79, 0x79, 0x20, 0x70, 0x62, 0x61,
-    0x67, 0x76, 0x61, 0x68, 0x72, 0x20, 0x7a, 0x62, 0x7a, 0x72, 0x61,
-    0x67, 0x6e, 0x65, 0x76, 0x79, 0x6c, 0x2e, 0x0a, 0x00
-};
-
 static void
-rkrphgvba(int x)
+AddTrustedUser(char const *username)
 {
-    char const *s = (x ? pmsg2 : pmsg1);
-    while(*s) {
-	int c = (int) *s++;
-	c=isalpha(c)?tolower(c)<0x6e?c+13:c-13:c;
-	putchar(c);
+    struct passwd *pwent;
+    if (NumTrustedUsers >= MAX_TRUSTED_USERS) {
+        fprintf(stderr, "Too many trusted users (%d max)\n",
+                MAX_TRUSTED_USERS);
+        exit(EXIT_FAILURE);
     }
-    sleep(5);
+
+    pwent = getpwnam(username);
+    if (!pwent) {
+	fprintf(ErrFp, ErrMsg[M_BAD_USER], username);
+	exit(EXIT_FAILURE);
+    }
+    TrustedUsers[NumTrustedUsers] = pwent->pw_uid;
+    NumTrustedUsers++;
 }
-#endif
+

src/json.h

@@ -0,0 +1,280 @@
+/* vim: set et ts=3 sw=3 sts=3 ft=c:
+ *
+ * Copyright (C) 2012, 2013, 2014 James McLaughlin et al.  All rights reserved.
+ * https://github.com/udp/json-parser
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _JSON_H
+#define _JSON_H
+
+#ifndef json_char
+   #define json_char char
+#endif
+
+#ifndef json_int_t
+   #ifndef _MSC_VER
+      #include <inttypes.h>
+      #define json_int_t int64_t
+   #else
+      #define json_int_t __int64
+   #endif
+#endif
+
+#include <stdlib.h>
+
+#ifdef __cplusplus
+
+   #include <string.h>
+
+   extern "C"
+   {
+
+#endif
+
+typedef struct
+{
+   unsigned long max_memory;
+   int settings;
+
+   /* Custom allocator support (leave null to use malloc/free)
+    */
+
+   void * (* mem_alloc) (size_t, int zero, void * user_data);
+   void (* mem_free) (void *, void * user_data);
+
+   void * user_data;  /* will be passed to mem_alloc and mem_free */
+
+   size_t value_extra;  /* how much extra space to allocate for values? */
+
+} json_settings;
+
+#define json_enable_comments  0x01
+
+typedef enum
+{
+   json_none,
+   json_object,
+   json_array,
+   json_integer,
+   json_double,
+   json_string,
+   json_boolean,
+   json_null
+
+} json_type;
+
+extern const struct _json_value json_value_none;
+
+typedef struct _json_object_entry
+{
+    json_char * name;
+    unsigned int name_length;
+
+    struct _json_value * value;
+
+} json_object_entry;
+
+typedef struct _json_value
+{
+   struct _json_value * parent;
+
+   json_type type;
+
+   union
+   {
+      int boolean;
+      json_int_t integer;
+      double dbl;
+
+      struct
+      {
+	 unsigned int length;
+	 json_char * ptr; /* null terminated */
+
+      } string;
+
+      struct
+      {
+	 unsigned int length;
+
+	 json_object_entry * values;
+
+	 #if defined(__cplusplus) && __cplusplus >= 201103L
+	 decltype(values) begin () const
+	 {  return values;
+	 }
+	 decltype(values) end () const
+	 {  return values + length;
+	 }
+	 #endif
+
+      } object;
+
+      struct
+      {
+	 unsigned int length;
+	 struct _json_value ** values;
+
+	 #if defined(__cplusplus) && __cplusplus >= 201103L
+	 decltype(values) begin () const
+	 {  return values;
+	 }
+	 decltype(values) end () const
+	 {  return values + length;
+	 }
+	 #endif
+
+      } array;
+
+   } u;
+
+   union
+   {
+      struct _json_value * next_alloc;
+      void * object_mem;
+
+   } _reserved;
+
+   #ifdef JSON_TRACK_SOURCE
+
+      /* Location of the value in the source JSON
+       */
+      unsigned int line, col;
+
+   #endif
+
+
+   /* Some C++ operator sugar */
+
+   #ifdef __cplusplus
+
+      public:
+
+	 inline _json_value ()
+	 {  memset (this, 0, sizeof (_json_value));
+	 }
+
+	 inline const struct _json_value &operator [] (int index) const
+	 {
+	    if (type != json_array || index < 0
+		     || ((unsigned int) index) >= u.array.length)
+	    {
+	       return json_value_none;
+	    }
+
+	    return *u.array.values [index];
+	 }
+
+	 inline const struct _json_value &operator [] (const char * index) const
+	 {
+	    if (type != json_object)
+	       return json_value_none;
+
+	    for (unsigned int i = 0; i < u.object.length; ++ i)
+	       if (!strcmp (u.object.values [i].name, index))
+		  return *u.object.values [i].value;
+
+	    return json_value_none;
+	 }
+
+	 inline operator const char * () const
+	 {
+	    switch (type)
+	    {
+	       case json_string:
+		  return u.string.ptr;
+
+	       default:
+		  return "";
+	    };
+	 }
+
+	 inline operator json_int_t () const
+	 {
+	    switch (type)
+	    {
+	       case json_integer:
+		  return u.integer;
+
+	       case json_double:
+		  return (json_int_t) u.dbl;
+
+	       default:
+		  return 0;
+	    };
+	 }
+
+	 inline operator bool () const
+	 {
+	    if (type != json_boolean)
+	       return false;
+
+	    return u.boolean != 0;
+	 }
+
+	 inline operator double () const
+	 {
+	    switch (type)
+	    {
+	       case json_integer:
+		  return (double) u.integer;
+
+	       case json_double:
+		  return u.dbl;
+
+	       default:
+		  return 0;
+	    };
+	 }
+
+   #endif
+
+} json_value;
+
+json_value * json_parse (const json_char * json,
+			 size_t length);
+
+#define json_error_max 128
+json_value * json_parse_ex (json_settings * settings,
+			    const json_char * json,
+			    size_t length,
+			    char * error);
+
+void json_value_free (json_value *);
+
+
+/* Not usually necessary, unless you used a custom mem_alloc and now want to
+ * use a custom mem_free.
+ */
+void json_value_free_ex (json_settings * settings,
+			 json_value *);
+
+
+#ifdef __cplusplus
+   } /* extern "C" */
+#endif
+
+#endif

src/lang.h

@@ -5,14 +5,13 @@
 /*  Header file for language support for various languages.    */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
 /* I'm chauvinistic and name each language with its English name... */
 
-#define ENGLISH    0 /* original   by David F. Skoll                   */
+#define ENGLISH    0 /* original   by Dianne Skoll                   */
 #define GERMAN     1 /* translated by Wolfgang Thronicke               */
 #define DUTCH      2 /* translated by Willem Kasdorp and Erik-Jan Vens */
 #define FINNISH    3 /* translated by Mikko Silvonen                   */
@@ -26,7 +25,7 @@
 #define SPANISH   11 /* translated by Rafa Couto                       */
 #define ICELANDIC 12 /* translated by Björn Davíðsson                  */
 
-/* Add more languages here - but please e-mail dfs@roaringpenguin.com
+/* Add more languages here - but please e-mail dianne@skoll.ca
    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

@@ -6,8 +6,7 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  REMIND is Copyright (C) 1992-2021 by Dianne Skoll          */
 /*  This file is Copyright (C) 1993 by Mogens Lynnerup.        */
 /*                                                             */
 /***************************************************************/
@@ -16,21 +15,13 @@
 #define L_LANGNAME "Danish"
 
 /* Day names */
-#if ISOLATIN1
-#  define L_SUNDAY "S\370ndag"
-#else
-#  define L_SUNDAY "Soendag"
-#endif
+#define L_SUNDAY "Søndag"
 #define L_MONDAY "Mandag"
 #define L_TUESDAY "Tirsdag"
 #define L_WEDNESDAY "Onsdag"
 #define L_THURSDAY "Torsdag"
 #define L_FRIDAY "Fredag"
-#if ISOLATIN1
-#  define L_SATURDAY "L\370rdag"
-#else
-#  define L_SATURDAY "Loerdag"
-#endif
+#define L_SATURDAY "Lørdag"
 
 /* Month names */
 #define L_JAN "Januar"
@@ -51,11 +42,7 @@
 #define L_TOMORROW "i morgen"
 
 /* The default banner */
-#if ISOLATIN1
-#  define L_BANNER "P\345mindelse for %w, %d. %m, %y%o:"
-#else
-#  define L_BANNER "Paamindelse for %w, %d. %m, %y%o:"
-#endif
+#define L_BANNER "Påmindelse for %w, %d. %m, %y%o:"
 
 /* "am" and "pm" */
 #define L_AM "am"
@@ -72,11 +59,7 @@
 #define L_INXDAYS "om %d dage"
 
 /* "on" as in "on date..." */
-#if ISOLATIN1
-#  define L_ON "p\345"
-#else
-#  define L_ON "paa"
-#endif 
+#define L_ON "på"
 
 /* Pluralizing - this is a problem for many languages and may require
    a more drastic fix */

src/langs/dutch.h

@@ -6,13 +6,12 @@
 /*                                                             */
 /*  Author: Willem Kasdorp                                     */
 /*                                                             */
-/*  Modified slightly by David Skoll                           */
+/*  Modified slightly by Dianne Skoll                          */
 /*                                                             */
 /*  Further corrections by Erik-Jan Vens                       */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 

src/langs/english.h

@@ -5,8 +5,7 @@
 /*  Support for the English language.                          */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 

src/langs/finnish.h

@@ -11,8 +11,7 @@
 /*                                                             */
 /*  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-2000 by Roaring Penguin Software Inc.       */
+/*  REMIND is Copyright (C) 1992-2021 by Dianne Skoll          */
 /*                                                             */
 /***************************************************************/
 
@@ -34,16 +33,8 @@
 #define L_MAR "maaliskuu"
 #define L_APR "huhtikuu"
 #define L_MAY "toukokuu"
-#if ISOLATIN1
-#define L_JUN "kes\xE4kuu"
-#define L_JUL "hein\xE4kuu"
-#elif IBMEXTENDED
-#define L_JUN "kes\x84kuu"
-#define L_JUL "hein\x84kuu"
-#else
-#define L_JUN "kes{kuu"
-#define L_JUL "hein{kuu"
-#endif
+#define L_JUN "kesäkuu"
+#define L_JUL "heinäkuu"
 #define L_AUG "elokuu"
 #define L_SEP "syyskuu"
 #define L_OCT "lokakuu"
@@ -51,13 +42,7 @@
 #define L_DEC "joulukuu"
 
 /* Today and tomorrow */
-#if ISOLATIN1
-#define L_TODAY "t\xE4n\xE4\xE4n"
-#elif IBMEXTENDED
-#define L_TODAY "t\x84n\x84\x84n"
-#else
-#define L_TODAY "t{n{{n"
-#endif
+#define L_TODAY "tänään"
 #define L_TOMORROW "huomenna"
 
 /* The default banner */
@@ -75,13 +60,7 @@
 #define L_FROMNOW "kuluttua"
 
 /* "in %d days' time" */
-#if ISOLATIN1
-#define L_INXDAYS "%d p\xE4iv\xE4n kuluttua"
-#elif IBMEXTENDED
-#define L_INXDAYS "%d p\x84iv\x84n kuluttua"
-#else
-#define L_INXDAYS "%d p{iv{n kuluttua"
-#endif
+#define L_INXDAYS "%d päivän kuluttua"
 
 /* "on" as in "on date...", but in Finnish it is a case ending;
    L_PARTIT is the partitive ending appended to -kuu and -tai */
@@ -91,13 +70,7 @@
 /* Pluralizing - this is a problem for many languages and may require
    a more drastic fix */
 /* The partitive ending of "day" */
-#if ISOLATIN1
-#define L_PLURAL "\xE4"
-#elif IBMEXTENDED
-#define L_PLURAL "\x84"
-#else
-#define L_PLURAL "{"
-#endif
+#define L_PLURAL "ä"
 
 /* Minutes, hours, at, etc */
 #define L_NOW "nyt"
@@ -121,9 +94,8 @@
 /* Define any overrides here, such as L_ORDINAL_OVERRIDE, L_A_OVER, etc.
    See the file dosubst.c for more info. */
 
-#if ISOLATIN1
 #define L_ORDINAL_OVERRIDE switch(d) { \
-    case 1:  plu = ":sen\xE4"; break; \
+    case 1:  plu = ":senä"; break; \
     case 2:  plu = ":sena"; break; \
     default: \
      switch(d%10) { \
@@ -131,36 +103,9 @@
        case 3: \
        case 6: \
        case 8:  plu = ":ntena"; break; \
-       default: plu = ":nten\xE4"; break; \
+       default: plu = ":ntenä"; break; \
      } \
 }
-#elif IBMEXTENDED
-#define L_ORDINAL_OVERRIDE switch(d) { \
-    case 1:  plu = ":sen\x84"; break; \
-    case 2:  plu = ":sena"; break; \
-    default: \
-     switch(d%10) { \
-       case 2: \
-       case 3: \
-       case 6: \
-       case 8:  plu = ":ntena"; break; \
-       default: plu = ":nten\x84"; break; \
-     } \
-}
-#else
-#define L_ORDINAL_OVERRIDE switch(d) { \
-    case 1:  plu = ":sen{"; break; \
-    case 2:  plu = ":sena"; break; \
-    default: \
-       switch(d%10) { \
-	  case 2: \
-	  case 3: \
-	  case 6: \
-	  case 8:  plu = ":ntena"; break; \
-	  default: plu = ":nten{"; break; \
-       } \
-}
-#endif
 #define L_A_OVER if (altmode == '*') { sprintf(s, "%s %d. %s %d", DayName[jul%7], d, MonthName[m], y); } else { sprintf(s, "%s%s %d. %s%s %d", DayName[jul%7], L_ON, d, MonthName[m], L_PARTIT, y); }
 #define L_C_OVER if (altmode == '*') { sprintf(s, "%s", DayName[jul%7]); } else { sprintf(s, "%s%s", DayName[jul%7], L_ON); }
 #define L_E_OVER sprintf(s, "%02d%c%02d%c%04d", d, DateSep, m+1, DateSep, y);
@@ -200,320 +145,110 @@ else { \
 #define L_ERR_OVERRIDE 1
 EXTERN char *ErrMsg[] =
 {
-#if ISOLATIN1
     "Ok",
     "Puuttuva ']'",
     "Puuttuva lainausmerkki",
     "Liian monimutkainen lauseke - liikaa operaattoreita",
     "Liian monimutkainen lauseke - liikaa operandeja",
     "Puuttuva ')'",
-    "M\xE4\xE4rittelem\xE4t\xF6n funktio",
+    "Määrittelemätön funktio",
     "Virheellinen merkki",
     "Kaksipaikkainen operaattori puuttuu",
     "Muisti loppui",
     "Virheellinen luku",
-    "Operaattoripino tyhj\xE4 - sis\xE4inen virhe",
-    "Muuttujapino tyhj\xE4 - sis\xE4inen virhe",
+    "Operaattoripino tyhjä - sisäinen virhe",
+    "Muuttujapino tyhjä - sisäinen virhe",
     "Tyyppimuunnos ei onnistu",
     "Virheellinen tyyppi",
-    "Liian suuri p\xE4iv\xE4ys",
-    "Pinovirhe - sis\xE4inen virhe",
+    "Liian suuri päiväys",
+    "Pinovirhe - sisäinen virhe",
     "Jako nollalla",
-    "M\xE4\xE4rittelem\xE4t\xF6n funktio",
+    "Määrittelemätön funktio",
     "Odottamaton rivin loppu",
     "Odottamaton tiedoston loppu",
-    "Sy\xF6tt\xF6- tai tulostusvirhe",
-    "Liian pitk\xE4 rivi",
-    "Sis\xE4inen virhe",
-    "Virheellinen p\xE4iv\xE4ys",
-    "Liian v\xE4h\xE4n argumentteja",
+    "Syöttö- tai tulostusvirhe",
+    "Liian pitkä rivi",
+    "Sisäinen virhe",
+    "Virheellinen päiväys",
+    "Liian vähän argumentteja",
     "Liian paljon argumentteja",
     "Virheellinen aika",
     "Liian suuri luku",
     "Liian pieni luku",
     "Tiedoston avaus ei onnistu",
-    "Liian monta sis\xE4kk\xE4ist\xE4 INCLUDEa",
-    "J\xE4sennysvirhe",
+    "Liian monta sisäkkäistä INCLUDEa",
+    "Jäsennysvirhe",
     "Laukaisuhetken laskenta ei onnistu",
-    "Liian monta sis\xE4kk\xE4ist\xE4 IF-lausetta",
+    "Liian monta sisäkkäistä IF-lausetta",
     "ELSE ilman IF-lausetta",
     "ENDIF ilman IF-lausetta",
-    "Kaikkia viikonp\xE4ivi\xE4 ei voi j\xE4tt\xE4\xE4 pois",
-    "Ylim\xE4\xE4r\xE4isi\xE4 merkkej\xE4 rivill\xE4",
+    "Kaikkia viikonpäiviä ei voi jättää pois",
+    "Ylimääräisiä merkkejä rivillä",
     "POP-OMIT-CONTEXT ilman PUSH-OMIT-CONTEXTia",
-    "RUN-lauseen k\xE4ytt\xF6 estetty",
+    "RUN-lauseen käyttö estetty",
     "Arvoaluevirhe",
     "Virheellinen tunniste",
     "Rekursiivinen funktiokutsu havaittu",
     "",
-    "J\xE4rjestelm\xE4muuttujan muuttaminen ei onnistu",
-    "C-kirjastofunktio ei pysty esitt\xE4m\xE4\xE4n p\xE4iv\xE4yst\xE4 tai aikaa",
-    "Sis\xE4isen funktion m\xE4\xE4ritelm\xE4\xE4 yritettiin muuttaa",
-    "Lausekkeessa ei voi olla sis\xE4kk\xE4isi\xE4 funktiom\xE4\xE4ritelmi\xE4",
-    "P\xE4iv\xE4yksen t\xE4ytyy olla t\xE4ydellinen toistokertoimessa",
+    "Järjestelmämuuttujan muuttaminen ei onnistu",
+    "C-kirjastofunktio ei pysty esittämään päiväystä tai aikaa",
+    "Sisäisen funktion määritelmää yritettiin muuttaa",
+    "Lausekkeessa ei voi olla sisäkkäisiä funktiomääritelmiä",
+    "Päiväyksen täytyy olla täydellinen toistokertoimessa",
     "Vuosi annettu kahdesti",
     "Kuukausi annettu kahdesti",
-    "P\xE4iv\xE4 annettu kahdesti",
+    "Päivä annettu kahdesti",
     "Tuntematon sana tai merkki",
-    "OMIT-komennossa on annettava kuukausi ja p\xE4iv\xE4",
+    "OMIT-komennossa on annettava kuukausi ja päivä",
     "Liian monta osittaista OMIT-komentoa",
-    "Liian monta t\xE4ydellist\xE4 OMIT-komentoa",
+    "Liian monta täydellistä OMIT-komentoa",
     "Varoitus: PUSH-OMIT-CONTEXT ilman POP-OMIT-CONTEXTia",
     "Virhe tiedoston luvussa",
     "Pilkku puuttuu",
-    "Virheellinen juutalainen p\xE4iv\xE4ys",
-    "IIF vaatii parittoman m\xE4\xE4r\xE4n argumentteja",
+    "Virheellinen juutalainen päiväys",
+    "IIF vaatii parittoman määrän argumentteja",
     "Varoitus: puuttuva ENDIF",
     "Pilkku puuttuu",
-    "Viikonp\xE4iv\xE4 annettu kahdesti",
-    "K\xE4yt\xE4 vain yht\xE4 komennoista BEFORE, AFTER ja SKIP",
-    "Sis\xE4kk\xE4isi\xE4 MSG-, MSF- ja RUN-lauseita ei voi k\xE4ytt\xE4\xE4 lausekkeessa",
+    "Viikonpäivä annettu kahdesti",
+    "Käytä vain yhtä komennoista BEFORE, AFTER ja SKIP",
+    "Sisäkkäisiä MSG-, MSF- ja RUN-lauseita ei voi käyttää lausekkeessa",
     "Toistokerroin annettu kahdesti",
     "Delta-arvo annettu kahdesti",
     "Peruutusarvo annettu kahdesti",
-    "ONCE-avainsanaa k\xE4ytetty kahdesti. (Hah.)",
-    "AT-sanan per\xE4st\xE4 puuttuu aika",
-    "THROUGH/UNTIL-sanaa k\xE4ytetty kahdesti",
-    "Ep\xE4t\xE4ydellinen p\xE4iv\xE4ys",
-    "FROM/SCANFROM-sanaa k\xE4ytetty kahdesti",
+    "ONCE-avainsanaa käytetty kahdesti. (Hah.)",
+    "AT-sanan perästä puuttuu aika",
+    "THROUGH/UNTIL-sanaa käytetty kahdesti",
+    "Epätäydellinen päiväys",
+    "FROM/SCANFROM-sanaa käytetty kahdesti",
     "Muuttuja",
     "Arvo",
-    "*M\xC4\xC4RITTELEM\xC4T\xD6N*",
-    "Siirryt\xE4\xE4n funktioon",
+    "*MÄÄRITTELEMÄTÖN*",
+    "Siirrytään funktioon",
     "Poistutaan funktiosta",
     "Vanhentunut",
-    "fork() ep\xE4onnistui - jonomuistutukset eiv\xE4t toimi",
+    "fork() epäonnistui - jonomuistutukset eivät toimi",
     "Tiedoston avaus ei onnistu",
-    "Virheellinen j\xE4rjestelm\xE4p\xE4iv\xE4ys: vuosi on v\xE4hemm\xE4n kuin %d\n",
-    "Tuntematon virheenetsint\xE4tarkenne '%c'\n",
+    "Virheellinen järjestelmäpäiväys: vuosi on vähemmän kuin %d\n",
+    "Tuntematon virheenetsintätarkenne '%c'\n",
     "Tuntematon tarkenne '%c'\n",
-    "Tuntematon k\xE4ytt\xE4j\xE4 '%s'\n",
-    "Ryhm\xE4numeron vaihto %d:ksi ei onnistunut\n",
-    "K\xE4ytt\xE4j\xE4numeron vaihto %d:ksi ei onnistunut\n",
-    "Muisti ei riit\xE4 ymp\xE4rist\xF6lle\n",
+    "Tuntematon käyttäjä '%s'\n",
+    "Ryhmänumeron vaihto %d:ksi ei onnistunut\n",
+    "Käyttäjänumeron vaihto %d:ksi ei onnistunut\n",
+    "Muisti ei riitä ympäristölle\n",
     "Puuttuva '='-merkki",
     "Puuttuva muuttujanimi",
     "Puuttuva lauseke",
-    "P\xE4iv\xE4n asetus %s:ksi ei onnitus\n",
+    "Päivän asetus %s:ksi ei onnitus\n",
     "Remind: tarkenne '-i': %s\n",
-    "Ei viestej\xE4.",
-    "%d viesti(\xE4) t\xE4m\xE4n p\xE4iv\xE4n jonossa.\n",
+    "Ei viestejä.",
+    "%d viesti(ä) tämän päivän jonossa.\n",
     "Numero puuttuu",
     "Virheellinen funktio WARN-lausekkeessa",
     "Can't convert between time zones",
     "No files matching *.rem",
-    "String too long"
-
-#elif IBMEXTENDED
-    "Ok",
-    "Puuttuva ']'",
-    "Puuttuva lainausmerkki",
-    "Liian monimutkainen lauseke - liikaa operaattoreita",
-    "Liian monimutkainen lauseke - liikaa operandeja",
-    "Puuttuva ')'",
-    "M\x84\x84rittelem\x84t\x94n funktio",
-    "Virheellinen merkki",
-    "Kaksipaikkainen operaattori puuttuu",
-    "Muisti loppui",
-    "Virheellinen luku",
-    "Operaattoripino tyhj\x84 - sis\x84inen virhe",
-    "Muuttujapino tyhj\x84 - sis\x84inen virhe",
-    "Tyyppimuunnos ei onnistu",
-    "Virheellinen tyyppi",
-    "Liian suuri p\x84iv\x84ys",
-    "Pinovirhe - sis\x84inen virhe",
-    "Jako nollalla",
-    "M\x84\x84rittelem\x84t\x94n funktio",
-    "Odottamaton rivin loppu",
-    "Odottamaton tiedoston loppu",
-    "Sy\x94tt\x94- tai tulostusvirhe",
-    "Liian pitk\x84 rivi",
-    "Sis\x84inen virhe",
-    "Virheellinen p\x84iv\x84ys",
-    "Liian v\x84h\x84n argumentteja",
-    "Liian paljon argumentteja",
-    "Virheellinen aika",
-    "Liian suuri luku",
-    "Liian pieni luku",
-    "Tiedoston avaus ei onnistu",
-    "Liian monta sis\x84kk\x84ist\x84 INCLUDEa",
-    "J\x84sennysvirhe",
-    "Laukaisuhetken laskenta ei onnistu",
-    "Liian monta sis\x84kk\x84ist\x84 IF-lausetta",
-    "ELSE ilman IF-lausetta",
-    "ENDIF ilman IF-lausetta",
-    "Kaikkia viikonp\x84ivi\x84 ei voi j\x84tt\x84\x84 pois",
-    "Ylim\x84\x84r\x84isi\x84 merkkej\x84 rivill\x84",
-    "POP-OMIT-CONTEXT ilman PUSH-OMIT-CONTEXTia",
-    "RUN-lauseen k\x84ytt\x94 estetty",
-    "Arvoaluevirhe",
-    "Virheellinen tunniste",
-    "Rekursiivinen funktiokutsu havaittu",
-    "",
-    "J\x84rjestelm\x84muuttujan muuttaminen ei onnistu",
-    "C-kirjastofunktio ei pysty esitt\x84m\x84\x84n p\x84iv\x84yst\x84 tai aikaa",
-    "Sis\x84isen funktion m\x84\x84ritelm\x84\x84 yritettiin muuttaa",
-    "Lausekkeessa ei voi olla sis\x84kk\x84isi\x84 funktiom\x84\x84ritelmi\x84",
-    "P\x84iv\x84yksen t\x84ytyy olla t\x84ydellinen toistokertoimessa",
-    "Vuosi annettu kahdesti",
-    "Kuukausi annettu kahdesti",
-    "P\x84iv\x84 annettu kahdesti",
-    "Tuntematon sana tai merkki",
-    "OMIT-komennossa on annettava kuukausi ja p\x84iv\x84",
-    "Liian monta osittaista OMIT-komentoa",
-    "Liian monta t\x84ydellist\x84 OMIT-komentoa",
-    "Varoitus: PUSH-OMIT-CONTEXT ilman POP-OMIT-CONTEXTia",
-    "Virhe tiedoston luvussa",
-    "Pilkku puuttuu",
-    "Virheellinen juutalainen p\x84iv\x84ys",
-    "IIF vaatii parittoman m\x84\x84r\x84n argumentteja",
-    "Varoitus: puuttuva ENDIF",
-    "Pilkku puuttuu",
-    "Viikonp\x84iv\x84 annettu kahdesti",
-    "K\x84yt\x84 vain yht\x84 komennoista BEFORE, AFTER ja SKIP",
-    "Sis\x84kk\x84isi\x84 MSG-, MSF- ja RUN-lauseita ei voi k\x84ytt\x84\x84 lausekkeessa",
-    "Toistokerroin annettu kahdesti",
-    "Delta-arvo annettu kahdesti",
-    "Peruutusarvo annettu kahdesti",
-    "ONCE-avainsanaa k\x84ytetty kahdesti. (Hah.)",
-    "AT-sanan per\x84st\x84 puuttuu aika",
-    "THROUGH/UNTIL-sanaa k\x84ytetty kahdesti",
-    "Ep\x84t\x84ydellinen p\x84iv\x84ys",
-    "FROM/SCANFROM-sanaa k\x84ytetty kahdesti",
-    "Muuttuja",
-    "Arvo",
-    "*M\x8E\x8ERITTELEM\x8ET\x99N*",
-    "Siirryt\x84\x84n funktioon",
-    "Poistutaan funktiosta",
-    "Vanhentunut",
-    "fork() ep\x84onnistui - jonomuistutukset eiv\x84t toimi",
-    "Tiedoston avaus ei onnistu",
-    "Virheellinen j\x84rjestelm\x84p\x84iv\x84ys: vuosi on v\x84hemm\x84n kuin %d\n",
-    "Tuntematon virheenetsint\x84tarkenne '%c'\n",
-    "Tuntematon tarkenne '%c'\n",
-    "Tuntematon k\x84ytt\x84j\x84 '%s'\n",
-    "Ryhm\x84numeron vaihto %d:ksi ei onnistunut\n",
-    "K\x84ytt\x84j\x84numeron vaihto %d:ksi ei onnistunut\n",
-    "Muisti ei riit\x84 ymp\x84rist\x94lle\n",
-    "Puuttuva '='-merkki",
-    "Puuttuva muuttujanimi",
-    "Puuttuva lauseke",
-    "P\x84iv\x84n asetus %s:ksi ei onnitus\n",
-    "Remind: tarkenne '-i': %s\n",
-    "Ei viestej\x84.",
-    "%d viesti(\x84) t\x84m\x84n p\x84iv\x84n jonossa.\n",
-    "Numero puuttuu"
-    "Virheellinen funktio WARN-lausekkeessa",
-    "Can't convert between time zones",
-    "No files matching *.rem",
-    "String too long"
-
-#else
-    "Ok",
-    "Puuttuva ']'",
-    "Puuttuva lainausmerkki",
-    "Liian monimutkainen lauseke - liikaa operaattoreita",
-    "Liian monimutkainen lauseke - liikaa operandeja",
-    "Puuttuva ')'",
-    "M{{rittelem{t|n funktio",
-    "Virheellinen merkki",
-    "Kaksipaikkainen operaattori puuttuu",
-    "Muisti loppui",
-    "Virheellinen luku",
-    "Operaattoripino tyhj{ - sis{inen virhe",
-    "Muuttujapino tyhj{ - sis{inen virhe",
-    "Tyyppimuunnos ei onnistu",
-    "Virheellinen tyyppi",
-    "Liian suuri p{iv{ys",
-    "Pinovirhe - sis{inen virhe",
-    "Jako nollalla",
-    "M{{rittelem{t|n funktio",
-    "Odottamaton rivin loppu",
-    "Odottamaton tiedoston loppu",
-    "Sy|tt|- tai tulostusvirhe",
-    "Liian pitk{ rivi",
-    "Sis{inen virhe",
-    "Virheellinen p{iv{ys",
-    "Liian v{h{n argumentteja",
-    "Liian paljon argumentteja",
-    "Virheellinen aika",
-    "Liian suuri luku",
-    "Liian pieni luku",
-    "Tiedoston avaus ei onnistu",
-    "Liian monta sis{kk{ist{ INCLUDEa",
-    "J{sennysvirhe",
-    "Laukaisuhetken laskenta ei onnistu",
-    "Liian monta sis{kk{ist{ IF-lausetta",
-    "ELSE ilman IF-lausetta",
-    "ENDIF ilman IF-lausetta",
-    "Kaikkia viikonp{ivi{ ei voi j{tt{{ pois",
-    "Ylim{{r{isi{ merkkej{ rivill{",
-    "POP-OMIT-CONTEXT ilman PUSH-OMIT-CONTEXTia",
-    "RUN-lauseen k{ytt| estetty",
-    "Arvoaluevirhe",
-    "Virheellinen tunniste",
-    "Rekursiivinen funktiokutsu havaittu",
-    "",
-    "J{rjestelm{muuttujan muuttaminen ei onnistu",
-    "C-kirjastofunktio ei pysty esitt{m{{n p{iv{yst{ tai aikaa",
-    "Sis{isen funktion m{{ritelm{{ yritettiin muuttaa",
-    "Lausekkeessa ei voi olla sis{kk{isi{ funktiom{{ritelmi{",
-    "P{iv{yksen t{ytyy olla t{ydellinen toistokertoimessa",
-    "Vuosi annettu kahdesti",
-    "Kuukausi annettu kahdesti",
-    "P{iv{ annettu kahdesti",
-    "Tuntematon sana tai merkki",
-    "OMIT-komennossa on annettava kuukausi ja p{iv{",
-    "Liian monta osittaista OMIT-komentoa",
-    "Liian monta t{ydellist{ OMIT-komentoa",
-    "Varoitus: PUSH-OMIT-CONTEXT ilman POP-OMIT-CONTEXTia",
-    "Virhe tiedoston luvussa",
-    "Pilkku puuttuu",
-    "Virheellinen juutalainen p{iv{ys",
-    "IIF vaatii parittoman m{{r{n argumentteja",
-    "Varoitus: puuttuva ENDIF",
-    "Pilkku puuttuu",
-    "Viikonp{iv{ annettu kahdesti",
-    "K{yt{ vain yht{ komennoista BEFORE, AFTER ja SKIP",
-    "Sis{kk{isi{ MSG-, MSF- ja RUN-lauseita ei voi k{ytt{{ lausekkeessa",
-    "Toistokerroin annettu kahdesti",
-    "Delta-arvo annettu kahdesti",
-    "Peruutusarvo annettu kahdesti",
-    "ONCE-avainsanaa k{ytetty kahdesti. (Hah.)",
-    "AT-sanan per{st{ puuttuu aika",
-    "THROUGH/UNTIL-sanaa k{ytetty kahdesti",
-    "Ep{t{ydellinen p{iv{ys",
-    "FROM/SCANFROM-sanaa k{ytetty kahdesti",
-    "Muuttuja",
-    "Arvo",
-    "*M[[RITTELEM[T\\N*",
-    "Siirryt{{n funktioon",
-    "Poistutaan funktiosta",
-    "Vanhentunut",
-    "fork() ep{onnistui - jonomuistutukset eiv{t toimi",
-    "Tiedoston avaus ei onnistu",
-    "Virheellinen j{rjestelm{p{iv{ys: vuosi on v{hemm{n kuin %d\n",
-    "Tuntematon virheenetsint{tarkenne '%c'\n",
-    "Tuntematon tarkenne '%c'\n",
-    "Tuntematon k{ytt{j{ '%s'\n",
-    "Ryhm{numeron vaihto %d:ksi ei onnistunut\n",
-    "K{ytt{j{numeron vaihto %d:ksi ei onnistunut\n",
-    "Muisti ei riit{ ymp{rist|lle\n",
-    "Puuttuva '='-merkki",
-    "Puuttuva muuttujanimi",
-    "Puuttuva lauseke",
-    "P{iv{n asetus %s:ksi ei onnitus\n",
-    "Remind: tarkenne '-i': %s\n",
-    "Ei viestej{.",
-    "%d viesti({) t{m{n p{iv{n jonossa.\n",
-    "Numero puuttuu",
-    "Virheellinen funktio WARN-lausekkeessa",
-    "Can't convert between time zones",
-    "No files matching *.rem",
-    "String too long"
-
-
-#endif
+    "String too long",
+    "Time specified twice",
+    "Cannot specify DURATION without specifying AT"
 };
 #endif /* MK_GLOBALS */
 
@@ -522,98 +257,37 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    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");
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2021 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
     fprintf(ErrFp, ">>>> BETAVERSIO <<<<\n");
 #endif
-#if ISOLATIN1
-    fprintf(ErrFp, "K\xE4ytt\xF6: remind [tarkenteet] tiedosto [p\xE4iv\xE4ys] [aika] [*toisto]\n");
+    fprintf(ErrFp, "Käyttö: remind [tarkenteet] tiedosto [päiväys] [aika] [*toisto]\n");
     fprintf(ErrFp, "Tarkenteet:\n");
     fprintf(ErrFp, " -n     Tulosta viestien seuraavat esiintymiskerrat yksink. muodossa\n");
-    fprintf(ErrFp, " -r     Est\xE4 RUN-lauseiden k\xE4ytt\xF6\n");
+    fprintf(ErrFp, " -r     Estä RUN-lauseiden käyttö\n");
     fprintf(ErrFp, " -c[n]  Tulosta n:n kuukauden kalenteri (oletus 1)\n");
     fprintf(ErrFp, " -c+[n] Tulosta n:n viikon kalenteri (oletus 1)\n");
-    fprintf(ErrFp, " -w[n[,p[,s]]] Aseta kalenterin leveys, tasaus ja v\xE4lit\n");
+    fprintf(ErrFp, " -w[n[,p[,s]]] Aseta kalenterin leveys, tasaus ja välit\n");
     fprintf(ErrFp, " -s[+][n] Tulosta n:n kuukauden (viikon) 'yksink. kalenteri' (oletus 1)\n");
     fprintf(ErrFp, " -p[n]  Kuten -s, mutta tulosta rem2ps:lle sopivassa muodossa\n");
     fprintf(ErrFp, " -v     Laveat tulostukset\n");
-    fprintf(ErrFp, " -o     \xC4l\xE4 noudata ONCE-lauseita\n");
-    fprintf(ErrFp, " -t     Laukaise kaikki viestit deltan arvosta v\xE4litt\xE4m\xE4tt\xE4\n");
+    fprintf(ErrFp, " -o     Älä noudata ONCE-lauseita\n");
+    fprintf(ErrFp, " -t     Laukaise kaikki viestit deltan arvosta välittämättä\n");
     fprintf(ErrFp, " -h     Suppeat tulostukset\n");
 #ifdef HAVE_QUEUED
-    fprintf(ErrFp, " -a     \xC4l\xE4 laukaise viestej\xE4 heti - lis\xE4\xE4 ne jonoon\n");
-    fprintf(ErrFp, " -q     \xC4l\xE4 lis\xE4\xE4 viestej\xE4 jonoon\n");
+    fprintf(ErrFp, " -a     Älä laukaise viestejä heti - lisää ne jonoon\n");
+    fprintf(ErrFp, " -q     Älä lisää viestejä jonoon\n");
     fprintf(ErrFp, " -f     Laukaise viestit, pysy etualalla\n");
-    fprintf(ErrFp, " -z[n]  K\xE4ynnisty demonina, her\xE4tys n:n (5:n) minuutin v\xE4lein\n");
+    fprintf(ErrFp, " -z[n]  Käynnisty demonina, herätys n:n (5:n) minuutin välein\n");
 #endif
-    fprintf(ErrFp, " -d...  Virheenetsint\xE4: e=echo x=expr-eval t=trig v=dumpvars l=showline\n");
+    fprintf(ErrFp, " -d...  Virheenetsintä: e=echo x=expr-eval t=trig v=dumpvars l=showline\n");
     fprintf(ErrFp, " -e     Ohjaa virhetulostus stdout-vuohon\n");
     fprintf(ErrFp, " -b[n]  Ajan ilmaisu: 0=ap/ip, 1=24 tuntia, 2=ei aikoja\n");
     fprintf(ErrFp, " -x[n]  SATISFY-lauseen toistoraja (oletus 150)\n");
     fprintf(ErrFp, " -kcmd  Suorita 'cmd' MSG-tyyppisille viesteille\n");
-    fprintf(ErrFp, " -g[ddd] Lajittele viestit p\xE4iv\xE4yksen, ajan ja t\xE4rkeyden mukaan\n");
-    fprintf(ErrFp, " -ivar=val Alusta muuttuja var arvolla val ja s\xE4ilyt\xE4 var\n");
-    fprintf(ErrFp, " -m     Aloita kalenteri maanantaista eik\xE4 sunnuntaista\n");
+    fprintf(ErrFp, " -g[ddd] Lajittele viestit päiväyksen, ajan ja tärkeyden mukaan\n");
+    fprintf(ErrFp, " -ivar=val Alusta muuttuja var arvolla val ja säilytä var\n");
+    fprintf(ErrFp, " -m     Aloita kalenteri maanantaista eikä sunnuntaista\n");
     exit(1);
-#elif IBMEXTENDED
-    fprintf(ErrFp, "K\x84ytt\x94: remind [tarkenteet] tiedosto [p\x84iv\x84ys] [aika] [*toisto]\n");
-    fprintf(ErrFp, "Tarkenteet:\n");
-    fprintf(ErrFp, " -n     Tulosta viestien seuraavat esiintymiskerrat yksink. muodossa\n");
-    fprintf(ErrFp, " -r     Est\x84 RUN-lauseiden k\x84ytt\x94\n");
-    fprintf(ErrFp, " -c[n]  Tulosta n:n kuukauden kalenteri (oletus 1)\n");
-    fprintf(ErrFp, " -c+[n] Tulosta n:n viikon kalenteri (oletus 1)\n");
-    fprintf(ErrFp, " -w[n[,p[,s]]] Aseta kalenterin leveys, tasaus ja v\x84lit\n");
-    fprintf(ErrFp, " -s[+][n] Tulosta n:n kuukauden (viikon) 'yksink. kalenteri' (oletus 1)\n");
-    fprintf(ErrFp, " -p[n]  Kuten -s, mutta tulosta rem2ps:lle sopivassa muodossa\n");
-    fprintf(ErrFp, " -v     Laveat tulostukset\n");
-    fprintf(ErrFp, " -o     \x8El\x84 noudata ONCE-lauseita\n");
-    fprintf(ErrFp, " -t     Laukaise kaikki viestit deltan arvosta v\x84litt\x84m\x84tt\x84\n");
-    fprintf(ErrFp, " -h     Suppeat tulostukset\n");
-#ifdef HAVE_QUEUED
-    fprintf(ErrFp, " -a     \x8El\x84 laukaise viestej\x84 heti - lis\x84\x84 ne jonoon\n");
-    fprintf(ErrFp, " -q     \x8El\x84 lis\x84\x84 viestej\x84 jonoon\n");
-    fprintf(ErrFp, " -f     Laukaise viestit, pysy etualalla\n");
-    fprintf(ErrFp, " -z[n]  K\x84ynnisty demonina, her\x84tys n:n (5:n) minuutin v\x84lein\n");
-#endif
-    fprintf(ErrFp, " -d...  Virheenetsint\x84: e=echo x=expr-eval t=trig v=dumpvars l=showline\n");
-    fprintf(ErrFp, " -e     Ohjaa virhetulostus stdout-vuohon\n");
-    fprintf(ErrFp, " -b[n]  Ajan ilmaisu: 0=ap/ip, 1=24 tuntia, 2=ei aikoja\n");
-    fprintf(ErrFp, " -x[n]  SATISFY-lauseen toistoraja (oletus 150)\n");
-    fprintf(ErrFp, " -kcmd  Suorita 'cmd' MSG-tyyppisille viesteille\n");
-    fprintf(ErrFp, " -g[ddd] Lajittele viestit p\x84iv\x84yksen, ajan ja t\x84rkeyden mukaan\n");
-    fprintf(ErrFp, " -ivar=val Alusta muuttuja var arvolla val ja s\x84ilyt\x84 var\n");
-    fprintf(ErrFp, " -m     Aloita kalenteri maanantaista eik\x84 sunnuntaista\n");
-    exit(1);
-#else
-    fprintf(ErrFp, "K{ytt|: remind [tarkenteet] tiedosto [p{iv{ys] [aika] [*toisto]\n");
-    fprintf(ErrFp, "Tarkenteet:\n");
-    fprintf(ErrFp, " -n     Tulosta viestien seuraavat esiintymiskerrat yksink. muodossa\n");
-    fprintf(ErrFp, " -r     Est{ RUN-lauseiden k{ytt|\n");
-    fprintf(ErrFp, " -c[n]  Tulosta n:n kuukauden kalenteri (oletus 1)\n");
-    fprintf(ErrFp, " -c+[n] Tulosta n:n viikon kalenteri (oletus 1)\n");
-    fprintf(ErrFp, " -w[n[,p[,s]]] Aseta kalenterin leveys, tasaus ja v{lit\n");
-    fprintf(ErrFp, " -s[+][n] Tulosta n:n kuukauden (viikon) 'yksink. kalenteri' (oletus 1)\n");
-    fprintf(ErrFp, " -p[n]  Kuten -s, mutta tulosta rem2ps:lle sopivassa muodossa\n");
-    fprintf(ErrFp, " -v     Laveat tulostukset\n");
-    fprintf(ErrFp, " -o     [l{ noudata ONCE-lauseita\n");
-    fprintf(ErrFp, " -t     Laukaise kaikki viestit deltan arvosta v{litt{m{tt{\n");
-    fprintf(ErrFp, " -h     Suppeat tulostukset\n");
-#ifdef HAVE_QUEUED
-    fprintf(ErrFp, " -a     [l{ laukaise viestej{ heti - lis{{ ne jonoon\n");
-    fprintf(ErrFp, " -q     [l{ lis{{ viestej{ jonoon\n");
-    fprintf(ErrFp, " -f     Laukaise viestit, pysy etualalla\n");
-    fprintf(ErrFp, " -z[n]  K{ynnisty demonina, her{tys n:n (5:n) minuutin v{lein\n");
-#endif
-    fprintf(ErrFp, " -d...  Virheenetsint{: e=echo x=expr-eval t=trig v=dumpvars l=showline\n");
-    fprintf(ErrFp, " -e     Ohjaa virhetulostus stdout-vuohon\n");
-    fprintf(ErrFp, " -b[n]  Ajan ilmaisu: 0=ap/ip, 1=24 tuntia, 2=ei aikoja\n");
-    fprintf(ErrFp, " -x[n]  SATISFY-lauseen toistoraja (oletus 150)\n");
-    fprintf(ErrFp, " -kcmd  Suorita 'cmd' MSG-tyyppisille viesteille\n");
-    fprintf(ErrFp, " -g[ddd] Lajittele viestit p{iv{yksen, ajan ja t{rkeyden mukaan\n");
-    fprintf(ErrFp, " -ivar=val Alusta muuttuja var arvolla val ja s{ilyt{ var\n");
-    fprintf(ErrFp, " -m     Aloita kalenteri maanantaista eik{ sunnuntaista\n");
-    exit(1);
-#endif
 }
 #endif /* L_IN_INIT */

src/langs/french.h

@@ -8,10 +8,9 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  REMIND is Copyright (C) 1992-2021 by Dianne Skoll          */
 /*  This file is Copyright (C) 1993 by Laurent Duperval and    */
-/*  David F. Skoll.                                            */
+/*  Dianne Skoll.                                              */
 /*                                                             */
 /***************************************************************/
 
@@ -29,29 +28,18 @@
 
 /* Month names */
 #define L_JAN "janvier"
-#if ISOLATIN1
-#define L_FEB "f\351vrier"
-#else
-#define L_FEB "fevrier"
-#endif
+#define L_FEB "février"
 #define L_MAR "mars"
 #define L_APR "avril"
 #define L_MAY "mai"
 #define L_JUN "juin"
 #define L_JUL "juillet"
-#if ISOLATIN1
-#define L_AUG "ao\373t"
-#else
-#define L_AUG "aout"
-#endif
+#define L_AUG "août"
 #define L_SEP "septembre"
 #define L_OCT "octobre"
 #define L_NOV "novembre"
-#if ISOLATIN1
-#define L_DEC "d\351cembre"
-#else
-#define L_DEC "decembre"
-#endif
+#define L_DEC "décembre"
+
 /* Today and tomorrow */
 #define L_TODAY "aujourd'hui"
 #define L_TOMORROW "demain"
@@ -82,22 +70,14 @@
 
 /* Minutes, hours, at, etc */
 #define L_NOW "maintenant"
-#if ISOLATIN1
-#define L_AT "\340"
-#else
-#define L_AT "a"
-#endif
+#define L_AT "à"
 #define L_MINUTE "minute"
 #define L_HOUR "heure"
 #define L_IS "est"
-#if ISOLATIN1
-#define L_WAS "\351tait"
-#else
-#define L_WAS "etait"
-#endif
+#define L_WAS "était"
 #define L_AND "et"
 /* What to add to make "hour" plural */
-#define L_HPLU "s"  
+#define L_HPLU "s"
 /* What to add to make "minute" plural */
 #define L_MPLU "s"
 
@@ -140,214 +120,110 @@ else if (tdiff < 0) { \
 #define L_ERR_OVERRIDE 1
 EXTERN char *ErrMsg[] =
 {
-#if ISOLATIN1
     "Ok",
     "']' manquant",
     "Apostrophe manquant",
-    "Expression trop complexe - trop d'op\351rateurs",
-    "Expression trop complexe - trop d'op\351randes",
+    "Expression trop complexe - trop d'opérateurs",
+    "Expression trop complexe - trop d'opérandes",
     "')' manquante",
-    "Fonction non-d\351finie",
-    "Caract\350re ill\351gal",
-    "Op\351rateur binaire attendu",
-    "Manque de m\351moire",
-    "Nombre mal form\351",
-    "Erreur interne - 'underflow' de la pile d'op\351rateurs",
+    "Fonction non-définie",
+    "Caractère illégal",
+    "Opérateur binaire attendu",
+    "Manque de mémoire",
+    "Nombre mal formé",
+    "Erreur interne - 'underflow' de la pile d'opérateurs",
     "Erreur interne - 'underflow' de la pile de variables",
     "Impossible de convertir",
-    "Types non-\351quivalents",
-    "D\351bordement de date",
+    "Types non-équivalents",
+    "Débordement de date",
     "Erreur interne - erreur de pile",
-    "Division par z\351ro",
-    "Variable non d\351finie",
+    "Division par zéro",
+    "Variable non définie",
     "Fin de ligne non attendue",
     "Fin de fichier non attendue",
     "Erreur I/O",
     "Ligne trop longue",
     "Erreur interne",
-    "Mauvaise date sp\351cifi\351e",
+    "Mauvaise date spécifiée",
     "Pas assez d'arguments",
     "Trop d'arguments",
-    "Heure mal form\351e",
-    "Nombre trop \351lev\351",
+    "Heure mal formée",
+    "Nombre trop élevé",
     "Nombre trop bas",
     "Impossible d'ouvrir le fichier",
-    "Trop d'INCLUDE imbriqu\351s",
+    "Trop d'INCLUDE imbriqués",
     "Erreur d'analyse",
-    "Impossible de calculer le d\351clenchement",
-    "Trop de IF imbriqu\351s",
+    "Impossible de calculer le déclenchement",
+    "Trop de IF imbriqués",
     "ELSE sans IF correspondant",
     "ENDIF sans IF correspondant",
     "Impossible d'omettre (OMIT) tous les jours",
-    "El\351ment(s) \351tranger(s) sur la ligne",
+    "Elément(s) étranger(s) sur la ligne",
     "POP-OMIT-CONTEXT sans PUSH-OMIT-CONTEXT correspondant",
-    "RUN d\351activ\351",
+    "RUN déactivé",
     "Erreur de domaine",
     "Identificateur invalide",
-    "Appel r\351cursif d\351tect\351",
+    "Appel récursif détecté",
     "",
-    "Impossible de modifier une variable syst\350me",
-    "Fonction de la librairie C ne peut repr\351senter la date/l'heure",
-    "Tentative de red\351finition d'une fonction intrins\350que",
-    "Impossible d'imbriquer une d\351finition de fonction dans une expression",
-    "Pour utiliser le facteur de r\351p\351tition la date doit \352tre sp\351cifi\351e au complet",
-    "Ann\351e sp\351cifi\351e deux fois",
-    "Mois sp\351cifi\351 deux fois",
-    "Jour sp\351cifi\351 deux fois",
-    "El\351ment inconnu",
-    "Mois et jour doivent \352tre sp\351cifi\351s dans commande OMIT",
+    "Impossible de modifier une variable système",
+    "Fonction de la librairie C ne peut représenter la date/l'heure",
+    "Tentative de redéfinition d'une fonction intrinsèque",
+    "Impossible d'imbriquer une définition de fonction dans une expression",
+    "Pour utiliser le facteur de répétition la date doit être spécifiée au complet",
+    "Année spécifiée deux fois",
+    "Mois spécifié deux fois",
+    "Jour spécifié deux fois",
+    "Elément inconnu",
+    "Mois et jour doivent être spécifiés dans commande OMIT",
     "Trop de OMITs partiels",
     "Trop de OMITs complets",
     "Attention: PUSH-OMIT-CONTEXT sans POP-OMIT-CONTEXT correspondant",
-    "Erreur \340 la lecture du fichier",
+    "Erreur à la lecture du fichier",
     "Fin de ligne attendue",
-    "Date h\351breuse invalide",
+    "Date hébreuse invalide",
     "IIF demande nombre d'arguments impair",
     "Attention: ENDIF manquant",
     "Virgule attendue",
-    "Jour de la semaine sp\351cifi\351 deux fois",
+    "Jour de la semaine spécifié deux fois",
     "Utiliser un seul parmi BEFORE, AFTER ou SKIP",
     "Impossible d'imbriquer MSG, MSF, RUN, etc. dans une expression",
-    "Valeur de r\351p\351tition sp\351cifi\351e deux fois",
-    "Valeur delta sp\351cifi\351e deux fois",
-    "Valeur de retour sp\351cifi\351e deux fois",
-    "Mot-cl\351 ONCE utilis\351 deux fois. (Hah.)",
-    "Heure attendue apr\350s AT",
-    "Mot-cl\351 THROUGH/UNTIL utilis\351 deux fois",
-    "Sp\351cification de date incompl\350te",
-    "Mot-cl\351 FROM/SCANFROM utilis\351 deux fois",
+    "Valeur de répétition spécifiée deux fois",
+    "Valeur delta spécifiée deux fois",
+    "Valeur de retour spécifiée deux fois",
+    "Mot-clé ONCE utilisé deux fois. (Hah.)",
+    "Heure attendue après AT",
+    "Mot-clé THROUGH/UNTIL utilisé deux fois",
+    "Spécification de date incomplète",
+    "Mot-clé FROM/SCANFROM utilisé deux fois",
     "Variable",
     "Valeur",
     "*NON-DEFINI*",
-    "Entr\351e dans UserFN",
+    "Entrée dans UserFN",
     "Sortie de UserFN",
-    "Expir\351",
-    "fork() \351chou\351 - impossible de faire les appels en queue",
-    "Impossible d'acc\351der au fichier",
-    "Date syst\350me ill\351gale: Ann\351e est inf\351rieure \340 %d\n",
-    "Option de d\351verminage inconnue '%c'\n",
+    "Expiré",
+    "fork() échoué - impossible de faire les appels en queue",
+    "Impossible d'accéder au fichier",
+    "Date système illégale: Année est inférieure à %d\n",
+    "Option de déverminage inconnue '%c'\n",
     "Option inconnue '%c'\n",
     "Usager inconnu '%s'\n",
     "Impossible de changer gid pour %d\n",
     "Impossible de changer uid pour %d\n",
-    "Manque de m\351moire pour environnement\n",
+    "Manque de mémoire pour environnement\n",
     "Signe '=' manquant",
     "Nom de variable absent",
     "Expression absente",
-    "Impossible de changer la date d'acc\350s de %s\n",
+    "Impossible de changer la date d'accès de %s\n",
     "Remind: '-i' option: %s\n",
     "Pas de rappels.",
     "%d rappel(s) en file pour aujourd'hui.\n",
     "Nombre attendu",
-    "Fonction ill\351gale apr\350s WARN",
+    "Fonction illégale après WARN",
     "Can't convert between time zones",
     "No files matching *.rem",
-    "String too long"
-
-#else /* ISOLATIN1 */
-    "Ok",
-    "']' manquant",
-    "Apostrophe manquant",
-    "Expression trop complexe - trop d'operateurs",
-    "Expression trop complexe - trop d'operandes",
-    "')' manquante",
-    "Fonction non-definie",
-    "Caractere illegal",
-    "Operateur binaire attendu",
-    "Manque de memoire",
-    "Nombre mal forme",
-    "Erreur interne - 'underflow' de la pile d'operateurs",
-    "Erreur interne - 'underflow' de la pile de variables",
-    "Impossible de convertir",
-    "Types non-equivalents",
-    "Debordement de date",
-    "Erreur interne - erreur de pile",
-    "Division par zero",
-    "Variable non definie",
-    "Fin de ligne non attendue",
-    "Fin de fichier non attendue",
-    "Erreur I/O",
-    "Ligne trop longue",
-    "Erreur interne",
-    "Mauvaise date specifiee",
-    "Pas assez d'arguments",
-    "Trop d'arguments",
-    "Heure mal formee",
-    "Nombre trop eleve",
-    "Nombre trop bas",
-    "Impossible d'ouvrir le fichier",
-    "Trop d'INCLUDE imbriques",
-    "erreur d'analyse",
-    "Impossible de calculer le declenchement",
-    "Trop de IF imbriques",
-    "ELSE sans IF correspondant",
-    "ENDIF sans IF correspondant",
-    "Impossible d'omettre (OMIT) tous les jours",
-    "Element(s) etranger(s) sur la ligne",
-    "POP-OMIT-CONTEXT sans PUSH-OMIT-CONTEXT correspondant",
-    "RUN desactive",
-    "Erreur de domaine",
-    "Identificateur invalide",
-    "Appel recursif detecte",
-    "",
-    "Impossible de modifier une variable systeme",
-    "Fonction de la librairie C ne peut representer la date/l'heure",
-    "Tentative de redefinition d'une fonction intrinseque",
-    "Impossible d'imbriquer une definition de fonction dans une expression",
-    "Pour utiliser le facteur de repetition la date doit etre specifiee au complet",
-    "Annee specifiee deux fois",
-    "Mois specifie deux fois",
-    "Jour specifie deux fois",
-    "Element inconnu",
-    "Mois et jour doivent etre specifies dans commande OMIT",
-    "Trop de OMITs partiels",
-    "Trop de OMITs complets",
-    "Attention: PUSH-OMIT-CONTEXT sans POP-OMIT-CONTEXT correspondant",
-    "Erreur a la lecture du fichier",
-    "Fin de ligne attendue",
-    "Date hebreuse invalide",
-    "IIF demande nombre d'arguments impair",
-    "Attention: ENDIF manquant",
-    "Virgule attendue",
-    "Jour de la semaine specifie deux fois",
-    "Utiliser un seul parmi BEFORE, AFTER ou SKIP",
-    "Impossible d'imbriquer MSG, MSF, RUN, etc. dans une expression",
-    "Valeur de repetition specifiee deux fois",
-    "Valeur delta specifiee deux fois",
-    "Valeur de retour specifiee deux fois",
-    "Mot-cle ONCE utilise deux fois. (Hah.)",
-    "Heure attendue apres AT",
-    "Mot-cle THROUGH/UNTIL utilise deux fois",
-    "Specification de date incomplete",
-    "Mot-cle FROM/SCANFROM utilise deux fois",
-    "Variable",
-    "Valeur",
-    "*NON-DEFINI*",
-    "Entree dans UserFN",
-    "Sortie de UserFN",
-    "Expire",
-    "fork() echoue - impossible de faire les appels en queue",
-    "Impossible d'acceder au fichier",
-    "Date systeme illegale: Annee est inferieure a %d\n",
-    "Option de deverminage inconnue '%c'\n",
-    "Option inconnue '%c'\n",
-    "Usager inconnu '%s'\n",
-    "Impossible de changer gid pour %d\n",
-    "Impossible de changer uid pour %d\n",
-    "Manque de memoire pour environnement\n",
-    "Signe '=' manquant",
-    "Nom de variable absent",
-    "Expression absente",
-    "Impossible de changer la date d'acces de %s\n",
-    "Remind: '-i' option: %s\n",
-    "Pas de rappels.",
-    "%d rappel(s) en file pour aujourd'hui.\n",
-    "Nombre attendu",
-    "Fonction illegale apres WARN",
-    "Can't convert between time zones",
-    "No files matching *.rem",
-    "String too long"
-#endif /* ISOLATIN1 */
+    "String too long",
+    "Time specified twice",
+    "Cannot specify DURATION without specifying AT"
 };
 #endif /* MK_GLOBALS */
 
@@ -356,68 +232,37 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    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");
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2021 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
     fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
 #endif
-#if ISOLATIN1
-    fprintf(ErrFp, "\nUtilisation: remind [options] fichier [date] [heure] [*r\351p\351tition]\n");
+    fprintf(ErrFp, "\nUtilisation: remind [options] fichier [date] [heure] [*répétition]\n");
     fprintf(ErrFp, "Options:\n");
     fprintf(ErrFp, " -n     Afficher la prochaine occurence des rappels en format simple\n");
-    fprintf(ErrFp, " -r     D\351sactiver les instructions RUN\n");
-    fprintf(ErrFp, " -c[n]  Produire un calendrier pour n (d\351faut 1) mois\n");
-    fprintf(ErrFp, " -c+[n] Produire un calendrier pour n (d\351faut 1) semaines\n");
-    fprintf(ErrFp, " -w[n[,p[,s]]]  Sp\351cifier largeur, remplissage et espacement du calendrier\n");
+    fprintf(ErrFp, " -r     Désactiver les instructions RUN\n");
+    fprintf(ErrFp, " -c[n]  Produire un calendrier pour n (défaut 1) mois\n");
+    fprintf(ErrFp, " -c+[n] Produire un calendrier pour n (défaut 1) semaines\n");
+    fprintf(ErrFp, " -w[n[,p[,s]]]  Spécifier largeur, remplissage et espacement du calendrier\n");
     fprintf(ErrFp, " -s[+][n] Produire un 'calendrier simple' pour n (1) mois (semaines)\n");
-    fprintf(ErrFp, " -p[n]  Comme -s, mais avec entr\351e compatible avec rem2ps\n");
+    fprintf(ErrFp, " -p[n]  Comme -s, mais avec entrée compatible avec rem2ps\n");
     fprintf(ErrFp, " -v     Mode verbeux\n");
     fprintf(ErrFp, " -o     Ignorer instructions ONCE\n");
-    fprintf(ErrFp, " -t     D\351clencher tous les rappels peu importe le delta\n");
+    fprintf(ErrFp, " -t     Déclencher tous les rappels peu importe le delta\n");
     fprintf(ErrFp, " -h     Mode silencieux\n");
 #ifdef HAVE_QUEUED
-    fprintf(ErrFp, " -a     Ne pas d\351clencher les rappels minut\351s imm\351diatement - les mettre en file\n");
-    fprintf(ErrFp, " -q     Ne pas mettre les rappels minut\351s en file\n");
-    fprintf(ErrFp, " -f     D\351clencher les rappels minut\351s imm\351diatement en restant en avant-plan\n");
-    fprintf(ErrFp, " -z[n]  Entrer en mode 'daemon', r\351veil chaque n (5) minutes\n");
+    fprintf(ErrFp, " -a     Ne pas déclencher les rappels minutés immédiatement - les mettre en file\n");
+    fprintf(ErrFp, " -q     Ne pas mettre les rappels minutés en file\n");
+    fprintf(ErrFp, " -f     Déclencher les rappels minutés immédiatement en restant en avant-plan\n");
+    fprintf(ErrFp, " -z[n]  Entrer en mode 'daemon', réveil chaque n (5) minutes\n");
 #endif
     fprintf(ErrFp, " -d...  Debug: e=echo x=expr-eval t=trig v=dumpvars l=showline\n");
-    fprintf(ErrFp, " -e     Envoyer les messages de stderr \340 stdout\n");
+    fprintf(ErrFp, " -e     Envoyer les messages de stderr à stdout\n");
     fprintf(ErrFp, " -b[n]  Formats de l'heure pour le calendrier: 0=am/pm, 1=24hr, 2=aucun\n");
-    fprintf(ErrFp, " -x[n]  Limite d'it\351rations pour la clause SATISFY (def=150)\n");
-    fprintf(ErrFp, " -kcmd  Ex\351cuter 'cmd' pour les rappels de type MSG\n");
-    fprintf(ErrFp, " -g[ddd] Trier les rappels par date, heure et priorit\351 avant d'\351mettre\n");
-    fprintf(ErrFp, " -ivar=val Initialiser var \340 val et conserver var\n");
-    fprintf(ErrFp, " -m     Commencer le calendrier avec lundi plut\364t que dimanche\n");
-#else /* ISOLATIN1 */
-    fprintf(ErrFp, "\nUtilisation: remind [options] fichier [date] [heure] [*repetition]\n");
-    fprintf(ErrFp, "Options:\n");
-    fprintf(ErrFp, " -n     Afficher la prochaine occurence des rappels en format simple\n");
-    fprintf(ErrFp, " -r     Desactiver les instructions RUN\n");
-    fprintf(ErrFp, " -c[n]  Produire un calendrier pour n (defaut 1) mois\n");
-    fprintf(ErrFp, " -c+[n] Produire un calendrier pour n (defaut 1) semaines\n");
-    fprintf(ErrFp, " -w[n[,p[,s]]]  Specifier largeur, remplissage et espacement du calendrier\n");
-    fprintf(ErrFp, " -s[+][n] Produire un 'calendrier simple' pour n (1) mois (semaines)\n");
-    fprintf(ErrFp, " -p[n]  Comme -s, mais avec entree compatible avec rem2ps\n");
-    fprintf(ErrFp, " -v     Mode verbeux\n");
-    fprintf(ErrFp, " -o     Ignorer instructions ONCE\n");
-    fprintf(ErrFp, " -t     Declencher tous les rappels peu importe le delta\n");
-    fprintf(ErrFp, " -h     Mode silencieux\n");
-#ifdef HAVE_QUEUED
-    fprintf(ErrFp, " -a     Ne pas declencher les rappels minutes immediatement - les mettre en file\n");
-    fprintf(ErrFp, " -q     Ne pas mettre les rappels minutes en file\n");
-    fprintf(ErrFp, " -f     Declencher les rappels minutes immediatement en restant en avant-plan\n");
-    fprintf(ErrFp, " -z[n]  Entrer en mode 'daemon', reveil chaque n (5) minutes\n");
-#endif
-    fprintf(ErrFp, " -d...  Debug: e=echo x=expr-eval t=trig v=dumpvars l=showline\n");
-    fprintf(ErrFp, " -e     Envoyer les messages de stderr a stdout\n");
-    fprintf(ErrFp, " -b[n]  Formats de l'heure pour le calendrier: 0=am/pm, 1=24hr, 2=aucun\n");
-    fprintf(ErrFp, " -x[n]  Limite d'iterations pour la clause SATISFY (def=150)\n");
-    fprintf(ErrFp, " -kcmd  Executer 'cmd' pour les rappels de type MSG\n");
-    fprintf(ErrFp, " -g[ddd] Trier les rappels par date, heure et priorite avant d'emettre\n");
-    fprintf(ErrFp, " -ivar=val Initialiser var a val et conserver var\n");
-    fprintf(ErrFp, " -m     Commencer le calendrier avec lundi plutot que dimanche\n");
-#endif /* ISOLATIN1 */
+    fprintf(ErrFp, " -x[n]  Limite d'itérations pour la clause SATISFY (def=150)\n");
+    fprintf(ErrFp, " -kcmd  Exécuter 'cmd' pour les rappels de type MSG\n");
+    fprintf(ErrFp, " -g[ddd] Trier les rappels par date, heure et priorité avant d'émettre\n");
+    fprintf(ErrFp, " -ivar=val Initialiser var à val et conserver var\n");
+    fprintf(ErrFp, " -m     Commencer le calendrier avec lundi plutôt que dimanche\n");
     exit(1);
 }
 #endif /* L_IN_INIT */

src/langs/german.h

@@ -9,8 +9,7 @@
 /*  I don't speak German.                                      */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -29,11 +28,7 @@
 /* Month names */
 #define L_JAN "Januar"
 #define L_FEB "Februar"
-#if ISOLATIN1
-#  define L_MAR "M\344rz"
-#else
-#  define L_MAR "Maerz"
-#endif
+#define L_MAR "März"
 #define L_APR "April"
 #define L_MAY "Mai"
 #define L_JUN "Juni"
@@ -49,11 +44,7 @@
 #define L_TOMORROW "morgen"
 
 /* The default banner */
-#if ISOLATIN1
-#  define L_BANNER "Termine f\374r %w, den %d. %m %y%o:"
-#else
-#  define L_BANNER "Termine fuer %w, den %d. %m %y%o:"
-#endif
+#define L_BANNER "Termine für %w, den %d. %m %y%o:"
 
 /* "am" and "pm" */
 #define L_AM "am"

src/langs/icelandic.h

@@ -5,8 +5,7 @@
 /*  Support for the Icelandic language.                        */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*  Translated by Björn Davíðsson (bjossi@snerpa.is)           */
 /*                                                             */
 /***************************************************************/

src/langs/italian.h

@@ -7,8 +7,7 @@
 /*  This file is part of REMIND.                               */
 /*  It is Copyright (C) 1996 by Valerio Aimale                 */
 /*                                                             */
-/*  Remind is copyright (C) 1992-1998 by David F. Skoll        */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Remind is copyright (C) 1992-2021 by Dianne Skoll          */
 /*                                                             */
 /***************************************************************/
 
@@ -16,23 +15,13 @@
 #define L_LANGNAME "Italian"
 
 /* Day names */
-#if ISOLATIN1
 #define L_SUNDAY "Domenica"
-#define L_MONDAY "Luned\354"
-#define L_TUESDAY "Marted\354"
-#define L_WEDNESDAY "Mercoled\354"
-#define L_THURSDAY "Gioved\354"
-#define L_FRIDAY "Venerd\354"
+#define L_MONDAY "Lunedí"
+#define L_TUESDAY "Martedí"
+#define L_WEDNESDAY "Mercoledí"
+#define L_THURSDAY "Giovedí"
+#define L_FRIDAY "Venerdí"
 #define L_SATURDAY "Sabato"
-#else /* ISOLATIN1 */
-#define L_SUNDAY "Domenica"
-#define L_MONDAY "Lunedi`"
-#define L_TUESDAY "Martedi`"
-#define L_WEDNESDAY "Mercoledi`"
-#define L_THURSDAY "Giovedi`"
-#define L_FRIDAY "Venerdi`"
-#define L_SATURDAY "Sabato"
-#endif /* ISOLATIN */
 
 /* Month names */
 #define L_JAN "Gennaio"
@@ -77,58 +66,54 @@
    a more drastic fix */
 
 /* Minutes, hours, at, etc */
-#define L_NOW "ora"  
+#define L_NOW "ora"
 #define L_AT "alle"
 #define L_MINUTE "minut"
 #define L_HOUR "or"
-#if ISOLATIN1 
-#define L_IS "\350"
-#else /* ISOLATIN1 */
-#define L_IS "e`"
-#endif/* ISOLATIN1 */
+#define L_IS "é"
 #define L_WAS "era"
 #define L_AND "e"
 /* What to add to make "hour" plural */
-#define L_HPLU "s"  
+#define L_HPLU "s"
 /* What to add to make "minute" plural */
 #define L_MPLU "s"
 
 /* Define any overrides here, such as L_ORDINAL_OVERRIDE, L_A_OVER, etc.
    See the file dosubst.c for more info. */
 
-#define L_P_OVER sprintf(s, (diff == 1 ? "o" : "i")); 
-#define L_Q_OVER sprintf(s, (diff == 1 ? "a" : "e")); 
+#define L_P_OVER sprintf(s, (diff == 1 ? "o" : "i"));
+#define L_Q_OVER sprintf(s, (diff == 1 ? "a" : "e"));
 
 #define L_HPLU_OVER	hplu = (hdiff == 1 ? "a" : "e");
 #define L_MPLU_OVER	mplu = (mdiff == 1 ? "o" : "i");
 
 #define L_A_OVER	sprintf(s, "%s, %d %s %d", DayName[jul%7], d,\
-		    		MonthName[m], y);	
-#define L_C_OVER	sprintf(s, "%s", DayName[jul%7]);	
+                                MonthName[m], y);
+#define L_C_OVER	sprintf(s, "%s", DayName[jul%7]);
 
 #define L_E_OVER	sprintf(s, "%02d%c%02d%c%04d", d, DateSep,\
-				 m+1, DateSep, y);	
+                                 m+1, DateSep, y);
 
-#define L_F_OVER	sprintf(s, "%02d%c%02d%c%04d", m+1, DateSep, d, DateSep, y);	
+#define L_F_OVER	sprintf(s, "%02d%c%02d%c%04d", m+1, DateSep, d, DateSep, y);
 
-#define L_G_OVER	sprintf(s, "%s, %d %s", DayName[jul%7], d, MonthName[m]);	
+#define L_G_OVER	sprintf(s, "%s, %d %s", DayName[jul%7], d, MonthName[m]);
 
-#define L_H_OVER	sprintf(s, "%02d%c%02d", d, DateSep, m+1);	
+#define L_H_OVER	sprintf(s, "%02d%c%02d", d, DateSep, m+1);
 
-#define L_I_OVER	sprintf(s, "%02d%c%02d", m+1, DateSep, d);	
+#define L_I_OVER	sprintf(s, "%02d%c%02d", m+1, DateSep, d);
 
 #define L_J_OVER	sprintf(s, "%s, %d %s %d", DayName[jul%7], d, \
-				MonthName[m], y);
+                                MonthName[m], y);
 
 #define L_K_OVER	sprintf(s, "%s, %d %s", DayName[jul%7], d, \
-				MonthName[m]);
-#define L_L_OVER	sprintf(s, "%04d%c%02d%c%02d", y, DateSep, m+1, DateSep, d);	
+                                MonthName[m]);
+#define L_L_OVER	sprintf(s, "%04d%c%02d%c%02d", y, DateSep, m+1, DateSep, d);
 
 #define L_U_OVER	sprintf(s, "%s, %d %s %d", DayName[jul%7], d, \
-				MonthName[m], y);
+                                MonthName[m], y);
 
 #define L_V_OVER	sprintf(s, "%s, %d %s", DayName[jul%7], d, \
-				MonthName[m]);
+                                MonthName[m]);
+
 
- 
 #endif /* L_IN_DOSUBST */

src/langs/norwgian.h

@@ -6,8 +6,7 @@
 /*                                                             */
 /*  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-2000 by Roaring Penguin Software Inc.       */
+/*  Remind is Copyright (C) 1992-2021 by Dianne Skoll          */
 /*                                                             */
 /***************************************************************/
 
@@ -15,21 +14,13 @@
 #define L_LANGNAME "Norwegian"
 
 /* Day names */
-#if ISOLATIN1
-#  define L_SUNDAY "S\370ndag"
-#else
-#  define L_SUNDAY "Soendag"
-#endif
+#define L_SUNDAY "Søndag"
 #define L_MONDAY "Mandag"
 #define L_TUESDAY "Tirsdag"
 #define L_WEDNESDAY "Onsdag"
 #define L_THURSDAY "Torsdag"
 #define L_FRIDAY "Fredag"
-#if ISOLATIN1
-#  define L_SATURDAY "L\370rdag"
-#else
-#  define L_SATURDAY "Loerdag"
-#endif
+#define L_SATURDAY "Lørdag"
 
 /* Month names */
 #define L_JAN "Januar"
@@ -50,11 +41,7 @@
 #define L_TOMORROW "i morgen"
 
 /* The default banner */
-#if ISOLATIN1
-#  define L_BANNER "P\345minnelse for %w, %d. %m, %y%o:"
-#else
-#  define L_BANNER "Paaminnelse for %w, %d. %m, %y%o:"
-#endif
+#define L_BANNER "Påminnelse for %w, %d. %m, %y%o:"
 
 /* "am" and "pm" */
 #define L_AM "am"
@@ -65,11 +52,7 @@
 
 /* Ago and from now */
 #define L_AGO "siden"
-#if ISOLATIN1
-#  define L_FROMNOW "fra n\345"
-#else
-#  define L_FROMNOW "fra naa"
-#endif
+#define L_FROMNOW "fra nå"
 
 /* "in %d days' time" */
 #define L_INXDAYS "om %d dager"
@@ -82,11 +65,7 @@
 #define L_PLURAL "er"
 
 /* Minutes, hours, at, etc */
-#if ISOLATIN1
-#  define L_NOW "n\345"
-#else
-#  define L_NOW "naa"
-#endif
+#define L_NOW "nå"
 #define L_AT "kl."
 #define L_MINUTE "minutt"
 #define L_HOUR "time"
@@ -94,7 +73,7 @@
 #define L_WAS "var"
 #define L_AND "og"
 /* What to add to make "hour" plural */
-#define L_HPLU "r"  
+#define L_HPLU "r"
 /* What to add to make "minute" plural */
 #define L_MPLU "er"
 

src/langs/polish.h

@@ -9,8 +9,7 @@
 /*  Polish.                                                    */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -18,52 +17,27 @@
 #define L_LANGNAME "Polish"
 
 /* Day names */
-#if ISOLATIN1
 #  define L_SUNDAY "Niedziela"
-#  define L_MONDAY "Poniedzia\263ek"
+#  define L_MONDAY "Poniedziałek"
 #  define L_TUESDAY "Wtorek"
-#  define L_WEDNESDAY "\246roda"
+#  define L_WEDNESDAY "Środa"
 #  define L_THURSDAY "Czwartek"
-#  define L_FRIDAY "Pi\261tek"
+#  define L_FRIDAY "Piątek"
 #  define L_SATURDAY "Sobota"
-#else
-#  define L_SUNDAY "Niedziela"
-#  define L_MONDAY "Poniedzialek"
-#  define L_TUESDAY "Wtorek"
-#  define L_WEDNESDAY "Sroda"
-#  define L_THURSDAY "Czwartek"
-#  define L_FRIDAY "Piatek"
-#  define L_SATURDAY "Sobota"
-#endif
 
 /* Month names */
-#if ISOLATIN1
-#  define L_JAN "Stycze\361"
+#  define L_JAN "Styczeń"
 #  define L_FEB "Luty"
 #  define L_MAR "Marzec"
-#  define L_APR "Kwiecie\361"
+#  define L_APR "Kwiecień"
 #  define L_MAY "Maj"
 #  define L_JUN "Czerwiec"
 #  define L_JUL "Lipiec"
-#  define L_AUG "Sierpie\361"
-#  define L_SEP "Wrzesie\361"
-#  define L_OCT "Pa\274dziernik"
+#  define L_AUG "Sierpień"
+#  define L_SEP "Wrzesień"
+#  define L_OCT "Październik"
 #  define L_NOV "Listopad"
-#  define L_DEC "Grudzie\361"
-#else
-#  define L_JAN "Styczen"
-#  define L_FEB "Luty"
-#  define L_MAR "Marzec"
-#  define L_APR "Kwiecien"
-#  define L_MAY "Maj"
-#  define L_JUN "Czerwiec"
-#  define L_JUL "Lipiec"
-#  define L_AUG "Sierpien"
-#  define L_SEP "Wrzesien"
-#  define L_OCT "Pazdziernik"
-#  define L_NOV "Listopad"
-#  define L_DEC "Grudzien"
-#endif
+#  define L_DEC "Grudzień"
 
 /* Today and tomorrow */
 #define L_TODAY "dzisiaj"
@@ -98,22 +72,12 @@
 #define L_AT "o"
 #define L_MINUTE "minut"
 #define L_HOUR "godzin"
-#if ISOLATIN1
-#  define L_IS "b\352dzie"
-#  define L_WAS "by\263o"
-#else
-#  define L_IS "bedzie"
-#  define L_WAS "bylo"
-#endif
+#  define L_IS "będzie"
+#  define L_WAS "było"
 #define L_AND "i"
 /* What to add to make "hour" or "minute" plural */
-#if ISOLATIN1
-#define L_NPLU( N ) ((N == 1) ? "\352" : ((N==12) || (N==13) || (N==14)) ? "" : \
+#define L_NPLU( N ) ((N == 1) ? "ę" : ((N==12) || (N==13) || (N==14)) ? "" : \
      ((N%10==2) || (N%10==3) || (N%10==4)) ? "y" : "" )
-#else
-#define L_NPLU( N ) ((N == 1) ? "e" : ((N==12) || (N==13) || (N==14)) ? "" : \
-     ((N%10==2) || (N%10==3) || (N%10==4)) ? "y" : "" )
-#endif
 /* What to add to make "hour" plural */
 #define L_HPLU L_NPLU( hdiff )
 /* What to add to make "minute" plural */
@@ -121,25 +85,14 @@
 
 /* Define any overrides here, such as L_ORDINAL_OVERRIDE, L_A_OVER, etc.
    See the file dosubst.c for more info. */
-#if ISOLATIN1
 #define L_AMPM_OVERRIDE(ampm, hour) \
 ampm = (hour<12) ? \
      (hour<5) ? " w nocy" \
      : (hour<10) ? " rano" \
-     : " przed po\263udniem" \
-     : (hour<18) ? " po po\263udniu" \
+     : " przed południem" \
+     : (hour<18) ? " po południu" \
      : (hour<22) ? " wieczorem" \
      : " w nocy";
-#else
-#define L_AMPM_OVERRIDE(ampm, hour) \
-ampm = (hour<12) ? \
-(hour<5) ? " w nocy" \
-: (hour<10) ? " rano" \
-: " przed poludniem" \
-: (hour<18) ? " po poludniu" \
-: (hour<22) ? " wieczorem" \
-: " w nocy";
-#endif
 #define L_ORDINAL_OVERRIDE		plu = "";
 #define L_A_OVER			if (altmode == '*') { sprintf(s, "%s, %d. %s %d", DayName[jul%7], d, MonthName[m], y); } else { sprintf(s, "%s %s, %d. %s %d", L_ON, DayName[jul%7], d, MonthName[m], y); }
 #define	L_G_OVER			if (altmode == '*') { sprintf(s, "%s, %d. %s", DayName[jul%7], d, MonthName[m]); } else { sprintf(s, "%s %s, %d. %s", L_ON, DayName[jul%7], d, MonthName[m]); }
@@ -179,213 +132,110 @@ else \
 #define L_ERR_OVERRIDE 1
 EXTERN char *ErrMsg[] =
 {
-#if ISOLATIN1
     "OK",
-    "Brakuj\261cy ']'",
-    "Brakuj\261cy nawias",
-    "Zbyt skomplikowane wyra\277enie - za du\277o operator\363w",
-    "Zbyt skomplikowane wyra\277enie - za du\277o argument\363w",
-    "Brakuj\261cy ')'",
+    "Brakujący ']'",
+    "Brakujący nawias",
+    "Zbyt skomplikowane wyrażenie - za dużo operatorów",
+    "Zbyt skomplikowane wyrażenie - za dużo argumentów",
+    "Brakujący ')'",
     "Nie zdefiniowana funkcja",
     "Nielegalny znak",
     "Spodziewany operator binarny",
-    "Brak pami\352ci",
+    "Brak pamięci",
     "Niepoprawny numer",
-    "Pusty stos operator\363w - b\263\261d wewn\352trzny",
-    "Pusty stos zmiennych - b\263\261d wewn\352trzny",
-    "Niemo\277liwa konwersja",
-    "B\263\261d typu",
+    "Pusty stos operatorów - błąd wewnętrzny",
+    "Pusty stos zmiennych - błąd wewnętrzny",
+    "Niemożliwa konwersja",
+    "Błąd typu",
     "Nadmiar daty",
-    "B\263\261d stosu - b\263\261d wewn\352trzny",
+    "Błąd stosu - błąd wewnętrzny",
     "Dzielenie przez zero",
     "Niezdefiniowana zmienna",
     "Niespodziewany koniec linii",
     "Niespodziewany koniec pliku",
-    "B\263\261d wejscia/wyjscia",
-    "Za d\263uga linia",
-    "B\263\261d wewn\352trzny",
-    "Z\263a specyfikacja daty",
-    "Za ma\263o argument\363w",
-    "Za du\277o argument\363w",
-    "Nieprawid\263owy czas",
-    "Liczba za du\277a",
-    "Liczba za ma\263a",
-    "Nie mog\352 otworzy\346 pliku",
-    "Zbyt zagnie\277d\277one INCLUDE",
-    "B\263\261d sk\263adniowy",
-    "Nie mog\352 obliczy\346 przypomnienia",
-    "Zbyt zagnie\277d\277one IF",
+    "Błąd wejscia/wyjscia",
+    "Za długa linia",
+    "Błąd wewnętrzny",
+    "Zła specyfikacja daty",
+    "Za mało argumentów",
+    "Za dużo argumentów",
+    "Nieprawidłowy czas",
+    "Liczba za duża",
+    "Liczba za mała",
+    "Nie mogę otworzyć pliku",
+    "Zbyt zagnieżdżone INCLUDE",
+    "Błąd składniowy",
+    "Nie mogę obliczyć przypomnienia",
+    "Zbyt zagnieżdżone IF",
     "ELSE bez IF do pary",
     "ENDIF bez IF do pary",
-    "Nie mog\352 omin\261\346 (OMIT) wszystkich dni",
+    "Nie mogę ominąć (OMIT) wszystkich dni",
     "Niespodziewany wyraz w lini",
     "POP-OMIT-CONTEXT bez PUSH-OMIT-CONTEXT",
     "Komenda RUN zablokowana",
-    "B\263\261d dziedziny",
+    "Błąd dziedziny",
     "Niepoprawny identyfikator",
-    "Wykryto rekursywne wywo\263anie funkcji",
+    "Wykryto rekursywne wywołanie funkcji",
     "",
-    "Nie mog\352 zmieni\346 zmiennej systemowej",
-    "Funkcja biblioteki C nie mo\277e reprezentowac daty/czasu",
-    "Pr\363ba redefinicji funkcji wbudowanej",
-    "Nie wolno zagnie\277d\277a\346 definicji funkcji w wyra\277eniu",
-    "Aby u\277yc powt\363rzenia trzeba w pe\263ni wyspecyfikowa\346 dat\352",
-    "Rok podany dw\363krotnie",
-    "Miesi\261c podany dw\363krotnie",
-    "Dzie\361 podany dw\363krotnie",
-    "Nieznane s\263owo",
-    "W komendzie OMIT trzeba poda\346 miesi\261c i dzie\361",
-    "Za du\277o cz\352\266ciowych komend OMIT",
-    "Za du\277o pe\263nych komend OMIT",
-    "Ostrze\277enie: PUSH-OMIT-CONTEXT bez POP-OMIT-CONTEXT",
-    "B\263\261d odczytu pliku",
+    "Nie mogę zmienić zmiennej systemowej",
+    "Funkcja biblioteki C nie może reprezentowac daty/czasu",
+    "Próba redefinicji funkcji wbudowanej",
+    "Nie wolno zagnieżdżać definicji funkcji w wyrażeniu",
+    "Aby użyc powtórzenia trzeba w pełni wyspecyfikować datę",
+    "Rok podany dwókrotnie",
+    "Miesiąc podany dwókrotnie",
+    "Dzień podany dwókrotnie",
+    "Nieznane słowo",
+    "W komendzie OMIT trzeba podać miesiąc i dzień",
+    "Za dużo częściowych komend OMIT",
+    "Za dużo pełnych komend OMIT",
+    "Ostrzeżenie: PUSH-OMIT-CONTEXT bez POP-OMIT-CONTEXT",
+    "Błąd odczytu pliku",
     "Oczekiwany koniec linii",
-    "B\263\352dna data hebrajska",
-    "IIF wymaga nieparzystej liczby argument\363w",
-    "Ostrze\277enie: Brakujacy ENDIF",
+    "Błędna data hebrajska",
+    "IIF wymaga nieparzystej liczby argumentów",
+    "Ostrzeżenie: Brakujacy ENDIF",
     "Oczekiwany przecinek",
-    "Dzie\361 tygodnia podany dw\363krotnie",
+    "Dzień tygodnia podany dwókrotnie",
     "Dozwolone tylko jedno z:  BEFORE, AFTER i SKIP",
-    "Nie mo\277na zagnie\277d\277a\346 MSG, MSF, RUN, itp. w wyra\277eniu",
-    "Warto\266\346 powtorzenia podana dw\363krotnie",
-    "Warto\266\346 r\363\277nicy podana dw\363krotnie",
-    "Warto\266\346 cofni\352cia podana dw\363krotnie",
-    "S\263owo ONCE u\277yte dw\363krotnie.",
+    "Nie można zagnieżdżać MSG, MSF, RUN, itp. w wyrażeniu",
+    "Wartość powtorzenia podana dwókrotnie",
+    "Wartość różnicy podana dwókrotnie",
+    "Wartość cofnięcia podana dwókrotnie",
+    "Słowo ONCE użyte dwókrotnie.",
     "Po AT oczekiwany jest czas",
-    "S\263owo THROUGH/UNTIL u\277yte dw\363krotnie",
+    "Słowo THROUGH/UNTIL użyte dwókrotnie",
     "Niekompletna specyfikacja daty",
-    "S\263owo FROM/SCANFROM u\277yte dw\363krotnie",
+    "Słowo FROM/SCANFROM użyte dwókrotnie",
     "Zmienna",
-    "Warto\266\346",
+    "Wartość",
     "*NIE ZDEFINIOWANE*",
-    "Pocz\261tek UserFN",
+    "Początek UserFN",
     "Koniec UserFN",
-    "Przemine\263o",
-    "Niepowodzenie w funkcji fork() - nie mog\352 kolejkowa\346 przypomnie\361",
-    "Nie ma dost\352pu do pliku",
-    "B\263\352dna data systemowa: Rok mniejszy ni\277 %d\n",
+    "Przemineło",
+    "Niepowodzenie w funkcji fork() - nie mogę kolejkować przypomnień",
+    "Nie ma dostępu do pliku",
+    "Błędna data systemowa: Rok mniejszy niż %d\n",
     "Nieznana flaga odpluskwiania '%c'\n",
     "Nieznana opcja '%c'\n",
-    "Nieznany u\277ytkownik '%s'\n",
-    "Nie mog\352 zmieni\346 gid na %d\n",
-    "Nie mog\352 zmieni\346 uid na %d\n",
-    "Brak pami\352ci na zmienne \266rodowiska\n",
+    "Nieznany użytkownik '%s'\n",
+    "Nie mogę zmienić gid na %d\n",
+    "Nie mogę zmienić uid na %d\n",
+    "Brak pamięci na zmienne środowiska\n",
     "Brak znaku '='",
     "Brak nazwy zmiennej",
-    "Brak wyra\277enia",
-    "Nie mog\352 zmieni\346 daty dost\352pu pliku %s\n",
+    "Brak wyrażenia",
+    "Nie mogę zmienić daty dostępu pliku %s\n",
     "Remind: '-i' option: %s\n",
-    "Brak przypomnie\361.",
-    "%d Przypomnienia zakolejkowane na p\363\274niej.\n",
+    "Brak przypomnień.",
+    "%d Przypomnienia zakolejkowane na później.\n",
     "Spodziewana liczba",
     "Illegal function in WARN clause (NEEDS TRANSLATION TO POLISH)",
     "Can't convert between time zones",
     "No files matching *.rem",
-    "String too long"
-#else /* ISOLATIN1 */
-    "OK",
-    "Brakujacy ']'",
-    "Brakujacy nawias",
-    "Zbyt skomplikowane wyrazenie - za duzo operatorow",
-    "Zbyt skomplikowane wyrazenie - za duzo argumentow",
-    "Brakujacy ')'",
-    "Niezdefiniowana funkcja",
-    "Nielegalny znak",
-    "Spodziewany operator binarny",
-    "Brak pamieci",
-    "Niepoprawny numer",
-    "Pusty stos operatorow - blad wewnetrzny",
-    "Pusty stos zmiennych - blad wewnetrzny",
-    "Niemozliwa konwersja",
-    "Blad typu",
-    "Nadmiar daty",
-    "Blad stosu - blad wewnetrzny",
-    "Dzielenie przez zero",
-    "Niezdefiniowana zmienna",
-    "Niespodziewany koniec linii",
-    "Niespodziewany koniec pliku",
-    "Blad wejscia/wyjscia",
-    "Za dluga linia",
-    "Blad wewnetrzny",
-    "Zla specyfikacja daty",
-    "Za malo argumentow",
-    "Za duzo argumentow",
-    "Nieprawidlowy czas",
-    "Liczba za duza",
-    "Liczba za mala",
-    "Nie moge otworzyc pliku",
-    "INCLUDE zbyt zagniezdzone",
-    "Blad skladniowy",
-    "Nie moge obliczyc przypomnienia",
-    "Zbyt zagniezdzone IF",
-    "ELSE bez IF do pary",
-    "ENDIF bez IF do pary",
-    "Nie moge ominac (OMIT) wszystkich dni",
-    "Niespodziewany wyraz w lini",
-    "POP-OMIT-CONTEXT bez PUSH-OMIT-CONTEXT",
-    "Komenda RUN zablokowana",
-    "Blad dziedziny",
-    "Niepoprawny identyfikator",
-    "Wykryto rekursywne wywolanie funkcji",
-    "",
-    "Nie moga zmienic zmiennej systemowej",
-    "Funkcja biblioteki C nie moze reprezentowac daty/czasu",
-    "Proba redefinicji funkcji wbudowanej",
-    "Nie wolno zagniezdzac definicji funkcji w wyrazeniu",
-    "Aby uzyc powtorzenia trzeba w pelni wyspecyfikowac date",
-    "Rok podany dwokrotnie",
-    "Miesiac podany dwokrotnie",
-    "Dzien podany dwokrotnie",
-    "Nieznane slowo",
-    "W komendzie OMIT trzeba podac miesiac i dzien",
-    "Za duzo czesciowych komend OMIT",
-    "Za duzo pelnych komend OMIT",
-    "ostrzezenie: PUSH-OMIT-CONTEXT bez POP-OMIT-CONTEXT",
-    "Blad odczytu pliku",
-    "Oczekiwany koniec linii",
-    "Bledna data hebrajska",
-    "IIF wymaga nieparzystej liczby argumentow",
-    "Ostrzezenie: Brakujacy ENDIF",
-    "Oczekiwany przecinek",
-    "Dzien tygodnia podany dwokrotnie",
-    "Dozwolone tylko jedno z:  BEFORE, AFTER i SKIP",
-    "Nie mozna zagniezdzac MSG, MSF, RUN, itp. w wyrazeniu",
-    "Wartosc powtorzenia podana dwokrotnie",
-    "Wartosc roznicy podana dwokrotnie",
-    "Wartosc cofniecia podana dwokrotnie",
-    "Slowo ONCE uzyte dwokrotnie.",
-    "Po AT oczekiwany jest czas",
-    "Slowo THROUGH/UNTIL uzyte dwokrotnie",
-    "Niekompletna specyfikacja daty",
-    "Slowo FROM/SCANFROM uzyte dwokrotnie",
-    "Zmienna",
-    "Wartosc",
-    "*UNDEFINED*",
-    "Poczatek UserFN",
-    "Koniec UserFN",
-    "Przeminelo",
-    "niepowodzenie w funkcji fork() - nie moge kolejkowac przypomnien",
-    "Nie ma dostepu do pliku",
-    "Bledna data systemowa: Rok mniejszy niz %d\n",
-    "Nieznana flaga odpluskwiania '%c'\n",
-    "Nieznana opcja '%c'\n",
-    "Nieznany uzytkownik '%s'\n",
-    "Nie moge zmienic gid na %d\n",
-    "Nie moge zmienic uid na %d\n",
-    "Brak pamieci na zmienne srodowiska\n",
-    "Brak znaku '='",
-    "Brak nazwy zmiennej",
-    "Brak wyrazenia",
-    "Nie moge zmienic daty dostepu pliku %s\n",
-    "Remind: '-i' option: %s\n",
-    "Brak przypomnien.",
-    "%d Przypomnienia zakolejkowane na pozniej.\n",
-    "Spodziewana liczba",
-    "Illegal function in WARN clause (NEEDS TRANSLATION TO POLISH)",
-    "Can't convert between time zones",
-    "No files matching *.rem",
-    "String too long"
-#endif /* ISOLATIN1 */
+    "String too long",
+    "Time specified twice",
+    "Cannot specify DURATION without specifying AT"
 };
 #endif /* MK_GLOBALS */
 
@@ -394,68 +244,37 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    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");
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2021 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
     fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
 #endif
-#if ISOLATIN1
-    fprintf(ErrFp, "\nSpos\363b u\277ycia: remind [opcje] plik [data] [czas] [*powt\363rzenie]\n");
+    fprintf(ErrFp, "\nSposób użycia: remind [opcje] plik [data] [czas] [*powtórzenie]\n");
     fprintf(ErrFp, "Opcje:\n");
-    fprintf(ErrFp, " -n     Wypisz nast\352pne przypomnienia w prostym formacie\n");
+    fprintf(ErrFp, " -n     Wypisz następne przypomnienia w prostym formacie\n");
     fprintf(ErrFp, " -r     Zablokuj dyrektywy RUN\n");
-    fprintf(ErrFp, " -c[n]  Wypisz kalendarz na n (domy\266lnie 1) miesi\352cy\n");
-    fprintf(ErrFp, " -c+[n] Wypisz kalendarz na n (domy\266lnie 1) tygodni\n");
-    fprintf(ErrFp, " -w[n[,p[,s]]]  Ustaw szeroko\266\346, wype\263nienie i odst\352py w kalendarzu\n");
-    fprintf(ErrFp, " -s[+][n] Wypisz uproszczony kalendarz na n (1) miesi\352cy (tygodni)\n");
+    fprintf(ErrFp, " -c[n]  Wypisz kalendarz na n (domyślnie 1) miesięcy\n");
+    fprintf(ErrFp, " -c+[n] Wypisz kalendarz na n (domyślnie 1) tygodni\n");
+    fprintf(ErrFp, " -w[n[,p[,s]]]  Ustaw szerokość, wypełnienie i odstępy w kalendarzu\n");
+    fprintf(ErrFp, " -s[+][n] Wypisz uproszczony kalendarz na n (1) miesięcy (tygodni)\n");
     fprintf(ErrFp, " -p[n]  To samo co -s, ale kompatybilne z rem2ps\n");
     fprintf(ErrFp, " -v     Obszerniejsze komentarze\n");
     fprintf(ErrFp, " -o     Ignoruj instrukcje ONCE\n");
-    fprintf(ErrFp, " -t     Odpal wszystkie przysz\263e przypomnienia niezale\277nie od delty\n");
+    fprintf(ErrFp, " -t     Odpal wszystkie przyszłe przypomnienia niezależnie od delty\n");
     fprintf(ErrFp, " -h     Praca bezszmerowa\n");
 #ifdef HAVE_QUEUED
-    fprintf(ErrFp, " -a     Nie odpalaj przyponie\361 czasowych - kolejkuj je\n");
-    fprintf(ErrFp, " -q     Nie kolejkuj przyponie\361 czasowych\n");
-    fprintf(ErrFp, " -f     Nie przechod\274 do pracy w tle\n");
-    fprintf(ErrFp, " -z[n]  Pracuj jako demon, budz\261c si\352 co n (5) minut\n");
+    fprintf(ErrFp, " -a     Nie odpalaj przyponień czasowych - kolejkuj je\n");
+    fprintf(ErrFp, " -q     Nie kolejkuj przyponień czasowych\n");
+    fprintf(ErrFp, " -f     Nie przechodź do pracy w tle\n");
+    fprintf(ErrFp, " -z[n]  Pracuj jako demon, budząc się co n (5) minut\n");
 #endif
     fprintf(ErrFp, " -d...  Odpluskwianie: e=echo x=expr-eval t=trig v=dumpvars l=showline\n");
-    fprintf(ErrFp, " -e     Komunikaty o b\263\352dach skieruj na stdout\n");
-    fprintf(ErrFp, " -b[n]  Format czasu: 0=am/pm, 1=24godz., 2=\277aden\n");
-    fprintf(ErrFp, " -x[n]  Limit powt\363rze\361 klauzuli SATISFY (domy\266lnie=150)\n");
-    fprintf(ErrFp, " -kcmd  Wywo\263aj 'cmd' dla przypomnie\361 typu MSG\n");
-    fprintf(ErrFp, " -g[ddd] Sortuj przypomnienia wed\263ug daty, czasu i priorytetu\n");
-    fprintf(ErrFp, " -ivar=val Zainicjuj zmienn\261 var warto\266cia val i zachowaj ja\n");
-    fprintf(ErrFp, " -m     Rozpocznij kalendarz od poniedzia\263ku zamiast od niedzieli\n");
-#else /* ISOLATIN1 */
-    fprintf(ErrFp, "\nSposob uzycia: remind [opcje] plik [data] [czas] [*powtorzenie]\n");
-    fprintf(ErrFp, "Opcje:\n");
-    fprintf(ErrFp, " -n     Wypisz nastepne przypomnienia w prostym formacie\n");
-    fprintf(ErrFp, " -r     Zablokuj dyrektywy RUN\n");
-    fprintf(ErrFp, " -c[n]  Wypisz kalendarz na n (domyslnie 1) miesiecy\n");
-    fprintf(ErrFp, " -c+[n] Wypisz kalendarz na n (domyslnie 1) tygodni\n");
-    fprintf(ErrFp, " -w[n[,p[,s]]]  Ustaw szerokosc, wypelnienie i odstepy w kalendarzu\n");
-    fprintf(ErrFp, " -s[+][n] Wypisz uproszczony kalendarz na n (1) miesiecy (tygodni)\n");
-    fprintf(ErrFp, " -p[n]  To samo co -s, ale kompatybilne z rem2ps\n");
-    fprintf(ErrFp, " -v     Obszerniejsze komentarze\n");
-    fprintf(ErrFp, " -o     Ignoruj instrukcje ONCE\n");
-    fprintf(ErrFp, " -t     Odpal wszystkie przyszle przypomnienia niezaleznie od delty\n");
-    fprintf(ErrFp, " -h     Praca bezszmerowa\n");
-#ifdef HAVE_QUEUED
-    fprintf(ErrFp, " -a     Nie odpalaj przyponien czasowych - kolejkuj je\n");
-    fprintf(ErrFp, " -q     Nie kolejkuj przyponien czasowych\n");
-    fprintf(ErrFp, " -f     Nie przechodz do pracy w tle\n");
-    fprintf(ErrFp, " -z[n]  Pracuj jako demon, budzac sie co n (5) minut\n");
-#endif
-    fprintf(ErrFp, " -d...  Odpluskwianie: e=echo x=expr-eval t=trig v=dumpvars l=showline\n");
-    fprintf(ErrFp, " -e     Komunikaty o bledach skieruj na stdout\n");
-    fprintf(ErrFp, " -b[n]  Format czasu: 0=am/pm, 1=24godz., 2=zaden\n");
-    fprintf(ErrFp, " -x[n]  Limit powtorzen klauzuli SATISFY (domyslnie=150)\n");
-    fprintf(ErrFp, " -kcmd  Wywolaj 'cmd' dla przypomnien typu MSG\n");
-    fprintf(ErrFp, " -g[ddd] Sortuj przypomnienia wedlug daty, czasu i priorytetu\n");
-    fprintf(ErrFp, " -ivar=val Zainicjuj zmienna var wartoscia val i zachowaj ja\n");
-    fprintf(ErrFp, " -m     Rozpocznij kalendarz od poniedzialku zamiast od niedzieli\n");
-#endif /* ISOLATIN1 */
+    fprintf(ErrFp, " -e     Komunikaty o błędach skieruj na stdout\n");
+    fprintf(ErrFp, " -b[n]  Format czasu: 0=am/pm, 1=24godz., 2=żaden\n");
+    fprintf(ErrFp, " -x[n]  Limit powtórzeń klauzuli SATISFY (domyślnie=150)\n");
+    fprintf(ErrFp, " -kcmd  Wywołaj 'cmd' dla przypomnień typu MSG\n");
+    fprintf(ErrFp, " -g[ddd] Sortuj przypomnienia według daty, czasu i priorytetu\n");
+    fprintf(ErrFp, " -ivar=val Zainicjuj zmienną var wartościa val i zachowaj ja\n");
+    fprintf(ErrFp, " -m     Rozpocznij kalendarz od poniedziałku zamiast od niedzieli\n");
     exit(1);
 }
 #endif /* L_IN_INIT */

src/langs/portbr.h

@@ -8,10 +8,9 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  REMIND is Copyright (C) 1992-2021 by Dianne Skoll          */
 /*  This file is Copyright (C) 1996 by Marco Paganini and      */
-/*  David F. Skoll.                                            */
+/*  Dianne Skoll.                                              */
 /*                                                             */
 /***************************************************************/
 
@@ -247,7 +246,9 @@ EXTERN char *ErrMsg[] =
     "Funcao ilegal na clausula WARN",
     "Can't convert between time zones",
     "No files matching *.rem",
-    "String too long"
+    "String too long",
+    "Time specified twice",
+    "Cannot specify DURATION without specifying AT"
 };
 #endif /* MK_GLOBALS */
 
@@ -256,8 +257,7 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    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");
+    fprintf(ErrFp, "\nREMIND %s (versao %s) (C) 1992-2021 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
     fprintf(ErrFp, ">>>> VERSAO BETA <<<<\n");
 #endif

src/langs/romanian.h

@@ -8,8 +8,7 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-1998 by David F. Skoll        */
-/*       Copyright 1999-2000 by Roaring Penguin Software Inc.  */
+/*  REMIND is Copyright (C) 1992-2021 by Dianne Skoll          */
 /*  This file is Copyright (C) 1996-1998 by Liviu Daia         */
 /*                                                             */
 /***************************************************************/
@@ -18,39 +17,13 @@
 #define L_LANGNAME "Romanian"
 
 /* Day names */
-#if ISOLATIN1
-#  define L_SUNDAY "Duminica"
+#  define L_SUNDAY "Duminică"
 #  define L_MONDAY "Luni"
-#  define L_TUESDAY "Marti"
+#  define L_TUESDAY "Marți"
 #  define L_WEDNESDAY "Miercuri"
 #  define L_THURSDAY "Joi"
 #  define L_FRIDAY "Vineri"
-#  define L_SATURDAY "S\342mbata"
-#elif ISOLATIN2
-#  define L_SUNDAY "Duminic\343"
-#  define L_MONDAY "Luni"
-#  define L_TUESDAY "Mar\376i"
-#  define L_WEDNESDAY "Miercuri"
-#  define L_THURSDAY "Joi"
-#  define L_FRIDAY "Vineri"
-#  define L_SATURDAY "S\342mb\343t\343"
-#elif IBM852
-#  define L_SUNDAY "Duminic\307"
-#  define L_MONDAY "Luni"
-#  define L_TUESDAY "Mar\316i"
-#  define L_WEDNESDAY "Miercuri"
-#  define L_THURSDAY "Joi"
-#  define L_FRIDAY "Vineri"
-#  define L_SATURDAY "S\203mb\307t\307"
-#else
-#  define L_SUNDAY "Duminica"
-#  define L_MONDAY "Luni"
-#  define L_TUESDAY "Marti"
-#  define L_WEDNESDAY "Miercuri"
-#  define L_THURSDAY "Joi"
-#  define L_FRIDAY "Vineri"
-#  define L_SATURDAY "Sambata"
-#endif
+#  define L_SATURDAY "Sâmbătă"
 
 /* Month names */
 #define L_JAN "Ianuarie"
@@ -67,19 +40,8 @@
 #define L_DEC "Decembrie"
 
 /* Today and tomorrow */
-#if ISOLATIN1
-#  define L_TODAY "astazi"
-#  define L_TOMORROW "m\342ine"
-#elif ISOLATIN2
-#  define L_TODAY "ast\343zi"
-#  define L_TOMORROW "m\342ine"
-#elif IBM852
-#  define L_TODAY "ast\307zi"
-#  define L_TOMORROW "m\203ine"
-#else
-#  define L_TODAY "astazi"
-#  define L_TOMORROW "maine"
-#endif
+#  define L_TODAY "astăzi"
+#  define L_TOMORROW "mâine"
 
 /* The default banner */
 #define L_BANNER "Reamintiri pentru %w, %d %m %y%o:"
@@ -115,30 +77,13 @@
 /* What to add to make "minute" plural */
 #define L_MPLU "e"
 
-#if ISOLATIN2
-   /* What to add to make "hour" plural */
-#  define L_HPLU_OVER hplu = (hdiff == 1 ? "\343" : "e");
-#  define L_AND "\272i"
-#elif IBM852
-   /* What to add to make "hour" plural */
-#  define L_HPLU_OVER hplu = (hdiff == 1 ? "\307" : "e");
-#  define L_AND "\255i"
-#else
-   /* What to add to make "hour" plural */
-#  define L_HPLU_OVER hplu = (hdiff == 1 ? "a" : "e");
-#  define L_AND "si"
-#endif
+/* What to add to make "hour" plural */
+#define L_HPLU_OVER hplu = (hdiff == 1 ? "ă" : "e");
+#define L_AND "şi"
 
 /* Define any overrides here, such as L_ORDINAL_OVERRIDE, L_A_OVER, etc.
    See the file dosubst.c for more info. */
-#if ISOLATIN2
-#  define L_AMPM_OVERRIDE(ampm, hour)	ampm = (hour < 12) ? (hour<4) ? " noaptea" : " diminea\376a" : (hour > 17) ? " seara" : " dup\343-amiaza";
-#elif IBM852
-#  define L_AMPM_OVERRIDE(ampm, hour)	ampm = (hour < 12) ? (hour<4) ? " noaptea" : " diminea\316a" : (hour > 17) ? " seara" : " dup\307-amiaza";
-#else
-#  define L_AMPM_OVERRIDE(ampm, hour)	ampm = (hour < 12) ? (hour<4) ? " noaptea" : " dimineata" : (hour > 17) ? " seara" : " dupa-amiaza";
-#endif
-
+#define L_AMPM_OVERRIDE(ampm, hour)	ampm = (hour < 12) ? (hour<4) ? " noaptea" : " dimineaţa" : (hour > 17) ? " seara" : " după-amiaza";
 #define L_ORDINAL_OVERRIDE		plu = "";
 
 #define L_A_OVER sprintf(s, "%s, %d %s %d", DayName[jul%7], d, MonthName[m], y);

src/langs/spanish.h

@@ -7,8 +7,7 @@
 /*  Author: Rafa Couto <rafacouto@biogate.com>                 */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -18,19 +17,10 @@
 #define L_SUNDAY "Domingo"
 #define L_MONDAY "Lunes"
 #define L_TUESDAY "Martes"
-#if ISOLATIN1
-#define L_WEDNESDAY "Mi\351rcoles"
-#else
-#define L_WEDNESDAY "Miercoles"
-#endif
-
+#define L_WEDNESDAY "Miércoles"
 #define L_THURSDAY "Jueves"
 #define L_FRIDAY "Viernes"
-#if ISOLATIN1
-#define L_SATURDAY "S\341bado"
-#else
-#define L_SATURDAY "Sabado"
-#endif
+#define L_SATURDAY "Sábado"
 
 /* Nombres de los meses */
 #define L_JAN "Enero"
@@ -42,17 +32,13 @@
 #define L_JUL "Julio"
 #define L_AUG "Agosto"
 #define L_SEP "Septiembre"
-#define L_OCT "Octuber"
+#define L_OCT "Octubre"
 #define L_NOV "Noviembre"
 #define L_DEC "Diciembre"
 
 /* Hoy y man~ana */
 #define L_TODAY "hoy"
-#if ISOLATIN1
-#define L_TOMORROW "ma\361ana"
-#else
-#define L_TOMORROW "manana"
-#endif
+#define L_TOMORROW "mañana"
 
 /* El titular habitual */
 #define L_BANNER "Agenda para el %w, %d%s %m, %y%o:"
@@ -69,13 +55,8 @@
 #define L_FROMNOW "desde hoy"
 
 /* "dentro de %d di'as" */
-#if ISOLATIN1
-#define L_INXDAYS "dentro de %d d\355as"
-#define L_ON "el d\355a"
-#else
-#define L_INXDAYS "dentro de %d di'as"
-#define L_ON "el di'a"
-#endif
+#define L_INXDAYS "dentro de %d días"
+#define L_ON "el día"
 
 /* "el di'a..." */
 

src/main.c

@@ -6,8 +6,7 @@
 /*  routines, etc.                                             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2011 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -45,10 +44,6 @@
 
 static void DoReminders(void);
 
-/* Whooo... the putchar/Putchar/PutChar macros are a mess...
-   my apologies... */
-#define Putchar(c) PutChar(c)
-
 /***************************************************************/
 /***************************************************************/
 /**                                                           **/
@@ -64,14 +59,16 @@ int main(int argc, char *argv[])
     setlocale(LC_ALL, "");
 #endif
 
-/* The very first thing to do is to set up ErrFp to be stderr */
+    /* The very first thing to do is to set up ErrFp to be stderr */
     ErrFp = stderr;
 
-/* Set up global vars */
+    /* Set up global vars */
     ArgC = argc;
     ArgV = (char const **) argv;
 
     InitRemind(argc, (char const **) argv);
+    ClearLastTriggers();
+
     if (DoCalendar || (DoSimpleCalendar && (!NextMode || PsCal))) {
 	ProduceCalendar();
 	return 0;
@@ -126,10 +123,7 @@ int main(int argc, char *argv[])
 	    }
 	}
 	if (Iterations) {
-	    ClearGlobalOmits();
-	    DestroyOmitContexts();
-	    DestroyVars(0);
-	    NumTriggered = 0;
+	    PerIterationInit();
 	    JulianToday++;
 	}
     }
@@ -147,6 +141,19 @@ void PurgeEchoLine(char const *fmt, ...)
 
 }
 
+void
+PerIterationInit(void)
+{
+    ClearGlobalOmits();
+    DestroyOmitContexts();
+    DestroyVars(0);
+    DefaultColorR = -1;
+    DefaultColorG = -1;
+    DefaultColorB = -1;
+    NumTriggered = 0;
+    ClearLastTriggers();
+}
+
 /***************************************************************/
 /*                                                             */
 /*  DoReminders                                                */
@@ -224,12 +231,22 @@ static void DoReminders(void)
 	    case T_Else:    r=DoElse(&p);    break;
 	    case T_EndIf:   r=DoEndif(&p);   break;
 	    case T_Include:
+            case T_IncludeR:
 		/* In purge mode, include closes file, so we
 		   need to echo it here! */
 		if (PurgeMode) {
 		    PurgeEchoLine("%s\n", CurLine);
 		}
-		r=DoInclude(&p);
+		r=DoInclude(&p, tok.type);
+		purge_handled = 1;
+		break;
+	    case T_IncludeCmd:
+		/* In purge mode, include closes file, so we
+		   need to echo it here! */
+		if (PurgeMode) {
+		    PurgeEchoLine("%s\n", CurLine);
+		}
+		r=DoIncludeCmd(&p);
 		purge_handled = 1;
 		break;
 	    case T_Exit:    DoExit(&p);      break;
@@ -595,11 +612,11 @@ void OutputLine(FILE *fp)
     char c = 0;
 
     while (*s) {
-	if (*s == '\n') Putc('\\', fp);
-	Putc(*s, fp);
+	if (*s == '\n') putc('\\', fp);
+	putc(*s, fp);
 	c = *s++;
     }
-    if (c != '\n') Putc('\n', fp);
+    if (c != '\n') putc('\n', fp);
 }
 
 /***************************************************************/
@@ -714,7 +731,7 @@ int DoIf(ParsePtr p)
     int r;
     unsigned syndrome;
 
-    if (NumIfs >= IF_NEST) return E_NESTED_IF;
+    if ((size_t) NumIfs >= IF_NEST) return E_NESTED_IF;
 
     if (ShouldIgnoreLine()) syndrome = IF_TRUE | BEFORE_ELSE;
     else {
@@ -795,13 +812,20 @@ int DoIfTrig(ParsePtr p)
     int jul;
 
 
-    if (NumIfs >= IF_NEST) return E_NESTED_IF;
+    if ((size_t) NumIfs >= IF_NEST) return E_NESTED_IF;
     if (ShouldIgnoreLine()) syndrome = IF_TRUE | BEFORE_ELSE;
     else {
 	if ( (r=ParseRem(p, &trig, &tim, 1)) ) return r;
 	if (trig.typ != NO_TYPE) return E_PARSE_ERR;
-	jul = ComputeTrigger(trig.scanfrom, &trig, &r, 1);
-	if (r) syndrome = IF_TRUE | BEFORE_ELSE;
+	jul = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 1);
+	if (r) {
+            if (r != E_CANT_TRIG || !trig.maybe_uncomputable) {
+                if (!Hush || r != E_RUN_DISABLED) {
+                    Eprint("%s", ErrMsg[r]);
+                }
+            }
+	    syndrome = IF_TRUE | BEFORE_ELSE;
+	}
 	else {
 	    if (ShouldTriggerReminder(&trig, &tim, jul, &err)) {
 		syndrome = IF_TRUE | BEFORE_ELSE;
@@ -1184,7 +1208,7 @@ void FillParagraph(char const *s)
 
 	/* If it's a carriage return, output it and start new paragraph */
 	if (*s == '\n') {
-	    Putchar('\n');
+	    putchar('\n');
 	    s++;
 	    line = 0;
 	    while(ISBLANK(*s)) s++;
@@ -1197,7 +1221,7 @@ void FillParagraph(char const *s)
 	   number of spaces */
 	j = line ? SubsIndent : FirstIndent;
 	for (i=0; i<j; i++) {
-	    Putchar(' ');
+	    putchar(' ');
 	}
 
 	/* Calculate the amount of room left on this line */
@@ -1216,17 +1240,17 @@ void FillParagraph(char const *s)
 	    }
 	    if (!pendspace || len+pendspace <= roomleft) {
 		for (i=0; i<pendspace; i++) {
-		    Putchar(' ');
+		    putchar(' ');
 		}
 		while(t < s) {
-		    Putchar(*t);
+		    putchar(*t);
 		    if (strchr(EndSent, *t)) doublespace = 2;
 		    else if (!strchr(EndSentIg, *t)) doublespace = 1;
 		    t++;
 		}
 	    } else {
 		s = t;
-		Putchar('\n');
+		putchar('\n');
 		line++;
 		break;
 	    }
@@ -1303,6 +1327,7 @@ void UTCToLocal(int utcdate, int utctime, int *locdate, int *loctime)
 
 void SigIntHandler(int d)
 {
+    UNUSED(d);
     signal(SIGINT, SigIntHandler);
     GotSigInt();
     exit(0);
@@ -1322,3 +1347,87 @@ FreeTrig(Trigger *t)
 {
     DBufFree(&(t->tags));
 }
+
+void
+ClearLastTriggers(void)
+{
+    LastTrigger.expired = 0;
+    LastTrigger.wd = NO_WD;
+    LastTrigger.d = NO_DAY;
+    LastTrigger.m = NO_MON;
+    LastTrigger.y = NO_YR;
+    LastTrigger.back = NO_BACK;
+    LastTrigger.delta = NO_DELTA;
+    LastTrigger.rep  = NO_REP;
+    LastTrigger.localomit = NO_WD;
+    LastTrigger.skip = NO_SKIP;
+    LastTrigger.until = NO_UNTIL;
+    LastTrigger.typ = NO_TYPE;
+    LastTrigger.once = NO_ONCE;
+    LastTrigger.scanfrom = NO_DATE;
+    LastTrigger.from = NO_DATE;
+    LastTrigger.priority = DefaultPrio;
+    LastTrigger.sched[0] = 0;
+    LastTrigger.warn[0] = 0;
+    LastTrigger.omitfunc[0] = 0;
+    LastTrigger.passthru[0] = 0;
+
+    LastTimeTrig.ttime = NO_TIME;
+    LastTimeTrig.delta = NO_DELTA;
+    LastTimeTrig.rep   = NO_REP;
+    LastTimeTrig.duration = NO_TIME;
+}
+
+void
+SaveAllTriggerInfo(Trigger const *t, TimeTrig const *tt, int trigdate, int trigtime, int valid)
+{
+    SaveLastTrigger(t);
+    SaveLastTimeTrig(tt);
+    LastTriggerDate = trigdate;
+    LastTriggerTime = trigtime;
+    LastTrigValid = valid;
+}
+
+void
+SaveLastTrigger(Trigger const *t)
+{
+    memcpy(&LastTrigger, t, sizeof(LastTrigger));
+    DBufInit(&(LastTrigger.tags));
+}
+
+void
+SaveLastTimeTrig(TimeTrig const *t)
+{
+    memcpy(&LastTimeTrig, t, sizeof(LastTimeTrig));
+}
+
+/* Wrapper to ignore warnings about ignoring return value of system() */
+void
+System(char const *cmd)
+{
+    int r;
+    r = system(cmd);
+    if (r == 0) {
+	r = 1;
+    }
+}
+
+char const *
+get_day_name(int wkday)
+{
+    if (wkday < 0 || wkday > 6) {
+        return "INVALID_WKDAY";
+    }
+    if (DynamicDayName[wkday]) return DynamicDayName[wkday];
+    return DayName[wkday];
+}
+
+char const *
+get_month_name(int mon)
+{
+    if (mon < 0 || mon > 11) {
+        return "INVALID_MON";
+    }
+    if (DynamicMonthName[mon]) return DynamicMonthName[mon];
+    return MonthName[mon];
+}

src/md5.c

@@ -141,7 +141,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
     MD5Transform(ctx->buf, (uint32 *) ctx->in);
     byteReverse((unsigned char *) ctx->buf, 4);
     memcpy(digest, ctx->buf, 16);
-    memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
+    memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
 }
 
 #ifndef ASM_MD5

src/moon.c

@@ -5,8 +5,7 @@
 /*  Calculations for figuring out moon phases.                 */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 

src/omit.c

@@ -6,8 +6,7 @@
 /*  the data structures for OMITted dates.                     */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -371,20 +370,30 @@ int DoOmit(ParsePtr p)
 	    NumPartialOmits++;
 	}
     } else {
-	if (NumFullOmits == MAX_FULL_OMITS) return E_2MANY_FULL;
 
 	if (d > DaysInMonth(m, y)) return E_BAD_DATE;
 	syndrome = Julian(y, m, d);
-	if (!BexistsIntArray(FullOmitArray, NumFullOmits, syndrome)) {
-	    InsertIntoSortedArray(FullOmitArray, NumFullOmits, syndrome);
-	    NumFullOmits++;
-	}
+        r = AddGlobalOmit(syndrome);
+        if (r) {
+            return r;
+        }
     }
     if (tok.type == T_Tag || tok.type == T_Duration || tok.type == T_RemType || tok.type == T_Priority) return E_PARSE_AS_REM;
     return OK;
 
 }
 
+int
+AddGlobalOmit(int jul)
+{
+    if (NumFullOmits == MAX_FULL_OMITS) return E_2MANY_FULL;
+    if (!BexistsIntArray(FullOmitArray, NumFullOmits, jul)) {
+        InsertIntoSortedArray(FullOmitArray, NumFullOmits, jul);
+        NumFullOmits++;
+    }
+    return OK;
+}
+
 static int
 DoThroughOmit(ParsePtr p, int ystart, int mstart, int dstart)
 {
@@ -454,6 +463,7 @@ DoThroughOmit(ParsePtr p, int ystart, int mstart, int dstart)
     end   = Julian(yend,   mend,   dend);
 
     if (end < start) {
+	Eprint("Warning: Swapping dates on OMIT ... THROUGH ... line");
 	tmp = start;
 	start = end;
 	end = tmp;

src/protos.h

@@ -5,11 +5,13 @@
 /*  Function Prototypes.                                       */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
+/* Suppress unused variable warnings */
+#define UNUSED(x) (void) x
+
 /* Define a string assignment macro - be careful!!! */
 #define STRSET(x, str) { if (x) free(x); (x) = StrDup(str); }
 
@@ -35,13 +37,15 @@ int ShouldTriggerReminder (Trigger *t, TimeTrig *tim, int jul, int *err);
 int DoSubst (ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul, int mode);
 int DoSubstFromString (char const *source, DynamicBuffer *dbuf, int jul, int tim);
 int ParseLiteralDate (char const **s, int *jul, int *tim);
+int ParseLiteralTime (char const **s, int *tim);
 int EvalExpr (char const **e, Value *v, ParsePtr p);
 int DoCoerce (char type, Value *v);
 void PrintValue  (Value *v, FILE *fp);
 int CopyValue (Value *dest, const Value *src);
 int ReadLine (void);
 int OpenFile (char const *fname);
-int DoInclude (ParsePtr p);
+int DoInclude (ParsePtr p, enum TokTypes tok);
+int DoIncludeCmd (ParsePtr p);
 int IncludeFile (char const *fname);
 int GetAccessDate (char const *file);
 int SetAccessDate (char const *fname, int jul);
@@ -86,7 +90,10 @@ void HandleQueuedReminders (void);
 char const *FindInitialToken (Token *tok, char const *s);
 void FindToken (char const *s, Token *tok);
 void FindNumericToken (char const *s, Token *t);
-int ComputeTrigger (int today, Trigger *trig, int *err, int save_in_globals);
+int ComputeTrigger (int today, Trigger *trig, TimeTrig *tim, int *err, int save_in_globals);
+int ComputeTriggerNoAdjustDuration (int today, Trigger *trig, TimeTrig *tim, int *err, int save_in_globals, int duration_days);
+int AdjustTriggerForDuration(int today, int r, Trigger *trig, TimeTrig *tim, int save_in_globals);
+int ComputeScanStart(int today, Trigger *trig, TimeTrig *tt);
 char *StrnCpy (char *dest, char const *source, int n);
 int StrMatch (char const *s1, char const *s2, int n);
 int StrinCmp (char const *s1, char const *s2, int n);
@@ -103,7 +110,7 @@ void DumpVarTable (void);
 void DestroyVars (int all);
 int PreserveVar (char const *name);
 int DoPreserve  (Parser *p);
-int DoSatRemind (Trigger *trig, TimeTrig *tim, ParsePtr p);
+int DoSatRemind (Trigger *trig, TimeTrig *tt, ParsePtr p);
 int DoMsgCommand (char const *cmd, char const *msg);
 int ParseNonSpaceChar (ParsePtr p, int *err, int peek);
 unsigned int HashVal (char const *str);
@@ -140,3 +147,25 @@ void PurgeEchoLine(char const *fmt, ...);
 void FreeTrig(Trigger *t);
 void AppendTag(DynamicBuffer *buf, char const *s);
 char const *SynthesizeTag(void);
+void ClearLastTriggers(void);
+void SaveLastTrigger(Trigger const *t);
+void SaveLastTimeTrig(TimeTrig const *t);
+void SaveAllTriggerInfo(Trigger const *t, TimeTrig const *tt, int trigdate, int trigtime, int valid);
+
+void PerIterationInit(void);
+char const *Decolorize(int r, int g, int b);
+char const *Colorize(int r, int g, int b);
+void PrintJSONString(char const *s);
+void PrintJSONKeyPairInt(char const *name, int val);
+void PrintJSONKeyPairString(char const *name, char const *val);
+void PrintJSONKeyPairDate(char const *name, int jul);
+void PrintJSONKeyPairDateTime(char const *name, int dt);
+void PrintJSONKeyPairTime(char const *name, int t);
+void System(char const *cmd);
+int ShellEscape(char const *in, DynamicBuffer *out);
+int AddGlobalOmit(int jul);
+void set_lat_and_long_from_components(void);
+void set_components_from_lat_and_long(void);
+
+char const *get_day_name(int wkday);
+char const *get_month_name(int mon);

src/queue.c

@@ -5,8 +5,7 @@
 /*  Queue up reminders for subsequent execution.               */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -28,9 +27,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "types.h"
 #include "globals.h"
 #include "err.h"
-#include "types.h"
 #include "protos.h"
 #include "expr.h"
 
@@ -44,6 +43,7 @@ typedef struct queuedrem {
     char passthru[PASSTHRU_LEN+1];
     char sched[VAR_NAME_LEN+1];
     DynamicBuffer tags;
+    Trigger t;
     TimeTrig tt;
 } QueuedRem;
 
@@ -57,7 +57,7 @@ static void CheckInitialFile (void);
 static int CalculateNextTime (QueuedRem *q);
 static QueuedRem *FindNextReminder (void);
 static int CalculateNextTimeUsingSched (QueuedRem *q);
-static void DaemonWait (unsigned int sleeptime);
+static void DaemonWait (struct timeval *sleep_tv);
 static void reread (void);
 
 /***************************************************************/
@@ -92,6 +92,8 @@ int QueueReminder(ParsePtr p, Trigger *trig,
     qelem->typ = trig->typ;
     strcpy(qelem->passthru, trig->passthru);
     qelem->tt = *tim;
+    qelem->t = *trig;
+    DBufInit(&(qelem->t.tags));
     qelem->next = QueueHead;
     qelem->RunDisabled = RunDisabled;
     qelem->ntrig = 0;
@@ -119,6 +121,8 @@ void HandleQueuedReminders(void)
     unsigned SleepTime;
     Parser p;
     Trigger trig;
+    struct timeval tv;
+    struct timeval sleep_tv;
 
     /* Suppress the BANNER from being issued */
     NumTriggered = 1;
@@ -152,7 +156,7 @@ void HandleQueuedReminders(void)
     /* Initialize the queue - initialize all the entries time of issue */
 
     while (q) {
-	q->tt.nexttime = (int) (SystemTime(0)/60 - 1);
+	q->tt.nexttime = (int) (SystemTime(1)/60 - 1);
 	q->tt.nexttime = CalculateNextTime(q);
 	q = q->next;
     }
@@ -169,32 +173,35 @@ void HandleQueuedReminders(void)
 	if (Daemon && !q) {
 	    if (Daemon < 0) {
 		/* Sleep until midnight */
-		TimeToSleep = MINUTES_PER_DAY*60 - SystemTime(0);
+		TimeToSleep = MINUTES_PER_DAY*60 - SystemTime(1);
 	    } else {
 		TimeToSleep = 60*Daemon;
 	    }
 	} else {
-	    TimeToSleep = q->tt.nexttime * 60L - SystemTime(0);
+	    TimeToSleep = q->tt.nexttime * 60L - SystemTime(1);
 	}
 
 	while (TimeToSleep > 0L) {
 	    SleepTime = TimeToSleep;
 
-	    if (Daemon > 0 && SleepTime > 60*Daemon) SleepTime = 60*Daemon;
+	    if (Daemon > 0 && SleepTime > (unsigned int) 60*Daemon) SleepTime = 60*Daemon;
 
 	    /* Wake up once a minute to recalibrate sleep time in
 	       case of laptop hibernation */
-	    if (Daemon <= 0) {
-		if (SleepTime > 60) {
-		    SleepTime = 60;
-		}
-	    }
-
-	    if (Daemon >= 0) {
-		sleep(SleepTime);
+	    if (Daemon < 0) {
+		/* Wake up on the next exact minute */
+                gettimeofday(&tv, NULL);
+                sleep_tv.tv_sec = 60 - (tv.tv_sec % 60);
+                if (tv.tv_usec != 0 && sleep_tv.tv_sec != 0) {
+                    sleep_tv.tv_sec--;
+                    sleep_tv.tv_usec = 1000000 - tv.tv_usec;
+                } else {
+                    sleep_tv.tv_usec = 0;
+                }
+		DaemonWait(&sleep_tv);
 	    } else {
-		DaemonWait(SleepTime);
-	    }
+		sleep(SleepTime);
+            }
 
 	    /* If not in daemon mode and day has rolled around,
 	       exit -- not much we can do. */
@@ -210,12 +217,12 @@ void HandleQueuedReminders(void)
 	    if (Daemon && !q) {
 		if (Daemon < 0) {
 		    /* Sleep until midnight */
-		    TimeToSleep = MINUTES_PER_DAY*60 - SystemTime(0);
+		    TimeToSleep = MINUTES_PER_DAY*60 - SystemTime(1);
 		} else {
 		    TimeToSleep = 60*Daemon;
 		}
 	    } else {
-		TimeToSleep = q->tt.nexttime * 60L - SystemTime(0);
+		TimeToSleep = q->tt.nexttime * 60L - SystemTime(1);
 	    }
 
 	}
@@ -225,7 +232,7 @@ void HandleQueuedReminders(void)
 	   changed or a laptop awakes from hibernation.
 	   However, DO triger if tt.nexttime == tt.ttime so all
 	   queued reminders are triggered at least once. */
-	if ((SystemTime(0) - (q->tt.nexttime * 60) <= 60) ||
+	if ((SystemTime(1) - (q->tt.nexttime * 60) <= 60) ||
 	    (q->tt.nexttime == q->tt.ttime)) {
 	    /* Trigger the reminder */
 	    CreateParser(q->text, &p);
@@ -235,7 +242,7 @@ void HandleQueuedReminders(void)
 	    if (Daemon < 0) {
 		printf("NOTE reminder %s",
 		       SimpleTime(q->tt.ttime));
-		printf("%s", SimpleTime(SystemTime(0)/60));
+		printf("%s", SimpleTime(SystemTime(1)/60));
 		if (!*DBufValue(&q->tags)) {
 		    printf("*\n");
 		} else {
@@ -245,9 +252,7 @@ void HandleQueuedReminders(void)
 
 	    /* Set up global variables so some functions like trigdate()
 	       and trigtime() work correctly                             */
-	    LastTriggerDate = JulianToday;
-	    LastTriggerTime = q->tt.ttime;
-	    LastTrigValid = 1;
+	    SaveAllTriggerInfo(&(q->t), &(q->tt), JulianToday, q->tt.ttime, 1);
 	    (void) TriggerReminder(&p, &trig, &q->tt, JulianToday);
 	    if (Daemon < 0) {
 		printf("NOTE endreminder\n");
@@ -449,6 +454,70 @@ static int CalculateNextTimeUsingSched(QueuedRem *q)
     }
 }
 
+/* Dump the queue in JSON format */
+static void
+json_queue(QueuedRem const *q)
+{
+    int done = 0;
+    printf("[");
+    while(q) {
+	if (q->tt.nexttime == NO_TIME) {
+	    q = q->next;
+	    continue;
+	}
+	if (done) {
+	    printf(",");
+	}
+	done = 1;
+	printf("{");
+	switch(q->typ) {
+	case NO_TYPE: PrintJSONKeyPairString("type", "NO_TYPE"); break;
+	case MSG_TYPE: PrintJSONKeyPairString("type", "MSG_TYPE"); break;
+	case RUN_TYPE: PrintJSONKeyPairString("type", "RUN_TYPE"); break;
+	case CAL_TYPE: PrintJSONKeyPairString("type", "CAL_TYPE"); break;
+	case SAT_TYPE: PrintJSONKeyPairString("type", "SAT_TYPE"); break;
+	case PS_TYPE: PrintJSONKeyPairString("type", "PS_TYPE"); break;
+	case PSF_TYPE: PrintJSONKeyPairString("type", "PSF_TYPE"); break;
+	case MSF_TYPE: PrintJSONKeyPairString("type", "MSF_TYPE"); break;
+	case PASSTHRU_TYPE: PrintJSONKeyPairString("type", "PASSTHRU_TYPE"); break;
+	default: PrintJSONKeyPairString("type", "?"); break;
+	}
+	PrintJSONKeyPairInt("rundisabled", q->RunDisabled);
+	PrintJSONKeyPairInt("ntrig", q->ntrig);
+	PrintJSONKeyPairTime("ttime", q->tt.ttime);
+	PrintJSONKeyPairTime("nextttime", q->tt.nexttime);
+	PrintJSONKeyPairInt("delta", q->tt.delta);
+	if (q->tt.rep != NO_TIME) {
+	    PrintJSONKeyPairInt("rep", q->tt.rep);
+	}
+	if (q->tt.duration != NO_TIME) {
+	    PrintJSONKeyPairInt("duration", q->tt.duration);
+	}
+	if (q->passthru[0]) {
+	    PrintJSONKeyPairString("passthru", q->passthru);
+	}
+	if (q->sched[0]) {
+	    PrintJSONKeyPairString("sched", q->sched);
+	}
+	if (DBufLen(&(q->tags))) {
+	    PrintJSONKeyPairString("tags", DBufValue(&(q->tags)));
+	}
+
+	/* Last one is a special case - no trailing comma */
+	printf("\"");
+	PrintJSONString("body");
+	printf("\":\"");
+	if (q->text) {
+	    PrintJSONString(q->text);
+	} else {
+	    PrintJSONString("");
+	}
+	printf("\"}");
+	q = q->next;
+    }
+    printf("]\n");
+}
+
 /***************************************************************/
 /*                                                             */
 /*  DaemonWait                                                 */
@@ -456,19 +525,16 @@ static int CalculateNextTimeUsingSched(QueuedRem *q)
 /*  Sleep or read command from stdin in "daemon -1" mode       */
 /*                                                             */
 /***************************************************************/
-static void DaemonWait(unsigned int sleeptime)
+static void DaemonWait(struct timeval *sleep_tv)
 {
     fd_set readSet;
-    struct timeval timeout;
     int retval;
     int y, m, d;
     char cmdLine[256];
 
     FD_ZERO(&readSet);
     FD_SET(0, &readSet);
-    timeout.tv_sec = sleeptime;
-    timeout.tv_usec = 0;
-    retval = select(1, &readSet, NULL, NULL, &timeout);
+    retval = select(1, &readSet, NULL, NULL, sleep_tv);
 
     /* If date has rolled around, restart */
     if (RealToday != SystemDate(&y, &m, &d)) {
@@ -506,6 +572,38 @@ static void DaemonWait(unsigned int sleeptime)
 	}
 	printf("NOTE queued %d\n", nqueued);
 	fflush(stdout);
+    } else if (!strcmp(cmdLine, "QUEUE\n")) {
+	printf("NOTE queue\n");
+	QueuedRem *q = QueueHead;
+	while (q) {
+	    if (q->tt.nexttime != NO_TIME) {
+		switch (q->typ) {
+		case NO_TYPE: printf("NO_TYPE "); break;
+		case MSG_TYPE: printf("MSG_TYPE "); break;
+		case RUN_TYPE: printf("RUN_TYPE "); break;
+		case CAL_TYPE: printf("CAL_TYPE "); break;
+		case SAT_TYPE: printf("SAT_TYPE "); break;
+		case PS_TYPE: printf("PS_TYPE "); break;
+		case PSF_TYPE: printf("PSF_TYPE "); break;
+		case MSF_TYPE: printf("MSF_TYPE "); break;
+		case PASSTHRU_TYPE: printf("PASSTHRU_TYPE "); break;
+		default: printf("? "); break;
+		}
+		printf("RunDisabled=%d ntrig=%d ttime=%02d:%02d nexttime=%02d:%02d delta=%d rep=%d duration=%d ", q->RunDisabled, q->ntrig, q->tt.ttime/60, q->tt.ttime % 60, q->tt.nexttime / 60, q->tt.nexttime % 60, q->tt.delta, (q->tt.rep != NO_TIME ? q->tt.rep : -1), (q->tt.duration != NO_TIME ? q->tt.duration : -1));
+		printf("%s %s %s\n",
+		       (q->passthru[0] ? q->passthru : "*"),
+		       (q->sched[0] ? q->sched : "*"),
+		       q->text ? q->text : "NULL");
+	    }
+	    q = q->next;
+	}
+	printf("NOTE endqueue\n");
+	fflush(stdout);
+    } else if (!strcmp(cmdLine, "JSONQUEUE\n")) {
+	printf("NOTE JSONQUEUE\n");
+	json_queue(QueueHead);
+	printf("NOTE ENDJSONQUEUE\n");
+	fflush(stdout);
     } else if (!strcmp(cmdLine, "REREAD\n")) {
 	printf("NOTE reread\n");
 	fflush(stdout);

src/rem2ps.c

@@ -5,8 +5,7 @@
 /*  Print a PostScript calendar.                               */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -21,6 +20,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include "rem2ps.h"
+#include "json.h"
 
 #define NEW(type) (malloc(sizeof(type)))
 
@@ -31,6 +31,7 @@
 #define SPECIAL_COLOR      4
 #define SPECIAL_WEEK       5
 #define SPECIAL_SHADE      6
+#define SPECIAL_UNKNOWN    7
 
 /* Array holding how specials sort */
 static int SpecialSortOrder[] = {
@@ -47,6 +48,7 @@ typedef struct calentry {
     struct calentry *next;
     int special;
     char *entry;
+    int daynum;
 } CalEntry;
 
 typedef struct {
@@ -63,7 +65,7 @@ char const *SmallCalLoc[] = {
     "sbt",
 };
 
-#define NUMSMALL (sizeof(SmallCalLoc)/sizeof(SmallCalLoc[0]))
+#define NUMSMALL ((int) (sizeof(SmallCalLoc)/sizeof(SmallCalLoc[0])))
 char const *SmallLocation;
 int SmallCol1, SmallCol2;
 
@@ -97,6 +99,7 @@ CalEntry *CurEntries = NULL;
 CalEntry *PsEntries[32];
 PageType *CurPage;
 char PortraitMode;
+char DaynumRight;
 char NoSmallCal;
 char UseISO;
 
@@ -138,6 +141,184 @@ void WriteOneEntry (CalEntry *c);
 void GetSmallLocations (void);
 char const *EatToken(char const *in, char *out, int maxlen);
 
+static void
+put_escaped_string(char const *s)
+{
+    while(*s) {
+        if (*s == '\\' || *s == '(' || *s == ')') {
+            putchar('\\');
+        }
+        putchar(*s);
+        s++;
+    }
+}
+
+/***************************************************************/
+/*                                                             */
+/*  StrCmpi                                                    */
+/*                                                             */
+/*  Compare strings, case insensitive.                         */
+/*                                                             */
+/***************************************************************/
+int StrCmpi(char const *s1, char const *s2)
+{
+    int r;
+    while (*s1 && *s2) {
+	r = toupper(*s1) - toupper(*s2);
+	if (r) return r;
+	s1++;
+	s2++;
+    }
+    return toupper(*s1) - toupper(*s2);
+}
+/***************************************************************/
+/*                                                             */
+/*   Parse the new-style JSON intermediate format              */
+/*                                                             */
+/***************************************************************/
+static CalEntry *
+JSONToCalEntry(DynamicBuffer *buf)
+{
+    CalEntry *c;
+    json_value *val;
+
+    val = json_parse(DBufValue(buf), DBufLen(buf));
+    if (!val) {
+	fprintf(stderr, "Unable to parse JSON line `%s'\n", DBufValue(buf));
+	exit(1);
+    }
+
+    if (val->type != json_object) {
+	fprintf(stderr, "Expecting JSON object; found `%s'\n",
+		DBufValue(buf));
+	exit(1);
+    }
+
+    c = NEW(CalEntry);
+    if (!c) {
+	fprintf(stderr, "malloc failed - aborting.\n");
+	exit(1);
+    }
+    c->next = NULL;
+    c->special = SPECIAL_NORMAL;
+
+    int got_date = 0, got_body = 0;
+    size_t i;
+    for (i=0; i<val->u.object.length; i++) {
+	char const *nm = val->u.object.values[i].name;
+	json_value *v = val->u.object.values[i].value;
+	char const *s;
+	if (!strcmp(nm, "date")) {
+	    if (v->type == json_string) {
+		s = v->u.string.ptr;
+		c->daynum = (s[8] - '0') * 10 + s[9] - '0';
+		got_date = 1;
+	    }
+	} else if (!strcmp(nm, "body")) {
+	    if (v->type == json_string) {
+		s = v->u.string.ptr;
+		c->entry = malloc(strlen(s)+1);
+		if (!c->entry) {
+		    fprintf(stderr, "malloc failed - aborting.\n");
+		    exit(1);
+		}
+		strcpy(c->entry, s);
+		got_body = 1;
+	    }
+	} else if (!strcmp(nm, "passthru")) {
+	    if (v->type == json_string) {
+		s = v->u.string.ptr;
+		if (!StrCmpi(s, "PostScript")) {
+		    c->special = SPECIAL_POSTSCRIPT;
+		} else if (!StrCmpi(s, "SHADE")) {
+		    c->special = SPECIAL_SHADE;
+		} else if (!StrCmpi(s, "MOON")) {
+		    c->special = SPECIAL_MOON;
+		} else if (!StrCmpi(s, "WEEK")) {
+		    c->special = SPECIAL_WEEK;
+		} else if (!StrCmpi(s, "PSFile")) {
+		    c->special = SPECIAL_PSFILE;
+		} else if (!StrCmpi(s, "COLOUR") ||
+			   !StrCmpi(s, "COLOR")) {
+		    c->special = SPECIAL_COLOR;
+		} else {
+		    c->special = SPECIAL_UNKNOWN;
+		}
+	    }
+	}
+    }
+
+    json_value_free(val);
+
+    if (!got_body || !got_date) {
+	fprintf(stderr, "Could not parse line `%s'\n", DBufValue(buf));
+	exit(1);
+    }
+    return c;
+}
+
+/***************************************************************/
+/*                                                             */
+/*   Parse the old-style REM2PS intermediate format            */
+/*                                                             */
+/***************************************************************/
+static CalEntry *
+TextToCalEntry(DynamicBuffer *buf)
+{
+    char const *startOfBody;
+    char passthru[PASSTHRU_LEN+1];
+
+    CalEntry *c = NEW(CalEntry);
+    if (!c) {
+	fprintf(stderr, "malloc failed - aborting.\n");
+	exit(1);
+    }
+    c->next = NULL;
+    c->special = SPECIAL_NORMAL;
+    c->daynum = (DBufValue(buf)[8] - '0') * 10 + DBufValue(buf)[9] - '0';
+
+    /* Skip the tag, duration and time */
+    startOfBody = DBufValue(buf)+10;
+
+    /* Eat the passthru */
+    startOfBody = EatToken(startOfBody, passthru, PASSTHRU_LEN);
+
+    /* Eat the tag */
+    startOfBody = EatToken(startOfBody, NULL, 0);
+
+    /* Eat the duration */
+    startOfBody = EatToken(startOfBody, NULL, 0);
+
+    /* Eat the time */
+    startOfBody = EatToken(startOfBody, NULL, 0);
+
+    c->entry = malloc(strlen(startOfBody) + 1);
+    if (!c->entry) {
+	fprintf(stderr, "malloc failed - aborting.\n");
+	exit(1);
+    }
+    strcpy(c->entry, startOfBody);
+
+    /* Save the type of SPECIAL */
+    if (!StrCmpi(passthru, "PostScript")) {
+	c->special = SPECIAL_POSTSCRIPT;
+    } else if (!StrCmpi(passthru, "SHADE")) {
+	c->special = SPECIAL_SHADE;
+    } else if (!StrCmpi(passthru, "MOON")) {
+	c->special = SPECIAL_MOON;
+    } else if (!StrCmpi(passthru, "WEEK")) {
+	c->special = SPECIAL_WEEK;
+    } else if (!StrCmpi(passthru, "PSFile")) {
+	c->special = SPECIAL_PSFILE;
+    } else if (!StrCmpi(passthru, "COLOUR") ||
+	       !StrCmpi(passthru, "COLOR")) {
+	c->special = SPECIAL_COLOR;
+    } else if (StrCmpi(passthru, "*")) {
+	c->special = SPECIAL_UNKNOWN;
+    }
+    return c;
+}
+
 /***************************************************************/
 /*                                                             */
 /*   MAIN PROGRAM                                              */
@@ -155,13 +336,20 @@ int main(int argc, char *argv[])
 	Usage("Input should not come from a terminal");
     }
 
+    int first_line = 1;
     /* Search for a valid input file */
     while (!feof(stdin)) {
 	DBufGets(&buf, stdin);
-	if (!strcmp(DBufValue(&buf), PSBEGIN)) {
+	if (first_line && (!strcmp(DBufValue(&buf), "["))) {
+	    fprintf(stderr, "Rem2PS: It appears that you have invoked Remind with the -ppp option.\n        Please use either -p or -pp, but not -ppp.\n");
+	    exit(1);
+	}
+	first_line = 0;
+	if (!strcmp(DBufValue(&buf), PSBEGIN) ||
+	    !strcmp(DBufValue(&buf), PSBEGIN2)) {
 	    if (!validfile) {
 		if (Verbose) {
-		    fprintf(stderr, "Rem2PS: Version %s Copyright 1992-1998 by David F. Skoll\n\n", VERSION);
+		    fprintf(stderr, "Rem2PS: Version %s Copyright 1992-2021 by Dianne Skoll\n\n", VERSION);
 		    fprintf(stderr, "Generating PostScript calendar\n");
 		}
 	    }
@@ -192,12 +380,10 @@ void DoPsCal(void)
     int days, wkday, prevdays, nextdays;
     int sfirst;
     int i;
-    int is_ps;
     int firstcol;
-    char const *startOfBody;
-    char passthru[PASSTHRU_LEN+1];
     DynamicBuffer buf;
     CalEntry *c, *d, *p;
+    char *s;
 
 /* Read the month and year name, followed by # days in month and 1st day of
    month */
@@ -206,12 +392,28 @@ void DoPsCal(void)
     sscanf(DBufValue(&buf), "%s %s %d %d %d", month, year, &days, &wkday,
 	   &MondayFirst);
 
+    /* Replace underscores in month name with spaces */
+    s = month;
+    while(*s) {
+        if (*s == '_') *s = ' ';
+        s++;
+    }
+
     /* Get day names */
     DBufGets(&buf, stdin);
     sscanf(DBufValue(&buf), "%32s %32s %32s %32s %32s %32s %32s",
 	   DayName[0], DayName[1], DayName[2], DayName[3],
 	   DayName[4], DayName[5], DayName[6]);
 
+    /* Replace underscores in day names with spaces */
+    for (i=0; i<7; i++) {
+        s = DayName[i];
+        while(*s) {
+            if (*s == '_') *s = ' ';
+            s++;
+        }
+    }
+
     /* We write the prolog here because it's only at this point that
        MondayFirst is set correctly. */
     if (validfile == 1) {
@@ -222,6 +424,19 @@ void DoPsCal(void)
     sscanf(DBufValue(&buf), "%s %d", prevm, &prevdays);
     DBufGets(&buf, stdin);
     sscanf(DBufValue(&buf), "%s %d", nextm, &nextdays);
+
+    /* Replace underscores with spaces in names of next/prev month */
+    s = prevm;
+    while(*s) {
+        if (*s == '_') *s = ' ';
+        s++;
+    }
+    s = nextm;
+    while(*s) {
+        if (*s == '_') *s = ' ';
+        s++;
+    }
+
     DBufFree(&buf);
     MaxDay = days;
     FirstWkDay = wkday;
@@ -231,6 +446,7 @@ void DoPsCal(void)
 
     printf("%%%%Page: %c%c%c%c%c %d\n", month[0], month[1], month[2],
 	   year[2], year[3], validfile);
+    printf("%%%%PageBoundingBox: 0 0 %d %d\n", CurPage->xsize, CurPage->ysize);
 
 /* Emit PostScript to do the heading */
     if (!PortraitMode) printf("90 rotate 0 XSIZE neg translate\n");
@@ -273,80 +489,48 @@ void DoPsCal(void)
 	}
 
 	DBufGets(&buf, stdin);
-	if (!strcmp(DBufValue(&buf), PSEND)) {
+	if (!strcmp(DBufValue(&buf), PSEND) ||
+	    !strcmp(DBufValue(&buf), PSEND2)) {
 	    DBufFree(&buf);
 	    break;
 	}
 
 	/* Ignore lines beginning with '#' */
 	if (DBufValue(&buf)[0] == '#') {
+	    DBufFree(&buf);
 	    continue;
 	}
-	/* Read the day number - a bit of a hack! */
-	DayNum = (DBufValue(&buf)[8] - '0') * 10 + DBufValue(&buf)[9] - '0';
-	if (DayNum != CurDay) {
-	    for(; CurDay<DayNum; CurDay++) {
+
+	if (DBufValue(&buf)[0] == '{') {
+	    /* Starts with '{', so assume new-style JSON format */
+	    c = JSONToCalEntry(&buf);
+	} else {
+	    /* Assume it's the old-style rem2ps intermediate format */
+	    c = TextToCalEntry(&buf);
+	}
+
+	/* If it's an unknown special, ignore */
+	if (c->special == SPECIAL_UNKNOWN) {
+	    DBufFree(&buf);
+	    free(c);
+	    c = NULL;
+	    continue;
+	}
+	if (c->daynum != CurDay) {
+	    for(; CurDay<c->daynum; CurDay++) {
 		WriteCalEntry();
 		WkDayNum = (WkDayNum + 1) % 7;
 	    }
 	}
-	/* Add the text */
-	c = NEW(CalEntry);
-	if (!c) {
-	    fprintf(stderr, "malloc failed - aborting.\n");
-	    exit(1);
-	}
-	c->next = NULL;
-	c->special = SPECIAL_NORMAL;
-
-	/* Skip the tag, duration and time */
-	startOfBody = DBufValue(&buf)+10;
-
-	/* Eat the passthru */
-	startOfBody = EatToken(startOfBody, passthru, PASSTHRU_LEN);
-
-	/* Eat the tag */
-	startOfBody = EatToken(startOfBody, NULL, 0);
-
-	/* Eat the duration */
-	startOfBody = EatToken(startOfBody, NULL, 0);
-
-	/* Eat the time */
-	startOfBody = EatToken(startOfBody, NULL, 0);
-
-	is_ps = 0;
-	if (!strcmp(passthru, "PostScript") ||
-	    !strcmp(passthru, "PSFile") ||
-	    !strcmp(passthru, "MOON") ||
-	    !strcmp(passthru, "WEEK") ||
-	    !strcmp(passthru, "SHADE")) {
-	    is_ps = 1;
-	}
-	c->entry = malloc(strlen(startOfBody) + 1);
-	if (!c->entry) {
-	    fprintf(stderr, "malloc failed - aborting.\n");
-	    exit(1);
-	}
-	strcpy(c->entry, startOfBody);
-
-	if (is_ps) {
-	    /* Save the type of SPECIAL */
-	    if (!strcmp(passthru, "PostScript")) {
-		c->special = SPECIAL_POSTSCRIPT;
-	    } else if (!strcmp(passthru, "SHADE")) {
-		c->special = SPECIAL_SHADE;
-	    } else if (!strcmp(passthru, "MOON")) {
-		c->special = SPECIAL_MOON;
-	    } else if (!strcmp(passthru, "WEEK")) {
-		c->special = SPECIAL_WEEK;
+	if (c->special == SPECIAL_POSTSCRIPT ||
+	    c->special == SPECIAL_SHADE ||
+	    c->special == SPECIAL_MOON ||
+	    c->special == SPECIAL_WEEK ||
+	    c->special == SPECIAL_PSFILE) {
+	    if (!PsEntries[c->daynum]) {
+		PsEntries[c->daynum] = c;
 	    } else {
-		c->special = SPECIAL_PSFILE;
-	    }
-
-	    if (!PsEntries[DayNum]) {
-		PsEntries[DayNum] = c;
-	    } else {
-		d = PsEntries[DayNum];
+		d = PsEntries[c->daynum];
 		p = NULL;
 		/* Slot it into the right place */
 		while (d->next && (SpecialSortOrder[c->special] <= SpecialSortOrder[d->special])) {
@@ -360,14 +544,12 @@ void DoPsCal(void)
 		    if (p) {
 			p->next = c;
 		    } else {
-			PsEntries[DayNum] = c;
+			PsEntries[c->daynum] = c;
 		    }
 		    c->next = d;
 		}
 	    }
-	} else if (!strcmp(passthru, "*") ||
-		   !strcmp(passthru, "COLOUR") ||
-	           !strcmp(passthru, "COLOR")) {
+	} else {
 	    /* Put on linked list */
 	    if (!CurEntries) {
 		CurEntries = c;
@@ -376,10 +558,6 @@ void DoPsCal(void)
 		while(d->next) d = d->next;
 		d->next = c;
 	    }
-	    if (!strcmp(passthru, "COLOR") ||
-		!strcmp(passthru, "COLOUR")) {
-		c->special = SPECIAL_COLOR;
-	    }
 	}
     }
     for(; CurDay<=days; CurDay++) {
@@ -447,11 +625,17 @@ void WriteProlog(void)
 	strcmp(SmallFont, DayFont)  &&
 	strcmp(TitleFont, SmallFont) &&
 	strcmp(SmallFont, EntryFont)) printf(" %s", SmallFont);
-    PutChar('\n');
+    putchar('\n');
     printf("%%%%Creator: Rem2PS\n");
     printf("%%%%Pages: (atend)\n");
     printf("%%%%Orientation: %s\n", PortraitMode ? "Portrait" : "Landscape");
     printf("%%%%EndComments\n");
+    if (PortraitMode) {
+        printf("<< /PageSize [%d %d] >> setpagedevice\n", x, y);
+    } else {
+        /* They were swapped up above, so swap them back or we'll get rotated output */
+        printf("<< /PageSize [%d %d] >> setpagedevice\n", y, x);
+    }
 
     for (i=0; PSProlog1[i]; i++) puts(PSProlog1[i]);
     if (!MondayFirst)
@@ -544,7 +728,7 @@ void WriteCalEntry(void)
     printf("]\n");
 
 /* Print the day number */
-    printf("(%d)\n", CurDay);
+    printf("(%d) %d\n", CurDay, (int) DaynumRight);
 /* Do it! */
     printf("DoCalBox\n");
 
@@ -621,20 +805,20 @@ void WriteOneEntry(CalEntry *c)
 	}
     }
 
-    PutChar('(');
+    putchar('(');
     while(*s) {
 	/* Use the "unsigned char" cast to fix problem on Solaris 2.5 */
 	/* which treated some latin1 characters as white space.       */
 	ch = (unsigned char) *s++;
-	if (ch == '\\' || ch == '(' || ch == ')') PutChar('\\');
-	if (!isspace(ch)) PutChar(ch);
+	if (ch == '\\' || ch == '(' || ch == ')') putchar('\\');
+	if (!isspace(ch)) putchar(ch);
 	else {
-	    PutChar(')');
+	    putchar(')');
 	    while(isspace((unsigned char)*s)) s++;
 	    if (!*s) {
 		goto finish;
 	    }
-	    PutChar('(');
+	    putchar('(');
 	}
     }
     printf(")\n");
@@ -670,7 +854,8 @@ void Init(int argc, char *argv[])
     char const *s;
     char const *t;
     int i=1;
-    int j;
+    size_t j;
+    int k;
     int offset;
 
     PortraitMode = 1;
@@ -683,6 +868,7 @@ void Init(int argc, char *argv[])
     FillPage = 0;
     MondayFirst = 0;
     SmallLocation = "bt";
+    DaynumRight = 1;
 
     for(j=0; j<32; j++) PsEntries[i] = NULL;
 
@@ -799,13 +985,14 @@ void Init(int argc, char *argv[])
 
 	case 'i': UseISO = 1; break;
 
-	case 'c': j=(*s);
-	    if (!j) {
+        case 'x': DaynumRight = 0; break;
+	case 'c': k=(*s);
+	    if (!k) {
 		SmallLocation = SmallCalLoc[0];
 	    } else {
-		j -= '0';
-		if (j>=0 && j<NUMSMALL) {
-		    SmallLocation = SmallCalLoc[j];
+		k -= '0';
+		if (k>=0 && k<NUMSMALL) {
+		    SmallLocation = SmallCalLoc[k];
 		} else {
 		    SmallLocation = SmallCalLoc[0];
 		}
@@ -843,6 +1030,7 @@ void Usage(char const *s)
     fprintf(stderr, "-b size       Set border size for calendar entries\n");
     fprintf(stderr, "-t size       Set line thickness\n");
     fprintf(stderr, "-e            Make calendar fill entire page\n");
+    fprintf(stderr, "-x            Put day numbers on left instead of right\n");
     fprintf(stderr, "-o[lrtb] marg Specify left, right, top and bottom margins\n");
     exit(1);
 }
@@ -918,10 +1106,10 @@ int DoQueuedPs(void)
     FILE *fp;
     int fnoff;
     char buffer[512];
-    char const *size, *extra;
+    char fbuffer[512];
+    char const *size, *fsize, *extra;
     char const *s;
     int num, r, g, b, phase, fontsize, moonsize;
-    unsigned char c;
 
     if (!MondayFirst) begin = CurDay - WkDayNum;
     else		     begin = CurDay - (WkDayNum ? WkDayNum-1 : 6);
@@ -993,19 +1181,28 @@ int DoQueuedPs(void)
 		while(*s && isspace(*s)) {
 		    s++;
 		}
-		while(*s) {
-		    if (*s == '\\' || *s == '(' || *s == ')') {
-			PutChar('\\');
-		    }
-		    PutChar(*s);
-		    s++;
-		}
+                put_escaped_string(s);
 		printf(") show grestore\n");
 		break;
 
 	    case SPECIAL_MOON:		/* Moon phase */
 		num = sscanf(e->entry+fnoff, "%d %d %d", &phase, &moonsize,
 			     &fontsize);
+		/* See if we have extra stuff */
+		extra = e->entry+fnoff;
+
+		/* Skip phase */
+		while(*extra && !isspace(*extra)) extra++;
+		while(*extra && isspace(*extra)) extra++;
+
+		/* Skip moon size */
+		while(*extra && !isspace(*extra)) extra++;
+		while(*extra && isspace(*extra)) extra++;
+
+		/* Skip font size */
+		while(*extra && !isspace(*extra)) extra++;
+		while(*extra && isspace(*extra)) extra++;
+
 		if (num == 1) {
 		    moonsize = -1;
 		    fontsize = -1;
@@ -1027,7 +1224,27 @@ int DoQueuedPs(void)
 		    size = buffer;
 		}
 
-		printf("gsave 0 setgray newpath Border %s add BoxHeight Border sub %s sub\n", size, size);
+                /* Store the starting X coordinate in "moonstartx" */
+                if (DaynumRight) {
+                    printf("Border %s add /moonstartx exch def", size);
+                } else {
+                    printf("xincr Border sub %s sub ", size);
+                    if (*extra) {
+                        if (fontsize < 0) {
+                            fsize = "EntrySize";
+                        } else {
+                            sprintf(fbuffer, "%d", fontsize);
+                            fsize = fbuffer;
+                        }
+                        printf("/EntryFont findfont %s scalefont setfont (",
+                               fsize);
+                        put_escaped_string(extra);
+                        printf(") stringwidth pop sub Border sub ");
+                    }
+                    printf("/moonstartx exch def\n");
+                }
+                printf(" gsave 0 setgray newpath ");
+                printf("moonstartx BoxHeight Border sub %s sub\n", size);
 		printf(" %s 0 360 arc closepath\n", size);
 		switch(phase) {
 		case 0:
@@ -1038,49 +1255,28 @@ int DoQueuedPs(void)
 		    break;
 
 		case 1:
-		    printf("stroke\n");
-		    printf("newpath Border %s add BoxHeight Border sub %s sub\n",
-			   size, size);
+		    printf("stroke\nnewpath ");
+                    printf("moonstartx BoxHeight Border sub %s sub\n", size);
 		    printf("%s 90 270 arc closepath fill\n", size);
 		    break;
 		default:
-		    printf("stroke\n");
-		    printf("newpath Border %s add BoxHeight Border sub %s sub\n",
-		size, size);
+		    printf("stroke\nnewpath ");
+                    printf("moonstartx BoxHeight Border sub %s sub\n", size);
 		    printf("%s 270 90 arc closepath fill\n", size);
 		    break;
 		}
-		/* See if we have extra stuff */
-		extra = e->entry+fnoff;
-
-		/* Skip phase */
-		while(*extra && !isspace(*extra)) extra++;
-		while(*extra && isspace(*extra)) extra++;
-
-		/* Skip moon size */
-		while(*extra && !isspace(*extra)) extra++;
-		while(*extra && isspace(*extra)) extra++;
-
-		/* Skip font size */
-		while(*extra && !isspace(*extra)) extra++;
-		while(*extra && isspace(*extra)) extra++;
-
 		/* Anything left? */
 		if (*extra) {
-		    printf("Border %s add %s add Border add BoxHeight border sub %s sub %s sub moveto\n", size, size, size, size);
+                    printf("moonstartx %s add Border add BoxHeight border sub %s sub %s sub moveto\n", size, size, size);
 		    if (fontsize < 0) {
-			size = "EntrySize";
+			fsize = "EntrySize";
 		    } else {
-			sprintf(buffer, "%d", fontsize);
-			size = buffer;
+			sprintf(fbuffer, "%d", fontsize);
+			fsize = fbuffer;
 		    }
 		    printf("/EntryFont findfont %s scalefont setfont (",
-			   size);
-		    while(*extra) {
-			c = (unsigned char) *extra++;
-			if (c == '\\' || c == '(' || c == ')') PutChar('\\');
-			PutChar(c);
-		    }
+			   fsize);
+                    put_escaped_string(extra);
 		    printf(") show\n");
 
 		}

src/rem2ps.h

@@ -5,16 +5,15 @@
 /*  Define the PostScript prologue                             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
 char *PSProlog1[] =
 {
     "% This file was produced by Remind and Rem2PS, written by",
-    "% David F. Skoll.",
-    "% Remind and Rem2PS are Copyright 1992-1997 David F. Skoll.",
+    "% Dianne Skoll.",
+    "% Remind and Rem2PS are Copyright 1992-2021 Dianne Skoll.",
     "/ISOLatin1Encoding where { pop save true }{ false } ifelse",
     "  /ISOLatin1Encoding [ StandardEncoding 0 45 getinterval aload pop /minus",
     "    StandardEncoding 46 98 getinterval aload pop /dotlessi /grave /acute",
@@ -197,9 +196,10 @@ char *PSProlog2[] =
     "% Variables for calendar boxes:",
     "% ytop - current top position",
     "% ymin - minimum y reached for current row",
-    "% border ytop xleft width textarray daynum DoCalBox ybot",
+    "% border ytop xleft width textarray daynum onright DoCalBox ybot",
     "% Do the entries for one calendar box.  Returns lowest Y-coordinate reached",
     "/DoCalBox {",
+    "   /onright exch def",
     "   /daynum exch def",
     "   /textarr exch def",
     "   /wid exch def",
@@ -208,8 +208,10 @@ char *PSProlog2[] =
     "   /border exch def",
     "% Do the day number",
     "   /DayFont findfont DaySize scalefont setfont",
-    "   xl wid add border sub daynum stringwidth pop sub",
-    "   yt border sub DaySize sub moveto daynum show",
+    "   onright 1 eq",
+    "   {xl wid add border sub daynum stringwidth pop sub yt border sub DaySize sub moveto daynum show}",
+    "   {xl border add yt border sub DaySize sub moveto daynum show}",
+    "   ifelse",
     "% Do the text entries.  Precharge the stack with current y pos.",
     "   /ycur yt border sub DaySize sub DaySize sub 2 add def",
     "   /EntryFont findfont EntrySize scalefont setfont",

src/sort.c

@@ -5,8 +5,7 @@
 /*  Routines for sorting reminders by trigger date             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -151,7 +150,7 @@ void IssueSortedReminders(void)
 	    break;
 
 	case RUN_TYPE:
-	    system(cur->text);
+	    System(cur->text);
 	    break;
 	}
 

src/test-all-languages.sh

@@ -5,7 +5,8 @@
 ALL=`grep ^#define lang.h | grep -v '#define LANG' | awk '{print $2}'`
 
 for i in $ALL ; do
-    make clean all LANGDEF=-DLANG=$i || exit 1
+    make clean
+    make -j`nproc` all LANGDEF=-DLANG=$i || exit 1
     ./remind -q -r ../tests/tstlang.rem
 done
 exit 0

src/token.c

@@ -6,8 +6,7 @@
 /*  classifying the tokens parsed.                             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -38,7 +37,7 @@ while (isdigit(*(string))) { \
    Keep this array sorted, or software will not work. */
 Token TokArray[] = {
     /* NAME          MINLEN      TYPE           VALUE */
-
+    { "addomit",        7,      T_AddOmit,      0 },
     { "after",		3,	T_Skip,	AFTER_SKIP },
     { "april",		3,	T_Month,	3 },
     { "at",		2,	T_At,		0 },
@@ -49,6 +48,7 @@ Token TokArray[] = {
     { "clear-omit-context", 5,   T_Clr,         0 },
     { "debug",          5,      T_Debug,       0 },
     { "december",	3,	T_Month,       11 },
+    { "do",     	2,	T_IncludeR,	0 },
     { "dumpvars",       4,      T_Dumpvars,    0 },
     { "duration",       3,      T_Duration,     0 },
     { "else",		4,	T_Else,	0 },
@@ -63,11 +63,13 @@ Token TokArray[] = {
     { "if",		2,	T_If,		0 },
     { "iftrig",		6,	T_IfTrig,	0 },
     { "include",	3,	T_Include,	0 },
+    { "includecmd",     10,     T_IncludeCmd,   0 },
     { "january",	3,	T_Month,	0 },
     { "july",		3,	T_Month,	6 },
     { "june",		3,	T_Month,	5 },
     { "march",		3,	T_Month,	2 },
     { "may",		3,	T_Month,	4 },
+    { "maybe-uncomputable", 5,  T_MaybeUncomputable, 0},
     { "monday",		3,	T_WkDay,	0 },
     { "msf",		3,	T_RemType,	MSF_TYPE },
     { "msg",		3,	T_RemType,	MSG_TYPE },
@@ -103,33 +105,6 @@ Token TokArray[] = {
     { "wednesday",	3,	T_WkDay,	2 }
 };
 
-/* If language != English, we must also search the following... */
-#if LANG != ENGLISH
-Token NonEnglishToks[] = {
-    /* NAME          MINLEN      TYPE           VALUE */
-
-    { L_MONDAY,	       3,       T_WkDay,        0 },
-    { L_TUESDAY,       3,       T_WkDay,        1 },
-    { L_WEDNESDAY,     3,       T_WkDay,        2 },
-    { L_THURSDAY,      3,       T_WkDay,        3 },
-    { L_FRIDAY,	       3,       T_WkDay,        4 },
-    { L_SATURDAY,      3,       T_WkDay,        5 },
-    { L_SUNDAY,	       3,       T_WkDay,        6 },
-    { L_JAN,           3,       T_Month,        0 },
-    { L_FEB,           3,       T_Month,        1 },
-    { L_MAR,           3,       T_Month,        2 },
-    { L_APR,           3,       T_Month,        3 },
-    { L_MAY,           3,       T_Month,        4 },
-    { L_JUN,           3,       T_Month,        5 },
-    { L_JUL,           3,       T_Month,        6 },
-    { L_AUG,           3,       T_Month,        7 },
-    { L_SEP,           3,       T_Month,        8 },
-    { L_OCT,           3,       T_Month,        9 },
-    { L_NOV,           3,       T_Month,        10 },
-    { L_DEC,           3,       T_Month,        11 }
-};
-#endif
-
 static int TokStrCmp (Token const *t, char const *s);
 
 /***************************************************************/
@@ -172,6 +147,10 @@ void FindToken(char const *s, Token *tok)
     int top, bot, mid, r, max;
     int l;
 
+#if LANG != ENGLISH
+    size_t i;
+#endif
+
     tok->type = T_Illegal;
     if (! *s) {
 	tok->type = T_Empty;
@@ -226,19 +205,6 @@ void FindToken(char const *s, Token *tok)
 	if (r > 0) top = mid-1; else bot=mid+1;
     }
 
-/* If language is other than English, search the DayNames[] and MonthNames[]
-   array. */
-#if LANG != ENGLISH
-    for (r=0; r<(sizeof(NonEnglishToks) / sizeof(Token)); r++) {
-	if (l >= NonEnglishToks[r].MinLen &&
-	    !TokStrCmp(&NonEnglishToks[r], s)) {
-	    tok->type = NonEnglishToks[r].type;
-	    tok->val = NonEnglishToks[r].val;
-	    return;
-	}
-    }
-#endif
-
     return;
 }
 
@@ -258,6 +224,7 @@ void FindNumericToken(char const *s, Token *t)
 {
     int mult = 1, hour, min;
     char const *s_orig = s;
+    int ampm = 0;
 
     t->type = T_Illegal;
     t->val = 0;
@@ -285,10 +252,6 @@ void FindNumericToken(char const *s, Token *t)
 	   like Jan 6, 1998 */
 	if (*s == ',') {
 	    s++;
-	    /* Special hack - convert years between 90 and
-	       99 to 1990 and 1999 */
-	    if (t->val >= 90 && t->val <= 99) t->val += 1900;
-
 	    /* Classify the number we've got */
 	    if (t->val >= BASE && t->val <= BASE+YR_RANGE) t->type = T_Year;
 	    else if (t->val >= 1 && t->val <= 31) t->type = T_Day;
@@ -300,7 +263,29 @@ void FindNumericToken(char const *s, Token *t)
 	    s++;
 	    hour = t->val;
 	    PARSENUM(min, s);
-	    if (*s || min > 59) return;  /* Illegal time */
+	    if (min > 59) return; /* Illegal time */
+	    /* Check for p[m] or a[m] */
+	    if (*s == 'A' || *s == 'a' || *s == 'P' || *s == 'p') {
+		ampm = tolower(*s);
+		s++;
+		if (*s == 'm' || *s == 'M') {
+		    s++;
+		}
+	    }
+	    if (*s) return;  /* Illegal time */
+	    if (ampm) {
+		if (hour < 1 || hour > 12) return;
+		if (ampm == 'a') {
+		    if (hour == 12) {
+			hour = 0;
+		    }
+		} else if (ampm == 'p') {
+		    if (hour < 12) {
+			hour += 12;
+		    }
+		}
+	    }
+
 	    t->val = hour*60 + min;  /* Convert to minutes past midnight */
 	    if (hour <= 23) {
 		t->type = T_Time;
@@ -313,9 +298,6 @@ void FindNumericToken(char const *s, Token *t)
 	/* If we hit a non-digit, error! */
 	if (*s) return;
 
-	/* Special hack - convert years between 90 and 99 to 1990 and 1999 */
-	if (t->val >= 90 && t->val <= 99) t->val += 1900;
-
 	/* Classify the number we've got */
 	if (t->val >= BASE && t->val <= BASE+YR_RANGE) t->type = T_Year;
 	else if (t->val >= 1 && t->val <= 31) t->type = T_Day;

src/trigger.c

@@ -5,8 +5,7 @@
 /*  Routines for figuring out the trigger date of a reminder   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -25,6 +24,8 @@
 #define GOT_YR 4
 #define GOT_WD 8
 
+#define ADVANCE_TO_WD(x, wd) while (! ((wd) & (1 << ((x)%7)))) (x)++
+
 static int JYear(int jul);
 static int JMonth(int jul);
 static int NextSimpleTrig(int startdate, Trigger *trig, int *err);
@@ -59,9 +60,10 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
     if (trig->wd != NO_WD) typ |= GOT_WD;
     switch(typ) {
     case 0:
+        return startdate;
+
     case GOT_WD:
-	if (trig->wd != NO_WD)
-	    while(! (trig->wd & (1 << (startdate%7)))) startdate++;
+	ADVANCE_TO_WD(startdate, trig->wd);
 	return startdate;
 
     case GOT_DAY:
@@ -84,12 +86,12 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	else return -1;
 
     case GOT_DAY+GOT_MON:
-	if (m > trig->m || (m == trig->m && d > trig->d)) y++;
 	if (trig->d > MonthDays[trig->m]) {
 	    *err = E_BAD_DATE;
 	    return -1;
 	}
 
+	if (m > trig->m || (m == trig->m && d > trig->d)) y++;
 	/* Take care of Feb. 29 */
 	while (trig->d > DaysInMonth(trig->m, y)) y++;
 	return Julian(y, trig->m, trig->d);
@@ -122,19 +124,19 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	if (y > trig->y) return -1;
 	if (y < trig->y) j = Julian(trig->y, 0, 1);
 	else j = startdate;
-	while(! (trig->wd & (1 << (j%7)))) j++;
+        ADVANCE_TO_WD(j, trig->wd);
 	if (JYear(j) > trig->y) return -1;
 	return j;
 
     case GOT_MON+GOT_WD:
 	if (m == trig->m) {
 	    j = startdate;
-	    while(! (trig->wd & (1 << (j%7)))) j++;
+            ADVANCE_TO_WD(j, trig->wd);
 	    if (JMonth(j) == trig->m) return j;
 	}
 	if (m >= trig->m) j = Julian(y+1, trig->m, 1);
 	else j = Julian(y, trig->m, 1);
-	while(! (trig->wd & (1 << (j%7)))) j++;
+        ADVANCE_TO_WD(j, trig->wd);
 	return j; /* Guaranteed to be within the month */
 
     case GOT_DAY+GOT_WD:
@@ -145,7 +147,7 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	    /* If there are fewer days in previous month, no match */
 	    if (trig->d <= DaysInMonth(m2, y2)) {
 		j = Julian(y2, m2, trig->d);
-		while(! (trig->wd & (1 << (j%7)))) j++;
+                ADVANCE_TO_WD(j, trig->wd);
 		if (j >= startdate) return j;
 
 	    }
@@ -154,7 +156,7 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	/* Try this month */
 	if (trig->d <= DaysInMonth(m, y)) {
 	    j = Julian(y, m, trig->d);
-	    while(! (trig->wd & (1 << (j%7)))) j++;
+            ADVANCE_TO_WD(j, trig->wd);
 	    if (j >= startdate) return j;
 	}
 
@@ -163,18 +165,18 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	if (m2 > 11) { m2 = 0; y++; }
 	while (trig->d > DaysInMonth(m2, y)) m2++;
 	j = Julian(y, m2, trig->d);
-	while(! (trig->wd & (1 << (j%7)))) j++;
+        ADVANCE_TO_WD(j, trig->wd);
 	return j;
 
     case GOT_WD+GOT_YR+GOT_DAY:
 	if (y > trig->y+1 || (y > trig->y && m>0)) return -1;
 	if (y > trig->y) {
 	    j = Julian(trig->y, 11, trig->d);
-	    while(! (trig->wd & (1 << (j%7)))) j++;
+            ADVANCE_TO_WD(j, trig->wd);
 	    if (j >= startdate) return j;
 	} else if (y < trig->y) {
 	    j = Julian(trig->y, 0, trig->d);
-	    while(! (trig->wd & (1 << (j%7)))) j++;
+            ADVANCE_TO_WD(j, trig->wd);
 	    return j;
 	} else {
 	    /* Try last month */
@@ -182,14 +184,16 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 		m2 = m-1;
 		while (trig->d > DaysInMonth(m2, trig->y)) m2--;
 		j = Julian(trig->y, m2, trig->d);
-		while(! (trig->wd & (1 << (j%7)))) j++;
+                ADVANCE_TO_WD(j, trig->wd);
+                if (JYear(j) > trig->y) return -1;
 		if (j >= startdate) return j;
 	    }
 	}
 	/* Try this month */
 	if (trig->d <= DaysInMonth(m, trig->y)) {
 	    j = Julian(trig->y, m, trig->d);
-	    while(! (trig->wd & (1 << (j%7)))) j++;
+            ADVANCE_TO_WD(j, trig->wd);
+            if (JYear(j) > trig->y) return -1;
 	    if (j >= startdate) return j;
 	}
 
@@ -198,7 +202,8 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	m++;
 	while (trig->d > DaysInMonth(m, trig->d)) m++;
 	j = Julian(trig->y, m, trig->d);
-	while(! (trig->wd & (1 << (j%7)))) j++;
+        ADVANCE_TO_WD(j, trig->wd);
+        if (JYear(j) > trig->y) return -1;
 	return j;
 
     case GOT_DAY+GOT_MON+GOT_WD:
@@ -216,31 +221,32 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 
 	/* Try last year */
 	j = Julian(y, trig->m, trig->d);
-	while(! (trig->wd & (1 << (j%7)))) j++;
+        ADVANCE_TO_WD(j, trig->wd);
 	if (j >= startdate) return j;
 
 	/* Try this year */
 	y++;
+	while (trig->d > DaysInMonth(trig->m, y)) y++;
 	j = Julian(y, trig->m, trig->d);
-	while(! (trig->wd & (1 << (j%7)))) j++;
+        ADVANCE_TO_WD(j, trig->wd);
 	if (j >= startdate) return j;
 
 	/* Must be next year */
 	y++;
 	while (trig->d > DaysInMonth(trig->m, y)) y++;
 	j = Julian(y, trig->m, trig->d);
-	while(! (trig->wd & (1 << (j%7)))) j++;
+        ADVANCE_TO_WD(j, trig->wd);
 	return j;
 
     case GOT_WD+GOT_MON+GOT_YR:
 	if (y > trig->y || (y == trig->y && m > trig->m)) return -1;
 	if (trig->y > y || (trig->y == y && trig->m > m)) {
 	    j = Julian(trig->y, trig->m, 1);
-	    while(! (trig->wd & (1 << (j%7)))) j++;
+            ADVANCE_TO_WD(j, trig->wd);
 	    return j;
 	} else {
 	    j = startdate;
-	    while(! (trig->wd & (1 << (j%7)))) j++;
+            ADVANCE_TO_WD(j, trig->wd);
 	    FromJulian(j, &y2, &m2, &d2);
 	    if (m2 == trig->m) return j; else return -1;
 	}
@@ -251,7 +257,7 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	    return -1;
 	}
 	j = Julian(trig->y, trig->m, trig->d);
-	while(! (trig->wd & (1 << (j%7)))) j++;
+        ADVANCE_TO_WD(j, trig->wd);
 	return j;
 
     default:
@@ -409,6 +415,57 @@ static int GetNextTriggerDate(Trigger *trig, int start, int *err, int *nextstart
     return simple;
 }
 
+int
+AdjustTriggerForDuration(int today, int r, Trigger *trig, TimeTrig *tim, int save_in_globals)
+{
+    int y, m, d;
+    /* If we have an AT, save the original event start */
+    if (tim->ttime != NO_TIME) {
+	trig->eventstart = MINUTES_PER_DAY * r + tim->ttime;
+	if (tim->duration != NO_TIME) {
+	    trig->eventduration = tim->duration;
+	}
+    }
+
+    /* Now potentially adjust */
+    if (r < today && r + trig->duration_days >= today) {
+	/* Adjust duration down */
+	tim->duration -= (today - r) * MINUTES_PER_DAY;
+	tim->duration += tim->ttime;
+
+	/* Start at midnight */
+	tim->ttime = 0;
+
+	/* Change trigger date to today */
+	r = today;
+	if (DebugFlag & DB_PRTTRIG) {
+	    FromJulian(r, &y, &m, &d);
+	    fprintf(ErrFp, "%s(%d): Trig(adj) = %s, %d %s, %d",
+		    FileName, LineNo,
+		    get_day_name(r % 7),
+		    d,
+		    get_month_name(m),
+		    y);
+	    if (tim->ttime != NO_TIME) {
+		fprintf(ErrFp, " AT %02d:%02d",
+			(tim->ttime / 60),
+			(tim->ttime % 60));
+		if (tim->duration != NO_TIME) {
+		    fprintf(ErrFp, " DURATION %02d:%02d",
+			    (tim->duration / 60),
+			    (tim->duration % 60));
+		}
+	    }
+	    fprintf(ErrFp, "\n");
+	}
+
+    }
+    if (save_in_globals) {
+	SaveAllTriggerInfo(trig, tim, r, tim->ttime, 1);
+    }
+    return r;
+}
+
 /***************************************************************/
 /*                                                             */
 /*  ComputeTrigger                                             */
@@ -417,10 +474,49 @@ static int GetNextTriggerDate(Trigger *trig, int start, int *err, int *nextstart
 /*  today's date.                                              */
 /*                                                             */
 /***************************************************************/
-int ComputeTrigger(int today, Trigger *trig, int *err, int save_in_globals)
+int ComputeTrigger(int today, Trigger *trig, TimeTrig *tim,
+		   int *err, int save_in_globals)
+{
+    int r = ComputeTriggerNoAdjustDuration(today, trig, tim, err, save_in_globals, 0);
+    if (*err != OK) {
+	return r;
+    }
+    if (r == today) {
+	if (tim->ttime != NO_TIME) {
+	    trig->eventstart = MINUTES_PER_DAY * r + tim->ttime;
+	    if (tim->duration != NO_TIME) {
+		trig->eventduration = tim->duration;
+	    }
+	}
+	if (save_in_globals) {
+	    SaveAllTriggerInfo(trig, tim, r, tim->ttime, 1);
+	}
+	return r;
+    }
+
+    if (trig->duration_days) {
+	r = ComputeTriggerNoAdjustDuration(today, trig, tim, err, save_in_globals, trig->duration_days);
+	if (*err != OK) {
+	    return r;
+	}
+    }
+    r = AdjustTriggerForDuration(today, r, trig, tim, save_in_globals);
+    return r;
+}
+
+/***************************************************************/
+/*                                                             */
+/*  ComputeTriggerNoAdjustDuration                             */
+/*                                                             */
+/*  Compute a trigger, but do NOT adjust the time trigger      */
+/*  duration.                                                  */
+/*                                                             */
+/***************************************************************/
+int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig *tim,
+				   int *err, int save_in_globals, int duration_days)
 {
     int nattempts = 0,
-	start = today,
+	start = today - duration_days,
 	nextstart = 0,
 	y, m, d, omit,
 	result;
@@ -430,15 +526,25 @@ int ComputeTrigger(int today, Trigger *trig, int *err, int save_in_globals)
 	LastTrigValid = 0;
     }
 
-/* Assume everything works */
+    /* Assume everything works */
     *err = OK;
 
-/* But check for obvious problems... */
+    /* But check for obvious problems... */
     if (trig->localomit == 1 + 2 + 4 + 8 + 16 + 32 + 64) {
 	*err = E_2MANY_LOCALOMIT;
 	return -1;
     }
 
+    if (start < 0) {
+	*err = E_DATE_OVER;
+	return -1;
+    }
+
+    if (tim->duration != NO_TIME && tim->ttime == NO_TIME) {
+	*err = E_DURATION_NO_AT;
+	return -1;
+    }
+
     if (trig->rep != NO_REP &&
 	(trig->d == NO_DAY ||
 	 trig->m == NO_MON ||
@@ -449,6 +555,11 @@ int ComputeTrigger(int today, Trigger *trig, int *err, int save_in_globals)
     }
 
 
+    /* Save the trigger */
+    if (save_in_globals) {
+	SaveLastTrigger(trig);
+    }
+
     while (nattempts++ < TRIG_ATTEMPTS) {
 	result = GetNextTriggerDate(trig, start, err, &nextstart);
 
@@ -470,7 +581,9 @@ int ComputeTrigger(int today, Trigger *trig, int *err, int save_in_globals)
 	} else {
 	    omit = 0;
 	}
-	if (result >= today &&
+
+	/** FIXME: Fix bad interaction with SATISFY... need to rethink!!! */
+	if (result+duration_days >= today &&
 	    (trig->skip != SKIP_SKIP || !omit)) {
 	    if (save_in_globals) {
 		LastTriggerDate = result;  /* Save in global var */
@@ -478,12 +591,23 @@ int ComputeTrigger(int today, Trigger *trig, int *err, int save_in_globals)
 	    }
 	    if (DebugFlag & DB_PRTTRIG) {
 		FromJulian(result, &y, &m, &d);
-		fprintf(ErrFp, "%s(%d): Trig = %s, %d %s, %d\n",
+		fprintf(ErrFp, "%s(%d): Trig = %s, %d %s, %d",
 			FileName, LineNo,
-			DayName[result % 7],
+			get_day_name(result % 7),
 			d,
-			MonthName[m],
+			get_month_name(m),
 			y);
+		if (tim->ttime != NO_TIME) {
+		    fprintf(ErrFp, " AT %02d:%02d",
+			    (tim->ttime / 60),
+			    (tim->ttime % 60));
+		    if (tim->duration != NO_TIME) {
+			fprintf(ErrFp, " DURATION %02d:%02d",
+			    (tim->duration / 60),
+			    (tim->duration % 60));
+		    }
+		}
+		fprintf(ErrFp, "\n");
 	    }
 	    return result;
 	}
@@ -536,3 +660,41 @@ int ComputeTrigger(int today, Trigger *trig, int *err, int save_in_globals)
     *err = E_CANT_TRIG;
     return -1;
 }
+
+/***************************************************************/
+/*                                                             */
+/*  ComputeScanStart                                            */
+/*                                                             */
+/*  Figure out where to start scan from by examining SCANFROM  */
+/*  and DURATION                                               */
+/*                                                             */
+/***************************************************************/
+int
+ComputeScanStart(int today, Trigger *trig, TimeTrig *tt)
+{
+    int minutes, days;
+
+    /* If we don't have a time/duration, just use scanfrom */
+    if (tt->ttime == NO_TIME ||
+	tt->duration == NO_TIME) {
+	if (trig->scanfrom == NO_DATE) {
+	    return today;
+	}
+	return trig->scanfrom;
+    }
+
+    /* Calculate time-based SCANFROM */
+    minutes = tt->ttime + tt->duration - 1;
+
+    /* Figure out how many days to scan backwards from */
+    days = minutes / MINUTES_PER_DAY;
+
+    if (trig->scanfrom != NO_DATE) {
+	if (trig->scanfrom <= today - days) {
+	    return trig->scanfrom;
+	} else {
+	    return today - days;
+	}
+    }
+    return today - days;
+}

src/types.h

@@ -5,8 +5,7 @@
 /*  Type definitions all dumped here.                          */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -69,7 +68,13 @@ typedef struct {
     int typ;
     int once;
     int scanfrom;
+    int from;
     int priority;
+    int duration_days;           /* Duration converted to days to search */
+    int eventstart;              /* Original event start (datetime) */
+    int eventduration;           /* Original event duration (minutes) */
+    int maybe_uncomputable;      /* Suppress "can't compute trigger" warnings */
+    int addomit;                 /* Add trigger date to global OMITs */
     char sched[VAR_NAME_LEN+1];  /* Scheduling function */
     char warn[VAR_NAME_LEN+1];   /* Warning function    */
     char omitfunc[VAR_NAME_LEN+1]; /* OMITFUNC function */
@@ -88,16 +93,16 @@ typedef struct {
 
 /* The parse pointer */
 typedef struct {
-    char isnested;              /* Is it a nested expression? */
-    char allownested;
+    DynamicBuffer pushedToken;	/* Pushed-back token */
     char const *text;           /* Start of text */
     char const *pos;            /* Current position */
     char const *etext;          /* Substituted text */
     char const *epos;           /* Position in substituted text */
-    DynamicBuffer pushedToken;	/* Pushed-back token */
     char const *tokenPushed;	/* NULL if no pushed-back token */
-    char expr_happened;         /* Did we encounter an [expression] ? */
-    char nonconst_expr;         /* Did we encounter a non-constant [expression] ? */
+    unsigned char isnested;      /* Is it a nested expression? */
+    unsigned char allownested;
+    unsigned char expr_happened; /* Did we encounter an [expression] ? */
+    unsigned char nonconst_expr; /* Did we encounter a non-constant [expression] ? */
 } Parser;
 
 typedef Parser *ParsePtr;  /* Pointer to parser structure */
@@ -146,9 +151,10 @@ typedef Parser *ParsePtr;  /* Pointer to parser structure */
 enum TokTypes
 { T_Illegal,
   /* Commands first */
-  T_Rem, T_Push, T_Pop, T_Preserve, T_Include, T_If, T_Else, T_EndIf,
+  T_Rem, T_Push, T_Pop, T_Preserve, T_Include, T_IncludeR, T_IncludeCmd, T_If, T_Else, T_EndIf,
   T_IfTrig, T_ErrMsg,
   T_Set, T_UnSet, T_Fset, T_Omit, T_Banner, T_Exit,
+  T_AddOmit,
   T_WkDay,
   T_Month, T_Time, T_Date, T_DateTime,
   T_Skip, T_At, T_RemType, T_Until, T_Year, T_Day, T_Rep, T_Delta, T_Back,
@@ -168,7 +174,8 @@ enum TokTypes
   T_Duration,
   T_LongTime,
   T_OmitFunc,
-  T_Through
+  T_Through,
+  T_MaybeUncomputable
 };
 
 /* The structure of a token */
@@ -213,3 +220,18 @@ typedef struct {
 /* Flags for FROM / SCANFROM */
 #define SCANFROM_TYPE 0
 #define FROM_TYPE     1
+
+/* PS Calendar levels */
+
+/* Original interchange format */
+#define PSCAL_LEVEL1  1
+
+/* Line-by-line JSON */
+#define PSCAL_LEVEL2  2
+
+/* Pure JSON */
+#define PSCAL_LEVEL3  3
+
+#define TERMINAL_BACKGROUND_UNKNOWN 0
+#define TERMINAL_BACKGROUND_DARK    1
+#define TERMINAL_BACKGROUND_LIGHT   2

src/userfns.c

@@ -6,8 +6,7 @@
 /*  functions.                                                 */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -65,6 +64,7 @@ int DoFset(ParsePtr p)
     int c;
     UserFunc *func;
     Var *v;
+    int orig_namelen;
 
     DynamicBuffer buf;
     DBufInit(&buf);
@@ -75,6 +75,7 @@ int DoFset(ParsePtr p)
 	DBufFree(&buf);
 	return E_BAD_ID;
     }
+    orig_namelen = buf.len;
 
     /* Should be followed by '(' */
     c = ParseNonSpaceChar(p, &r, 0);
@@ -95,9 +96,8 @@ int DoFset(ParsePtr p)
     StrnCpy(func->name, DBufValue(&buf), VAR_NAME_LEN);
     DBufFree(&buf);
     if (!Hush) {
-	if (FindFunc(DBufValue(&buf), Func, NumFuncs)) {
-	    Eprint("%s: `%s'", ErrMsg[E_REDEF_FUNC],
-		   DBufValue(&buf));
+	if (FindFunc(func->name, Func, NumFuncs)) {
+	    Eprint("%s: `%s'", ErrMsg[E_REDEF_FUNC], func->name);
 	}
     }
     func->locals = NULL;
@@ -119,6 +119,7 @@ int DoFset(ParsePtr p)
 	    if ( (r=ParseIdentifier(p, &buf)) ) return r;
 	    if (*DBufValue(&buf) == '$') {
 		DBufFree(&buf);
+		DestroyUserFunc(func);
 		return E_BAD_ID;
 	    }
 	    v = NEW(Var);
@@ -165,6 +166,10 @@ int DoFset(ParsePtr p)
 
     /* Add the function definition */
     FSet(func);
+    if (orig_namelen > VAR_NAME_LEN) {
+	Eprint("Warning: Function name `%s...' truncated to `%s'",
+	       func->name, func->name);
+    }
     return OK;
 }
 
@@ -274,7 +279,7 @@ int CallUserFunc(char const *name, int nargs, ParsePtr p)
 	}
 	return E_RECURSIVE;
     }
-   
+
     /* Check number of args */
     if (nargs != f->nargs) {
 	if (DebugFlag &DB_PRTEXPR) {

src/utils.c

@@ -5,12 +5,15 @@
 /*  Useful utility functions.                                  */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
+static char const DontEscapeMe[] =
+"1234567890_-=+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@.,/";
+
 #include "config.h"
+#include "err.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -124,3 +127,38 @@ int DateOK(int y, int m, int d)
 	d > DaysInMonth(m, y) ) return 0;
     else return 1;
 }
+
+/* Functions designed to defeat gcc optimizer */
+
+int _private_div(int a, int b) { return a/b; }
+int _private_add_overflow(int result, int b, int old)
+{
+    if (b > 0 && result < old) return 1;
+    if (b < 0 && result > old) return 1;
+    return 0;
+}
+int _private_sub_overflow(int result, int b, int old)
+{
+    if (b < 0 && result < old) return 1;
+    if (b > 0 && result > old) return 1;
+    return 0;
+}
+
+int _private_unminus_overflow(int a, int b)
+{
+    if (a > 0 && b > 0) return 1;
+    if (a < 0 && b < 0) return 1;
+    return 0;
+}
+
+int
+ShellEscape(char const *in, DynamicBuffer *out)
+{
+    while(*in) {
+        if (!strchr(DontEscapeMe, *in)) {
+            if (DBufPutc(out, '\\') != OK) return E_NO_MEM;
+        }
+        if (DBufPutc(out, *in++) != OK) return E_NO_MEM;
+    }
+    return OK;
+}

src/var.c

@@ -6,8 +6,7 @@
 /*  user- and system-defined variables.                        */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by David F. Skoll                  */
-/*  Copyright (C) 1999-2007 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/
 
@@ -18,6 +17,8 @@
 #include <ctype.h>
 
 #include <stdlib.h>
+#include <limits.h>
+#include <errno.h>
 #include "types.h"
 #include "expr.h"
 #include "globals.h"
@@ -32,12 +33,109 @@
 #define VALUE    ErrMsg[E_VAL]
 #define UNDEF	 ErrMsg[E_UNDEF]
 
+static int IntMin = INT_MIN;
+static int IntMax = INT_MAX;
+
 static Var *VHashTbl[VAR_HASH_SIZE];
 
 typedef int (*SysVarFunc)(int, Value *);
 
+static void deprecated_var(char const *var, char const *instead)
+{
+    if (DebugFlag & DB_PRTLINE) {
+        Eprint("%s is deprecated; use %s instead", var, instead);
+        FreshLine = 1;
+    }
+}
+
+static int latlong_component_func(int do_set, Value *val, int *var, int min, int max, char const *varname, char const *newvarname)
+{
+    if (!do_set) {
+        val->type = INT_TYPE;
+        val->v.val = *var;
+        return OK;
+    }
+    deprecated_var(varname, newvarname);
+    if (val->type != INT_TYPE) return E_BAD_TYPE;
+    if (val->v.val < min) return E_2LOW;
+    if (val->v.val > max) return E_2HIGH;
+    *var = val->v.val;
+    set_lat_and_long_from_components();
+    return OK;
+}
+static int latdeg_func(int do_set, Value *val)
+{
+    return latlong_component_func(do_set, val, &LatDeg, -90, 90, "$LatDeg", "$Latitude");
+}
+
+static int latmin_func(int do_set, Value *val)
+{
+    return latlong_component_func(do_set, val, &LatMin, -59, 59, "$LatMin", "$Latitude");
+}
+
+static int latsec_func(int do_set, Value *val)
+{
+    return latlong_component_func(do_set, val, &LatSec, -59, 59, "$LatSec", "$Latitude");
+}
+
+static int longdeg_func(int do_set, Value *val)
+{
+    return latlong_component_func(do_set, val, &LongDeg, -180, 180, "$LongDeg", "$Longitude");
+}
+
+static int longmin_func(int do_set, Value *val)
+{
+    return latlong_component_func(do_set, val, &LongMin, -59, 59, "$LongMin", "$Longitude");
+}
+
+static int longsec_func(int do_set, Value *val)
+{
+    return latlong_component_func(do_set, val, &LongSec, -59, 59, "$LongSec", "$Longitude");
+}
+
+static int latitude_longitude_func(int do_set, Value *val, double *var, double min, double max) {
+    char buf[64];
+    double x;
+    char *endptr;
+
+    if (!do_set) {
+        snprintf(buf, sizeof(buf), "%f", *var);
+        val->v.str = malloc(strlen(buf)+1);
+        if (!val->v.str) return E_NO_MEM;
+        strcpy(val->v.str, buf);
+        val->type = STR_TYPE;
+        return OK;
+    }
+    if (val->type == INT_TYPE) {
+        x = (double) val->v.val;
+    } else {
+        if (val->type != STR_TYPE) return E_BAD_TYPE;
+        errno = 0;
+        x = strtod(val->v.str, &endptr);
+        if (errno) return E_BAD_TYPE;
+        if (*endptr) return E_BAD_TYPE;
+    }
+    if (x < min) return E_2LOW;
+    if (x > max) return E_2HIGH;
+    *var = x;
+    set_components_from_lat_and_long();
+    return OK;
+}
+
+static int longitude_func(int do_set, Value *val)
+{
+    return latitude_longitude_func(do_set, val, &Longitude, -180.0, 180.0);
+}
+
+static int latitude_func(int do_set, Value *val)
+{
+    return latitude_longitude_func(do_set, val, &Latitude, -90.0, 90.0);
+}
+
+
 static int trig_date_func(int do_set, Value *val)
 {
+    UNUSED(do_set);
     val->type = DATE_TYPE;
     if (!LastTrigValid) {
 	val->v.val = 0;
@@ -49,6 +147,7 @@ static int trig_date_func(int do_set, Value *val)
 static int trig_day_func(int do_set, Value *val)
 {
     int y, m, d;
+    UNUSED(do_set);
     val->type = INT_TYPE;
     if (!LastTrigValid) {
 	val->v.val = -1;
@@ -63,6 +162,7 @@ static int trig_day_func(int do_set, Value *val)
 static int trig_mon_func(int do_set, Value *val)
 {
     int y, m, d;
+    UNUSED(do_set);
     val->type = INT_TYPE;
     if (!LastTrigValid) {
 	val->v.val = -1;
@@ -77,6 +177,7 @@ static int trig_mon_func(int do_set, Value *val)
 static int trig_year_func(int do_set, Value *val)
 {
     int y, m, d;
+    UNUSED(do_set);
     val->type = INT_TYPE;
     if (!LastTrigValid) {
 	val->v.val = -1;
@@ -91,6 +192,7 @@ static int trig_year_func(int do_set, Value *val)
 static int trig_wday_func(int do_set, Value *val)
 {
     val->type = INT_TYPE;
+    UNUSED(do_set);
     if (!LastTrigValid) {
 	val->v.val = -1;
 	return OK;
@@ -102,6 +204,7 @@ static int trig_wday_func(int do_set, Value *val)
 
 static int today_date_func(int do_set, Value *val)
 {
+    UNUSED(do_set);
     val->type = DATE_TYPE;
     val->v.val = JulianToday;
     return OK;
@@ -109,6 +212,7 @@ static int today_date_func(int do_set, Value *val)
 static int today_day_func(int do_set, Value *val)
 {
     int y, m, d;
+    UNUSED(do_set);
     val->type = INT_TYPE;
     FromJulian(JulianToday, &y, &m, &d);
     val->v.val = d;
@@ -118,6 +222,7 @@ static int today_day_func(int do_set, Value *val)
 static int today_mon_func(int do_set, Value *val)
 {
     int y, m, d;
+    UNUSED(do_set);
     val->type = INT_TYPE;
     FromJulian(JulianToday, &y, &m, &d);
     val->v.val = m+1;
@@ -127,6 +232,7 @@ static int today_mon_func(int do_set, Value *val)
 static int today_year_func(int do_set, Value *val)
 {
     int y, m, d;
+    UNUSED(do_set);
     val->type = INT_TYPE;
     FromJulian(JulianToday, &y, &m, &d);
     val->v.val = y;
@@ -135,11 +241,70 @@ static int today_year_func(int do_set, Value *val)
 
 static int today_wday_func(int do_set, Value *val)
 {
+    UNUSED(do_set);
     val->type = INT_TYPE;
     val->v.val = (JulianToday + 1) % 7;
     return OK;
 }
 
+static int datetime_sep_func(int do_set, Value *val)
+{
+    if (!do_set) {
+	val->v.str = malloc(2);
+	if (!val->v.str) return E_NO_MEM;
+	val->v.str[0] = DateTimeSep;
+	val->v.str[1] = 0;
+	val->type = STR_TYPE;
+	return OK;
+    }
+    if (val->type != STR_TYPE) return E_BAD_TYPE;
+    if (strcmp(val->v.str, "T") &&
+	strcmp(val->v.str, "@")) {
+	return E_BAD_TYPE;
+    }
+    DateTimeSep = val->v.str[0];
+    return OK;
+}
+
+static int default_color_func(int do_set, Value *val)
+{
+    int col_r, col_g, col_b;
+    if (!do_set) {
+    /* 12 = strlen("255 255 255\0") */
+        val->v.str = malloc(12);
+        if (!val->v.str) return E_NO_MEM;
+        snprintf(val->v.str, 12, "%d %d %d",
+                 DefaultColorR,
+                 DefaultColorG,
+                 DefaultColorB
+            );
+        val->type = STR_TYPE;
+        return OK;
+    }
+    if (val->type != STR_TYPE) return E_BAD_TYPE;
+    if (sscanf(val->v.str, "%d %d %d", &col_r, &col_g, &col_b) != 3) {
+        return E_BAD_TYPE;
+    }
+    /* They either all have to be -1, or all between 0 and 255 */
+    if (col_r == -1 && col_g == -1 && col_b == -1) {
+	DefaultColorR = -1;
+	DefaultColorG = -1;
+	DefaultColorB = -1;
+	return OK;
+    }
+    if (col_r < 0) return E_2LOW;
+    if (col_r > 255) return E_2HIGH;
+    if (col_g < 0) return E_2LOW;
+    if (col_g > 255) return E_2HIGH;
+    if (col_b < 0) return E_2LOW;
+    if (col_b > 255) return E_2HIGH;
+
+    DefaultColorR = col_r;
+    DefaultColorG = col_g;
+    DefaultColorB = col_b;
+    return OK;
+}
+
 static int date_sep_func(int do_set, Value *val)
 {
     if (!do_set) {
@@ -342,6 +507,10 @@ int DoSet (Parser *p)
 
     if (*DBufValue(&buf) == '$') r = SetSysVar(DBufValue(&buf)+1, &v);
     else r = SetVar(DBufValue(&buf), &v);
+    if (buf.len > VAR_NAME_LEN) {
+	Eprint("Warning: Variable name `%.*s...' truncated to `%.*s'",
+	       VAR_NAME_LEN, DBufValue(&buf), VAR_NAME_LEN, DBufValue(&buf));
+    }
     DBufFree(&buf);
     return r;
 }
@@ -404,17 +573,17 @@ int DoDump(ParsePtr p)
 	DumpVarTable();
 	return OK;
     }
-    fprintf(ErrFp, "%*s  %s\n\n", VAR_NAME_LEN, VARIABLE, VALUE);
+    fprintf(ErrFp, "%s  %s\n\n", VARIABLE, VALUE);
     while(1) {
 	if (*DBufValue(&buf) == '$') {
 	    DumpSysVarByName(DBufValue(&buf)+1);
 	} else {
 	    v = FindVar(DBufValue(&buf), 0);
 	    DBufValue(&buf)[VAR_NAME_LEN] = 0;
-	    if (!v) fprintf(ErrFp, "%*s  %s\n", VAR_NAME_LEN,
+	    if (!v) fprintf(ErrFp, "%s  %s\n",
 			    DBufValue(&buf), UNDEF);
 	    else {
-		fprintf(ErrFp, "%*s  ", VAR_NAME_LEN, v->name);
+		fprintf(ErrFp, "%s  ", v->name);
 		PrintValue(&(v->v), ErrFp);
 		fprintf(ErrFp, "\n");
 	    }
@@ -442,12 +611,12 @@ void DumpVarTable(void)
     register Var *v;
     register int i;
 
-    fprintf(ErrFp, "%*s  %s\n\n", VAR_NAME_LEN, VARIABLE, VALUE);
+    fprintf(ErrFp, "%s  %s\n\n", VARIABLE, VALUE);
 
     for (i=0; i<VAR_HASH_SIZE; i++) {
 	v = VHashTbl[i];
 	while(v) {
-	    fprintf(ErrFp, "%*s  ", VAR_NAME_LEN, v->name);
+	    fprintf(ErrFp, "%s  ", v->name);
 	    PrintValue(&(v->v), ErrFp);
 	    fprintf(ErrFp, "\n");
 	    v = v->next;
@@ -559,6 +728,7 @@ typedef struct {
     void *value;
     int min;
     int max;
+    int (*validate)(void const *newvalue);
 } SysVar;
 
 /* If the type of a sys variable is STR_TYPE, then min is redefined
@@ -570,57 +740,83 @@ typedef struct {
 
 /* All of the system variables sorted alphabetically */
 static SysVar SysVarArr[] = {
-    /*  name          mod  type              value         min/mal   max */
-    {"CalcUTC",        1,  INT_TYPE,     &CalculateUTC,       0,      1   },
-    {"CalMode",        0,  INT_TYPE,     &DoCalendar,         0,      0   },
-    {"Daemon",         0,  INT_TYPE,     &Daemon,             0,      0   },
-    {"DateSep",        1,  SPECIAL_TYPE, date_sep_func,       0,      0   },
-    {"DefaultPrio",    1,  INT_TYPE,     &DefaultPrio,        0,      9999},
-    {"DeltaOffset",    0,  INT_TYPE,     &DeltaOffset,        0,      0   },
-    {"DontFork",       0,  INT_TYPE,     &DontFork,           0,      0   },
-    {"DontQueue",      0,  INT_TYPE,     &DontQueue,          0,      0   },
-    {"DontTrigAts",    0,  INT_TYPE,     &DontIssueAts,       0,      0   },
-    {"EndSent",        1,  STR_TYPE,     &EndSent,            0,      0   },
-    {"EndSentIg",      1,  STR_TYPE,     &EndSentIg,          0,      0   },
-    {"FirstIndent",    1,  INT_TYPE,     &FirstIndent,        0,      132 },
-    {"FoldYear",       1,  INT_TYPE,     &FoldYear,           0,      1   },
-    {"FormWidth",      1,  INT_TYPE,     &FormWidth,          20,     132 },
-    {"HushMode",       0,  INT_TYPE,     &Hush,               0,      0   },
-    {"IgnoreOnce",     0,  INT_TYPE,     &IgnoreOnce,         0,      0   },
-    {"InfDelta",       0,  INT_TYPE,     &InfiniteDelta,      0,      0   },
-    {"LatDeg",         1,  INT_TYPE,     &LatDeg,             -90,    90  },
-    {"LatMin",         1,  INT_TYPE,     &LatMin,             -59,    59  },
-    {"LatSec",         1,  INT_TYPE,     &LatSec,             -59,    59  },
-    {"Location",       1,  STR_TYPE,     &Location,           0,      0   },
-    {"LongDeg",        1,  INT_TYPE,     &LongDeg,            -180,   180 },
-    {"LongMin",        1,  INT_TYPE,     &LongMin,            -59,    59  },
-    {"LongSec",        1,  INT_TYPE,     &LongSec,            -59,    59  },
-    {"MaxSatIter",     1,  INT_TYPE,     &MaxSatIter,         10,     ANY },
-    {"MaxStringLen",   1,  INT_TYPE,     &MaxStringLen,       -1,     ANY },
-    {"MinsFromUTC",    1,  INT_TYPE,     &MinsFromUTC,        -780,   780 },
-    {"NextMode",       0,  INT_TYPE,     &NextMode,           0,      0   },
-    {"NumQueued",      0,  INT_TYPE,     &NumQueued,          0,      0   },
-    {"NumTrig",        0,  INT_TYPE,     &NumTriggered,       0,      0   },
-    {"PrefixLineNo",   0,  INT_TYPE,     &DoPrefixLineNo,     0,      0   },
-    {"PSCal",          0,  INT_TYPE,     &PsCal,              0,      0   },
-    {"RunOff",         0,  INT_TYPE,     &RunDisabled,        0,      0   },
-    {"SimpleCal",      0,  INT_TYPE,     &DoSimpleCalendar,   0,      0   },
-    {"SortByDate",     0,  INT_TYPE,     &SortByDate,         0,      0   },
-    {"SortByPrio",     0,  INT_TYPE,     &SortByPrio,         0,      0   },
-    {"SortByTime",     0,  INT_TYPE,     &SortByTime,         0,      0   },
-    {"SubsIndent",     1,  INT_TYPE,     &SubsIndent,         0,      132 },
-    {"T",              0,  SPECIAL_TYPE, trig_date_func,      0,      0   },
-    {"Td",             0,  SPECIAL_TYPE, trig_day_func,       0,      0   },
-    {"TimeSep",        1,  SPECIAL_TYPE, time_sep_func,       0,      0   },
-    {"Tm",             0,  SPECIAL_TYPE, trig_mon_func,       0,      0   },
-    {"Tw",             0,  SPECIAL_TYPE, trig_wday_func,      0,      0   },
-    {"Ty",             0,  SPECIAL_TYPE, trig_year_func,      0,      0   },
-    {"U",              0,  SPECIAL_TYPE, today_date_func,     0,      0   },
-    {"Ud",             0,  SPECIAL_TYPE, today_day_func,      0,      0   },
-    {"Um",             0,  SPECIAL_TYPE, today_mon_func,      0,      0   },
-    {"UntimedFirst",   0,  INT_TYPE,     &UntimedBeforeTimed, 0,      0   },
-    {"Uw",             0,  SPECIAL_TYPE, today_wday_func,     0,      0   },
-    {"Uy",             0,  SPECIAL_TYPE, today_year_func,     0,      0   }
+    /*  name          mod  type              value          min/mal   max  validate*/
+    {"April",          1,  STR_TYPE,     &DynamicMonthName[3], 0,      0,    NULL },
+    {"August",         1,  STR_TYPE,     &DynamicMonthName[7], 0,      0,    NULL },
+    {"CalcUTC",        1,  INT_TYPE,     &CalculateUTC,        0,      1,    NULL },
+    {"CalMode",        0,  INT_TYPE,     &DoCalendar,          0,      0,    NULL },
+    {"Daemon",         0,  INT_TYPE,     &Daemon,              0,      0,    NULL },
+    {"DateSep",        1,  SPECIAL_TYPE, date_sep_func,        0,      0,    NULL },
+    {"DateTimeSep",    1,  SPECIAL_TYPE, datetime_sep_func,    0,      0,    NULL },
+    {"December",       1,  STR_TYPE,     &DynamicMonthName[11],0,      0,    NULL },
+    {"DefaultColor",   1,  SPECIAL_TYPE, default_color_func,   0,      0,    NULL },
+    {"DefaultPrio",    1,  INT_TYPE,     &DefaultPrio,         0,      9999, NULL },
+    {"DefaultTDelta",  1,  INT_TYPE,     &DefaultTDelta,       0,      1440, NULL },
+    {"DeltaOffset",    0,  INT_TYPE,     &DeltaOffset,         0,      0,    NULL },
+    {"DontFork",       0,  INT_TYPE,     &DontFork,            0,      0,    NULL },
+    {"DontQueue",      0,  INT_TYPE,     &DontQueue,           0,      0,    NULL },
+    {"DontTrigAts",    0,  INT_TYPE,     &DontIssueAts,        0,      0,    NULL },
+    {"EndSent",        1,  STR_TYPE,     &EndSent,             0,      0,    NULL },
+    {"EndSentIg",      1,  STR_TYPE,     &EndSentIg,           0,      0,    NULL },
+    {"February",       1,  STR_TYPE,     &DynamicMonthName[1], 0,      0,    NULL },
+    {"FirstIndent",    1,  INT_TYPE,     &FirstIndent,         0,      132,  NULL },
+    {"FoldYear",       1,  INT_TYPE,     &FoldYear,            0,      1,    NULL },
+    {"FormWidth",      1,  INT_TYPE,     &FormWidth,           20,     500,  NULL },
+    {"Friday",         1,  STR_TYPE,     &DynamicDayName[4],   0,      0,    NULL },
+    {"HushMode",       0,  INT_TYPE,     &Hush,                0,      0,    NULL },
+    {"IgnoreOnce",     0,  INT_TYPE,     &IgnoreOnce,          0,      0,    NULL },
+    {"InfDelta",       0,  INT_TYPE,     &InfiniteDelta,       0,      0,    NULL },
+    {"IntMax",         0,  INT_TYPE,     &IntMax,              0,      0,    NULL },
+    {"IntMin",         0,  INT_TYPE,     &IntMin,              0,      0,    NULL },
+    {"January",        1,  STR_TYPE,     &DynamicMonthName[0], 0,      0,    NULL },
+    {"July",           1,  STR_TYPE,     &DynamicMonthName[6], 0,      0,    NULL },
+    {"June",           1,  STR_TYPE,     &DynamicMonthName[5], 0,      0,    NULL },
+    {"LatDeg",         1,  SPECIAL_TYPE, latdeg_func,          0,      0,    NULL },
+    {"Latitude",       1,  SPECIAL_TYPE, latitude_func,        0,      0,    NULL },
+    {"LatMin",         1,  SPECIAL_TYPE, latmin_func,          0,      0,    NULL },
+    {"LatSec",         1,  SPECIAL_TYPE, latsec_func,          0,      0,    NULL },
+    {"Location",       1,  STR_TYPE,     &Location,            0,      0,    NULL },
+    {"LongDeg",        1,  SPECIAL_TYPE, longdeg_func,         0,      0,    NULL },
+    {"Longitude",      1,  SPECIAL_TYPE, longitude_func,       0,      0,    NULL },
+    {"LongMin",        1,  SPECIAL_TYPE, longmin_func,         0,      0,    NULL },
+    {"LongSec",        1,  SPECIAL_TYPE, longsec_func,         0,      0,    NULL },
+    {"March",          1,  STR_TYPE,     &DynamicMonthName[2], 0,      0,    NULL },
+    {"MaxSatIter",     1,  INT_TYPE,     &MaxSatIter,          10,     ANY,  NULL },
+    {"MaxStringLen",   1,  INT_TYPE,     &MaxStringLen,        -1,     ANY,  NULL },
+    {"May",            1,  STR_TYPE,     &DynamicMonthName[4], 0,      0,    NULL },
+    {"MinsFromUTC",    1,  INT_TYPE,     &MinsFromUTC,         -780,   780,  NULL },
+    {"Monday",         1,  STR_TYPE,     &DynamicDayName[0],   0,      0,    NULL },
+    {"NextMode",       0,  INT_TYPE,     &NextMode,            0,      0,    NULL },
+    {"November",       1,  STR_TYPE,     &DynamicMonthName[10],0,      0,    NULL },
+    {"NumQueued",      0,  INT_TYPE,     &NumQueued,           0,      0,    NULL },
+    {"NumTrig",        0,  INT_TYPE,     &NumTriggered,        0,      0,    NULL },
+    {"October",        1,  STR_TYPE,     &DynamicMonthName[9], 0,      0,    NULL },
+    {"PrefixLineNo",   0,  INT_TYPE,     &DoPrefixLineNo,      0,      0,    NULL },
+    {"PSCal",          0,  INT_TYPE,     &PsCal,               0,      0,    NULL },
+    {"RunOff",         0,  INT_TYPE,     &RunDisabled,         0,      0,    NULL },
+    {"Saturday",       1,  STR_TYPE,     &DynamicDayName[5],   0,      0,    NULL },
+    {"September",      1,  STR_TYPE,     &DynamicMonthName[8], 0,      0,    NULL },
+    {"SimpleCal",      0,  INT_TYPE,     &DoSimpleCalendar,    0,      0,    NULL },
+    {"SortByDate",     0,  INT_TYPE,     &SortByDate,          0,      0,    NULL },
+    {"SortByPrio",     0,  INT_TYPE,     &SortByPrio,          0,      0,    NULL },
+    {"SortByTime",     0,  INT_TYPE,     &SortByTime,          0,      0,    NULL },
+    {"SubsIndent",     1,  INT_TYPE,     &SubsIndent,          0,      132,  NULL },
+    {"Sunday",         1,  STR_TYPE,     &DynamicDayName[6],   0,      0,    NULL },
+    {"T",              0,  SPECIAL_TYPE, trig_date_func,       0,      0,    NULL },
+    {"Td",             0,  SPECIAL_TYPE, trig_day_func,        0,      0,    NULL },
+    {"Thursday",       1,  STR_TYPE,     &DynamicDayName[3],   0,      0,    NULL },
+    {"TimeSep",        1,  SPECIAL_TYPE, time_sep_func,        0,      0,    NULL },
+    {"Tm",             0,  SPECIAL_TYPE, trig_mon_func,        0,      0,    NULL },
+    {"Tuesday",        1,  STR_TYPE,     &DynamicDayName[1],   0,      0,    NULL },
+    {"Tw",             0,  SPECIAL_TYPE, trig_wday_func,       0,      0,    NULL },
+    {"Ty",             0,  SPECIAL_TYPE, trig_year_func,       0,      0,    NULL },
+    {"U",              0,  SPECIAL_TYPE, today_date_func,      0,      0,    NULL },
+    {"Ud",             0,  SPECIAL_TYPE, today_day_func,       0,      0,    NULL },
+    {"Um",             0,  SPECIAL_TYPE, today_mon_func,       0,      0,    NULL },
+    {"UntimedFirst",   0,  INT_TYPE,     &UntimedBeforeTimed,  0,      0,    NULL },
+    {"Uw",             0,  SPECIAL_TYPE, today_wday_func,      0,      0,    NULL },
+    {"Uy",             0,  SPECIAL_TYPE, today_year_func,      0,      0,    NULL },
+    {"Wednesday",      1,  STR_TYPE,     &DynamicDayName[2],   0,      0,    NULL }
 };
 
 #define NUMSYSVARS ( sizeof(SysVarArr) / sizeof(SysVar) )
@@ -635,6 +831,7 @@ static void DumpSysVar (char const *name, const SysVar *v);
 /***************************************************************/
 int SetSysVar(char const *name, Value *value)
 {
+    int r;
     SysVar *v = FindSysVar(name);
     if (!v) return E_NOSUCH_VAR;
     if (v->type != SPECIAL_TYPE &&
@@ -646,8 +843,27 @@ int SetSysVar(char const *name, Value *value)
 
     if (v->type == SPECIAL_TYPE) {
 	SysVarFunc f = (SysVarFunc) v->value;
-	return f(1, value);
-    } else if (v->type == STR_TYPE) {
+	r = f(1, value);
+        DestroyValue(*value);
+        return r;
+    }
+    if (v->validate) {
+        if (v->type == STR_TYPE) {
+            r = (v->validate)((void *) value->v.str);
+        } else {
+            r = (v->validate)((void *) &(value->v.val));
+        }
+        if (r != OK) {
+            return r;
+        }
+    }
+    if (v->type == STR_TYPE) {
+        /* If it's already the same, don't bother doing anything */
+        if (!strcmp(value->v.str, (char const *) v->value)) {
+            DestroyValue(*value);
+            return OK;
+        }
+
         /* If it's a string variable, special measures must be taken */
 	if (v->been_malloced) free(*((char **)(v->value)));
 	v->been_malloced = 1;
@@ -678,7 +894,11 @@ int GetSysVar(char const *name, Value *val)
 	SysVarFunc f = (SysVarFunc) v->value;
 	return f(0, val);
     } else if (v->type == STR_TYPE) {
-	val->v.str = StrDup(*((char **) v->value));
+        if (! * (char **) v->value) {
+            val->v.str = StrDup("");
+        } else {
+            val->v.str = StrDup(*((char **) v->value));
+        }
 	if (!val->v.str) return E_NO_MEM;
     } else {
 	val->v.val = *((int *) v->value);
@@ -688,7 +908,7 @@ int GetSysVar(char const *name, Value *val)
     /* In "verbose" mode, print attempts to test $RunOff */
     if (DebugFlag & DB_PRTLINE) {
 	if (v->value == (void *) &RunDisabled) {
-	    Eprint("(Security note: $RunOff variable tested.)\n");
+	    Eprint("(Security note: $RunOff variable tested.)");
 	    /* Allow further messages from this line */
 	    FreshLine = 1;
 	}
@@ -729,7 +949,7 @@ static SysVar *FindSysVar(char const *name)
 /***************************************************************/
 void DumpSysVarByName(char const *name)
 {
-    int i;
+    size_t i;
     SysVar *v;
 
     if (!name || !*name) {
@@ -757,37 +977,41 @@ static void DumpSysVar(char const *name, const SysVar *v)
     if (!v && !name) return;  /* Shouldn't happen... */
 
     buffer[0]='$'; buffer[1] = 0;
+    if (name && strlen(name) > VAR_NAME_LEN) {
+	fprintf(ErrFp, "$%s: Name too long\n", name);
+	return;
+    }
     if (name) strcat(buffer, name); else strcat(buffer, v->name);
-    fprintf(ErrFp, "%*s  ", VAR_NAME_LEN+1, buffer);
+    fprintf(ErrFp, "%16s  ", buffer);
     if (v) {
 	if (v->type == SPECIAL_TYPE) {
 	    Value val;
 	    SysVarFunc f = (SysVarFunc) v->value;
 	    f(0, &val);
 	    PrintValue(&val, ErrFp);
-	    Putc('\n', ErrFp);
+	    putc('\n', ErrFp);
 	    DestroyValue(val);
 	} else if (v->type == STR_TYPE) {
 	    char const *s = *((char **)v->value);
 	    int y;
-	    Putc('"', ErrFp);
+	    putc('"', ErrFp);
 	    for (y=0; y<MAX_PRT_LEN && *s; y++) {
 		if (*s == '"') {
 		    fprintf(ErrFp, "\" + char(34) + \"");
 		    s++;
 		} else {
-		    Putc(*s++, ErrFp);
+		    putc(*s++, ErrFp);
 		}
 	    }
-	    Putc('"', ErrFp);
+	    putc('"', ErrFp);
 	    if (*s) fprintf(ErrFp, "...");
-	    Putc('\n', ErrFp);
+	    putc('\n', ErrFp);
 	} else if (v->type == DATE_TYPE) {
 	    Value val;
 	    val.type = DATE_TYPE;
 	    val.v.val = * (int *) v->value;
 	    PrintValue(&val, ErrFp);
-	    Putc('\n', ErrFp);
+	    putc('\n', ErrFp);
 	} else {
 	    if (!v->modifiable) fprintf(ErrFp, "%d\n", *((int *)v->value));
 	    else {
@@ -802,3 +1026,48 @@ static void DumpSysVar(char const *name, const SysVar *v)
 
     return;
 }
+
+void
+set_lat_and_long_from_components(void)
+{
+    Latitude = (double) LatDeg + ((double) LatMin) / 60.0 + ((double) LatSec) / 3600.0;
+    Longitude = - ( (double) LongDeg + ((double) LongMin) / 60.0 + ((double) LongSec) / 3600.0);
+}
+
+void
+set_components_from_lat_and_long(void)
+{
+    double x;
+
+    x = (Latitude < 0.0 ? -Latitude : Latitude);
+    LatDeg = (int) x;
+    x -= (double) LatDeg;
+    x *= 60;
+    LatMin = (int) x;
+    x -= (double) LatMin;
+    x *= 60;
+    LatSec = (int) x;
+    if (Latitude < 0.0) {
+        LatDeg = -LatDeg;
+        LatMin = -LatMin;
+        LatSec = -LatSec;
+    }
+
+    x = (Longitude < 0.0 ? -Longitude : Longitude);
+    LongDeg = (int) x;
+    x -= (double) LongDeg;
+    x *= 60;
+    LongMin = (int) x;
+    x -= (double) LongMin;
+    x *= 60;
+    LongSec = (int) x;
+
+    /* Use STANDARD sign for $Longitude even if $LongDeg, $LongMin and
+     * $LongSec are messed up */
+    if (Longitude > 0.0) {
+        LongDeg = -LongDeg;
+        LongMin = -LongMin;
+        LongSec = -LongSec;
+    }
+}
+

tests/include_dir/02.rem

@@ -1 +1,3 @@
 REM 15 MSG 02
+DO subdir/04.rem
+INCLUDE subdir/04.rem

tests/include_dir/subdir/04.rem

@@ -0,0 +1 @@
+REM 16 MSG Should be included by 02.rem

tests/scripts.rem

@@ -0,0 +1,70 @@
+# This is a test file that tests the
+# rendering of various Unicode characters.
+# It also tests some of the features of
+# the Pango/Cairo-based rem2pdf program.
+
+SET $Sunday "እሁድ"
+SET $Monday "一"
+SET $Tuesday "mardi"
+SET $Wednesday "水曜日"
+SET $Thursday "четвер"
+SET $Friday "piątek"
+SET $Saturday "יום שבת"
+
+SET $January "January"
+SET $February "février"
+SET $March "März"
+SET $April "אַפּרִיל"
+SET $May "ግንቦት"
+SET $June "Чэрвень"
+SET $July "تموز"
+SET $August "Наймдугаар сар"
+SET $September "Вересень"
+SET $October "październik"
+SET $November "נאוועמבער"
+SET $December "दिसंबर"
+
+REM 1 MSG Përkujtues
+REM 2 SPECIAL SHADE 192 192 255
+REM 2 MSG تذكير
+REM 3 MSG 提醒
+REM 4 MSG રીમાઇન્ડર
+REM 5 MSG Emlékeztető
+REM 6 MSG Áminning
+REM 7 SPECIAL PANGO <u>תִזכּוֹרֶת</u>
+REM 8 MSG अनुस्मारक
+REM 9 SPECIAL COLOR 0 0 192 Эскертүү
+REM 10 SPECIAL COLOR 0 192 0 Напоминание
+REM 11 SPECIAL COLOR 192 0 0 Υπενθύμιση
+REM 12 SPECIAL PANGO <b>Bold</b> <small>and</small> <i>Italic</i> <big>and</big> <span bgcolor="#C0C0C0" foreground="red"><u>underline</u></span>
+REM 12 MSG Hello
+REM 28 SPECIAL PANGO <span face="zapf chancery" size="10000">Very Fancy</span>
+
+REM 13 SPECIAL PANGO <bad>Invalid
+REM 13 MSG Hello Again
+
+REM 15 SPECIAL PANGO @1,-1 <small><small>[hebday($U)] [hebmon($U)]  Rise [sunrise($U)] Set [sunset($U)]</small></small>
+
+REM 16 MSG یادآور
+REM 17 MSG Lời nhắc nhở
+REM 18 MSG Påminnelse
+REM 19 MSG דערמאָנונג
+REM 20 MSG Hatırlatma
+REM 21 SPECIAL PANGO <big><big> Нагадування</big></big>
+REM 22 MSG შეხსენება
+REM 23 MSG เตือนความจำ
+REM 24 MSG リマインダー
+REM 25 MSG Искә төшерү
+REM 26 MSG Напомняне
+REM 27 MSG ഓർമ്മപ്പെടുത്തൽ
+REM 1 SPECIAL SHADE 192 255 192
+REM 14 SPECIAL SHADE 255 192 192
+REM 14 SPECIAL PANGO <span face="Zapf Chancery" size="15000">This is so <span foreground="blue">fancy</span></span>
+REM [moondate(0)] SPECIAL MOON 0
+REM [moondate(1)] SPECIAL MOON 1
+REM [moondate(2)] SPECIAL MOON 2 -1 -1 [moontime(2)]
+REM [moondate(3)] SPECIAL MOON 3 -1 -1 [moontime(3)]
+
+REM Mon SPECIAL WEEK (W[weekno(today())])
+
+REM SATISFY [$Td != 15] SPECIAL PANGO @1,-1 <span size="4800"><i>Rise [sunrise($U)] Set [sunset($U)]</i></span>

tests/shade.rem

@@ -28,3 +28,5 @@ REM Fri SPECIAL SHADE 255 204 204
 REM Sat SPECIAL SHADE 204 255 204
 REM Sun SPECIAL SHADE 204 204 255
 
+# This should be ignored by rem2ps
+REM SPECIAL HTML <b>FOO</b>

tests/test-addomit.rem

@@ -0,0 +1,2 @@
+REM Mon 1 Sep SCANFROM -7 ADDOMIT MSG Labour Day
+REM 6 Sep 2021 AFTER MSG Should be bumped to Tuesday

tests/test-for-backends.rem

@@ -0,0 +1,27 @@
+# This file is designed for testing how back-ends
+# handle SPECIALs, including SPECIALS they don't understand
+# If you're writing a back-end, test it by feeding it the output
+# of:   remind -pp test-for-backends.rem
+
+# Color and shade
+REM 1 SPECIAL COLOR 128 0 0 Red
+REM 2 SPECIAL COLOUR 0 128 0 British Green
+REM 3 SPECIAL SHADE 192 192 255
+
+# Moon
+REM [moondate(0)] SPECIAL MOON 0 -1 -1 [moontime(0)]
+REM [moondate(1)] SPECIAL MOON 1 -1 -1 [moontime(1)]
+REM [moondate(2)] SPECIAL MOON 2 -1 -1 [moontime(2)]
+REM [moondate(3)] SPECIAL MOON 3 -1 -1 [moontime(3)]
+
+# Week
+REM Monday SPECIAL WEEK (W[weekno()])
+
+# PostScript
+REM Wed PS Border Border 2 div moveto /Helvetica-Oblique findfont 6 scalefont setfont (oof!) show
+
+# A SPECIAL that should be ignored
+REM 15 SPECIAL RANDOM-STUFF ignore me and be happy
+
+# A normal reminder
+REM 16 MSG A normal reminder

tests/test-rem

@@ -7,14 +7,22 @@
 # in the build directory.
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 David F. Skoll        
-# Copyright (C) 1999-2000 Roaring Penguin Software Inc.
+# Copyright (C) 1992-2021 Dianne Skoll
 # ---------------------------------------------------------------------------
 
 DIR=`dirname $0`
 cd $DIR
 if test $? != 0 ; then
+    echo ""
     echo "Unable to cd $DIR" >&2
+    echo ""
+    exit 1
+fi
+
+if test `id -u` = 0 ; then
+    echo ""
+    echo "*** Please do not run the test suite as root; it will fail."
+    echo ""
     exit 1
 fi
 
@@ -57,6 +65,14 @@ echo "" >> ../tests/test.out
 
 chmod 644 include_dir/04cantread.rem
 
+# Feb 29 bug
+echo "Feb 29 Bug Test" >> ../tests/test.out
+echo 'REM Sun 29 Feb MSG [$T]' | ../src/remind -dt - 1 feb 2021 >> ../tests/test.out 2>&1
+
+# Day Weekday Year out-of-year bug
+echo "Mon 31 Dec Bug Test" >> ../tests/test.out
+echo 'REM Mon 31 2021 MSG [$T]' | ../src/remind -dt - 31 dec 2021 >> ../tests/test.out 2>&1
+
 echo "Color Test" >> ../tests/test.out
 ../src/remind -ccl ../tests/colors.rem 1 aug 2007 >> ../tests/test.out 2>&1
 
@@ -80,6 +96,7 @@ rm -f ../tests/purge_dir/*.rem.purged >> ../tests/test.out 2>&1
 ../src/remind ../tests/runtest.rem >> ../tests/test.out 2>&1
 
 ../src/remind -p ../tests/shade.rem 1 August 2009 | ../src/rem2ps -e -l -c3 >> ../tests/test.out 2>&1
+../src/remind -pp ../tests/shade.rem 1 August 2009 | ../src/rem2ps -e -l -c3 >> ../tests/test.out 2>&1
 
 # The sun tests can fail due to math roundoff error changing the times
 # by a minute...
@@ -100,6 +117,215 @@ REM 1 Jan 2012 AT 10:00 MSG 10am: Should show up
 MSG [$DontTrigAts]
 EOF
 
+# An OMITFUNC should indicate nonconst_expr
+../src/remind -pp - 1 jan 2012 9:00 <<'EOF' >> ../tests/test.out 2>&1
+REM Mon OMITFUNC foo MSG bar
+EOF
+
+# Test default color
+../src/remind -ppp - 1 Jan 2012 9:00 <<'EOF' >> ../tests/test.out 2>&1
+REM 2 MSG Normal
+SET $DefaultColor "255 0 0"
+REM 3 MSG Red
+SET $DefaultColor "-1 -1 -1"
+REM 4 MSG Normal
+# Should give an error
+SET $DefaultColor "256 0 0"
+EOF
+
+# Test -@ option
+../src/remind -w,0,0 -@0 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@0
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@0,0 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@0,0
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@0,1 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@0,1
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@1 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@1
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@1,0 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@1,0
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@1,1 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@1,1
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@2 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@2
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@2,0 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@2,0
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+../src/remind -w,0,0 -@2,1 -c - 1 Jan 2020 <<'EOF' >> ../tests/test.out 2>&1
+rem 1 SPECIAL COLOR 0   0   0 BLACK
+rem 2 SPECIAL COLOR 0   0  65 BLUE
+rem 3 SPECIAL COLOR 0  65   0 GREEN
+rem 4 SPECIAL COLOR 0  65  65 CYAN
+rem 5 msg -@2,1
+rem 15 SPECIAL COLOR 65  0   0 RED
+rem 16 SPECIAL COLOR 65  0  65 MAGENTA
+rem 17 SPECIAL COLOR 65 65   0 YELLOW
+rem 18 SPECIAL COLOR 65 65  65 WHITE
+rem 8 SPECIAL COLOR 0   0   0 BLACK
+rem 9 SPECIAL COLOR 0   0  200 BRIGHT BLUE
+rem 10 SPECIAL COLOR 0  200   0 BRIGHT GREEN
+rem 11 SPECIAL COLOR 0  200  200 BRIGHT CYAN
+rem 22 SPECIAL COLOR 200  0   0 BRIGHT RED
+rem 23 SPECIAL COLOR 200  0  200 BRIGHT MAGENTA
+rem 24 SPECIAL COLOR 200 200   0 BRIGHT YELLOW
+rem 25 SPECIAL COLOR 200 200  200 BRIGHT WHITE
+EOF
+
+# If we're already in a utf-8 locale, do
+# nothing; otherwise, set LC_ALL
+OK=0
+if echo $LC_ALL | grep -i utf-8 > /dev/null 2>&1 ; then
+    OK=1
+fi
+
+if test -z "$LC_ALL" ; then
+    if echo $LANG | grep -i utf-8 > /dev/null 2>&1 ; then
+        export LC_ALL="$LANG"
+        OK=1
+    fi
+fi
+
+if test "$OK" = 0 ; then
+    export LC_ALL=en_US.utf-8
+fi
+
+../src/remind -w128 -c ../tests/utf-8.rem 1 Nov 2019 >> ../tests/test.out
+../src/remind -c ../tests/test-addomit.rem 1 Sep 2021 >> ../tests/test.out
 
 cmp -s ../tests/test.out ../tests/test.cmp
 if [ "$?" = "0" ]; then

tests/test.rem

@@ -5,13 +5,50 @@
 #
 # 	./test-rem  # From WITHIN Remind source directory!
 
+# Should issue a warning
+fset year(x) 1
+
 # Don't evaluate SATISFY expressions if reminder has expired
 
 REM Wed UNTIL 15 Feb 1991 SATISFY [trigdate() > '1990-01-01'] MSG wookie
 
+# bad AT
+REM AT 0:00 0:01 0:02 MSG foo
+
+# Includecmd
+INCLUDECMD echo REM 16 Feb 1991 MSG Blork
+INCLUDECMD echo REM 18 Feb 1991 MSG Blork
+
+# Includecmd with continuation line
+INCLUDECMD echo REM 18 Feb 1991 MSG This line is \
+continued so there
+
+# This should work
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+
+# This should fail
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
 REM MSG Today is [hebday(today())] [hebmon(today())] [hebyear(today())]
 fset _h(x, y) trigger(hebdate(x,y))
 
+# Test case from Remind mailing list
+set mltest "a b"
+INCLUDECMD printf 'REM %s\n' [mltest]
+
+# Disabling RUN in an !includecmd
+INCLUDECMD !echo MSG foo
+INCLUDECMD !echo MSG foo
+INCLUDECMD !echo INCLUDECMD echo MSG foo
+INCLUDECMD !echo INCLUDECMD echo MSG foo
+INCLUDECMD !echo MSG foo
+INCLUDECMD !echo MSG foo
+
+# INCLUDECMD with RUN disabled
+RUN OFF
+INCLUDECMD echo MSG foo
+RUN ON
+INCLUDECMD echo MSG foo
+
 [_h(1,  "Tishrey")] MSG Rosh Hashana 1
 [_h(2,  "Tishrey")] MSG Rosh Hashana 2
 [_h(3,  "Tishrey")] MSG Tzom Gedalia
@@ -166,6 +203,10 @@ REM Fri SCANFROM [trigger(today()-7)] SATISFY 1
 OMIT [trigger(trigdate())]
 REM Fri after MSG 16 Feb 1991
 CLEAR-OMIT-CONTEXT
+REM Fri SCANFROM -7 SATISFY 1
+OMIT [trigger(trigdate())]
+REM Fri after MSG 16 Feb 1991
+CLEAR-OMIT-CONTEXT
 
 # Test omitfunc
 fset _ofunc(x) (day(x) < 7 || day(x) % 2)
@@ -185,6 +226,36 @@ REM 1991/02/28@14:45 MSG Feb 28
 REM Wed UNTIL 1991-01-01 MSG Expired
 REM Wed SCANFROM 1991-02-26 MSG SCANFROM
 
+CLEAR-OMIT-CONTEXT
+# Test ADDOMIT
+
+REM Mon 15 Feb ADDOMIT MSG Family Day
+REM Feb 18 AFTER MSG Should trigger on Feb 19
+OMIT DUMP
+
+set $CalcUTC 0
+set $DateTimeSep "@"
+set $DefaultColor "-1 -1 -1"
+set $DefaultPrio 5000
+set $EndSent  ".?!"
+set $EndSentIg  "" + char(34) + "')]}>"
+set $FirstIndent 0
+set $FoldYear 0
+set $FormWidth 72
+set $Location "Ottawa"
+set $MaxSatIter 150
+set $MaxStringLen 65535
+set $MinsFromUTC -300
+set $SubsIndent 0
+set $TimeSep ":"
+
+set $LatDeg 30
+set $LatMin 30
+set $LatSec 0
+set $LongDeg -25
+set $LongMin 15
+set $LongSec 0
+
 set a000 abs(1)
 set a001 abs(-1)
 set a002 asc("foo")
@@ -303,9 +374,351 @@ set a082 slide('1991-03-01', 7, "Sat", "Sun")
 set a083 slide('1991-04-01', -7, "Sat")
 set a084 nonomitted('1991-03-01', '1991-03-13', "Sat", "Sun")
 set a085 nonomitted('1991-03-24', '1991-04-01', "Sat")
+REM 2010-09-03 +3 -4 UNTIL 2012-01-01 PRIORITY 7 *14 MSG foo
+set a086 trigback()
+set a087 trigdelta()
+set a088 trigrep()
+set a089 triguntil()
+set a090 trigscanfrom()
+set a091 trigfrom()
+set a092 trigpriority()
+set a093 trigtimedelta()
+set a094 trigtimerep()
+set a095 trigduration()
+
+REM Mon Wed FROM 2010-09-03 ++3 --4 MSG foo
+set a096 trigback()
+set a097 trigdelta()
+set a098 trigrep()
+set a099 triguntil()
+set a100 trigscanfrom()
+set a101 trigfrom()
+set a102 trigpriority()
+set a103 trigtimedelta()
+set a104 trigtimerep()
+set a105 trigduration()
+
+REM 2010-09-03 +3 -4 UNTIL 2012-01-01 PRIORITY 7 *14 AT 14:41 +15 *2 DURATION 213 MSG foo
+set a106 trigback()
+set a107 trigdelta()
+set a108 trigrep()
+set a109 triguntil()
+set a110 trigscanfrom()
+set a111 trigfrom()
+set a112 trigpriority()
+set a113 trigtimedelta()
+set a114 trigtimerep()
+set a115 trigduration()
+
+REM Mon Wed FROM 2010-09-03 ++3 --4 AT 14:44 MSG foo
+set a116 trigback()
+set a117 trigdelta()
+set a118 trigrep()
+set a119 triguntil()
+set a120 trigscanfrom()
+set a121 trigfrom()
+set a122 trigpriority()
+set a123 trigtimedelta()
+set a124 trigtimerep()
+set a125 trigduration()
+
+# Test adding TIME+TIME and DATETIME+TIME
+set a126 11:00 + 3:00
+set a127 23:00 + 5:30
+set a128 '2018-02-03@10:00' + 6:45
+set a129 23:30 + '2019-02-02@16:44'
+
+# Multi-day reminder
+REM 13 AT 16:00 DURATION 72:00 MSG 72-hour event
+set a130 trigdate()
+set a131 trigtime()
+set a132 trigdatetime()
+set a133 trigduration()
+set a134 trigeventstart()
+set a135 trigeventduration()
+
+# These will issue errors
+REM Mon OMIT Mon SKIP MSG Never ever ever...
+REM Mon SATISFY [wkdaynum($T) == 3] MSG Nope nope...
+
+# These will just silently not trigger
+REM MAYBE-UNCOMPUTABLE Mon OMIT Mon SKIP MSG Never ever ever...
+REM MAYBE-UNCOMPUTABLE Mon SATISFY [wkdaynum($T) == 3] MSG Nope nope...
+
 dump
+dump $
+msg [$April]%
+msg [$August]%
+msg [$CalcUTC]%
+msg [$CalMode]%
+msg [$Daemon]%
+msg [$DateSep]%
+msg [$DateTimeSep]%
+msg [$December]%
+msg [$DefaultColor]%
+msg [$DefaultPrio]%
+msg [$DefaultTDelta]%
+msg [$DeltaOffset]%
+msg [$DontFork]%
+msg [$DontQueue]%
+msg [$DontTrigAts]%
+msg [$EndSent]%
+msg [$EndSentIg]%
+msg [$February]%
+msg [$FirstIndent]%
+msg [$FoldYear]%
+msg [$FormWidth]%
+msg [$Friday]%
+msg [$HushMode]%
+msg [$IgnoreOnce]%
+msg [$InfDelta]%
+msg [$IntMax]%
+msg [$IntMin]%
+msg [$January]%
+msg [$July]%
+msg [$June]%
+msg [$LatDeg]%
+msg [$Latitude]%
+msg [$LatMin]%
+msg [$LatSec]%
+msg [$Location]%
+msg [$LongDeg]%
+msg [$Longitude]%
+msg [$LongMin]%
+msg [$LongSec]%
+msg [$March]%
+msg [$MaxSatIter]%
+msg [$MaxStringLen]%
+msg [$May]%
+msg [$MinsFromUTC]%
+msg [$Monday]%
+msg [$NextMode]%
+msg [$November]%
+msg [$NumQueued]%
+msg [$NumTrig]%
+msg [$October]%
+msg [$PrefixLineNo]%
+msg [$PSCal]%
+msg [$RunOff]%
+msg [$Saturday]%
+msg [$September]%
+msg [$SimpleCal]%
+msg [$SortByDate]%
+msg [$SortByPrio]%
+msg [$SortByTime]%
+msg [$SubsIndent]%
+msg [$Sunday]%
+msg [$T]%
+msg [$Td]%
+msg [$Thursday]%
+msg [$TimeSep]%
+msg [$Tm]%
+msg [$Tuesday]%
+msg [$Tw]%
+msg [$Ty]%
+msg [$U]%
+msg [$Ud]%
+msg [$Um]%
+msg [$UntimedFirst]%
+msg [$Uw]%
+msg [$Uy]%
+msg [$Wednesday]%
+
+dump $aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 OMIT 2010-09-03 THROUGH 2010-09-15
 OMIT December 25 MSG X
 # Next should give a parse error
 OMIT 26 Dec 2010 THROUGH 27 Dec 2010 MSG This is not legal
 OMIT DUMP
+# Regression test for bugfix in Hebrew calendar Adar jahrzeit
+[_i(14, "Adar", today(), 5761)] MSG Purim
+
+# Regression test for bug found by Larry Hynes
+REM SATISFY [day(trigdate()-25) == 14] MSG Foo
+
+# Check combo of SATISFY and long-duration events
+REM 14 SATISFY [$Tw == 4] MSG Thursday, the 14th
+REM 14 AT 16:00 DURATION 8:00 SATISFY [$Tw == 4] MSG Thursday, the 14th
+REM 14 AT 16:00 DURATION 8:01 SATISFY [$Tw == 4] MSG Thursday, the 14th
+REM 14 AT 16:00 DURATION 32:00 SATISFY [$Tw == 4] MSG Thursday, the 14th
+REM 14 AT 16:00 DURATION 32:01 SATISFY [$Tw == 4] MSG Thursday, the 14th
+REM 14 AT 16:00 DURATION 40:00 SATISFY [$Tw == 4] MSG Thursday, the 14th
+
+# This is now an error
+REM DURATION 15:00 MSG Should fail... need AT if you have DURATION.
+
+# Parsing of AM/PM times
+REM AT 0:00am MSG foo 0a
+REM AT 1:00AM MSG foo 1a
+REM AT 2:00am MSG foo 2a
+REM AT 3:00AM MSG foo 3a
+REM AT 4:00am MSG foo 4a
+REM AT 5:00AM MSG foo 5a
+REM AT 6:00am MSG foo 6a
+REM AT 7:00AM MSG foo 7a
+REM AT 8:00am MSG foo 8a
+REM AT 9:00AM MSG foo 9a
+REM AT 10:00am MSG foo 10a
+REM AT 11:00AM MSG foo 11a
+REM AT 12:00am MSG foo 12a
+REM AT 13:00AM MSG foo 13a
+REM AT 0:00pm MSG foo 0p
+REM AT 1:00PM MSG foo 1p
+REM AT 2:00pm MSG foo 2p
+REM AT 3:00PM MSG foo 3p
+REM AT 4:00pm MSG foo 4p
+REM AT 5:00PM MSG foo 5p
+REM AT 6:00pm MSG foo 6p
+REM AT 7:00PM MSG foo 7p
+REM AT 8:00pm MSG foo 8p
+REM AT 9:00PM MSG foo 9p
+REM AT 10:00pm MSG foo 10p
+REM AT 11:00PM MSG foo 11p
+REM AT 12:00pm MSG foo 12p
+REM AT 13:00PM MSG foo 13p
+
+DEBUG +x
+SET x 0:00am + 0
+SET x 1:00AM + 0
+SET x 2:00am + 0
+SET x 3:00AM + 0
+SET x 4:00am + 0
+SET x 5:00AM + 0
+SET x 6:00am + 0
+SET x 7:00AM + 0
+SET x 8:00am + 0
+SET x 9:00AM + 0
+SET x 10:00am + 0
+SET x 11:00AM + 0
+SET x 12:00am + 0
+SET x 13:00AM + 0
+
+SET x 0:00pm + 0
+SET x 1:00PM + 0
+SET x 2:00pm + 0
+SET x 3:00PM + 0
+SET x 4:00pm + 0
+SET x 5:00PM + 0
+SET x 6:00pm + 0
+SET x 7:00PM + 0
+SET x 8:00pm + 0
+SET x 9:00PM + 0
+SET x 10:00pm + 0
+SET x 11:00PM + 0
+SET x 12:00pm + 0
+SET x 13:00PM + 0
+
+SET x '2015-02-03@0:00am' + 0
+SET x '2015-02-03@1:00AM' + 0
+SET x '2015-02-03@2:00am' + 0
+SET x '2015-02-03@3:00AM' + 0
+SET x '2015-02-03@4:00am' + 0
+SET x '2015-02-03@5:00AM' + 0
+SET x '2015-02-03@6:00am' + 0
+SET x '2015-02-03@7:00AM' + 0
+SET x '2015-02-03@8:00am' + 0
+SET x '2015-02-03@9:00AM' + 0
+SET x '2015-02-03@10:00am' + 0
+SET x '2015-02-03@11:00AM' + 0
+SET x '2015-02-03@12:00am' + 0
+SET x '2015-02-03@13:00AM' + 0
+
+SET x '2015-02-03@0:00pm' + 0
+SET x '2015-02-03@1:00PM' + 0
+SET x '2015-02-03@2:00pm' + 0
+SET x '2015-02-03@3:00PM' + 0
+SET x '2015-02-03@4:00pm' + 0
+SET x '2015-02-03@5:00PM' + 0
+SET x '2015-02-03@6:00pm' + 0
+SET x '2015-02-03@7:00PM' + 0
+SET x '2015-02-03@8:00pm' + 0
+SET x '2015-02-03@9:00PM' + 0
+SET x '2015-02-03@10:00pm' + 0
+SET x '2015-02-03@11:00PM' + 0
+SET x '2015-02-03@12:00pm' + 0
+SET x '2015-02-03@13:00PM' + 0
+
+# Test the ampm function
+set x ampm(0:12) + ""
+set x ampm(1:12) + ""
+set x ampm(2:12) + ""
+set x ampm(3:12) + ""
+set x ampm(4:12) + ""
+set x ampm(5:12) + ""
+set x ampm(6:12) + ""
+set x ampm(7:12) + ""
+set x ampm(8:12) + ""
+set x ampm(9:12) + ""
+set x ampm(10:12) + ""
+set x ampm(11:12) + ""
+set x ampm(12:12) + ""
+set x ampm(13:12) + ""
+set x ampm(14:12) + ""
+set x ampm(15:12) + ""
+set x ampm(16:12) + ""
+set x ampm(17:12) + ""
+set x ampm(18:12) + ""
+set x ampm(19:12) + ""
+set x ampm(20:12) + ""
+set x ampm(21:12) + ""
+set x ampm(22:12) + ""
+set x ampm(23:12) + ""
+
+# Coerce with am/pm
+set x coerce("TIME", "12:45am")
+set x coerce("TIME", "12:45")
+set x coerce("TIME", "1:45pm")
+set x coerce("DATETIME", "2020-05-05@12:45am")
+set x coerce("DATETIME", "2020-05-05@12:45")
+set x coerce("DATETIME", "2020-05-05@1:45pm")
+
+# Overflow - these tests only work on machines with 32-bit
+# twos-complement signed integers.  You may get test failures on
+# machines with different architectures.
+set a $IntMin - 1
+set a $IntMin - $IntMax
+set a $IntMax - $IntMin
+set a $IntMax - (-1)
+set a $IntMax + 1
+set a $IntMax + $IntMax
+set a $IntMin + (-1)
+set a $IntMin + $IntMin
+set a $IntMax * 2
+set a $IntMax * $IntMax
+set a $IntMax * $IntMin
+set a $IntMin * 2
+set a $IntMin * $IntMin
+set a $IntMin * $IntMax
+set a $IntMin / (-1)
+set a $IntMin * (-1)
+set a (-1) * $IntMin
+set a abs($IntMin)
+
+# The "isany" function
+set a isany(1)
+set a isany("foo")
+set a isany(1:00)
+set a isany(1, 2)
+set a isany("foo", 2)
+set a isany(1:00, 2)
+set a isany(1, 2, 1, 3)
+set a isany("foo", 2, 3, "foo")
+set a isany(1:00, 2, "foo", 2:00, 1:00, 9:00)
+
+# Shellescape
+set a shellescape(" !\"#$%%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~")
+
+msg [a]
+
+# Deprecated functions
+set x psshade(50)
+set x psmoon(0)
+
+# Don't want Remind to queue reminders
+EXIT
+
+__EOF__
+REM This line should not even be seen
+And you can put whatever you like here.
+[+f=asdfasdasde3ir0a]
+

tests/tstlang.rem

@@ -11,8 +11,7 @@
 # Use the output to verify your translations.
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 David F. Skoll        
-# Copyright (C) 1999-2000 Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 Dianne Skoll
 #
 # ---------------------------------------------------------------------------
 

tests/utf-8.rem

@@ -0,0 +1,4 @@
+MSG ру́сский ру́сский ру́сский ру́сский ру́сский ру́сский ру́сский ру́сский
+MSG עִבְרִית עִבְרִית עִבְרִית עִבְרִית עִבְרִית עִבְרִית עִבְרִית עִבְרִית עִבְרִית
+
+Wed MSG		With	tabs		and   spaces

unconfigure

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 echo "Unconfiguring Remind..."
-echo rm -f config.cache config.log config.status src/Makefile src/config.h src/version.h www/Makefile
-rm -f config.cache config.log config.status src/Makefile src/config.h src/version.h www/Makefile
+echo rm -f config.cache config.log config.status src/Makefile src/config.h src/version.h www/Makefile rem2html/Makefile
+rm -f config.cache config.log config.status src/Makefile src/config.h src/version.h www/Makefile rem2html/Makefile
 exit 0

www/Makefile.in

@@ -1,11 +1,10 @@
 # Makefile.in for installing WWW server calendar scripts
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by David F. Skoll
-# Copyright (C) 1999-2007 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 by Dianne Skoll
 
 # The complete path to where the scripts actually live, as seen by
 # the UNIX operating system.
-SCRIPTDIR = /var/www/cgi-bin
+SCRIPTDIR = /usr/lib/cgi-bin
 
 # Where the scripts live as seen by the web browser.
 CGIDIR = /cgi-bin
@@ -18,7 +17,7 @@ HTMLDIR = /var/www/remind
 # Where you stick images and CSS files, as seen by UNIX
 IMAGEDIR = /var/www/remind/resources
 
-# Where images are, as seen by web browers
+# Where images and CSS fiels are, as seen by web browers
 IMAGEBASE = /remind/resources
 
 # Set by configure - don't touch.
@@ -33,7 +32,7 @@ datarootdir=@datarootdir@
 # Where do Remind and Rem2PS executables live?
 REMIND = $(bindir)/remind
 REM2PS = $(bindir)/rem2ps
-
+REM2HTML = $(bindir)/rem2html
 # If your Web server requires CGI programs to have a .cgi suffix, use
 # the next line.  Otherwise, comment it out
 CGISUFFIX=.cgi
@@ -47,14 +46,8 @@ SEDSCRIPT = -e 's@%CGIDIR%@$(CGIDIR)@g' \
 	    -e 's@%REMIND%@$(REMIND)@g' \
 	    -e 's@%IMAGEBASE%@$(IMAGEBASE)@g' \
 	    -e 's@%REM2PS%@$(REM2PS)@g' \
+	    -e 's@%REM2HTML%@$(REM2HTML)@g' \
 	    -e 's@cal_dispatch@cal_dispatch$(CGISUFFIX)@g' \
-	    -e 's@rem2html@rem2html$(CGISUFFIX)@g'
-
-SEDSCRIPT2 = -e 's@%CGIDIR%@$(CGIDIR)@g' \
-	     -e 's@%SCRIPTDIR%@$(SCRIPTDIR)@g' \
-	     -e 's@%REMIND%@$(REMIND)@g' \
-	     -e 's@%IMAGEBASE%@$(IMAGEBASE)@g' \
-	     -e 's@%REM2PS%@$(REM2PS)@g'
 
 all:
 	@echo "Edit the Makefile; then type 'make install' to install"
@@ -70,29 +63,24 @@ install:
 	sed $(SEDSCRIPT)  < moon.rem-DIST      > $(DESTDIR)$(SCRIPTDIR)/moon.rem
 	sed $(SEDSCRIPT)  < sunrise.rem-DIST   > $(DESTDIR)$(SCRIPTDIR)/sunrise.rem
 	sed $(SEDSCRIPT)  < sunset.rem-DIST    > $(DESTDIR)$(SCRIPTDIR)/sunset.rem
+	cp blank.rem $(DESTDIR)$(SCRIPTDIR)/blank.rem
 	sed $(SEDSCRIPT)  < calendar.html-DIST > $(DESTDIR)$(HTMLDIR)/calendar.html
 	sed $(SEDSCRIPT)  < hebhtml  > $(DESTDIR)$(SCRIPTDIR)/hebhtml
-	sed $(SEDSCRIPT2) < rem2html > $(DESTDIR)$(SCRIPTDIR)/rem2html$(CGISUFFIX)
 	chmod 644 $(DESTDIR)$(SCRIPTDIR)/sunrise.rem
 	chmod 644 $(DESTDIR)$(SCRIPTDIR)/moon.rem
 	chmod 644 $(DESTDIR)$(SCRIPTDIR)/hebdate.rem
 	chmod 644 $(DESTDIR)$(SCRIPTDIR)/sunset.rem
+	chmod 644 $(DESTDIR)$(SCRIPTDIR)/blank.rem
 	chmod 644 $(DESTDIR)$(HTMLDIR)/calendar.html
 	chmod 755 $(DESTDIR)$(SCRIPTDIR)/cal_dispatch$(CGISUFFIX)
-	chmod 755 $(DESTDIR)$(SCRIPTDIR)/rem2html$(CGISUFFIX)
 	chmod 755 $(DESTDIR)$(SCRIPTDIR)/calps $(DESTDIR)$(SCRIPTDIR)/hebdate \
 	$(DESTDIR)$(SCRIPTDIR)/hebps $(DESTDIR)$(SCRIPTDIR)/moon \
 	$(DESTDIR)$(SCRIPTDIR)/sunrise $(DESTDIR)$(SCRIPTDIR)/sunset \
         $(DESTDIR)$(SCRIPTDIR)/hebhtml \
-        $(DESTDIR)$(SCRIPTDIR)/rem2html$(CGISUFFIX)
 
 	-mkdir -p $(DESTDIR)$(IMAGEDIR)
-	cp firstquarter.png fullmoon.png lastquarter.png newmoon.png rem-default.css $(DESTDIR)$(IMAGEDIR)
-	chmod 644 $(DESTDIR)$(IMAGEDIR)/firstquarter.png \
-        $(DESTDIR)$(IMAGEDIR)/fullmoon.png \
-        $(DESTDIR)$(IMAGEDIR)/lastquarter.png \
-        $(DESTDIR)$(IMAGEDIR)/newmoon.png \
-	$(DESTDIR)$(IMAGEDIR)/rem-default.css
+	cp rem-default.css *.png $(DESTDIR)$(IMAGEDIR)
+	chmod 644 $(DESTDIR)$(IMAGEDIR)/rem-default.css $(DESTDIR)$(IMAGEDIR)/*.png
 
 
 

www/README

@@ -9,7 +9,7 @@ only tested it with Linux running NCSA's httpd and Apache's httpd, but
 it should work on any UNIX web server.
 
 To install it, you need the Remind package, available via ftp from
-ftp://ftp.doe.carleton.ca/pub/remind-3.0.  You should install Remind,
+https://dianne.skoll.ca/projects/remind/  You should install Remind,
 setting the lattitude, longitude, location and time zone as appropriate
 for your machine.
 
@@ -19,9 +19,7 @@ server:
 1) Edit the Makefile in this directory.  See the comments in the Makefile
    for details.
 
-2) Edit the first line of "rem2html" to reflect the location of
-   Perl on your system. (Oh yeah, you need Perl for the
-   HTML Hebrew calendar...)
+2) Make sure "rem2html" is installed.
 
 3) Type "make install"
 
@@ -38,12 +36,8 @@ where "what" is one of:
 	hebps   -- get a PostScript calendar with Jewish holidays.
 	hebhtml -- get an HTML version of the above (requires Perl.)
 
-   (Visit http://www.doe.carleton.ca/~dfs/ for previews.)
-
    All of these links will be set up in a sample HTML document
    called "calendar.html" and installed in the HTMLDIR you specified
    in the Makefile.
 
 4) Enjoy!
-
-