]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/formula.C
more IU
[lyx.git] / src / mathed / formula.C
index 4bf5d1faf11f16c0c5eb0930f65ef3629c0bd6dd..c80334a0567a390cb38ac229fac79a01571103b2 100644 (file)
 #include "math_mathmlstream.h"
 #include "textpainter.h"
 
+#include "BufferView.h"
 #include "debug.h"
-#include "latexrunparams.h"
-#include "Lsstream.h"
-
+#include "LColor.h"
+#include "lyx_main.h"
+#include "outputparams.h"
 
 #include "frontends/Painter.h"
 
-#include "graphics/PreviewedInset.h"
-#include "graphics/PreviewImage.h"
+#include "graphics/PreviewLoader.h"
+
+#include "insets/render_preview.h"
 
+#include "support/std_sstream.h"
 
+#include <boost/bind.hpp>
+
+using std::string;
 using std::ostream;
+using std::ostringstream;
 using std::vector;
 using std::auto_ptr;
 using std::endl;
 
 
-class InsetFormula::PreviewImpl : public lyx::graphics::PreviewedInset {
-public:
-       ///
-       PreviewImpl(InsetFormula & p) : PreviewedInset(p) {}
-
-private:
-       ///
-       bool previewWanted() const;
-       ///
-       string const latexString() const;
-       ///
-       InsetFormula & parent() const
-       {
-               return *static_cast<InsetFormula*>(inset());
-       }
-};
-
-
-
 InsetFormula::InsetFormula(bool chemistry)
        : par_(MathAtom(new MathHullInset)),
-         preview_(new PreviewImpl(*this))
+         preview_(new RenderPreview)
 {
+       preview_->connect(boost::bind(&InsetFormula::statusChanged, this));
        if (chemistry)
                mutate("chemistry");
 }
@@ -66,22 +55,25 @@ InsetFormula::InsetFormula(bool chemistry)
 InsetFormula::InsetFormula(InsetFormula const & other)
        : InsetFormulaBase(other),
          par_(other.par_),
-         preview_(new PreviewImpl(*this))
-{}
+         preview_(new RenderPreview)
+{
+       preview_->connect(boost::bind(&InsetFormula::statusChanged, this));
+}
 
 
 InsetFormula::InsetFormula(BufferView *)
        : par_(MathAtom(new MathHullInset)),
-         preview_(new PreviewImpl(*this))
+         preview_(new RenderPreview)
 {
-       //view_ = bv->owner()->view();
+       preview_->connect(boost::bind(&InsetFormula::statusChanged, this));
 }
 
 
 InsetFormula::InsetFormula(string const & data)
        : par_(MathAtom(new MathHullInset)),
-         preview_(new PreviewImpl(*this))
+         preview_(new RenderPreview)
 {
+       preview_->connect(boost::bind(&InsetFormula::statusChanged, this));
        if (!data.size())
                return;
        if (!mathed_parse_normal(par_, data))
@@ -89,7 +81,6 @@ InsetFormula::InsetFormula(string const & data)
 }
 
 
-
 InsetFormula::~InsetFormula()
 {}
 
