void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_EDIT: {
editIncluded(to_utf8(params()["filename"]));
bool InsetInclude::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_EDIT:
flag.setEnabled(true);
Buffer * InsetInclude::loadIfNeeded() const
{
- // This is for background export and preview. We don't want to load the
- // cloned child document again.
- if (child_buffer_ && theBufferList().isLoaded(child_buffer_)
- && child_buffer_->isClone())
+ // This is for background export and preview. We don't even want to
+ // try to load the cloned child document again.
+ if (buffer().isClone())
return child_buffer_;
-
+
// Don't try to load it again if we failed before.
if (failedtoload_ || isVerbatim(params()) || isListings(params()))
return 0;
+ FileName const included_file = includedFilename(buffer(), params());
// Use cached Buffer if possible.
if (child_buffer_ != 0) {
- if (theBufferList().isLoaded(child_buffer_))
+ if (theBufferList().isLoaded(child_buffer_)
+ // additional sanity check: make sure the Buffer really is
+ // associated with the file we want.
+ && child_buffer_ == theBufferList().getBuffer(included_file))
return child_buffer_;
// Buffer vanished, so invalidate cache and try to reload.
child_buffer_ = 0;
}
- string const parent_filename = buffer().absFileName();
- FileName const included_file =
- makeAbsPath(to_utf8(params()["filename"]), onlyPath(parent_filename));
-
- if (!isLyXFilename(included_file.absFilename()))
+ if (!isLyXFilename(included_file.absFileName()))
return 0;
Buffer * child = theBufferList().getBuffer(included_file);
if (!included_file.exists())
return 0;
- child = theBufferList().newBuffer(included_file.absFilename());
+ child = theBufferList().newBuffer(included_file.absFileName());
if (!child)
// Buffer creation is not possible.
return 0;
// This isn't sufficient, as the inclusion could be downstream.
// But it'll have to do for now.
if (isInputOrInclude(params()) &&
- buffer().absFileName() == included_file.absFilename())
+ buffer().absFileName() == included_file.absFileName())
{
Alert::error(_("Recursive input"),
bformat(_("Attempted to include file %1$s in itself! "
// buffer directory.
if (!FileName::isAbsolute(incfile)) {
// FIXME UNICODE
- incfile = to_utf8(makeRelPath(from_utf8(included_file.absFilename()),
+ incfile = to_utf8(makeRelPath(from_utf8(included_file.absFileName()),
from_utf8(masterBuffer->filePath())));
}
mangled = DocFileName(included_file).mangledFilename();
} else {
exportfile = changeExtension(incfile, ".tex");
- mangled = DocFileName(changeExtension(included_file.absFilename(), ".tex")).
+ mangled = DocFileName(changeExtension(included_file.absFileName(), ".tex")).
mangledFilename();
}
//Don't try to load or copy the file if we're
//in a comment or doing a dryrun
} else if (isInputOrInclude(params()) &&
- isLyXFilename(included_file.absFilename())) {
+ isLyXFilename(included_file.absFileName())) {
//if it's a LyX file and we're inputting or including,
//try to load it so we can write the associated latex
if (!loadIfNeeded())
runparams.encoding = &tmp->params().encoding();
runparams.master_language = buffer().params().language;
tmp->makeLaTeXFile(writefile,
- masterFileName(buffer()).onlyPath().absFilename(),
+ masterFileName(buffer()).onlyPath().absFileName(),
runparams, false);
runparams.encoding = oldEnc;
runparams.master_language = oldLang;
LYXERR(Debug::LATEX,
to_utf8(bformat(_("Could not copy the file\n%1$s\n"
"into the temporary directory."),
- from_utf8(included_file.absFilename()))));
+ from_utf8(included_file.absFileName()))));
return 0;
}
}
exportfile);
// \input wants file with extension (default is .tex)
- if (!isLyXFilename(included_file.absFilename())) {
+ if (!isLyXFilename(included_file.absFileName())) {
incfile = latex_path(incfile);
// FIXME UNICODE
os << '\\' << from_ascii(params().getCmdName())
// We don't (yet) know how to Input or Include non-LyX files.
// (If we wanted to get really arcane, we could run some tex2html
// converter on the included file. But that's just masochistic.)
- string const parent_filename = buffer().absFileName();
- FileName const included_file =
- makeAbsPath(to_utf8(params()["filename"]), onlyPath(parent_filename));
- if (!isLyXFilename(included_file.absFilename())) {
+ FileName const included_file = includedFilename(buffer(), params());
+ if (!isLyXFilename(included_file.absFileName())) {
frontend::Alert::warning(_("Unsupported Inclusion"),
bformat(_("LyX does not know how to include non-LyX files when "
"generating HTML output. Offending file:\n%1$s"),
// Check we're not trying to include ourselves.
// FIXME RECURSIVE INCLUDE
- if (buffer().absFileName() == included_file.absFilename()) {
+ if (buffer().absFileName() == included_file.absFileName()) {
Alert::error(_("Recursive input"),
bformat(_("Attempted to include file %1$s in itself! "
"Ignoring inclusion."), params()["filename"]));
if (incfile.empty())
return 0;
- string const included_file = includedFilename(buffer(), params()).absFilename();
+ string const included_file = includedFilename(buffer(), params()).absFileName();
// Check we're not trying to include ourselves.
// FIXME RECURSIVE INCLUDE
LASSERT(&buffer() == &features.buffer(), /**/);
string const included_file =
- includedFilename(buffer(), params()).absFilename();
+ includedFilename(buffer(), params()).absFileName();
if (isLyXFilename(included_file))
writefile = changeExtension(included_file, ".sgml");
if (!features.runparams().nice && !isVerbatim(params()) && !isListings(params())) {
incfile = DocFileName(writefile).mangledFilename();
writefile = makeAbsPath(incfile,
- buffer().masterBuffer()->temppath()).absFilename();
+ buffer().masterBuffer()->temppath()).absFileName();
}
features.includeFile(include_label, writefile);
InsetIterator const & /*di*/) const
{
if (loadIfNeeded()) {
- string const included_file = includedFilename(buffer(), params()).absFilename();
+ string const included_file = includedFilename(buffer(), params()).absFileName();
Buffer * tmp = theBufferList().getBuffer(FileName(included_file));
BiblioInfo const & newkeys = tmp->localBibInfo();
keys.mergeBiblioInfo(newkeys);
projects / lyx.git / blobdiff