Fix natbib bug spotted by JMarc.

[lyx.git] / src / trans.C

diff --git a/src/trans.C b/src/trans.C
index 87caa575a478bc0be7b236d35127559757a23e21..8b0fa7029fbdd74b9412589671bbcf1b803f1f4f 100644 (file)
--- a/src/trans.C
+++ b/src/trans.C
@@ -4,7 +4,6 @@
 #pragma implementation
 #endif
 
-#include "LyXView.h"
 #include "trans.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
@@ -111,7 +110,7 @@ void Trans::AddDeadkey(tex_accent accent, string const & keys)
 }
 
 
-int Trans::Load(LyXLex & lex) 
+int Trans::Load(LyXLex & lex)
 {
        bool error = false;
 
@@ -124,16 +123,16 @@ int Trans::Load(LyXLex & lex)
                        if (lex.next(true)) {
                                if (lyxerr.debugging(Debug::KBMAP))
                                        lyxerr << "key\t`" << lex.text()
-                                              << "'" << endl;
+                                              << '\'' << endl;
                        } else
                                return -1;
-                       
+
                        string const keys = lex.getString();
 
                        if (lex.next(true)) {
                                if (lyxerr.debugging(Debug::KBMAP))
                                        lyxerr << "accent\t`" << lex.text()
-                                              << "'" << endl;
+                                              << '\'' << endl;
                        } else
                                return -1;
 
@@ -149,7 +148,7 @@ int Trans::Load(LyXLex & lex)
                        if (lex.next(true)) {
                                if (lyxerr.debugging(Debug::KBMAP))
                                        lyxerr << "allowed\t`" << lex.text()
-                                              << "'" << endl;
+                                              << '\'' << endl;
                        } else
                                return -1;
 
@@ -159,7 +158,7 @@ int Trans::Load(LyXLex & lex)
                        AddDeadkey(accent, keys);
 #endif
                        break;
-               }       
+               }
                case KCOMB: {
                        string str;
 
@@ -169,7 +168,7 @@ int Trans::Load(LyXLex & lex)
                                lyxerr[Debug::KBMAP] << str << endl;
                        } else
                                return -1;
-                       
+
                        tex_accent accent_1 = getkeymod(str);
                        if (accent_1 == TEX_NOACCENT) return -1;
 
@@ -209,7 +208,7 @@ int Trans::Load(LyXLex & lex)
                        } else {
                                return -1;
                        }
-                       
+
                        InsertException(kmod_list_[accent_1].exception_list,
                                        static_cast<char>(it->first), allowed,
                                        true, accent_2);
@@ -223,7 +222,7 @@ int Trans::Load(LyXLex & lex)
                        if (lex.next(true)) {
                                key_from = lex.text()[0];
                                if (lyxerr.debugging(Debug::KBMAP))
-                                       lyxerr << "\t`" << lex.text() << "'"
+                                       lyxerr << "\t`" << lex.text() << '\''
                                               << endl;
                        } else
                                return -1;
@@ -232,7 +231,7 @@ int Trans::Load(LyXLex & lex)
                                string string_to = lex.text();
                                keymap_[key_from] = string_to;
                                if (lyxerr.debugging(Debug::KBMAP))
-                                       lyxerr << "\t`" << string_to << "'"
+                                       lyxerr << "\t`" << string_to << '\''
                                               << endl;
                        } else
                                return -1;
@@ -248,7 +247,7 @@ int Trans::Load(LyXLex & lex)
                                lyxerr << "KXMOD:\t" << lex.text() << endl;
                        if (lex.next(true)) {
                                if (lyxerr.debugging(Debug::KBMAP))
-                                       lyxerr << "\t`" << lex.text() << "'"
+                                       lyxerr << "\t`" << lex.text() << '\''
                                               << endl;
                                accent = getkeymod(lex.getString());
                        } else
@@ -256,7 +255,7 @@ int Trans::Load(LyXLex & lex)
 
                        if (lex.next(true)) {
                                if (lyxerr.debugging(Debug::KBMAP))
-                                       lyxerr << "\t`" << lex.text() << "'"
+                                       lyxerr << "\t`" << lex.text() << '\''
                                               << endl;
                                key = lex.text()[0];
                        } else
@@ -264,7 +263,7 @@ int Trans::Load(LyXLex & lex)
 
                        if (lex.next(true)) {
                                if (lyxerr.debugging(Debug::KBMAP))
-                                       lyxerr << "\t`" << lex.text() << "'"
+                                       lyxerr << "\t`" << lex.text() << '\''
                                               << endl;
                                str = lex.text();
                        } else
@@ -321,9 +320,9 @@ int Trans::Load(string const & language)
                return -1;
 
        FreeKeymap();
-       LyXLex lex(kmapTags, K_LAST-1);
+       LyXLex lex(kmapTags, K_LAST - 1);
        lex.setFile(filename);
-       
+
        int const res = Load(lex);
 
        if (res == 0) {
@@ -343,8 +342,8 @@ tex_accent getkeymod(string const & p)
                        lyxerr << "p = " << p
                               << ", lyx_accent_table[" << i
                               << "].name = `" << lyx_accent_table[i].name
-                              << "'" << endl;
-               
+                              << '\'' << endl;
+
                if (lyx_accent_table[i].name
                     && contains(p, lyx_accent_table[i].name)) {
                        lyxerr[Debug::KBMAP] << "Found it!" << endl;