fix compilation error

[lyx.git] / src / mathed / math_macrotemplate.C

diff --git a/src/mathed/math_macrotemplate.C b/src/mathed/math_macrotemplate.C
index 21e00835755a67e9dac73eb00f51162a1116f15a..22186a52ee52fff2d81898f46f026ba39f9957a9 100644 (file)
--- a/src/mathed/math_macrotemplate.C
+++ b/src/mathed/math_macrotemplate.C
@@ -1,178 +1,90 @@
-#include <config.h>
+#ifdef __GNUG__
+#pragma implementation
+#endif
 
 #include "math_macrotemplate.h"
-#include "math_macro.h"
-#include "macro_support.h"
+#include "math_mathmlstream.h"
+#include "frontends/Painter.h"
+#include "debug.h"
 
 
-void  MathMacroTemplate::setTCode(MathedTextCodes t)
-{
-       tcode = t;
-}
-
-
-MathedTextCodes MathMacroTemplate::getTCode() const
-{
-       return tcode;
-}
-
-
-int MathMacroTemplate::getNoArgs() const
-{
-       return nargs;
-}
-
-
-MathMacroTemplate::MathMacroTemplate(string const & nm, int na, int flg):
-       MathParInset(LM_ST_TEXT, nm, LM_OT_MACRO), 
-       flags(flg), nargs(na)
-{
-       if (nargs > 0) {
-               tcode = LM_TC_ACTIVE_INSET;
-               args_.resize(nargs);
-               for (int i = 0; i < nargs; ++i) {
-                       args_[i].setNumber(i + 1);
-               }
-       } else {
-               tcode = LM_TC_INSET;
-               // Here is  nargs != args_.size()
-               //args = 0;
-       }
-}
-
-
-MathMacroTemplate::~MathMacroTemplate()
-{
-       // prevent to delete already deleted objects
-       for (int i = 0; i < nargs; ++i) {
-               args_[i].SetData(0);
-       }
-}
+MathMacroTemplate::MathMacroTemplate()
+       : MathNestInset(2), numargs_(0), name_()
+{}
 
 
-void MathMacroTemplate::setEditMode(bool ed)
+MathMacroTemplate::MathMacroTemplate(string const & nm, int numargs)
+       : MathNestInset(2), numargs_(numargs), name_(nm)
 {
-       if (ed) {
-               flags |= MMF_Edit;
-               for (int i = 0; i < nargs; ++i) {
-                       args_[i].setExpand(false);
-               }
-       }
-       else {
-               flags &= ~MMF_Edit;
-               for (int i = 0; i < nargs; ++i) {
-                       args_[i].setExpand(true);
-               }
-       }
+       if (numargs_ > 9)
+               lyxerr << "MathMacroTemplate::MathMacroTemplate: wrong # of arguments: "
+                       << numargs_ << std::endl;
 }
 
 
-void MathMacroTemplate::draw(Painter & pain, int x, int y)
+MathInset * MathMacroTemplate::clone() const
 {
-       int x2, y2;
-       bool expnd = (nargs > 0) ? args_[0].getExpand(): false;
-       if (flags & MMF_Edit) {
-               for (int i = 0; i < nargs; ++i) {
-                       args_[i].setExpand(false);
-               }
-               x2 = x; y2 = y;
-       } else {
-               for (int i = 0; i < nargs; ++i) {
-                       args_[i].setExpand(true);
-               }
-               x2 = xo; y2 = yo;
-       }
-       MathParInset::draw(pain, x, y);
-       xo = x2; yo = y2;
-
-       for (int i = 0; i < nargs; ++i) {
-               args_[i].setExpand(expnd);
-       }
+       //lyxerr << "cloning MacroTemplate!\n";
+       return new MathMacroTemplate(*this);
 }
 
 
