lyxstring compile fixes ; small stuff

[lyx.git] / src / lyxlex_pimpl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index b0587400dfccc9e78bf1c88752cf22c41d0d0001..bcb41376211e00a5e3b20d7844be60e2142cf944 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -9,9 +9,6 @@
 #include "support/lyxalgo.h"
 #include "support/filetools.h"
 #include "debug.h"
-#if 1 // to get NEW_INSETS
-#include "lyxparagraph.h"
-#endif
 
 using std::sort;
 using std::ostream;
@@ -25,7 +22,10 @@ struct compare_tags {
        // used by lower_bound, sort and sorted
        inline
        int operator()(keyword_item const & a, keyword_item const & b) const {
-               return compare_no_case(a.tag, b.tag) < 0;
+               // we use the ascii version, because in turkish, 'i'
+               // is not the lowercase version of 'I', and thus
+               // turkish locale breaks parsing of tags.
+               return compare_ascii_no_case(a.tag, b.tag) < 0;
        }
 };
 // } // end of anon namespace
@@ -47,7 +47,7 @@ string const LyXLex::Pimpl::GetString() const
 
 void LyXLex::Pimpl::printError(string const & message) const
 {
-       string tmpmsg = subst(message, "$$Token", GetString());
+       string const tmpmsg = subst(message, "$$Token", GetString());
        lyxerr << "LyX: " << tmpmsg << " [around line " << lineno
               << " of file " << MakeDisplayPath(name) << ']' << endl;
 }
@@ -142,12 +142,6 @@ void LyXLex::Pimpl::setCommentChar(char c)
 bool LyXLex::Pimpl::next(bool esc /* = false */)
 {
        if (!pushTok.empty()) {
-#ifndef NEW_INSETS
-               pushTok.copy(buff, string::npos);
-               buff[pushTok.length()] = '\0';
-               pushTok.erase();
-               return true;
-#else
                // There can have been a whole line pushed so
                // we extract the first word and leaves the rest
                // in pushTok. (Lgb)
@@ -163,7 +157,6 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                        pushTok.erase();
                        return true;
                }     
-#endif
        }
        if (!esc) {
                unsigned char c = 0; // getc() returns an int
@@ -180,7 +173,7 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                                lyxerr[Debug::LYXLEX] << "Comment read: `" << c
                                                      << buff << "'" << endl;
 #else
-                               // unfortunately is ignore buggy (Lgb)
+                               // unfortunately ignore is buggy (Lgb)
                                is.ignore(100, '\n');
 #endif
                                ++lineno;
@@ -401,23 +394,14 @@ int LyXLex::Pimpl::lex()
        
 bool LyXLex::Pimpl::EatLine()
 {
-#ifndef NEW_INSETS
-       // This is not handling the pushed token
-       if (!pushTok.empty()) {
-               pushTok.copy(buff, string::npos);
-               buff[pushTok.length()] = '\0';
-               pushTok.erase();
-               return true;
-       }
-#endif
        int i = 0;
        unsigned char c = '\0';
        char cc = 0;
        while(is && c != '\n' && i != (LEX_MAX_BUFF - 1)) {
                is.get(cc);
                c = cc;
-               lyxerr[Debug::LYXLEX] << "LyXLex::EatLine read char: `"
-                                     << c << "'" << endl;
+               //lyxerr[Debug::LYXLEX] << "LyXLex::EatLine read char: `"
+               //                    << c << "'" << endl;
                if (c != '\r')
                        buff[i++] = c;
        }
@@ -442,12 +426,6 @@ bool LyXLex::Pimpl::EatLine()
 bool LyXLex::Pimpl::nextToken()
 {
        if (!pushTok.empty()) {
-#ifndef NEW_INSETS
-               pushTok.copy(buff, string::npos);
-               buff[pushTok.length()] = '\0';
-               pushTok.erase();
-               return true;
-#else
                // There can have been a whole line pushed so
                // we extract the first word and leaves the rest
                // in pushTok. (Lgb)
@@ -463,7 +441,6 @@ bool LyXLex::Pimpl::nextToken()
                        pushTok.erase();
                        return true;
                }
-#endif
        }
 
        status = 0;