--- parser3/src/main/pa_charset.C	2002/06/28 09:59:01	1.24
+++ parser3/src/main/pa_charset.C	2002/10/15 15:12:57	1.31
@@ -3,10 +3,10 @@
 
 	Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan<paf@design.ru>(http://paf.design.ru)
-
-	$Id: pa_charset.C,v 1.24 2002/06/28 09:59:01 paf Exp $
 */
 
+static const char* IDENT_CHARSET_C="$Date: 2002/10/15 15:12:57 $";
+
 #include "pa_charset.h"
 
 #ifdef XML
@@ -191,7 +191,8 @@ void Charset::sort_ToTable() {
 }
 
 static XMLByte xlatOneTo(const XMLCh toXlat,
-						 const Charset::Tables& tables) {
+						 const Charset::Tables& tables,
+						 XMLByte not_found) {
     unsigned int    lowOfs = 0;
     unsigned int    hiOfs = tables.toTableSize - 1;
     XMLByte         curByte = 0;
@@ -210,7 +211,7 @@ static XMLByte xlatOneTo(const XMLCh toX
 			return tables.toTable[midOfs].extCh;
 	} while(lowOfs+1<hiOfs);
 
-    return '?';
+    return not_found;
 }
 
 void Charset::transcode(Pool& pool,
@@ -360,9 +361,18 @@ static int transcodeToUTF8(
     // Return the characters read
     toFillLen = outPtr - toFill;
 
-	return srcPtr==srcEnd?(int)toFillLen:-1;
+	//return srcPtr==srcEnd?(int)toFillLen:-1;
+/*
+xmlCharEncodingInputFunc
+Returns :
+the number of byte written, or -1 by lack of space, or -2 if the transcoding failed. The value of inlen after return is the
+number of octets consumed as the return value is positive, else unpredictiable. The value of outlen after return is the number
+of ocetes consumed.
+*/
+	return 0;
 }
-static size_t transcodeFromUTF8(
+/// @todo digital entites only when xml/html output [at output in html/xml mode, in html part of a letter]
+static int transcodeFromUTF8(
 								const XMLByte *srcData, size_t& srcLen,
 								XMLByte* toFill, size_t& toFillLen,
 								const Charset::Tables& tables) {
@@ -413,9 +423,12 @@ static size_t transcodeFromUTF8(
         //  If it will fit into a single char, then put it in. Otherwise
         //  fail [*encode it as a surrogate pair. If its not valid, use the
         //  replacement char.*]
-        if(!(tmpVal & 0xFFFF0000))
-            *outPtr++= xlatOneTo(tmpVal, tables);
-		else
+        if(!(tmpVal & 0xFFFF0000)) {
+			if(XMLByte xlat=xlatOneTo(tmpVal, tables, 0))
+				*outPtr++=xlat;
+			else 
+				outPtr+=sprintf((char *)outPtr, "&#%d;", tmpVal); // &#decimal;
+		} else
 			throw Exception(0,
 				0,
 				"transcodeFromUTF8 error: too big tmpVal(0x%08X)", tmpVal);
@@ -427,14 +440,22 @@ static size_t transcodeFromUTF8(
     // Return the characters read
     toFillLen = outPtr - toFill;
 
-	return srcPtr==srcEnd?(int)toFillLen:-1;
+	//return srcPtr==srcEnd?(int)toFillLen:-1;
+/*
+xmlCharEncodingOutputFunc
+Returns :
+the number of byte written, or -1 by lack of space, or -2 if the transcoding failed. The value of inlen after return is the
+number of octets consumed as the return value is positive, else unpredictiable. The value of outlen after return is the number
+of ocetes consumed.
+*/
+	return 0;
 }
 
 /// @todo not so memory-hungry with prescan
 void Charset::transcodeToUTF8(Pool& pool,
 								 const void *source_body, size_t source_content_length,
 								 const void *& adest_body, size_t& dest_content_length) const {
-	dest_content_length=source_content_length*6/*so that surly enough*/;
+	dest_content_length=source_content_length*6/*so that surly enough, max utf8 seq len=6*/;
 	XMLByte *dest_body=(XMLByte*)pool.malloc(dest_content_length);
 
 	if(::transcodeToUTF8(
@@ -451,7 +472,7 @@ void Charset::transcodeToUTF8(Pool& pool
 void Charset::transcodeFromUTF8(Pool& pool,
 								   const void *source_body, size_t source_content_length,
 								   const void *& adest_body, size_t& dest_content_length) const {
-	dest_content_length=source_content_length/*surly enough*/;
+	dest_content_length=source_content_length*6/*so that surly enough, "&#255;" has max ratio */;
 	XMLByte *dest_body=(XMLByte*)pool.malloc(dest_content_length);
 
 	if(::transcodeFromUTF8(
@@ -484,7 +505,7 @@ void Charset::transcodeToCharset(Pool& p
 		for(XMLByte* outPtr=dest_body; srcPtr<srcEnd; srcPtr++) {
 			XMLCh curVal = tables.fromTable[*srcPtr];
 			if(curVal) 
-				*outPtr++=xlatOneTo(curVal, dest_charset.tables);
+				*outPtr++=xlatOneTo(curVal, dest_charset.tables, '?');
 			else {
 				// use the replacement character
 				*outPtr++= '?';
@@ -553,52 +574,71 @@ const char *Charset::transcode_cstr(xmlC
 	int outlen=inlen+1; // max
 	char *out=(char *)malloc(outlen*sizeof(char));
 	
-	int size;
+	int error;
 	if(xmlCharEncodingOutputFunc output=transcoder(0)->output) {
-		size=output(
+		error=output(
 			(unsigned char*)out, &outlen,
 			(const unsigned char*)s, &inlen,
 			transcoder(0)->outputInfo);
-	} else
-		memcpy(out, s, size=inlen);
-	if(size<0)
+	} else {
+		memcpy(out, s, outlen=inlen);
+		error=0;
+	}
+	if(error<0)
 		throw Exception(0,
 			0,
-			"transcode_cstr failed (%d)", size);
+			"transcode_cstr failed (%d)", error);
 
-	out[size]=0;
+	out[outlen/*surely would be less then on input*/]=0;
 	return out;
 }
-String& Charset::transcode(xmlChar *s) { 
-	return *NEW String(pool(), transcode_cstr(s)); 
+String& Charset::transcode(xmlChar *s
+#ifndef NO_STRING_ORIGIN
+		, const String *origin
+#endif
+						   ) { 
+	String& result=*NEW String(pool());
+	result.APPEND_CLEAN(transcode_cstr(s), 0/*auto-size*/, origin->origin().file, origin->origin().line);
+	return result; 
 }
 const char *Charset::transcode_cstr(GdomeDOMString *s) { 
 	return s?transcode_cstr(BAD_CAST s->str):"";
 }
-String& Charset::transcode(GdomeDOMString *s) { 
-	return *NEW String(pool(), transcode_cstr(s)); 
+String& Charset::transcode(GdomeDOMString *s
+#ifndef NO_STRING_ORIGIN
+		, const String *origin
+#endif
+						   ) { 
+	String& result=*NEW String(pool());
+	result.APPEND_CLEAN(transcode_cstr(s), 0/*auto-size*/, origin->origin().file, origin->origin().line);
+	return result; 
 }
 
 /// @test less memory using -maybe- xmlParserInputBufferCreateMem
 xmlChar *Charset::transcode_buf2xchar(const char *buf, size_t buf_size) {
-	int outlen=buf_size*6/*max*/+1;
-	unsigned char *out=(unsigned char*)malloc(outlen*sizeof(unsigned char));
-
-	int size;
+	unsigned char *out;
+	int outlen;
+	int error;
 	if(xmlCharEncodingInputFunc input=transcoder(0)->input) {
-		size=input(
+		outlen=buf_size*6/*max*/+1;
+		out=(unsigned char*)malloc(outlen*sizeof(unsigned char));
+		error=input(
 			out, &outlen,
 			(const unsigned char *)buf,  (int *)&buf_size,
 			transcoder(0)->inputInfo);
-	} else
-		memcpy(out, buf, size=buf_size);
+	} else {
+		outlen=buf_size;
+		out=(unsigned char*)malloc(outlen*sizeof(unsigned char));
+		memcpy(out, buf, outlen);
+		error=0;
+	}
 	
-	if(size<0)
+	if(error<0)
 		throw Exception(0,
 			0,
-			"transcode_buf failed (%d)", size);
+			"transcode_buf failed (%d)", error);
 
-	out[size]=0;
+	out[outlen/*surely would be less then on input*/]=0;
 	return (xmlChar *)out;
 }
 GdomeDOMString_auto_ptr Charset::transcode_buf2dom(const char *buf, size_t buf_size) {