The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit e5165f7fc356b7a579756a6d77d77088663c6295
Author: Julien Rioux <[email protected]>
Date:   Wed Jan 23 12:30:15 2013 +0100

    Exclude unsafe encodings when setting the inputencoding value.
    
    All of the japanese encodings are safe, but nevertheless the
    logic here should exclude unsafe encodings.

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 61ce6b8..15f8103 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -737,7 +737,7 @@ void Preamble::handle_package(Parser &p, string const & 
name,
                                // we will output a note at the top of the 
document
                                // explaining what to do.
                                Encoding const * const enc = 
encodings.fromIconvName(
-                                       p.getEncoding(), Encoding::japanese, 
true);
+                                       p.getEncoding(), Encoding::japanese, 
false);
                                if (enc)
                                        h_inputencoding = enc->name();
                                is_nonCJKJapanese = true;

-----------------------------------------------------------------------

Summary of changes:
 src/tex2lyx/Preamble.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to