Fix Bug 3947: BibTeX allows parentheses in the key (even if the whole entry is delimi...

[lyx.git] / src / insets / InsetCommand.cpp

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index d3676497d9455a03f19c963965b3d43e51c23a43..ea52598dc1278919749d9626f877082622899773 100644 (file)
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -13,13 +13,14 @@
 
 #include "InsetCommand.h"
 
+#include "Buffer.h"
 #include "BufferView.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
-#include "lyxlex.h"
-#include "metricsinfo.h"
+#include "Lexer.h"
+#include "MetricsInfo.h"
 
 #include <sstream>
 
@@ -85,30 +86,30 @@ void InsetCommand::setParams(InsetCommandParams const & p)
 
 
 int InsetCommand::latex(Buffer const &, odocstream & os,
-                        OutputParams const &) const
+                       OutputParams const &) const
 {
        os << getCommand();
        return 0;
 }
 
 
-int InsetCommand::plaintext(Buffer const &, odocstream & os,
-                            OutputParams const &) const
+int InsetCommand::plaintext(Buffer const & buf, odocstream & os,
+                           OutputParams const &) const
 {
-       docstring const str = "[" + _("LaTeX Command: ") + from_utf8(getCmdName()) + "]";
+       docstring const str = "[" + buf.B_("LaTeX Command: ") + from_utf8(getCmdName()) + "]";
        os << str;
        return str.size();
 }
 
 
 int InsetCommand::docbook(Buffer const &, odocstream &,
-                          OutputParams const &) const
+                         OutputParams const &) const
 {
        return 0;
 }
 
 
-void InsetCommand::doDispatch(LCursor & cur, FuncRequest & cmd)
+void InsetCommand::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
        case LFUN_INSET_REFRESH:
@@ -132,20 +133,20 @@ void InsetCommand::doDispatch(LCursor & cur, FuncRequest & cmd)
        }
 
        case LFUN_MOUSE_RELEASE: {
-               if (!mailer_name_.empty())
+               if (!mailer_name_.empty() && !cur.selection())
                        InsetCommandMailer(mailer_name_, *this).showDialog(&cur.bv());
                break;
        }
 
        default:
-               InsetBase::doDispatch(cur, cmd);
+               Inset::doDispatch(cur, cmd);
                break;
        }
 
 }
 
 
-bool InsetCommand::getStatus(LCursor & cur, FuncRequest const & cmd,
+bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
        FuncStatus & status) const
 {
        switch (cmd.action) {
@@ -160,7 +161,7 @@ bool InsetCommand::getStatus(LCursor & cur, FuncRequest const & cmd,
                status.enabled(true);
                return true;
        default:
-               return InsetBase::getStatus(cur, cmd, status);
+               return Inset::getStatus(cur, cmd, status);
        }
 }
 
@@ -193,7 +194,7 @@ void InsetCommandMailer::string2params(string const & name,
                return;
 
        istringstream data(in);
-       LyXLex lex(0,0);
+       Lexer lex(0,0);
        lex.setStream(data);
 
        string n;
@@ -202,7 +203,7 @@ void InsetCommandMailer::string2params(string const & name,
                return print_mailer_error("InsetCommandMailer", in, 1, name);
 
        // This is part of the inset proper that is usually swallowed
-       // by LyXText::readInset
+       // by Text::readInset
        string id;
        lex >> id;
        if (!lex || id != "LatexCommand")