TempName::TempName()
{
- support::FileName const tempname(support::tempName(support::FileName(), "lyxext"));
+ FileName const tempname = FileName::tempName("lyxext");
// FIXME: This is unsafe
tempname.removeFile();
// must have an extension for the converter code to work correctly.
- tempname_ = support::FileName(tempname.absFilename() + ".tmp");
+ tempname_ = FileName(tempname.absFilename() + ".tmp");
}
os << "External\n"
<< "\ttemplate " << templatename() << '\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 (!filename.empty())
+ os << "\tfilename " << filename.outputFilename(buffer.filePath()) << '\n';
if (display != defaultDisplayType)
os << "\tdisplay "
}
if (!resizedata.no_resize()) {
- using support::float_equal;
double const scl = convert<double>(resizedata.scale);
if (!float_equal(scl, 0.0, 0.05)) {
if (!float_equal(scl, 100.0, 0.05))
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;
}
void InsetExternal::registerEmbeddedFiles(Buffer const &,
EmbeddedFiles & files) const
{
- files.registerFile(params_.filename.absFilename(), false, this);
+ // temporarily disable embedding for this inset
+ /* files.registerFile(params_.filename, this); */
}
external::getTemplatePtr(params);
if (!ptr)
// FIXME UNICODE
- return support::bformat((_("External template %1$s is not installed")),
+ return bformat((_("External template %1$s is not installed")),
from_utf8(params.templatename()));
// FIXME UNICODE
docstring gui = _(ptr->guiName);