Factor code for math axis height

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index c66668a35d25c76d37acb427def579c85ce85b88..90ad07501add91569ae11984c7b1e5361e91e59b 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -428,10 +428,8 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
                // close \lyxadded or \lyxdeleted
                os << '}';
                column++;
-               if (oldChange.type == Change::DELETED) {
+               if (oldChange.type == Change::DELETED && !runparams.wasDisplayMath)
                        --runparams.inulemcmd;
-                       runparams.inDisplayMath = false;
-               }
        }
 
        docstring chgTime;
@@ -442,7 +440,8 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
        docstring macro_beg;
        if (change.type == Change::DELETED) {
                macro_beg = from_ascii("\\lyxdeleted{");
-               ++runparams.inulemcmd;
+               if (!runparams.inDisplayMath)
+                       ++runparams.inulemcmd;
        }
        else if (change.type == Change::INSERTED)
                macro_beg = from_ascii("\\lyxadded{");
@@ -459,7 +458,7 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
                if (os.afterParbreak())
                        str += from_ascii("\\\\\\noindent\n");
                else
-                       str += from_ascii("\\\\\\mbox{}\\\\\n");
+                       str += from_ascii("\\\\\\\\\n");
        }
 
        os << str;