Make CJK.lyx exportable.

If there was an encoding set by the inputenc package, it must not be ignored.
Now all tex2lyx test cases can be exported to .tex again by LyX (although
there are still some differences in the .lyx output).
This commit is contained in:
Georg Baum 2012-07-08 22:35:22 +02:00
parent c3731b25da
commit af322ba9b4

View File

@ -759,7 +759,8 @@ void Preamble::handle_package(Parser &p, string const & name,
have_CJK = true; have_CJK = true;
// set the encoding to "auto" because it might be set to "default" by the babel handling // set the encoding to "auto" because it might be set to "default" by the babel handling
// and this would not be correct for CJK // and this would not be correct for CJK
h_inputencoding = "auto"; if (h_inputencoding == "default")
h_inputencoding = "auto";
registerAutomaticallyLoadedPackage("CJK"); registerAutomaticallyLoadedPackage("CJK");
} }