commit 614862fcccafc9bf1bd05b13d6e34fef1decb586
Author: Georg Baum <[email protected]>
Date:   Fri Dec 26 20:44:29 2014 +0100

    Move cjk check out of the loop
    
    According to the indentation this was probably a merge error, and the check 
is
    only needed once.

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 88a756d..fd1499a 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -2208,8 +2208,6 @@ void parse_text(Parser & p, ostream & os, unsigned flags, 
bool outer,
        bool const use_natbib = isProvided("natbib");
        bool const use_jurabib = isProvided("jurabib");
        string last_env;
-       while (p.good()) {
-               Token const & t = p.get_token();
 
        // it is impossible to determine the correct encoding for non-CJK 
Japanese.
        // Therefore write a note at the beginning of the document
@@ -2233,6 +2231,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, 
bool outer,
                is_nonCJKJapanese = false;
        }
 
+       while (p.good()) {
+               Token const & t = p.get_token();
 #ifdef FILEDEBUG
                debugToken(cerr, t, flags);
 #endif

Reply via email to