#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 "graphics/PreviewLoader.h"
-#include "support/bind.h"
#include "support/convert.h"
#include "support/debug.h"
#include "support/ExceptionMessage.h"
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;
}
TempName::~TempName()
{
- delete tempfile_;
+ tempname_.removeFile();
}
TempName & TempName::operator=(TempName const & other)
{
if (this != &other) {
- delete tempfile_;
- tempfile_ = new support::TempFile("lyxextXXXXXX.tmp");
+ if (!tempname_.empty())
+ tempname_.removeFile();
+ support::TempFile f("lyxextXXXXXX.tmp");
+ f.setAutoRemove(false);
+ tempname_ = f.name();
}
return *this;
}
support::FileName TempName::operator()() const
{
- return tempfile_->name();
+ return tempname_;
}
} // namespace external
InsetExternalParams::InsetExternalParams()
: display(true),
+ preview_mode(PREVIEW_OFF),
lyxscale(defaultLyxScale),
draft(false)
{
clearIfNotFound(resizedata, external::Resize, ids);
clearIfNotFound(rotationdata, external::Rotate, ids);
- //
+ //
preview_mode = et->preview_mode;
}
case EX_FILENAME: {
lex.eatLine();
string const name = lex.getString();
- filename.set(name, buffer.originFilePath());
+ filename = buffer.getReferencedFileName(name);
break;
}
-
+
case EX_DISPLAY: {
lex.next();
display = lex.getString() != "false";
break;
}
- case EX_LYXSCALE:
+ case EX_LYXSCALE: {
lex.next();
- lyxscale = lex.getInteger();
+ int const ls = lex.getInteger();
+ // negative values are not accepted.
+ if (ls >= 0)
+ lyxscale = ls;
+ else
+ lex.printError("ExternalInset::read: Wrong lyxscale: $$Token");
break;
+ }
case EX_DRAFT:
draft = true;
// Mouse hover is not copied and remains empty
InsetExternal::InsetExternal(InsetExternal const & other)
: Inset(other),
- boost::signals::trackable(),
params_(other.params_),
renderer_(other.renderer_->clone(this))
{}
void InsetExternal::addToToc(DocIterator const & cpit, bool output_active,
- UpdateType) const
+ UpdateType, TocBackend & backend) 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));
+ TocBuilder & b = backend.builder("external");
+ b.pushItem(cpit, str, output_active);
+ b.pop();
}
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);
renderer_.reset(new RenderButton);
button_ptr = renderer_->asButton();
}
- button_ptr->update(screenLabel(params_, buffer()), true);
+ button_ptr->update(screenLabel(params_, buffer()), true, false);
return;
}
LASSERT(false, return);
break;
case PREVIEW_INSTANT: {
- renderer_.reset(new RenderMonitoredPreview(this));
- RenderMonitoredPreview * preview_ptr = preview_ptr = renderer_->asMonitoredPreview();
- preview_ptr->fileChanged(bind(&InsetExternal::fileChanged, this));
- if (preview_ptr->monitoring())
- preview_ptr->stopMonitoring();
+ renderer_ = make_unique<RenderMonitoredPreview>(this);
+ RenderMonitoredPreview * preview_ptr = renderer_->asMonitoredPreview();
+ // This connection is closed at the same time as this is destroyed.
+ preview_ptr->connect([=]() { fileChanged(); });
add_preview_and_start_loading(*preview_ptr, *this, buffer());
break;
- }
+ }
case PREVIEW_GRAPHICS: {
RenderGraphic * graphic_ptr = renderer_->asGraphic();
if (!graphic_ptr) {
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;
}
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();
}
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);
}
void InsetExternal::addPreview(DocIterator const & /*inset_pos*/,
- graphics::PreviewLoader & ploader) const
+ graphics::PreviewLoader & ploader) const
{
RenderMonitoredPreview * const ptr = renderer_->asMonitoredPreview();
if (!ptr)
projects / lyx.git / blobdiff