X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.h;h=19c6680a7ebe6676935ed6c54d2aacec3d780151;hb=5d3718cad2a2ef6a4d6a495054ab0705ba27b6b5;hp=d4bddd69381a350faaaaedaca15ed23b313ef062;hpb=e93e806dd595881bb0b82bd8f03d95e551a21988;p=lyx.git

diff --git a/src/buffer.h b/src/buffer.h
index d4bddd6938..19c6680a7e 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -13,10 +13,6 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "LString.h"
 #include "undo.h"
 #include "support/limited_stack.h"
@@ -26,29 +22,18 @@
 #include "texrow.h"
 #include "ParagraphList.h"
 #include "paragraph.h"
+#include "author.h"
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 
 class BufferView;
-class Counters;
 class LyXRC;
 class TeXErrors;
 class LaTeXFeatures;
 class Language;
 class ParIterator;
+class ParConstIterator;
 
-#define NO_COMPABILITY 1
-
-///
-struct DEPCLEAN {
-	///
-	bool clean;
-	///
-	string master;
-	///
-	DEPCLEAN * next;
-};
 
 /** The buffer object.
   This is the buffer object. It contains all the informations about
@@ -111,7 +96,7 @@ public:
 	    \param par if != 0 insert the file.
 	    \return \c false if method fails.
 	*/
-	bool readFile(LyXLex &, Paragraph * par = 0);
+	bool readFile(LyXLex &, string const &, Paragraph * par = 0);
 
 	/** Reads a file without header.
 	    \param par if != 0 insert the file.
@@ -128,13 +113,6 @@ public:
 	///
 	void insertStringAsLines(Paragraph *&, lyx::pos_type &,
 				 LyXFont const &, string const &) const;
-#ifndef NO_COMPABILITY
-	///
-	Inset * isErtInset(Paragraph * par, int pos) const;
-	///
-	void insertErtContents(Paragraph * par, int & pos,
-			       bool set_inactive = true);
-#endif
 	///
 	Paragraph * getParFromID(int id) const;
 private:
@@ -187,12 +165,6 @@ public:
 	///
 	void makeDocBookFile(string const & filename,
 			     bool nice, bool only_body = false);
-	/// Open SGML/XML tag.
-	int sgmlOpenTag(std::ostream & os, Paragraph::depth_type depth, bool mixcont,
-		string const & latexname) const;
-	/// Closes SGML/XML tag.
-	int sgmlCloseTag(std::ostream & os, Paragraph::depth_type depth, bool mixcont,
-		string const & latexname) const;
 	///
 	void sgmlError(Paragraph * par, int pos, string const & message) const;
 
@@ -275,8 +247,6 @@ public:
 	*/
 	void validate(LaTeXFeatures &) const;
 
-	///
-	string const getIncludeonlyList(char delim = ',');
 	///
 	std::vector<std::pair<string, string> > const getBibkeyList() const;
 	///
@@ -319,10 +289,19 @@ public:
 
 	/// Used when typesetting to place errorboxes.
 	TexRow texrow;
-	/// Buffer-wide counter array
-	Counters & counters() const;
+
+	/// the author list for the document
+	AuthorList & authors();
 
 private:
+	typedef std::map<string, bool> DepClean;
+
+	/// need to regenerate .tex ?
+	DepClean dep_clean_;
+ 
+	/// the author list
+	AuthorList authorlist;
+
 	/// is save needed
 	mutable bool lyx_clean;
 
@@ -332,9 +311,6 @@ private:
 	/// is this a unnamed file (New...)
 	bool unnamed;
 
-	/// is regenerating #.tex# necessary
-	DEPCLEAN * dep_clean;
-
 	/// buffer is r/o
 	bool read_only;
 
@@ -354,10 +330,6 @@ private:
 	    of the buffers in the list of users to do a #updateLayoutChoice#.
 	*/
 	BufferView * users;
-
-	/// The pointer is const although its contents may not be
-	boost::scoped_ptr<Counters> const ctrs;
-
 public:
 	///
 	class inset_iterator {
@@ -427,7 +399,11 @@ public:
 	///
 	ParIterator par_iterator_begin();
 	///
+	ParConstIterator par_iterator_begin() const;
+	///
 	ParIterator par_iterator_end();
+	///
+	ParConstIterator par_iterator_end() const;
 
 	///
 	Inset * getInsetFromID(int id_arg) const;