Update release notes.

Remove obsolete line.
Use git-archive to create tarball.
2026-04-16 14:28:40 +02:00 · 2019-11-15 11:14:23 -05:00 · 2019-11-15 11:08:04 -05:00 · 2019-11-15 11:06:19 -05:00 · 2019-11-15 10:57:01 -05:00 · 2019-11-15 10:56:40 -05:00
84 changed files with 726 additions and 536 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+.gitignore		export-ignore
+.gitattributes		export-ignore
+remind.php		export-ignore
+sync-to-dianne-git	export-ignore
--- a/10
+++ b/10
@@ -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-2018 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
 --
-Dianne Skoll <dfs@roaringpenguin.com>
+Dianne Skoll <dianne@skoll.ca>
+
+https://dianne.skoll.ca/projects/remind

-Tel. (613) 231-6599
-http://www.roaringpenguin.com

--- a/4
+++ b/4
@@ -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/
--- a/build.tk
+++ b/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 Dianne Skoll
-#   Copyright (C) 1999-2000 Roaring Penguin Software Inc.
+#   Copyright (C) 1992-2018 Dianne Skoll
 #
 #--------------------------------------------------------------

@@ -95,10 +94,6 @@ proc CreateMainDialog {} {
    wm title . "Remind Configuration"
    wm iconname . "Remind Config"

-    doLogo
-    destroy .c
-    update idletasks
-
    SetConfigFromRemind
    tabnotebook_create .tn

@@ -757,125 +752,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:
--- a/18
+++ b/18
@@ -657,6 +657,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -727,6 +728,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -979,6 +981,15 @@ do
  | -silent | --silent | --silen | --sile | --sil)
    silent=yes ;;

+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
    ac_prev=sbindir ;;
  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1116,7 +1127,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
  eval ac_val=\$$ac_var
  # Remove trailing slashes.
@@ -1269,6 +1280,7 @@ Fine tuning of the installation directories:
  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
  --libdir=DIR            object code libraries [EPREFIX/lib]
  --includedir=DIR        C header files [PREFIX/include]
  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -3964,7 +3976,7 @@ fi


 if test "$GCC" = yes; then
-	CFLAGS="$CFLAGS -Wall -Wstrict-prototypes"
+	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
 fi

 for ac_func in setenv unsetenv glob mbstowcs setlocale
@@ -3979,7 +3991,7 @@ _ACEOF
 fi
 done

-VERSION=03.01.15
+VERSION=03.01.17

 ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h"

--- a/configure.in
+++ b/configure.in
@@ -71,10 +71,10 @@ 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.15
+VERSION=03.01.17
 AC_SUBST(VERSION)
 AC_OUTPUT(src/Makefile www/Makefile src/version.h)
--- a/contrib/README
+++ b/contrib/README
@@ -1,7 +1,6 @@
 This directory contains contributed scripts.  They are provided
-"as-is" with no warranty.  Please do not contact Dianne 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.
--- a/contrib/rem2ics-0.93/rem2ics
+++ b/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 Dianne 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
--- a/docs/README.UNIX
+++ b/docs/README.UNIX
@@ -100,5 +100,5 @@ exit


 --
-Dianne Skoll <dfs@roaringpenguin.com>
-http://www.roaringpenguin.com/remind/
+Dianne Skoll <dianne@skoll.ca>
+https://dianne.skoll.ca/projects/remind/
--- a/docs/WHATSNEW
+++ b/docs/WHATSNEW
@@ -1,5 +1,52 @@
 CHANGES TO REMIND

+* 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
@@ -266,7 +313,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
@@ -274,7 +321,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
@@ -487,11 +534,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
@@ -507,8 +549,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.

--- a/examples/defs.rem
+++ b/examples/defs.rem
@@ -17,8 +17,7 @@
 #  "#COLORS" for examples of ANSI color escape sequences.                   #
 # 									    #
 # This file is part of REMIND.						    #
-# Copyright (C) 1992-1997 Dianne Skoll                                    #
-# Copyright (C) 1999-2000 Roaring Penguin Software Inc.                     #
+# Copyright (C) 1992-2018 Dianne Skoll                                      #
 # 									    #
 #############################################################################

@@ -310,6 +309,9 @@ REM      Mar 17		MSG %"St. Patrick's%" Day
 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 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
+
 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%"
@@ -325,11 +327,6 @@ OMIT [trigdate()] MSG %"Labor Day%"
 REM  Mon Oct [Week_2]	MSG %"Columbus Day%"
 REM      Nov 11		MSG %"Veterans Day%"

-# 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      Oct 30		MSG %"Mischief Night%"
 REM      Oct 31		MSG %"Halloween%"
 REM  Tue Nov  2		SCANFROM [_back(7)] \
@@ -516,11 +513,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
--- a/examples/remind.vim
+++ b/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
--- a/man/cm2rem.1
+++ b/man/cm2rem.1
@@ -10,10 +10,7 @@ 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 Dianne Skoll <dfs@roaringpenguin.com>.
+\fBcm2rem.tcl\fR was written by Dianne Skoll <dianne@skoll.ca>.
 .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
--- a/man/rem.1
+++ b/man/rem.1
@@ -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 Dianne Skoll <dfs@roaringpenguin.com>
+Remind was written by Dianne Skoll <dianne@skoll.ca>
 .SH SEE ALSO
 \fBremind\fR
--- a/man/rem2ps.1
+++ b/man/rem2ps.1
@@ -394,10 +394,7 @@ 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)
-.PP
-Rem2PS was written by Dianne Skoll <dfs@roaringpenguin.com>.
+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
--- a/man/remind.1
+++ b/man/remind.1
@@ -2123,6 +2123,15 @@ be a number as described in the UNIX \fBaccess\fR(2) system call.  The
 function returns 0 if the file can be accessed with the specified \fImode\fR,
 and \-1 otherwise.
 .TP
+.B adawn([dq_date])
+Returns the time of "astronomical dawn" on the specified \fIdate\fR.  If
+\fIdate\fR is omitted, defaults to \fBtoday()\fR.  If a \fIdatetime\fR object
+is supplied, only the date component is used.
+.TP
+.B adusk([dq_date])
+Returns the time of "astronomical twilight" on the specified \fIdate\fR.  If
+\fIdate\fR is omitted, defaults to \fBtoday()\fR.
+.TP
 .B args(s_fname)
 Returns the number of arguments expected by the user-defined function
 \fIfname\fR, or \-1 if no such user-defined function exists.  Note that
@@ -2517,6 +2526,15 @@ which default to \fBtoday()\fR and midnight, respectively.  The returned
 value is an integer from 0 to 359, representing the phase of the moon
 in degrees.  0 is a new moon, 180 is a full moon, 90 is first-quarter, etc.
 .TP
+.B ndawn([dq_date])
+Returns the time of "nautical dawn" on the specified \fIdate\fR.  If
+\fIdate\fR is omitted, defaults to \fBtoday()\fR.  If a \fIdatetime\fR object
+is supplied, only the date component is used.
+.TP
+.B ndusk([dq_date])
+Returns the time of "nautical twilight" on the specified \fIdate\fR.  If
+\fIdate\fR is omitted, defaults to \fBtoday()\fR.
+.TP
 .B nonomitted(dq_start, dq_end [,s_wkday...])
 This function returns the number of \fInon-\fRomitted days between
 \fIstart\fR and \fIend\fR.  If \fIstart\fR is non-omitted, then it is
@@ -4336,6 +4354,18 @@ from 7 days before the current date.  This ensures that Labour Day for
 the current year will continue to be triggered until 7 days after it has
 occurred.  This allows you to safely use the AFTER keyword as shown.
 .PP
+As a special case, you can simply use a negative number after SCANFROM;
+a negative numbner \-N is interpreted as N days before today.  Thus,
+the previous example could also be written like this:
+.PP
+.nf
+	# This form of SCANFROM requires Remind 03.01.17 or later.
+	REM Mon 1 Sept SCANFROM \-7 SATISFY 1
+	OMIT [trigdate()]
+
+	REM Mon AFTER MSG Hello
+.fi
+.PP
 In general, use \fBSCANFROM\fR as shown for safe movable \fBOMITs\fR.  The
 amount you should scan back by (7 days in the example above) depends on
 the number of possible consecutive \fBOMITted\fR days that may occur, and
@@ -4390,10 +4420,7 @@ Note that this behaviour is not true for
 versions of \fBRemind\fR prior to 03.00.01.
 .SH AUTHOR
 .PP
