--- parser3/src/main/pa_charset.C	2008/07/17 09:10:49	1.63
+++ parser3/src/main/pa_charset.C	2009/04/15 07:42:46	1.69
@@ -1,11 +1,11 @@
 /** @file
 	Parser: Charset connection implementation.
 
-	Copyright(c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan<paf@design.ru>(http://paf.design.ru)
 */
 
-static const char * const IDENT_CHARSET_C="$Date: 2008/07/17 09:10:49 $";
+static const char * const IDENT_CHARSET_C="$Date: 2009/04/15 07:42:46 $";
 
 #include "pa_charset.h"
 #include "pa_charsets.h"
@@ -15,6 +15,8 @@ static const char * const IDENT_CHARSET_
 #endif
 
 //#define PA_PATCHED_LIBXML_BACKWARD
+
+// reduce memory usage by pre-calculation utf-8 string length
 #define PRECALCULATE_DEST_LENGTH
 
 // globals
@@ -86,7 +88,6 @@ static void element2case(unsigned char f
 
 // methods
 
-extern "C" unsigned char pcre_default_tables[]; // pcre/chartables.c
 Charset::Charset(Request_charsets* charsets, const String::Body ANAME, const String* afile_spec): 
 	FNAME(ANAME),
 	FNAME_CSTR(ANAME.cstrm()) {
@@ -100,7 +101,7 @@ Charset::Charset(Request_charsets* chars
 	} else {
 		fisUTF8=true;
 		// grab default onces [for UTF-8 so to be able to make a-z =>A-Z
-		memcpy(pcre_tables, pcre_default_tables, sizeof(pcre_tables));
+		memcpy(pcre_tables, _pcre_default_tables, sizeof(pcre_tables));
 	}
 
 #ifdef XML
@@ -432,15 +433,17 @@ of ocetes consumed.
 	return 0;
 }
 
-static bool is_escaped(char c){
+static bool is_escaped(XMLByte c){
 	return
-		!(c<=127
-		&& (
-			((c>='0') && (c<='9'))
-			|| ((c>='A') && (c<='Z'))
-			|| ((c>='a') && (c<='z'))
-			|| strchr("*@-_+./", c)!=0
-		));
+		!(
+			(c<=127)
+			&& (
+				((c>='0') && (c<='9'))
+				|| ((c>='A') && (c<='Z'))
+				|| ((c>='a') && (c<='z'))
+				|| strchr("*@-_+./", c)!=0
+			)
+		);
 }
 
 // read one utf8 character, return number of bytes needed for store it
@@ -633,6 +636,22 @@ String::C Charset::escape(const String::
 	return String::C((char*)dest_body, dest_length);
 }
 	
+String::Body Charset::escape(const String::Body src, const Charset& source_charset) {
+	const char *src_ptr=src.cstr();
+	size_t src_size=strlen(src_ptr);
+
+	String::C dest=Charset::escape(String::C(src_ptr, src_size),
+		source_charset);
+
+	return String::Body(dest.str, dest.length);
+}
+
+String& Charset::escape(const String& src, const Charset& source_charset) {
+	if(!src.length())
+		return *new String("", 0, false);
+
+	return *new String(escape((String::Body)src, source_charset), String::L_CLEAN);
+}
 
 const String::C Charset::transcodeToUTF8(const String::C src) const {
 	size_t src_length=src.length;
@@ -641,8 +660,8 @@ const String::C Charset::transcodeToUTF8
 	size_t dest_length=0;
 	const XMLByte* srcPtr=(XMLByte*)src.str;
 	const XMLByte* srcEnd=srcPtr+src_length;
-	XMLByte firstByte;
-	XMLCh UTF8Char;
+ 	XMLByte firstByte;
+ 	XMLCh UTF8Char;
 	while(uint charSize=readChar(srcPtr, srcEnd, firstByte, UTF8Char, tables))
 		dest_length+=charSize;
 #else