Import new libical from mainline HEAD and make appropriate changes to

Evolution.

svn path=/trunk/; revision=22538

7 files changed, 169 insertions, 37 deletions

diff --git a/libical/design-data/.cvsignore b/libical/design-data/.cvsignore
index 3dda72986f..bbc8ba00d1 100644
--- a/libical/design-data/.cvsignore
+++ b/libical/design-data/.cvsignore
@@ -1,2 +1,5 @@
-Makefile.in
 Makefile
+.deps
+.libs
+*.lo
+*.la
diff --git a/libical/design-data/components.txt b/libical/design-data/components.txt
index ae5cc976ad..c4736e72b2 100644
--- a/libical/design-data/components.txt
+++ b/libical/design-data/components.txt
@@ -1,22 +1,22 @@
+ANY
+VAGENDA
+VALARM
 VCALENDAR
+VCAR
+VCOMMAND
 VEVENT
-VTODO
-VJOURNAL
 VFREEBUSY
+VJOURNAL
+VQUERY
+VSCHEDULE
 VTIMEZONE
-XSTANDARDTIME
-XDAYLIGHTSAVINGSTIME
-VALARM
+VTODO
+X
 XAUDIOALARM
+XDAYLIGHTSAVINGSTIME
 XDISPLAYALARM
 XEMAILALARM
-XPROCEDUREALARM
-X
-VSCHEDULE
-VQUERY
-VCAR
-VCOMMAND
 XLICINVALID
 XMIMEPART
-ANY
-
+XPROCEDUREALARM
+XSTANDARDTIME
diff --git a/libical/design-data/parameters.csv b/libical/design-data/parameters.csv
index f223b415a8..d0a2ef9df6 100644
--- a/libical/design-data/parameters.csv
+++ b/libical/design-data/parameters.csv
@@ -12,13 +12,22 @@
 "MEMBER","const char*",
 "PARTSTAT","icalparameter_partstat","NEEDS-ACTION;ACCEPTED;DECLINED;TENTATIVE;DELEGATED;COMPLETED;INPROCESS"
 "RANGE","icalparameter_range","THISANDPRIOR;THISANDFUTURE"
-"RELATED","icalparameter_related","START;END "
+"RELATED","icalparameter_related","START;END"
 "RELTYPE","icalparameter_reltype","PARENT;CHILD;SIBLING"
 "ROLE","icalparameter_role","CHAIR;REQ-PARTICIPANT;OPT-PARTICIPANT;NON-PARTICIPANT"
 "RSVP","icalparameter_rsvp","TRUE;FALSE"
 "SENT-BY","const char*",
 "TZID","const char*",
-"VALUE","icalparameter_value","BINARY;BOOLEAN;DATE;DURATION;FLOAT;INTEGER;PERIOD;RECUR;TEXT;TIME;URI;ERROR;DATE-TIME;UTC-OFFSET;CAL-ADDRESS"
+"VALUE","icalparameter_value","BINARY;BOOLEAN;DATE;DURATION;FLOAT;INTEGER;PERIOD;RECUR;TEXT;URI;ERROR;DATE-TIME;UTC-OFFSET;CAL-ADDRESS"
 "X","const char*",
 "X-LIC-ERRORTYPE","icalparameter_xlicerrortype","COMPONENT-PARSE-ERROR;PROPERTY-PARSE-ERROR;PARAMETER-NAME-PARSE-ERROR;PARAMETER-VALUE-PARSE-ERROR;VALUE-PARSE-ERROR;INVALID-ITIP;UNKNOWN-VCAL-PROP-ERROR;MIME-PARSE-ERROR;VCAL-PROP-PARSE-ERROR"
-"X-LIC-COMPARETYPE","icalparameter_xliccomparetype","EQUAL;NOTEQUAL;LESS;GREATER;LESSEQUAL;GREATEREQUAL;REGEX"
+"X-LIC-COMPARETYPE","icalparameter_xliccomparetype","EQUAL;NOTEQUAL;LESS;GREATER;LESSEQUAL;GREATEREQUAL;REGEX;ISNULL;ISNOTNULL"
+"#CAP Parameters","Draft 8",
+"#this parameter should really be called ACTION, but this conflicts with the ACTION property"
+"ACTIONPARAM","icalparameter_action","ASK;ABORT"
+"ID","const char*",
+"ENABLE","icalparameter_enable","TRUE;FALSE"
+"LATENCY","const char*",
+"LOCAL","icalparameter_local","TRUE;FALSE"
+"LOCALIZE","const char*",
+"OPTIONS","const char*",
diff --git a/libical/design-data/params-in-prop.txt b/libical/design-data/params-in-prop.txt
index 4d4e133fc3..863366312e 100644
--- a/libical/design-data/params-in-prop.txt
+++ b/libical/design-data/params-in-prop.txt
@@ -4,6 +4,7 @@ ATTENDEE             CN CUTYPE DELEGATED-FROM DELEGATED-TO DIR LANGUAGE MEMBER P
 CALSCALE             X
 CATEGORIES           LANGUAGE X
 CLASS                X