-Remind is now supported by Roaring Penguin Software
-Inc. (http://www.roaringpenguin.com)
-.PP
-Dianne Skoll <dfs@roaringpenguin.com> wrote \fBRemind\fR.  The moon code
+Dianne Skoll <dianne@skoll.ca> wrote \fBRemind\fR.  The moon code
 was copied largely unmodified from "moontool" by John Walker.  The
 sunrise and sunset functions use ideas from programs by Michael
 Schwartz and Marc T. Kaufman.  The Hebrew calendar support was taken
--- a/man/tkremind.1
+++ b/man/tkremind.1
@@ -104,7 +104,7 @@ 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.

@@ -358,13 +358,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 Dianne Skoll <dfs@roaringpenguin.com>.
+TkRemind was written by Dianne Skoll <dianne@skoll.ca>

-\fBTkRemind\fR is Copyright 1996-1998 by Dianne Skoll, Copyright
-1999 by Roaring Penguin Software Inc.
+\fBTkRemind\fR is Copyright 1996-2018 by Dianne Skoll.

 .SH FILES

--- a/scripts/cm2rem.tcl
+++ b/scripts/cm2rem.tcl
@@ -8,8 +8,7 @@
 #   files (version 3 only) to Remind format.
 #
 #   This file is part of REMIND.
-#   Copyright (C) 1992-1998 by Dianne Skoll
-#   Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+#   Copyright (C) 1992-2018 by Dianne Skoll
 #
 #--------------------------------------------------------------

--- a/scripts/tkremind
+++ b/scripts/tkremind
@@ -7,8 +7,7 @@
 #   A cheesy graphical front/back end for Remind using Tcl/Tk
 #
 #   This file is part of REMIND.
-#   Copyright (C) 1992-1998 Dianne Skoll
-#   Copyright (C) 1999-2010 Roaring Penguin Software Inc.
+#   Copyright (C) 1992-2019 Dianne Skoll
 #
 #--------------------------------------------------------------

@@ -17,6 +16,8 @@ exec wish "$0" "$@"

 wm withdraw .

+set Hostname [exec hostname]
+
 # Our icon photo
 catch {
    image create photo rpicon -data {
@@ -108,6 +109,9 @@ set OptDescr(MailAddr) "(String) Specify an e-mail address to which reminders sh
 set Option(SMTPServer) "127.0.0.1"
 set OptDescr(SMTPServer) "(String) IP address or host name of SMTP server to use for sending e-mail"

+set Option(ExtraRemindArgs) ""
+set OptDescr(ExtraRemindArgs) "(String) Extra arguments when invoking remind"
+
 # Remind program to execute -- supply full path if you want
 set Remind "remind"
 #set Remind "/home/dfs/Remind/src/remind"
@@ -189,10 +193,10 @@ set HighestTagSoFar 0
 proc Initialize {} {

    global DayNames argc argv CommandLine ReminderFile AppendFile Remind PSCmd
-    global MondayFirst TwentyFourHourMode
-
-    set CommandLine "|$Remind -itkremind=1 -p -y -l"
-    set PSCmd "$Remind -p -l"
+    global MondayFirst TwentyFourHourMode ReminderFileModTime
+    global Option
+    set CommandLine "|$Remind -itkremind=1 -p -y -l EXTRA"
+    set PSCmd "$Remind -p -l EXTRA"
    set i 0
    while {$i < $argc} {
 	if {[regexp -- {-[bgxim].*} [lindex $argv $i]]} {
@@ -254,9 +258,49 @@ proc Initialize {} {
    append CommandLine " $ReminderFile"
    append PSCmd " $ReminderFile"
    set DayNames [GetWeekdayNames]
+
+    # Get modification time of ReminderFile
+    set ReminderFileModTime -1
+    catch {
+	set ReminderFileModTime [file mtime $ReminderFile]
+    }
+
+    MonitorReminderFile
+
 #   puts "CommandLine: $CommandLine"
 }

+#---------------------------------------------------------------------------
+# MonitorReminderFile
+# If Reminder File modtime changes, restart daemon
+#---------------------------------------------------------------------------
+proc MonitorReminderFile {} {
+    global ReminderFileModTime ReminderFile
+
+    if {$ReminderFileModTime < 0} {
+	# Could not stat file
+	return
+    }
+
+    set mtime -1
+    catch {
+	set mtime [file mtime $ReminderFile]
+    }
+    if {$mtime < 0} {
+	# Doh!
+	return
+    }
+
+    # Run ourselves again
+    after 60000 MonitorReminderFile
+
+    # Redraw calendar and restart daemon if needed
+    if {$ReminderFileModTime < $mtime} {
+	set ReminderFileModTime $mtime
+	FillCalWindow
+	RestartBackgroundRemindDaemon
+    }
+}
 #---------------------------------------------------------------------------
 # GetWeekdayNames - Spawn a remind process and get the names of the weekdays
 # Also sets CurMonth and CurYear.
@@ -455,6 +499,12 @@ proc ConfigureCalFrame { w firstDay numDays } {
    }
 }

+proc DoQueue {} {
+    global DaemonFile
+    puts $DaemonFile "QUEUE"
+    flush $DaemonFile
+}
+
 #---------------------------------------------------------------------------
 # CreateCalWindow -- create the calendar window.
 # Arguments:
@@ -475,11 +525,12 @@ proc CreateCalWindow { dayNames } {
    button .b.next -text {->} -command {MoveMonth 1} -border 1
    button .b.goto -text {Go To Date...} -command {GotoDialog} -border 1
    button .b.print -text {Print...} -command {DoPrint} -border 1
+    button .b.queue -text {Queue...} -command {DoQueue} -border 1
    button .b.quit -text {Quit} -command {Quit} -border 1
    button .b.options -text {Options...} -command EditOptions -border 1
    label .b.status -text "" -width 25 -relief sunken -border 1
    label .b.nqueued -text "" -width 20 -relief sunken -border 1
-    pack .b.prev .b.this .b.next .b.goto .b.print .b.options .b.quit -side left -fill x
+    pack .b.prev .b.this .b.next .b.goto .b.print .b.options .b.queue .b.quit -side left -fill x
    pack .b.status -side left -fill x -expand 1
    pack .b.nqueued -side left -fill x
    pack .b -side bottom -fill x -expand 0
@@ -588,6 +639,14 @@ proc EditOptions {} {
    pack $w.editor -in $w.ef -side left -expand 1 -fill x
    $w.editor insert 0 $tmpOpt(Editor)

+    # extra args
+    frame $w.eaf
+    label $w.eal -text "Extra Arguments for Remind:" -anchor w -justify left
+    entry $w.extraargs -width 30
+    pack $w.eal -in $w.eaf -side left -expand 0 -fill none
+    pack $w.extraargs -in $w.eaf -side left -expand 1 -fill x
+    $w.extraargs insert 0 $tmpOpt(ExtraRemindArgs)
+
    frame $w.sep1 -border 1 -relief sunken
    frame $w.sep2 -border 1 -relief sunken

@@ -608,6 +667,7 @@ proc EditOptions {} {
    pack $w.eml -in $w.f -side top -expand 0 -fill x
    pack $w.fsmtp -in $w.f -side top -expand 0 -fill x
    pack $w.ef -in $w.f -side top -expand 0 -fill x
+    pack $w.eaf -in $w.f -side top -expand 0 -fill x
    pack $w.sep2 -in $w.f -side top -expand 0 -fill x -ipady 1

    button $w.apply -text "Apply Options" -command "ApplyOptions $w; destroy $w"
@@ -615,7 +675,7 @@ proc EditOptions {} {
    button $w.cancel -text "Cancel" -command "destroy $w"

    pack $w.apply $w.save $w.cancel -in $w.b -side left -expand 0 -fill x
-    CenterWindow $w
+    CenterWindow $w .
 }

 #***********************************************************************
@@ -629,15 +689,26 @@ proc EditOptions {} {
 #***********************************************************************
 proc ApplyOptions { w } {
    global Option tmpOpt
+
    set tmpOpt(RunCmd) [$w.cmd get]
    set tmpOpt(Editor) [$w.editor get]
+    set tmpOpt(ExtraRemindArgs) [$w.extraargs get]
    set tmpOpt(MailAddr) [$w.email_address get]
    set tmpOpt(SMTPServer) [$w.smtp get]

+    set need_restart 0
+    if {"$tmpOpt(ExtraRemindArgs)" != "$Option(ExtraRemindArgs)"} {
+	set need_restart 1
+    }
    # Copy working copy to real option set
    foreach name [array names tmpOpt] {
 	set Option($name) $tmpOpt($name)
    }
+    if {$need_restart != 0} {
+	FillCalWindow
+	StopBackgroundRemindDaemon
+	StartBackgroundRemindDaemon
+    }
 }

 #***********************************************************************
@@ -722,8 +793,9 @@ proc LoadOptions {} {
 #  Any side effects
 #***********************************************************************
 proc ConfigureCalWindow { month year firstDay numDays } {
+    global Hostname
    .h.title configure -text "$month $year"
-    wm title . "$month $year - TkRemind"
+    wm title . "$month $year - TkRemind on $Hostname"
    wm iconname . "$month $year"
    ConfigureCalFrame .cal $firstDay $numDays
 }
@@ -734,12 +806,13 @@ proc ConfigureCalWindow { month year firstDay numDays } {
 proc FillCalWindow {} {
    set FileName ""
    set LineNo 0
-    global DayNames CurYear CurMonth MonthNames CommandLine
+    global DayNames CurYear CurMonth MonthNames CommandLine Option

    Status "Firing off Remind..."
    set month [lindex $MonthNames $CurMonth]

-    set file [open "$CommandLine $month $CurYear" r]
+    set cmd [regsub EXTRA $CommandLine $Option(ExtraRemindArgs)]
+    set file [open "$cmd $month $CurYear" r]
    # Look for # rem2ps begin line
    while { [gets $file line] >= 0 } {
 	if { [string compare "$line" "# rem2ps begin"] == 0 } { break }
@@ -897,7 +970,7 @@ proc Status { stuff } {
 #   None
 #---------------------------------------------------------------------------
 proc DoPrint {} {
-    global PrintDest PrintSize PrintMargins PrintOrient PrintFill PrintEncoding PrintSmallCalendars PrintStatus Rem2PS PSCmd
+    global PrintDest PrintSize PrintMargins PrintOrient PrintFill PrintEncoding PrintSmallCalendars PrintStatus Rem2PS PSCmd Option
    global CurMonth CurYear MonthNames
    catch {destroy .p}
    toplevel .p
@@ -955,7 +1028,7 @@ proc DoPrint {} {
    bind .p <KeyPress-Escape> ".p.cancel flash; .p.cancel invoke"
    bind .p <KeyPress-Return> ".p.print flash; .p.print invoke"
    set PrintStatus 2
-    CenterWindow .p
+    CenterWindow .p .
    tkwait visibility .p
    set oldFocus [focus]
    focus .p.filename
@@ -989,7 +1062,8 @@ proc DoPrint {} {
    }

    # Build the command line
-    set cmd "$PSCmd 1 [lindex $MonthNames $CurMonth] $CurYear | $Rem2PS"
+    set p [regsub EXTRA $PSCmd $Option(ExtraRemindArgs)]
+    set cmd "$p 1 [lindex $MonthNames $CurMonth] $CurYear | $Rem2PS"
    if {$PrintSize == "letter"} {
 	append cmd " -m Letter"
    } else {
@@ -1077,7 +1151,7 @@ proc GotoDialog {} {
    pack .g.y -expand 1 -fill x
    pack .g.b -expand 1 -fill x
    bind .g <KeyPress-Escape> ".g.b.cancel flash; .g.b.cancel invoke"
-    CenterWindow .g
+    CenterWindow .g .
    set oldFocus [focus]
    grab .g
    focus .g.y.e
@@ -1344,7 +1418,7 @@ proc CreateModifyDialog {w day firstDay args} {
    set ModifyDialogResult 0

    # Center the window on the root
-    CenterWindow $w
+    CenterWindow $w .
 }

 #***********************************************************************
@@ -1567,17 +1641,24 @@ proc ModifyDay {d firstDay} {
 }

 #---------------------------------------------------------------------------
-# CenterWindow -- center a window on the screen.  Stolen from tk_dialog code
+# CenterWindow -- center a window on the screen or over a parent.
+#                 Stolen from tk_dialog code
 # Arguments:
 #    w -- window to center
+#    parent -- window over which to center.  Defaults to screen if not supplied.
 #---------------------------------------------------------------------------
-proc CenterWindow {w} {
+proc CenterWindow {w {parent {}}} {
    wm withdraw $w
    update idletasks
-    set x [expr [winfo screenwidth $w]/2 - [winfo reqwidth $w]/2 \
-	    - [winfo vrootx [winfo parent $w]]]
-    set y [expr [winfo screenheight $w]/2 - [winfo reqheight $w]/2 \
-	    - [winfo vrooty [winfo parent $w]]]
+    if {"$parent" == ""} {
+	set x [expr [winfo screenwidth $w]/2 - [winfo reqwidth $w]/2 \
+		   - [winfo vrootx [winfo parent $w]]]
+	set y [expr [winfo screenheight $w]/2 - [winfo reqheight $w]/2 \
+		   - [winfo vrooty [winfo parent $w]]]
+    } else {
+	set x [expr [winfo rootx $parent] + [winfo width $parent]/2 - [winfo reqwidth $w]/2]
+	set y [expr [winfo rooty $parent] + [winfo height $parent]/2 - [winfo reqheight $w]/2]
+    }
    wm geom $w +$x+$y
    wm deiconify $w
 }
@@ -1860,7 +1941,7 @@ proc EditReminder {rem args} {
    pack .edit.f -side top -fill x -expand 1
    bind .edit <KeyPress-Escape> ".edit.but1 flash; .edit.but1 invoke"
    set ModifyDialogResult 0
-    CenterWindow .edit
+    CenterWindow .edit .
    tkwait visibility .edit
    set oldFocus [focus]
    focus .edit.t
@@ -1970,7 +2051,7 @@ proc BrowseForFile {w title {oktext "OK"} {showdots 0} {filter "*"}} {
    bindtags $w.entry "Entry $w.entry $w all"

    bindtags $w.list "Listbox $w.list $w all"
-    CenterWindow $w
+    CenterWindow $w .
    set oldFocus [focus]
    tkwait visibility $w
    focus $w.entry
@@ -2093,8 +2174,8 @@ proc BrowseForFileRead {w {dir ""}} {
 #    Starts a background Remind daemon to handle timed reminders
 #---------------------------------------------------------------------------
 proc StartBackgroundRemindDaemon {} {
-    global Remind DaemonFile ReminderFile
-    set problem [catch { set DaemonFile [open "|$Remind -z0 $ReminderFile" "r+"] } err]
+    global Remind DaemonFile ReminderFile Option
+    set problem [catch { set DaemonFile [open "|$Remind -z0 $Option(ExtraRemindArgs) $ReminderFile" "r+"] } err]
    if {$problem} {
 	tk_dialog .error Error "Can't start Remind daemon in background: $err" error 0 OK
    } else {
@@ -2132,13 +2213,61 @@ proc StopBackgroundRemindDaemon {} {
 #    Restarts the background Remind daemon
 #---------------------------------------------------------------------------
 proc RestartBackgroundRemindDaemon {} {
-    global DaemonFile
+    global DaemonFile ReminderFile ReminderFileModTime
+
+    # Don't let the background handler trigger another reread
+    catch {
+	set mtime [file mtime $ReminderFile]
+	set ReminderFileModTime $mtime
+    }
+
    catch {
 	puts $DaemonFile "REREAD"
 	flush $DaemonFile
    }
 }

+#---------------------------------------------------------------------------
+# ShowQueue
+# Arguments:
+#    file -- file channel that is readable
+# Returns:
+#    nothing
+# Description:
+#    Dumps the debugging queue listing
+#---------------------------------------------------------------------------
+proc ShowQueue { file } {
+    set w .queuedbg
+    catch { destroy $w }
+    toplevel $w
+    wm title $w "Queue (Debugging Output)"
+    wm iconname $w "Queue Dbg"
+    text $w.t -width 80 -height 30 -wrap word -yscrollcommand "$w.sb set"
+    scrollbar $w.sb -orient vertical -command "$w.text yview"
+    button $w.ok -text "OK" -command "destroy $w"
+    grid $w.t -row 0 -column 0 -sticky nsew
+    grid $w.sb -row 0 -column 1 -sticky ns
+    grid $w.ok -row 1 -column 0 -sticky w
+    grid columnconfigure $w 0 -weight 1
+    grid columnconfigure $w 1 -weight 0
+    grid rowconfigure $w 0 -weight 1
+    grid rowconfigure $w 1 -weight 0
+    set did 0
+    CenterWindow $w .
+    while (1) {
+	gets $file line
+	if {$line == "NOTE endqueue"} {
+	    break
+	}
+	set did 1
+	$w.t insert end "$line\n"
+    }
+    if {!$did} {
+	$w.t insert end "*** Queue is empty ***\n"
+    }
+    $w.t configure -state disabled
+}
+
 #---------------------------------------------------------------------------
 # DaemonReadable
 # Arguments:
@@ -2161,6 +2290,9 @@ proc DaemonReadable { file } {
 	    scan $line "NOTE reminder %s %s %s" time now tag
 	    IssueBackgroundReminder $file $time $now $tag
 	}
+	"NOTE queue" {
+	    ShowQueue $file
+	}
 	"NOTE newdate" {
 	    # Date has rolled over -- clear "ignore" list
 	    catch { unset Ignore}
@@ -2252,7 +2384,7 @@ proc IssueBackgroundReminder { file time now tag } {
 	pack $w.nomore $w.kill -in $w.b -side left
    }

-    CenterWindow $w
+    CenterWindow $w .

    update
    if {$Option(RingBell)} {
@@ -2319,8 +2451,7 @@ proc main {} {

    global AppendFile HighestTagSoFar DayNames
    catch {
-	puts "\nTkRemind Copyright (C) 1996-1998 Dianne Skoll"
-	puts "Copyright (C) 1999-2010 Roaring Penguin Software Inc."
+	puts "\nTkRemind Copyright (C) 1996-2019 Dianne Skoll"
    }
    catch { SetFonts }
    LoadOptions
@@ -2855,10 +2986,10 @@ proc ShowTodaysReminders {} {
    grid $w.sb -row 0 -column 1 -sticky ns
    grid $w.ok -row 1 -column 0 -sticky w

-    CenterWindow $w
+    CenterWindow $w .

    # Grab the reminders
-    set stuff [exec -keepnewline $Remind -g -q -r $ReminderFile 2>/dev/null]
+    set stuff [exec -keepnewline $Remind -g -q -r $Option(ExtraRemindArgs) $ReminderFile 2>/dev/null]
    $w.text insert end $stuff
    $w.text configure -state disabled
 }
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -79,16 +79,13 @@ depend:

 # 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)/ HEAD > src/remind-$(VERSION)-BETA-$(BETA).tar
 	gzip -f -v -9 remind-$(VERSION)-BETA-$(BETA).tar
-	rm -f ../remind-$(VERSION)-BETA-$(BETA)

 #---------------- Stuff after this added by "make depend" -----------------

--- a/src/calendar.c
+++ b/src/calendar.c
@@ -5,8 +5,7 @@
 /*  The code for generating a calendar.                        */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -277,7 +276,7 @@ void ProduceCalendar(void)
 /*  Write a calendar for a single week                         */
 /*                                                             */
 /***************************************************************/
-static void DoCalendarOneWeek(nleft)
+static void DoCalendarOneWeek(int nleft)
 {
    int y, m, d, done, i, l, wd;
    char buf[81];
@@ -956,7 +955,7 @@ static int DoCalRem(ParsePtr p, int col)
 	return E_EOLN;
    }
    if (trig.typ == SAT_TYPE) {
-	r=DoSatRemind(&trig, &tim, p);
+	r=DoSatRemind(&trig, p);
 	if (r) {
 	    FreeTrig(&trig);
 	    if (r == E_EXPIRED) return OK;
--- a/src/custom.h
+++ b/src/custom.h
@@ -6,8 +6,7 @@
 /*  which you can customize.                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -37,7 +36,7 @@
 /*---------------------------------------------------------------------*/
 #define DEFAULT_PAGE {"Letter", 612, 792}
 /* #define DEFAULT_PAGE {"A4", 595, 842} */
-  
+
 /*---------------------------------------------------------------------*/
 /* DATESEP:  The default date separator.  Standard usage is '-';       */
 /* others may prefer '/'.                                              */
@@ -52,6 +51,13 @@
 #define TIMESEP ':'
 /* #define TIMESEP '.' */

+/*---------------------------------------------------------------------*/
+/* DATETIMESEP:  The default datetime separator.  Default is '@';      */
+/* others may prefer 'T'.                                              */
+/*---------------------------------------------------------------------*/
+#define DATETIMESEP '@'
+/* #define DATETIMESEP '/' */
+
 /*---------------------------------------------------------------------*/
 /* ISOLATIN1: define it to 1 if you use the                            */
 /* ISO 8859-1 character set instead of ASCII.                          */
--- a/src/custom.h.in
+++ b/src/custom.h.in
@@ -6,8 +6,7 @@
 /*  which you can customize.                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -37,7 +36,7 @@
 /*---------------------------------------------------------------------*/
 #define DEFAULT_PAGE {"Letter", 612, 792}
 /* #define DEFAULT_PAGE {"A4", 595, 842} */
-  
+
 /*---------------------------------------------------------------------*/
 /* DATESEP:  The default date separator.  Standard usage is '-';       */
 /* others may prefer '/'.                                              */
@@ -52,6 +51,13 @@
 #define TIMESEP ':'
 /* #define TIMESEP '.' */

+/*---------------------------------------------------------------------*/
+/* DATETIMESEP:  The default datetime separator.  Default is '@';      */
+/* others may prefer 'T'.                                              */
+/*---------------------------------------------------------------------*/
+#define DATETIMESEP '@'
+/* #define DATETIMESEP '/' */
+
 /*---------------------------------------------------------------------*/
 /* ISOLATIN1: define it to 1 if you use the                            */
 /* ISO 8859-1 character set instead of ASCII.                          */
--- a/src/dorem.c
+++ b/src/dorem.c
@@ -7,8 +7,7 @@
 /*  commands.                                                  */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -69,7 +68,7 @@ int DoRem(ParsePtr p)
    if (trig.typ == SAT_TYPE) {
 	PurgeEchoLine("%s\n", "#!P: Cannot purge SATISFY-type reminders");
 	PurgeEchoLine("%s\n", CurLine);
-	r=DoSatRemind(&trig, &tim, p);
+	r=DoSatRemind(&trig, p);
 	if (r) {
 	    FreeTrig(&trig);
 	    if (r == E_EXPIRED) return OK;
@@ -667,6 +666,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]);
@@ -996,7 +1019,7 @@ 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, ParsePtr p)
 {
    int iter, jul, r;
    Value v;
--- a/src/dosubst.c
+++ b/src/dosubst.c
@@ -6,8 +6,7 @@
 /*  reminders are triggered.                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/dynbuf.c
+++ b/src/dynbuf.c
@@ -6,8 +6,7 @@
 /*  buffers.                                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/dynbuf.h
+++ b/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 Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/err.h
+++ b/src/err.h
@@ -5,8 +5,7 @@
 /*  Error definitions.                                         */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/expr.c
+++ b/src/expr.c
@@ -5,8 +5,7 @@
 /*  This file contains routines to parse and evaluate          */
 /*  expressions.                                               */
 /*                                                             */
-/*  Copyright 1992-1998 by Dianne Skoll                        */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright 1992-2018 by Dianne Skoll                        */
 /*                                                             */
 /***************************************************************/

@@ -620,8 +619,8 @@ 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(CoerceBuf, "%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;
 	}
@@ -799,7 +798,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 && (l1 + l2 > (size_t) MaxStringLen)) {
 	    DestroyValue(v1); DestroyValue(v2);
 	    return E_STRING_TOO_LONG;
 	}
@@ -1193,7 +1192,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");
@@ -1261,7 +1260,7 @@ 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;
--- a/src/expr.h
+++ b/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 Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/files.c
+++ b/src/files.c
@@ -7,8 +7,7 @@
 /*  files.                                                     */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/funcs.c
+++ b/src/funcs.c
@@ -6,8 +6,7 @@
 /*  expressions.                                               */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -110,6 +109,10 @@ static int	FPsshade	(func_info *);
 static	int	FShell		(func_info *);
 static	int	FStrlen		(func_info *);
 static	int	FSubstr		(func_info *);
+static	int	FADawn		(func_info *);
+static	int	FADusk	 	(func_info *);
+static	int	FNDawn		(func_info *);
+static	int	FNDusk	 	(func_info *);
 static	int	FDawn		(func_info *);
 static	int	FDusk	 	(func_info *);
 static	int	FSunset		(func_info *);
@@ -188,6 +191,8 @@ BuiltinFunc Func[] = {

    {   "abs",          1,      1,      1,          FAbs },
    {   "access",       2,      2,      0,          FAccess },
+    {   "adawn",        0,      1,      0,          FADawn},
+    {   "adusk",        0,      1,      0,          FADusk},
    {   "args",         1,      1,      0,          FArgs   },
    {   "asc",          1,      1,      1,          FAsc    },
    {   "baseyr",       0,      0,      1,          FBaseyr },
@@ -233,6 +238,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    },
@@ -1878,9 +1885,6 @@ static int SunStuff(int rise, double cosz, int jul)

    FromJulian(jul, &year, &mon, &day);

-    if (rise > 1)
-	rise -= 2;
-
 /* Following formula on page B6 exactly... */
    t = (double) jul;
    if (rise) {
@@ -1970,19 +1974,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 +2029,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                                                  */
--- a/src/globals.c
+++ b/src/globals.c
@@ -8,8 +8,7 @@
 /*  globals.h and err.h                                        */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/globals.h
+++ b/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 Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -73,6 +72,7 @@ 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     SynthesizeTags, 0);
 EXTERN  INIT(   int     ScFormat, SC_AMPM);
 EXTERN  INIT(   int     MaxSatIter, 150);
--- a/src/hbcal.c
+++ b/src/hbcal.c
@@ -5,8 +5,7 @@
 /*  Support for the Hebrew calendar                            */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 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) {
--- a/src/init.c
+++ b/src/init.c
@@ -7,8 +7,7 @@
 /*  in normal mode.                                            */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2011 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2019 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -586,7 +585,7 @@ 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 +599,7 @@ void InitRemind(int argc, char const *argv[])
 #ifndef L_USAGE_OVERRIDE
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 Dianne Skoll\n", VERSION, L_LANGNAME);
-    fprintf(ErrFp, "Copyright 1999-2011 Roaring Penguin Software Inc.\n");
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2019 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
    fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
 #endif
--- a/src/lang.h
+++ b/src/lang.h
@@ -5,8 +5,7 @@
 /*  Header file for language support for various languages.    */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -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
--- a/src/langs/danish.h
+++ b/src/langs/danish.h
@@ -6,8 +6,7 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-1998 by Dianne Skoll          */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  REMIND is Copyright (C) 1992-2018 by Dianne Skoll          */
 /*  This file is Copyright (C) 1993 by Mogens Lynnerup.        */
 /*                                                             */
 /***************************************************************/
--- a/src/langs/dutch.h
+++ b/src/langs/dutch.h
@@ -11,8 +11,7 @@
 /*  Further corrections by Erik-Jan Vens                       */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/langs/english.h
+++ b/src/langs/english.h
@@ -5,8 +5,7 @@
 /*  Support for the English language.                          */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/langs/finnish.h
+++ b/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 Dianne Skoll          */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  REMIND is Copyright (C) 1992-2018 by Dianne Skoll          */
 /*                                                             */
 /***************************************************************/

@@ -525,8 +524,7 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 Dianne Skoll\n", VERSION, L_LANGNAME);
-    fprintf(ErrFp, "Copyright 1999-2000 Roaring Penguin Software Inc.\n");
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2018 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
    fprintf(ErrFp, ">>>> BETAVERSIO <<<<\n");
 #endif
--- a/src/langs/french.h
+++ b/src/langs/french.h
@@ -8,8 +8,7 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-1998 by Dianne Skoll          */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  REMIND is Copyright (C) 1992-2018 by Dianne Skoll          */
 /*  This file is Copyright (C) 1993 by Laurent Duperval and    */
 /*  Dianne Skoll.                                              */
 /*                                                             */
@@ -358,8 +357,7 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 Dianne Skoll\n", VERSION, L_LANGNAME);
-    fprintf(ErrFp, "Copyright 1999-2000 Roaring Penguin Software Inc.\n");
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2018 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
    fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
 #endif
--- a/src/langs/german.h
+++ b/src/langs/german.h
@@ -9,8 +9,7 @@
 /*  I don't speak German.                                      */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/langs/icelandic.h
+++ b/src/langs/icelandic.h
@@ -5,8 +5,7 @@
 /*  Support for the Icelandic language.                        */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*  Translated by Björn Davíðsson (bjossi@snerpa.is)           */
 /*                                                             */
 /***************************************************************/
--- a/src/langs/italian.h
+++ b/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 Dianne Skoll          */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Remind is copyright (C) 1992-2018 by Dianne Skoll          */
 /*                                                             */
 /***************************************************************/

--- a/src/langs/norwgian.h
+++ b/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 Dianne Skoll          */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Remind is Copyright (C) 1992-2018 by Dianne Skoll          */
 /*                                                             */
 /***************************************************************/

--- a/src/langs/polish.h
+++ b/src/langs/polish.h
@@ -9,8 +9,7 @@
 /*  Polish.                                                    */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -396,8 +395,7 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-1998 Dianne Skoll\n", VERSION, L_LANGNAME);
-    fprintf(ErrFp, "Copyright 1999-2000 Roaring Penguin Software Inc.\n");
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2018 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
    fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
 #endif
--- a/src/langs/portbr.h
+++ b/src/langs/portbr.h
@@ -8,8 +8,7 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-1998 by Dianne Skoll          */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  REMIND is Copyright (C) 1992-2018 by Dianne Skoll          */
 /*  This file is Copyright (C) 1996 by Marco Paganini and      */
 /*  Dianne Skoll.                                              */
 /*                                                             */
@@ -257,8 +256,7 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (versao %s) (C) 1992-1998 Dianne Skoll\n", VERSION, L_LANGNAME);
-    fprintf(ErrFp, "(C) 1999-2000 Roaring Penguin Software Inc.\n");
+    fprintf(ErrFp, "\nREMIND %s (versao %s) (C) 1992-2018 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
    fprintf(ErrFp, ">>>> VERSAO BETA <<<<\n");
 #endif
--- a/src/langs/romanian.h
+++ b/src/langs/romanian.h
@@ -8,8 +8,7 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-1998 by Dianne Skoll          */
-/*       Copyright 1999-2000 by Roaring Penguin Software Inc.  */
+/*  REMIND is Copyright (C) 1992-2018 by Dianne Skoll          */
 /*  This file is Copyright (C) 1996-1998 by Liviu Daia         */
 /*                                                             */
 /***************************************************************/
--- a/src/langs/spanish.h
+++ b/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 Dianne Skoll                    */
-/*  Copyright 1999-2000 by Roaring Penguin Software Inc.       */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/main.c
+++ b/src/main.c
@@ -6,8 +6,7 @@
 /*  routines, etc.                                             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2011 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -714,7 +713,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,7 +794,7 @@ 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;
@@ -1303,6 +1302,7 @@ void UTCToLocal(int utcdate, int utctime, int *locdate, int *loctime)

 void SigIntHandler(int d)
 {
+    UNUSED(d);
    signal(SIGINT, SigIntHandler);
    GotSigInt();
    exit(0);
--- a/src/moon.c
+++ b/src/moon.c
@@ -5,8 +5,7 @@
 /*  Calculations for figuring out moon phases.                 */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/omit.c
+++ b/src/omit.c
@@ -6,8 +6,7 @@
 /*  the data structures for OMITted dates.                     */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -454,6 +453,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;
--- a/src/protos.h
+++ b/src/protos.h
@@ -5,11 +5,13 @@
 /*  Function Prototypes.                                       */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 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); }

@@ -103,7 +105,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, ParsePtr p);
 int DoMsgCommand (char const *cmd, char const *msg);
 int ParseNonSpaceChar (ParsePtr p, int *err, int peek);
 unsigned int HashVal (char const *str);
--- a/src/queue.c
+++ b/src/queue.c
@@ -5,8 +5,7 @@
 /*  Queue up reminders for subsequent execution.               */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -152,7 +151,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,25 +168,24 @@ 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;
-		}
+		/* Wake up on the next exact minute */
+		SleepTime = 60 - (SystemTime(1)%60);
 	    }

 	    if (Daemon >= 0) {
@@ -210,12 +208,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 +223,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 +233,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 {
@@ -506,6 +504,33 @@ 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, "REREAD\n")) {
 	printf("NOTE reread\n");
 	fflush(stdout);
--- a/src/rem2ps.c
+++ b/src/rem2ps.c
@@ -5,8 +5,7 @@
 /*  Print a PostScript calendar.                               */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -63,7 +62,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;

@@ -670,7 +669,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;
@@ -799,13 +799,13 @@ void Init(int argc, char *argv[])

 	case 'i': UseISO = 1; break;

-	case 'c': j=(*s);
-	    if (!j) {
+	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];
 		}
--- a/src/rem2ps.h
+++ b/src/rem2ps.h
@@ -5,8 +5,7 @@
 /*  Define the PostScript prologue                             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/sort.c
+++ b/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 Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/token.c
+++ b/src/token.c
@@ -6,8 +6,7 @@
 /*  classifying the tokens parsed.                             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/trigger.c
+++ b/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 Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/types.h
+++ b/src/types.h
@@ -5,8 +5,7 @@
 /*  Type definitions all dumped here.                          */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/userfns.c
+++ b/src/userfns.c
@@ -6,8 +6,7 @@
 /*  functions.                                                 */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -95,9 +94,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 +117,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);
@@ -274,7 +273,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) {
--- a/src/utils.c
+++ b/src/utils.c
@@ -5,8 +5,7 @@
 /*  Useful utility functions.                                  */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2000 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

--- a/src/var.c
+++ b/src/var.c
@@ -6,8 +6,7 @@
 /*  user- and system-defined variables.                        */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-1998 by Dianne Skoll                    */
-/*  Copyright (C) 1999-2007 by Roaring Penguin Software Inc.   */
+/*  Copyright (C) 1992-2018 by Dianne Skoll                    */
 /*                                                             */
 /***************************************************************/

@@ -38,6 +37,7 @@ typedef int (*SysVarFunc)(int, Value *);

 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 +49,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 +64,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 +79,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 +94,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 +106,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 +114,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 +124,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 +134,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 +143,31 @@ 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 date_sep_func(int do_set, Value *val)
 {
    if (!do_set) {
@@ -575,6 +603,7 @@ static SysVar SysVarArr[] = {
    {"CalMode",        0,  INT_TYPE,     &DoCalendar,         0,      0   },
    {"Daemon",         0,  INT_TYPE,     &Daemon,             0,      0   },
    {"DateSep",        1,  SPECIAL_TYPE, date_sep_func,       0,      0   },
+    {"DateTimeSep",    1,  SPECIAL_TYPE, datetime_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   },
@@ -729,7 +758,7 @@ static SysVar *FindSysVar(char const *name)
 /***************************************************************/
 void DumpSysVarByName(char const *name)
 {
-    int i;
+    size_t i;
    SysVar *v;

    if (!name || !*name) {
--- a/8
+++ b/8
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd /home/dfs/Software/Remind.git || exit 1
+
+rm -f .git/COMMIT_EDITMSG
+
+git update-server-info && cd .git && rsync --archive --verbose --progress --delete ./ dianne.skoll.ca:web/projects/remind/git/Remind.git/
+exit $?
+
--- a/tests/test-rem
+++ b/tests/test-rem
@@ -7,8 +7,7 @@
 # in the build directory.
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 Dianne Skoll        
-# Copyright (C) 1999-2000 Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 Dianne Skoll
 # ---------------------------------------------------------------------------

 DIR=`dirname $0`
--- a/tests/test.cmp
+++ b/tests/test.cmp
@@ -7,17 +7,21 @@ Test 1
 #
 # 	./test-rem  # From WITHIN Remind source directory!

+# Should issue a warning
+fset year(x) 1
+../tests/test.rem(9): Attempt to redefine built-in function: `year'
+
 # Don't evaluate SATISFY expressions if reminder has expired

 REM Wed UNTIL 15 Feb 1991 SATISFY [trigdate() > '1990-01-01'] MSG wookie
-../tests/test.rem(10): Expired
+../tests/test.rem(13): Expired

 # bad AT
 REM AT 0:00 0:01 0:02 MSG foo
-../tests/test.rem(13): Time specified twice
+../tests/test.rem(16): Time specified twice

 REM MSG Today is [hebday(today())] [hebmon(today())] [hebyear(today())]
-../tests/test.rem(15): Trig = Saturday, 16 February, 1991
+../tests/test.rem(18): Trig = Saturday, 16 February, 1991
 Reminders for Saturday, 16th February, 1991:

 today() => 1991-02-16
@@ -37,7 +41,7 @@ y => "Tishrey"
 hebdate(1, "Tishrey") => 1991-09-09
 trigger(1991-09-09) => "9 September 1991"
 Leaving UserFN _h() => "9 September 1991"
-../tests/test.rem(18): Trig = Monday, 9 September, 1991
+../tests/test.rem(21): Trig = Monday, 9 September, 1991
 [_h(2,  "Tishrey")] MSG Rosh Hashana 2
 Entering UserFN _h(2, "Tishrey")
 x => 2
@@ -45,7 +49,7 @@ y => "Tishrey"
 hebdate(2, "Tishrey") => 1991-09-10
 trigger(1991-09-10) => "10 September 1991"
 Leaving UserFN _h() => "10 September 1991"
-../tests/test.rem(19): Trig = Tuesday, 10 September, 1991
+../tests/test.rem(22): Trig = Tuesday, 10 September, 1991
 [_h(3,  "Tishrey")] MSG Tzom Gedalia
 Entering UserFN _h(3, "Tishrey")
 x => 3
@@ -53,7 +57,7 @@ y => "Tishrey"
 hebdate(3, "Tishrey") => 1991-09-11
 trigger(1991-09-11) => "11 September 1991"
 Leaving UserFN _h() => "11 September 1991"
-../tests/test.rem(20): Trig = Wednesday, 11 September, 1991
+../tests/test.rem(23): Trig = Wednesday, 11 September, 1991
 [_h(10, "Tishrey")] MSG Yom Kippur
 Entering UserFN _h(10, "Tishrey")
 x => 10
@@ -61,7 +65,7 @@ y => "Tishrey"
 hebdate(10, "Tishrey") => 1991-09-18
 trigger(1991-09-18) => "18 September 1991"
 Leaving UserFN _h() => "18 September 1991"
-../tests/test.rem(21): Trig = Wednesday, 18 September, 1991
+../tests/test.rem(24): Trig = Wednesday, 18 September, 1991
 [_h(15, "Tishrey")] MSG Sukkot 1
 Entering UserFN _h(15, "Tishrey")
 x => 15
@@ -69,7 +73,7 @@ y => "Tishrey"
 hebdate(15, "Tishrey") => 1991-09-23
 trigger(1991-09-23) => "23 September 1991"
 Leaving UserFN _h() => "23 September 1991"
-../tests/test.rem(22): Trig = Monday, 23 September, 1991
+../tests/test.rem(25): Trig = Monday, 23 September, 1991
 [_h(25, "Kislev")]  MSG Channuka
 Entering UserFN _h(25, "Kislev")
 x => 25
@@ -77,7 +81,7 @@ y => "Kislev"
 hebdate(25, "Kislev") => 1991-12-02
 trigger(1991-12-02) => "2 December 1991"
 Leaving UserFN _h() => "2 December 1991"
-../tests/test.rem(23): Trig = Monday, 2 December, 1991
+../tests/test.rem(26): Trig = Monday, 2 December, 1991
 [_h(10, "Tevet")]   MSG Asara B'Tevet
 Entering UserFN _h(10, "Tevet")
 x => 10
@@ -85,7 +89,7 @@ y => "Tevet"
 hebdate(10, "Tevet") => 1991-12-17
 trigger(1991-12-17) => "17 December 1991"
 Leaving UserFN _h() => "17 December 1991"
-../tests/test.rem(24): Trig = Tuesday, 17 December, 1991
+../tests/test.rem(27): Trig = Tuesday, 17 December, 1991
 [_h(15, "Shvat")]   MSG Tu B'Shvat
 Entering UserFN _h(15, "Shvat")
 x => 15
@@ -93,7 +97,7 @@ y => "Shvat"
 hebdate(15, "Shvat") => 1992-01-20
 trigger(1992-01-20) => "20 January 1992"
 Leaving UserFN _h() => "20 January 1992"
-../tests/test.rem(25): Trig = Monday, 20 January, 1992
+../tests/test.rem(28): Trig = Monday, 20 January, 1992
 [_h(15, "Adar A")]  MSG Purim Katan
 Entering UserFN _h(15, "Adar A")
 x => 15
@@ -101,7 +105,7 @@ y => "Adar A"
 hebdate(15, "Adar A") => 1992-02-19
 trigger(1992-02-19) => "19 February 1992"
 Leaving UserFN _h() => "19 February 1992"
-../tests/test.rem(26): Trig = Wednesday, 19 February, 1992
+../tests/test.rem(29): Trig = Wednesday, 19 February, 1992
 [_h(14, "Adar")]    MSG Purim
 Entering UserFN _h(14, "Adar")
 x => 14
@@ -109,7 +113,7 @@ y => "Adar"
 hebdate(14, "Adar") => 1991-02-28
 trigger(1991-02-28) => "28 February 1991"
 Leaving UserFN _h() => "28 February 1991"
-../tests/test.rem(27): Trig = Thursday, 28 February, 1991
+../tests/test.rem(30): Trig = Thursday, 28 February, 1991
 [_h(15, "Nisan")]   MSG Pesach
 Entering UserFN _h(15, "Nisan")
 x => 15
@@ -117,7 +121,7 @@ y => "Nisan"
 hebdate(15, "Nisan") => 1991-03-30
 trigger(1991-03-30) => "30 March 1991"
 Leaving UserFN _h() => "30 March 1991"
-../tests/test.rem(28): Trig = Saturday, 30 March, 1991
+../tests/test.rem(31): Trig = Saturday, 30 March, 1991
 [_h(27, "Nisan")]   MSG Yom HaShoah
 Entering UserFN _h(27, "Nisan")
 x => 27
@@ -125,7 +129,7 @@ y => "Nisan"
 hebdate(27, "Nisan") => 1991-04-11
 trigger(1991-04-11) => "11 April 1991"
 Leaving UserFN _h() => "11 April 1991"
-../tests/test.rem(29): Trig = Thursday, 11 April, 1991
+../tests/test.rem(32): Trig = Thursday, 11 April, 1991
 [_h(4,  "Iyar")]    MSG Yom HaZikaron
 Entering UserFN _h(4, "Iyar")
 x => 4
@@ -133,7 +137,7 @@ y => "Iyar"
 hebdate(4, "Iyar") => 1991-04-18
 trigger(1991-04-18) => "18 April 1991"
 Leaving UserFN _h() => "18 April 1991"
-../tests/test.rem(30): Trig = Thursday, 18 April, 1991
+../tests/test.rem(33): Trig = Thursday, 18 April, 1991
 [_h(5,  "Iyar")]    MSG Yom Ha'atzmaut
 Entering UserFN _h(5, "Iyar")
 x => 5
@@ -141,7 +145,7 @@ y => "Iyar"
 hebdate(5, "Iyar") => 1991-04-19
 trigger(1991-04-19) => "19 April 1991"
 Leaving UserFN _h() => "19 April 1991"
-../tests/test.rem(31): Trig = Friday, 19 April, 1991
+../tests/test.rem(34): Trig = Friday, 19 April, 1991
 [_h(28, "Iyar")]    MSG Yom Yerushalayim
 Entering UserFN _h(28, "Iyar")
 x => 28
@@ -149,7 +153,7 @@ y => "Iyar"
 hebdate(28, "Iyar") => 1991-05-12
 trigger(1991-05-12) => "12 May 1991"
 Leaving UserFN _h() => "12 May 1991"
-../tests/test.rem(32): Trig = Sunday, 12 May, 1991
+../tests/test.rem(35): Trig = Sunday, 12 May, 1991
 [_h(6,  "Sivan")]   MSG Shavuot
 Entering UserFN _h(6, "Sivan")
 x => 6
@@ -157,7 +161,7 @@ y => "Sivan"
 hebdate(6, "Sivan") => 1991-05-19
 trigger(1991-05-19) => "19 May 1991"
 Leaving UserFN _h() => "19 May 1991"
-../tests/test.rem(33): Trig = Sunday, 19 May, 1991
+../tests/test.rem(36): Trig = Sunday, 19 May, 1991
 [_h(9,  "Av")]      MSG Tish'a B'Av
 Entering UserFN _h(9, "Av")
 x => 9
@@ -165,7 +169,7 @@ y => "Av"
 hebdate(9, "Av") => 1991-07-20
 trigger(1991-07-20) => "20 July 1991"
 Leaving UserFN _h() => "20 July 1991"
-../tests/test.rem(34): Trig = Saturday, 20 July, 1991
+../tests/test.rem(37): Trig = Saturday, 20 July, 1991

 # Test some jahrzeit cases
 fset _i(x,y,z,a) trigger(hebdate(x,y,z,a))
@@ -179,7 +183,7 @@ a => 5759
 hebdate(30, "Heshvan", 1991-02-16, 5759) => 1991-11-07
 trigger(1991-11-07) => "7 November 1991"
 Leaving UserFN _i() => "7 November 1991"
-../tests/test.rem(38): Trig = Thursday, 7 November, 1991
+../tests/test.rem(41): Trig = Thursday, 7 November, 1991
 [_i(30, "Heshvan", today(), 5760)] MSG Complete-Defective
 today() => 1991-02-16
 Entering UserFN _i(30, "Heshvan", 1991-02-16, 5760)
@@ -190,7 +194,7 @@ a => 5760
 hebdate(30, "Heshvan", 1991-02-16, 5760) => 1991-11-07
 trigger(1991-11-07) => "7 November 1991"
 Leaving UserFN _i() => "7 November 1991"
-../tests/test.rem(39): Trig = Thursday, 7 November, 1991
+../tests/test.rem(42): Trig = Thursday, 7 November, 1991
 [_i(30, "Heshvan", today(), 5761)] MSG Illegal
 today() => 1991-02-16
 Entering UserFN _i(30, "Heshvan", 1991-02-16, 5761)
@@ -198,7 +202,7 @@ x => 30
 y => "Heshvan"
 z => 1991-02-16
 a => 5761
-hebdate(30, "Heshvan", 1991-02-16, 5761) => ../tests/test.rem(40): 30 Heshvan 5761: Invalid Hebrew date
+hebdate(30, "Heshvan", 1991-02-16, 5761) => ../tests/test.rem(43): 30 Heshvan 5761: Invalid Hebrew date
 Invalid Hebrew date
 Leaving UserFN _i() => Invalid Hebrew date

@@ -212,7 +216,7 @@ a => 5759
 hebdate(30, "Kislev", 1991-02-16, 5759) => 1991-12-07
 trigger(1991-12-07) => "7 December 1991"
 Leaving UserFN _i() => "7 December 1991"
-../tests/test.rem(42): Trig = Saturday, 7 December, 1991
+../tests/test.rem(45): Trig = Saturday, 7 December, 1991
 [_i(30, "Kislev", today(), 5760)] MSG Complete-Defective
 today() => 1991-02-16
 Entering UserFN _i(30, "Kislev", 1991-02-16, 5760)
@@ -223,7 +227,7 @@ a => 5760
 hebdate(30, "Kislev", 1991-02-16, 5760) => 1991-12-07
 trigger(1991-12-07) => "7 December 1991"
 Leaving UserFN _i() => "7 December 1991"
-../tests/test.rem(43): Trig = Saturday, 7 December, 1991
+../tests/test.rem(46): Trig = Saturday, 7 December, 1991
 [_i(30, "Kislev", today(), 5761)] MSG Illegal
 today() => 1991-02-16
 Entering UserFN _i(30, "Kislev", 1991-02-16, 5761)
@@ -231,7 +235,7 @@ x => 30
 y => "Kislev"
 z => 1991-02-16
 a => 5761
-hebdate(30, "Kislev", 1991-02-16, 5761) => ../tests/test.rem(44): 30 Kislev 5761: Invalid Hebrew date
+hebdate(30, "Kislev", 1991-02-16, 5761) => ../tests/test.rem(47): 30 Kislev 5761: Invalid Hebrew date
 Invalid Hebrew date
 Leaving UserFN _i() => Invalid Hebrew date

@@ -245,7 +249,7 @@ a => 5755
 hebdate(30, "Adar A", 1991-02-16, 5755) => 1992-03-05
 trigger(1992-03-05) => "5 March 1992"
 Leaving UserFN _i() => "5 March 1992"
-../tests/test.rem(46): Trig = Thursday, 5 March, 1992
+../tests/test.rem(49): Trig = Thursday, 5 March, 1992
 [_i(30, "Adar A", today(), 5756)] MSG Illegal
 today() => 1991-02-16
 Entering UserFN _i(30, "Adar A", 1991-02-16, 5756)
@@ -253,7 +257,7 @@ x => 30
 y => "Adar A"
 z => 1991-02-16
 a => 5756
-hebdate(30, "Adar A", 1991-02-16, 5756) => ../tests/test.rem(47): No Adar A in 5756
+hebdate(30, "Adar A", 1991-02-16, 5756) => ../tests/test.rem(50): No Adar A in 5756
 Invalid Hebrew date
 Leaving UserFN _i() => Invalid Hebrew date
 [_i(29, "Adar A", today(), 5755)] MSG Leap
@@ -266,7 +270,7 @@ a => 5755
 hebdate(29, "Adar A", 1991-02-16, 5755) => 1991-03-15
 trigger(1991-03-15) => "15 March 1991"
 Leaving UserFN _i() => "15 March 1991"
-../tests/test.rem(48): Trig = Friday, 15 March, 1991
+../tests/test.rem(51): Trig = Friday, 15 March, 1991
 [_i(29, "Adar A", today(), 5756)] MSG Illegal
 today() => 1991-02-16
 Entering UserFN _i(29, "Adar A", 1991-02-16, 5756)
@@ -274,225 +278,235 @@ x => 29
 y => "Adar A"
 z => 1991-02-16
 a => 5756
-hebdate(29, "Adar A", 1991-02-16, 5756) => ../tests/test.rem(49): No Adar A in 5756
+hebdate(29, "Adar A", 1991-02-16, 5756) => ../tests/test.rem(52): No Adar A in 5756
 Invalid Hebrew date
 Leaving UserFN _i() => Invalid Hebrew date

 # This causes a parse error on version 03.01.01
 REM 1990-01-01 SATISFY 1
-../tests/test.rem(52): Expired
+../tests/test.rem(55): Expired

 # Test each possible case of the basic reminders.

 REM MSG Every Day
-../tests/test.rem(56): Trig = Saturday, 16 February, 1991
+../tests/test.rem(59): Trig = Saturday, 16 February, 1991
 Every Day


 REM 18 MSG Every 18th 
-../tests/test.rem(58): Trig = Monday, 18 February, 1991
+../tests/test.rem(61): Trig = Monday, 18 February, 1991
 REM 15 MSG Every 15th
-../tests/test.rem(59): Trig = Friday, 15 March, 1991
+../tests/test.rem(62): Trig = Friday, 15 March, 1991

 REM Feb MSG February
-../tests/test.rem(61): Trig = Saturday, 16 February, 1991
+../tests/test.rem(64): Trig = Saturday, 16 February, 1991
 February

 REM Jan MSG January
-../tests/test.rem(62): Trig = Wednesday, 1 January, 1992
+../tests/test.rem(65): Trig = Wednesday, 1 January, 1992
 REM March MSG March
-../tests/test.rem(63): Trig = Friday, 1 March, 1991
+../tests/test.rem(66): Trig = Friday, 1 March, 1991

 REM 13 Jan MSG 13 Jan
-../tests/test.rem(65): Trig = Monday, 13 January, 1992
+../tests/test.rem(68): Trig = Monday, 13 January, 1992
 REM 15 Feb MSG 15 Feb
-../tests/test.rem(66): Trig = Saturday, 15 February, 1992
+../tests/test.rem(69): Trig = Saturday, 15 February, 1992
 REM 28 Feb MSG 28 Feb
-../tests/test.rem(67): Trig = Thursday, 28 February, 1991
+../tests/test.rem(70): Trig = Thursday, 28 February, 1991
 REM 29 Feb MSG 29 Feb
-../tests/test.rem(68): Trig = Saturday, 29 February, 1992
+../tests/test.rem(71): Trig = Saturday, 29 February, 1992
 REM 5 Mar MSG 5 Mar
-../tests/test.rem(69): Trig = Tuesday, 5 March, 1991
+../tests/test.rem(72): Trig = Tuesday, 5 March, 1991

 REM 1990 MSG 1990
-../tests/test.rem(71): Expired
+../tests/test.rem(74): Expired
 REM 1991 MSG 1991
-../tests/test.rem(72): Trig = Saturday, 16 February, 1991
+../tests/test.rem(75): Trig = Saturday, 16 February, 1991
 1991

 REM 1992 MSG 1991
-../tests/test.rem(73): Trig = Wednesday, 1 January, 1992
+../tests/test.rem(76): Trig = Wednesday, 1 January, 1992

 REM 1 1990 MSG 1 1990
-../tests/test.rem(75): Expired
+../tests/test.rem(78): Expired
 REM 29 1991 MSG 29 1991
-../tests/test.rem(76): Trig = Friday, 29 March, 1991
+../tests/test.rem(79): Trig = Friday, 29 March, 1991
 REM 29 1992 MSG 29 1992
-../tests/test.rem(77): Trig = Wednesday, 29 January, 1992
+../tests/test.rem(80): Trig = Wednesday, 29 January, 1992
 REM 16 1991 MSG 16 1991
-../tests/test.rem(78): Trig = Saturday, 16 February, 1991
+../tests/test.rem(81): Trig = Saturday, 16 February, 1991
 16 1991


 REM Jan 1990 MSG Jan 1990
-../tests/test.rem(80): Expired
+../tests/test.rem(83): Expired
 REM Feb 1991 MSG Feb 1991
-../tests/test.rem(81): Trig = Saturday, 16 February, 1991
+../tests/test.rem(84): Trig = Saturday, 16 February, 1991
 Feb 1991

 REM Dec 1991 MSG Dec 1991
-../tests/test.rem(82): Trig = Sunday, 1 December, 1991
+../tests/test.rem(85): Trig = Sunday, 1 December, 1991
 REM May 1992 MSG May 1992
-../tests/test.rem(83): Trig = Friday, 1 May, 1992
+../tests/test.rem(86): Trig = Friday, 1 May, 1992

 REM 1 Jan 1991 MSG 1 Jan 1991
-../tests/test.rem(85): Expired
+../tests/test.rem(88): Expired
 REM 16 Feb 1991 MSG 16 Feb 1991
-../tests/test.rem(86): Trig = Saturday, 16 February, 1991
+../tests/test.rem(89): Trig = Saturday, 16 February, 1991
 16 Feb 1991

 REM 29 Dec 1992 MSG 29 Dec 1992
-../tests/test.rem(87): Trig = Tuesday, 29 December, 1992
+../tests/test.rem(90): Trig = Tuesday, 29 December, 1992

 REM Sun MSG Sun
-../tests/test.rem(89): Trig = Sunday, 17 February, 1991
+../tests/test.rem(92): Trig = Sunday, 17 February, 1991
 REM Fri Sat Tue MSG Fri Sat Tue
-../tests/test.rem(90): Trig = Saturday, 16 February, 1991
+../tests/test.rem(93): Trig = Saturday, 16 February, 1991
 Fri Sat Tue


 REM Sun 16 MSG Sun 16
-../tests/test.rem(92): Trig = Sunday, 17 February, 1991
+../tests/test.rem(95): Trig = Sunday, 17 February, 1991
 REM Mon Tue Wed Thu Fri 1 MSG Mon Tue Wed Thu Fri 1
-../tests/test.rem(93): Trig = Friday, 1 March, 1991
+../tests/test.rem(96): Trig = Friday, 1 March, 1991

 REM Sun Feb MSG Sun Feb
-../tests/test.rem(95): Trig = Sunday, 17 February, 1991
+../tests/test.rem(98): Trig = Sunday, 17 February, 1991
 REM Mon Tue March MSG Mon Tue March
-../tests/test.rem(96): Trig = Monday, 4 March, 1991
+../tests/test.rem(99): Trig = Monday, 4 March, 1991

 REM Sun 16 Feb MSG Sun 16 Feb
-../tests/test.rem(98): Trig = Sunday, 17 February, 1991
+../tests/test.rem(101): Trig = Sunday, 17 February, 1991
 REM Mon Tue 10 March MSG Mon Tue 10 March
-../tests/test.rem(99): Trig = Monday, 11 March, 1991
+../tests/test.rem(102): Trig = Monday, 11 March, 1991

 REM Sat Sun 1991 MSG Sat Sun 1991
-../tests/test.rem(101): Trig = Saturday, 16 February, 1991
+../tests/test.rem(104): Trig = Saturday, 16 February, 1991
 Sat Sun 1991

 REM Mon Tue 1992 MSG Mon Tue 1992
-../tests/test.rem(102): Trig = Monday, 6 January, 1992
+../tests/test.rem(105): Trig = Monday, 6 January, 1992

 REM Sun 16 1991 MSG Sun 16 1991
-../tests/test.rem(104): Trig = Sunday, 17 February, 1991
+../tests/test.rem(107): Trig = Sunday, 17 February, 1991
 REM Mon Tue Wed Thu Fri 1 1992 MSG Mon Tue Wed Thu Fri 1 1992
-../tests/test.rem(105): Trig = Wednesday, 1 January, 1992
+../tests/test.rem(108): Trig = Wednesday, 1 January, 1992

 REM Mon Feb 1991 MSG Mon Feb 1991
-../tests/test.rem(107): Trig = Monday, 18 February, 1991
+../tests/test.rem(110): Trig = Monday, 18 February, 1991
 REM Tue Jan 1992 MSG Tue Jan 1992
-../tests/test.rem(108): Trig = Tuesday, 7 January, 1992
+../tests/test.rem(111): Trig = Tuesday, 7 January, 1992

 REM Sun Mon 16 Feb 1991 MSG Sun Mon 16 Feb 1991
-../tests/test.rem(110): Trig = Sunday, 17 February, 1991
+../tests/test.rem(113): Trig = Sunday, 17 February, 1991
 REM Tue 28 Jan 1992 MSG Tue 28 Jan 1992
-../tests/test.rem(111): Trig = Tuesday, 28 January, 1992
+../tests/test.rem(114): Trig = Tuesday, 28 January, 1992

 # Try some Backs
 CLEAR-OMIT-CONTEXT
 REM 1 -1 OMIT sat sun MSG 1 -1 OMIT Sat Sun
-../tests/test.rem(115): Trig = Thursday, 28 February, 1991
+../tests/test.rem(118): Trig = Thursday, 28 February, 1991
 REM 1 --1 OMIT sat sun MSG 1 --1 OMIT Sat Sun
-../tests/test.rem(116): Trig = Thursday, 28 February, 1991
+../tests/test.rem(119): Trig = Thursday, 28 February, 1991

 OMIT 28 Feb
 REM 1 -1 OMIT sat sun MSG 1 -1 OMIT Sat Sun (28 Feb omitted)
-../tests/test.rem(119): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(122): Trig = Wednesday, 27 February, 1991
 REM 1 --1 OMIT sat sun MSG 1 --1 OMIT Sat Sun (28 Feb omitted)
-../tests/test.rem(120): Trig = Thursday, 28 February, 1991
+../tests/test.rem(123): Trig = Thursday, 28 February, 1991

 CLEAR-OMIT-CONTEXT

 # Try out UNTIL
 REM Wed UNTIL 21 Feb 1991 MSG Wed UNTIL 21 Feb 1991
-../tests/test.rem(125): Trig = Wednesday, 20 February, 1991
+../tests/test.rem(128): Trig = Wednesday, 20 February, 1991

 # Try playing with the OMIT context

 OMIT 28 Feb 1991
 REM 1 Mar -1 MSG 1 mar -1 (28feb91 omitted)
-../tests/test.rem(130): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(133): Trig = Wednesday, 27 February, 1991
 REM 1 Mar --1 MSG 1 mar --1 (28Feb91 omitted)
-../tests/test.rem(131): Trig = Thursday, 28 February, 1991
+../tests/test.rem(134): Trig = Thursday, 28 February, 1991
 REM 28 Feb BEFORE MSG 28 Feb BEFORE (28Feb91 omitted)
-../tests/test.rem(132): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(135): Trig = Wednesday, 27 February, 1991
 REM 28 Feb SKIP MSG 28 Feb SKIP (28Feb91 omitted)
-../tests/test.rem(133): Trig = Friday, 28 February, 1992
+../tests/test.rem(136): Trig = Friday, 28 February, 1992
 REM 28 Feb AFTER MSG 28 Feb AFTER (28Feb91 omitted)
-../tests/test.rem(134): Trig = Friday, 1 March, 1991
+../tests/test.rem(137): Trig = Friday, 1 March, 1991

 PUSH-OMIT-CONTEXT
 CLEAR-OMIT-CONTEXT
 REM 1 Mar -1 MSG 1 mar -1
-../tests/test.rem(138): Trig = Thursday, 28 February, 1991
-REM 1 Mar --1 MSG 1 mar --1
-../tests/test.rem(139): Trig = Thursday, 28 February, 1991
-REM 28 Feb BEFORE MSG 28 Feb BEFORE
-../tests/test.rem(140): Trig = Thursday, 28 February, 1991
-REM 28 Feb SKIP MSG 28 Feb SKIP
 ../tests/test.rem(141): Trig = Thursday, 28 February, 1991
-REM 28 Feb AFTER MSG 28 Feb AFTER
+REM 1 Mar --1 MSG 1 mar --1
 ../tests/test.rem(142): Trig = Thursday, 28 February, 1991
+REM 28 Feb BEFORE MSG 28 Feb BEFORE
+../tests/test.rem(143): Trig = Thursday, 28 February, 1991
+REM 28 Feb SKIP MSG 28 Feb SKIP
+../tests/test.rem(144): Trig = Thursday, 28 February, 1991
+REM 28 Feb AFTER MSG 28 Feb AFTER
+../tests/test.rem(145): Trig = Thursday, 28 February, 1991

 POP-OMIT-CONTEXT
 REM 1 Mar -1 MSG 1 mar -1 (28feb91 omitted)
-../tests/test.rem(145): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(148): Trig = Wednesday, 27 February, 1991
 REM 1 Mar --1 MSG 1 mar --1 (28Feb91 omitted)
-../tests/test.rem(146): Trig = Thursday, 28 February, 1991
+../tests/test.rem(149): Trig = Thursday, 28 February, 1991
 REM 28 Feb BEFORE MSG 28 Feb BEFORE (28Feb91 omitted)
-../tests/test.rem(147): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(150): Trig = Wednesday, 27 February, 1991
 REM 28 Feb SKIP MSG 28 Feb SKIP (28Feb91 omitted)
-../tests/test.rem(148): Trig = Friday, 28 February, 1992
+../tests/test.rem(151): Trig = Friday, 28 February, 1992
 REM 28 Feb AFTER MSG 28 Feb AFTER (28Feb91 omitted)
-../tests/test.rem(149): Trig = Friday, 1 March, 1991
+../tests/test.rem(152): Trig = Friday, 1 March, 1991


 REM 13 March 1991 *1 UNTIL 19 March 1991 MSG 13-19 Mar 91
-../tests/test.rem(152): Trig = Wednesday, 13 March, 1991
+../tests/test.rem(155): Trig = Wednesday, 13 March, 1991

 # Test BACK
 CLEAR-OMIT-CONTEXT
 REM 18 Feb 1991 +1 MSG 18 Feb 1991 +1
-../tests/test.rem(156): Trig = Monday, 18 February, 1991
+../tests/test.rem(159): Trig = Monday, 18 February, 1991

 OMIT 17 Feb 1991
 REM 18 Feb 1991 +1 MSG 18 Feb 1991 +1 (17Feb91 omitted)
-../tests/test.rem(159): Trig = Monday, 18 February, 1991
+../tests/test.rem(162): Trig = Monday, 18 February, 1991
 18 Feb 1991 +1 (17Feb91 omitted)

 REM 18 Feb 1991 ++1 MSG 18 Feb 1991 ++1 (17Feb91 omitted)
-../tests/test.rem(160): Trig = Monday, 18 February, 1991
+../tests/test.rem(163): Trig = Monday, 18 February, 1991

 CLEAR-OMIT-CONTEXT
 # Test the scanfrom clause
 REM Fri SATISFY 1
-../tests/test.rem(164): Trig = Friday, 22 February, 1991
+../tests/test.rem(167): Trig = Friday, 22 February, 1991
 OMIT [trigger(trigdate())]
 trigdate() => 1991-02-22
 trigger(1991-02-22) => "22 February 1991"
 REM Fri after MSG 23 Feb 1991
-../tests/test.rem(166): Trig = Saturday, 23 February, 1991
+../tests/test.rem(169): Trig = Saturday, 23 February, 1991
 CLEAR-OMIT-CONTEXT
 REM Fri SCANFROM [trigger(today()-7)] SATISFY 1
 today() => 1991-02-16
 1991-02-16 - 7 => 1991-02-09
 trigger(1991-02-09) => "9 February 1991"
-../tests/test.rem(168): Trig = Friday, 15 February, 1991
+../tests/test.rem(171): Trig = Friday, 15 February, 1991
 OMIT [trigger(trigdate())]
 trigdate() => 1991-02-15
 trigger(1991-02-15) => "15 February 1991"
 REM Fri after MSG 16 Feb 1991
-../tests/test.rem(170): Trig = Saturday, 16 February, 1991
+../tests/test.rem(173): Trig = Saturday, 16 February, 1991
+16 Feb 1991
+
+CLEAR-OMIT-CONTEXT
+REM Fri SCANFROM -7 SATISFY 1
+../tests/test.rem(175): Trig = Friday, 15 February, 1991
+OMIT [trigger(trigdate())]
+trigdate() => 1991-02-15
+trigger(1991-02-15) => "15 February 1991"
+REM Fri after MSG 16 Feb 1991
+../tests/test.rem(177): Trig = Saturday, 16 February, 1991
 16 Feb 1991

 CLEAR-OMIT-CONTEXT
@@ -590,7 +604,7 @@ day(1991-03-08) => 8
 8 % 2 => 0
 0 || 0 => 0
 Leaving UserFN _ofunc() => 0
-../tests/test.rem(175): Trig = Friday, 8 March, 1991
+../tests/test.rem(182): Trig = Friday, 8 March, 1991
 REM 8 March OMITFUNC _ofunc -1 MSG OmitFunc Test 2
 Entering UserFN _ofunc(1991-03-07)
 x => 1991-03-07
@@ -664,31 +678,31 @@ day(1991-02-28) => 28
 28 % 2 => 0
 0 || 0 => 0
 Leaving UserFN _ofunc() => 0
-../tests/test.rem(176): Trig = Thursday, 28 February, 1991
+../tests/test.rem(183): Trig = Thursday, 28 February, 1991

 # omitfunc ignores local/global omits
 fset _ofunc(x) 0
 OMIT 1 March
 OMIT 2 March 1991
 REM 1 March OMIT Sun OMITFUNC _ofunc AFTER MSG Should trigger 1 March
-../tests/test.rem(182): Warning: OMIT is ignored if you use OMITFUNC
+../tests/test.rem(189): Warning: OMIT is ignored if you use OMITFUNC
 Entering UserFN _ofunc(1991-02-15)
 Leaving UserFN _ofunc() => 0
 Entering UserFN _ofunc(1991-03-01)
 Leaving UserFN _ofunc() => 0
-../tests/test.rem(182): Trig = Friday, 1 March, 1991
+../tests/test.rem(189): Trig = Friday, 1 March, 1991
 REM 1 March OMIT Sun AFTER MSG Should trigger 4 March
-../tests/test.rem(183): Trig = Monday, 4 March, 1991
+../tests/test.rem(190): Trig = Monday, 4 March, 1991

 # Test shorthand reminders
 REM 1991-02-28 MSG Feb 28
-../tests/test.rem(186): Trig = Thursday, 28 February, 1991
+../tests/test.rem(193): Trig = Thursday, 28 February, 1991
 REM 1991/02/28@14:45 MSG Feb 28
-../tests/test.rem(187): Trig = Thursday, 28 February, 1991
+../tests/test.rem(194): Trig = Thursday, 28 February, 1991
 REM Wed UNTIL 1991-01-01 MSG Expired
-../tests/test.rem(188): Expired
+../tests/test.rem(195): Expired
 REM Wed SCANFROM 1991-02-26 MSG SCANFROM
-../tests/test.rem(189): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(196): Trig = Wednesday, 27 February, 1991

 set a000 abs(1)
 abs(1) => 1
@@ -712,7 +726,7 @@ set a008 coerce("string", 11:44)
 coerce("string", 11:44) => "11:44"
 set a009 coerce("int", "badnews")
 coerce("int", "badnews") => Can't coerce
-../tests/test.rem(200): Can't coerce
+../tests/test.rem(207): Can't coerce
 set a010 coerce("int", "12")
 coerce("int", "12") => 12
 set a011 coerce("int", 11:44)
@@ -724,7 +738,7 @@ set a013 date(1992, 2, 2)
 date(1992, 2, 2) => 1992-02-02
 set a014 date(1993, 2, 29)
 date(1993, 2, 29) => Bad date specification
-../tests/test.rem(205): Bad date specification
+../tests/test.rem(212): Bad date specification
 set a015 day(today())
 today() => 1991-02-16
 day(1991-02-16) => 16
@@ -819,15 +833,15 @@ strlen("sadjflkhsldkfhsdlfjhk") => 21
 set a050 substr(a049, 2)
 a049 => 21
 substr(21, 2) => Type mismatch
-../tests/test.rem(243): Type mismatch
+../tests/test.rem(250): Type mismatch
 set a051 substr(a050, 2, 6)
-a050 => ../tests/test.rem(244): Undefined variable: a050
+a050 => ../tests/test.rem(251): Undefined variable: a050
 set a052 time(1+2, 3+4)
 1 + 2 => 3
 3 + 4 => 7
 time(3, 7) => 03:07
 rem 10 jan 1992 AT 11:22 CAL
-../tests/test.rem(246): Trig = Friday, 10 January, 1992
+../tests/test.rem(253): Trig = Friday, 10 January, 1992
 set a053 trigdate()
 trigdate() => 1992-01-10
 set a054 trigtime()
@@ -840,7 +854,7 @@ set a057 value("a05"+"6")
 "a05" + "6" => "a056"
 value("a056") => "SDFJHSDF KSJDFH KJSDFH KSJDFH"
 set a058 version()
-version() => "03.01.15"
+version() => "03.01.17"
 set a059 wkday(today())
 today() => 1991-02-16
 wkday(1991-02-16) => "Saturday"
@@ -919,101 +933,101 @@ y => 11:33
 x => "foo"
 y => 11:33
 "foo" * 11:33 => Type mismatch
-../tests/test.rem(269): `*': Type mismatch
+../tests/test.rem(276): `*': Type mismatch
 Leaving UserFN h() => Type mismatch
 set a074 dosubst("%a %b %c %d %e %f %g %h", '1992/5/5')
 dosubst("%a %b %c %d %e %f %g %h", 1992-05-05) => "on Tuesday, 5 May, 1992 in 444 days' tim"...
 msg [a074]%
-../tests/test.rem(271): Trig = Saturday, 16 February, 1991
+../tests/test.rem(278): Trig = Saturday, 16 February, 1991
 a074 => "on Tuesday, 5 May, 1992 in 444 days' tim"...
 on Tuesday, 5 May, 1992 in 444 days' time on Tuesday 5 on 05-05-1992 on 05-05-1992 on Tuesday, 5 May on 05-05
 set a075 dosubst("%i %j %k %l %m %n %o %p", '1992/5/5')
 dosubst("%i %j %k %l %m %n %o %p", 1992-05-05) => "on 05-05 on Tuesday, May 5th, 1992 on Tu"...
 msg [a075]%
-../tests/test.rem(273): Trig = Saturday, 16 February, 1991
+../tests/test.rem(280): Trig = Saturday, 16 February, 1991
 a075 => "on 05-05 on Tuesday, May 5th, 1992 on Tu"...
 on 05-05 on Tuesday, May 5th, 1992 on Tuesday, May 5th on 1992-05-05 May 5  s
 set a076 dosubst("%q %r %s %t %u %v %w %x", '1992/5/5')
 dosubst("%q %r %s %t %u %v %w %x", 1992-05-05) => "s' 05 th 05 on Tuesday, 5th May, 1992 on"...
 msg [a076]%
-../tests/test.rem(275): Trig = Saturday, 16 February, 1991
+../tests/test.rem(282): Trig = Saturday, 16 February, 1991
 a076 => "s' 05 th 05 on Tuesday, 5th May, 1992 on"...
 s' 05 th 05 on Tuesday, 5th May, 1992 on Tuesday, 5th May Tuesday 444
 set a074 dosubst("%*a %*b %*c %*d %*e %*f %*g %*h", '1992/5/5')
 dosubst("%*a %*b %*c %*d %*e %*f %*g %*h", 1992-05-05) => "Tuesday, 5 May, 1992 in 444 days' time T"...
 msg [a074]%
-../tests/test.rem(277): Trig = Saturday, 16 February, 1991
+../tests/test.rem(284): Trig = Saturday, 16 February, 1991
 a074 => "Tuesday, 5 May, 1992 in 444 days' time T"...
 Tuesday, 5 May, 1992 in 444 days' time Tuesday 5 05-05-1992 05-05-1992 Tuesday, 5 May 05-05
 set a075 dosubst("%*i %*j %*k %*l %*m %*n %*o %*p", '1992/5/5')
 dosubst("%*i %*j %*k %*l %*m %*n %*o %*p", 1992-05-05) => "05-05 Tuesday, May 5th, 1992 Tuesday, Ma"...
 msg [a075]%
-../tests/test.rem(279): Trig = Saturday, 16 February, 1991
+../tests/test.rem(286): Trig = Saturday, 16 February, 1991
 a075 => "05-05 Tuesday, May 5th, 1992 Tuesday, Ma"...
 05-05 Tuesday, May 5th, 1992 Tuesday, May 5th 1992-05-05 May 5  s
 set a076 dosubst("%*q %*r %*s %*t %*u %*v %*w %*x", '1992/5/5')
 dosubst("%*q %*r %*s %*t %*u %*v %*w %*x", 1992-05-05) => "s' 05 th 05 Tuesday, 5th May, 1992 Tuesd"...
 msg [a076]%
-../tests/test.rem(281): Trig = Saturday, 16 February, 1991
+../tests/test.rem(288): Trig = Saturday, 16 February, 1991
 a076 => "s' 05 th 05 Tuesday, 5th May, 1992 Tuesd"...
 s' 05 th 05 Tuesday, 5th May, 1992 Tuesday, 5th May Tuesday 444
 set a077 dosubst("%*y %*z", '1992/5/5')
 dosubst("%*y %*z", 1992-05-05) => "1992 92
 "
 msg [a077]%
-../tests/test.rem(283): Trig = Saturday, 16 February, 1991
+../tests/test.rem(290): Trig = Saturday, 16 February, 1991
 a077 => "1992 92
 "
 1992 92
 set a074 dosubst("%A %B %C %D %E %F %G %H", '1992/5/5')
 dosubst("%A %B %C %D %E %F %G %H", 1992-05-05) => "On Tuesday, 5 May, 1992 In 444 days' tim"...
 msg [a074]%
-../tests/test.rem(285): Trig = Saturday, 16 February, 1991
+../tests/test.rem(292): Trig = Saturday, 16 February, 1991
 a074 => "On Tuesday, 5 May, 1992 In 444 days' tim"...
 On Tuesday, 5 May, 1992 In 444 days' time On Tuesday 5 On 05-05-1992 On 05-05-1992 On Tuesday, 5 May On 05-05
 set a075 dosubst("%I %J %K %L %M %N %O %P", '1992/5/5')
 dosubst("%I %J %K %L %M %N %O %P", 1992-05-05) => "On 05-05 On Tuesday, May 5th, 1992 On Tu"...
 msg [a075]%
-../tests/test.rem(287): Trig = Saturday, 16 February, 1991
+../tests/test.rem(294): Trig = Saturday, 16 February, 1991
 a075 => "On 05-05 On Tuesday, May 5th, 1992 On Tu"...
 On 05-05 On Tuesday, May 5th, 1992 On Tuesday, May 5th On 1992-05-05 May 5  S
 set a076 dosubst("%Q %R %S %T %U %V %W %X", '1992/5/5')
 dosubst("%Q %R %S %T %U %V %W %X", 1992-05-05) => "S' 05 Th 05 On Tuesday, 5th May, 1992 On"...
 msg [a076]%
-../tests/test.rem(289): Trig = Saturday, 16 February, 1991
+../tests/test.rem(296): Trig = Saturday, 16 February, 1991
 a076 => "S' 05 Th 05 On Tuesday, 5th May, 1992 On"...
 S' 05 Th 05 On Tuesday, 5th May, 1992 On Tuesday, 5th May Tuesday 444
 set a077 dosubst("%Y %Z", '1992/5/5')
 dosubst("%Y %Z", 1992-05-05) => "1992 92
 "
 msg [a077]%
-../tests/test.rem(291): Trig = Saturday, 16 February, 1991
+../tests/test.rem(298): Trig = Saturday, 16 February, 1991
 a077 => "1992 92
 "
 1992 92
 set a074 dosubst("%*A %*B %*C %*D %*E %*F %*G %*H", '1992/5/5')
 dosubst("%*A %*B %*C %*D %*E %*F %*G %*H", 1992-05-05) => "Tuesday, 5 May, 1992 In 444 days' time T"...
 msg [a074]%
-../tests/test.rem(293): Trig = Saturday, 16 February, 1991
+../tests/test.rem(300): Trig = Saturday, 16 February, 1991
 a074 => "Tuesday, 5 May, 1992 In 444 days' time T"...
 Tuesday, 5 May, 1992 In 444 days' time Tuesday 5 05-05-1992 05-05-1992 Tuesday, 5 May 05-05
 set a075 dosubst("%*I %*J %*K %*L %*M %*N %*O %*P", '1992/5/5')
 dosubst("%*I %*J %*K %*L %*M %*N %*O %*P", 1992-05-05) => "05-05 Tuesday, May 5th, 1992 Tuesday, Ma"...
 msg [a075]%
-../tests/test.rem(295): Trig = Saturday, 16 February, 1991
+../tests/test.rem(302): Trig = Saturday, 16 February, 1991
 a075 => "05-05 Tuesday, May 5th, 1992 Tuesday, Ma"...
 05-05 Tuesday, May 5th, 1992 Tuesday, May 5th 1992-05-05 May 5  S
 set a076 dosubst("%*Q %*R %*S %*T %*U %*V %*W %*X", '1992/5/5')
 dosubst("%*Q %*R %*S %*T %*U %*V %*W %*X", 1992-05-05) => "S' 05 Th 05 Tuesday, 5th May, 1992 Tuesd"...
 msg [a076]%
-../tests/test.rem(297): Trig = Saturday, 16 February, 1991
+../tests/test.rem(304): Trig = Saturday, 16 February, 1991
 a076 => "S' 05 Th 05 Tuesday, 5th May, 1992 Tuesd"...
 S' 05 Th 05 Tuesday, 5th May, 1992 Tuesday, 5th May Tuesday 444
 set a077 dosubst("%*Y %*Z", '1992/5/5')
 dosubst("%*Y %*Z", 1992-05-05) => "1992 92
 "
 msg [a077]%
-../tests/test.rem(299): Trig = Saturday, 16 February, 1991
+../tests/test.rem(306): Trig = Saturday, 16 February, 1991
 a077 => "1992 92
 "
 1992 92
@@ -1063,7 +1077,7 @@ dump
            a048  "foo"
            a067  "INT"
            a039  "February"
-            a058  "03.01.15"
+            a058  "03.01.17"
            a077  "1992 92
 "
            a049  21
@@ -1126,10 +1140,10 @@ dump $aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 $aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: Name too long
 OMIT 2010-09-03 THROUGH 2010-09-15
 OMIT December 25 MSG X
-../tests/test.rem(312): Trig = Wednesday, 25 December, 1991
+../tests/test.rem(319): Trig = Wednesday, 25 December, 1991
 # Next should give a parse error
 OMIT 26 Dec 2010 THROUGH 27 Dec 2010 MSG This is not legal
-../tests/test.rem(314): Trig = Sunday, 26 December, 2010
+../tests/test.rem(321): Trig = Sunday, 26 December, 2010
 OMIT DUMP
 Global Full OMITs (16 of maximum allowed 500):
 	1991-03-11
@@ -1150,6 +1164,18 @@ Global Full OMITs (16 of maximum allowed 500):
 	2010-12-27
 Global Partial OMITs (1 of maximum allowed 366):
 	12-25
+# Regression test for bugfix in Hebrew calendar Adar jahrzeit
+[_i(14, "Adar", today(), 5761)] MSG Purim
+today() => 1991-02-16
+Entering UserFN _i(14, "Adar", 1991-02-16, 5761)
+x => 14
+y => "Adar"
+z => 1991-02-16
+a => 5761
+hebdate(14, "Adar", 1991-02-16, 5761) => 1991-02-28
+trigger(1991-02-28) => "28 February 1991"
+Leaving UserFN _i() => "28 February 1991"
+../tests/test.rem(324): Trig = Thursday, 28 February, 1991


 Test 2
--- a/tests/test.rem
+++ b/tests/test.rem
@@ -5,6 +5,9 @@
 #
 # 	./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
@@ -169,6 +172,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)
@@ -313,7 +320,10 @@ 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
 __EOF__
 REM This line should not even be seen
 And you can put whatever you like here.
 [+f=asdfasdasde3ir0a]
+
--- a/tests/tstlang.rem
+++ b/tests/tstlang.rem
@@ -11,8 +11,7 @@
 # Use the output to verify your translations.
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 Dianne Skoll        
-# Copyright (C) 1999-2000 Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 Dianne Skoll
 #
 # ---------------------------------------------------------------------------

--- a/www/Makefile.in
+++ b/www/Makefile.in
@@ -1,7 +1,6 @@
 # Makefile.in for installing WWW server calendar scripts
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by Dianne 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.
--- a/www/cal_dispatch-DIST
+++ b/www/cal_dispatch-DIST
@@ -1,8 +1,7 @@
 #!/bin/sh

 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by Dianne Skoll
-# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 by Dianne Skoll

 # CAL_DISPATCH -- Shell script for CGI directory to dispatch calendar
 # commands.
--- a/www/calendar.html-DIST
+++ b/www/calendar.html-DIST
@@ -22,7 +22,7 @@ PostScript Calendar with Jewish Holidays</a> (Approximately 35 kB)<P>
 <a HREF="%CGIDIR%/cal_dispatch?hebhtml">
 HTML Calendar with Jewish Holidays</a>
 <HR>
-<a HREF="http://www.roaringpenguin.com/remind">
+<a HREF="https://dianne.skoll.ca/projects/remind">
 Get the Remind software</a> that provides this service.<P>

 </BODY>
--- a/www/calps
+++ b/www/calps
@@ -2,8 +2,7 @@
 # PostScript calendar shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by Dianne Skoll
-# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 by Dianne Skoll

 echo "Content-type: application/postscript"
 echo
--- a/www/hebdate
+++ b/www/hebdate
@@ -2,8 +2,7 @@
 # Hebrew date shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by Dianne Skoll
-# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 by Dianne Skoll

 echo Content-type: text/html
 echo ""
--- a/www/hebdate.rem-DIST
+++ b/www/hebdate.rem-DIST
@@ -1,8 +1,7 @@
 # Hebrew date reminder file
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by Dianne Skoll
-# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 by Dianne Skoll

 BANNER %
 IF !$PSCAL
--- a/www/hebhtml
+++ b/www/hebhtml
@@ -2,8 +2,7 @@
 # HTML calendar shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by Dianne Skoll
-# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 by Dianne Skoll

 echo "Content-Type: text/html"
 echo ""
--- a/www/hebps
+++ b/www/hebps
@@ -2,8 +2,7 @@
 # Hebrew PostScript calendar shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by Dianne Skoll
-# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 by Dianne Skoll

 # Figure out the month:  If day <= 20, use this month; otherwise, use
 # next month.
--- a/www/moon
+++ b/www/moon
@@ -2,8 +2,7 @@
 # Moon shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by Dianne Skoll
-# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 by Dianne Skoll

 echo Content-type: text/html
 echo
--- a/www/moon.rem-DIST
+++ b/www/moon.rem-DIST
@@ -1,8 +1,7 @@
 # File for giving moon phase info.
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by Dianne Skoll
-# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 by Dianne Skoll

 set now now()

--- a/www/rem2html
+++ b/www/rem2html
@@ -256,6 +256,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+(.*)$/) {
--- a/www/sunrise
+++ b/www/sunrise
@@ -2,8 +2,7 @@
 # Sunrise shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by Dianne Skoll
-# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 by Dianne Skoll

 echo Content-type: text/html
 echo
--- a/www/sunrise.rem-DIST
+++ b/www/sunrise.rem-DIST
@@ -1,8 +1,7 @@
 # File for giving sunrise info
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by Dianne Skoll
-# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 by Dianne Skoll

 set now now()

--- a/www/sunset
+++ b/www/sunset
@@ -2,8 +2,7 @@
 # Sunset shell script
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by Dianne Skoll
-# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 by Dianne Skoll

 echo Content-type: text/html
 echo
--- a/www/sunset.rem-DIST
+++ b/www/sunset.rem-DIST
@@ -1,8 +1,7 @@
 # File for giving sunset info
 #
 # This file is part of REMIND.
-# Copyright (C) 1992-1997 by Dianne Skoll
-# Copyright (C) 1999-2000 by Roaring Penguin Software Inc.
+# Copyright (C) 1992-2018 by Dianne Skoll

 set now now()
Author	SHA1	Message	Date
Dianne Skoll	41594bc1ac	Update release notes.	2019-11-15 11:14:23 -05:00
Dianne Skoll	e85199d464	Remove obsolete line.	2019-11-15 11:08:04 -05:00
Dianne Skoll	a6ee3bc704	Use git-archive to create tarball.	2019-11-15 11:06:19 -05:00
Dianne Skoll	2909106f30	Update copyright date.	2019-11-15 10:57:01 -05:00
Dianne Skoll	05b97aabb2	Sign releases.	2019-11-15 10:56:40 -05:00
Dianne Skoll	84af60d817	Delete COMMIT_EDITMSG when syncing to public git repo.	2019-11-14 17:04:43 -05:00
Dianne Skoll	72403a2512	Warn if "OMIT a THROUGH b" has a > b	2019-11-14 11:09:51 -05:00
Dianne Skoll	4ec619d646	Update copyright date.	2019-11-07 20:52:38 -05:00
Dianne Skoll	6178a627a0	Fix bug that prevented warning if we redefine a built-in function.	2019-11-07 20:50:35 -05:00
Dianne Skoll	3095fd7e4a	Enable warning-free compilation even with -Wextra.	2019-11-04 16:35:14 -05:00
Dianne Skoll	74a6041760	Update version to 03.01.17.	2019-11-04 16:18:56 -05:00
Dianne Skoll	96127e37ff	Update man page.	2019-11-04 16:16:15 -05:00
Dianne Skoll	df5484ea35	Add test for "SCANFROM -n" form.	2019-11-04 16:10:53 -05:00
Dianne Skoll	0ae3dae030	Allow shortand: SCANFROM -n meaning SCANFROM [today() - n]	2019-11-04 16:08:44 -05:00
Dianne Skoll	e5979139ac	Fix typo.	2019-02-13 11:04:20 -05:00
Dianne Skoll	f81f6deb20	Apply patch from Dov Feldstern to fix Adar behaviour.	2018-12-11 10:05:11 -05:00
Dianne Skoll	f9951909d8	First part of patch to fix ADAR behaviour	2018-12-11 10:04:05 -05:00
Dianne Skoll	bbda972b05	Properly react to changes in extra remind args.	2018-12-07 14:54:02 -05:00
Dianne Skoll	4445e9c434	Add "Extra remind options" option.	2018-12-07 14:47:47 -05:00
Dianne Skoll	709adacac2	Add helper script to sync to dianne.skoll.ca git repo	2018-11-29 11:18:35 -05:00
Dianne Skoll	9841cdd355	When dumping queue contents, omit expired reminders.	2018-11-28 14:27:40 -05:00
Dianne Skoll	4cabe5fd71	Update docs/WHATSNEW with release notes.	2018-11-09 08:27:21 -05:00
Dianne Skoll	0db239f8a0	Bump version to 03.01.16.	2018-11-09 08:20:08 -05:00
Dianne Skoll	32fb1706c8	Fix a few more SystemTime calls.	2018-11-04 13:47:18 -05:00
Dianne Skoll	c9e6cd9796	Queue should use actual clock in computer.	2018-11-04 13:45:23 -05:00
Dianne Skoll	81677528a5	In -z0 mode, wake up exactly on the minute.	2018-11-04 13:39:00 -05:00
Dianne Skoll	7761baba10	?	2018-11-04 13:29:59 -05:00
Dianne Skoll	52d252723f	Depenguinization.	2018-11-04 10:56:47 -05:00
Dianne Skoll	d476709b59	Update DST rules.	2018-10-31 10:44:44 -04:00
Dianne Skoll	0910e3da74	Center popups over cal window.	2018-10-29 13:22:33 -04:00
Dianne Skoll	2cc7b7c817	Make queue grid resize gracefully.	2018-04-19 14:06:52 -04:00
Dianne Skoll	011a95ebbd	Format the queue output better.	2018-04-19 14:01:09 -04:00
Dianne Skoll	bbdc086a1f	Correct definitions for Yom Hazikaron and Yom Ha'atzmaut.	2018-04-19 14:00:46 -04:00
Dianne Skoll	7d6617d21e	Finish adding queue feature.	2018-04-18 10:57:51 -04:00
Dianne Skoll	f684baeeb9	Add a QUEUE daemon command to dump the queue.	2018-04-18 10:43:49 -04:00
Dianne Skoll	308104853b	Redraw window if file time is updated.	2018-04-13 08:46:26 -04:00
Dianne Skoll	6953bcac35	Monitor .reminders for mtime changes and restart daemon if it changes.	2018-04-12 11:44:04 -04:00
Dianne Skoll	69e9fa4721	Put hostname in tkremind window. Silence gcc warning.	2017-07-18 10:36:08 -04:00
Dianne Skoll	72d154c5e0	Patch from Stephen Morgan to calculate astronomical and nautical twilight in addition to civil twilight.	2017-01-19 10:11:54 -05:00
Dianne Skoll	84b0a96170	Accept datetimes in ISO-8601 format on input. Add $DateTimeSep system variable to select T or @ as separator on output.	2016-07-25 10:05:25 -04:00
Dianne Skoll	6d3b8f7a09	Handle the "SHADE nnn" special with just one number. Pointed out by hymie@lactose.homelinux.net	2016-01-15 10:16:02 -05:00