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

This file failed to go in r38615 due to its still being in conflict.

Browse Source 
Why don't you get a warning about this in QtCreator?



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38617 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-05-07 17:38:02 +00:00
parent 8f7c852b0f
commit 6d6ca1e343
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Buffer.cpp
View File

@ -830,7 +830,7 @@ bool Buffer::readDocument(Lexer & lex)
} }
usermacros.clear(); usermacros.clear();
updateMacros(); updateMacros();
updateMacroInstances(); updateMacroInstances(InternalUpdate);
return res; return res;
} }
@ -1350,7 +1350,7 @@ void Buffer::writeLaTeXSource(otexstream & os,
// fold macros if possible, still with parent buffer as the // fold macros if possible, still with parent buffer as the
// macros will be put in the prefix anyway. // macros will be put in the prefix anyway.
updateMacroInstances(); updateMacroInstances(OutputUpdate);
// There are a few differences between nice LaTeX and usual files: // There are a few differences between nice LaTeX and usual files:
// usual is \batchmode and has a // usual is \batchmode and has a
@ -1615,7 +1615,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
updateBuffer(UpdateMaster, OutputUpdate); updateBuffer(UpdateMaster, OutputUpdate);
d->bibinfo_.makeCitationLabels(*this); d->bibinfo_.makeCitationLabels(*this);
updateMacros(); updateMacros();
updateMacroInstances(); updateMacroInstances(OutputUpdate);
if (!only_body) { if (!only_body) {
os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@ -2920,7 +2920,7 @@ void Buffer::getUsedBranches(std::list<docstring> & result, bool const from_mast
} }
void Buffer::updateMacroInstances() const void Buffer::updateMacroInstances(UpdateType utype) const
{ {
LYXERR(Debug::MACROS, "updateMacroInstances for " LYXERR(Debug::MACROS, "updateMacroInstances for "
<< d->filename.onlyFileName()); << d->filename.onlyFileName());
@ -2938,7 +2938,7 @@ void Buffer::updateMacroInstances() const
MacroContext mc = MacroContext(this, it); MacroContext mc = MacroContext(this, it);
for (DocIterator::idx_type i = 0; i < n; ++i) { for (DocIterator::idx_type i = 0; i < n; ++i) {
MathData & data = minset->cell(i); MathData & data = minset->cell(i);
data.updateMacros(0, mc); data.updateMacros(0, mc, utype);
} }
} }
} }
@ -3524,7 +3524,7 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
// fix macros // fix macros
updateMacros(); updateMacros();
updateMacroInstances(); updateMacroInstances(OutputUpdate);
// Plain text backend // Plain text backend
if (backend_format == "text") { if (backend_format == "text") {