+CMD		     ACTIONPARAM ID LATENCY LOCALIZE OPTIONS X
 COMMENT              ALTREP LANGUAGE X
 COMPLETED            X
 CONTACT              ALTREP LANGUAGE X
@@ -32,11 +33,11 @@ REPEAT               X
 REQUEST-STATUS       LANGUAGE X
 RESOURCES            ALTREP LANGUAGE X
 RRULE                X
-SEQUENCE             X
+SEQUENCE             LOCAL X
 STATUS               X
 SUMMARY              ALTREP LANGUAGE X
 TRANSP               X
-TRIGGER              VALUE RELATED X
+TRIGGER              ENABLE VALUE RELATED X
 TZID                 X
 TZNAME               LANGUAGE X
 TZOFFSETFROM         X
@@ -52,4 +53,5 @@ MAXRESULTS           X
 MAXRESULTSSIZE       X
 QUERY                X
 QUERYNAME            X
-TARGET               X
\ No newline at end of file
+TARGET               X
+EXPAND               X
diff --git a/libical/design-data/properties.csv b/libical/design-data/properties.csv
index dca6810d8f..11f977ed3d 100644
--- a/libical/design-data/properties.csv
+++ b/libical/design-data/properties.csv
@@ -5,7 +5,7 @@
 "ATTENDEE","CAL-ADDRESS","CAL-ADDRESS"
 "CALSCALE","TEXT","TEXT"
 "CATEGORIES","TEXT","TEXT"
-"CLASS","TEXT","TEXT"
+"CLASS","CLASS","CLASS"
 "COMMENT","TEXT","TEXT"
 "COMPLETED","DATE-TIME","DATE-TIME"
 "CONTACT","TEXT","TEXT"
@@ -31,13 +31,13 @@
 "RECURRENCE-ID","DATE-TIME","DATE-TIME"
 "RELATED-TO","TEXT","TEXT"
 "REPEAT","INTEGER","INTEGER"
-"REQUEST-STATUS","STRING","STRING"
+"REQUEST-STATUS","REQUEST-STATUS","REQUEST-STATUS"
 "RESOURCES","TEXT","TEXT"
 "RRULE","RECUR","RECUR"
 "SEQUENCE","INTEGER","INTEGER"
 "STATUS","STATUS","STATUS"
 "SUMMARY","TEXT","TEXT"
-"TRANSP","TEXT","TEXT"
+"TRANSP","TRANSP","TRANSP"
 "TRIGGER","TRIGGER","DURATION"
 "TZID","TEXT","TEXT"
 "TZNAME","TEXT","TEXT"
@@ -47,13 +47,10 @@
 "UID","TEXT","TEXT"
 "URL","URI","URI"
 "VERSION","TEXT","TEXT"
-"X","TEXT","TEXT"
-"SCOPE","TEXT","TEXT"
+"X","X","X"
 "MAXRESULTS","INTEGER","INTEGER"
 "MAXRESULTSSIZE","INTEGER","INTEGER"
-"QUERY","QUERY","QUERY"
 "QUERYNAME","TEXT","TEXT"
-"TARGET","CAL-ADDRESS","CAL-ADDRESS"
 "X-LIC-ERROR","TEXT","TEXT"
 "X-LIC-CLUSTERCOUNT","STRING","STRING"
 "X-LIC-MIMECONTENTTYPE","STRING","STRING"
@@ -62,5 +59,50 @@
 "X-LIC-MIMEOPTINFO","STRING","STRING"
 "X-LIC-MIMECID","STRING","STRING"
 "X-LIC-MIMEFILENAME","STRING","STRING"
+"X-LIC-CLASS","X-LIC-CLASS","X-LIC-CLASS"
 "ANY","NO","NO"
 "NO","NO","NO"
