Account for old versions of Pygments

[lyx.git] / src / Author.cpp

diff --git a/src/Author.cpp b/src/Author.cpp
index 44acfbc60582c449765109057d557fa49db262a2..03025a38aa9910f8695039fa6b3d56a497f31c4f 100644 (file)
--- a/src/Author.cpp
+++ b/src/Author.cpp
@@ -12,18 +12,57 @@
 
 #include "Author.h"
 
+#include "support/convert.h"
+#include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 
-#include <boost/assert.hpp>
-
+#include <algorithm>
 #include <istream>
 
-using std::string;
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::token;
-using support::trim;
+static int computeHash(docstring const & name,
+       docstring const & email)
+{
+       string const full_author_string = to_utf8(name + email);
+       // Bernstein's hash function
+       unsigned int hash = 5381;
+       for (unsigned int i = 0; i < full_author_string.length(); ++i)
+               hash = ((hash << 5) + hash) + (unsigned int)(full_author_string[i]);
+       return int(hash);
+}
+
+
+Author::Author(docstring const & name, docstring const & email)
+       : name_(name), email_(email), used_(true),
+         buffer_id_(computeHash(name, email))
+{}
+
+
+Author::Author(int buffer_id)
+       : name_(convert<docstring>(buffer_id)), email_(docstring()), used_(false),
+         buffer_id_(buffer_id)
+{}
+
+
+docstring Author::nameAndEmail() const
+{
+       if (email().empty())
+               return name();
+       else
+               return bformat(_("%1$s[[name]] (%2$s[[email]])"), name(), email());
+}
+
+
+bool Author::valid() const
+{
+       //this cannot be equal if the buffer_id was produced by the hash function.
+       return name_ != convert<docstring>(buffer_id_);
+}
 
 
 bool operator==(Author const & l, Author const & r)
@@ -32,16 +71,21 @@ bool operator==(Author const & l, Author const & r)
 }
 
 
-std::ostream & operator<<(std::ostream & os, Author const & a)
+ostream & operator<<(ostream & os, Author const & a)
 {
        // FIXME UNICODE
-       os << "\"" << to_utf8(a.name()) << "\" " << to_utf8(a.email());
+       os << a.buffer_id_ << " \"" << to_utf8(a.name_) << "\"";
+       if (!a.email_.empty())
+               os << " " << to_utf8(a.email_);
+
        return os;
 }
 
-std::istream & operator>>(std::istream & is, Author & a)
+
+istream & operator>>(istream & is, Author & a)
 {
        string s;
+       is >> a.buffer_id_;
        getline(is, s);
        // FIXME UNICODE
        a.name_ = from_utf8(trim(token(s, '\"', 1)));
@@ -50,40 +94,64 @@ std::istream & operator>>(std::istream & is, Author & a)
 }
 
 
-AuthorList::AuthorList()
-       : last_id_(0)
+bool author_smaller(Author const & lhs, Author const & rhs)
 {
+       return lhs.bufferId() < rhs.bufferId();
 }
 
 
+AuthorList::AuthorList()
+{}
+
+
 int AuthorList::record(Author const & a)
 {
-       Authors::const_iterator it(authors_.begin());
-       Authors::const_iterator itend(authors_.end());
-
-       for (;  it != itend; ++it) {
-               if (it->second == a)
-                       return it->first;
+       bool const valid = a.valid();
+       // If we record an author which equals the current
+       // author, we copy the buffer_id, so that it will
+       // keep the same id in the file.
+       if (valid && !authors_.empty() && a == authors_[0])
+               authors_[0].setBufferId(a.bufferId());
+
+       Authors::const_iterator it = authors_.begin();
+       Authors::const_iterator const beg = it;
+       Authors::const_iterator const end = authors_.end();
+       for (; it != end; ++it) {
+               if (valid && *it == a)
+                       return it - beg;
+               if (it->bufferId() == a.bufferId()) {
+                       int id = it - beg;
+                       if (!it->valid())
+                               // we need to handle the case of a valid author being registred
+                               // after an invalid one. For instance, because "buffer-reload"
+                               // does not clear the buffer's author list.
+                               record(id, a);
+                       return id;
+               }
        }
-
-       authors_[last_id_++] = a;
-       return last_id_ - 1;
+       authors_.push_back(a);
+       return authors_.size() - 1;
 }
 
 
 void AuthorList::record(int id, Author const & a)
 {
-       BOOST_ASSERT(unsigned(id) < authors_.size());
-
+       LBUFERR(unsigned(id) < authors_.size());
        authors_[id] = a;
 }
 
 
+void AuthorList::recordCurrentAuthor(Author const & a)
+{
+       // current author has id 0
+       record(0, a);
+}
+
+
 Author const & AuthorList::get(int id) const
 {
-       Authors::const_iterator it(authors_.find(id));
-       BOOST_ASSERT(it != authors_.end());
-       return it->second;
+       LASSERT(id < (int)authors_.size() , return authors_[0]);
+       return authors_[id];
 }
 
 
@@ -99,4 +167,27 @@ AuthorList::Authors::const_iterator AuthorList::end() const
 }
 
 
+void AuthorList::sort()
+{
+       std::sort(authors_.begin(), authors_.end(), author_smaller);
+}
+
+
+ostream & operator<<(ostream & os, AuthorList const & a)
+{
+       // Copy the authorlist, because we don't want to sort the original
+       AuthorList sorted = a;
+       sorted.sort();
+
+       AuthorList::Authors::const_iterator a_it = sorted.begin();
+       AuthorList::Authors::const_iterator const a_end = sorted.end();
+
+       for (; a_it != a_end; ++a_it) {
+               if (a_it->used() && a_it->valid())
+                       os << "\\author " << *a_it << "\n";     
+       }
+       return os;
+}
+
+
 } // namespace lyx