The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 35e4c1c9a65886c77dde005774914e2e0fc4df6d
Author: Pavel Sanda <[email protected]>
Date:   Thu Jun 14 12:44:16 2012 +0200

    Allow dead caron to be recognized in our key bindings.
    This allows to workaround the problem in #8198 - on some systems
    we get dead caron as a single character instead of whole combined
    character. I suppose this has rather something to do with X settings
    than LyX per se.

diff --git a/src/frontends/qt4/GuiKeySymbol.cpp 
b/src/frontends/qt4/GuiKeySymbol.cpp
index b318430..5ec58c4 100644
--- a/src/frontends/qt4/GuiKeySymbol.cpp
+++ b/src/frontends/qt4/GuiKeySymbol.cpp
@@ -341,6 +341,7 @@ static int string_to_qkey(std::string const & str)
        if (str == "yacute") return Qt::Key_Yacute;
        if (str == "thorn") return Qt::Key_THORN;
        if (str == "ydiaeresis") return Qt::Key_ydiaeresis;
+       if (str == "Dead_Caron") return Qt::Key_Dead_Caron;
 
        // FIXME, correct for all these ?
        if (str == "Super_L") return Qt::Key_Super_L;
@@ -559,6 +560,7 @@ static std::string const qkey_to_string(int lkey)
        case Qt::Key_ssharp: return "ssharp";
        case Qt::Key_ydiaeresis: return "ydiaeresis";
        case Qt::Key_Bar: return "bar";
+       case Qt::Key_Dead_Caron: return "Dead_Caron";
 
        // FIXME: these ones I don't know the names of ... help !
        // what's here is basically guesses ...

-----------------------------------------------------------------------

Summary of changes:
 src/frontends/qt4/GuiKeySymbol.cpp |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to