X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetExternal.cpp;h=b68a09d77fc10e1663b7f645eb1ed6dabac70018;hb=860accd01fb8115ec7c6ad80b054f1046e19c62f;hp=2e97fc07055bd504c859f044529582c2a28a603d;hpb=f09a9fe2e60e4aeaca23b42b2bf30f5d64cfd9b1;p=lyx.git

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index 2e97fc0705..b68a09d77f 100644
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -30,6 +30,9 @@
 #include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "output_latex.h"
+#include "output_xhtml.h"
+#include "texstream.h"
+#include "TocBackend.h"
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
@@ -68,13 +71,20 @@ namespace Alert = frontend::Alert;
 
 namespace external {
 
-TempName::TempName() : tempfile_(new support::TempFile("lyxextXXXXXX.tmp"))
+TempName::TempName()
 {
 	// must have an extension for the converter code to work correctly.
+	support::TempFile f("lyxextXXXXXX.tmp");
+	// Let f go out of scope here and delete the file ourselves in
+	// ~TempName(), since otherwise external processes would not be able
+	// to use the file on windows (bug 9925). This is not as safe as
+	// keeping a support::TempFile member would be, but the best we can do.
+	f.setAutoRemove(false);
+	tempname_ = f.name();
 }
 
 
-TempName::TempName(TempName const & that) : tempfile_(0)
+TempName::TempName(TempName const & that)
 {
 	*this = that;
 }
@@ -82,15 +92,17 @@ TempName::TempName(TempName const & that) : tempfile_(0)
 
 TempName::~TempName()
 {
-	delete tempfile_;
+	tempname_.removeFile();
 }
 
 
 TempName & TempName::operator=(TempName const & other)
 {
 	if (this != &other) {
-		delete tempfile_;
-		tempfile_ = new support::TempFile("lyxextXXXXXX.tmp");
+		tempname_.removeFile();
+		support::TempFile f("lyxextXXXXXX.tmp");
+		f.setAutoRemove(false);
+		tempname_ = f.name(); 
 	}
 	return *this;
 }
@@ -98,7 +110,7 @@ TempName & TempName::operator=(TempName const & other)
 
 support::FileName TempName::operator()() const
 {
-	return tempfile_->name();
+	return tempname_;
 }
 
 } // namespace external
@@ -106,6 +118,7 @@ support::FileName TempName::operator()() const
 
 InsetExternalParams::InsetExternalParams()
 	: display(true),
+	  preview_mode(PREVIEW_OFF),
 	  lyxscale(defaultLyxScale),
 	  draft(false)
 {
@@ -272,7 +285,7 @@ bool InsetExternalParams::read(Buffer const & buffer, Lexer & lex)
 		case EX_FILENAME: {
 			lex.eatLine();
 			string const name = lex.getString();
-			filename.set(name, buffer.filePath());
+			filename = buffer.getReferencedFileName(name);
 			break;
 		}
 		
@@ -293,13 +306,13 @@ bool InsetExternalParams::read(Buffer const & buffer, Lexer & lex)
 
 		case EX_BOUNDINGBOX:
 			lex.next();
-			clipdata.bbox.xl = lex.getInteger();
+			clipdata.bbox.xl = Length(lex.getString());
 			lex.next();
-			clipdata.bbox.yb = lex.getInteger();
+			clipdata.bbox.yb = Length(lex.getString());
 			lex.next();
-			clipdata.bbox.xr = lex.getInteger();
+			clipdata.bbox.xr = Length(lex.getString());
 			lex.next();
-			clipdata.bbox.yt = lex.getInteger();
+			clipdata.bbox.yt = Length(lex.getString());
 			break;
 
 		case EX_CLIP:
@@ -365,6 +378,8 @@ bool InsetExternalParams::read(Buffer const & buffer, Lexer & lex)
 
 	if (lyxerr.debugging(Debug::EXTERNAL)) {
 		lyxerr	<< "InsetExternalParams::read:\n";
+		// false positive
+		// coverity[NEGATIVE_RETURNS]
 		write(buffer, lyxerr);
 	}
 
@@ -372,6 +387,33 @@ bool InsetExternalParams::read(Buffer const & buffer, Lexer & lex)
 }
 
 
