DocBook: eat a bit of that spaghetti code.

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index ed9205d530fd3a76b3d52258f1b2ebffc90e4b7c..63bb021efeced935b10f40282b3e6527f1e84656 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -380,7 +380,7 @@ docstring getLaTeXMarkup(docstring const & macro, Author const & author,
                                          "Choose an appropriate document encoding (such as utf8)\n"
                                          "or change the author initials."),
                                        uncodable_initials, author_initials_latexed.second));
-                               warned_author_initials.insert(uncodable_author);
+                               warned_author_initials.insert(uncodable_initials);
                        }
                }
        }
@@ -429,10 +429,6 @@ 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) {
                if (oldChange.type != Change::DELETED || runparams.ctObject != OutputParams::CT_OMITOBJECT) {
                        // close \lyxadded or \lyxdeleted
@@ -440,7 +436,7 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
                        column++;
                }
                if (oldChange.type == Change::DELETED
-                   && !runparams.wasDisplayMath && !dvipost)
+                   && !runparams.wasDisplayMath)
                        --runparams.inulemcmd;
        }
 
@@ -461,7 +457,7 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
                        macro_beg = from_ascii("\\lyxudisplayobjdeleted");
                else {
                        macro_beg = from_ascii("\\lyxdeleted");
-                       if (!runparams.inDisplayMath && !dvipost)
+                       if (!runparams.inDisplayMath)
                                ++runparams.inulemcmd;
                }
        }
@@ -561,14 +557,6 @@ void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer,
 }
 
 
-void Changes::updateBuffer(Buffer const & buf)
-{
-       bool const changed = isChanged();
-       buf.setChangesPresent(buf.areChangesPresent() || changed);
-       previously_changed_ = changed;
-}
-
-
 void Change::paintCue(PainterInfo & pi, double const x1, double const y,
                       double const x2, FontInfo const & font) const
 {
@@ -600,7 +588,7 @@ void Change::paintCue(PainterInfo & pi, double const x1, double const y1,
                return;
        case INSERTED: {
                if (!lyxrc.ct_additions_underlined)
-                       break;
+                       return;
                pi.pain.line(int(x1), int(y2) + 1, int(x2), int(y2) + 1,
                             color(), Painter::line_solid,
                             pi.base.solidLineThickness());