Account for old versions of Pygments

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

diff --git a/src/mathed/CommandInset.cpp b/src/mathed/CommandInset.cpp
index a53a23355599044cef561fd85621b32b598cd46d..344c570323a32aef7156509539c2574617d242b0 100644 (file)
--- 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.
  */
@@ -14,40 +14,35 @@
 #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<Inset> CommandInset::doClone() const
+Inset * CommandInset::clone() const
 {
-       return auto_ptr<Inset>(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;
 }
 
 
@@ -61,14 +56,15 @@ Inset * 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) << '}';
 }