diff --git a/man/remind.1.in b/man/remind.1.in index 09cfe478..130c2a83 100644 --- a/man/remind.1.in +++ b/man/remind.1.in @@ -3533,10 +3533,13 @@ will set \fBa\fR to: .fi .TP -.B slide(d_start, i_amt [,s_wkday...]) +.B slide(d_start, i_amt [, i_step] [,s_wkday...]) This function is the inverse of \fBnonomitted\fR. It adds \fIamt\fR -days (which can be negative) to \fIstart\fR, \fInot counting omitted days\fR. -The optional \fIwkday\fR arguments are additional weekday names to omit. +(which can be negative) chunks of \fIstep\fR days to \fIstart\fR, +\fInot counting omitted days\fR. If \fIstep\fR is not supplied, then +it is assumed to be 1. Note that only every \fIstep\fRth day is +tested to see if it is omitted. The optional \fIwkday\fR arguments +are additional weekday names to omit. .RS .PP Consider this example: @@ -3556,6 +3559,26 @@ May 16 and 17. You can go backwards, too, so: .fi .PP takes \fIa\fR back to 2009-05-13. +.PP +Now consider this example: +.PP +.nf + OMIT 14 May 2009 + SET a slide('2009-05-07', 2, 7) +.fi +.PP +This sets \fIa\fR to '2009-05-28' because we skip ahead two weeks, not +counting a week where the day we land on happens to be omitted. Contrast with +this: +.PP +.nf + OMIT 13 May 2009 + SET a slide('2009-05-07', 2, 7) +.fi +.PP +which sets \fIa\fR to '2009-05-21'. Although 2009-05-13 is omitted, we +don't "land" on it as we step forward in chunks of 7 days, so we never +see that it is omitted. .RE .TP .B soleq(i_which [, dqi_start]) diff --git a/src/funcs.c b/src/funcs.c index 5fae4c23..5ced952e 100644 --- a/src/funcs.c +++ b/src/funcs.c @@ -3290,6 +3290,8 @@ FSlide(func_info *info) { int r, omit, d, i, localomit, amt; Token tok; + int step = 1; + int localargs = 2; if (!HASDATE(ARG(0))) return E_BAD_TYPE; ASSERT_TYPE(1, INT_TYPE); @@ -3299,8 +3301,13 @@ FSlide(func_info *info) if (amt > 1000000) return E_2HIGH; if (amt < -1000000) return E_2LOW; + if (Nargs > 2 && ARG(2).type == INT_TYPE) { + step = ARGV(2); + if (step < 1) return E_2LOW; + localargs++; + } localomit = 0; - for (i=2; i 0) { while(amt) { - d++; + d += step; r = IsOmitted(d, localomit, NULL, &omit); if (r) return r; if (!omit) amt--; } } else { while(amt) { - d--; + d -= step; if (d < 0) return E_DATE_OVER; r = IsOmitted(d, localomit, NULL, &omit); if (r) return r; diff --git a/tests/test.cmp b/tests/test.cmp index a8ae5239..3a453e69 100644 --- a/tests/test.cmp +++ b/tests/test.cmp @@ -4860,6 +4860,12 @@ September 30 2007/08/01 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/01 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/01 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/01 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/01 * * * * 2007/09/07 # fileinfo 18 ../tests/test2.rem 2007/08/02 COLOR * * * 255 0 0 Red Thursday # fileinfo 27 ../tests/test2.rem @@ -4878,6 +4884,12 @@ September 30 2007/08/02 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/02 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/02 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/02 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/02 * * * * 2007/09/07 # fileinfo 21 ../tests/test2.rem 2007/08/03 SHADE * * * 0 255 0 # fileinfo 27 ../tests/test2.rem @@ -4896,6 +4908,12 @@ September 30 2007/08/03 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/03 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/03 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/03 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/03 * * * * 2007/09/07 # fileinfo 27 ../tests/test2.rem 2007/08/04 * * * * 3 NonOmit-1 # fileinfo 28 ../tests/test2.rem @@ -4912,6 +4930,12 @@ September 30 2007/08/04 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/04 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/04 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/04 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/04 * * * * 2007/09/07 # fileinfo 27 ../tests/test2.rem 2007/08/05 * * * * 4 NonOmit-1 # fileinfo 28 ../tests/test2.rem @@ -4928,6 +4952,12 @@ September 30 2007/08/05 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/05 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/05 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/05 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/05 * * * * 2007/09/07 # fileinfo 27 ../tests/test2.rem 2007/08/06 * * * * 5 NonOmit-1 # fileinfo 28 ../tests/test2.rem @@ -4944,7 +4974,13 @@ September 30 2007/08/06 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/06 * * * * 3 -# fileinfo 53 ../tests/test2.rem +# fileinfo 41 ../tests/test2.rem +2007/08/06 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/06 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/06 * * * * 2007/09/07 +# fileinfo 62 ../tests/test2.rem 2007/08/06 * * * * Blort # fileinfo 27 ../tests/test2.rem 2007/08/07 * * * * 6 NonOmit-1 @@ -4962,6 +4998,12 @@ September 30 2007/08/07 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/07 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/07 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/07 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/07 * * * * 2007/09/07 # fileinfo 17 ../tests/test2.rem 2007/08/08 COLOR * * * 0 0 255 Blue Wednesday # fileinfo 27 ../tests/test2.rem @@ -4980,6 +5022,12 @@ September 30 2007/08/08 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/08 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/08 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/08 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/08 * * * * 2007/09/07 # fileinfo 18 ../tests/test2.rem 2007/08/09 COLOR * * * 255 0 0 Red Thursday # fileinfo 27 ../tests/test2.rem @@ -4998,6 +5046,12 @@ September 30 2007/08/09 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/09 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/09 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/09 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/09 * * * * 2007/09/07 # fileinfo 21 ../tests/test2.rem 2007/08/10 SHADE * * * 0 255 0 # fileinfo 27 ../tests/test2.rem @@ -5016,6 +5070,12 @@ September 30 2007/08/10 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/10 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/10 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/10 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/10 * * * * 2007/09/07 # fileinfo 27 ../tests/test2.rem 2007/08/11 * * * * 10 NonOmit-1 # fileinfo 28 ../tests/test2.rem @@ -5032,6 +5092,12 @@ September 30 2007/08/11 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/11 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/11 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/11 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/11 * * * * 2007/09/07 # fileinfo 24 ../tests/test2.rem 2007/08/12 MOON * * * 0 # fileinfo 27 ../tests/test2.rem @@ -5050,6 +5116,12 @@ September 30 2007/08/12 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/12 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/12 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/12 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/12 * * * * 2007/09/07 # fileinfo 27 ../tests/test2.rem 2007/08/13 * * * * 12 NonOmit-1 # fileinfo 28 ../tests/test2.rem @@ -5066,6 +5138,12 @@ September 30 2007/08/13 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/13 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/13 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/13 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/13 * * * * 2007/09/07 # fileinfo 27 ../tests/test2.rem 2007/08/14 * * * * 13 NonOmit-1 # fileinfo 28 ../tests/test2.rem @@ -5082,6 +5160,12 @@ September 30 2007/08/14 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/14 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/14 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/14 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/14 * * * * 2007/09/07 # fileinfo 17 ../tests/test2.rem 2007/08/15 COLOR * * * 0 0 255 Blue Wednesday # fileinfo 27 ../tests/test2.rem @@ -5100,6 +5184,12 @@ September 30 2007/08/15 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/15 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/15 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/15 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/15 * * * * 2007/09/07 # fileinfo 18 ../tests/test2.rem 2007/08/16 COLOR * * * 255 0 0 Red Thursday # fileinfo 27 ../tests/test2.rem @@ -5118,6 +5208,12 @@ September 30 2007/08/16 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/16 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/16 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/16 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/16 * * * * 2007/09/07 # fileinfo 21 ../tests/test2.rem 2007/08/17 SHADE * * * 0 255 0 # fileinfo 27 ../tests/test2.rem @@ -5136,6 +5232,12 @@ September 30 2007/08/17 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/17 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/17 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/17 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/17 * * * * 2007/09/07 # fileinfo 27 ../tests/test2.rem 2007/08/18 * * * * 16 NonOmit-1 # fileinfo 28 ../tests/test2.rem @@ -5152,6 +5254,12 @@ September 30 2007/08/18 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/18 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/18 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/18 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/18 * * * * 2007/09/07 # fileinfo 27 ../tests/test2.rem 2007/08/19 * * * * 17 NonOmit-1 # fileinfo 28 ../tests/test2.rem @@ -5169,6 +5277,12 @@ September 30 # fileinfo 37 ../tests/test2.rem 2007/08/19 * * * * 3 # fileinfo 41 ../tests/test2.rem +2007/08/19 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/19 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/19 * * * * 2007/09/07 +# fileinfo 50 ../tests/test2.rem 2007/08/20 COLOR * * 825 6 7 8 1:45pm Mooo! # fileinfo 27 ../tests/test2.rem 2007/08/20 * * * * 18 NonOmit-1 @@ -5186,9 +5300,15 @@ September 30 2007/08/20 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/20 * * * * 3 -# fileinfo 53 ../tests/test2.rem +# fileinfo 41 ../tests/test2.rem +2007/08/20 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/20 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/20 * * * * 2007/09/07 +# fileinfo 62 ../tests/test2.rem 2007/08/20 * * * * Blort -# fileinfo 44 ../tests/test2.rem +# fileinfo 53 ../tests/test2.rem 2007/08/21 PostScript * * 115 (wookie) show # fileinfo 27 ../tests/test2.rem 2007/08/21 * * * * 19 NonOmit-1 @@ -5206,6 +5326,12 @@ September 30 2007/08/21 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/21 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/21 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/21 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/21 * * * * 2007/09/07 # fileinfo 17 ../tests/test2.rem 2007/08/22 COLOR * * * 0 0 255 Blue Wednesday # fileinfo 27 ../tests/test2.rem @@ -5224,9 +5350,15 @@ September 30 2007/08/22 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/22 * * * * 3 -# fileinfo 45 ../tests/test2.rem +# fileinfo 41 ../tests/test2.rem +2007/08/22 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/22 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/22 * * * * 2007/09/07 +# fileinfo 54 ../tests/test2.rem 2007/08/22 PostScript * * * (cabbage) show -# fileinfo 48 ../tests/test2.rem +# fileinfo 57 ../tests/test2.rem 2007/08/23 blort * * 1004 snoo glup # fileinfo 18 ../tests/test2.rem 2007/08/23 COLOR * * * 255 0 0 Red Thursday @@ -5246,6 +5378,12 @@ September 30 2007/08/23 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/23 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/23 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/23 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/23 * * * * 2007/09/07 # fileinfo 21 ../tests/test2.rem 2007/08/24 SHADE * * * 0 255 0 # fileinfo 27 ../tests/test2.rem @@ -5264,7 +5402,13 @@ September 30 2007/08/24 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/24 * * * * 3 -# fileinfo 49 ../tests/test2.rem +# fileinfo 41 ../tests/test2.rem +2007/08/24 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/24 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/24 * * * * 2007/09/07 +# fileinfo 58 ../tests/test2.rem 2007/08/24 blort * * * gulp wookie # fileinfo 27 ../tests/test2.rem 2007/08/25 * * * * 23 NonOmit-1 @@ -5282,6 +5426,12 @@ September 30 2007/08/25 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/25 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/25 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/25 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/25 * * * * 2007/09/07 # fileinfo 27 ../tests/test2.rem 2007/08/26 * * * * 24 NonOmit-1 # fileinfo 28 ../tests/test2.rem @@ -5298,6 +5448,12 @@ September 30 2007/08/26 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/26 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/26 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/26 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/26 * * * * 2007/09/07 # fileinfo 27 ../tests/test2.rem 2007/08/27 * * * * 25 NonOmit-1 # fileinfo 28 ../tests/test2.rem @@ -5314,7 +5470,13 @@ September 30 2007/08/27 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/27 * * * * 3 -# fileinfo 53 ../tests/test2.rem +# fileinfo 41 ../tests/test2.rem +2007/08/27 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/27 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/27 * * * * 2007/09/07 +# fileinfo 62 ../tests/test2.rem 2007/08/27 * * * * Blort # fileinfo 27 ../tests/test2.rem 2007/08/28 * * * * 26 NonOmit-1 @@ -5332,6 +5494,12 @@ September 30 2007/08/28 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/28 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/28 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/28 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/28 * * * * 2007/09/07 # fileinfo 17 ../tests/test2.rem 2007/08/29 COLOR * * * 0 0 255 Blue Wednesday # fileinfo 27 ../tests/test2.rem @@ -5350,6 +5518,12 @@ September 30 2007/08/29 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/29 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/29 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/29 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/29 * * * * 2007/09/07 # fileinfo 18 ../tests/test2.rem 2007/08/30 COLOR * * * 255 0 0 Red Thursday # fileinfo 27 ../tests/test2.rem @@ -5368,6 +5542,12 @@ September 30 2007/08/30 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/30 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/30 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/30 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/30 * * * * 2007/09/07 # fileinfo 21 ../tests/test2.rem 2007/08/31 SHADE * * * 0 255 0 # fileinfo 27 ../tests/test2.rem @@ -5386,6 +5566,12 @@ September 30 2007/08/31 * * * * 3 # fileinfo 37 ../tests/test2.rem 2007/08/31 * * * * 3 +# fileinfo 41 ../tests/test2.rem +2007/08/31 * * * * 2007/08/07 +# fileinfo 42 ../tests/test2.rem +2007/08/31 * * * * 2007/08/31 +# fileinfo 46 ../tests/test2.rem +2007/08/31 * * * * 2007/09/07 # rem2ps end Test 3 @@ -5399,6 +5585,9 @@ Test 3 2007/08/01 * * * * 4 2007/08/01 * * * * 3 2007/08/01 * * * * 3 +2007/08/01 * * * * 2007/08/07 +2007/08/01 * * * * 2007/08/31 +2007/08/01 * * * * 2007/09/07 2007/08/02 COLOR * * * 255 0 0 Red Thursday 2007/08/02 * * * * 1 NonOmit-1 2007/08/02 * * * * 1 NonOmit-2 @@ -5408,6 +5597,9 @@ Test 3 2007/08/02 * * * * 4 2007/08/02 * * * * 3 2007/08/02 * * * * 3 +2007/08/02 * * * * 2007/08/07 +2007/08/02 * * * * 2007/08/31 +2007/08/02 * * * * 2007/09/07 2007/08/03 * * * * 2 NonOmit-1 2007/08/03 * * * * 2 NonOmit-2 2007/08/03 * * * * 5 @@ -5416,6 +5608,9 @@ Test 3 2007/08/03 * * * * 4 2007/08/03 * * * * 3 2007/08/03 * * * * 3 +2007/08/03 * * * * 2007/08/07 +2007/08/03 * * * * 2007/08/31 +2007/08/03 * * * * 2007/09/07 2007/08/04 * * * * 3 NonOmit-1 2007/08/04 * * * * 3 NonOmit-2 2007/08/04 * * * * 5 @@ -5424,6 +5619,9 @@ Test 3 2007/08/04 * * * * 4 2007/08/04 * * * * 3 2007/08/04 * * * * 3 +2007/08/04 * * * * 2007/08/07 +2007/08/04 * * * * 2007/08/31 +2007/08/04 * * * * 2007/09/07 2007/08/05 * * * * 4 NonOmit-1 2007/08/05 * * * * 3 NonOmit-2 2007/08/05 * * * * 5 @@ -5432,6 +5630,9 @@ Test 3 2007/08/05 * * * * 4 2007/08/05 * * * * 3 2007/08/05 * * * * 3 +2007/08/05 * * * * 2007/08/07 +2007/08/05 * * * * 2007/08/31 +2007/08/05 * * * * 2007/09/07 2007/08/06 * * * * 5 NonOmit-1 2007/08/06 * * * * 3 NonOmit-2 2007/08/06 * * * * 5 @@ -5440,6 +5641,9 @@ Test 3 2007/08/06 * * * * 4 2007/08/06 * * * * 3 2007/08/06 * * * * 3 +2007/08/06 * * * * 2007/08/07 +2007/08/06 * * * * 2007/08/31 +2007/08/06 * * * * 2007/09/07 2007/08/06 * * * * Blort 2007/08/07 * * * * 6 NonOmit-1 2007/08/07 * * * * 4 NonOmit-2 @@ -5449,6 +5653,9 @@ Test 3 2007/08/07 * * * * 4 2007/08/07 * * * * 3 2007/08/07 * * * * 3 +2007/08/07 * * * * 2007/08/07 +2007/08/07 * * * * 2007/08/31 +2007/08/07 * * * * 2007/09/07 2007/08/08 COLOR * * * 0 0 255 Blue Wednesday 2007/08/08 * * * * 7 NonOmit-1 2007/08/08 * * * * 5 NonOmit-2 @@ -5458,6 +5665,9 @@ Test 3 2007/08/08 * * * * 4 2007/08/08 * * * * 3 2007/08/08 * * * * 3 +2007/08/08 * * * * 2007/08/07 +2007/08/08 * * * * 2007/08/31 +2007/08/08 * * * * 2007/09/07 2007/08/09 COLOR * * * 255 0 0 Red Thursday 2007/08/09 * * * * 8 NonOmit-1 2007/08/09 * * * * 6 NonOmit-2 @@ -5467,6 +5677,9 @@ Test 3 2007/08/09 * * * * 4 2007/08/09 * * * * 3 2007/08/09 * * * * 3 +2007/08/09 * * * * 2007/08/07 +2007/08/09 * * * * 2007/08/31 +2007/08/09 * * * * 2007/09/07 2007/08/10 * * * * 9 NonOmit-1 2007/08/10 * * * * 7 NonOmit-2 2007/08/10 * * * * 5 @@ -5475,6 +5688,9 @@ Test 3 2007/08/10 * * * * 4 2007/08/10 * * * * 3 2007/08/10 * * * * 3 +2007/08/10 * * * * 2007/08/07 +2007/08/10 * * * * 2007/08/31 +2007/08/10 * * * * 2007/09/07 2007/08/11 * * * * 10 NonOmit-1 2007/08/11 * * * * 8 NonOmit-2 2007/08/11 * * * * 5 @@ -5483,6 +5699,9 @@ Test 3 2007/08/11 * * * * 4 2007/08/11 * * * * 3 2007/08/11 * * * * 3 +2007/08/11 * * * * 2007/08/07 +2007/08/11 * * * * 2007/08/31 +2007/08/11 * * * * 2007/09/07 2007/08/12 * * * * 11 NonOmit-1 2007/08/12 * * * * 8 NonOmit-2 2007/08/12 * * * * 5 @@ -5491,6 +5710,9 @@ Test 3 2007/08/12 * * * * 4 2007/08/12 * * * * 3 2007/08/12 * * * * 3 +2007/08/12 * * * * 2007/08/07 +2007/08/12 * * * * 2007/08/31 +2007/08/12 * * * * 2007/09/07 2007/08/13 * * * * 12 NonOmit-1 2007/08/13 * * * * 8 NonOmit-2 2007/08/13 * * * * 5 @@ -5499,6 +5721,9 @@ Test 3 2007/08/13 * * * * 4 2007/08/13 * * * * 3 2007/08/13 * * * * 3 +2007/08/13 * * * * 2007/08/07 +2007/08/13 * * * * 2007/08/31 +2007/08/13 * * * * 2007/09/07 2007/08/14 * * * * 13 NonOmit-1 2007/08/14 * * * * 9 NonOmit-2 2007/08/14 * * * * 5 @@ -5507,6 +5732,9 @@ Test 3 2007/08/14 * * * * 4 2007/08/14 * * * * 3 2007/08/14 * * * * 3 +2007/08/14 * * * * 2007/08/07 +2007/08/14 * * * * 2007/08/31 +2007/08/14 * * * * 2007/09/07 2007/08/15 COLOR * * * 0 0 255 Blue Wednesday 2007/08/15 * * * * 13 NonOmit-1 2007/08/15 * * * * 9 NonOmit-2 @@ -5516,6 +5744,9 @@ Test 3 2007/08/15 * * * * 4 2007/08/15 * * * * 3 2007/08/15 * * * * 3 +2007/08/15 * * * * 2007/08/07 +2007/08/15 * * * * 2007/08/31 +2007/08/15 * * * * 2007/09/07 2007/08/16 COLOR * * * 255 0 0 Red Thursday 2007/08/16 * * * * 14 NonOmit-1 2007/08/16 * * * * 10 NonOmit-2 @@ -5525,6 +5756,9 @@ Test 3 2007/08/16 * * * * 4 2007/08/16 * * * * 3 2007/08/16 * * * * 3 +2007/08/16 * * * * 2007/08/07 +2007/08/16 * * * * 2007/08/31 +2007/08/16 * * * * 2007/09/07 2007/08/17 * * * * 15 NonOmit-1 2007/08/17 * * * * 11 NonOmit-2 2007/08/17 * * * * 5 @@ -5533,6 +5767,9 @@ Test 3 2007/08/17 * * * * 4 2007/08/17 * * * * 3 2007/08/17 * * * * 3 +2007/08/17 * * * * 2007/08/07 +2007/08/17 * * * * 2007/08/31 +2007/08/17 * * * * 2007/09/07 2007/08/18 * * * * 16 NonOmit-1 2007/08/18 * * * * 12 NonOmit-2 2007/08/18 * * * * 5 @@ -5541,6 +5778,9 @@ Test 3 2007/08/18 * * * * 4 2007/08/18 * * * * 3 2007/08/18 * * * * 3 +2007/08/18 * * * * 2007/08/07 +2007/08/18 * * * * 2007/08/31 +2007/08/18 * * * * 2007/09/07 2007/08/19 * * * * 17 NonOmit-1 2007/08/19 * * * * 12 NonOmit-2 2007/08/19 * * * * 5 @@ -5549,6 +5789,9 @@ Test 3 2007/08/19 * * * * 4 2007/08/19 * * * * 3 2007/08/19 * * * * 3 +2007/08/19 * * * * 2007/08/07 +2007/08/19 * * * * 2007/08/31 +2007/08/19 * * * * 2007/09/07 2007/08/20 COLOR * * 825 6 7 8 1:45pm Mooo! 2007/08/20 * * * * 18 NonOmit-1 2007/08/20 * * * * 12 NonOmit-2 @@ -5558,6 +5801,9 @@ Test 3 2007/08/20 * * * * 4 2007/08/20 * * * * 3 2007/08/20 * * * * 3 +2007/08/20 * * * * 2007/08/07 +2007/08/20 * * * * 2007/08/31 +2007/08/20 * * * * 2007/09/07 2007/08/20 * * * * Blort 2007/08/21 * * * * 19 NonOmit-1 2007/08/21 * * * * 13 NonOmit-2 @@ -5567,6 +5813,9 @@ Test 3 2007/08/21 * * * * 4 2007/08/21 * * * * 3 2007/08/21 * * * * 3 +2007/08/21 * * * * 2007/08/07 +2007/08/21 * * * * 2007/08/31 +2007/08/21 * * * * 2007/09/07 2007/08/22 COLOR * * * 0 0 255 Blue Wednesday 2007/08/22 * * * * 20 NonOmit-1 2007/08/22 * * * * 14 NonOmit-2 @@ -5576,6 +5825,9 @@ Test 3 2007/08/22 * * * * 4 2007/08/22 * * * * 3 2007/08/22 * * * * 3 +2007/08/22 * * * * 2007/08/07 +2007/08/22 * * * * 2007/08/31 +2007/08/22 * * * * 2007/09/07 2007/08/23 COLOR * * * 255 0 0 Red Thursday 2007/08/23 * * * * 21 NonOmit-1 2007/08/23 * * * * 15 NonOmit-2 @@ -5585,6 +5837,9 @@ Test 3 2007/08/23 * * * * 4 2007/08/23 * * * * 3 2007/08/23 * * * * 3 +2007/08/23 * * * * 2007/08/07 +2007/08/23 * * * * 2007/08/31 +2007/08/23 * * * * 2007/09/07 2007/08/24 * * * * 22 NonOmit-1 2007/08/24 * * * * 16 NonOmit-2 2007/08/24 * * * * 5 @@ -5593,6 +5848,9 @@ Test 3 2007/08/24 * * * * 4 2007/08/24 * * * * 3 2007/08/24 * * * * 3 +2007/08/24 * * * * 2007/08/07 +2007/08/24 * * * * 2007/08/31 +2007/08/24 * * * * 2007/09/07 2007/08/25 * * * * 23 NonOmit-1 2007/08/25 * * * * 17 NonOmit-2 2007/08/25 * * * * 5 @@ -5601,6 +5859,9 @@ Test 3 2007/08/25 * * * * 4 2007/08/25 * * * * 3 2007/08/25 * * * * 3 +2007/08/25 * * * * 2007/08/07 +2007/08/25 * * * * 2007/08/31 +2007/08/25 * * * * 2007/09/07 2007/08/26 * * * * 24 NonOmit-1 2007/08/26 * * * * 17 NonOmit-2 2007/08/26 * * * * 5 @@ -5609,6 +5870,9 @@ Test 3 2007/08/26 * * * * 4 2007/08/26 * * * * 3 2007/08/26 * * * * 3 +2007/08/26 * * * * 2007/08/07 +2007/08/26 * * * * 2007/08/31 +2007/08/26 * * * * 2007/09/07 2007/08/27 * * * * 25 NonOmit-1 2007/08/27 * * * * 17 NonOmit-2 2007/08/27 * * * * 5 @@ -5617,6 +5881,9 @@ Test 3 2007/08/27 * * * * 4 2007/08/27 * * * * 3 2007/08/27 * * * * 3 +2007/08/27 * * * * 2007/08/07 +2007/08/27 * * * * 2007/08/31 +2007/08/27 * * * * 2007/09/07 2007/08/27 * * * * Blort 2007/08/28 * * * * 26 NonOmit-1 2007/08/28 * * * * 18 NonOmit-2 @@ -5626,6 +5893,9 @@ Test 3 2007/08/28 * * * * 4 2007/08/28 * * * * 3 2007/08/28 * * * * 3 +2007/08/28 * * * * 2007/08/07 +2007/08/28 * * * * 2007/08/31 +2007/08/28 * * * * 2007/09/07 2007/08/29 COLOR * * * 0 0 255 Blue Wednesday 2007/08/29 * * * * 27 NonOmit-1 2007/08/29 * * * * 19 NonOmit-2 @@ -5635,6 +5905,9 @@ Test 3 2007/08/29 * * * * 4 2007/08/29 * * * * 3 2007/08/29 * * * * 3 +2007/08/29 * * * * 2007/08/07 +2007/08/29 * * * * 2007/08/31 +2007/08/29 * * * * 2007/09/07 2007/08/30 COLOR * * * 255 0 0 Red Thursday 2007/08/30 * * * * 28 NonOmit-1 2007/08/30 * * * * 20 NonOmit-2 @@ -5644,6 +5917,9 @@ Test 3 2007/08/30 * * * * 4 2007/08/30 * * * * 3 2007/08/30 * * * * 3 +2007/08/30 * * * * 2007/08/07 +2007/08/30 * * * * 2007/08/31 +2007/08/30 * * * * 2007/09/07 2007/08/31 * * * * 29 NonOmit-1 2007/08/31 * * * * 21 NonOmit-2 2007/08/31 * * * * 5 @@ -5652,6 +5928,9 @@ Test 3 2007/08/31 * * * * 4 2007/08/31 * * * * 3 2007/08/31 * * * * 3 +2007/08/31 * * * * 2007/08/07 +2007/08/31 * * * * 2007/08/31 +2007/08/31 * * * * 2007/09/07 Test 4 @@ -5664,6 +5943,9 @@ Test 4 2007/08/01 * * * * 4 2007/08/01 * * * * 3 2007/08/01 * * * * 3 +2007/08/01 * * * * 2007/08/07 +2007/08/01 * * * * 2007/08/31 +2007/08/01 * * * * 2007/09/07 2007/08/02 COLOR * * * 255 0 0 Red Thursday 2007/08/02 * * * * 1 NonOmit-1 2007/08/02 * * * * 1 NonOmit-2 @@ -5673,6 +5955,9 @@ Test 4 2007/08/02 * * * * 4 2007/08/02 * * * * 3 2007/08/02 * * * * 3 +2007/08/02 * * * * 2007/08/07 +2007/08/02 * * * * 2007/08/31 +2007/08/02 * * * * 2007/09/07 2007/08/03 * * * * 2 NonOmit-1 2007/08/03 * * * * 2 NonOmit-2 2007/08/03 * * * * 5 @@ -5681,6 +5966,9 @@ Test 4 2007/08/03 * * * * 4 2007/08/03 * * * * 3 2007/08/03 * * * * 3 +2007/08/03 * * * * 2007/08/07 +2007/08/03 * * * * 2007/08/31 +2007/08/03 * * * * 2007/09/07 2007/08/04 * * * * 3 NonOmit-1 2007/08/04 * * * * 3 NonOmit-2 2007/08/04 * * * * 5 @@ -5689,6 +5977,9 @@ Test 4 2007/08/04 * * * * 4 2007/08/04 * * * * 3 2007/08/04 * * * * 3 +2007/08/04 * * * * 2007/08/07 +2007/08/04 * * * * 2007/08/31 +2007/08/04 * * * * 2007/09/07 2007/08/05 * * * * 4 NonOmit-1 2007/08/05 * * * * 3 NonOmit-2 2007/08/05 * * * * 5 @@ -5697,6 +5988,9 @@ Test 4 2007/08/05 * * * * 4 2007/08/05 * * * * 3 2007/08/05 * * * * 3 +2007/08/05 * * * * 2007/08/07 +2007/08/05 * * * * 2007/08/31 +2007/08/05 * * * * 2007/09/07 2007/08/06 COLOR * * * 0 0 255 Blue Wednesday is in 2 days' time 2007/08/06 * * * * 5 NonOmit-1 2007/08/06 * * * * 3 NonOmit-2 @@ -5706,6 +6000,9 @@ Test 4 2007/08/06 * * * * 4 2007/08/06 * * * * 3 2007/08/06 * * * * 3 +2007/08/06 * * * * 2007/08/07 +2007/08/06 * * * * 2007/08/31 +2007/08/06 * * * * 2007/09/07 2007/08/06 * * * * Blort 2007/08/07 COLOR * * * 0 0 255 Blue Wednesday is tomorrow 2007/08/07 * * * * 6 NonOmit-1 @@ -5716,6 +6013,9 @@ Test 4 2007/08/07 * * * * 4 2007/08/07 * * * * 3 2007/08/07 * * * * 3 +2007/08/07 * * * * 2007/08/07 +2007/08/07 * * * * 2007/08/31 +2007/08/07 * * * * 2007/09/07 2007/08/08 COLOR * * * 0 0 255 Blue Wednesday 2007/08/08 * * * * 7 NonOmit-1 2007/08/08 * * * * 5 NonOmit-2 @@ -5725,6 +6025,9 @@ Test 4 2007/08/08 * * * * 4 2007/08/08 * * * * 3 2007/08/08 * * * * 3 +2007/08/08 * * * * 2007/08/07 +2007/08/08 * * * * 2007/08/31 +2007/08/08 * * * * 2007/09/07 2007/08/09 COLOR * * * 255 0 0 Red Thursday 2007/08/09 * * * * 8 NonOmit-1 2007/08/09 * * * * 6 NonOmit-2 @@ -5734,6 +6037,9 @@ Test 4 2007/08/09 * * * * 4 2007/08/09 * * * * 3 2007/08/09 * * * * 3 +2007/08/09 * * * * 2007/08/07 +2007/08/09 * * * * 2007/08/31 +2007/08/09 * * * * 2007/09/07 2007/08/10 * * * * 9 NonOmit-1 2007/08/10 * * * * 7 NonOmit-2 2007/08/10 * * * * 5 @@ -5742,6 +6048,9 @@ Test 4 2007/08/10 * * * * 4 2007/08/10 * * * * 3 2007/08/10 * * * * 3 +2007/08/10 * * * * 2007/08/07 +2007/08/10 * * * * 2007/08/31 +2007/08/10 * * * * 2007/09/07 2007/08/11 * * * * 10 NonOmit-1 2007/08/11 * * * * 8 NonOmit-2 2007/08/11 * * * * 5 @@ -5750,6 +6059,9 @@ Test 4 2007/08/11 * * * * 4 2007/08/11 * * * * 3 2007/08/11 * * * * 3 +2007/08/11 * * * * 2007/08/07 +2007/08/11 * * * * 2007/08/31 +2007/08/11 * * * * 2007/09/07 2007/08/12 COLOR * * * 0 0 255 Blue Wednesday is in 3 days' time 2007/08/12 * * * * 11 NonOmit-1 2007/08/12 * * * * 8 NonOmit-2 @@ -5759,6 +6071,9 @@ Test 4 2007/08/12 * * * * 4 2007/08/12 * * * * 3 2007/08/12 * * * * 3 +2007/08/12 * * * * 2007/08/07 +2007/08/12 * * * * 2007/08/31 +2007/08/12 * * * * 2007/09/07 2007/08/13 COLOR * * * 0 0 255 Blue Wednesday is in 2 days' time 2007/08/13 * * * * 12 NonOmit-1 2007/08/13 * * * * 8 NonOmit-2 @@ -5768,6 +6083,9 @@ Test 4 2007/08/13 * * * * 4 2007/08/13 * * * * 3 2007/08/13 * * * * 3 +2007/08/13 * * * * 2007/08/07 +2007/08/13 * * * * 2007/08/31 +2007/08/13 * * * * 2007/09/07 2007/08/14 COLOR * * * 0 0 255 Blue Wednesday is tomorrow 2007/08/14 * * * * 13 NonOmit-1 2007/08/14 * * * * 9 NonOmit-2 @@ -5777,6 +6095,9 @@ Test 4 2007/08/14 * * * * 4 2007/08/14 * * * * 3 2007/08/14 * * * * 3 +2007/08/14 * * * * 2007/08/07 +2007/08/14 * * * * 2007/08/31 +2007/08/14 * * * * 2007/09/07 2007/08/15 COLOR * * * 0 0 255 Blue Wednesday 2007/08/15 * * * * 13 NonOmit-1 2007/08/15 * * * * 9 NonOmit-2 @@ -5786,6 +6107,9 @@ Test 4 2007/08/15 * * * * 4 2007/08/15 * * * * 3 2007/08/15 * * * * 3 +2007/08/15 * * * * 2007/08/07 +2007/08/15 * * * * 2007/08/31 +2007/08/15 * * * * 2007/09/07 2007/08/16 COLOR * * * 255 0 0 Red Thursday 2007/08/16 * * * * 14 NonOmit-1 2007/08/16 * * * * 10 NonOmit-2 @@ -5795,6 +6119,9 @@ Test 4 2007/08/16 * * * * 4 2007/08/16 * * * * 3 2007/08/16 * * * * 3 +2007/08/16 * * * * 2007/08/07 +2007/08/16 * * * * 2007/08/31 +2007/08/16 * * * * 2007/09/07 2007/08/17 * * * * 15 NonOmit-1 2007/08/17 * * * * 11 NonOmit-2 2007/08/17 * * * * 5 @@ -5803,6 +6130,9 @@ Test 4 2007/08/17 * * * * 4 2007/08/17 * * * * 3 2007/08/17 * * * * 3 +2007/08/17 * * * * 2007/08/07 +2007/08/17 * * * * 2007/08/31 +2007/08/17 * * * * 2007/09/07 2007/08/18 * * * * 16 NonOmit-1 2007/08/18 * * * * 12 NonOmit-2 2007/08/18 * * * * 5 @@ -5811,6 +6141,9 @@ Test 4 2007/08/18 * * * * 4 2007/08/18 * * * * 3 2007/08/18 * * * * 3 +2007/08/18 * * * * 2007/08/07 +2007/08/18 * * * * 2007/08/31 +2007/08/18 * * * * 2007/09/07 2007/08/19 * * * * 17 NonOmit-1 2007/08/19 * * * * 12 NonOmit-2 2007/08/19 * * * * 5 @@ -5819,6 +6152,9 @@ Test 4 2007/08/19 * * * * 4 2007/08/19 * * * * 3 2007/08/19 * * * * 3 +2007/08/19 * * * * 2007/08/07 +2007/08/19 * * * * 2007/08/31 +2007/08/19 * * * * 2007/09/07 2007/08/20 COLOR * * 825 6 7 8 1:45pm Mooo! 2007/08/20 COLOR * * * 0 0 255 Blue Wednesday is in 2 days' time 2007/08/20 * * * * 18 NonOmit-1 @@ -5829,6 +6165,9 @@ Test 4 2007/08/20 * * * * 4 2007/08/20 * * * * 3 2007/08/20 * * * * 3 +2007/08/20 * * * * 2007/08/07 +2007/08/20 * * * * 2007/08/31 +2007/08/20 * * * * 2007/09/07 2007/08/20 * * * * Blort 2007/08/21 COLOR * * * 0 0 255 Blue Wednesday is tomorrow 2007/08/21 * * * * 19 NonOmit-1 @@ -5839,6 +6178,9 @@ Test 4 2007/08/21 * * * * 4 2007/08/21 * * * * 3 2007/08/21 * * * * 3 +2007/08/21 * * * * 2007/08/07 +2007/08/21 * * * * 2007/08/31 +2007/08/21 * * * * 2007/09/07 2007/08/22 COLOR * * * 0 0 255 Blue Wednesday 2007/08/22 * * * * 20 NonOmit-1 2007/08/22 * * * * 14 NonOmit-2 @@ -5848,6 +6190,9 @@ Test 4 2007/08/22 * * * * 4 2007/08/22 * * * * 3 2007/08/22 * * * * 3 +2007/08/22 * * * * 2007/08/07 +2007/08/22 * * * * 2007/08/31 +2007/08/22 * * * * 2007/09/07 2007/08/23 COLOR * * * 255 0 0 Red Thursday 2007/08/23 * * * * 21 NonOmit-1 2007/08/23 * * * * 15 NonOmit-2 @@ -5857,6 +6202,9 @@ Test 4 2007/08/23 * * * * 4 2007/08/23 * * * * 3 2007/08/23 * * * * 3 +2007/08/23 * * * * 2007/08/07 +2007/08/23 * * * * 2007/08/31 +2007/08/23 * * * * 2007/09/07 2007/08/24 * * * * 22 NonOmit-1 2007/08/24 * * * * 16 NonOmit-2 2007/08/24 * * * * 5 @@ -5865,6 +6213,9 @@ Test 4 2007/08/24 * * * * 4 2007/08/24 * * * * 3 2007/08/24 * * * * 3 +2007/08/24 * * * * 2007/08/07 +2007/08/24 * * * * 2007/08/31 +2007/08/24 * * * * 2007/09/07 2007/08/25 * * * * 23 NonOmit-1 2007/08/25 * * * * 17 NonOmit-2 2007/08/25 * * * * 5 @@ -5873,6 +6224,9 @@ Test 4 2007/08/25 * * * * 4 2007/08/25 * * * * 3 2007/08/25 * * * * 3 +2007/08/25 * * * * 2007/08/07 +2007/08/25 * * * * 2007/08/31 +2007/08/25 * * * * 2007/09/07 2007/08/26 * * * * 24 NonOmit-1 2007/08/26 * * * * 17 NonOmit-2 2007/08/26 * * * * 5 @@ -5881,6 +6235,9 @@ Test 4 2007/08/26 * * * * 4 2007/08/26 * * * * 3 2007/08/26 * * * * 3 +2007/08/26 * * * * 2007/08/07 +2007/08/26 * * * * 2007/08/31 +2007/08/26 * * * * 2007/09/07 2007/08/27 COLOR * * * 0 0 255 Blue Wednesday is in 2 days' time 2007/08/27 * * * * 25 NonOmit-1 2007/08/27 * * * * 17 NonOmit-2 @@ -5890,6 +6247,9 @@ Test 4 2007/08/27 * * * * 4 2007/08/27 * * * * 3 2007/08/27 * * * * 3 +2007/08/27 * * * * 2007/08/07 +2007/08/27 * * * * 2007/08/31 +2007/08/27 * * * * 2007/09/07 2007/08/27 * * * * Blort 2007/08/28 COLOR * * * 0 0 255 Blue Wednesday is tomorrow 2007/08/28 * * * * 26 NonOmit-1 @@ -5900,6 +6260,9 @@ Test 4 2007/08/28 * * * * 4 2007/08/28 * * * * 3 2007/08/28 * * * * 3 +2007/08/28 * * * * 2007/08/07 +2007/08/28 * * * * 2007/08/31 +2007/08/28 * * * * 2007/09/07 2007/08/29 COLOR * * * 0 0 255 Blue Wednesday 2007/08/29 * * * * 27 NonOmit-1 2007/08/29 * * * * 19 NonOmit-2 @@ -5909,6 +6272,9 @@ Test 4 2007/08/29 * * * * 4 2007/08/29 * * * * 3 2007/08/29 * * * * 3 +2007/08/29 * * * * 2007/08/07 +2007/08/29 * * * * 2007/08/31 +2007/08/29 * * * * 2007/09/07 2007/08/30 COLOR * * * 255 0 0 Red Thursday 2007/08/30 * * * * 28 NonOmit-1 2007/08/30 * * * * 20 NonOmit-2 @@ -5918,6 +6284,9 @@ Test 4 2007/08/30 * * * * 4 2007/08/30 * * * * 3 2007/08/30 * * * * 3 +2007/08/30 * * * * 2007/08/07 +2007/08/30 * * * * 2007/08/31 +2007/08/30 * * * * 2007/09/07 2007/08/31 * * * * 29 NonOmit-1 2007/08/31 * * * * 21 NonOmit-2 2007/08/31 * * * * 5 @@ -5926,6 +6295,9 @@ Test 4 2007/08/31 * * * * 4 2007/08/31 * * * * 3 2007/08/31 * * * * 3 +2007/08/31 * * * * 2007/08/07 +2007/08/31 * * * * 2007/08/31 +2007/08/31 * * * * 2007/09/07 Test 5 # rem2ps begin diff --git a/tests/test2.rem b/tests/test2.rem index 07659ed7..58fae931 100644 --- a/tests/test2.rem +++ b/tests/test2.rem @@ -37,6 +37,15 @@ REM MSG [nonomitted('2007-08-01', '2007-08-29', 7)] REM MSG [nonomitted('2007-08-01', '2007-08-28', 7)] POP-OMIT-CONTEXT +# Test slide +REM MSG [slide('2007-08-03', 4)] +REM MSG [slide('2007-08-03', 4, 7)] + +PUSH-OMIT-CONTEXT +OMIT 2007-08-17 +REM MSG [slide('2007-08-03', 4, 7)] +POP-OMIT-CONTEXT + # Test SPECIAL COLOR with an AT clause REM 20 AUG AT 13:45 SPECIAL COLOR 6 7 8 Mooo!