--- parser3/src/include/pa_charset.h	2005/12/16 10:15:12	1.32
+++ parser3/src/include/pa_charset.h	2008/07/21 07:36:34	1.38
@@ -8,7 +8,7 @@
 #ifndef PA_CHARSET_H
 #define PA_CHARSET_H
 
-static const char * const IDENT_CHARSET_H="$Date: 2005/12/16 10:15:12 $";
+static const char * const IDENT_CHARSET_H="$Date: 2008/07/21 07:36:34 $";
 
 
 #include "pa_exception.h"
@@ -57,9 +57,8 @@ public:
 	bool isUTF8() const { return fisUTF8; }
 
 	static String::C transcode(const String::C src,
-		const Charset& source_transcoder, 
-		const Charset& dest_transcoder
-	);
+		const Charset& source_charset, 
+		const Charset& dest_charset);
 
 	static String& transcode(const String& src,
 		const Charset& source_transcoder, 
@@ -77,6 +76,17 @@ public:
 		const Charset& source_transcoder, 
 		const Charset& dest_transcoder);
 
+	static String::C escape(const String::C src,
+		const Charset& source_charset);
+
+	static String::Body escape(const String::Body src,
+		const Charset& source_charset);
+
+	static String& escape(const String& src,
+		const Charset& source_charset);
+
+	void store_Char(XMLByte*& outPtr, XMLCh src, XMLByte not_found);
+
 #ifdef XML
 	xmlCharEncodingHandler& transcoder(const String::Body NAME);
 #endif
@@ -162,5 +172,8 @@ extern Charset::UTF8CaseTable UTF8CaseTo
 void change_case_UTF8(const XMLByte* srcData, size_t srcLen,
 					  XMLByte* toFill, size_t toFillLen,
 					  const Charset::UTF8CaseTable& table);
+size_t getUTF8BytePos(const XMLByte* srcBegin, const XMLByte* srcEnd, size_t charPos/*position in characters*/);
+size_t getUTF8CharPos(const XMLByte* srcBegin, const XMLByte* srcEnd, size_t bytePos/*position in bytes*/);
+size_t lengthUTF8(const XMLByte* srcBegin, const XMLByte* srcEnd);
 
 #endif