X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_inset.C;h=1a9b26d3e5d3924af921f8105d1240eea70ff8fd;hb=f1ff990de782f1a4c3ae14902f5242bdb012b264;hp=77bdc707b40afb980e6cb0fac9c5250e957ef168;hpb=a92d23883e434166230b350660ed01b60d349987;p=lyx.git diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C index 77bdc707b4..1a9b26d3e5 100644 --- a/src/mathed/math_inset.C +++ b/src/mathed/math_inset.C @@ -15,18 +15,12 @@ * the GNU General Public Licence version 2 or later. */ -#ifdef __GNUG__ -#pragma implementation -#endif - #include -#include "Lsstream.h" #include "math_inset.h" #include "math_scriptinset.h" #include "math_mathmlstream.h" #include "math_cursor.h" -#include "math_parser.h" #include "debug.h" #include "frontends/LyXView.h" @@ -34,32 +28,13 @@ #include "BufferView.h" #include "formulabase.h" - using std::ostream; -using std::vector; +using std::endl; -int MathInset::height() const +BufferView * MathInset::view() const { - return ascent() + descent(); -} - - -ostream & operator<<(ostream & os, MathAtom const & at) -{ - if (at.nucleus()) - os << *(at.nucleus()); - else - os << "(nil)"; - return os; -} - - -ostream & operator<<(ostream & os, MathInset const & inset) -{ - WriteStream wi(os, false, false); - inset.write(wi); - return os; + return mathcursor ? mathcursor->formula()->view() : 0; } @@ -69,49 +44,28 @@ MathInset::size_type MathInset::nargs() const } -Dimension MathInset::dimensions() const -{ - lyxerr << "call MathInset::dimensions()\n"; - return Dimension(width(), ascent(), descent()); -} - - -MathXArray dummyCell; - -MathXArray & MathInset::xcell(idx_type) -{ - lyxerr << "I don't have a cell 1\n"; - return dummyCell; -} - - -MathXArray const & MathInset::xcell(idx_type) const -{ - lyxerr << "I don't have a cell 2\n"; - return dummyCell; -} - +MathArray dummyCell; MathArray & MathInset::cell(idx_type) { - lyxerr << "I don't have a cell 3\n"; - return dummyCell.data(); + lyxerr << "I don't have a cell 1" << endl; + return dummyCell; } MathArray const & MathInset::cell(idx_type) const { - lyxerr << "I don't have a cell 4\n"; - return dummyCell.data(); + lyxerr << "I don't have a cell 2" << endl; + return dummyCell; } MathInset::idx_type MathInset::index(row_type row, col_type col) const { if (row != 0) - lyxerr << "illegal row: " << row << "\n"; + lyxerr << "illegal row: " << row << endl; if (col != 0) - lyxerr << "illegal col: " << col << "\n"; + lyxerr << "illegal col: " << col << endl; return 0; } @@ -149,6 +103,12 @@ bool MathInset::idxUpDown(idx_type &, pos_type &, bool, int) const } +bool MathInset::idxUpDown2(idx_type &, pos_type &, bool, int) const +{ + return false; +} + + bool MathInset::idxFirst(idx_type &, pos_type &) const { return false; @@ -175,66 +135,37 @@ bool MathInset::idxEnd(idx_type &, pos_type &) const void MathInset::getPos(idx_type, pos_type, int & x, int & y) const { - lyxerr << "MathInset::getPos() called directly!\n"; + lyxerr << "MathInset::getPos() called directly!" << endl; x = y = 0; } -void MathInset::normalize(NormalStream & os) const -{ - os << "[unknown "; - WriteStream wi(os.os(), false, true); - write(wi); - os << "] "; -} - - void MathInset::dump() const { - lyxerr << "---------------------------------------------\n"; + lyxerr << "---------------------------------------------" << endl; WriteStream wi(lyxerr, false, true); write(wi); - lyxerr << "\n---------------------------------------------\n"; -} - - -void MathInset::validate(LaTeXFeatures &) const -{} - - -vector - MathInset::idxBetween(idx_type from, idx_type to) const -{ - vector res; - for (idx_type i = from; i <= to; ++i) - res.push_back(i); - return res; -} - - -void MathInset::metrics(MathMetricsInfo &) const -{ - lyxerr << "MathInset::metrics() called directly!\n"; + lyxerr << "\n---------------------------------------------" << endl; } -void MathInset::draw(MathPainterInfo &, int, int) const +bool MathInset::idxBetween(idx_type idx, idx_type from, idx_type to) const { - lyxerr << "MathInset::draw() called directly!\n"; + return from <= idx && idx <= to; } -void MathInset::drawSelection(MathPainterInfo &, +void MathInset::drawSelection(PainterInfo &, idx_type, pos_type, idx_type, pos_type) const { - lyxerr << "MathInset::drawSelection() called directly!\n"; + lyxerr << "MathInset::drawSelection() called directly!" << endl; } -void MathInset::metricsT(TextMetricsInfo const &) const +void MathInset::metricsT(TextMetricsInfo const &, Dimension &) const { #ifdef WITH_WARNINGS - lyxerr << "MathInset::metricsT(Text) called directly!\n"; + lyxerr << "MathInset::metricsT(Text) called directly!" << endl; #endif } @@ -242,33 +173,47 @@ void MathInset::metricsT(TextMetricsInfo const &) const void MathInset::drawT(TextPainter &, int, int) const { #ifdef WITH_WARNINGS - lyxerr << "MathInset::drawT(Text) called directly!\n"; + lyxerr << "MathInset::drawT(Text) called directly!" << endl; #endif } -void MathInset::write(WriteStream &) const +void MathInset::write(WriteStream & os) const +{ + os << '\\' << name().c_str(); + os.pendingSpace(true); +} + + +void MathInset::normalize(NormalStream & os) const { - lyxerr << "MathInset::write() called directly!\n"; + os << '[' << name().c_str() << "] "; } -void MathInset::octavize(OctaveStream & os) const +void MathInset::octave(OctaveStream & os) const { NormalStream ns(os.os()); normalize(ns); } -void MathInset::maplize(MapleStream & os) const +void MathInset::maple(MapleStream & os) const { NormalStream ns(os.os()); normalize(ns); } -void MathInset::mathematicize(MathematicaStream & os) const +void MathInset::maxima(MaximaStream & os) const +{ + MapleStream ns(os.os()); + maple(ns); +} + + +void MathInset::mathematica(MathematicaStream & os) const { NormalStream ns(os.os()); normalize(ns); @@ -300,21 +245,9 @@ int MathInset::docbook(std::ostream &, bool) const } -int MathInset::dispatch(string const &, idx_type, pos_type) -{ - return 0; // undispatched -} - - -std::vector MathInset::getLabelList() const -{ - return std::vector(); -} - - string const & MathInset::getType() const { - static string t("none"); + static string const t("none"); return t; } @@ -325,30 +258,15 @@ string MathInset::name() const } -string asString(MathArray const & ar) -{ - std::ostringstream os; - WriteStream ws(os); - ws << ar; - return os.str(); -} - - -MathArray asArray(string const & str) -{ - MathArray ar; - mathed_parse_cell(ar, str); - return ar; -} - - -Dialogs * getDialogs() +ostream & operator<<(ostream & os, MathAtom const & at) { - return mathcursor->formula()->view()->owner()->getDialogs(); + WriteStream wi(os, false, false); + at->write(wi); + return os; } -LyXFunc * getLyXFunc() +string MathInset::fileInsetLabel() const { - return mathcursor->formula()->view()->owner()->getLyXFunc(); + return "Formula"; }