X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.h;h=75f6e0530f2a0c35e10c1c8100ac8d6f75b6169c;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=26abfd024aa0211fa09b69b269240e7ce6e3dba8;hpb=dcb9c3eabb55a987f11eb52967ab7845583e75db;p=lyx.git

diff --git a/src/buffer.h b/src/buffer.h
index 26abfd024a..75f6e0530f 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -80,7 +80,7 @@ public:
 
 	// FIXME: it's very silly to pass a lex in here
 	/// load a new file
-	bool readFile(LyXLex &, string const &);
+	bool readFile(string const &);
 
 	/// read the header, returns number of unknown tokens
 	int readHeader(LyXLex & lex);
@@ -141,14 +141,14 @@ public:
 	void makeLaTeXFile(string const & filename,
 			   string const & original_path,
 			   LatexRunParams const &,
-			   bool only_body = false,
-			   bool only_preamble = false);
+			   bool output_preamble = true,
+			   bool output_body = true);
 	///
 	void makeLaTeXFile(std::ostream & os,
 			   string const & original_path,
 			   LatexRunParams const &,
-			   bool only_body = false,
-			   bool only_preamble = false);
+			   bool output_preamble = true,
+			   bool output_body = true);
 	///
 	void simpleDocBookOnePar(std::ostream &,
 				 ParagraphList::iterator par, int & desc_on,
@@ -292,6 +292,8 @@ public:
 	AuthorList & authors();
 
 private:
+	bool do_writeFile(std::ostream & ofs) const;
+
 	typedef std::map<string, bool> DepClean;
 
 	/// need to regenerate .tex ?
@@ -315,8 +317,6 @@ private:
 	/// The path to the document file.
 	string filepath_;
 
-	/// Format number of buffer
-	int file_format;
 	///
 	boost::scoped_ptr<Messages> messages_;
 public:
@@ -324,10 +324,10 @@ public:
 	class inset_iterator {
 	public:
 		typedef std::input_iterator_tag iterator_category;
-		typedef Inset value_type;
+		typedef InsetOld value_type;
 		typedef ptrdiff_t difference_type;
-		typedef Inset * pointer;
-		typedef Inset & reference;
+		typedef InsetOld * pointer;
+		typedef InsetOld & reference;
 		typedef ParagraphList::iterator base_type;
 
 		///
@@ -387,7 +387,7 @@ public:
 	ParConstIterator par_iterator_end() const;
 
 	///
-	Inset * getInsetFromID(int id_arg) const;
+	InsetOld * getInsetFromID(int id_arg) const;
 };
 
 bool operator==(Buffer::inset_iterator const & iter1,