X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderPreview.cpp;h=5a51d793b213900b6bf76fd1fbdd6aa8b0fe6ffe;hb=bfddee97e191a853f0576f4fab3f095c4e9ce0de;hp=d21f638eee19588b40df7bcdae8972dc3a5145b9;hpb=5ddc612b735317d5b22553a63aad7879503e3950;p=lyx.git

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index d21f638eee..5a51d793b2 100644
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -15,7 +15,6 @@
 
 #include "BufferView.h"
 #include "Dimension.h"
-#include "gettext.h"
 #include "LyX.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -28,17 +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;
-
 
 LyXRC_PreviewStatus RenderPreview::status()
 {
@@ -62,8 +61,8 @@ RenderPreview::RenderPreview(RenderPreview const & other,
 
 RenderPreview::~RenderPreview()
 {
-       if (ploader_connection_.connected())
-               ploader_connection_.disconnect();
+	if (ploader_connection_.connected())
+		ploader_connection_.disconnect();
 }
 
 
@@ -77,14 +76,13 @@ 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);
+	LASSERT(bv, /**/);
 
 	Buffer const & buffer = bv->buffer();
 	graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
@@ -120,15 +118,15 @@ RenderPreview::getPreviewImage(Buffer const & buffer) const
 
 void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	BOOST_ASSERT(mi.base.bv);
+	LASSERT(mi.base.bv, /**/);
 
 	graphics::PreviewImage const * const pimage =
 		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;
@@ -146,7 +144,7 @@ void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 {
-	BOOST_ASSERT(pi.base.bv);
+	LASSERT(pi.base.bv, /**/);
 
 	graphics::PreviewImage const * const pimage =
 		getPreviewImage(pi.base.bv->buffer());
@@ -177,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
@@ -218,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_);
@@ -240,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(Inset const * inset)
-	: RenderPreview(inset),
-	  monitor_(FileName(), 2000)
+	: RenderPreview(inset), monitor_(FileName(), 2000)
 {}