anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-31 15:46:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Next step in fixing problems noted by Vincent: Remove magic boolean from

Browse Source 
updateMacros().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35000 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-07-21 21:58:54 +00:00
parent 2f78698fbd
commit 06445c964e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Buffer.cpp
View File

@ -164,8 +164,7 @@ public:
/// Update macro table starting with position of it \param it in some
/// text inset.
void updateMacros(DocIterator & it, DocIterator & scope,
bool record_docits = false);
void updateMacros(DocIterator & it, DocIterator & scope);
///
void setLabel(ParIterator & it, UpdateType utype) const;
///
@ -1576,7 +1575,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
updateBuffer(UpdateMaster, OutputUpdate);
checkBibInfoCache();
d->bibinfo_.makeCitationLabels(*this);
updateMacros(true);
updateMacros();
updateMacroInstances();
if (!only_body) {
@ -2668,8 +2667,7 @@ MacroData const * Buffer::getMacro(docstring const & name,
}
void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope,
bool record_docits)
void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
{
pit_type const lastpit = it.lastpit();
@ -2723,7 +2721,7 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope,
continue;
}
if (record_docits && iit->inset->asInsetMath()) {
if (doing_export && iit->inset->asInsetMath()) {
InsetMath * im = static_cast<InsetMath *>(iit->inset);
if (im->asHullInset()) {
InsetMathHull * hull = static_cast<InsetMathHull *>(im);
@ -2762,7 +2760,7 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope,
}
void Buffer::updateMacros(bool record_docit) const
void Buffer::updateMacros() const
{
if (d->macro_lock)
return;
@ -2781,7 +2779,7 @@ void Buffer::updateMacros(bool record_docit) const
DocIterator it = par_iterator_begin();
DocIterator outerScope = it;
outerScope.pit() = outerScope.lastpit() + 2;
d->updateMacros(it, outerScope, record_docit);
d->updateMacros(it, outerScope);
}

2
src/Buffer.h
View File

@ -427,7 +427,7 @@ public:
// Macro handling
//
/// Collect macro definitions in paragraphs
void updateMacros(bool record_docit = false) const;
void updateMacros() const;
/// Iterate through the whole buffer and try to resolve macros
void updateMacroInstances() const;