+"#CAP Properties",,
+,"FIXME","Should be BOOLEAN"
+"ALLOW-CONFLICT","TEXT","TEXT"
+"CALID","TEXT","TEXT"
+"CALMASTER","TEXT","TEXT"
+"CARID","TEXT","TEXT"
+"CMD","CMD","CMD"
+"CSID","URI","URI"
+"DECREED","TEXT","TEXT"
+"DEFAULT-CHARSET","TEXT","TEXT"
+"DEFAULT-LOCALE","TEXT","TEXT"
+"DEFAULT-TZID","TEXT","TEXT"
+"DEFAULT-VCARS","TEXT","TEXT"
+,"FIXME","Should be UPN-FILTER"
+"DENY","TEXT","TEXT"
+,"FIXME","Should be BOOLEAN"
+"EXPAND","INTEGER","INTEGER"
+,"FIXME","Should be UPN-FILTER"
+"GRANT","TEXT","TEXT"
+"MAXDATE","DATE-TIME","DATE-TIME"
+"MINDATE","DATE-TIME","DATE-TIME"
+"NAME","TEXT","TEXT"
+"OWNER","TEXT","TEXT"
+"PERMISSION","TEXT","TEXT"
+"QUERY","QUERY","QUERY"
+"QUERYID","TEXT","TEXT"
+"RELCALID","TEXT","TEXT"
+"RESTRICTION","QUERY","QUERY"
+"SCOPE","TEXT","TEXT"
+"TARGET","CAL-ADDRESS","CAL-ADDRESS"
+"#CAP Properties","These are only allowed in VREPLY",
+"CAP-VERSION","TEXT","TEXT"
+"CAR-LEVEL","CAR-LEVEL","CAR-LEVEL"
+"COMPONENTS","TEXT","TEXT"
+"STORES-EXPANDED","TEXT","TEXT"
+"DATE-MAX","DATE-TIME","DATE-TIME"
+"DATE-MIN","DATE-TIME","DATE-TIME"
+"ITIP-VERSION","TEXT","TEXT"
+"MAX-COMPONENT-SIZE","INTEGER","INTEGER"
+"MULTIPART","TEXT","TEXT"
+"QUERY-LEVEL","QUERY-LEVEL","QUERY-LEVEL"
+"RECUR-ACCEPTED","TEXT","TEXT"
+"RECUR-EXPAND","TEXT","TEXT"
+"RECUR-LIMIT","TEXT","TEXT"
diff --git a/libical/design-data/restrictions.csv b/libical/design-data/restrictions.csv
index 1c62e2a8b4..bded850694 100644
--- a/libical/design-data/restrictions.csv
+++ b/libical/design-data/restrictions.csv
@@ -14,8 +14,8 @@ PUBLISH,VEVENT,COMMENT,NONE,ZEROORONE
 PUBLISH,VEVENT,CONTACT,NONE,ZEROPLUS
 PUBLISH,VEVENT,CREATED,NONE,ZEROORONE
 PUBLISH,VEVENT,DESCRIPTION,NONE,ZEROORONE
-PUBLISH,VEVENT,DTEND,NONE,ZEROORONE
-PUBLISH,VEVENT,DURATION,NONE,ZEROORONE
+PUBLISH,VEVENT,DTEND,NONE,ONEEXCLUSIVE,no_duration
+PUBLISH,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_dtend
 PUBLISH,VEVENT,EXDATE,NONE,ZEROPLUS
 PUBLISH,VEVENT,EXRULE,NONE,ZEROPLUS
 PUBLISH,VEVENT,GEO,NONE,ZEROORONE
@@ -38,6 +38,7 @@ PUBLISH,VEVENT,NONE,VJOURNAL,ZERO
 PUBLISH,VEVENT,NONE,VTODO,ZERO
 PUBLISH,VEVENT,NONE,VTIMEZONE,ZEROPLUS,must_if_tz_ref
 PUBLISH,VEVENT,NONE,X,ZEROPLUS
+PUBLISH,VEVENT,RELCALID,NONE,ZEROORONE
 REQUEST,VEVENT,NONE,NONE,ONEPLUS
 REQUEST,VEVENT,ATTENDEE,NONE,ONEPLUS
 REQUEST,VEVENT,DTSTAMP,NONE,ONE
@@ -77,6 +78,7 @@ REQUEST,VEVENT,NONE,X,ZEROPLUS
 REQUEST,VEVENT,NONE,VFREEBUSY,ZERO
 REQUEST,VEVENT,NONE,VJOURNAL,ZERO
 REQUEST,VEVENT,NONE,VTODO,ZERO
+REQUEST,VEVENT,RELCALID,NONE,ZEROORONE
 REPLY,VEVENT,NONE,NONE,ONEPLUS
 REPLY,VEVENT,ATTENDEE,NONE,ONE
 REPLY,VEVENT,DTSTAMP,NONE,ONE
