Properly restore the file encoding after a LaTeX environment with local scope.

[lyx.git] / src / Changes.h

diff --git a/src/Changes.h b/src/Changes.h
index 09ac0aa0fe7d3dd52271f2a1574ab23693d9a432..2183adf0404a67161f3e26b673c3a861ebb3e7f6 100644 (file)
--- a/src/Changes.h
+++ b/src/Changes.h
@@ -15,7 +15,7 @@
 #ifndef CHANGES_H
 #define CHANGES_H
 
-#include "ColorCode.h"
+#include "Color.h"
 
 #include "support/strfwd.h"
 #include "support/types.h"
@@ -45,7 +45,7 @@ public:
        /// is the change similar to the given change such that both can be merged?
        bool isSimilarTo(Change const & change) const;
        /// The color of this change on screen
-       ColorCode color() const;
+       Color color() const;
        ///
        bool changed() const { return type != UNCHANGED; }
        ///
@@ -94,14 +94,17 @@ public:
        /// return true if there is a change in the given range (excluding end)
        bool isChanged(pos_type start, pos_type end) const;
 
+       /// return true if the whole range is deleted
+       bool isFullyDeleted(pos_type const start, pos_type const end) const;            
+
        /// output latex to mark a transition between two change types
        /// returns length of text outputted
        static int latexMarkChange(odocstream & os, BufferParams const & bparams,
                                   Change const & oldChange, Change const & change);
 
        /// output .lyx file format for transitions between changes
-       static void lyxMarkChange(std::ostream & os, int & column,
-               Change const & old, Change const & change);
+       static void lyxMarkChange(std::ostream & os, BufferParams const & bparams,
+               int & column, Change const & old, Change const & change);
 
        ///
        void checkAuthors(AuthorList const & authorList);