-void MathMacroTemplate::Metrics()
+int MathMacroTemplate::numargs() const
 {
-       bool expnd = (nargs > 0) ? args_[0].getExpand(): false;
-    
-       if (flags & MMF_Edit) {
-               for (int i = 0; i < nargs; ++i) {
-                       args_[i].setExpand(false);
-               }
-       } else {
-               for (int i = 0; i < nargs; ++i) {
-                       args_[i].setExpand(true);
-               }
-       }
-       MathParInset::Metrics();
-    
-       for (int i = 0; i < nargs; ++i) {
-               args_[i].setExpand(expnd);
-       }
+       return numargs_;
 }
 
 
-void MathMacroTemplate::update(MathMacro * macro)
+void MathMacroTemplate::numargs(int numargs)
 {
-       int idx = (macro) ? macro->getArgumentIdx() : 0;
-       for (int i = 0; i < nargs; ++i) {
-               if (macro) {
-                       macro->setArgumentIdx(i);
-                       args_[i].SetData(macro->GetData());
-                       MathedRowSt * row = macro->getRowSt();
-                       args_[i].setRowSt(row);
-               }
-       }       
-       if (macro)
-               macro->setArgumentIdx(idx);
+       numargs_ = numargs;
 }
 
 
-void MathMacroTemplate::WriteDef(ostream & os, bool fragile)
+string const & MathMacroTemplate::name() const
 {
-       os << "\n\\newcommand{\\" << name << "}";
-
-       if (nargs > 0 ) 
-               os << "[" << nargs << "]";
-
-       os << "{";
-
-       for (int i = 0; i < nargs; ++i) {
-               args_[i].setExpand(false);
-       }        
-       Write(os, fragile); 
-       os << "}\n";
+       return name_;
 }
 
 
-void MathMacroTemplate::setArgument(MathedArray * a, int i)
+void MathMacroTemplate::metrics(MathMetricsInfo & mi) const
 {
-       args_[i].SetData(a);
+       xcell(0).metrics(mi);
+       xcell(1).metrics(mi);
+       width_   = xcell(0).width() + xcell(1).width() + 10;
+       ascent_  = std::max(xcell(0).ascent(),  xcell(1).ascent())  + 2;
+       descent_ = std::max(xcell(0).descent(), xcell(1).descent()) + 2;
 }
 
 
-void MathMacroTemplate::GetMacroXY(int i, int & x, int & y) const
+void MathMacroTemplate::draw(MathPainterInfo & pi, int x, int y) const
 {
-       args_[i].GetXY(x, y);
+       int const w0 = xcell(0).width();
+       int const w1 = xcell(1).width();
+       xcell(0).draw(pi, x + 2, y + 1);
+       pi.pain.rectangle(x, y - ascent() + 1, w0 + 4, height(),
+                       LColor::blue);
+       xcell(1).draw(pi, x + 8 + w0, y + 1);
+       pi.pain.rectangle(x + w0 + 6 , y - ascent() + 1, w1 + 4,
+                       height(), LColor::blue);
 }
 
 
-MathParInset * MathMacroTemplate::getMacroPar(int i) const
+void MathMacroTemplate::write(WriteStream & os) const
 {
-       if (i >= 0 && i < nargs) 
-               return const_cast<MathParInset *>
-                       (static_cast<MathParInset const *>(&args_[i]));
-       else 
-               return 0;
-}
-
-
-void MathMacroTemplate::SetMacroFocus(int &idx, int x, int y)
-{
-       for (int i = 0; i < nargs; ++i) {
-               if (args_[i].Inside(x, y)) {
-                       idx = i;
-                       break;
-               }
+       if (os.latex()) {
+               os << "\n\\newcommand{\\" << name_.c_str() << '}';
+               if (numargs_ > 0)
+                       os << '[' << numargs_ << ']';
+               os << '{' << cell(0) << "}\n";
+       } else {
+               // writing .lyx
+               os << "\n\\newcommand{\\" << name_.c_str() << '}';
+               if (numargs_ > 0)
+                       os << '[' << numargs_ << ']';
+               os << '{' << cell(0) << '}';
+               // write special .tex export only if necessary
+               if (!cell(1).empty())
+                       os << "\n{" << cell(1) << '}';
        }
 }