anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 21:45:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport fix for 5539.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@27702 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-11-25 13:37:49 +00:00
parent a60d1b1c3c
commit 76144c7942
4 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Buffer.cpp
View File

@ -1879,11 +1879,10 @@ void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const
// is it an external file?
if (iit->inset->lyxCode() == INCLUDE_CODE) {
// get buffer of external file
InsetCommand const & inset
= static_cast<InsetCommand const &>(*iit->inset);
InsetCommandParams const & ip = inset.params();
InsetInclude const & inset
= static_cast<InsetInclude const &>(*iit->inset);
d->macro_lock = true;
Buffer * child = loadIfNeeded(*this, ip);
Buffer * child = inset.loadIfNeeded(*this);
d->macro_lock = false;
if (!child)
continue;

44
src/insets/InsetInclude.cpp
View File

@ -160,7 +160,8 @@ InsetLabel * createLabel(docstring const & label_str)
InsetInclude::InsetInclude(InsetCommandParams const & p)
: InsetCommand(p, "include"), include_label(uniqueID()),
preview_(new RenderMonitoredPreview(this)), set_label_(false), label_(0)
preview_(new RenderMonitoredPreview(this)), failedtoload_(false),
set_label_(false), label_(0)
{
preview_->fileChanged(boost::bind(&InsetInclude::fileChanged, this));
@ -173,7 +174,8 @@ InsetInclude::InsetInclude(InsetCommandParams const & p)
InsetInclude::InsetInclude(InsetInclude const & other)
: InsetCommand(other), include_label(other.include_label),
preview_(new RenderMonitoredPreview(this)), set_label_(false), label_(0)
preview_(new RenderMonitoredPreview(this)), failedtoload_(false),
set_label_(false), label_(0)
{
preview_->fileChanged(boost::bind(&InsetInclude::fileChanged, this));
@ -351,31 +353,34 @@ docstring InsetInclude::screenLabel() const
}
/// return the child buffer if the file is a LyX doc and is loaded
Buffer * getChildBuffer(Buffer const & buffer, InsetCommandParams const & params)
Buffer * InsetInclude::getChildBuffer(Buffer const & buffer) const
{
if (isVerbatim(params) || isListings(params))
InsetCommandParams const & p = params();
if (isVerbatim(p) || isListings(p))
return 0;
string const included_file = includedFilename(buffer, params).absFilename();
string const included_file = includedFilename(buffer, p).absFilename();
if (!isLyXFilename(included_file))
return 0;
Buffer * childBuffer = loadIfNeeded(buffer, params);
Buffer * childBuffer = loadIfNeeded(buffer);
// FIXME: recursive includes
return (childBuffer == &buffer) ? 0 : childBuffer;
}
/// return true if the file is or got loaded.
Buffer * loadIfNeeded(Buffer const & parent, InsetCommandParams const & params)
Buffer * InsetInclude::loadIfNeeded(Buffer const & parent) const
{
if (isVerbatim(params) || isListings(params))
if (failedtoload_)
return 0;
InsetCommandParams const & p = params();
if (isVerbatim(p) || isListings(p))
return 0;
string const parent_filename = parent.absFileName();
FileName const included_file = makeAbsPath(to_utf8(params["filename"]),
FileName const included_file = makeAbsPath(to_utf8(p["filename"]),
onlyPath(parent_filename));
if (!isLyXFilename(included_file.absFilename()))
@ -393,6 +398,7 @@ Buffer * loadIfNeeded(Buffer const & parent, InsetCommandParams const & params)
return 0;
if (!child->loadLyXFile(included_file)) {
failedtoload_ = true;
//close the buffer we just opened
theBufferList().release(child);
return 0;
@ -466,7 +472,7 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
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(buffer(), params()))
if (!loadIfNeeded(buffer()))
return false;
Buffer * tmp = theBufferList().getBuffer(included_file);
@ -626,7 +632,7 @@ int InsetInclude::docbook(odocstream & os, OutputParams const & runparams) const
string const exportfile = changeExtension(incfile, ".sgml");
DocFileName writefile(changeExtension(included_file, ".sgml"));
if (loadIfNeeded(buffer(), params())) {
if (loadIfNeeded(buffer())) {
Buffer * tmp = theBufferList().getBuffer(FileName(included_file));
string const mangled = writefile.mangledFilename();
@ -689,7 +695,7 @@ void InsetInclude::validate(LaTeXFeatures & features) const
// Here we must do the fun stuff...
// Load the file in the include if it needs
// to be loaded:
if (loadIfNeeded(buffer(), params())) {
if (loadIfNeeded(buffer())) {
// a file got loaded
Buffer * const tmp = theBufferList().getBuffer(FileName(included_file));
// make sure the buffer isn't us
@ -711,7 +717,7 @@ void InsetInclude::validate(LaTeXFeatures & features) const
void InsetInclude::fillWithBibKeys(BiblioInfo & keys,
InsetIterator const & /*di*/) const
{
if (loadIfNeeded(buffer(), params())) {
if (loadIfNeeded(buffer())) {
string const included_file = includedFilename(buffer(), params()).absFilename();
Buffer * tmp = theBufferList().getBuffer(FileName(included_file));
BiblioInfo const & newkeys = tmp->localBibInfo();
@ -722,7 +728,7 @@ void InsetInclude::fillWithBibKeys(BiblioInfo & keys,
void InsetInclude::updateBibfilesCache()
{
Buffer * const tmp = getChildBuffer(buffer(), params());
Buffer * const tmp = getChildBuffer(buffer());
if (tmp) {
tmp->setParent(0);
tmp->updateBibfilesCache();
@ -734,7 +740,7 @@ void InsetInclude::updateBibfilesCache()
support::FileNameList const &
InsetInclude::getBibfilesCache(Buffer const & buffer) const
{
Buffer * const tmp = getChildBuffer(buffer, params());
Buffer * const tmp = getChildBuffer(buffer);
if (tmp) {
tmp->setParent(0);
support::FileNameList const & cache = tmp->getBibfilesCache();
@ -888,7 +894,7 @@ void InsetInclude::addToToc(DocIterator const & cpit)
toc.push_back(TocItem(pit, 0, str));
return;
}
Buffer const * const childbuffer = getChildBuffer(buffer(), params());
Buffer const * const childbuffer = getChildBuffer(buffer());
if (!childbuffer)
return;
@ -909,7 +915,7 @@ void InsetInclude::addToToc(DocIterator const & cpit)
void InsetInclude::updateLabels(ParIterator const & it)
{
Buffer const * const childbuffer = getChildBuffer(buffer(), params());
Buffer const * const childbuffer = getChildBuffer(buffer());
if (childbuffer) {
lyx::updateLabels(*childbuffer, true);
return;

8
src/insets/InsetInclude.h
View File

@ -95,6 +95,10 @@ public:
static bool isCompatibleCommand(std::string const & s);
///
docstring contextMenu(BufferView const & bv, int x, int y) const;
/// \return the child buffer if the file is a LyX doc and is loaded
Buffer * getChildBuffer(Buffer const & buffer) const;
/// \return loaded Buffer or zero if the file loading did not proceed.
Buffer * loadIfNeeded(Buffer const & parent) const;
protected:
InsetInclude(InsetInclude const &);
///
@ -121,6 +125,8 @@ private:
/// The pointer never changes although *preview_'s contents may.
boost::scoped_ptr<RenderMonitoredPreview> const preview_;
///
mutable bool failedtoload_;
/// cache
mutable bool set_label_;
mutable RenderButton button_;
@ -128,8 +134,6 @@ private:
InsetLabel * label_;
};
/// return loaded Buffer or zero if the file loading did not proceed.
Buffer * loadIfNeeded(Buffer const & parent, InsetCommandParams const & params);
} // namespace lyx

5
status.16x
View File

@ -75,6 +75,11 @@ What's new
- Fix import of CVS data on Windows.
- Fix freeze when child document fails to load due to a conversion error
or similar problem (bug 5539). Note that LyX will not try to reload the
file. If the problem should with the child be fixed, the master document
will need to be closed and reopened for the child to be loaded.
* USER INTERFACE