Turn an error message into a Debug::LOCALE warning

[lyx.git] / src / Changes.cpp

diff --git a/src/Changes.cpp b/src/Changes.cpp
index ea7c5c998ee63da630e8e838dedee1a78fb4cebc..39f2a8ebc75a8d0b947ea9d60538ea6ff948d931 100644 (file)
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -340,6 +340,7 @@ void Changes::merge()
 
 
 namespace {
+
 docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
                         docstring const & chgTime,
                         OutputParams const & runparams)
@@ -347,6 +348,7 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
        if (macro.empty())
                return docstring();
 
+       // FIXME THREAD
        static docstring warned_author = docstring();
        docstring uncodable_author = warned_author;
        odocstringstream ods;
@@ -379,6 +381,7 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
 
        return ods.str();
 }
+
 } //namespace anon
 
 
@@ -386,7 +389,7 @@ 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;
@@ -395,16 +398,20 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams,
                // 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{");
        
@@ -457,7 +464,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;
@@ -479,8 +487,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();
@@ -491,8 +498,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;
                }
@@ -500,7 +507,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)));
        }
 }