namespace {
+
docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
docstring const & chgTime,
OutputParams const & runparams)
if (macro.empty())
return docstring();
+ // FIXME THREAD
static docstring warned_author = docstring();
docstring uncodable_author = warned_author;
odocstringstream ods;
return ods.str();
}
+
} //namespace anon
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;
// close \lyxadded or \lyxdeleted
os << '}';
column++;
+ if (oldChange.type == Change::DELETED)
+ --runparams.inulemcmd;
}
docstring chgTime;
- chgTime += ctime(&change.changetime);
+ chgTime += asctime(gmtime(&change.changetime));
// remove trailing '\n'
chgTime.erase(chgTime.end() - 1);
docstring macro_beg;
- if (change.type == Change::DELETED)
+ if (change.type == Change::DELETED) {
macro_beg = from_ascii("\\lyxdeleted{");
+ ++runparams.inulemcmd;
+ }
else if (change.type == Change::INSERTED)
macro_beg = from_ascii("\\lyxadded{");
}
-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;
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();
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;
}
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)));
}
}