@@ -116,6 +118,7 @@ REPLY,VEVENT,NONE,VALARM,ZERO
 REPLY,VEVENT,NONE,VFREEBUSY,ZERO
 REPLY,VEVENT,NONE,VJOURNAL,ZERO
 REPLY,VEVENT,NONE,VTODO,ZERO
+REPLY,VEVENT,RELCALID,NONE,ZEROORONE
 ADD,VEVENT,NONE,NONE,ONE
 ADD,VEVENT,DTSTAMP,NONE,ONE
 ADD,VEVENT,DTSTART,NONE,ONE
@@ -132,7 +135,7 @@ ADD,VEVENT,CONTACT,NONE,ZEROPLUS
 ADD,VEVENT,CREATED,NONE,ZEROORONE
 ADD,VEVENT,DESCRIPTION,NONE,ZEROORONE
 ADD,VEVENT,DTEND,NONE,ONEEXCLUSIVE,no_duration
-ADD,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_duration
+ADD,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_dtend
 ADD,VEVENT,EXDATE,NONE,ZEROPLUS
 ADD,VEVENT,EXRULE,NONE,ZEROPLUS
 ADD,VEVENT,GEO,NONE,ZEROORONE
@@ -155,6 +158,7 @@ ADD,VEVENT,NONE,X,ZEROPLUS
 ADD,VEVENT,NONE,VFREEBUSY,ZERO
 ADD,VEVENT,NONE,VTODO,ZERO
 ADD,VEVENT,NONE,VJOURNAL,ZERO
+ADD,VEVENT,RELCALID,NONE,ZEROORONE
 CANCEL,VEVENT,NONE,NONE,ONEPLUS
 CANCEL,VEVENT,ATTENDEE,NONE,ZEROPLUS
 CANCEL,VEVENT,DTSTAMP,NONE,ONE
@@ -170,7 +174,7 @@ CANCEL,VEVENT,CREATED,NONE,ZEROORONE
 CANCEL,VEVENT,DESCRIPTION,NONE,ZEROORONE
 CANCEL,VEVENT,DTEND,NONE,ONEEXCLUSIVE ,no_duration
 CANCEL,VEVENT,DTSTART,NONE,ZEROORONE
-CANCEL,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_duration
+CANCEL,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_dtend
 CANCEL,VEVENT,EXDATE,NONE,ZEROPLUS
 CANCEL,VEVENT,EXRULE,NONE,ZEROPLUS
 CANCEL,VEVENT,GEO,NONE,ZEROORONE
@@ -194,6 +198,7 @@ CANCEL,VEVENT,NONE,VTODO,ZERO
 CANCEL,VEVENT,NONE,VJOURNAL,ZERO
 CANCEL,VEVENT,NONE,VFREEBUSY,ZERO
 CANCEL,VEVENT,NONE,VALARM,ZERO
+CANCEL,VEVENT,RELCALID,NONE,ZEROORONE
 REFRESH,VEVENT,NONE,NONE,ONE
 REFRESH,VEVENT,ATTENDEE,NONE,ONE
 REFRESH,VEVENT,DTSTAMP,NONE,ONE
@@ -233,6 +238,7 @@ REFRESH,VEVENT,NONE,VJOURNAL,ZERO
 REFRESH,VEVENT,NONE,VFREEBUSY,ZERO
 REFRESH,VEVENT,NONE,VTIMEZONE,ZERO,must_if_tz_ref
 REFRESH,VEVENT,NONE,VALARM,ZERO
+REFRESH,VEVENT,RELCALID,NONE,ZEROORONE
 COUNTER,VEVENT,NONE,NONE,ONE
 COUNTER,VEVENT,DTSTAMP,NONE,ONE
 COUNTER,VEVENT,DTSTART,NONE,ONE
@@ -249,7 +255,7 @@ COUNTER,VEVENT,CONTACT,NONE,ZEROPLUS
 COUNTER,VEVENT,CREATED,NONE,ZEROORONE
 COUNTER,VEVENT,DESCRIPTION,NONE,ZEROORONE
 COUNTER,VEVENT,DTEND,NONE,ONEEXCLUSIVE,no_duration
-COUNTER,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_duration
+COUNTER,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_dtend
 COUNTER,VEVENT,EXDATE,NONE,ZEROPLUS
 COUNTER,VEVENT,EXRULE,NONE,ZEROPLUS
 COUNTER,VEVENT,GEO,NONE,ZEROORONE
@@ -272,6 +278,7 @@ COUNTER,VEVENT,NONE,X,ZEROPLUS
 COUNTER,VEVENT,NONE,VTODO,ZERO
 COUNTER,VEVENT,NONE,VJOURNAL,ZERO
 COUNTER,VEVENT,NONE,VFREEBUSY,ZERO
