The branch, master, has been updated. - Log -----------------------------------------------------------------
commit af322ba9b414da7df031b92c096d0acfd5466f9b Author: Georg Baum <[email protected]> Date: Sun Jul 8 22:35:22 2012 +0200 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). diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp index 92e3da7..afa0997 100644 --- a/src/tex2lyx/Preamble.cpp +++ b/src/tex2lyx/Preamble.cpp @@ -759,7 +759,8 @@ void Preamble::handle_package(Parser &p, string const & name, have_CJK = true; // set the encoding to "auto" because it might be set to "default" by the babel handling // and this would not be correct for CJK - h_inputencoding = "auto"; + if (h_inputencoding == "default") + h_inputencoding = "auto"; registerAutomaticallyLoadedPackage("CJK"); } ----------------------------------------------------------------------- Summary of changes: src/tex2lyx/Preamble.cpp | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
