X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.C;h=c6986cce240e8ec00ae174c12fafb2da27cd7d9a;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=c76bd8c1872b74f8c5f1e4ffa35beed529e8d01b;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/output_latex.C b/src/output_latex.C
index c76bd8c187..c6986cce24 100644
--- a/src/output_latex.C
+++ b/src/output_latex.C
@@ -29,6 +29,7 @@
 #include "insets/insetoptarg.h"
 
 #include "support/lstrings.h"
+#include "support/unicode.h"
 
 
 namespace lyx {
@@ -236,7 +237,7 @@ ParagraphList::const_iterator
 TeXOnePar(Buffer const & buf,
 	  ParagraphList const & paragraphs,
 	  ParagraphList::const_iterator pit,
-	  odocstream & os, TexRow & texrow,
+	  odocstream & ucs4, TexRow & texrow,
 	  OutputParams const & runparams_in,
 	  string const & everypar)
 {
@@ -274,34 +275,41 @@ TeXOnePar(Buffer const & buf,
 		if (!lyxrc.language_command_end.empty() &&
 		    previous_language->babel() != doc_language->babel())
 		{
-			os << from_ascii(subst(lyxrc.language_command_end,
+			ucs4 << from_ascii(subst(lyxrc.language_command_end,
 				"$$lang",
 				previous_language->babel()))
-			   << endl;
+			     << endl;
 			texrow.newline();
 		}
 
 		if (lyxrc.language_command_end.empty() ||
 		    language->babel() != doc_language->babel())
 		{
-			os << from_ascii(subst(
+			ucs4 << from_ascii(subst(
 				lyxrc.language_command_begin,
 				"$$lang",
 				language->babel()))
-			   << endl;
+			     << endl;
 			texrow.newline();
 		}
 	}
 
-	if (false) {
-		if (bparams.inputenc == "auto" &&
-			language->encoding() != previous_language->encoding()) {
-			os << "\\inputencoding{"
-			   << from_ascii(language->encoding()->latexName())
-			   << "}\n";
-			texrow.newline();
-		}
+	if (bparams.inputenc == "auto" &&
+	    language->encoding() != previous_language->encoding()) {
+		ucs4 << "\\inputencoding{"
+		     << from_ascii(language->encoding()->latexName())
+		     << "}\n";
+		texrow.newline();
 	}
+	// We need to output the paragraph to a temporary stream if we
+	// need to change the encoding. Don't do this if the result does
+	// not go to a file but to the builtin source viewer.
+	odocstringstream par_stream;
+	bool const change_encoding = !runparams_in.dryrun &&
+			bparams.inputenc == "auto" &&
+			language->encoding() != doc_language->encoding();
+	// don't trigger the copy ctor because it's private on msvc 
+	odocstream & os = *(change_encoding ? &par_stream : &ucs4);
 
 	// In an an inset with unlimited length (all in one row),
 	// don't allow any special options in the paragraph
@@ -474,6 +482,60 @@ TeXOnePar(Buffer const & buf,
 	if (boost::next(pit) != paragraphs.end() &&
 	    lyxerr.debugging(Debug::LATEX))
 		lyxerr << "TeXOnePar...done " << &*boost::next(pit) << endl;
+
+	if (change_encoding) {
+		lyxerr[Debug::LATEX] << "Converting paragraph to encoding "
+			<< language->encoding()->iconvName() << endl;
+		docstring const par = par_stream.str();
+		// Convert the paragraph to the 8bit encoding that we need to
+		// output.
+		std::vector<char> const encoded = lyx::ucs4_to_eightbit(par.c_str(),
+			par.size(), language->encoding()->iconvName());
+		// Interpret this as if it was in the 8 bit encoding of the
+		// document language and convert it back to UCS4. That means
+		// that faked does not contain pure UCS4 anymore, but what
+		// will be written to the output file will be correct, because
+		// the real output stream will do a UCS4 -> document language
+		// encoding conversion.
+		// This is of course a hack, but not a bigger one than mixing
+		// two encodings in one file.
+		// FIXME: Catch iconv conversion errors and display an error
+		// dialog.
+
+		// Here follows an explanation how I (gb) came to the current
+		// solution:
+
+		// codecvt facets are only used by file streams -> OK, maybe
+		// we could use file streams and not generic streams in the
+		// latex() methods? No, that does not  work, we use them at
+		// several places to write to string streams.
+		// Next try: Maybe we could do something else than codecvt
+		// in our streams, and  add a setEncoding() method? That
+		// does not work unless we rebuild the functionality of file
+		// and string streams, since both odocfstream and
+		// odocstringstream inherit from std::basic_ostream<docstring>
+		// and we can  neither add a method to that class nor change
+		// the inheritance of the file and string streams.
+
+		// What might be possible is to encapsulate the real file and
+		// string streams in our own version, and use a homemade
+		// streambuf that would do the encoding conversion and then
+		// forward to the real stream. That would probably work, but
+		// would require far more code and a good understanding of
+		// stream buffers to get it right.
+
+		// Another idea by JMarc is to use a modifier like
+		// os << setencoding("iso-8859-1");
+		// That currently looks like the best idea.
+
+		std::vector<char_type> const faked = lyx::eightbit_to_ucs4(&(encoded[0]),
+			encoded.size(), doc_language->encoding()->iconvName());
+		std::vector<char_type>::const_iterator const end = faked.end();
+		std::vector<char_type>::const_iterator it = faked.begin();
+		for (; it != end; ++it)
+			ucs4.put(*it);
+	}
+
 	return ++pit;
 }