X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans.C;h=3230fabf1874e2be0f8cf9103d3e9efcbd39360c;hb=b59621bc59584fb3496459a2be79acfc8476a9a1;hp=8b0fa7029fbdd74b9412589671bbcf1b803f1f4f;hpb=53274e31ec1cc715c0b48921ee67818790c2e99a;p=lyx.git

diff --git a/src/trans.C b/src/trans.C
index 8b0fa7029f..3230fabf18 100644
--- a/src/trans.C
+++ b/src/trans.C
@@ -1,19 +1,29 @@
-#include <config.h>
+/**
+ * \file trans.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "trans.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "tex-strings.h"
 #include "lyxlex.h"
 #include "debug.h"
 #include "trans_mgr.h"
 
-using std::map;
+using lyx::support::contains;
+using lyx::support::LibFileSearch;
+
 using std::endl;
+using std::string;
+using std::map;
 
 
 // KmodInfo
@@ -119,10 +129,10 @@ int Trans::Load(LyXLex & lex)
 		case KMOD:
 		{
 			if (lyxerr.debugging(Debug::KBMAP))
-				lyxerr << "KMOD:\t" << lex.text() << endl;
+				lyxerr << "KMOD:\t" << lex.getString() << endl;
 			if (lex.next(true)) {
 				if (lyxerr.debugging(Debug::KBMAP))
-					lyxerr << "key\t`" << lex.text()
+					lyxerr << "key\t`" << lex.getString()
 					       << '\'' << endl;
 			} else
 				return -1;
@@ -131,7 +141,7 @@ int Trans::Load(LyXLex & lex)
 
 			if (lex.next(true)) {
 				if (lyxerr.debugging(Debug::KBMAP))
-					lyxerr << "accent\t`" << lex.text()
+					lyxerr << "accent\t`" << lex.getString()
 					       << '\'' << endl;
 			} else
 				return -1;
@@ -147,7 +157,7 @@ int Trans::Load(LyXLex & lex)
 			// so that this field is not present anymore.
 			if (lex.next(true)) {
 				if (lyxerr.debugging(Debug::KBMAP))
-					lyxerr << "allowed\t`" << lex.text()
+					lyxerr << "allowed\t`" << lex.getString()
 					       << '\'' << endl;
 			} else
 				return -1;
@@ -164,7 +174,7 @@ int Trans::Load(LyXLex & lex)
 
 			lyxerr[Debug::KBMAP] << "KCOMB:" << endl;
 			if (lex.next(true)) {
-				str= lex.text();
+				str = lex.getString();
 				lyxerr[Debug::KBMAP] << str << endl;
 			} else
 				return -1;
@@ -173,7 +183,7 @@ int Trans::Load(LyXLex & lex)
 			if (accent_1 == TEX_NOACCENT) return -1;
 
 			if (lex.next(true)) {
-				str = lex.text();
+				str = lex.getString();
 				lyxerr[Debug::KBMAP] << str << endl;
 			} else
 				return -1;
@@ -218,17 +228,17 @@ int Trans::Load(LyXLex & lex)
 			unsigned char key_from;
 
 			if (lyxerr.debugging(Debug::KBMAP))
-				lyxerr << "KMAP:\t" << lex.text() << endl;
+				lyxerr << "KMAP:\t" << lex.getString() << endl;
 			if (lex.next(true)) {
-				key_from = lex.text()[0];
+				key_from = lex.getString()[0];
 				if (lyxerr.debugging(Debug::KBMAP))
-					lyxerr << "\t`" << lex.text() << '\''
+					lyxerr << "\t`" << lex.getString() << '\''
 					       << endl;
 			} else
 				return -1;
 
 			if (lex.next(true)) {
-				string string_to = lex.text();
+				string const string_to = lex.getString();
 				keymap_[key_from] = string_to;
 				if (lyxerr.debugging(Debug::KBMAP))
 					lyxerr << "\t`" << string_to << '\''
@@ -244,10 +254,10 @@ int Trans::Load(LyXLex & lex)
 			string str;
 
 			if (lyxerr.debugging(Debug::KBMAP))
-				lyxerr << "KXMOD:\t" << lex.text() << endl;
+				lyxerr << "KXMOD:\t" << lex.getString() << endl;
 			if (lex.next(true)) {
 				if (lyxerr.debugging(Debug::KBMAP))
-					lyxerr << "\t`" << lex.text() << '\''
+					lyxerr << "\t`" << lex.getString() << '\''
 					       << endl;
 				accent = getkeymod(lex.getString());
 			} else
@@ -255,17 +265,17 @@ int Trans::Load(LyXLex & lex)
 
 			if (lex.next(true)) {
 				if (lyxerr.debugging(Debug::KBMAP))
-					lyxerr << "\t`" << lex.text() << '\''
+					lyxerr << "\t`" << lex.getString() << '\''
 					       << endl;
-				key = lex.text()[0];
+				key = lex.getString()[0];
 			} else
 				return -1;
 
 			if (lex.next(true)) {
 				if (lyxerr.debugging(Debug::KBMAP))
-					lyxerr << "\t`" << lex.text() << '\''
+					lyxerr << "\t`" << lex.getString() << '\''
 					       << endl;
-				str = lex.text();
+				str = lex.getString();
 			} else
 				return -1;