+COUNTER,VEVENT,RELCALID,NONE,ZEROORONE
 DECLINECOUNTER,VEVENT,NONE,NONE,ONE
 DECLINECOUNTER,VEVENT,DTSTAMP,NONE,ONE
 DECLINECOUNTER,VEVENT,ORGANIZER,NONE,ONE
@@ -311,6 +318,7 @@ DECLINECOUNTER,VEVENT,NONE,VJOURNAL,ZERO
 DECLINECOUNTER,VEVENT,NONE,VFREEBUSY,ZERO
 DECLINECOUNTER,VEVENT,NONE,VTIMEZONE,ZERO,must_if_tz_ref
 DECLINECOUNTER,VEVENT,NONE,VALARM,ZERO
+DECLINECOUNTER,VEVENT,RELCALID,NONE,ZEROORONE
 PUBLISH,VFREEBUSY,NONE,NONE,ONEPLUS
 PUBLISH,VFREEBUSY,DTSTAMP,NONE,ONE
 PUBLISH,VFREEBUSY,DTSTART,NONE,ONE
@@ -411,6 +419,7 @@ PUBLISH,VTODO,NONE,X,ZEROPLUS
 PUBLISH,VTODO,NONE,VFREEBUSY,ZERO
 PUBLISH,VTODO,NONE,VEVENT,ZERO
 PUBLISH,VTODO,NONE,VJOURNAL,ZERO
+PUBLISH,VTODO,RELCALID,NONE,ZEROORONE
 REQUEST,VTODO,NONE,NONE,ONEPLUS
 REQUEST,VTODO,ATTENDEE,NONE,ONEPLUS
 REQUEST,VTODO,DTSTAMP,NONE,ONE
@@ -450,6 +459,7 @@ REQUEST,VTODO,NONE,X,ZEROPLUS
 REQUEST,VTODO,NONE,VEVENT,ZERO
 REQUEST,VTODO,NONE,VFREEBUSY,ZERO
 REQUEST,VTODO,NONE,VJOURNAL,ZERO
+REQUEST,VTODO,RELCALID,NONE,ZEROORONE
 REPLY,VTODO,NONE,NONE,ONEPLUS
 REPLY,VTODO,ATTENDEE,NONE,ONEPLUS
 REPLY,VTODO,DTSTAMP,NONE,ONE
@@ -488,6 +498,7 @@ REPLY,VTODO,NONE,X,ZEROPLUS
 REPLY,VTODO,NONE,VALARM,ZERO
 REPLY,VTODO,NONE,VEVENT,ZERO
 REPLY,VTODO,NONE,VFREEBUSY,ZERO
+REPLY,VTODO,RELCALID,NONE,ZEROORONE
 ADD,VTODO,NONE,NONE,ONE
 ADD,VTODO,DTSTAMP,NONE,ONE
 ADD,VTODO,ORGANIZER,NONE,ONE
@@ -527,6 +538,7 @@ ADD,VTODO,NONE,X,ZEROPLUS
 ADD,VTODO,NONE,VEVENT,ZERO
 ADD,VTODO,NONE,VJOURNAL,ZERO
 ADD,VTODO,NONE,VFREEBUSY,ZERO
+ADD,VTODO,RELCALID,NONE,ZEROORONE
 CANCEL,VTODO,NONE,NONE,ONE
 CANCEL,VTODO,ATTENDEE,NONE,ZEROPLUS
 CANCEL,VTODO,UID,NONE,ONE
@@ -564,6 +576,7 @@ CANCEL,VTODO,NONE,X,ZEROPLUS
 CANCEL,VTODO,NONE,VALARM,ZERO
 CANCEL,VTODO,NONE,VEVENT,ZERO
 CANCEL,VTODO,NONE,VFREEBUSY,ZERO
+CANCEL,VTODO,RELCALID,NONE,ZEROORONE
 REFRESH,VTODO,NONE,NONE,ONE
 REFRESH,VTODO,ATTENDEE,NONE,ONE
 REFRESH,VTODO,DTSTAMP,NONE,ONE
@@ -601,6 +614,7 @@ REFRESH,VTODO,NONE,VALARM,ZERO
 REFRESH,VTODO,NONE,VEVENT,ZERO
 REFRESH,VTODO,NONE,VFREEBUSY,ZERO
 REFRESH,VTODO,NONE,VTIMEZONE,ZERO
+REFRESH,VTODO,RELCALID,NONE,ZEROORONE
 COUNTER,VTODO,NONE,NONE,ONE
 COUNTER,VTODO,ATTENDEE,NONE,ONEPLUS
 COUNTER,VTODO,DTSTAMP,NONE,ONE
