More requires --> required, for C++2a.

[lyx.git] / src / KeySequence.cpp

diff --git a/src/KeySequence.cpp b/src/KeySequence.cpp
index 177e74e1bfa34ef5829bf846b8aa443f7c70fda8..f1530c886686370a916fdd6c87cfd56a13865ca5 100644 (file)
--- a/src/KeySequence.cpp
+++ b/src/KeySequence.cpp
@@ -70,6 +70,12 @@ size_t KeySequence::parse(string const & s)
                                i += 2;
                                continue;
                        case 'm': case 'M':
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+                               mod |= MetaModifier;
+                               i += 2;
+                               continue;
+#endif
+                       case 'a': case 'A':
                                mod |= AltModifier;
                                i += 2;
                                continue;
@@ -88,6 +94,12 @@ size_t KeySequence::parse(string const & s)
                                i += 3;
                                continue;
                        case 'm': case 'M':
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+                               nmod |= MetaModifier;
+                               i += 3;
+                               continue;
+#endif
+                       case 'a': case 'A':
                                nmod |= AltModifier;
                                i += 3;
                                continue;
@@ -113,8 +125,7 @@ size_t KeySequence::parse(string const & s)
                }
        }
 
-       // empty sequence?
-       if (sequence.size() == 0)
+       if (sequence.empty())
                return 0;
 
        // everything is fine
@@ -122,7 +133,7 @@ size_t KeySequence::parse(string const & s)
 }
 
 
-docstring const KeySequence::print(outputFormat format) const
+docstring const KeySequence::print(outputFormat format, bool const untranslated) const
 {
        docstring buf;
 
@@ -131,20 +142,24 @@ docstring const KeySequence::print(outputFormat format) const
        for (size_t i = 0; i != length; ++i) {
                switch (format) {
                case Portable:
-                       buf += sequence[i].print(modifiers[i].first, false);
+                       buf += sequence[i].print(modifiers[i].first, false, untranslated);
                        break;
                case ForGui:
-                       buf += sequence[i].print(modifiers[i].first, true);
+                       buf += sequence[i].print(modifiers[i].first, true, untranslated);
                        break;
                case BindFile:
                        KeyModifier mod = modifiers[i].first;
                        if (mod & ControlModifier)
                                buf += "C-";
                        if (mod & AltModifier)
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+                               buf += "A-";
+                       if (mod & MetaModifier)
+#endif
                                buf += "M-";
                        if (mod & ShiftModifier)
                                buf += "S-";
-               
+
                        buf += from_utf8(sequence[i].getSymbolName());
                        break;
                }
@@ -189,6 +204,8 @@ void KeySequence::removeKey()
                return;
        sequence.pop_back();
        modifiers.pop_back();
+       if (sequence.empty())
+               deleted_ = true;
 }