X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FCommandInset.cpp;h=344c570323a32aef7156509539c2574617d242b0;hb=5d7dae9e382f0b01800f5652e673e12fa6923740;hp=a9529b5f3c2cf81a00d05f88b8462824379f945d;hpb=42123ab8a71080b6d15fca4e0c43ae76abf00a1e;p=lyx.git

diff --git a/src/mathed/CommandInset.cpp b/src/mathed/CommandInset.cpp
index a9529b5f3c..344c570323 100644
--- a/src/mathed/CommandInset.cpp
+++ b/src/mathed/CommandInset.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,47 +11,42 @@
 #include <config.h>
 
 #include "CommandInset.h"
-#include "MathArray.h"
+#include "MathData.h"
 #include "MathStream.h"
 #include "DispatchResult.h"
-#include "FuncRequest.h"
 
 #include <sstream>
 
+using namespace std;
 
 namespace lyx {
 
-using std::auto_ptr;
-using std::string;
 
-CommandInset::CommandInset(docstring const & name)
-	: InsetMathNest(2), name_(name), set_label_(false)
+CommandInset::CommandInset(Buffer * buf, docstring const & name, bool needs_math_mode)
+	: InsetMathNest(buf, 2), name_(name), needs_math_mode_(needs_math_mode),
+	  set_label_(false)
 {
 	lock_ = true;
 }
 
 
-auto_ptr<InsetBase> CommandInset::doClone() const
+Inset * CommandInset::clone() const
 {
-	return auto_ptr<InsetBase>(new CommandInset(*this));
+	return new CommandInset(*this);
 }
 
 
-bool CommandInset::metrics(MetricsInfo & mi, Dimension & dim) const
+void CommandInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	if (!set_label_) {
 		set_label_ = true;
-		button_.update(screenLabel(), true);
+		button_.update(screenLabel(), true, false);
 	}
 	button_.metrics(mi, dim);
-	if (dim_ == dim)
-		return false;
-	dim_ = dim;
-	return true;
 }
 
 
-InsetBase * CommandInset::editXY(Cursor & cur, int /*x*/, int /*y*/)
+Inset * CommandInset::editXY(Cursor & cur, int /*x*/, int /*y*/)
 {
 	edit(cur, true);
 	return this;
@@ -61,14 +56,15 @@ InsetBase * CommandInset::editXY(Cursor & cur, int /*x*/, int /*y*/)
 void CommandInset::draw(PainterInfo & pi, int x, int y) const
 {
 	button_.draw(pi, x, y);
-	setPosCache(pi, x, y);
 }
 
 
 void CommandInset::write(WriteStream & os) const
 {
-	os << '\\' << name_.c_str();
-	if (cell(1).size())
+	ModeSpecifier specifier(os, currentMode(), lockedMode(), asciiOnly());
+	MathEnsurer ensurer(os, needs_math_mode_);
+	os << '\\' << name_;
+	if (!cell(1).empty())
 		os << '[' << cell(1) << ']';
 	os << '{' << cell(0) << '}';
 }