X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderPreview.cpp;h=0c567631b0d4d47d7c46fe5eb53d97a6df092cb3;hb=25ef8e7eef8dfb2b6d6d4f2935ae6775ebf2ba60;hp=199c5a766b3c6d861f726f561e319ce1438c0530;hpb=f982b5e0513c82c8f31773a01160e995c8afe42f;p=lyx.git

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index 199c5a766b..0c567631b0 100644
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -13,10 +13,9 @@
 #include "insets/RenderPreview.h"
 #include "insets/Inset.h"
 
+#include "Buffer.h"
 #include "BufferView.h"
-#include "Color.h"
 #include "Dimension.h"
-#include "gettext.h"
 #include "LyX.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -26,25 +25,23 @@
 
 #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;
-using std::auto_ptr;
-
 
 LyXRC_PreviewStatus RenderPreview::status()
 {
-	return graphics::Previews::status();
+	return lyxrc.preview;
 }
 
 
@@ -64,33 +61,26 @@ RenderPreview::RenderPreview(RenderPreview const & other,
 
 RenderPreview::~RenderPreview()
 {
-       if (ploader_connection_.connected())
-               ploader_connection_.disconnect();
+	if (ploader_connection_.connected())
+		ploader_connection_.disconnect();
 }
 
 
-auto_ptr<RenderBase> RenderPreview::clone(Inset const * inset) const
+RenderBase * RenderPreview::clone(Inset const * inset) const
 {
-	return auto_ptr<RenderBase>(new RenderPreview(*this, inset));
+	return new RenderPreview(*this, inset);
 }
 
 
 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 && bv->buffer());
+	LASSERT(bv, /**/);
 
-	Buffer const & buffer = *bv->buffer();
-	graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
-	graphics::PreviewLoader::Status const status = loader.status(snippet);
+	Buffer const & buffer = bv->buffer();
+	graphics::PreviewLoader const * loader = buffer.loader();
+	graphics::PreviewLoader::Status const status = loader->status(snippet);
 
 	docstring message;
 	switch (status) {
@@ -115,45 +105,44 @@ 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_);
 }
 
 
-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;
 
-		Font font(mi.base.font);
-		font.setFamily(Font::SANS_FAMILY);
-		font.setSize(Font::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) {
@@ -167,11 +156,11 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 				  y - dim_.asc,
 				  dim_.wid - 2 * offset,
 				  dim_.asc + dim_.des,
-				  Color::foreground);
+				  Color_foreground);
 
-		Font font(pi.base.font);
-		font.setFamily(Font::SANS_FAMILY);
-		font.setSize(Font::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,
@@ -181,31 +170,35 @@ 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();
+	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 (status() == 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 (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
 		return;
 
 	// FIXME UNICODE
@@ -222,7 +215,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_);
@@ -234,8 +227,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();
 }
 
@@ -244,13 +238,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)
 {}