+namespace {
+
+docstring screenLabel(InsetExternalParams const & params,
+			    Buffer const & buffer)
+{
+	external::Template const * const ptr =
+		external::getTemplatePtr(params);
+	if (!ptr)
+		// FIXME UNICODE
+		return bformat((_("External template %1$s is not installed")),
+					from_utf8(params.templatename()));
+	// FIXME UNICODE
+	docstring gui = _(ptr->guiName);
+	gui += ": ";
+
+	if (params.filename.empty())
+		gui += "???";
+	else
+		gui += from_utf8(params.filename.relFileName(buffer.filePath()));
+
+	return gui;
+}
+
+} // namespace anon
+
+
+
 InsetExternal::InsetExternal(Buffer * buf)
 	: Inset(buf), renderer_(new RenderButton)
 {
@@ -381,7 +423,7 @@ InsetExternal::InsetExternal(Buffer * buf)
 // Mouse hover is not copied and remains empty
 InsetExternal::InsetExternal(InsetExternal const & other)
 	: Inset(other),
-	  boost::signals::trackable(),
+	  boost::signals2::trackable(),
 	  params_(other.params_),
 	  renderer_(other.renderer_->clone(this))
 {}
@@ -460,6 +502,17 @@ bool InsetExternal::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
+void InsetExternal::addToToc(DocIterator const & cpit, bool output_active,
+							 UpdateType) const
+{
+	DocIterator pit = cpit;
+	pit.push_back(CursorSlice(const_cast<InsetExternal &>(*this)));
+	shared_ptr<Toc> toc = buffer().tocBackend().toc("external");
+	docstring str = screenLabel(params_, buffer());
+	toc->push_back(TocItem(pit, 0, str, output_active));
+}
+
+
 bool InsetExternal::showInsetDialog(BufferView * bv) const
 {
 	bv->showDialog("external", params2string(params(), bv->buffer()),
@@ -498,28 +551,6 @@ graphics::Params get_grfx_params(InsetExternalParams const & eparams)
 	return gparams;
 }
 
-
-docstring screenLabel(InsetExternalParams const & params,
-			    Buffer const & buffer)
-{
-	external::Template const * const ptr =
-		external::getTemplatePtr(params);
-	if (!ptr)
-		// FIXME UNICODE
-		return bformat((_("External template %1$s is not installed")),
-					from_utf8(params.templatename()));
-	// FIXME UNICODE
-	docstring gui = _(ptr->guiName);
-	gui += ": ";
-
-	if (params.filename.empty())
-		gui += "???";
-	else
-		gui += from_utf8(params.filename.relFileName(buffer.filePath()));
-
-	return gui;
-}
-
 } // namespace anon
 
 
@@ -531,9 +562,8 @@ static bool isPreviewWanted(InsetExternalParams const & params)
 
 static docstring latexString(InsetExternal const & inset)
 {
-	TexRow texrow;
 	odocstringstream ods;
-	otexstream os(ods, texrow);
+	otexstream os(ods);
 	// We don't need to set runparams.encoding since it is not used by
 	// latex().
 	OutputParams runparams(0);
@@ -599,9 +629,8 @@ void InsetExternal::setParams(InsetExternalParams const & p)
 		LASSERT(false, return);
 		break;
 	case PREVIEW_INSTANT: {
-		RenderMonitoredPreview * preview_ptr = renderer_->asMonitoredPreview();
 		renderer_.reset(new RenderMonitoredPreview(this));
-		preview_ptr = renderer_->asMonitoredPreview();
+		RenderMonitoredPreview * preview_ptr = renderer_->asMonitoredPreview();
 		preview_ptr->fileChanged(bind(&InsetExternal::fileChanged, this));
 		if (preview_ptr->monitoring())
 			preview_ptr->stopMonitoring();
@@ -702,12 +731,12 @@ int InsetExternal::plaintext(odocstringstream & os,
 	if (runparams.for_tooltip)
 		return 0;
 
-	TexRow texrow;
-	otexstream ots(os, texrow);
+	bool const external_in_tmpdir = !runparams.nice;
+	bool const dryrun = runparams.dryrun || runparams.inComment;
+	otexstream ots(os);
 	ots << '\n'; // output external material on a new line
 	external::writeExternal(params_, "Ascii", buffer(), ots,
-				*(runparams.exportdata), false,
-				runparams.dryrun || runparams.inComment);
+				*(runparams.exportdata), external_in_tmpdir, dryrun);
 	return PLAINTEXT_NEWLINE;
 }
 
@@ -715,23 +744,27 @@ int InsetExternal::plaintext(odocstringstream & os,
 int InsetExternal::docbook(odocstream & os,
 			   OutputParams const & runparams) const
 {
-	TexRow texrow;
+	bool const external_in_tmpdir = !runparams.nice;
+	bool const dryrun = runparams.dryrun || runparams.inComment;
 	odocstringstream ods;
-	otexstream ots(ods, texrow);
+	otexstream ots(ods);
 	external::writeExternal(params_, "DocBook", buffer(), ots,
-				*(runparams.exportdata), false,
-				runparams.dryrun || runparams.inComment);
+				*(runparams.exportdata), external_in_tmpdir, dryrun);
 	os << ods.str();
 	return int(count(ods.str().begin(), ods.str().end(), '\n'));
 }
 
 
-docstring InsetExternal::xhtml(XHTMLStream  & /*xs*/,
-			OutputParams const & /*rp*/) const
+docstring InsetExternal::xhtml(XHTMLStream & xs,
+			OutputParams const & runparams) const
 {
-//	external::writeExternal(params_, "XHTML", buffer(), os,
-//				       *(runparams.exportdata), false,
-//				       runparams.dryrun || runparams.inComment);
+	bool const external_in_tmpdir = !runparams.nice;
+	bool const dryrun = runparams.dryrun || runparams.inComment;
+	odocstringstream ods;
+	otexstream ots(ods);
+	external::writeExternal(params_, "XHTML", buffer(), ots,
+				       *(runparams.exportdata), external_in_tmpdir, dryrun);
+	xs << XHTMLStream::ESCAPE_NONE << ods.str();
 	return docstring();
 }
 
@@ -795,10 +828,8 @@ void InsetExternal::validate(LaTeXFeatures & features) const
 
 	external::TemplateManager & etm = external::TemplateManager::get();
 
-	it  = cit->second.preambleNames.begin();
-	end = cit->second.preambleNames.end();
-	for (; it != end; ++it) {
-		string const preamble = etm.getPreambleDefByName(*it);
+	for (string const & name : cit->second.preambleNames) {
+		docstring const preamble = etm.getPreambleDefByName(name);
 		if (!preamble.empty())
 			features.addPreambleSnippet(preamble);
 	}