This commit was generated by cvs2svn to compensate for changes in r7747,

which included commits to RCS files with non-trunk default branches.

svn path=/trunk/; revision=7748

2 files changed, 28 insertions, 262 deletions

diff --git a/libical/test-data/classify.ics b/libical/test-data/classify.ics
index 27794e1ac6..c7c5a1e438 100644
--- a/libical/test-data/classify.ics
+++ b/libical/test-data/classify.ics
@@ -12,7 +12,7 @@ ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
 ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
 DTSTAMP:19970611T190000Z
 DTSTART:19960701T200000Z
-DTEND:19970701T2000000Z
+DTEND:19970701T200000Z
 SUMMARY:Conference
 UID:calsrv.example.com-873970198738777@example.com
 SEQUENCE:1
@@ -34,7 +34,7 @@ ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
 ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
 DTSTAMP:19950611T190000Z
 DTSTART:19970701T200000Z
-DTEND:19970701T2000000Z
+DTEND:19970701T200000Z
 SUMMARY:Conference in the park
 UID:calsrv.example.com-873970198738777@example.com
 SEQUENCE:0
diff --git a/libical/test-data/recur.txt b/libical/test-data/recur.txt
index 8c977b3c05..2020331993 100644
--- a/libical/test-data/recur.txt
+++ b/libical/test-data/recur.txt
@@ -7,231 +7,17 @@ DTSTART
 RRULE
  :FREQ=DAILY;COUNT=10;INTERVAL=1
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Daily until December 24\, 1997:
 DTSTART
  ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;UNTIL=19971224T000000Z;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every other day - forever:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=2
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 10 days\, 5 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=5;INTERVAL=10
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Daily for 10 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Daily until December 24\, 1997:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;UNTIL=19971224T000000Z;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every other day - forever:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=2
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 10 days\, 5 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=5;INTERVAL=10
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Daily for 10 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Daily until December 24\, 1997:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;UNTIL=19971224T000000Z;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every other day - forever:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=2
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 10 days\, 5 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=5;INTERVAL=10
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Daily for 10 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Daily until December 24\, 1997:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;UNTIL=19971224T000000Z;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every other day - forever:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=2
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 10 days\, 5 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=5;INTERVAL=10
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Daily for 10 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Daily until December 24\, 1997:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;UNTIL=19971224T000000Z;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every other day - forever:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=2
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 10 days\, 5 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=5;INTERVAL=10
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Daily for 10 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Daily until December 24\, 1997:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;UNTIL=19971224T000000Z;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every other day - forever:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=2
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 10 days\, 5 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=5;INTERVAL=10
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Daily for 10 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Daily until December 24\, 1997:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
+ :19971215T090000
 RRULE
  :FREQ=DAILY;UNTIL=19971224T000000Z;INTERVAL=1
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Every other day - forever:
@@ -241,6 +27,7 @@ DTSTART
 RRULE
  :FREQ=DAILY;COUNT=10;INTERVAL=2
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Every 10 days\, 5 occurrences:
@@ -250,6 +37,7 @@ DTSTART
 RRULE
  :FREQ=DAILY;COUNT=5;INTERVAL=10
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Daily for 10 occurrences:
@@ -259,42 +47,17 @@ DTSTART
 RRULE
  :FREQ=DAILY;COUNT=10;INTERVAL=1
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
- :Daily until December 24\, 1997:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;UNTIL=19971224T000000Z;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every other day - forever:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=10;INTERVAL=2
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Every 10 days\, 5 occurrences:
-DTSTART
- ;TZID=US-Eastern
- :19970902T090000
-RRULE
- :FREQ=DAILY;COUNT=5;INTERVAL=10
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION
- :Everyday in January\, for 3 years
+ :Every day in January\, for 3 years
 DTSTART
  ;TZID=US-Eastern
  :19980101T090000
 RRULE
  :FREQ=YEARLY;UNTIL=20000131T090000Z;INTERVAL=1;BYDAY=SU,MO,TU,WE,TH,FR,SA;BYMONTH=1
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Everyday in January\, for 3 years:
@@ -304,6 +67,7 @@ DTSTART
 RRULE
  :FREQ=DAILY;UNTIL=20000131T090000Z;INTERVAL=1;BYMONTH=1
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Weekly for 10 occurrences
@@ -313,6 +77,7 @@ DTSTART
 RRULE
  :FREQ=WEEKLY;COUNT=10;INTERVAL=1
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Weekly until December 24\, 1997
@@ -322,6 +87,7 @@ DTSTART
 RRULE
  :FREQ=WEEKLY;UNTIL=19971224T000000Z;INTERVAL=1
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Every other week - forever:
@@ -331,6 +97,7 @@ DTSTART
 RRULE
  :FREQ=WEEKLY;INTERVAL=2
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Weekly on Tuesday and Thursday for 5 weeks:
@@ -340,6 +107,7 @@ DTSTART
 RRULE
  :FREQ=WEEKLY;UNTIL=19971007T000000Z;INTERVAL=1;BYDAY=TU,TH
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Weekly on Tuesday and Thursday for 5 weeks:
@@ -349,6 +117,7 @@ DTSTART
 RRULE
  :FREQ=WEEKLY;COUNT=10;INTERVAL=1;BYDAY=TU,TH
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Every other week on Monday\, Wednesday and Friday until December 
@@ -356,11 +125,10 @@ DESCRIPTION
 DTSTART
  ;TZID=US-Eastern
  :19970902T090000
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'FREQ=WEEKLY\;INTERVAL=2\;UNTIL=19971224T000000Z\;WKST=SU\;'
+RRULE
+ :FREQ=WEEKLY;INTERVAL=2;UNTIL=19971224T000000Z;BYDAY=MO,WE,FR;WKST=SU
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Every other week on Tuesday and Thursday\, for 8 occurrences:
@@ -395,10 +163,8 @@ DESCRIPTION
 DTSTART
  ;TZID=US-Eastern
  :19970907T090000
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'FREQ=MONTHLY\;INTERVAL=2\;COUNT=10\;BYDAY=1SU\,-1SU'
+RULE
+ :FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=1SU,-1SU'
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
@@ -429,8 +195,10 @@ RRULE
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
- :Monthly on the first and last day of the month for 10 occurrences:\nDTSTART
- \;TZID=US-Eastern:19970930T090000
+ :Monthly on the first and last day of the month for 10 occurrences:\n
+DTSTART
+ ;TZID=US-Eastern
+ :19970930T090000
 RRULE
  :FREQ=MONTHLY;COUNT=10;INTERVAL=1;BYMONTHDAY=1,-1
 END:VEVENT
@@ -597,7 +365,7 @@ DTSTART
  ;TZID=US-Eastern
  :19970902T090000
 RRULE
- :FREQ=DAILY;INTERVAL=1;BYMINUTE=0,20,40;BYHOUR=9,10,11,12,13,14,15,16
+ :FREQ=DAILY;COUNT=20;INTERVAL=1;BYMINUTE=0,20,40;BYHOUR=9,10,11,12,13,14,15,16
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
@@ -606,7 +374,7 @@ DTSTART
  ;TZID=US-Eastern
  :19970902T090000
 RRULE
- :FREQ=MINUTELY;INTERVAL=20;BYHOUR=9,10,11,12,13,14,15,16
+ :FREQ=MINUTELY;COUNT=20;INTERVAL=20;BYHOUR=9,10,11,12,13,14,15,16
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
@@ -621,9 +389,7 @@ END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
  :An example where the days generated makes a difference because of 
- WKST. Changing only WKST from MO to SU
-DESCRIPTION
- : yields different results...  
+ WKST. Changing only WKST from MO to SU yields different results...  
 DTSTART
  ;TZID=US-Eastern
  :19970805T090000