X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.cpp;h=d24df403ccf07f478d54792b71cc781aac711466;hb=889182eb1a19da1cb4d5b5efeea434a5e6592ef0;hp=766b698a3ab6019fee063a62c6a0cfca40dc17ac;hpb=6b2232a29c682d8e62d1d2b963bb1a70bee4330b;p=lyx.git diff --git a/src/Changes.cpp b/src/Changes.cpp index 766b698a3a..d24df403cc 100644 --- a/src/Changes.cpp +++ b/src/Changes.cpp @@ -400,7 +400,7 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams, } docstring chgTime; - chgTime += ctime(&change.changetime); + chgTime += asctime(gmtime(&change.changetime)); // remove trailing '\n' chgTime.erase(chgTime.end() - 1); @@ -459,7 +459,8 @@ void Changes::checkAuthors(AuthorList const & authorList) } -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; @@ -481,8 +482,7 @@ void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer) const break; case Change::INSERTED: // 0x270d is the hand writting symbol in the Dingbats unicode group. - str.push_back(0x270d); - break; + str.push_back(0x270d); break; } dit.pos() = it->range.start; Paragraph const & par = dit.paragraph(); @@ -493,8 +493,8 @@ void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer) const 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, + change_list.push_back(TocItem(dit, 0, author, output_active)); + change_list.push_back(TocItem(dit, 1, str, output_active, support::wrapParas(str, 4))); continue; } @@ -502,7 +502,7 @@ void Changes::addToToc(DocIterator const & cdit, Buffer const & buffer) const 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))); } }