Convert cursorX() and computeRowMetrics() to the new scheme

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index d24df403ccf07f478d54792b71cc781aac711466..39f2a8ebc75a8d0b947ea9d60538ea6ff948d931 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -348,6 +348,7 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
        if (macro.empty())
                return docstring();
 
+       // FIXME THREAD
        static docstring warned_author = docstring();
        docstring uncodable_author = warned_author;
        odocstringstream ods;
@@ -388,7 +389,7 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
                             Change const & oldChange, Change const & change,
                             OutputParams const & runparams)
 {
-       if (!bparams.outputChanges || oldChange == change)
+       if (!bparams.output_changes || oldChange == change)
                return 0;
 
        int column = 0;
@@ -397,6 +398,8 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
                // close \lyxadded or \lyxdeleted
                os << '}';
                column++;
+               if (oldChange.type == Change::DELETED)
+                       --runparams.inulemcmd;
        }
 
        docstring chgTime;
@@ -405,8 +408,10 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
        chgTime.erase(chgTime.end() - 1);
 
        docstring macro_beg;
-       if (change.type == Change::DELETED)
+       if (change.type == Change::DELETED) {
                macro_beg = from_ascii("\\lyxdeleted{");
+               ++runparams.inulemcmd;
+       }
        else if (change.type == Change::INSERTED)
                macro_beg = from_ascii("\\lyxadded{");