Better TOC output for XHTML, per Rob and Pavel.

[lyx.git] / src / insets / RenderPreview.cpp

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index 9a1836e9ae420addd68d15324f41911f2c9646d2..5a51d793b213900b6bf76fd1fbdd6aa8b0fe6ffe 100644 (file)
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -15,8 +15,6 @@
 
 #include "BufferView.h"
 #include "Dimension.h"
-#include "gettext.h"
-#include "LColor.h"
 #include "LyX.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -29,18 +27,17 @@
 #include "graphics/Previews.h"
 
 #include "support/FileName.h"
+#include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-
-using std::string;
-using std::auto_ptr;
-
 
 LyXRC_PreviewStatus RenderPreview::status()
 {
@@ -48,13 +45,13 @@ LyXRC_PreviewStatus RenderPreview::status()
 }
 
 
-RenderPreview::RenderPreview(InsetBase const * inset)
+RenderPreview::RenderPreview(Inset const * inset)
        : parent_(inset)
 {}
 
 
 RenderPreview::RenderPreview(RenderPreview const & other,
-                            InsetBase const * inset)
+                            Inset const * inset)
        : RenderBase(other),
          boost::signals::trackable(),
          snippet_(other.snippet_),
@@ -62,9 +59,16 @@ RenderPreview::RenderPreview(RenderPreview const & other,
 {}
 
 
-auto_ptr<RenderBase> RenderPreview::clone(InsetBase const * inset) const
+RenderPreview::~RenderPreview()
+{
+       if (ploader_connection_.connected())
+               ploader_connection_.disconnect();
+}
+
+
+RenderBase * RenderPreview::clone(Inset const * inset) const
 {
-       return auto_ptr<RenderBase>(new RenderPreview(*this, inset));
+       return new RenderPreview(*this, inset);
 }
 
 
@@ -72,16 +76,15 @@ namespace {
 
 graphics::PreviewLoader & getPreviewLoader(Buffer const & buffer)
 {
-       graphics::Previews const & previews = graphics::Previews::get();
-       return previews.loader(buffer);
+       return thePreviews().loader(buffer);
 }
 
 
 docstring const statusMessage(BufferView const * bv, string const & snippet)
 {
-       BOOST_ASSERT(bv && bv->buffer());
+       LASSERT(bv, /**/);
 
-       Buffer const & buffer = *bv->buffer();
+       Buffer const & buffer = bv->buffer();
        graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
        graphics::PreviewLoader::Status const status = loader.status(snippet);
 
@@ -113,40 +116,38 @@ RenderPreview::getPreviewImage(Buffer const & buffer) const
 }
 
 
-bool RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
+void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       BOOST_ASSERT(mi.base.bv && mi.base.bv->buffer());
+       LASSERT(mi.base.bv, /**/);
 
        graphics::PreviewImage const * const pimage =
-               getPreviewImage(*mi.base.bv->buffer());
+               getPreviewImage(mi.base.bv->buffer());
 
        if (pimage) {
-               dim.asc = pimage->ascent();
-               dim.des = pimage->descent();
-               dim.wid = pimage->width();
+               // If prepared, load the picture before dim calculation. See bug #5627.
+               pimage->image();
+               dim = pimage->dim();
        } else {
                dim.asc = 50;
                dim.des = 0;
 
-               LyXFont font(mi.base.font);
-               font.setFamily(LyXFont::SANS_FAMILY);
-               font.setSize(LyXFont::SIZE_FOOTNOTE);
+               FontInfo font(mi.base.font);
+               font.setFamily(SANS_FAMILY);
+               font.setSize(FONT_SIZE_FOOTNOTE);
                docstring const stat = statusMessage(mi.base.bv, snippet_);
                dim.wid = 15 + theFontMetrics(font).width(stat);
        }
 
-       bool const changed = dim_ != dim;
        dim_ = dim;
-       return changed;
 }
 
 
 void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 {
-       BOOST_ASSERT(pi.base.bv && pi.base.bv->buffer());
+       LASSERT(pi.base.bv, /**/);
 
        graphics::PreviewImage const * const pimage =
-               getPreviewImage(*pi.base.bv->buffer());
+               getPreviewImage(pi.base.bv->buffer());
        graphics::Image const * const image = pimage ? pimage->image() : 0;
 
        if (image) {
@@ -154,17 +155,17 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
                              *image);
 
        } else {
-               int const offset = InsetOld::TEXT_TO_INSET_OFFSET;
+               int const offset = Inset::TEXT_TO_INSET_OFFSET;
 
                pi.pain.rectangle(x + offset,
                                  y - dim_.asc,
                                  dim_.wid - 2 * offset,
                                  dim_.asc + dim_.des,
-                                 LColor::foreground);
+                                 Color_foreground);
 
-               LyXFont font(pi.base.font);
-               font.setFamily(LyXFont::SANS_FAMILY);
-               font.setSize(LyXFont::SIZE_FOOTNOTE);
+               FontInfo font(pi.base.font);
+               font.setFamily(SANS_FAMILY);
+               font.setSize(FONT_SIZE_FOOTNOTE);
 
                docstring const stat = statusMessage(pi.base.bv, snippet_);
                pi.pain.text(x + offset + 6,
@@ -174,31 +175,33 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void RenderPreview::startLoading(Buffer const & buffer) const
+void RenderPreview::startLoading(Buffer const & buffer, bool forexport) const
 {
-       if (status() == LyXRC::PREVIEW_OFF || snippet_.empty())
+       if (!forexport && (status() == LyXRC::PREVIEW_OFF || snippet_.empty()))
                return;
 
        graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
-       loader.startLoading();
+       loader.startLoading(forexport);
 }
 
 
 void RenderPreview::addPreview(docstring const & latex_snippet,
-                              Buffer const & buffer)
+                               Buffer const & buffer, 
+                               bool ignore_lyxrc)
 {
-       if (status() == LyXRC::PREVIEW_OFF)
+       if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
                return;
 
        graphics::PreviewLoader & loader = getPreviewLoader(buffer);
-       addPreview(latex_snippet, loader);
+       addPreview(latex_snippet, loader, ignore_lyxrc);
 }
 
 
 void RenderPreview::addPreview(docstring const & latex_snippet,
-                              graphics::PreviewLoader & ploader)
+                               graphics::PreviewLoader & ploader, 
+                               bool ignore_lyxrc)
 {
-       if (status() == LyXRC::PREVIEW_OFF)
+       if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
                return;
 
        // FIXME UNICODE
@@ -215,7 +218,7 @@ void RenderPreview::addPreview(docstring const & latex_snippet,
        // is ready for loading.
        if (!ploader_connection_.connected()) {
                ploader_connection_ = ploader.connect(
-                       boost::bind(&RenderPreview::imageReady, this, _1));
+                       bind(&RenderPreview::imageReady, this, _1));
        }
 
        ploader.add(snippet_);
@@ -237,13 +240,12 @@ void RenderPreview::imageReady(graphics::PreviewImage const & pimage)
 {
        // Check the current snippet is the same as that previewed.
        if (snippet_ == pimage.snippet())
-               LyX::cref().updateInset(parent_);
+               parent_->updateFrontend();
 }
 
 
-RenderMonitoredPreview::RenderMonitoredPreview(InsetBase const * inset)
-       : RenderPreview(inset),
-         monitor_(FileName(), 2000)
+RenderMonitoredPreview::RenderMonitoredPreview(Inset const * inset)
+       : RenderPreview(inset), monitor_(FileName(), 2000)
 {}