@@ -639,6 +653,7 @@ COUNTER,VTODO,NONE,VTIMEZONE,ZEROORONE
 COUNTER,VTODO,NONE,X,ZEROPLUS
 COUNTER,VTODO,NONE,VEVENT,ZERO
 COUNTER,VTODO,NONE,VFREEBUSY,ZERO
+COUNTER,VTODO,RELCALID,NONE,ZEROORONE
 DECLINECOUNTER,VTODO,NONE,NONE,ONE
 DECLINECOUNTER,VTODO,ATTENDEE,NONE,ONEPLUS
 DECLINECOUNTER,VTODO,DTSTAMP,NONE,ONE
@@ -676,6 +691,7 @@ DECLINECOUNTER,VTODO,NONE,X,ZEROPLUS
 DECLINECOUNTER,VTODO,NONE,VALARM,ZERO
 DECLINECOUNTER,VTODO,NONE,VEVENT,ZERO
 DECLINECOUNTER,VTODO,NONE,VFREEBUSY,ZERO
+DECLINECOUNTER,VTODO,RELCALID,NONE,ZEROORONE
 PUBLISH,VJOURNAL,NONE,NONE,ONEPLUS
 PUBLISH,VJOURNAL,DESCRIPTION,NONE,ONE
 PUBLISH,VJOURNAL,DTSTAMP,NONE,ONE
@@ -770,9 +786,58 @@ CANCEL,VJOURNAL,NONE,VALARM,ZERO
 CANCEL,VJOURNAL,NONE,VEVENT,ZERO
 CANCEL,VJOURNAL,NONE,VFREEBUSY,ZERO
 CANCEL,VJOURNAL,NONE,VTODO,ZERO
+PUBLISH,VAGENDA,NONE,NONE,ONEPLUS
+PUBLISH,VAGENDA,CALMASTER,NONE,ONE
+PUBLISH,VAGENDA,OWNER,NONE,ZEROORONE
+PUBLISH,VAGENDA,RELCALID,NONE,ZEROORONE
+PUBLISH,VAGENDA,TZID,NONE,ONE
+REQUEST,VAGENDA,NONE,NONE,ONEPLUS
+REQUEST,VAGENDA,CALMASTER,NONE,ONE
+REQUEST,VAGENDA,OWNER,NONE,ZEROORONE
+REQUEST,VAGENDA,RELCALID,NONE,ZEROORONE
+REQUEST,VAGENDA,TZID,NONE,ONE
+REPLY,VAGENDA,NONE,NONE,ONEPLUS
+REPLY,VAGENDA,CALMASTER,NONE,ONE
+REPLY,VAGENDA,OWNER,NONE,ZEROORONE
+REPLY,VAGENDA,RELCALID,NONE,ZEROORONE
+REPLY,VAGENDA,TZID,NONE,ONE
+ADD,VAGENDA,NONE,NONE,ONEPLUS
+ADD,VAGENDA,CALMASTER,NONE,ONE
+ADD,VAGENDA,OWNER,NONE,ZEROORONE
+ADD,VAGENDA,RELCALID,NONE,ZEROORONE
+ADD,VAGENDA,TZID,NONE,ONE
+CANCEL,VAGENDA,NONE,NONE,ONEPLUS
+CANCEL,VAGENDA,CALMASTER,NONE,ONE
+CANCEL,VAGENDA,OWNER,NONE,ZEROORONE
+CANCEL,VAGENDA,RELCALID,NONE,ZEROORONE
+CANCEL,VAGENDA,TZID,NONE,ONE
+REFRESH,VAGENDA,NONE,NONE,ONEPLUS
+REFRESH,VAGENDA,CALMASTER,NONE,ONE
+REFRESH,VAGENDA,OWNER,NONE,ZEROORONE
+REFRESH,VAGENDA,RELCALID,NONE,ZEROORONE
+REFRESH,VAGENDA,TZID,NONE,ONE
+COUNTER,VAGENDA,NONE,NONE,ONEPLUS
+COUNTER,VAGENDA,CALMASTER,NONE,ONE
+COUNTER,VAGENDA,OWNER,NONE,ZEROORONE
+COUNTER,VAGENDA,RELCALID,NONE,ZEROORONE
+COUNTER,VAGENDA,TZID,NONE,ONE
+DECLINECOUNTER,VAGENDA,NONE,NONE,ONEPLUS
+DECLINECOUNTER,VAGENDA,CALMASTER,NONE,ONE
+DECLINECOUNTER,VAGENDA,OWNER,NONE,ZEROORONE
+DECLINECOUNTER,VAGENDA,RELCALID,NONE,ZEROORONE
+DECLINECOUNTER,VAGENDA,TZID,NONE,ONE
+NONE,VAGENDA,ALLOWCONFLICT,NONE,ONE
+NONE,VAGENDA,CALMASTER,NONE,ONE
+NONE,VAGENDA,OWNER,NONE,ZEROORONE
+NONE,VAGENDA,RELCALID,NONE,ZEROORONE
+NONE,VAGENDA,TZID,NONE,ONE
+NONE,VAGENDA,DEFAULTCHARSET,NONE,ONE
+NONE,VAGENDA,DEFAULTLOCALE,NONE,ONE
+NONE,VAGENDA,DEFAULTTZID,NONE,ONE
 NONE,VCALENDAR,ACTION,NONE,ZERO
 NONE,VCALENDAR,ATTACH,NONE,ZERO
 NONE,VCALENDAR,ATTENDEE,NONE,ZERO
