X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FAuthor.h;h=798cfd80433499f236c2462645ab42e33cbc705e;hb=4ed0312c51704780af1c452d3a82a84171b3725a;hp=3bfefaaba0022d46f097337fcc7abf480530a580;hpb=94959709b957eb499d90f092325db0988c1c2ae0;p=lyx.git

diff --git a/src/Author.h b/src/Author.h
index 3bfefaaba0..798cfd8043 100644
--- a/src/Author.h
+++ b/src/Author.h
@@ -22,34 +22,46 @@ namespace lyx {
 class Author {
 public:
 	///
-	Author() {}
+	Author() : used_(false), buffer_id_(0) {}
 	///
-	Author(docstring const & name, docstring const & email)
-		: name_(name), email_(email), used_(true), buffer_id_(0) {}
+	Author(docstring const & name, docstring const & email,
+	       docstring const & initials);
+	/// For when the \author line is missing (#9854)
+	Author(int buffer_id);
 	///
 	docstring name() const { return name_; }
 	///
 	docstring email() const { return email_; }
 	///
-	unsigned int buffer_id() const { return buffer_id_; }
+	docstring initials() const { return initials_; }
 	///
-	void setBufferId(unsigned int buffer_id) const { buffer_id_ = buffer_id; }
+	docstring nameAndEmail() const;
+	///
+	int bufferId() const { return buffer_id_; }
+	///
+	void setBufferId(int buffer_id) const { buffer_id_ = buffer_id; }
 	///
 	void setUsed(bool u) const { used_ = u; }
 	///
 	bool used() const { return used_; }
+	/// Was the author line not missing?
+	bool valid() const;
 	///
 	friend std::istream & operator>>(std::istream & os, Author & a);
+	///
+	friend std::ostream & operator<<(std::ostream & os, Author const & a);
 
 private:
 	/// The author's name
 	docstring name_;
 	/// The author's email address
 	docstring email_;
+	/// The author's initials
+	docstring initials_;
 	///
 	mutable bool used_;
 	/// The id of the author in the lyx-file
-	mutable unsigned int buffer_id_;
+	mutable int buffer_id_;
 };
 
 
@@ -62,12 +74,14 @@ public:
 	///
 	void record(int id, Author const & a);
 	///
-	Author const & get(int id) const;
+	void recordCurrentAuthor(Author const & a);
 	///
-	typedef std::vector<Author> Authors;
+	Author const & get(int id) const;
 	///
 	void sort();
 	///
+	typedef std::vector<Author> Authors;
+	///
 	Authors::const_iterator begin() const;
 	///
 	Authors::const_iterator end() const;
@@ -75,8 +89,6 @@ public:
 	friend
 	std::ostream & operator<<(std::ostream & os, AuthorList const & a);
 private:
-	///
-	int last_id_;
 	///
 	Authors authors_;
 };