Fix creationCode() of GuiPrintNomencl

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index 5a803c21e843715159ff1c0c81d9d7882093e739..b4226582f4f7b97e88323607223f9f691c005178 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -142,7 +142,7 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en
 {
        if (change.type != Change::UNCHANGED) {
                LYXERR(Debug::CHANGES, "setting change (type: " << change.type
-                       << ", author: " << change.author 
+                       << ", author: " << change.author
                        << ", time: " << long(change.changetime)
                        << ") in range (" << start << ", " << end << ")");
        }
@@ -382,7 +382,7 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
        return ods.str();
 }
 
-} //namespace anon
+} // namespace
 
 
 int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
@@ -394,11 +394,16 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
 
        int column = 0;
 
+       bool const dvipost = LaTeXFeatures::isAvailable("dvipost") &&
+                       (runparams.flavor == OutputParams::LATEX
+                        || runparams.flavor == OutputParams::DVILUATEX);
+
        if (oldChange.type != Change::UNCHANGED) {
                // close \lyxadded or \lyxdeleted
                os << '}';
                column++;
-               if (oldChange.type == Change::DELETED && !runparams.wasDisplayMath)
+               if (oldChange.type == Change::DELETED
+                   && !runparams.wasDisplayMath && !dvipost)
                        --runparams.inulemcmd;
        }
 
@@ -410,21 +415,19 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
        docstring macro_beg;
        if (change.type == Change::DELETED) {
                macro_beg = from_ascii("\\lyxdeleted{");
-               if (!runparams.inDisplayMath)
+               if (!runparams.inDisplayMath && !dvipost)
                        ++runparams.inulemcmd;
        }
        else if (change.type == Change::INSERTED)
                macro_beg = from_ascii("\\lyxadded{");
-       
+
        docstring str = getLaTeXMarkup(macro_beg,
                                       bparams.authors().get(change.author).name(),
                                       chgTime, runparams);
-       
+
        // signature needed by \lyxsout to correctly strike out display math
        if (change.type == Change::DELETED && runparams.inDisplayMath
-           && (!LaTeXFeatures::isAvailable("dvipost")
-               || (runparams.flavor != OutputParams::LATEX
-                   && runparams.flavor != OutputParams::DVILUATEX))) {
+           && !dvipost) {
                if (os.afterParbreak())
                        str += from_ascii("\\\\\\noindent\n");
                else
@@ -475,12 +478,12 @@ void Changes::checkAuthors(AuthorList const & authorList)
 
 
 void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer,
-        bool output_active) const
+                       bool output_active, TocBackend & backend) const
 {
        if (table_.empty())
                return;
 
-       shared_ptr<Toc> change_list = buffer.tocBackend().toc("change");
+       shared_ptr<Toc> change_list = backend.toc("change");
        AuthorList const & author_list = buffer.params().authors();
        DocIterator dit = cdit;