some support for matrix operations with maple ('M-x math-extern maple evalm')

[lyx.git] / src / trans.C

diff --git a/src/trans.C b/src/trans.C
index a4363299f11b711f668803e4b1b1bdca5440daa6..6f1e3809f7461ba87cb56d4360c1eef60c64f004 100644 (file)
--- a/src/trans.C
+++ b/src/trans.C
@@ -221,11 +221,11 @@ void Trans::AddDeadkey(tex_accent accent, string const & keys)
 }
 
 
-int Trans::Load(LyXLex & lex)
+int Trans::Load(LyXLex & lex) 
 {
        bool error = false;
 
-       while (lex.IsOK() && !error) {
+       while (lex.isOK() && !error) {
                switch (lex.lex()) {
                case KMOD:
                {
@@ -238,7 +238,7 @@ int Trans::Load(LyXLex & lex)
                        } else
                                return -1;
                        
-                       string const keys = lex.GetString();
+                       string const keys = lex.getString();
 
                        if (lex.next(true)) {
                                if (lyxerr.debugging(Debug::KBMAP))
@@ -247,13 +247,13 @@ int Trans::Load(LyXLex & lex)
                        } else
                                return -1;
 
-                       tex_accent accent = getkeymod(lex.GetString());
+                       tex_accent accent = getkeymod(lex.getString());
 
                        if (accent == TEX_NOACCENT)
                                return -1;
 
 #if 1
-#warning This code should be removed...
+//#warning This code should be removed...
                        // But we need to fix up all the kmap files first
                        // so that this field is not present anymore.
                        if (lex.next(true)) {
@@ -263,7 +263,7 @@ int Trans::Load(LyXLex & lex)
                        } else
                                return -1;
 
-                       string const allowed = lex.GetString();
+                       string const allowed = lex.getString();
                        AddDeadkey(accent, keys /*, allowed*/);
 #else
                        AddDeadkey(accent, keys);
@@ -340,7 +340,7 @@ int Trans::Load(LyXLex & lex)
                        }
                        string allowed;
                        if (lex.next()) {
-                               allowed = lex.GetString();
+                               allowed = lex.getString();
                                lyxerr[Debug::KBMAP] << "allowed: "
                                                     << allowed << endl;
                        } else {
@@ -388,7 +388,7 @@ int Trans::Load(LyXLex & lex)
                                if (lyxerr.debugging(Debug::KBMAP))
                                        lyxerr << "\t`" << lex.text() << "'"
                                               << endl;
-                               accent = getkeymod(lex.GetString());
+                               accent = getkeymod(lex.getString());
                        } else
                                return -1;