anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 03:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cosmetics

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23543 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2008-03-07 20:51:56 +00:00
parent 095fc3a2a1
commit 49c45006ae
1 changed files with 33 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/Buffer.cpp
View File

@ -1354,7 +1354,7 @@ void Buffer::getLabelList(vector<docstring> & list) const
{ {
// If this is a child document, use the parent's list instead. // If this is a child document, use the parent's list instead.
if (d->parent_buffer) { if (d->parent_buffer) {
masterBuffer()->getLabelList(list); d->parent_buffer->getLabelList(list);
return; return;
} }
@ -1371,12 +1371,9 @@ void Buffer::getLabelList(vector<docstring> & list) const
void Buffer::updateBibfilesCache() const void Buffer::updateBibfilesCache() const
{ {
// if this is a child document and the parent is already loaded // If this is a child document, use the parent's cache instead.
// update the parent's cache instead if (d->parent_buffer) {
Buffer const * tmp = masterBuffer(); d->parent_buffer->updateBibfilesCache();
BOOST_ASSERT(tmp);
if (tmp != this) {
tmp->updateBibfilesCache();
return; return;
} }
@ -1405,12 +1402,9 @@ void Buffer::updateBibfilesCache() const
EmbeddedFileList const & Buffer::getBibfilesCache() const EmbeddedFileList const & Buffer::getBibfilesCache() const
{ {
// if this is a child document and the parent is already loaded // If this is a child document, use the parent's cache instead.
// use the parent's cache instead if (d->parent_buffer)
Buffer const * tmp = masterBuffer(); return d->parent_buffer->getBibfilesCache();
BOOST_ASSERT(tmp);
if (tmp != this)
return tmp->getBibfilesCache();
// We update the cache when first used instead of at loading time. // We update the cache when first used instead of at loading time.
if (d->bibfilesCache_.empty()) if (d->bibfilesCache_.empty())
@ -1775,8 +1769,8 @@ MacroData const * Buffer::getMacro(docstring const & name,
// If there is a master buffer, query that // If there is a master buffer, query that
if (d->parent_buffer) { if (d->parent_buffer) {
d->macro_lock = true; d->macro_lock = true;
MacroData const * macro MacroData const * macro = d->parent_buffer->getMacro(
= d->parent_buffer->getMacro(name, *this, false); name, *this, false);
d->macro_lock = false; d->macro_lock = false;
if (macro) if (macro)
return macro; return macro;
@ -1802,11 +1796,11 @@ MacroData const * Buffer::getMacro(docstring const & name, bool global) const
} }
MacroData const * Buffer::getMacro(docstring const & name, Buffer const & child, bool global) const MacroData const * Buffer::getMacro(docstring const & name,
Buffer const & child, bool global) const
{ {
// look where the child buffer is included first // look where the child buffer is included first
Impl::BufferPositionMap::iterator it Impl::BufferPositionMap::iterator it = d->children_positions.find(&child);
= d->children_positions.find(&child);
if (it == d->children_positions.end()) if (it == d->children_positions.end())
return 0; return 0;
@ -1815,15 +1809,12 @@ MacroData const * Buffer::getMacro(docstring const & name, Buffer const & child,
} }
void Buffer::updateEnvironmentMacros(DocIterator & it, void Buffer::updateEnvironmentMacros(DocIterator & it, pit_type lastpit,
pit_type lastpit, DocIterator & scope) const
DocIterator & scope) const
{ {
Paragraph & par = it.paragraph(); Paragraph & par = it.paragraph();
depth_type depth depth_type depth = par.params().depth();
= par.params().depth(); Length const & leftIndent = par.params().leftIndent();
Length const & leftIndent
= par.params().leftIndent();
// look for macros in each paragraph // look for macros in each paragraph
while (it.pit() <= lastpit) { while (it.pit() <= lastpit) {
@ -1831,7 +1822,7 @@ void Buffer::updateEnvironmentMacros(DocIterator & it,
// increased depth? // increased depth?
if ((par.params().depth() > depth if ((par.params().depth() > depth
|| par.params().leftIndent() != leftIndent) || par.params().leftIndent() != leftIndent)
&& par.layout().isEnvironment()) { && par.layout().isEnvironment()) {
updateBlockMacros(it, scope); updateBlockMacros(it, scope);
continue; continue;
@ -1866,7 +1857,7 @@ void Buffer::updateEnvironmentMacros(DocIterator & it,
if (iit->inset->lyxCode() == INCLUDE_CODE) { if (iit->inset->lyxCode() == INCLUDE_CODE) {
// get buffer of external file // get buffer of external file
InsetCommand const & inset InsetCommand const & inset
= static_cast<InsetCommand const &>(*iit->inset); = static_cast<InsetCommand const &>(*iit->inset);
InsetCommandParams const & ip = inset.params(); InsetCommandParams const & ip = inset.params();
d->macro_lock = true; d->macro_lock = true;
Buffer * child = loadIfNeeded(*this, ip); Buffer * child = loadIfNeeded(*this, ip);
@ -1877,12 +1868,11 @@ void Buffer::updateEnvironmentMacros(DocIterator & it,
// register its position, but only when it is // register its position, but only when it is
// included first in the buffer // included first in the buffer
if (d->children_positions.find(child) if (d->children_positions.find(child)
== d->children_positions.end()) == d->children_positions.end())
d->children_positions[child] = it; d->children_positions[child] = it;
// register child with its scope // register child with its scope
d->position_to_children[it] = Impl::ScopeBuffer(scope, child); d->position_to_children[it] = Impl::ScopeBuffer(scope, child);
continue; continue;
} }
@ -1904,8 +1894,8 @@ void Buffer::updateEnvironmentMacros(DocIterator & it,
continue; continue;
// register macro // register macro
d->macros[macroTemplate.name()][it] d->macros[macroTemplate.name()][it] =
= Impl::ScopeMacro(scope, MacroData(*this, it)); Impl::ScopeMacro(scope, MacroData(*this, it));
} }
// next paragraph // next paragraph
@ -2015,18 +2005,14 @@ void Buffer::listMacroNames(MacroNameSet & macros) const
d->macro_lock = true; d->macro_lock = true;
// loop over macro names // loop over macro names
Impl::NamePositionScopeMacroMap::iterator nameIt Impl::NamePositionScopeMacroMap::iterator nameIt = d->macros.begin();
= d->macros.begin(); Impl::NamePositionScopeMacroMap::iterator nameEnd = d->macros.end();
Impl::NamePositionScopeMacroMap::iterator nameEnd
= d->macros.end();
for (; nameIt != nameEnd; ++nameIt) for (; nameIt != nameEnd; ++nameIt)
macros.insert(nameIt->first); macros.insert(nameIt->first);
// loop over children // loop over children
Impl::BufferPositionMap::iterator it Impl::BufferPositionMap::iterator it = d->children_positions.begin();
= d->children_positions.begin(); Impl::BufferPositionMap::iterator end = d->children_positions.end();
Impl::BufferPositionMap::iterator end
= d->children_positions.end();
for (; it != end; ++it) for (; it != end; ++it)
it->first->listMacroNames(macros); it->first->listMacroNames(macros);
@ -2071,7 +2057,8 @@ Buffer::References & Buffer::references(docstring const & label)
static InsetLabel const * dummy_il = 0; static InsetLabel const * dummy_il = 0;
static References const dummy_refs; static References const dummy_refs;
it = d->ref_cache_.insert(make_pair(label, make_pair(dummy_il, dummy_refs))).first; it = d->ref_cache_.insert(
make_pair(label, make_pair(dummy_il, dummy_refs))).first;
return it->second.second; return it->second.second;
} }
@ -2150,31 +2137,30 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
d->texrow.newline(); d->texrow.newline();
if (isLatex()) if (isLatex())
writeLaTeXSource(os, filePath(), runparams, true, true); writeLaTeXSource(os, filePath(), runparams, true, true);
else { else
writeDocBookSource(os, absFileName(), runparams, false); writeDocBookSource(os, absFileName(), runparams, false);
}
} else { } else {
runparams.par_begin = par_begin; runparams.par_begin = par_begin;
runparams.par_end = par_end; runparams.par_end = par_end;
if (par_begin + 1 == par_end) if (par_begin + 1 == par_end) {
os << "% " os << "% "
<< bformat(_("Preview source code for paragraph %1$d"), par_begin) << bformat(_("Preview source code for paragraph %1$d"), par_begin)
<< "\n\n"; << "\n\n";
else } else {
os << "% " os << "% "
<< bformat(_("Preview source code from paragraph %1$s to %2$s"), << bformat(_("Preview source code from paragraph %1$s to %2$s"),
convert<docstring>(par_begin), convert<docstring>(par_begin),
convert<docstring>(par_end - 1)) convert<docstring>(par_end - 1))
<< "\n\n"; << "\n\n";
}
d->texrow.newline(); d->texrow.newline();
d->texrow.newline(); d->texrow.newline();
// output paragraphs // output paragraphs
if (isLatex()) { if (isLatex())
latexParagraphs(*this, text(), os, d->texrow, runparams); latexParagraphs(*this, text(), os, d->texrow, runparams);
} else { else
// DocBook // DocBook
docbookParagraphs(paragraphs(), *this, os, runparams); docbookParagraphs(paragraphs(), *this, os, runparams);
}
} }
} }