X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FAuthor.cpp;h=f1d346ea75619429cebd664ee4ea620097eb4f93;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=4f2f13f7f93251a9bb6a224566f241aa1d6abd0d;hpb=9abb7db46800e554f57e865a3e768602ffd9d6f1;p=lyx.git

diff --git a/src/Author.cpp b/src/Author.cpp
index 4f2f13f7f9..f1d346ea75 100644
--- a/src/Author.cpp
+++ b/src/Author.cpp
@@ -12,10 +12,10 @@
 
 #include "Author.h"
 
+#include "support/lassert.h"
 #include "support/lstrings.h"
 
-#include <boost/assert.hpp>
-
+#include <algorithm>
 #include <istream>
 
 using namespace std;
@@ -23,6 +23,24 @@ using namespace lyx::support;
 
 namespace lyx {
 
+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_);
+}
+
 
 bool operator==(Author const & l, Author const & r)
 {
@@ -33,13 +51,16 @@ bool operator==(Author const & l, Author const & r)
 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_)
+			<< "\" " << to_utf8(a.email_);
+		
 	return os;
 }
 
 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)));
@@ -48,6 +69,11 @@ istream & operator>>(istream & is, Author & a)
 }
 
 
+bool author_smaller(Author const & lhs, Author const & rhs) {
+	return lhs.bufferId() < rhs.bufferId();
+}
+
+
 AuthorList::AuthorList()
 	: last_id_(0)
 {
@@ -56,32 +82,42 @@ AuthorList::AuthorList()
 
 int AuthorList::record(Author const & a)
 {
+	// 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 (authors_.size() > 0 && a == authors_[0])
+		authors_[0].setBufferId(a.bufferId());
+
 	Authors::const_iterator it(authors_.begin());
 	Authors::const_iterator itend(authors_.end());
-
-	for (;  it != itend; ++it) {
-		if (it->second == a)
-			return it->first;
+	for (int i = 0;  it != itend; ++it, ++i) {
+		if (*it == a)
+			return i;
 	}
-
-	authors_[last_id_++] = a;
-	return last_id_ - 1;
+	authors_.push_back(a);
+	return last_id_++;
 }
 
 
 void AuthorList::record(int id, Author const & a)
 {
-	BOOST_ASSERT(unsigned(id) < authors_.size());
+	LASSERT(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_[id];
 }
 
 
@@ -97,4 +133,25 @@ 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 a_end = sorted.end();
+	
+	for (a_it = sorted.begin(); a_it != a_end; ++a_it) {
+		if (a_it->used())
+			os << "\\author " << *a_it << "\n";	
+	}
+	return os;
+}
+
+
 } // namespace lyx