X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_inset.C;h=33f2119d5006f8fe7bc98ea6abecdc6d126c48a7;hb=ea53de7c85a432377f87a4e0cc47a027d7793a74;hp=40193c8f4a1b7d36d9fd4d196964fc56c61f96f7;hpb=528a1a42d40f9b3727cf704056e817106bbc7f0b;p=lyx.git diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C index 40193c8f4a..33f2119d50 100644 --- a/src/mathed/math_inset.C +++ b/src/mathed/math_inset.C @@ -1,56 +1,24 @@ -/* - * File: math_inset.C - * Purpose: Implementation of insets for mathed - * Author: Alejandro Aguilar Sierra - * Created: January 1996 - * Description: +/** + * \file math_inset.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * Dependencies: Xlib, XForms + * \author Alejandro Aguilar Sierra + * \author André Pönitz * - * Copyright: 1996, 1997 Alejandro Aguilar Sierra - * - * Version: 0.8beta. - * - * You are free to use and modify this code under the terms of - * the GNU General Public Licence version 2 or later. + * Full author contact details are available in file CREDITS. */ -#ifdef __GNUG__ -#pragma implementation -#endif - #include -#include "Lsstream.h" #include "math_inset.h" -#include "math_scriptinset.h" +#include "math_data.h" #include "math_mathmlstream.h" -#include "math_cursor.h" -#include "math_parser.h" #include "debug.h" -#include "frontends/LyXView.h" -#include "frontends/Dialogs.h" -#include "BufferView.h" -#include "formulabase.h" - - +using std::string; using std::ostream; -using std::vector; - - -int MathInset::height() const -{ - return ascent() + descent(); -} - - -ostream & operator<<(ostream & os, MathAtom const & at) -{ - WriteStream wi(os, false, false); - at->write(wi); - return os; -} +using std::endl; MathInset::size_type MathInset::nargs() const @@ -59,25 +27,18 @@ MathInset::size_type MathInset::nargs() const } -Dimension MathInset::dimensions() const -{ - lyxerr << "call MathInset::dimensions()\n"; - return Dimension(width(), ascent(), descent()); -} - - MathArray dummyCell; MathArray & MathInset::cell(idx_type) { - lyxerr << "I don't have a cell 1\n"; + 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 2\n"; + lyxerr << "I don't have a cell 2" << endl; return dummyCell; } @@ -85,9 +46,9 @@ MathArray const & MathInset::cell(idx_type) const 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; } @@ -95,73 +56,79 @@ void MathInset::substitute(MathMacro const &) {} -bool MathInset::idxNext(idx_type &, pos_type &) const +bool MathInset::idxNext(LCursor &) const { return false; } -bool MathInset::idxRight(idx_type &, pos_type &) const +bool MathInset::idxRight(LCursor &) const { return false; } -bool MathInset::idxPrev(idx_type &, pos_type &) const +bool MathInset::idxPrev(LCursor &) const { return false; } -bool MathInset::idxLeft(idx_type &, pos_type &) const +bool MathInset::idxLeft(LCursor &) const { return false; } -bool MathInset::idxUpDown(idx_type &, pos_type &, bool, int) const +bool MathInset::idxUpDown(LCursor &, bool, int) const { return false; } -bool MathInset::idxFirst(idx_type &, pos_type &) const +bool MathInset::idxUpDown2(LCursor &, bool, int) const { return false; } -bool MathInset::idxLast(idx_type &, pos_type &) const +bool MathInset::idxFirst(LCursor &) const { return false; } -bool MathInset::idxHome(idx_type &, pos_type &) const +bool MathInset::idxLast(LCursor &) const { return false; } -bool MathInset::idxEnd(idx_type &, pos_type &) const +bool MathInset::idxHome(LCursor &) const { return false; } -void MathInset::getPos(idx_type, pos_type, int & x, int & y) const +bool MathInset::idxEnd(LCursor &) const { - lyxerr << "MathInset::getPos() called directly!\n"; + return false; +} + + +void MathInset::getScreenPos(idx_type, pos_type, int & x, int & y) const +{ + lyxerr << "MathInset::getScreenPos() called directly!" << endl; x = y = 0; } void MathInset::dump() const { - lyxerr << "---------------------------------------------\n"; + lyxerr << "---------------------------------------------" << endl; WriteStream wi(lyxerr, false, true); write(wi); - lyxerr << "\n---------------------------------------------\n"; + lyxerr << "\n---------------------------------------------" << endl; } @@ -171,29 +138,17 @@ bool MathInset::idxBetween(idx_type idx, idx_type from, idx_type to) const } -void MathInset::metrics(MathMetricsInfo &) const -{ - lyxerr << "MathInset::metrics() called directly!\n"; -} - - -void MathInset::draw(MathPainterInfo &, int, int) const -{ - lyxerr << "MathInset::draw() called directly!\n"; -} - - -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 } @@ -201,7 +156,7 @@ 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 } @@ -220,62 +175,62 @@ void MathInset::normalize(NormalStream & os) const } -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 { - NormalStream ns(os.os()); - normalize(ns); + MapleStream ns(os.os()); + maple(ns); } -void MathInset::mathmlize(MathMLStream & os) const +void MathInset::mathematica(MathematicaStream & os) const { NormalStream ns(os.os()); normalize(ns); } -int MathInset::ascii(std::ostream &, int) const +void MathInset::mathmlize(MathMLStream & os) const { - return 0; + NormalStream ns(os.os()); + normalize(ns); } -int MathInset::linuxdoc(std::ostream &) const +int MathInset::plaintext(std::ostream &, OutputParams const &) const { return 0; } -int MathInset::docbook(std::ostream &, bool) const +int MathInset::linuxdoc(std::ostream &, OutputParams const &) const { return 0; } -MathInset::result_type - MathInset::dispatch(FuncRequest const &, idx_type &, pos_type &) +int MathInset::docbook(std::ostream &, OutputParams const &) const { - return UNDISPATCHED; + return 0; } string const & MathInset::getType() const { - static string t("none"); + static string const t("none"); return t; } @@ -286,24 +241,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) +ostream & operator<<(ostream & os, MathAtom const & at) { - MathArray ar; - mathed_parse_cell(ar, str); - return ar; + WriteStream wi(os, false, false); + at->write(wi); + return os; } -Dialogs & getDialogs() +string MathInset::fileInsetLabel() const { - return mathcursor->formula()->view()->owner()->getDialogs(); + return "Formula"; }