+NONE,VCALENDAR,RELCALID,NONE,ZEROORONE
 NONE,VCALENDAR,CALSCALE,NONE,ZEROORONE
 NONE,VCALENDAR,CATEGORIES,NONE,ZERO
 NONE,VCALENDAR,CLASS,NONE,ZERO
@@ -833,7 +898,7 @@ NONE,VEVENT,DTEND,NONE,ONEEXCLUSIVE,no_duration
 NONE,VEVENT,DTSTAMP,NONE,ZEROORONE
 NONE,VEVENT,DTSTART,NONE,ZEROORONE
 NONE,VEVENT,DUE,NONE,ZERO
-NONE,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_duration
+NONE,VEVENT,DURATION,NONE,ONEEXCLUSIVE,no_dtend
 NONE,VEVENT,EXDATE,NONE,ZEROPLUS
 NONE,VEVENT,EXRULE,NONE,ZEROPLUS
 NONE,VEVENT,FREEBUSY,NONE,ZERO
@@ -866,6 +931,7 @@ NONE,VEVENT,UID,NONE,ZEROORONE
 NONE,VEVENT,URL,NONE,ZEROORONE
 NONE,VEVENT,VERSION,NONE,ZERO
 NONE,VEVENT,X,NONE,ZEROPLUS
+NONE,VEVENT,RELCALID,NONE,ZEROORONE
 NONE,VTODO,ACTION,NONE,ZERO
 NONE,VTODO,ATTACH,NONE,ZEROPLUS
 NONE,VTODO,ATTENDEE,NONE,ZEROPLUS
@@ -914,6 +980,7 @@ NONE,VTODO,UID,NONE,ZEROORONE
 NONE,VTODO,URL,NONE,ZEROORONE
 NONE,VTODO,VERSION,NONE,ZERO
 NONE,VTODO,X,NONE,ZEROPLUS
+NONE,VTODO,RELCALID,NONE,ZEROORONE
 NONE,VJOURNAL,ACTION,NONE,ZERO
 NONE,VJOURNAL,ATTACH,NONE,ZEROPLUS
 NONE,VJOURNAL,ATTENDEE,NONE,ZEROPLUS
@@ -1058,6 +1125,8 @@ NONE,VTIMEZONE,UID,NONE,ZERO
 NONE,VTIMEZONE,URL,NONE,ZERO
 NONE,VTIMEZONE,VERSION,NONE,ZERO
 NONE,VTIMEZONE,X,NONE,ZEROORONE
+NONE,VTIMEZONE,NONE,XSTANDARD,ZEROPLUS
+NONE,VTIMEZONE,NONE,XDAYLIGHT,ZEROPLUS
 NONE,XSTANDARD,ACTION,NONE,ZERO
 NONE,XSTANDARD,ATTACH,NONE,ZERO
 NONE,XSTANDARD,ATTENDEE,NONE,ZERO
@@ -1250,7 +1319,7 @@ NONE,XDISPLAYALARM,UID,NONE,ZERO
 NONE,XDISPLAYALARM,URL,NONE,ZERO
 NONE,XDISPLAYALARM,VERSION,NONE,ZERO
 NONE,XDISPLAYALARM,X,NONE,ZEROPLUS
-NONE,XEMAILALARM,ACTION,NONE,ONE
+NONE,XEMAILALARM,ACTION,NONE,ONE,must_be_email
 NONE,XEMAILALARM,ATTACH,NONE,ZEROPLUS
 NONE,XEMAILALARM,ATTENDEE,NONE,ONEPLUS
 NONE,XEMAILALARM,CALSCALE,NONE,ZERO
