Rename ascii to plaintext and LatexRunParams to OutputParams.

[lyx.git] / src / mathed / formula.C

diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index 85617a78e3d843e63952e7ee1ab5c8280034dc9d..63cffade24a91543e4c2fa98288dd58cc22aa496 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -20,13 +20,15 @@
 
 #include "BufferView.h"
 #include "debug.h"
-#include "latexrunparams.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"
 
@@ -40,24 +42,9 @@ using std::auto_ptr;
 using std::endl;
 
 
-class InsetFormula::PreviewImpl : public PreviewedInset {
-public:
-       ///
-       PreviewImpl(InsetFormula const & p) : parent_(p) {}
-
-private:
-       ///
-       bool previewWanted(Buffer const &) const;
-       ///
-       string const latexString(Buffer const &) const;
-       ///
-       InsetFormula const & parent_;
-};
-
-
 InsetFormula::InsetFormula(bool chemistry)
        : par_(MathAtom(new MathHullInset)),
-         preview_(new PreviewImpl(*this))
+         preview_(new RenderPreview)
 {
        preview_->connect(boost::bind(&InsetFormula::statusChanged, this));
        if (chemistry)
@@ -68,7 +55,7 @@ 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));
 }
@@ -76,7 +63,7 @@ InsetFormula::InsetFormula(InsetFormula const & other)
 
 InsetFormula::InsetFormula(BufferView *)
        : par_(MathAtom(new MathHullInset)),
-         preview_(new PreviewImpl(*this))
+         preview_(new RenderPreview)
 {
        preview_->connect(boost::bind(&InsetFormula::statusChanged, this));
 }
@@ -84,7 +71,7 @@ InsetFormula::InsetFormula(BufferView *)
 
 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())
@@ -113,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);
@@ -121,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;
@@ -141,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");
@@ -191,14 +181,24 @@ void InsetFormula::read(Buffer const &, LyXLex & lex)
 //}
 
 
-void InsetFormula::draw(PainterInfo & pi, int x, int y) const
+namespace {
+
+bool editing_inset(InsetFormula const * inset)
 {
-       BufferView * bv = pi.base.bv;
-       cache(bv);
+       return mathcursor &&
+               (const_cast<InsetFormulaBase const *>(mathcursor->formula()) ==
+                inset);
+}
+
+} // namespace anon
 
+
+void InsetFormula::draw(PainterInfo & pi, int x, int y) const
+{
        // The previews are drawn only when we're not editing the inset.
-       bool const editing_inset = mathcursor && mathcursor->formula() == this;
-       bool const use_preview = !editing_inset && preview_->previewReady();
+       bool const use_preview = (!editing_inset(this) &&
+                                 RenderPreview::activated() &&
+                                 preview_->previewReady());
 
        int const w = dim_.wid;
        int const d = dim_.des;
@@ -206,10 +206,10 @@ 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(bv);
+               PainterInfo p(pi.base.bv);
                p.base.style = LM_ST_TEXT;
                p.base.font  = pi.base.font;
                p.base.font.setColor(LColor::math);
@@ -217,12 +217,12 @@ 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 (editing_inset) {
+               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;
@@ -260,16 +260,14 @@ bool InsetFormula::insetAllowed(InsetOld::Code code) const
 
 void InsetFormula::metrics(MetricsInfo & m, Dimension & dim) const
 {
-       view_ = m.base.bv;
-
-       bool const editing_inset = mathcursor && mathcursor->formula() == this;
-       bool const use_preview = !editing_inset && preview_->previewReady();
+       bool const use_preview = (!editing_inset(this) &&
+                                 RenderPreview::activated() &&
+                                 preview_->previewReady());
 
        if (use_preview) {
-               dim.asc = preview_->pimage()->ascent();
-               dim.des = preview_->pimage()->descent();
+               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 {
@@ -281,13 +279,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;
 }
 
@@ -304,33 +295,33 @@ void InsetFormula::mutate(string const & type)
 
 void InsetFormula::statusChanged() const
 {
-       if (view())
-               view()->updateInset(this);
+       LyX::cref().updateInset(this);
 }
 
 
-void InsetFormula::addPreview(lyx::graphics::PreviewLoader & ploader) const
-{
-       preview_->addPreview(ploader);
-}
-
+namespace {
 
-void InsetFormula::generatePreview(Buffer const & buffer) const
+string const latex_string(InsetFormula const & inset, Buffer const &)
 {
-       preview_->generatePreview(buffer);
+       ostringstream ls;
+       WriteStream wi(ls, false, false);
+       inset.par()->write(wi);
+       return ls.str();
 }
 
+} // namespace anon
+
 
-bool InsetFormula::PreviewImpl::previewWanted(Buffer const &) 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(Buffer const &) const
+void InsetFormula::generatePreview(Buffer const & buffer) const
 {
-       ostringstream ls;
-       WriteStream wi(ls, false, false);
-       parent_.par_->write(wi);
-       return ls.str();
+       string const snippet = latex_string(*this, buffer);
+       preview_->addPreview(snippet, buffer);
+       preview_->startLoading(buffer);
 }