6 files changed, 51 insertions, 91 deletions
diff --git a/libical/test-data/0 b/libical/test-data/0
index e30493fcc0..3d7fb999cb 100644
--- a/libical/test-data/0
+++ b/libical/test-data/0
@@ -1,21 +1,9 @@
-BEGIN:VCALENDAR
-PRODID:-//GNOME//NONSGML GnomeCalendar//EN
-VERSION:0.0.1
-BEGIN:VEVENT
-UID:20000216T083142-31506-500-2714-0@twitch
-SEQUENCE:0
-DTSTART:19970714T170000
-DTEND:19970715T035959
-DCREATED:19691231T160000
-LAST-MODIFIED:20000216T083142
-SUMMARY:Bastille Day Party
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-X-PILOTID:0
-X-PILOTSTAT:1
-END:VEVENT
-
-END:VCALENDAR
-
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//hacksw/handcal//NONSGML v1.0//EN
+BEGIN:VEVENT
+DTSTART:19970714T170000Z
+DTEND:19970715T035959Z
+SUMMARY:Bastille Day Party
+END:VEVENT
+END:VCALENDAR
diff --git a/libical/test-data/1 b/libical/test-data/1
index 213b37d916..6a368d9997 100644
--- a/libical/test-data/1
+++ b/libical/test-data/1
@@ -23,14 +23,17 @@ DTSTAMP:19980309T231000Z
 UID:guid-1.host1.com
 ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com
 ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com
+ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:mailto:Employee-B@HOST.com
+ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MailTo:Eric@Agony.Qualcomm.com
 DESCRIPTION:Project XYZ Review Meeting
 CATEGORIES:MEETING
 CLASS:PUBLIC
 CREATED:19980309T130000Z
 SUMMARY:XYZ Project Review
-DTSTART;TZID=US-Eastern:19980312T083000
+DTSTAR;TZID=US-Eastern:19980312T083000
 DTEND;TZID=US-Eastern:19980312T093000
-LOCATION:1CP Conference Room 4350
+LOCATION:1CP Conference 
+Room 4350
 END:VEVENT
 END:VCALENDAR
 
diff --git a/libical/test-data/2445.ics b/libical/test-data/2445.ics
index 1168324d88..f225f26331 100644
--- a/libical/test-data/2445.ics
+++ b/libical/test-data/2445.ics
@@ -1,11 +1,4 @@
 BEGIN:VCALENDAR
-X-LIC-CLUSTERCOUNT
- :0
-DTSTART
- :00000000T000000
-DTEND
- :00000000T000000     
-BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//hacksw/handcal//NONSGML v1.0//EN
 BEGIN:VEVENT
@@ -248,7 +241,7 @@ LOCATION:1CP Conference Room 4350
 END:VEVENT
 END:VCALENDAR
 BEGIN:VCALENDAR
-METHOD:xyz
+METHOD:PUBLISH
 VERSION:2.0
 PRODID:-//ABC Corporation//NONSGML My Product//EN
 BEGIN:VEVENT
@@ -256,7 +249,6 @@ DTSTAMP:19970324T1200Z
 SEQUENCE:0
 UID:uid3@host1.com
 ORGANIZER:MAILTO:jdoe@host1.com
-ATTENDEE;RSVP=TRUE:MAILTO:jsmith@host1.com
 DTSTART:19970324T123000Z
 DTEND:19970324T210000Z
 CATEGORIES:MEETING,PROJECT
@@ -283,7 +275,7 @@ STATUS:NEEDS-ACTION
 SUMMARY:Submit Income Taxes
 BEGIN:VALARM
 ACTION:AUDIO
-TRIGGER;VALUE=DATE-TIME:19980403T120000Z
+TRIGGER:19980403T120000
 ATTACH;FMTTYPE=audio/basic:http://host.com/pub/audio-
  files/ssbanner.aud
 REPEAT:4
@@ -303,8 +295,9 @@ CLASS:PUBLIC
 CATEGORIES:Project Report, XYZ, Weekly Meeting
 DESCRIPTION:Project xyz Review Meeting Minutes\n
  Agenda\n1. Review of project version 1.0 requirements.\n2.
- Definition of project processes.\n3. Review of project schedule.\n
- Participants: John Smith, Jane Doe, Jim Dandy\n-It was
+ Definition
+ of project processes.\n3. Review of project schedule.\n
+ Participants: John Smith\, Jane Doe\, Jim Dandy\n-It was
   decided that the requirements need to be signed off by
   product marketing.\n-Project processes were accepted.\n
  -Project schedule needs to account for scheduled holidays
@@ -326,4 +319,3 @@ FREEBUSY:19980318T030000Z/19980318T040000Z
 URL:http://www.host.com/calendar/busytime/jsmith.ifb
 END:VFREEBUSY
 END:VCALENDAR