@@ -1346,3 +1415,6 @@ NONE,XPROCEDUREALARM,UID,NONE,ZERO
 NONE,XPROCEDUREALARM,URL,NONE,ZERO
 NONE,XPROCEDUREALARM,VERSION,NONE,ZERO
 NONE,XPROCEDUREALARM,X,NONE,ZEROPLUS
+NONE,VQUERY,QUERY,NONE,ZEROORONE
+NONE,VQUERY,QUERYNAME,NONE,ONE
+NONE,VQUERY,EXPAND,NONE,ONE
diff --git a/libical/design-data/value-types.csv b/libical/design-data/value-types.csv
index 654307097e..1e6b88b3c5 100644
--- a/libical/design-data/value-types.csv
+++ b/libical/design-data/value-types.csv
@@ -10,22 +10,26 @@
 "PERIOD","(a)struct icalperiodtype","Period","unitary",
 "RECUR","(m)struct icalrecurrencetype","RecurrenceSet","unitary",
 "TEXT","(a)const char*","string","unitary",
-"TIME","(a)struct icaltimetype","Time","unitary",
 "URI","(a)const char*","string","unitary",
 "UTC-OFFSET","(a)int","integer","unitary",
 "QUERY","(a)const char*","string","unitary",
 "#Non-standard multi-valued types",,,,
 "ATTACH","(m)icalattach *","none","URI;BINARY",
-"DATE-TIME-DATE","(a)struct icaltimetype","none","DATE-TIME;DATE",
 "DATE-TIME-PERIOD","(m)struct icaldatetimeperiodtype","none","DATE-TIME;PERIOD",
 "TRIGGER","(m)struct icaltriggertype","string","DURATION;DATE-TIME",
 "#Non-standard property enumeration types",,,,
 "METHOD","(a)enum icalproperty_method","string","unitary","PUBLISH;REQUEST;REPLY;ADD;CANCEL;REFRESH;COUNTER;DECLINECOUNTER;CREATE;READ;RESPONSE;MOVE;MODIFY;GENERATEUID;DELETE"
+"X-LIC-CLASS","(a)enum icalproperty_xlicclass","string","unitary","PUBLISH-NEW;PUBLISH-UPDATE;PUBLISH-FREEBUSY;REQUEST-NEW;REQUEST-UPDATE;REQUEST-RESCHEDULE;REQUEST-DELEGATE;REQUEST-NEW-ORGANIZER;REQUEST-FORWARD;REQUEST-STATUS;REQUEST-FREEBUSY;REPLY-ACCEPT;REPLY-DECLINE;REPLY-DELEGATE;REPLY-CRASHER-ACCEPT;REPLY-CRASHER-DECLINE;ADD-INSTANCE;CANCEL-EVENT;CANCEL-INSTANCE;CANCEL-ALL;REFRESH;COUNTER;DECLINECOUNTER;MALFORMED;OBSOLETE;MISSEQUENCED;UNKNOWN"
 "ACTION","(a)enum icalproperty_action","string","unitary","AUDIO;DISPLAY;EMAIL;PROCEDURE"
 "STATUS","(a)enum icalproperty_status","string","unitary","TENTATIVE;CONFIRMED;COMPLETED;NEEDS-ACTION;CANCELLED;IN-PROCESS;DRAFT;FINAL"
-"TRANSP","(a)enum icalproperty_transp","string","unitary","OPAQUE;TRANSPARENT"
+"TRANSP","(a)enum icalproperty_transp","string","unitary","OPAQUE;OPAQUE-NOCONFLICT;TRANSPARENT;TRANSPARENT-NOCONFLICT"
 "CLASS","(a)enum icalproperty_class","string","unitary","PUBLIC;PRIVATE;CONFIDENTIAL"
 "#Other non-standard",,,,
+"REQUEST-STATUS","(a)struct icalreqstattype","string","unitary"
 "GEO","(a)struct icalgeotype","tuple","unitary",
 "STRING","(a)const char*","string","unitary",
 "X","(m)const char*","string","unitary",
+"#CAP enumeration types",,,,
+"CMD","(a)enum icalproperty_cmd","string","unitary","ABORT;CONTINUE;CREATE;DELETE;GENERATE-UID;GET-CAPABILITY;IDENTIFY;MODIFY;MOVE;REPLY;SEARCH;SET-LOCALE"
+"QUERY-LEVEL","(a)enum icalproperty_querylevel","string","unitary","CAL-QL-1;CAL-QL-NONE"
+"CAR-LEVEL","(a)enum icalproperty_carlevel","string","unitary","CAR-NONE;CAR-MIN;CAR-FULL-1"