X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderPreview.cpp;h=e985d290a27391427a44df676147d0f8b4c56b95;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=cc4fe5ed93ca05c55aac5b3d83c29ca94dfb1644;hpb=7df235d64984503367369121faae4af2c705f71f;p=lyx.git

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index cc4fe5ed93..e985d290a2 100644
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -13,9 +13,9 @@
 #include "insets/RenderPreview.h"
 #include "insets/Inset.h"
 
+#include "Buffer.h"
 #include "BufferView.h"
 #include "Dimension.h"
-#include "gettext.h"
 #include "LyX.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -25,24 +25,47 @@
 
 #include "graphics/PreviewImage.h"
 #include "graphics/PreviewLoader.h"
-#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;
+bool RenderPreview::previewText()
+{
+	// Use a switch to trigger a warning if the enum is changed.
+	switch(lyxrc.preview) {
+	case LyXRC::PREVIEW_ON:
+	case LyXRC::PREVIEW_NO_MATH:
+		return true;
+	case LyXRC::PREVIEW_OFF:
+		break;
+	}
 
+	return false;
+}
 
-LyXRC_PreviewStatus RenderPreview::status()
+
+bool RenderPreview::previewMath()
 {
-	return graphics::Previews::status();
+	// Use a switch to trigger a warning if the enum is changed.
+	switch(lyxrc.preview) {
+	case LyXRC::PREVIEW_ON:
+		return true;
+	case LyXRC::PREVIEW_NO_MATH:
+	case LyXRC::PREVIEW_OFF:
+		break;
+	}
+
+	return false;
 }
 
 
@@ -54,7 +77,7 @@ RenderPreview::RenderPreview(Inset const * inset)
 RenderPreview::RenderPreview(RenderPreview const & other,
 			     Inset const * inset)
 	: RenderBase(other),
-	  boost::signals::trackable(),
+	  boost::signals2::trackable(),
 	  snippet_(other.snippet_),
 	  parent_(inset)
 {}
@@ -62,8 +85,8 @@ RenderPreview::RenderPreview(RenderPreview const & other,
 
 RenderPreview::~RenderPreview()
 {
-       if (ploader_connection_.connected())
-               ploader_connection_.disconnect();
+	if (ploader_connection_.connected())
+		ploader_connection_.disconnect();
 }
 
 
@@ -75,20 +98,16 @@ RenderBase * RenderPreview::clone(Inset const * inset) const
 
 namespace {
 
-graphics::PreviewLoader & getPreviewLoader(Buffer const & buffer)
-{
-	graphics::Previews const & previews = graphics::Previews::get();
-	return previews.loader(buffer);
-}
-
-
 docstring const statusMessage(BufferView const * bv, string const & snippet)
 {
-	BOOST_ASSERT(bv);
+	LASSERT(bv, return docstring());
 
 	Buffer const & buffer = bv->buffer();
-	graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
-	graphics::PreviewLoader::Status const status = loader.status(snippet);
+	graphics::PreviewLoader const * loader = buffer.loader();
+	// please coverity (probably worth the check anyway)
+	if (!loader)
+		return docstring();
+	graphics::PreviewLoader::Status const status = loader->status(snippet);
 
 	docstring message;
 	switch (status) {
@@ -113,19 +132,22 @@ docstring const statusMessage(BufferView const * bv, string const & snippet)
 graphics::PreviewImage const *
 RenderPreview::getPreviewImage(Buffer const & buffer) const
 {
-	graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
-	return loader.preview(snippet_);
+	graphics::PreviewLoader const * loader = buffer.loader();
+	LASSERT(loader, return 0);
+	return loader->preview(snippet_);
 }
 
 
 void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	BOOST_ASSERT(mi.base.bv);
+	LBUFERR(mi.base.bv);
 
 	graphics::PreviewImage const * const pimage =
 		getPreviewImage(mi.base.bv->buffer());
 
 	if (pimage) {
+		// If prepared, load the picture before dim calculation. See bug #5627.
+		pimage->image();
 		dim = pimage->dim();
 	} else {
 		dim.asc = 50;
@@ -144,7 +166,7 @@ void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 {
-	BOOST_ASSERT(pi.base.bv);
+	LBUFERR(pi.base.bv);
 
 	graphics::PreviewImage const * const pimage =
 		getPreviewImage(pi.base.bv->buffer());
@@ -153,7 +175,6 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 	if (image) {
 		pi.pain.image(x, y - dim_.asc, dim_.wid, dim_.height(),
 			      *image);
-
 	} else {
 		int const offset = Inset::TEXT_TO_INSET_OFFSET;
 
@@ -172,34 +193,40 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 			     y - theFontMetrics(font).maxAscent() - 4,
 			     stat, font);
 	}
+	pi.change_.paintCue(pi, x, y - dim_.asc,
+	                    x + dim_.width(), y - dim_.asc + dim_.height());
 }
 
 
-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 && (lyxrc.preview == LyXRC::PREVIEW_OFF || snippet_.empty()))
 		return;
 
-	graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
-	loader.startLoading();
+	graphics::PreviewLoader * loader = buffer.loader();
+	LASSERT(loader, return);
+	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 (lyxrc.preview == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
 		return;
 
-	graphics::PreviewLoader & loader = getPreviewLoader(buffer);
-	addPreview(latex_snippet, loader);
+	graphics::PreviewLoader * loader = buffer.loader();
+	LASSERT(loader, return);
+	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 (lyxrc.preview == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
 		return;
 
 	// FIXME UNICODE
@@ -216,7 +243,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_);
@@ -228,8 +255,9 @@ void RenderPreview::removePreview(Buffer const & buffer)
 	if (snippet_.empty())
 		return;
 
-	graphics::PreviewLoader & loader = getPreviewLoader(buffer);
-	loader.remove(snippet_);
+	graphics::PreviewLoader * loader = buffer.loader();
+	LASSERT(loader, return);
+	loader->remove(snippet_);
 	snippet_.erase();
 }
 
@@ -261,7 +289,7 @@ void RenderMonitoredPreview::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-boost::signals::connection
+boost::signals2::connection
 RenderMonitoredPreview::fileChanged(slot_type const & slot)
 {
 	return monitor_.connect(slot);