-END:VCALENDAR
-\ No newline at end of file
diff --git a/libical/test-data/2446.ics b/libical/test-data/2446.ics
index 679f6c7920..0f816efeba 100644
--- a/libical/test-data/2446.ics
+++ b/libical/test-data/2446.ics
@@ -1,10 +1,4 @@
-BEGIN:VCALENDAR
-X-LIC-CLUSTERCOUNT
- :0
-DTSTART
- :00000000T000000
-DTEND
- :00000000T000000   
+
 BEGIN:VCALENDAR
 METHOD:PUBLISH
 PRODID:-//ACME/DesktopCalendar//EN
@@ -17,6 +11,7 @@ SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
 UID:0981234-1234234-23@example.com
 END:VEVENT
 END:VCALENDAR
+
 BEGIN:VCALENDAR
 METHOD:PUBLISH
 VERSION:2.0
@@ -46,7 +41,7 @@ END:VCALENDAR
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:PUBLISH
-SCALE:GREGORIAN
+CALSCALE:GREGORIAN
 VERSION:2.0
 BEGIN:VTIMEZONE
 TZID:America-Chicago
@@ -202,7 +197,6 @@ COMMENT:This time works much better and I think the big conference
   room is too big
 UID:calsrv.example.com-873970198738777a@example.com
 SEQUENCE:0
-DTSTAMP:19970611T190000Z
 END:VEVENT
 END:VCALENDAR
 BEGIN:VCALENDAR
@@ -231,10 +225,8 @@ METHOD:DECLINECOUNTER
 VERSION:2.0
 BEGIN:VEVENT
 ORGANIZER:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-COMMENT:Sorry, I cannot change this meeting time
+COMMENT:Sorry\, I cannot change this meeting time
 UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
 DTSTAMP:19970614T190000Z
 END:VEVENT
 END:VCALENDAR
@@ -279,8 +271,6 @@ BEGIN:VEVENT
 ORGANIZER:MAILTO:A@Example.com
 ATTENDEE;PARTSTAT=ACCEPTED;DELEGATED-
  FROM="Mailto:C@example.com":Mailto:E@example.com
-ATTENDEE;PARTSTAT=DELEGATED;
- DELEGATED-TO="Mailto:E@example.com":Mailto:C@example.com
 UID:calsrv.example.com-873970198738777@example.com
 SEQUENCE:0
 REQUEST-STATUS:2.0;Success
@@ -295,9 +285,7 @@ BEGIN:VEVENT
 ORGANIZER:MAILTO:A@Example.com
 ATTENDEE;PARTSTAT=DELEGATED;
  DELEGATED-TO="Mailto:E@example.com":Mailto:C@example.com
-ATTENDEE;PARTSTAT=DECLINED;
- DELEGATED-FROM="Mailto:C@example.com":Mailto:E@example.com
-COMMENT:Sorry, I will be out of town at that time.
+COMMENT:Sorry\, I will be out of town at that time.
 UID:calsrv.example.com-873970198738777@example.com
 SEQUENCE:0
 REQUEST-STATUS:2.0;Success
@@ -577,7 +565,7 @@ CLASS:PUBLIC
 SUMMARY:IETF Calendaring Working Group Meeting
 DTSTART:19970901T210000Z
 DTEND:19970901T220000Z
-LOCATION:Building 32, Microsoft, Seattle, WA
+LOCATION:Building 32\, Microsoft\, Seattle\, WA
 DTSTAMP:19970526T083000Z
 STATUS:CONFIRMED
 END:VEVENT
@@ -630,7 +618,7 @@ VERSION:2.0
 BEGIN:VEVENT
 UID:123456789@host1.com
 SEQUENCE:7
-RRULE:WKST=SU;BYDAY=TH;FREQ=WEEKLY
+RRULE:FREQ=WEEKLY;WKST=SU;BYDAY=TH
 ORGANIZER:Mailto:A@example.com
 ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
 ATTENDEE;RSVP=TRUE:Mailto:B@example.com
@@ -649,7 +637,7 @@ VERSION:2.0
 BEGIN:VEVENT
 UID:123456789@host1.com
 SEQUENCE:7
-RRULE:WKST=SU;BYDAY=TU,TH;FREQ=WEEKLY
+RRULE:FREQ=WEEKLY;WKST=SU;BYDAY=TU,TH
 ORGANIZER:Mailto:A@example.com
 ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
 ATTENDEE;RSVP=TRUE:Mailto:B@example.com
@@ -742,13 +730,15 @@ END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:2
 RECURRENCE-ID:19980311T160000Z
-ATTENDEE;ROLE=CHAIR;RSVP=TRUE:Mailto:A@example.com
+ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
 ATTENDEE;RSVP=TRUE:Mailto:B@example.com
 SUMMARY:Review Accounts
 DTSTART:19980311T160000Z
 DTEND:19980304T180000Z
 DTSTAMP:19980306T193000Z
+ORGANIZER:Mailto:A@example.com
 LOCATION:The Small conference room
