#include "Buffer.h"
#include "BufferView.h"
+#include "Converter.h"
#include "Cursor.h"
#include "DispatchResult.h"
#include "Exporter.h"
#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"
string defaultTemplateName;
-} // namespace anon
+} // namespace
namespace lyx {
TempName & TempName::operator=(TempName const & other)
{
if (this != &other) {
- tempname_.removeFile();
+ if (!tempname_.empty())
+ tempname_.removeFile();
support::TempFile f("lyxextXXXXXX.tmp");
f.setAutoRemove(false);
- tempname_ = f.name();
+ tempname_ = f.name();
}
return *this;
}
InsetExternalParams::InsetExternalParams()
: display(true),
+ preview_mode(PREVIEW_OFF),
lyxscale(defaultLyxScale),
draft(false)
{
data = T();
}
-} // namespace anon
+} // namespace
void InsetExternalParams::settemplate(string const & name)
clearIfNotFound(resizedata, external::Resize, ids);
clearIfNotFound(rotationdata, external::Rotate, ids);
- //
+ //
preview_mode = et->preview_mode;
}
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;
return gui;
}
-} // namespace anon
-
+} // namespace
InsetExternal::InsetExternal(Buffer * buf)
// 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::statusChanged() const
-{
- updateFrontend();
-}
-
-
void InsetExternal::doDispatch(Cursor & cur, FuncRequest & cmd)
{
switch (cmd.action()) {
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();
}
void InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
{
+ if (!isRendererValid())
+ updatePreview();
+
renderer_->metrics(mi, dim);
}
void InsetExternal::draw(PainterInfo & pi, int x, int y) const
{
+ if (!isRendererValid())
+ updatePreview();
+
if (renderer_->asButton())
renderer_->setRenderState(mouse_hover_[pi.base.bv]);
renderer_->draw(pi, x, y);
return gparams;
}
-} // namespace anon
+} // namespace
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);
}
-void InsetExternal::updatePreview()
+bool InsetExternal::isPreviewed() const
{
- setParams(params_);
+ return (external::getTemplatePtr(params_) && !params_.filename.empty()
+ && params_.display
+ && lyxrc.display_graphics
+ && params_.preview_mode != PREVIEW_OFF
+ && (params_.preview_mode != PREVIEW_INSTANT
+ || RenderPreview::previewText()));
+}
+
+
+bool InsetExternal::isRendererValid() const
+{
+ if (!renderer_->asButton())
+ return isPreviewed();
+ return !isPreviewed();
}
// will use this.
defaultTemplateName = params_.templatename();
- if (!external::getTemplatePtr(params_) || params_.filename.empty()
- || !params_.display
- || !lyxrc.display_graphics
- || params_.preview_mode == PREVIEW_OFF
- || (params_.preview_mode == PREVIEW_INSTANT
- && !RenderPreview::previewText())) {
+ updatePreview();
+}
+
+
+void InsetExternal::updatePreview() const
+{
+ if (!isPreviewed()) {
RenderButton * button_ptr = renderer_->asButton();
if (!button_ptr) {
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));
+ renderer_ = make_unique<RenderMonitoredPreview>(this);
RenderMonitoredPreview * preview_ptr = renderer_->asMonitoredPreview();
- preview_ptr->fileChanged(bind(&InsetExternal::fileChanged, this));
- if (preview_ptr->monitoring())
- preview_ptr->stopMonitoring();
+ // 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) {
et.formats.find("PDFLaTeX");
if (cit != et.formats.end()) {
- external::writeExternal(params_, "PDFLaTeX",
- buffer(), os,
- *(runparams.exportdata),
- external_in_tmpdir,
- dryrun);
+ external::RetVal retval =
+ external::writeExternal(params_, "PDFLaTeX", buffer(), os,
+ *(runparams.exportdata), external_in_tmpdir, dryrun);
+ if (retval == external::KILLED) {
+ LYXERR0("External template preparation killed.");
+ if (buffer().isClone() && buffer().isExporting())
+ throw ConversionException();
+ }
return;
}
}
- external::writeExternal(params_, "LaTeX", buffer(), os,
- *(runparams.exportdata),
- external_in_tmpdir,
- dryrun);
+ external::RetVal retval =
+ external::writeExternal(params_, "LaTeX", buffer(), os,
+ *(runparams.exportdata), external_in_tmpdir, dryrun);
+ if (retval == external::KILLED) {
+ LYXERR0("External template preparation killed.");
+ if (buffer().isClone() && buffer().isExporting())
+ throw ConversionException();
+ }
}
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);
+ external::RetVal retval =
+ external::writeExternal(params_, "Ascii", buffer(), ots,
+ *(runparams.exportdata), external_in_tmpdir, dryrun);
+ if (retval == external::KILLED) {
+ LYXERR0("External template preparation killed.");
+ if (buffer().isClone() && buffer().isExporting())
+ throw ConversionException();
+ }
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);
- external::writeExternal(params_, "DocBook", buffer(), ots,
- *(runparams.exportdata), false,
- runparams.dryrun || runparams.inComment);
+ otexstream ots(ods);
+ external::RetVal retval =
+ external::writeExternal(params_, "DocBook", buffer(), ots,
+ *(runparams.exportdata), external_in_tmpdir, dryrun);
+ if (retval == external::KILLED) {
+ LYXERR0("External template preparation killed.");
+ if (buffer().isClone() && buffer().isExporting())
+ throw ConversionException();
+ }
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::RetVal retval =
+ external::writeExternal(params_, "XHTML", buffer(), ots,
+ *(runparams.exportdata), external_in_tmpdir, dryrun);
+ if (retval == external::KILLED) {
+ LYXERR0("External template preparation killed.");
+ if (buffer().isClone() && buffer().isExporting())
+ throw ConversionException();
+ }
+ 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