anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* cosmetic

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22815 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stefan Schimanski 2008-02-06 21:32:31 +00:00
parent a58f6d8025
commit 5627a35790
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/Buffer.cpp
View File

@ -1754,31 +1754,33 @@ MacroData const * Buffer::getBufferMacro(docstring const & name,
// find macros in included files
Impl::PositionScopeBufferMap::const_iterator it
= greatest_below(d->position_to_children, pos);
if (it != d->position_to_children.end()) {
while (true) {
// do we know something better (i.e. later) already?
if (it->first < bestPos )
break;
if (it == d->position_to_children.end())
// no children before
return bestData;
// scope ends behind pos?
if (pos < it->second.first) {
// look for macro in external file
d->macro_lock = true;
MacroData const * data
= it->second.second->getMacro(name, false);
d->macro_lock = false;
if (data) {
bestPos = it->first;
bestData = data;
break;
}
}
// try previous file if there is one
if (it == d->position_to_children.begin())
while (true) {
// do we know something better (i.e. later) already?
if (it->first < bestPos )
break;
// scope ends behind pos?
if (pos < it->second.first) {
// look for macro in external file
d->macro_lock = true;
MacroData const * data
= it->second.second->getMacro(name, false);
d->macro_lock = false;
if (data) {
bestPos = it->first;
bestData = data;
break;
--it;
}
}
// try previous file if there is one
if (it == d->position_to_children.begin())
break;
--it;
}
// return the best macro we have found