+UID:guid-1@host1.com
 STATUS:CONFIRMED
 END:VEVENT
 END:VCALENDAR
@@ -873,6 +863,7 @@ BEGIN:VTODO
 ORGANIZER:MAILTO:A@example.com
 ATTENDEE;PARTSTAT=IN-PROCESS:Mailto:B@example.com
 PERCENT-COMPLETE:75
+REQUEST-STATUS:2.0
 UID:calsrv.example.com-873970198738777-00@example.com
 DTSTAMP:19970717T233000Z
 SEQUENCE:0
@@ -886,6 +877,7 @@ BEGIN:VTODO
 ORGANIZER:MAILTO:A@example.com
 ATTENDEE;PARTSTAT=COMPLETED:Mailto:D@example.com
 UID:calsrv.example.com-873970198738777-00@example.com
+REQUEST-STATUS:2.0
 DTSTAMP:19970717T233000Z
 SEQUENCE:0
 END:VTODO
@@ -926,7 +918,7 @@ SUMMARY:Send Status Reports to Area Managers
 UID:calsrv.example.com-873970198738777-00@example.com
 SEQUENCE:0
 DTSTAMP:19970717T200000Z
-STATUS:NEEDS ACTION
+STATUS:NEEDS-ACTION
 PRIORITY:1
 END:VTODO
 END:VCALENDAR
@@ -941,6 +933,8 @@ UID:calsrv.example.com-873970198738777-00@example.com
 DTSTAMP:19970717T233000Z
 RECURRENCE-ID:19980101T170000Z
 SEQUENCE:1
+ORGANIZER:MAILTO:A@Example.com
+REQUEST-STATUS:2.0
 END:VTODO
 END:VCALENDAR
 BEGIN:VCALENDAR
@@ -949,9 +943,10 @@ PRODID:-//ACME/DesktopCalendar//EN
 VERSION:2.0
 BEGIN:VJOURNAL
 DTSTART:19971002T200000Z
+DTSTAMP:19971002T200000Z
 ORGANIZER:MAILTO:A@Example.com
 SUMMARY:Phone conference minutes
-DESCRIPTION:The editors meeting was held on October 1, 1997.
+DESCRIPTION:The editors meeting was held on October 1\, 1997.
   Details are in the attached document.
 UID:0981234-1234234-2410@example.com
 RELATED-TO:0981234-1234234-2402-35@example.com
@@ -965,9 +960,6 @@ VERSION:2.0
 BEGIN:VEVENT
 ORGANIZER:Mailto:A@example.com
 ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-ATTENDEE:Mailto:C@example.com
-ATTENDEE:Mailto:D@example.com
 UID: guid-1-12345@host1.com
 DTSTAMP:19970603T094000
 END:VEVENT
@@ -1004,4 +996,3 @@ UID:acme-12345@host1.com
 DTSTAMP:19970603T094000
 END:VEVENT
 END:VCALENDAR
-END:VCALENDAR
-\ No newline at end of file
diff --git a/libical/test-data/6 b/libical/test-data/6
index e0214b5021..753bd2b66c 100644
--- a/libical/test-data/6
+++ b/libical/test-data/6
@@ -1,21 +1,12 @@
-BEGIN:VCALENDAR
-PRODID:-//GNOME//NONSGML GnomeCalendar//EN
-VERSION:0.0.1
-BEGIN:VEVENT
-UID:0981234-1234234-23@example.com
-SEQUENCE:0
-DTSTART:19970701T200000
-DTEND:19691231T160000
-DCREATED:19691231T160000
-LAST-MODIFIED:20000216T083225
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-X-PILOTID:0
-X-PILOTSTAT:1
-END:VEVENT
-
-END:VCALENDAR
-
+BEGIN:VCALENDAR
+METHOD:PUBLISH
+PRODID:-//ACME/DesktopCalendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+ORGANIZER:mailto:a@example.com
+DTSTART:19970701T200000Z
+DTSTAMP:19970611T190000Z
+SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
+UID:0981234-1234234-23@example.com
+END:VEVENT
+END:VCALENDAR
diff --git a/libical/test-data/smallcluster.ics b/libical/test-data/smallcluster.ics
index c4e2dbae50..2902136bab 100644
--- a/libical/test-data/smallcluster.ics
+++ b/libical/test-data/smallcluster.ics
@@ -1,15 +1,10 @@
 BEGIN:VCALENDAR
-X-LIC-CLUSTERCOUNT
- :0
-DTSTART
- :00000000T000000
-DTEND
- :00000000T000000     
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//hacksw/handcal//NONSGML v1.0//EN
 BEGIN:VEVENT
-DTSTART:19970714T170000Z
+DTSTART
+ :19970714T170000Z
 DTEND:19970715T035959Z
 SUMMARY:Bastille Day Party
 RRULE:FREQ=YEARLY;UNTIL=123456T123456;BYSETPOS=-1,2,-3,4,-5,6,-7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,4,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54;BYSECOND=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,4,25,26