@@ -27,21 +27,22 @@
 
 enum event_type {
 	TAG_START,
 	TAG_END,
 	STRING,
+	CDATA,
 	COMMENT
 };
 
 @implementation TestsAppDelegate (OFXMLParser)
-- (void)xmlParserCallbackWithEventType: (enum event_type)et
-				  name: (OFString*)name
-				prefix: (OFString*)prefix
-			     namespace: (OFString*)ns
-			    attributes: (OFArray*)attrs
-				string: (OFString*)string
-			       comment: (OFString*)comment
+- (void)parserCallbackWithEventType: (enum event_type)et
+			       name: (OFString*)name
+			     prefix: (OFString*)prefix
+			  namespace: (OFString*)ns
+			 attributes: (OFArray*)attrs
+			     string: (OFString*)string
+			    comment: (OFString*)comment
 {
 	OFString *msg;
 
 	i++;
 	msg = [OFString stringWithFormat: @"Parsing part #%d", i];
@@ -53,11 +54,11 @@
 		break;
 	case 2:
 		TEST(msg, et == STRING && [string isEqual: @"\n "])
 		break;
 	case 3:
-		TEST(msg, et == STRING && [string isEqual: @"f<oo"])
+		TEST(msg, et == CDATA && [string isEqual: @"f<oo"])
 		break;
 	case 4:
 		TEST(msg, et == TAG_START && [name isEqual: @"bar"] &&
 		    prefix == nil && ns == nil && attrs == nil)
 		break;
@@ -225,65 +226,77 @@
 		    prefix == nil && ns == nil);
 		break;
 	}
 }
 
--     (void)xmlParser: (OFXMLParser*)parser
-  didStartTagWithName: (OFString*)name
-	       prefix: (OFString*)prefix
-	    namespace: (OFString*)ns
-	   attributes: (OFArray*)attrs
-{
-	[self xmlParserCallbackWithEventType: TAG_START
-					name: name
-				      prefix: prefix
-				   namespace: ns
-				  attributes: attrs
-				      string: nil
-				     comment: nil];
-}
-
--   (void)xmlParser: (OFXMLParser*)parser
-  didEndTagWithName: (OFString*)name
-	     prefix: (OFString*)prefix
-	  namespace: (OFString*)ns
-{
-	[self xmlParserCallbackWithEventType: TAG_END
-					name: name
-				      prefix: prefix
-				   namespace: ns
-				  attributes: nil
-				      string: nil
-				     comment: nil];
-}
-
-- (void)xmlParser: (OFXMLParser*)parser
-    didFindString: (OFString*)string
-{
-	[self xmlParserCallbackWithEventType: STRING
-					name: nil
-				      prefix: nil
-				   namespace: nil
-				  attributes: nil
-				      string: string
-				     comment: nil];
-}
-
-- (void)xmlParser: (OFXMLParser*)parser
-   didFindComment: (OFString*)comment
-{
-	[self xmlParserCallbackWithEventType: COMMENT
-					name: nil
-				      prefix: nil
-				   namespace: nil
-				  attributes: nil
-				      string: nil
-				     comment: comment];
-}
-
--      (OFString*)xmlParser: (OFXMLParser*)parser
-  didFindUnknownEntityNamed: (OFString*)entity
+-    (void)parser: (OFXMLParser*)parser
+  didStartElement: (OFString*)name
+       withPrefix: (OFString*)prefix
+	namespace: (OFString*)ns
+       attributes: (OFArray*)attrs
+{
+	[self parserCallbackWithEventType: TAG_START
+				     name: name
+				   prefix: prefix
+				namespace: ns
+			       attributes: attrs
+				   string: nil
+				  comment: nil];
+}
+
+-  (void)parser: (OFXMLParser*)parser
+  didEndElement: (OFString*)name
+     withPrefix: (OFString*)prefix
+      namespace: (OFString*)ns
+{
+	[self parserCallbackWithEventType: TAG_END
+				     name: name
+				   prefix: prefix
+				namespace: ns
+			       attributes: nil
+				   string: nil
+				  comment: nil];
+}
+
+-    (void)parser: (OFXMLParser*)parser
+  foundCharacters: (OFString*)string
+{
+	[self parserCallbackWithEventType: STRING
+				     name: nil
+				   prefix: nil
+				namespace: nil
+			       attributes: nil
+				   string: string
+				  comment: nil];
+}
+
+- (void)parser: (OFXMLParser*)parser
+    foundCDATA: (OFString*)cdata
+{
+	[self parserCallbackWithEventType: CDATA
+				     name: nil
+				   prefix: nil
+				namespace: nil
+			       attributes: nil
+				   string: cdata
+				  comment: nil];
+}
+
+- (void)parser: (OFXMLParser*)parser
+  foundComment: (OFString*)comment
+{
+	[self parserCallbackWithEventType: COMMENT
+				     name: nil
+				   prefix: nil
+				namespace: nil
+			       attributes: nil
+				   string: nil
+				  comment: comment];
+}
+
+-	(OFString*)parser: (OFXMLParser*)parser
+  foundUnknownEntityNamed: (OFString*)entity
 {
 	if ([entity isEqual: @"foo"])
 		return @"foobar";
 
 	return nil;