X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex_pimpl.C;h=6351ec523ba8b933e36aead8a4aa5e780264ca38;hb=4e4ebe5d4d675348bbd7f75b9ca6424b6727a253;hp=e67add9d4b2c23193815048d7acb726857c0eb90;hpb=42a1e2ea5a05435f9b07c6274b966e2ae13d4615;p=lyx.git

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index e67add9d4b..6351ec523b 100644
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -8,10 +8,8 @@
 #include "lyxlex_pimpl.h"
 #include "support/lyxalgo.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 #include "debug.h"
-#if 1 // to get NEW_INSETS
-#include "lyxparagraph.h"
-#endif
 
 using std::sort;
 using std::ostream;
@@ -25,7 +23,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
@@ -39,7 +40,7 @@ LyXLex::Pimpl::Pimpl(keyword_item * tab, int num)
 }
 
 
-string const LyXLex::Pimpl::GetString() const
+string const LyXLex::Pimpl::getString() const
 {
 	return string(buff);
 }
@@ -47,7 +48,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;
 }
@@ -68,7 +69,7 @@ void LyXLex::Pimpl::verifyTable()
 {
 	// Check if the table is sorted and if not, sort it.
 	if (table
-	    && !sorted(table, table + no_items, compare_tags())) {
+	    && !lyx::sorted(table, table + no_items, compare_tags())) {
 		lyxerr << "The table passed to LyXLex is not sorted!\n"
 		       << "Tell the developers to fix it!" << endl;
 		// We sort it anyway to avoid problems.
@@ -142,12 +143,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 +158,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 +174,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;
@@ -399,25 +393,16 @@ int LyXLex::Pimpl::lex()
 }
 
 	
-bool LyXLex::Pimpl::EatLine()
+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 +427,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 +442,6 @@ bool LyXLex::Pimpl::nextToken()
 			pushTok.erase();
 			return true;
 		}
-#endif
 	}
 
 	status = 0;