anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not rely on math macros being updated

Browse Source 
Trying to spare a few cycles by avoiding computing metrics during
screen updates and export. See also 8f86ee74, 72cf7c8f, and e36a8903.
Guillaume will tell whether this also avoids crashing his documents ;)
This commit is contained in:
Enrico Forestieri 2016-09-25 20:31:13 +02:00
parent 3bc80220a7
commit 6642152e66
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BufferView.cpp
View File

@ -495,9 +495,7 @@ void BufferView::processUpdateFlags(Update::flags flags)
// updateMetrics() does not update paragraph position
// This is done at draw() time. So we need a redraw!
// We pass true so that metrics are computed for the sake
// of having MacroData updated.
buffer_.changed(true);
buffer_.changed(false);
if (needsFitCursor()) {
// The cursor is off screen so ensure it is visible.
@ -2167,9 +2165,7 @@ void BufferView::updateHoveredInset() const
// This event (moving without mouse click) is not passed further.
// This should be changed if it is further utilized.
// We pass true so that metrics are computed for the sake
// of having MacroData updated.
buffer_.changed(true);
buffer_.changed(false);
}
}

10
src/mathed/MathMacro.cpp
View File

@ -939,11 +939,11 @@ bool MathMacro::folded() const
void MathMacro::write(WriteStream & os) const
{
bool user_macro = !MacroTable::globalMacros().get(name());
bool textmode_macro = user_macro ? false : d->macro_ && d->macro_->symbol()
&& d->macro_->symbol()->extra == "textmode";
bool needs_mathmode = user_macro ? bool(d->macro_) : d->macro_ && (!d->macro_->symbol()
|| d->macro_->symbol()->extra != "textmode");
MacroData const * data = MacroTable::globalMacros().get(name());
bool textmode_macro = data && data->symbol()
&& data->symbol()->extra == "textmode";
bool needs_mathmode = data && (!data->symbol()
|| data->symbol()->extra != "textmode");
MathEnsurer ensurer(os, needs_mathmode, true, textmode_macro);