#include "Author.h"
#include "Buffer.h"
#include "BufferParams.h"
+#include "Encoding.h"
#include "LaTeXFeatures.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 <ostream>
}
-ColorCode Change::color() const
+Color Change::color() const
{
- ColorCode color = Color_none;
+ Color color = Color_none;
switch (author % 5) {
case 0:
color = Color_changedtextauthor1;
color = Color_changedtextauthor5;
break;
}
+
+ if (deleted())
+ color.mergeColor = Color_deletedtextmodifier;
+
return color;
}
}
+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();
}
-int Changes::latexMarkChange(odocstream & os, BufferParams const & bparams,
- Change const & oldChange, Change const & change)
+namespace {
+
+docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
+ docstring const & chgTime,
+ OutputParams const & runparams)
{
- if (!bparams.outputChanges || oldChange == change)
+ if (macro.empty())
+ return docstring();
+
+ docstring uncodable_author;
+ odocstringstream ods;
+
+ ods << macro;
+ // convert utf8 author name to something representable
+ // in the current encoding
+ pair<docstring, docstring> 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<docstring> 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(otexstream & os, BufferParams const & bparams,
+ Change const & oldChange, Change const & change,
+ OutputParams const & runparams)
+{
+ 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)
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;
- }
}
}
}
-void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer) const
+void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer,
+ bool output_active) const
{
if (table_.empty())
return;
- Toc & change_list = buffer.tocBackend().toc("change");
+ shared_ptr<Toc> change_list = buffer.tocBackend().toc("change");
AuthorList const & author_list = buffer.params().authors();
DocIterator dit = cdit;
case Change::UNCHANGED:
continue;
case Change::DELETED:
- // 0x2702 is a scissors symbol in the Dingbats unicode group.
+ // ✂ U+2702 BLACK SCISSORS
str.push_back(0x2702);
break;
case Change::INSERTED:
- // 0x270d is the hand writting symbol in the Dingbats unicode group.
+ // ✍ U+270D WRITING HAND
str.push_back(0x270d);
break;
}
Paragraph const & par = dit.paragraph();
str += " " + par.asString(it->range.start, min(par.size(), it->range.end));
if (it->range.end > par.size())
- // the end of paragraph symbol from the Punctuation group
- str.push_back(0x204B);
+ // ¶ U+00B6 PILCROW SIGN
+ str.push_back(0xb6);
docstring const & author = author_list.get(it->change.author).name();
- Toc::iterator it = change_list.item(0, author);
- if (it == change_list.end()) {
- change_list.push_back(TocItem(dit, 0, author));
- change_list.push_back(TocItem(dit, 1, str));
+ Toc::iterator it = change_list->item(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,
+ support::wrapParas(str, 4)));
continue;
}
- for (++it; it != change_list.end(); ++it) {
+ for (++it; it != change_list->end(); ++it) {
if (it->depth() == 0 && it->str() != author)
break;
}
- change_list.insert(it, TocItem(dit, 1, str));
+ change_list->insert(it, TocItem(dit, 1, str, output_active,
+ support::wrapParas(str, 4)));
}
}
projects / lyx.git / blobdiff