* the GNU General Public Licence version 2 or later.
*/
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include <config.h>
#include "formula.h"
-#include "commandtags.h"
#include "math_cursor.h"
#include "math_parser.h"
#include "math_charinset.h"
#include "math_arrayinset.h"
-#include "math_metricsinfo.h"
+#include "metricsinfo.h"
#include "math_deliminset.h"
#include "math_hullinset.h"
#include "math_support.h"
#include "math_mathmlstream.h"
#include "textpainter.h"
-#include "lyx_main.h"
#include "BufferView.h"
#include "gettext.h"
#include "debug.h"
+#include "latexrunparams.h"
#include "lyxrc.h"
+#include "funcrequest.h"
+#include "Lsstream.h"
#include "support/LOstream.h"
#include "support/LAssert.h"
#include "graphics/PreviewedInset.h"
#include "graphics/PreviewImage.h"
-#include <fstream>
-
using std::ostream;
-using std::ifstream;
-using std::istream;
-using std::pair;
-using std::endl;
using std::vector;
-using std::getline;
+using std::auto_ptr;
+using std::endl;
-class InsetFormula::PreviewImpl : public grfx::PreviewedInset {
+class InsetFormula::PreviewImpl : public lyx::graphics::PreviewedInset {
public:
///
PreviewImpl(InsetFormula & p) : PreviewedInset(p) {}
///
string const latexString() const;
///
- BufferView * view() const
- {
- return parent().view();
- }
- ///
InsetFormula & parent() const
{
return *static_cast<InsetFormula*>(inset());
-InsetFormula::InsetFormula()
+InsetFormula::InsetFormula(bool chemistry)
: par_(MathAtom(new MathHullInset)),
preview_(new PreviewImpl(*this))
-{}
+{
+ if (chemistry)
+ mutate("chemistry");
+}
InsetFormula::InsetFormula(InsetFormula const & other)
{}
-InsetFormula::InsetFormula(BufferView * bv)
+InsetFormula::InsetFormula(BufferView *)
: par_(MathAtom(new MathHullInset)),
preview_(new PreviewImpl(*this))
{
- view_ = bv->owner()->view();
+ //view_ = bv->owner()->view();
}
if (!data.size())
return;
if (!mathed_parse_normal(par_, data))
- lyxerr << "cannot interpret '" << data << "' as math\n";
+ lyxerr << "cannot interpret '" << data << "' as math" << endl;
}
{}
-Inset * InsetFormula::clone(Buffer const &, bool) const
+auto_ptr<InsetBase> InsetFormula::clone() const
{
- return new InsetFormula(*this);
+ return auto_ptr<InsetBase>(new InsetFormula(*this));
}
void InsetFormula::write(Buffer const *, ostream & os) const
{
WriteStream wi(os, false, false);
- os << par_->fileInsetLabel() << " ";
+ os << par_->fileInsetLabel() << ' ';
par_->write(wi);
}
-int InsetFormula::latex(Buffer const *, ostream & os, bool fragile, bool) const
+int InsetFormula::latex(Buffer const *, ostream & os,
+ LatexRunParams const & runparams) const
{
- WriteStream wi(os, fragile, true);
+ WriteStream wi(os, runparams.moving_arg, true);
par_->write(wi);
return wi.line();
}
int InsetFormula::ascii(Buffer const *, ostream & os, int) const
{
- if (display()) {
+ if (0 && display()) {
+ Dimension dim;
TextMetricsInfo mi;
- par()->metricsT(mi);
- TextPainter tpain(par()->width(), par()->height());
- par()->drawT(tpain, 0, par()->ascent());
+ par()->metricsT(mi, dim);
+ TextPainter tpain(dim.width(), dim.height());
+ par()->drawT(tpain, 0, dim.ascent());
tpain.show(os, 3);
// reset metrics cache to "real" values
- metrics();
+ //metrics();
return tpain.textheight();
} else {
WriteStream wi(os, false, true);
ms << "]]>";
ms << ETag("alt");
ms << MTag("math");
- ms << par_.nucleus();
+ ms << par_;
ms << ETag("math");
ms << ETag("equation");
return ms.line() + res;
void InsetFormula::read(Buffer const *, LyXLex & lex)
{
mathed_parse_normal(par_, lex);
- metrics();
+ // remove extra 'mathrm' for chemistry stuff.
+ // will be re-added on write
+ if (par_->asHullInset()->getType() =="chemistry") {
+ lyxerr << "this is chemistry" << endl;
+ if (par_->cell(0).size() == 1) {
+ lyxerr << "this is size 1" << endl;
+ if (par_->cell(0)[0]->asFontInset()) {
+ lyxerr << "this is a font inset "
+ << "replacing " << par_.nucleus()->cell(0) <<
+ " with " << par_->cell(0)[0]->cell(0) << endl;
+ }
+ }
+ }
+ //metrics();
}
//}
-void InsetFormula::draw(BufferView * bv, LyXFont const & font,
- int y, float & xx, bool) const
+void InsetFormula::draw(PainterInfo & pi, int x, int y) const
{
+ cache(pi.base.bv);
// This initiates the loading of the preview, so should come
// before the metrics are computed.
- view_ = bv->owner()->view();
bool const use_preview = preview_->previewReady();
- int const x = int(xx);
- int const w = width(bv, font);
- int const d = descent(bv, font);
- int const a = ascent(bv, font);
+ int const w = dim_.wid;
+ int const d = dim_.des;
+ int const a = dim_.asc;
int const h = a + d;
- MathPainterInfo pi(bv->painter());
-
if (use_preview) {
- pi.pain.image(x, y - a, w, h,
- *(preview_->pimage()->image(*this, *bv)));
+ pi.pain.image(x + 1, y - a, w, h, // one pixel gap in front
+ *(preview_->pimage()->image()));
} else {
- //pi.base.style = display() ? LM_ST_DISPLAY : LM_ST_TEXT;
- pi.base.style = LM_ST_TEXT;
- pi.base.font = font;
- pi.base.font.setColor(LColor::math);
+ PainterInfo p(pi.base.bv);
+ p.base.style = LM_ST_TEXT;
+ p.base.font = pi.base.font;
+ p.base.font.setColor(LColor::math);
if (lcolor.getX11Name(LColor::mathbg)
!= lcolor.getX11Name(LColor::background))
- pi.pain.fillRectangle(x, y - a, w, h, LColor::mathbg);
+ p.pain.fillRectangle(x, y - a, w, h, LColor::mathbg);
if (mathcursor &&
const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
{
mathcursor->drawSelection(pi);
- //pi.pain.rectangle(x, y - a, w, h, LColor::mathframe);
+ //p.pain.rectangle(x, y - a, w, h, LColor::mathframe);
}
- par_->draw(pi, x + 1, y);
+ par_->draw(p, x, y);
}
- xx += w;
xo_ = x;
yo_ = y;
-
- setCursorVisible(false);
}
-vector<string> const InsetFormula::getLabelList() const
+void InsetFormula::getLabelList(vector<string> & res) const
{
- vector<string> res;
par()->getLabelList(res);
- return res;
}
-UpdatableInset::RESULT
-InsetFormula::localDispatch(BufferView * bv, kb_action action,
- string const & arg)
+InsetOld::Code InsetFormula::lyxCode() const
{
- RESULT result = DISPATCHED;
-
- switch (action) {
-
- case LFUN_BREAKLINE:
- bv->lockedInsetStoreUndo(Undo::INSERT);
- mathcursor->breakLine();
- mathcursor->normalize();
- updateLocal(bv, true);
- break;
-
- case LFUN_MATH_NUMBER:
- {
- if (!hull())
- break;
- //lyxerr << "toggling all numbers\n";
- if (display()) {
- bv->lockedInsetStoreUndo(Undo::INSERT);
- bool old = par()->numberedType();
- for (MathInset::row_type row = 0; row < par_->nrows(); ++row)
- hull()->numbered(row, !old);
- bv->owner()->message(old ? _("No number") : _("Number"));
- updateLocal(bv, true);
- }
- break;
- }
-
- case LFUN_MATH_NONUMBER:
- {
- //lyxerr << "toggling line number\n";
- if (display()) {
- bv->lockedInsetStoreUndo(Undo::INSERT);
- MathCursor::row_type row = mathcursor->hullRow();
- bool old = hull()->numbered(row);
- bv->owner()->message(old ? _("No number") : _("Number"));
- hull()->numbered(row, !old);
- updateLocal(bv, true);
- }
- break;
- }
-
- case LFUN_INSERT_LABEL:
- {
- if (!hull())
- break;
-
- bv->lockedInsetStoreUndo(Undo::INSERT);
-
- MathCursor::row_type row = mathcursor->hullRow();
- string old_label = hull()->label(row);
- string new_label = arg;
-
- if (new_label.empty()) {
- string const default_label =
- (lyxrc.label_init_length >= 0) ? "eq:" : "";
- pair<bool, string> const res = old_label.empty()
- ? Alert::askForText(_("Enter new label to insert:"), default_label)
- : Alert::askForText(_("Enter label:"), old_label);
- if (!res.first)
- break;
- new_label = trim(res.second);
- }
-
- //if (new_label == old_label)
- // break; // Nothing to do
-
- if (!new_label.empty()) {
- lyxerr << "setting label to '" << new_label << "'\n";
- hull()->numbered(row, true);
- }
-
-#warning FIXME: please check you really mean repaint() ... is it needed,
-#warning and if so, should it be update() instead ?
- if (!new_label.empty() && bv->ChangeRefsIfUnique(old_label, new_label))
- bv->repaint();
-
- hull()->label(row, new_label);
-
- updateLocal(bv, true);
- break;
- }
-
- case LFUN_MATH_MUTATE:
- {
- bv->lockedInsetStoreUndo(Undo::EDIT);
- int x;
- int y;
- mathcursor->getPos(x, y);
- mutate(arg);
- mathcursor->setPos(x, y);
- mathcursor->normalize();
- updateLocal(bv, true);
- break;
- }
-
- case LFUN_MATH_EXTERN:
- {
- bv->lockedInsetStoreUndo(Undo::EDIT);
- if (mathcursor)
- mathcursor->handleExtern(arg);
- // re-compute inset dimension
- metrics(bv);
- updateLocal(bv, true);
- break;
- }
-
- case LFUN_MATH_DISPLAY:
- {
- int x = 0;
- int y = 0;
- mathcursor->getPos(x, y);
- if (hullType() == "simple")
- mutate("equation");
- else
- mutate("simple");
- mathcursor->setPos(x, y);
- mathcursor->normalize();
- updateLocal(bv, true);
- break;
- }
-
- case LFUN_PASTESELECTION:
- {
- string const clip = bv->getClipboard();
- if (!clip.empty())
- mathed_parse_normal(par_, clip);
- break;
- }
-
- default:
- result = InsetFormulaBase::localDispatch(bv, action, arg);
- }
-
- return result;
-}
-
-
-bool InsetFormula::display() const
-{
- return hullType() != "simple" && hullType() != "none";
-}
-
-
-MathHullInset * InsetFormula::hull() const
-{
- lyx::Assert(par_->asHullInset());
- return par_->asHullInset();
-}
-
-
-Inset::Code InsetFormula::lyxCode() const
-{
- return Inset::MATH_CODE;
+ return InsetOld::MATH_CODE;
}
}
-bool InsetFormula::insetAllowed(Inset::Code code) const
+bool InsetFormula::insetAllowed(InsetOld::Code code) const
{
return
- (code == Inset::LABEL_CODE && display())
- || code == Inset::REF_CODE
- || code == Inset::ERT_CODE;
-}
-
-
-int InsetFormula::ascent(BufferView *, LyXFont const &) const
-{
- return preview_->previewReady() ?
- preview_->pimage()->ascent() : 1 + par_->ascent();
+ code == InsetOld::LABEL_CODE
+ || code == InsetOld::REF_CODE
+ || code == InsetOld::ERT_CODE;
}
-int InsetFormula::descent(BufferView *, LyXFont const &) const
+void InsetFormula::metrics(MetricsInfo & m, Dimension & dim) const
{
- if (!preview_->previewReady())
- return 1 + par_->descent();
-
- int const descent = preview_->pimage()->descent();
- return display() ? descent + 12 : descent;
-}
-
-
-int InsetFormula::width(BufferView * bv, LyXFont const & font) const
-{
- metrics(bv, font);
- return preview_->previewReady() ?
- preview_->pimage()->width() : par_->width();
-}
-
-
-string InsetFormula::hullType() const
-{
- return par()->getType();
+ view_ = m.base.bv;
+ if (preview_->previewReady()) {
+ dim.asc = preview_->pimage()->ascent();
+ dim.des = preview_->pimage()->descent();
+ // insert a one pixel gap in front of the formula
+ dim.wid = 1 + preview_->pimage()->width();
+ if (display())
+ dim.des += 12;
+ } else {
+ MetricsInfo mi = m;
+ mi.base.style = LM_ST_TEXT;
+ mi.base.font.setColor(LColor::math);
+ par()->metrics(mi, dim);
+ dim.asc += 1;
+ dim.des += 1;
+ }
+ dim_ = dim;
}
void InsetFormula::mutate(string const & type)
{
- par()->mutate(type);
+ par_.nucleus()->mutate(type);
}
// preview stuff
//
-void InsetFormula::addPreview(grfx::PreviewLoader & ploader) const
+void InsetFormula::addPreview(lyx::graphics::PreviewLoader & ploader) const
{
preview_->addPreview(ploader);
}
ostringstream ls;
WriteStream wi(ls, false, false);
parent().par_->write(wi);
- return ls.str().c_str();
+ return STRCONV(ls.str());
}
projects / lyx.git / blobdiff