--- parser3/src/classes/xdoc.C	2004/01/30 14:35:11	1.129
+++ parser3/src/classes/xdoc.C	2004/02/20 13:19:08	1.142
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b xdoc parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -9,15 +9,16 @@
 
 #ifdef XML
 
-static const char * const IDENT_XDOC_C="$Date: 2004/01/30 14:35:11 $";
+static const char * const IDENT_XDOC_C="$Date: 2004/02/20 13:19:08 $";
 
 #include "gdome.h"
 #include "libxml/tree.h"
+#include "libxml/HTMLtree.h"
 #include "libxslt/xsltInternals.h"
 #include "libxslt/transform.h"
 #include "libxslt/xsltutils.h"
 #include "libxslt/variables.h"
-
+#include "libxslt/imports.h"
 
 #include "pa_vmethod_frame.h"
 
@@ -601,24 +602,33 @@ struct Xdoc2buf_result {
 static Xdoc2buf_result xdoc2buf(Request& r, VXdoc& vdoc, 
 					 MethodParams& params, int index,
 					 VXdoc::Output_options& oo,
-					 const String* file_spec) {
+					 const String* file_spec,
+					 bool use_source_charset_to_render_and_client_charset_to_write_to_header=false) {
 	Xdoc2buf_result result;
 	prepare_output_options(r, params, index,
 		oo);
 
-	const char* encoding_cstr=oo.encoding->cstr();
-	xmlCharEncodingHandler *encoder=xmlFindCharEncodingHandler(encoding_cstr);
-	if(!encoder)
+	const char* render_encoding;
+	const char* header_encoding;
+	if(use_source_charset_to_render_and_client_charset_to_write_to_header) {
+		render_encoding=r.charsets.source().NAME_CSTR();
+		header_encoding=r.charsets.client().NAME_CSTR();
+	} else {
+		header_encoding=render_encoding=oo.encoding->cstr();
+	}
+
+	xmlCharEncodingHandler *renderer=xmlFindCharEncodingHandler(render_encoding);
+	if(!renderer)
 		throw Exception("parser.runtime",
 			0,
-			"encoding '%s' not supported", encoding_cstr);
-	// UTF-8 encoder contains empty input/output converters, 
+			"encoding '%s' not supported", render_encoding);
+	// UTF-8 renderer contains empty input/output converters, 
 	// which is wrong for xmlOutputBufferCreateIO
-	// while zero encoder goes perfectly 
-	if(encoder && strcmp(encoder->name, "UTF-8")==0)
-		encoder=0;
+	// while zero renderer goes perfectly 
+	if(strcmp(render_encoding, "UTF-8")==0)
+		renderer=0;
 
-	xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(encoder));
+	xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(renderer));
 
 	xsltStylesheet_auto_ptr stylesheet(xsltNewStylesheet());
 	if(!stylesheet.get())
@@ -635,16 +645,18 @@ static Xdoc2buf_result xdoc2buf(Request&
 	OOS2STYLE(encoding);
 	OOS2STYLE(mediaType);
 //	OOS2STYLE(doctypeSystem);
-	//OOS2STYLE(doctypePublic);
+//	OOS2STYLE(doctypePublic);
 	OOE2STYLE(indent);
 	OOS2STYLE(version);
 	OOE2STYLE(standalone);
 	OOE2STYLE(omitXmlDeclaration);
 
 	xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document());
-	if(encoder)
-		document->encoding=BAD_CAST xmlMemStrdup(encoder->name);
-	if(xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get())<0) {
+	document->encoding=BAD_CAST xmlMemStrdup(render_encoding);
+	if(header_encoding)
+		stylesheet->encoding=BAD_CAST xmlMemStrdup(header_encoding);
+	if(xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get())<0
+		|| xmlHaveGenericErrors()) {
 		GdomeException exc=0;
 		throw XmlException(0, exc);
 	}
@@ -712,7 +724,8 @@ static void _string(Request& r, MethodPa
 	VXdoc::Output_options oo(vdoc.output_options);
 	Xdoc2buf_result buf=xdoc2buf(r, vdoc, params, 0, 
 		oo,
-		0/*not to file, to memory*/);
+		0/*not to file, to memory*/,
+		true/*use source charset to render, client charset to put to header*/);
 	// write out result
 	r.write_no_lang(String(buf.str, buf.length));
 }
@@ -732,8 +745,10 @@ static void add_xslt_param(
 	*info->current_transform_param++=(s=info->r->transcode(attribute))->str; *info->strings+=s;
 	*info->current_transform_param++=(s=info->r->transcode(meaning->as_string()))->str; *info->strings+=s;
 }
+
 static VXdoc& _transform(Request& r, const String* stylesheet_source, 
-						   VXdoc& vdoc, xsltStylesheetPtr stylesheet, const char** transform_params) {
+						   VXdoc& vdoc, xsltStylesheetPtr stylesheet, const char** transform_params) 
+{
 	xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document());
 	xsltTransformContext_auto_ptr transformContext(
 		xsltNewTransformContext(stylesheet, document));