more IU

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

diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index e6c7cf1939b6943953da6831336744079b8e0ef4..c80334a0567a390cb38ac229fac79a01571103b2 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -20,9 +20,9 @@
 
 #include "BufferView.h"
 #include "debug.h"
-#include "latexrunparams.h"
 #include "LColor.h"
 #include "lyx_main.h"
+#include "outputparams.h"
 
 #include "frontends/Painter.h"
 
@@ -100,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);
@@ -108,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;
@@ -128,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");
@@ -171,13 +174,6 @@ 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)
@@ -192,10 +188,13 @@ bool editing_inset(InsetFormula const * inset)
 
 void InsetFormula::draw(PainterInfo & pi, int x, int y) const
 {
+       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());
+       bool const use_preview = !editing_inset(this)
+               && RenderPreview::activated()
+               && preview_->previewReady();
 
        int const w = dim_.wid;
        int const d = dim_.des;
@@ -219,11 +218,8 @@ void InsetFormula::draw(PainterInfo & pi, int x, int y) const
                        //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;
 }
 
 
@@ -257,9 +253,9 @@ bool InsetFormula::insetAllowed(InsetOld::Code code) const
 
 void InsetFormula::metrics(MetricsInfo & m, Dimension & dim) const
 {
-       bool const use_preview = (!editing_inset(this) &&
-                                 RenderPreview::activated() &&
-                                 preview_->previewReady());
+       bool const use_preview = !editing_inset(this)
+               && RenderPreview::activated()
+               && preview_->previewReady();
 
        if (use_preview) {
                preview_->metrics(m, dim);
@@ -276,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;
 }
 
@@ -307,10 +296,10 @@ namespace {
 
 string const latex_string(InsetFormula const & inset, Buffer const &)
 {
-       ostringstream ls;
-       WriteStream wi(ls, false, false);
+       ostringstream os;
+       WriteStream wi(os, false, false);
        inset.par()->write(wi);
-       return ls.str();
+       return os.str();
 }
 
 } // namespace anon
@@ -326,5 +315,6 @@ void InsetFormula::addPreview(lyx::graphics::PreviewLoader & ploader) const
 void InsetFormula::generatePreview(Buffer const & buffer) const
 {
        string const snippet = latex_string(*this, buffer);
-       preview_->generatePreview(snippet, buffer);
+       preview_->addPreview(snippet, buffer);
+       preview_->startLoading(buffer);
 }