From: Georg Baum <baum@lyx.org>
Date: Mon, 18 Feb 2013 20:22:21 +0000 (+0100)
Subject: Fix encoding for japanese documents
X-Git-Tag: 2.1.0beta1~646
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2a1eb2fe9bf3977f10c4e21bc44c8b0cc704462f;p=features.git

Fix encoding for japanese documents

The header parameter \inputenc uses the LaTeX name, so we need must not set
it to the LyX name for japanese documents.
---

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index a7ef65f53f..aaa76841fe 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -805,7 +805,7 @@ void Preamble::handle_package(Parser &p, string const & name,
 				Encoding const * const enc = encodings.fromIconvName(
 					p.getEncoding(), Encoding::japanese, false);
 				if (enc)
-					h_inputencoding = enc->name();
+					h_inputencoding = enc->latexName();
 				is_nonCJKJapanese = true;
 				// in this case babel can be removed from the preamble
 				registerAutomaticallyLoadedPackage("babel");