* the GNU General Public Licence version 2 or later.
*/
-#include <config.h>
-#include <fstream>
-
-#include "support/LOstream.h"
-
#ifdef __GNUG__
#pragma implementation
#endif
+#include <config.h>
+#include <fstream>
+
#include "formula.h"
#include "commandtags.h"
#include "math_cursor.h"
#include "math_parser.h"
#include "lyx_main.h"
#include "BufferView.h"
-#include "lyxtext.h"
#include "gettext.h"
#include "debug.h"
#include "lyx_gui_misc.h"
#include "support/syscall.h"
#include "LyXView.h"
#include "Painter.h"
-#include "font.h"
#include "lyxrc.h"
#include "math_matrixinset.h"
#include "mathed/support.h"
-using std::ostringstream;
using std::ostream;
using std::ifstream;
using std::istream;
extern char const * latex_mathenv[];
extern MathCursor * mathcursor;
-extern LyXFont WhichFont(short type, int size);
-
// quite a hack i know. Should be done with return values...
{}
+InsetFormula::InsetFormula(string const & s)
+ : InsetFormulaBase(mathed_parse(s))
+{
+ Metrics();
+}
+
-Inset * InsetFormula::Clone(Buffer const &) const
+Inset * InsetFormula::clone(Buffer const &, bool) const
{
return new InsetFormula(*this);
}
-void InsetFormula::Write(Buffer const * buf, ostream & os) const
+void InsetFormula::write(ostream & os) const
{
os << "Formula ";
- Latex(buf, os, false, false);
+ latex(os, false, false);
}
-int InsetFormula::Latex(Buffer const *, ostream & os, bool fragile, bool) const
+int InsetFormula::latex(ostream & os, bool fragile, bool) const
{
par()->Write(os, fragile);
return 1;
}
-int InsetFormula::Ascii(Buffer const *, ostream & os, int) const
+int InsetFormula::ascii(ostream & os, int) const
{
par()->Write(os, false);
return 1;
}
-int InsetFormula::Linuxdoc(Buffer const * buf, ostream & os) const
+int InsetFormula::linuxdoc(ostream & os) const
{
- return Ascii(buf, os, 0);
+ return ascii(os, 0);
}
-int InsetFormula::DocBook(Buffer const * buf, ostream & os) const
+int InsetFormula::docBook(ostream & os) const
{
- return Ascii(buf, os, 0);
+ return ascii(os, 0);
}
-void InsetFormula::Read(Buffer const *, LyXLex & lex)
+void InsetFormula::read(LyXLex & lex)
{
- par_ = mathed_parse(lex);
+ par(mathed_parse(lex));
+ Metrics();
}
{
int x = int(xx) - 1;
y -= 2;
+
MathInset::workwidth = bv->workWidth();
Painter & pain = bv->painter();
+ Metrics();
int w = par()->width();
int h = par()->height();
int a = par()->ascent();
- pain.fillRectangle(int(x), y - a, w, h, LColor::mathbg);
-
- if (mathcursor) {
- par()->Metrics(LM_ST_TEXT);
-
- if (mathcursor->formula() == this) {
- if (mathcursor->Selection()) {
- int xp[10];
- int yp[10];
- int n;
- mathcursor->SelGetArea(xp, yp, n);
- pain.fillPolygon(xp, yp, n, LColor::selection);
- }
- pain.rectangle(int(x), y - a, w, h, LColor::mathframe);
- }
+ pain.fillRectangle(x, y - a, w, h, LColor::mathbg);
+
+ if (mathcursor && mathcursor->formula() == this) {
+ mathcursor->drawSelection(pain);
+ pain.rectangle(x, y - a, w, h, LColor::mathframe);
}
- par()->draw(pain, int(x), y);
+ par()->draw(pain, x, y);
xx += par()->width();
setCursorVisible(false);
}
+void InsetFormula::Metrics() const
+{
+ const_cast<MathInset *>(par_)->Metrics(display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+}
+
vector<string> const InsetFormula::getLabelList() const
{
return par()->getLabelList();
UpdatableInset::RESULT
-InsetFormula::LocalDispatch(BufferView * bv, kb_action action,
+InsetFormula::localDispatch(BufferView * bv, kb_action action,
string const & arg)
{
RESULT result = DISPATCHED;
case LFUN_BREAKLINE:
bv->lockedInsetStoreUndo(Undo::INSERT);
- par()->breakLine();
- UpdateLocal(bv);
- break;
-
-
- case LFUN_DELETE_LINE_FORWARD:
- bv->lockedInsetStoreUndo(Undo::DELETE);
- mathcursor->DelLine();
- UpdateLocal(bv);
+ int x;
+ int y;
+ mathcursor->GetPos(x, y);
+ mathcursor->breakLine();
+ mathcursor->normalize();
+ updateLocal(bv, true);
break;
case LFUN_MATH_NUMBER:
for (int row = 0; row < par()->nrows(); ++row)
par()->numbered(row, !old);
bv->owner()->message(old ? _("No number") : _("Number"));
- UpdateLocal(bv);
+ updateLocal(bv, true);
}
break;
}
bool old = par()->numbered(row);
bv->owner()->message(old ? _("No number") : _("Number"));
par()->numbered(row, !old);
- UpdateLocal(bv);
+ updateLocal(bv, true);
}
break;
}
par()->label(row, new_label);
- UpdateLocal(bv);
+ updateLocal(bv, true);
break;
}
case LFUN_MATH_EXTERN:
- HandleExtern(arg, bv);
- UpdateLocal(bv);
+ bv->lockedInsetStoreUndo(Undo::EDIT);
+ handleExtern(arg, bv);
+ updateLocal(bv, true);
break;
case LFUN_MATH_MUTATE:
+ {
+ bv->lockedInsetStoreUndo(Undo::EDIT);
+ int x;
+ int y;
+ mathcursor->GetPos(x, y);
par()->mutate(arg);
- UpdateLocal(bv);
- break;
-
- case LFUN_TABINSERT:
- lyxerr << "take index from cursor\n";
- par()->splitCell(0);
- UpdateLocal(bv);
+ mathcursor->SetPos(x, y);
+ mathcursor->normalize();
+ updateLocal(bv, true);
break;
+ }
case LFUN_MATH_DISPLAY:
+ {
+ int x;
+ int y;
+ mathcursor->GetPos(x, y);
if (par()->GetType() == LM_OT_SIMPLE)
par()->mutate(LM_OT_EQUATION);
else
par()->mutate(LM_OT_SIMPLE);
- UpdateLocal(bv);
+ mathcursor->SetPos(x, y);
+ mathcursor->normalize();
+ updateLocal(bv, true);
break;
+ }
default:
- result = InsetFormulaBase::LocalDispatch(bv, action, arg);
+ result = InsetFormulaBase::localDispatch(bv, action, arg);
}
return result;
}
-void InsetFormula::HandleExtern(const string & arg, BufferView *)
+void InsetFormula::handleExtern(const string & arg, BufferView *)
{
//string outfile = lyx::tempName("maple.out");
string outfile = "/tmp/lyx2" + arg + ".out";
Systemcalls cmd(Systemcalls::System, script, 0);
ifstream is(outfile.c_str());
- par_ = mathed_parse(is);
+ par(mathed_parse(is));
+ Metrics();
}
bool InsetFormula::display() const
return static_cast<MathMatrixInset *>(par_);
}
+void InsetFormula::par(MathInset * p)
+{
+ delete par_;
+ par_ = p ? p : new MathMatrixInset;
+}
-Inset::Code InsetFormula::LyxCode() const
+
+Inset::Code InsetFormula::lyxCode() const
{
return Inset::MATH_CODE;
}
-void InsetFormula::Validate(LaTeXFeatures & features) const
+void InsetFormula::validate(LaTeXFeatures & features) const
{
par()->Validate(features);
}
+bool InsetFormula::insetAllowed(Inset::Code code) const
+{
+ return code == Inset::LABEL_CODE;
+}
+
int InsetFormula::ascent(BufferView *, LyXFont const &) const
{
- return par()->ascent() + 4;
+ return par()->ascent() + 1;
}
int InsetFormula::descent(BufferView *, LyXFont const &) const
{
- return par()->descent();
+ return par()->descent() + 1;
}
int InsetFormula::width(BufferView *, LyXFont const &) const
{
- par()->Metrics(LM_ST_TEXT);
+ Metrics();
return par()->width();
}
-
-/*
-LyXFont const InsetFormula::ConvertFont(LyXFont const & f) const
-{
- // We have already discussed what was here
- LyXFont font(f);
- font.setLatex(LyXFont::OFF);
- return font;
-}
-*/
projects / lyx.git / blobdiff