@@ -109,7 +100,7 @@ void InsetFormula::write(Buffer const &, ostream & os) const
 
 
 int InsetFormula::latex(Buffer const &, ostream & os,
-                       LatexRunParams const & runparams) const
+                       OutputParams const & runparams) const
 {
        WriteStream wi(os, runparams.moving_arg, true);
        par_->write(wi);
@@ -117,7 +108,8 @@ int InsetFormula::latex(Buffer const &, ostream & os,
 }
 
 
-int InsetFormula::ascii(Buffer const &, ostream & os, int) const
+int InsetFormula::plaintext(Buffer const &, ostream & os,
+                       OutputParams const &) const
 {
        if (0 && display()) {
                Dimension dim;
@@ -137,19 +129,21 @@ int InsetFormula::ascii(Buffer const &, ostream & os, int) const
 }
 
 
-int InsetFormula::linuxdoc(Buffer const & buf, ostream & os) const
+int InsetFormula::linuxdoc(Buffer const & buf, ostream & os,
+                          OutputParams const & runparams) const
 {
-       return docbook(buf, os, false);
+       return docbook(buf, os, runparams);
 }
 
 
-int InsetFormula::docbook(Buffer const & buf, ostream & os, bool) const
+int InsetFormula::docbook(Buffer const & buf, ostream & os,
+                         OutputParams const & runparams) const
 {
        MathMLStream ms(os);
        ms << MTag("equation");
        ms <<   MTag("alt");
        ms <<    "<[CDATA[";
-       int res = ascii(buf, ms.os(), 0);
+       int res = plaintext(buf, ms.os(), runparams);
        ms <<    "]]>";
        ms <<   ETag("alt");
        ms <<   MTag("math");
@@ -180,19 +174,27 @@ void InsetFormula::read(Buffer const &, LyXLex & lex)
 }
 
 
-//ostream & operator<<(ostream & os, LyXCursor const & c)
-//{
-//     os << '[' << c.x() << ' ' << c.y() << ' ' << c.pos() << ']';
-//     return os;
-//}
+namespace {
+
+bool editing_inset(InsetFormula const * inset)
+{
+       return mathcursor &&
+               (const_cast<InsetFormulaBase const *>(mathcursor->formula()) ==
+                inset);
+}
+
+} // namespace anon
 
 
 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.
-       bool const use_preview = preview_->previewReady();
+       xo_ = x;
+       yo_ = y;
+
+       // The previews are drawn only when we're not editing the inset.
+       bool const use_preview = !editing_inset(this)
+               && RenderPreview::activated()
+               && preview_->previewReady();
 
        int const w = dim_.wid;
        int const d = dim_.des;
@@ -200,8 +202,8 @@ void InsetFormula::draw(PainterInfo & pi, int x, int y) const
        int const h = a + d;
 
        if (use_preview) {
-               pi.pain.image(x + 1, y - a, w, h,   // one pixel gap in front
-                             *(preview_->pimage()->image()));
+               // one pixel gap in front
+               preview_->draw(pi, x + 1, y);
        } else {
                PainterInfo p(pi.base.bv);
                p.base.style = LM_ST_TEXT;
@@ -211,24 +213,20 @@ void InsetFormula::draw(PainterInfo & pi, int x, int y) const
                            != lcolor.getX11Name(LColor::background))
                        p.pain.fillRectangle(x, y - a, w, h, LColor::mathbg);
 
-               if (mathcursor &&
-                               const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
-               {
+               if (editing_inset(this)) {
                        mathcursor->drawSelection(pi);
                        //p.pain.rectangle(x, y - a, w, h, LColor::mathframe);
                }
 
-               par_->draw(p, x + offset_, y);
+               par_->draw(p, x, y);
        }
-
-       xo_ = x;
-       yo_ = y;
 }
 
 
-void InsetFormula::getLabelList(vector<string> & res) const
+void InsetFormula::getLabelList(Buffer const & buffer,
+                               vector<string> & res) const
 {
-       par()->getLabelList(res);
+       par()->getLabelList(buffer, res);
 }
 
 
@@ -255,12 +253,14 @@ bool InsetFormula::insetAllowed(InsetOld::Code code) const
 
 void InsetFormula::metrics(MetricsInfo & m, Dimension & dim) const
 {
-       view_ = m.base.bv;
-       if (preview_->previewReady()) {
-               dim.asc = preview_->pimage()->ascent();
-               dim.des = preview_->pimage()->descent();
+       bool const use_preview = !editing_inset(this)
+               && RenderPreview::activated()
+               && preview_->previewReady();
+
+       if (use_preview) {
+               preview_->metrics(m, dim);
                // insert a one pixel gap in front of the formula
-               dim.wid = 1 + preview_->pimage()->width();
+               dim.wid += 1;
                if (display())
                        dim.des += 12;
        } else {
@@ -272,13 +272,6 @@ void InsetFormula::metrics(MetricsInfo & m, Dimension & dim) const
                dim.des += 1;
        }
 
-       if (display()) {
-               offset_ = (m.base.textwidth - dim.wid) / 2;
-               dim.wid = m.base.textwidth;
-       } else {
-               offset_ = 0;
-       }
-
        dim_ = dim;
 }
 
@@ -293,28 +286,35 @@ void InsetFormula::mutate(string const & type)
 // preview stuff
 //
 
-void InsetFormula::addPreview(lyx::graphics::PreviewLoader & ploader) const
+void InsetFormula::statusChanged() const
 {
-       preview_->addPreview(ploader);
+       LyX::cref().updateInset(this);
 }
 
 
-void InsetFormula::generatePreview() const
+namespace {
+
+string const latex_string(InsetFormula const & inset, Buffer const &)
 {
-       preview_->generatePreview();
+       ostringstream os;
+       WriteStream wi(os, false, false);
+       inset.par()->write(wi);
+       return os.str();
 }
 
+} // namespace anon
+
 
-bool InsetFormula::PreviewImpl::previewWanted() const
+void InsetFormula::addPreview(lyx::graphics::PreviewLoader & ploader) const
 {
-       return !parent().par_->asNestInset()->editing();
+       string const snippet = latex_string(*this, ploader.buffer());
+       preview_->addPreview(snippet, ploader);
 }
 
 
-string const InsetFormula::PreviewImpl::latexString() const
+void InsetFormula::generatePreview(Buffer const & buffer) const
 {
-       ostringstream ls;
-       WriteStream wi(ls, false, false);
-       parent().par_->write(wi);
-       return STRCONV(ls.str());
+       string const snippet = latex_string(*this, buffer);
+       preview_->addPreview(snippet, buffer);
+       preview_->startLoading(buffer);
 }