prepare Qt 5.6 builds

[lyx.git] / src / Trans.cpp

diff --git a/src/Trans.cpp b/src/Trans.cpp
index 173958a629011a6fdbaaadd99aebae87ab3b4ec6..9249e8e8d4e00acb814e07c4b038ae309f672f06 100644 (file)
--- a/src/Trans.cpp
+++ b/src/Trans.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Matthias Ettrich
  *
  * Full author contact details are available in file CREDITS.
@@ -17,27 +17,20 @@
 #include "BufferView.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 #include "Text.h"
 
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/convert.h"
-#include "support/docstream.h"
-
-namespace lyx {
-
-using support::split;
-using support::contains;
-using support::libFileSearch;
 
-using std::endl;
-using std::string;
-using std::pair;
-using std::map;
+using namespace std;
+using namespace lyx::support;
 
+namespace lyx {
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -62,7 +55,7 @@ using std::map;
    |    cedilla       |    cedilla       |LFUN_ACCENT_CEDILLA      | cedilla
    |    underdot      |                  |LFUN_ACCENT_UNDERDOT     | underdot
    |    underbar      |                  |LFUN_ACCENT_UNDERBAR     | underbar
-   |    hácek         |    caron         |LFUN_ACCENT_CARON        | caron
+   |    hácek         |    caron         |LFUN_ACCENT_CARON        | caron
    |    breve         |    breve         |LFUN_ACCENT_BREVE        | breve
    |    tie           |                  |LFUN_ACCENT_TIE          | tie
    | Hungarian umlaut |    doubleacute   |LFUN_ACCENT_HUNGARIAN_UMLAUT  | hungarian umlaut
@@ -71,15 +64,16 @@ using std::map;
    |                  |    iota          |                  |
    |                  |    voiced_sound  |                  |
    |                  | semivoiced_sound |                  |
-   |                  |                  |LFUN_ACCENT_SPECIAL_CARON| special caron
    */
-static tex_accent_struct lyx_accent_table[] = {
+static TeXAccent lyx_accent_table[] = {
        {TEX_NOACCENT,   0,      "",                LFUN_NOACTION},
        {TEX_ACUTE,      0x0301, "acute",           LFUN_ACCENT_ACUTE},
        {TEX_GRAVE,      0x0300, "grave",           LFUN_ACCENT_GRAVE},
        {TEX_MACRON,     0x0304, "macron",          LFUN_ACCENT_MACRON},
        {TEX_TILDE,      0x0303, "tilde",           LFUN_ACCENT_TILDE},
-       {TEX_UNDERBAR,   0x0320, "underbar",        LFUN_ACCENT_UNDERBAR},
+       {TEX_PERISPOMENI, 0x0342, "perispomeni",    LFUN_ACCENT_PERISPOMENI},
+       {TEX_UNDERBAR,   0x0320, "underbar",        LFUN_ACCENT_UNDERBAR}, // COMBINING MINUS SIGN BELOW or 0x0331 COMBINING MACRON BELOW ?
+
        {TEX_CEDILLA,    0x0327, "cedilla",         LFUN_ACCENT_CEDILLA},
        {TEX_UNDERDOT,   0x0323, "underdot",        LFUN_ACCENT_UNDERDOT},
        {TEX_CIRCUMFLEX, 0x0302, "circumflex",      LFUN_ACCENT_CIRCUMFLEX},
@@ -87,7 +81,6 @@ static tex_accent_struct lyx_accent_table[] = {
        {TEX_TIE,        0x0361, "tie",             LFUN_ACCENT_TIE},
        {TEX_BREVE,      0x0306, "breve",           LFUN_ACCENT_BREVE},
        {TEX_CARON,      0x030c, "caron",           LFUN_ACCENT_CARON},
-//     {TEX_SPECIAL_CARON, 0x030c, "ooo",          LFUN_ACCENT_SPECIAL_CARON},
        // Don't fix this typo for compatibility reasons!
        {TEX_HUNGUML,    0x030b, "hugarian_umlaut", LFUN_ACCENT_HUNGARIAN_UMLAUT},
        {TEX_UMLAUT,     0x0308, "umlaut",          LFUN_ACCENT_UMLAUT},
@@ -96,7 +89,7 @@ static tex_accent_struct lyx_accent_table[] = {
 };
 
 
-tex_accent_struct get_accent(kb_action action)
+TeXAccent get_accent(FuncCode action)
 {
        int i = 0;
        while (i <= TEX_MAX_ACCENT) {
@@ -104,8 +97,8 @@ tex_accent_struct get_accent(kb_action action)
                        return lyx_accent_table[i];
                ++i;
        }
-       struct tex_accent_struct temp = { static_cast<tex_accent>(0), 0,
-                                         0, static_cast<kb_action>(0)};
+       struct TeXAccent temp = { static_cast<tex_accent>(0), 0,
+                                         0, static_cast<FuncCode>(0)};
        return temp;
 }
 
@@ -121,7 +114,7 @@ static docstring const doAccent(docstring const & s, tex_accent accent)
        if (s.length() > 1) {
                if (accent != TEX_TIE || s.length() > 2)
                        lyxerr << "Warning: Too many characters given for accent "
-                              << lyx_accent_table[accent].name << '.' << std::endl;
+                              << lyx_accent_table[accent].name << '.' << endl;
                os << s.substr(1);
        }
        return normalize_c(os.str());
@@ -175,20 +168,11 @@ bool Trans::isDefined() const
 }
 
 
-enum kmaptags_ {
+enum {
        KCOMB = 1,
        KMOD,
        KMAP,
-       KXMOD,
-       K_LAST
-};
-
-
-struct keyword_item kmapTags[K_LAST - 1] = {
-       {"\\kcomb", KCOMB },
-       { "\\kmap", KMAP },
-       { "\\kmod", KMOD },
-       { "\\kxmod", KXMOD }
+       KXMOD
 };
 
 
@@ -393,12 +377,19 @@ docstring const Trans::process(char_type c, TransManager & k)
 
 int Trans::load(string const & language)
 {
-       support::FileName const filename = libFileSearch("kbd", language, "kmap");
+       LexerKeyword kmapTags[] = {
+               {"\\kcomb", KCOMB },
+               { "\\kmap", KMAP },
+               { "\\kmod", KMOD },
+               { "\\kxmod", KXMOD }
+       };
+
+       FileName const filename = libFileSearch("kbd", language, "kmap");
        if (filename.empty())
                return -1;
 
        freeKeymap();
-       Lexer lex(kmapTags, K_LAST - 1);
+       Lexer lex(kmapTags);
        lex.setFile(filename);
 
        int const res = load(lex);
@@ -438,10 +429,9 @@ tex_accent getkeymod(string const & p)
 
 
 // TransFSMData
-TransFSMData::TransFSMData()
+TransFSMData::TransFSMData() : deadkey_(0), deadkey2_(0), init_state_(0),
+       deadkey_state_(0), combined_state_(0), currentState(0)
 {
-       deadkey_ = deadkey2_ = 0;
-       deadkey_info_.accent = deadkey2_info_.accent = TEX_NOACCENT;
 }
 
 
@@ -591,7 +581,7 @@ Trans TransManager::default_;
 
 
 TransManager::TransManager()
-       : active_(0)
+       : active_(&default_)
 {}