X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.cpp;h=e9191e37d80210958a8fa909e4fe31f0460b85f0;hb=28f6c312a95ba6a2f632c7540b8b69f0f2c0ab02;hp=7b711172ecaa84aaf4fd97c551495aa7120386b2;hpb=9b4a26a252b2da164fcd6aa84feed0a738b16c10;p=lyx.git diff --git a/src/Changes.cpp b/src/Changes.cpp index 7b711172ec..e9191e37d8 100644 --- a/src/Changes.cpp +++ b/src/Changes.cpp @@ -15,12 +15,24 @@ #include "Changes.h" #include "Author.h" +#include "Buffer.h" #include "BufferParams.h" +#include "Encoding.h" #include "LaTeXFeatures.h" +#include "MetricsInfo.h" +#include "OutputParams.h" +#include "Paragraph.h" +#include "TocBackend.h" #include "support/debug.h" - +#include "support/gettext.h" #include "support/lassert.h" +#include "support/lstrings.h" +#include "support/mutex.h" + +#include "frontends/alert.h" +#include "frontends/FontMetrics.h" +#include "frontends/Painter.h" #include @@ -28,6 +40,9 @@ using namespace std; namespace lyx { +using frontend::Painter; +using frontend::FontMetrics; + /* * Class Change has a changetime field that specifies the exact time at which * a specific change was made. The change time is used as a guidance for the @@ -39,7 +54,7 @@ namespace lyx { * the later change time is preserved. */ -bool Change::isSimilarTo(Change const & change) +bool Change::isSimilarTo(Change const & change) const { if (type != change.type) return false; @@ -51,6 +66,34 @@ bool Change::isSimilarTo(Change const & change) } +Color Change::color() const +{ + Color color = Color_none; + switch (author % 5) { + case 0: + color = Color_changedtextauthor1; + break; + case 1: + color = Color_changedtextauthor2; + break; + case 2: + color = Color_changedtextauthor3; + break; + case 3: + color = Color_changedtextauthor4; + break; + case 4: + color = Color_changedtextauthor5; + break; + } + + if (deleted()) + color.mergeColor = Color_deletedtextmodifier; + + return color; +} + + bool operator==(Change const & l, Change const & r) { if (l.type != r.type) @@ -101,6 +144,8 @@ void Changes::set(Change const & change, pos_type const start, pos_type const en << ", author: " << change.author << ", time: " << long(change.changetime) << ") in range (" << start << ", " << end << ")"); + if (!isChanged()) + is_update_required_ = true; } Range const newRange(start, end); @@ -225,6 +270,24 @@ Change const & Changes::lookup(pos_type const pos) const } +bool Changes::isDeleted(pos_type start, pos_type end) const +{ + ChangeTable::const_iterator it = table_.begin(); + ChangeTable::const_iterator const itend = table_.end(); + + for (; it != itend; ++it) { + if (it->range.contains(Range(start, end))) { + LYXERR(Debug::CHANGES, "range (" + << start << ", " << end << ") fully contains (" + << it->range.start << ", " << it->range.end + << ") of type " << it->change.type); + return it->change.type == Change::DELETED; + } + } + return false; +} + + bool Changes::isChanged(pos_type const start, pos_type const end) const { ChangeTable::const_iterator it = table_.begin(); @@ -243,8 +306,21 @@ bool Changes::isChanged(pos_type const start, pos_type const end) const } +bool Changes::isChanged() const +{ + ChangeTable::const_iterator it = table_.begin(); + ChangeTable::const_iterator const itend = table_.end(); + for (; it != itend; ++it) { + if (it->change.changed()) + return true; + } + return false; +} + + void Changes::merge() { + bool merged = false; ChangeTable::iterator it = table_.begin(); while (it != table_.end()) { @@ -257,6 +333,7 @@ void Changes::merge() << it->range.start); table_.erase(it); + merged = true; // start again it = table_.begin(); continue; @@ -275,6 +352,7 @@ void Changes::merge() (it + 1)->change.changetime = max(it->change.changetime, (it + 1)->change.changetime); table_.erase(it); + merged = true; // start again it = table_.begin(); continue; @@ -282,45 +360,102 @@ void Changes::merge() ++it; } + if (merged && !isChanged()) + is_update_required_ = true; +} + + +namespace { + +docstring getLaTeXMarkup(docstring const & macro, docstring const & author, + docstring const & chgTime, + OutputParams const & runparams) +{ + if (macro.empty()) + return docstring(); + + docstring uncodable_author; + odocstringstream ods; + + ods << macro; + // convert utf8 author name to something representable + // in the current encoding + pair author_latexed = + runparams.encoding->latexString(author, runparams.dryrun); + if (!author_latexed.second.empty()) { + LYXERR0("Omitting uncodable characters '" + << author_latexed.second + << "' in change author name!"); + uncodable_author = author; + } + ods << author_latexed.first << "}{" << chgTime << "}{"; + + // warn user (once) if we found uncodable glyphs. + if (!uncodable_author.empty()) { + static std::set warned_authors; + static Mutex warned_mutex; + Mutex::Locker locker(&warned_mutex); + if (warned_authors.find(uncodable_author) == warned_authors.end()) { + frontend::Alert::warning(_("Uncodable character in author name"), + support::bformat(_("The author name '%1$s',\n" + "used for change tracking, contains the following glyphs that\n" + "cannot be represented in the current encoding: %2$s.\n" + "These glyphs will be omitted in the exported LaTeX file.\n\n" + "Choose an appropriate document encoding (such as utf8)\n" + "or change the spelling of the author name."), + uncodable_author, author_latexed.second)); + warned_authors.insert(uncodable_author); + } + } + + return ods.str(); } +} //namespace anon + -int Changes::latexMarkChange(odocstream & os, BufferParams const & bparams, - Change const & oldChange, Change const & change) +int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams, + Change const & oldChange, Change const & change, + OutputParams const & runparams) { - if (!bparams.outputChanges || oldChange == change) + if (!bparams.output_changes || oldChange == change) return 0; int column = 0; if (oldChange.type != Change::UNCHANGED) { - os << '}'; // close \lyxadded or \lyxdeleted + // close \lyxadded or \lyxdeleted + os << '}'; column++; + if (oldChange.type == Change::DELETED) + --runparams.inulemcmd; } docstring chgTime; - chgTime += ctime(&change.changetime); - chgTime.erase(chgTime.end() - 1); // remove trailing '\n' + chgTime += asctime(gmtime(&change.changetime)); + // remove trailing '\n' + chgTime.erase(chgTime.end() - 1); + docstring macro_beg; if (change.type == Change::DELETED) { - docstring str = "\\lyxdeleted{" + - bparams.authors().get(change.author).name() + "}{" + - chgTime + "}{"; - os << str; - column += str.size(); - } else if (change.type == Change::INSERTED) { - docstring str = "\\lyxadded{" + - bparams.authors().get(change.author).name() + "}{" + - chgTime + "}{"; - os << str; - column += str.size(); + macro_beg = from_ascii("\\lyxdeleted{"); + ++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); + + os << str; + column += str.size(); return column; } -void Changes::lyxMarkChange(ostream & os, int & column, +void Changes::lyxMarkChange(ostream & os, BufferParams const & bparams, int & column, Change const & old, Change const & change) { if (old == change) @@ -328,22 +463,22 @@ void Changes::lyxMarkChange(ostream & os, int & column, column = 0; + int const buffer_id = bparams.authors().get(change.author).bufferId(); + switch (change.type) { case Change::UNCHANGED: os << "\n\\change_unchanged\n"; break; - case Change::DELETED: { - os << "\n\\change_deleted " << change.author + case Change::DELETED: + os << "\n\\change_deleted " << buffer_id << " " << change.changetime << "\n"; break; - } - case Change::INSERTED: { - os << "\n\\change_inserted " << change.author + case Change::INSERTED: + os << "\n\\change_inserted " << buffer_id << " " << change.changetime << "\n"; break; - } } } @@ -357,4 +492,105 @@ void Changes::checkAuthors(AuthorList const & authorList) authorList.get(it->change.author).setUsed(true); } + +void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer, + bool output_active) const +{ + if (table_.empty()) + return; + + shared_ptr change_list = buffer.tocBackend().toc("change"); + AuthorList const & author_list = buffer.params().authors(); + DocIterator dit = cdit; + + ChangeTable::const_iterator it = table_.begin(); + ChangeTable::const_iterator const itend = table_.end(); + for (; it != itend; ++it) { + docstring str; + switch (it->change.type) { + case Change::UNCHANGED: + continue; + case Change::DELETED: + // ✂ U+2702 BLACK SCISSORS + str.push_back(0x2702); + break; + case Change::INSERTED: + // ✍ U+270D WRITING HAND + str.push_back(0x270d); + break; + } + dit.pos() = it->range.start; + Paragraph const & par = dit.paragraph(); + str += " " + par.asString(it->range.start, min(par.size(), it->range.end)); + if (it->range.end > par.size()) + // ¶ U+00B6 PILCROW SIGN + str.push_back(0xb6); + docstring const & author = author_list.get(it->change.author).name(); + Toc::iterator it = TocBackend::findItem(*change_list, 0, author); + if (it == change_list->end()) { + change_list->push_back(TocItem(dit, 0, author, true)); + change_list->push_back(TocItem(dit, 1, str, output_active)); + continue; + } + for (++it; it != change_list->end(); ++it) { + if (it->depth() == 0 && it->str() != author) + break; + } + change_list->insert(it, TocItem(dit, 1, str, output_active)); + } +} + + +void Changes::updateBuffer(Buffer const & buf) +{ + is_update_required_ = false; + if (!buf.areChangesPresent() && isChanged()) + buf.setChangesPresent(true); +} + + +void Change::paintCue(PainterInfo & pi, double const x1, double const y, + double const x2, FontInfo const & font) const +{ + if (!changed()) + return; + // Calculate 1/3 height of font + FontMetrics const & fm = theFontMetrics(font); + double const y_bar = deleted() ? y - fm.maxAscent() / 3 + : y + 2 * pi.base.solidLineOffset() + pi.base.solidLineThickness(); + pi.pain.line(int(x1), int(y_bar), int(x2), int(y_bar), color(), + Painter::line_solid, pi.base.solidLineThickness()); +} + + +void Change::paintCue(PainterInfo & pi, double const x1, double const y1, + double const x2, double const y2) const +{ + /* + * y1 / + * / + * / + * / + * / + * y2 /_____ + * x1 x2 + */ + double y = 0; + switch(type) { + case UNCHANGED: + return; + case INSERTED: + y = y2; + break; + case DELETED: + y = y1; + break; + } + // we cannot use antialias since we keep drawing on the same background + pi.pain.line(int(x1), int(y2), int(x2), int(y), + color(), Painter::line_solid_aliased, + pi.base.solidLineThickness()); +} + + } // namespace lyx