X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FChanges.h;h=6146b5a0f2de091ad7d3adae595c8f71ccff2df6;hb=62af7ee772f16f154225d2d0b65d77f4376b6001;hp=435d44bca37d609a1404152272434e5181fdf086;hpb=1ef605f6254ef3f3b8cec5440a2e67e6f23a707b;p=lyx.git diff --git a/src/Changes.h b/src/Changes.h index 435d44bca3..6146b5a0f2 100644 --- a/src/Changes.h +++ b/src/Changes.h @@ -17,7 +17,6 @@ #include "Color.h" -#include "support/docstream.h" #include "support/strfwd.h" #include "support/types.h" #include "support/lyxtime.h" @@ -30,7 +29,12 @@ namespace lyx { class AuthorList; class Buffer; class DocIterator; +class FontInfo; class OutputParams; +class otexstream; +class PainterInfo; +class TocBackend; + class Change { public: @@ -41,7 +45,7 @@ public: DELETED // deleted text }; - explicit Change(Type t = UNCHANGED, int a = 0, time_t ct = current_time()) + explicit Change(Type t = UNCHANGED, int a = 0, time_t ct = support::current_time()) : type(t), author(a), changetime(ct) {} /// is the change similar to the given change such that both can be merged? @@ -63,6 +67,20 @@ public: /// Is this change made by the current author ? bool currentAuthor() const { return author == 0; } + /// Paint under- or strike-through line + /// + /// Text : underline or strike through + /// \param x1 begin + /// \param x2 end + /// \param y baseline + void paintCue(PainterInfo & pi, double const x1, double const y, + double const x2, FontInfo const & font) const; + /// Box : line below or diagonal + /// \param x1,y1 top-left corner + /// \param x2,y2 bottom-right corner + void paintCue(PainterInfo & pi, double const x1, double const y1, + double const x2, double const y2) const; + Type type; int author; @@ -97,6 +115,8 @@ public: /// return true if there is a change in the given range (excluding end) bool isChanged(pos_type start, pos_type end) const; + /// + bool isChanged() const; /// return true if the whole range is deleted bool isDeleted(pos_type start, pos_type end) const; @@ -115,7 +135,8 @@ public: void checkAuthors(AuthorList const & authorList); /// - void addToToc(DocIterator const & cdit, Buffer const & buffer) const; + void addToToc(DocIterator const & cdit, Buffer const & buffer, + bool output_active, TocBackend & backend) const; private: class Range {