X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FChanges.h;h=435d44bca37d609a1404152272434e5181fdf086;hb=b53445e6cdc803c43e05c236edee980385849c58;hp=2183adf0404a67161f3e26b673c3a861ebb3e7f6;hpb=966687d98b0a434b31d8ba2a508a6783c4245c8a;p=lyx.git diff --git a/src/Changes.h b/src/Changes.h index 2183adf040..435d44bca3 100644 --- a/src/Changes.h +++ b/src/Changes.h @@ -17,6 +17,7 @@ #include "Color.h" +#include "support/docstream.h" #include "support/strfwd.h" #include "support/types.h" #include "support/lyxtime.h" @@ -29,6 +30,7 @@ namespace lyx { class AuthorList; class Buffer; class DocIterator; +class OutputParams; class Change { public: @@ -58,6 +60,8 @@ public: bool deleted() const { return type == DELETED; } /// void setDeleted() { type = DELETED; } + /// Is this change made by the current author ? + bool currentAuthor() const { return author == 0; } Type type; @@ -95,12 +99,13 @@ public: 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; + bool isDeleted(pos_type start, pos_type 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); + static int latexMarkChange(otexstream & os, BufferParams const & bparams, + Change const & oldChange, Change const & change, + OutputParams const & runparams); /// output .lyx file format for transitions between changes static void lyxMarkChange(std::ostream & os, BufferParams const & bparams,