Fix #10778 (issue with CJK and language nesting)

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

diff --git a/src/mathed/InsetMathEnv.cpp b/src/mathed/InsetMathEnv.cpp
index e70b09cb1fb50f6ebffd4bd1ef9c336cae38db75..cc613fd44018eb4165f877e304b282e1f22fe156 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.
  */
@@ -11,38 +11,35 @@
 #include <config.h>
 
 #include "InsetMathEnv.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathStream.h"
-#include "support/std_ostream.h"
-
 
-namespace lyx {
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
+#include <ostream>
 
-using std::string;
-using std::auto_ptr;
+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)
 {}
 
 
-auto_ptr<Inset> InsetMathEnv::doClone() const
+Inset * InsetMathEnv::clone() const
 {
-       return auto_ptr<Inset>(new InsetMathEnv(*this));
+       return new InsetMathEnv(*this);
 }
 
 
-bool InsetMathEnv::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathEnv::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi, dim);
        metricsMarkers(dim);
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
 }
 
 
@@ -55,6 +52,7 @@ void InsetMathEnv::draw(PainterInfo & pi, int x, int y) const
 
 void InsetMathEnv::write(WriteStream & os) const
 {
+       MathEnsurer ensurer(os);
        os << "\\begin{" << name_ << '}' << cell(0) << "\\end{" << name_ << '}';
 }
 
@@ -67,7 +65,7 @@ void InsetMathEnv::normalize(NormalStream & os) const
 
 void InsetMathEnv::infoize(odocstream & os) const
 {
-       os << "Env: " << name_;
+       os << bformat(_("Environment: %1$s"), name_);
 }