X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetExternal.cpp;h=b68a09d77fc10e1663b7f645eb1ed6dabac70018;hb=860accd01fb8115ec7c6ad80b054f1046e19c62f;hp=c0f72256644db16e1a63a47f2bea24d31b0cf61a;hpb=70ff68b5804a2d4a69f8fd36ca4fa5272a134c26;p=lyx.git diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp index c0f7225664..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" @@ -45,6 +48,7 @@ #include "support/lassert.h" #include "support/lstrings.h" #include "support/lyxlib.h" +#include "support/TempFile.h" #include #include @@ -69,15 +73,20 @@ namespace external { TempName::TempName() { - FileName const tempname = FileName::tempName("lyxext"); // must have an extension for the converter code to work correctly. - tempname_ = FileName(tempname.absFileName() + ".tmp"); + 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 &) +TempName::TempName(TempName const & that) { - tempname_ = TempName()(); + *this = that; } @@ -89,16 +98,27 @@ TempName::~TempName() TempName & TempName::operator=(TempName const & other) { - if (this != &other) - tempname_ = TempName()(); + if (this != &other) { + tempname_.removeFile(); + support::TempFile f("lyxextXXXXXX.tmp"); + f.setAutoRemove(false); + tempname_ = f.name(); + } return *this; } + +support::FileName TempName::operator()() const +{ + return tempname_; +} + } // namespace external InsetExternalParams::InsetExternalParams() : display(true), + preview_mode(PREVIEW_OFF), lyxscale(defaultLyxScale), draft(false) { @@ -265,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; } @@ -286,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: @@ -358,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); } @@ -365,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) { @@ -374,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)) {} @@ -453,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(*this))); + shared_ptr 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()), @@ -491,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 @@ -524,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); @@ -542,8 +579,7 @@ static void add_preview_and_start_loading(RenderMonitoredPreview & renderer, { InsetExternalParams const & params = inset.params(); - if (RenderPreview::status() != LyXRC::PREVIEW_OFF && - isPreviewWanted(params)) { + if (RenderPreview::previewText() && isPreviewWanted(params)) { renderer.setAbsFile(params.filename); docstring const snippet = latexString(inset); renderer.addPreview(snippet, buffer); @@ -577,7 +613,7 @@ void InsetExternal::setParams(InsetExternalParams const & p) || !lyxrc.display_graphics || params_.preview_mode == PREVIEW_OFF || (params_.preview_mode == PREVIEW_INSTANT - && RenderPreview::status() == LyXRC::PREVIEW_OFF)) { + && !RenderPreview::previewText())) { RenderButton * button_ptr = renderer_->asButton(); if (!button_ptr) { renderer_.reset(new RenderButton); @@ -593,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(); @@ -622,7 +657,7 @@ void InsetExternal::fileChanged() const return; RenderMonitoredPreview * const ptr = renderer_->asMonitoredPreview(); - LASSERT(ptr, /**/); + LASSERT(ptr, return); ptr->removePreview(*buffer); add_preview_and_start_loading(*ptr, *this, *buffer); @@ -673,31 +708,35 @@ void InsetExternal::latex(otexstream & os, OutputParams const & runparams) const et.formats.find("PDFLaTeX"); if (cit != et.formats.end()) { - int l = external::writeExternal(params_, "PDFLaTeX", - buffer(), os.os(), - *(runparams.exportdata), - external_in_tmpdir, - dryrun); - os.texrow().newlines(l); + external::writeExternal(params_, "PDFLaTeX", + buffer(), os, + *(runparams.exportdata), + external_in_tmpdir, + dryrun); return; } } - int l = external::writeExternal(params_, "LaTeX", buffer(), os.os(), - *(runparams.exportdata), - external_in_tmpdir, - dryrun); - os.texrow().newlines(l); + external::writeExternal(params_, "LaTeX", buffer(), os, + *(runparams.exportdata), + external_in_tmpdir, + dryrun); } -int InsetExternal::plaintext(odocstream & os, - OutputParams const & runparams) const +int InsetExternal::plaintext(odocstringstream & os, + OutputParams const & runparams, size_t) const { - os << '\n'; // output external material on a new line - external::writeExternal(params_, "Ascii", buffer(), os, - *(runparams.exportdata), false, - runparams.dryrun || runparams.inComment); + // this is too slow for constant use + if (runparams.for_tooltip) + return 0; + + 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), external_in_tmpdir, dryrun); return PLAINTEXT_NEWLINE; } @@ -705,18 +744,27 @@ int InsetExternal::plaintext(odocstream & os, int InsetExternal::docbook(odocstream & os, OutputParams const & runparams) const { - return external::writeExternal(params_, "DocBook", 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_, "DocBook", buffer(), ots, + *(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(); } @@ -780,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); }