#include <sstream>
-using std::endl;
using std::string;
-using std::auto_ptr;
using std::istringstream;
using std::ostream;
using std::ostringstream;
using std::vector;
+using lyx::support::DocFileName;
namespace {
unsigned int const defaultLyxScale = 100;
-string defaultTemplateName = "RasterImage";
+string defaultTemplateName;
} // namespace anon
InsetExternalParams::InsetExternalParams()
: display(defaultDisplayType),
lyxscale(defaultLyxScale),
- draft(false),
- templatename_(defaultTemplateName)
-{}
+ draft(false)
+{
+ if (defaultTemplateName.empty()) {
+ external::TemplateManager const & etm =
+ external::TemplateManager::get();
+ templatename_ = etm.getTemplates().begin()->first;
+ } else
+ templatename_ = defaultTemplateName;
+}
namespace {
os << "External\n"
<< "\ttemplate " << templatename() << '\n';
- if (!filename.empty())
- os << "\tfilename "
- << filename.outputFilename(buffer.filePath())
- << '\n';
+ if (!filename.empty()) {
+ // when we save, we still use the original filename
+ EmbeddedFiles::EmbeddedFileList::const_iterator it =
+ buffer.embeddedFiles().find(filename.toFilesystemEncoding());
+ if (it != buffer.embeddedFiles().end())
+ os << "\tfilename " << DocFileName(it->absFilename()).outputFilename(buffer.filePath()) << '\n';
+ else
+ os << "\tfilename " << filename.outputFilename(buffer.filePath()) << '\n';
+ }
if (display != defaultDisplayType)
os << "\tdisplay "
lex.eatLine();
string const name = lex.getString();
filename.set(name, buffer.filePath());
+ // maybe this file is embedded
+ EmbeddedFiles::EmbeddedFileList::const_iterator it = buffer.embeddedFiles().find(filename.toFilesystemEncoding());
+ if (it != buffer.embeddedFiles().end())
+ // using available file, embedded or external, depending on file availability and
+ // embedding status.
+ filename = DocFileName(it->availableFile(&buffer));
break;
}
InsetExternal::InsetExternal(InsetExternal const & other)
- : InsetBase(other),
+ : Inset(other),
boost::signals::trackable(),
params_(other.params_),
renderer_(other.renderer_->clone(this))
{}
-auto_ptr<InsetBase> InsetExternal::doClone() const
+Inset * InsetExternal::clone() const
{
- return auto_ptr<InsetBase>(new InsetExternal(*this));
+ return new InsetExternal(*this);
}
break;
case LFUN_MOUSE_RELEASE:
- InsetExternalMailer(*this).showDialog(&cur.bv());
+ if (!cur.selection())
+ InsetExternalMailer(*this).showDialog(&cur.bv());
break;
default:
- InsetBase::doDispatch(cur, cmd);
+ Inset::doDispatch(cur, cmd);
}
}
return true;
default:
- return InsetBase::getStatus(cur, cmd, flag);
+ return Inset::getStatus(cur, cmd, flag);
}
}
+void InsetExternal::registerEmbeddedFiles(Buffer const &,
+ EmbeddedFiles & files) const
+{
+ files.registerFile(params_.filename.absFilename(), false, this);
+}
+
+
void InsetExternal::edit(Cursor & cur, bool)
{
InsetExternalMailer(*this).showDialog(&cur.bv());
}
-bool InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
{
renderer_->metrics(mi, dim);
- bool const changed = dim_ != dim;
- dim_ = dim;
- return changed;
}
void InsetExternal::draw(PainterInfo & pi, int x, int y) const
{
- setPosCache(pi, x, y);
renderer_->draw(pi, x, y);
}
BOOST_ASSERT(false);
}
if (gparams.display == graphics::DefaultDisplay)
- gparams.display = lyxrc.display_graphics;
+ gparams.display = graphics::DisplayType(lyxrc.display_graphics);
// Override the above if we're not using a gui
if (!use_gui)
gparams.display = graphics::NoDisplay;
return support::bformat((_("External template %1$s is not installed")),
from_utf8(params.templatename()));
// FIXME UNICODE
+ docstring gui = _(ptr->guiName);
return from_utf8(external::doSubstitution(params, buffer,
- ptr->guiName, false));
+ to_utf8(gui), false));
}
void add_preview_and_start_loading(RenderMonitoredPreview &,
int InsetExternal::latex(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
if (params_.draft) {
// FIXME UNICODE
if (cit != et.formats.end()) {
return external::writeExternal(params_, "PDFLaTeX",
- buf, os,
- *(runparams.exportdata),
- external_in_tmpdir,
- dryrun);
- }
+ buf, os,
+ *(runparams.exportdata),
+ external_in_tmpdir,
+ dryrun);
+ }
}
return external::writeExternal(params_, "LaTeX", buf, os,
- *(runparams.exportdata),
- external_in_tmpdir,
- dryrun);
+ *(runparams.exportdata),
+ external_in_tmpdir,
+ dryrun);
}
int InsetExternal::plaintext(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
os << '\n'; // output external material on a new line
external::writeExternal(params_, "Ascii", buf, os,
- *(runparams.exportdata), false,
- runparams.dryrun || runparams.inComment);
+ *(runparams.exportdata), false,
+ runparams.dryrun || runparams.inComment);
return PLAINTEXT_NEWLINE;
}
int InsetExternal::docbook(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
return external::writeExternal(params_, "DocBook", buf, os,
*(runparams.exportdata), false,
- runparams.dryrun || runparams.inComment);
+ runparams.dryrun || runparams.inComment);
}
bool preview_wanted(InsetExternalParams const & params)
{
return params.display == external::PreviewDisplay &&
- support::isFileReadable(params.filename);
+ params.filename.isFileReadable();
}
return print_mailer_error("InsetExternalMailer", in, 1, name_);
// This is part of the inset proper that is usually swallowed
- // by LyXText::readInset
+ // by Text::readInset
string id;
lex >> id;
if (!lex || id != "External")