Kill macro mode when using LFUN_ESCAPE

[lyx.git] / src / mathed / InsetMathEnv.cpp

diff --git a/src/mathed/InsetMathEnv.cpp b/src/mathed/InsetMathEnv.cpp
index 3daba8179de46d9030624ae1fe26fcba5a299d1d..2eea5ac4185815f979f39c25b9a119b8f048b532 100644 (file)
--- a/src/mathed/InsetMathEnv.cpp
+++ b/src/mathed/InsetMathEnv.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -16,13 +16,19 @@
 #include "MathStream.h"
 #include "MathStream.h"
 
+#include "MetricsInfo.h"
+
+#include "support/gettext.h"
+#include "support/lstrings.h"
+
 #include <ostream>
 
+using namespace lyx::support;
 
 namespace lyx {
 
-InsetMathEnv::InsetMathEnv(docstring const & name)
-       : InsetMathNest(1), name_(name)
+InsetMathEnv::InsetMathEnv(Buffer * buf, docstring const & name)
+       : InsetMathNest(buf, 1), name_(name)
 {}
 
 
@@ -34,15 +40,15 @@ Inset * InsetMathEnv::clone() const
 
 void InsetMathEnv::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+       Changer dummy = mi.base.changeEnsureMath();
        cell(0).metrics(mi, dim);
-       metricsMarkers(dim);
 }
 
 
 void InsetMathEnv::draw(PainterInfo & pi, int x, int y) const
 {
-       cell(0).draw(pi, x + 1, y);
-       drawMarkers(pi, x, y);
+       Changer dummy = pi.base.changeEnsureMath();
+       cell(0).draw(pi, x, y);
 }
 
 
@@ -61,7 +67,7 @@ void InsetMathEnv::normalize(NormalStream & os) const
 
 void InsetMathEnv::infoize(odocstream & os) const
 {
-       os << "Env: " << name_;
+       os << bformat(_("Environment: %1$s"), name_);
 }