@@ -16,19 +16,18 @@
 
 #import "OFXMLParser.h"
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFDictionary.h"
+#import "OFXMLAttribute.h"
 #import "OFAutoreleasePool.h"
 #import "OFExceptions.h"
 #import "macros.h"
 
-int _OFXMLParser_reference;
-
 static OF_INLINE OFString*
 transform_string(OFMutableString *cache,
-    OFObject <OFXMLUnescapingDelegate> *handler)
+    OFObject <OFStringXMLUnescapingDelegate> *handler)
 {
 	[cache replaceOccurrencesOfString: @"\r\n"
 			       withString: @"\n"];
 	[cache replaceOccurrencesOfString: @"\r"
 			       withString: @"\n"];
@@ -52,58 +51,10 @@
 	}
 
 	return nil;
 }
 
-static OF_INLINE OFString*
-parse_numeric_entity(const char *entity, size_t length)
-{
-	of_unichar_t c;
-	size_t i;
-	char buf[5];
-
-	if (length == 1 || *entity != '#')
-		return nil;
-
-	c = 0;
-	entity++;
-	length--;
-
-	if (entity[0] == 'x') {
-		if (length == 1)
-			return nil;
-
-		entity++;
-		length--;
-
-		for (i = 0; i < length; i++) {
-			if (entity[i] >= '0' && entity[i] <= '9')
-				c = (c << 4) + (entity[i] - '0');
-			else if (entity[i] >= 'A' && entity[i] <= 'F')
-				c = (c << 4) + (entity[i] - 'A' + 10);
-			else if (entity[i] >= 'a' && entity[i] <= 'f')
-				c = (c << 4) + (entity[i] - 'a' + 10);
-			else
-				return nil;
-		}
-	} else {
-		for (i = 0; i < length; i++) {
-			if (entity[i] >= '0' && entity[i] <= '9')
-				c = (c * 10) + (entity[i] - '0');
-			else
-				return nil;
-		}
-	}
-
-	if ((i = of_string_unicode_to_utf8(c, buf)) == 0)
-		return nil;
-	buf[i] = 0;
-
-	return [OFString stringWithCString: buf
-				    length: i];
-}
-
 @implementation OFXMLParser
 + xmlParser
 {
 	return [[[self alloc] init] autorelease];
 }
@@ -686,109 +637,10 @@
 - (OFString*)didFindUnknownEntityNamed: (OFString*)entity
 {
 	return [delegate xmlParser: self
 	 didFindUnknownEntityNamed: entity];
 }
-@end
-
-@implementation OFString (OFXMLUnescaping)
-- (OFString*)stringByXMLUnescaping
-{
-	return [self stringByXMLUnescapingWithHandler: nil];
-}
-
-- (OFString*)stringByXMLUnescapingWithHandler:
-    (OFObject <OFXMLUnescapingDelegate>*)h
-{
-	size_t i, last;
-	BOOL in_entity;
-	OFMutableString *ret;
-
-	last = 0;
-	in_entity = NO;
-	ret = [OFMutableString string];
-
-	switch (of_string_check_utf8(string, length)) {
-	case 1:
-		((OFString*)ret)->isUTF8 = YES;
-		break;
-	case -1:
-		@throw [OFInvalidEncodingException newWithClass: isa];
-	}
-
-	for (i = 0; i < length; i++) {
-		if (!in_entity && string[i] == '&') {
-			[ret appendCStringWithoutUTF8Checking: string + last
-						       length: i - last];
-
-			last = i + 1;
-			in_entity = YES;
-		} else if (in_entity && string[i] == ';') {
-			char *entity = string + last;
-			size_t len = i - last;
-
-			if (len == 2 && !memcmp(entity, "lt", 2))
-				[ret appendCStringWithoutUTF8Checking: "<"
-							       length: 1];
-			else if (len == 2 && !memcmp(entity, "gt", 2))
-				[ret appendCStringWithoutUTF8Checking: ">"
-							       length: 1];
-			else if (len == 4 && !memcmp(entity, "quot", 4))
-				[ret appendCStringWithoutUTF8Checking: "\""
-							       length: 1];
-			else if (len == 4 && !memcmp(entity, "apos", 4))
-				[ret appendCStringWithoutUTF8Checking: "'"
-							       length: 1];
-			else if (len == 3 && !memcmp(entity, "amp", 3))
-				[ret appendCStringWithoutUTF8Checking: "&"
-							       length: 1];
-			else if (entity[0] == '#') {
-				OFAutoreleasePool *pool;
-				OFString *tmp;
-
-				pool = [[OFAutoreleasePool alloc] init];
-				tmp = parse_numeric_entity(entity, len);
-
-				if (tmp == nil)
-					@throw [OFInvalidEncodingException
-					    newWithClass: isa];
-
-				[ret appendString: tmp];
-				[pool release];
-			} else if (h != nil) {
-				OFAutoreleasePool *pool;
-				OFString *n, *tmp;
-
-				pool = [[OFAutoreleasePool alloc] init];
-
-				n = [OFString stringWithCString: entity
-							 length: len];
-				tmp = [h didFindUnknownEntityNamed: n];
-
-				if (tmp == nil)
-					@throw [OFInvalidEncodingException
-					    newWithClass: isa];
-
-				[ret appendString: tmp];
-				[pool release];
-			} else
-				@throw [OFInvalidEncodingException
-				    newWithClass: isa];
-
-			last = i + 1;
-			in_entity = NO;
-		}
-	}
-
-	if (in_entity)
-		@throw [OFInvalidEncodingException newWithClass: isa];
-
-	[ret appendCStringWithoutUTF8Checking: string + last
-				       length: i - last];
-
-	return ret;
-}
 @end
 
 @implementation OFObject (OFXMLParserDelegate)
 -     (void)xmlParser: (OFXMLParser*)parser
   didStartTagWithName: (OFString*)name