X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.h;h=280fc05c8d23b3eb5c279cd1e7115bb9c00f1fd0;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=d3c8d20e655a076334bb23c78fed8ab6157ee14a;hpb=e33bac93cde7248b51716488be4b5ef01e5bad16;p=lyx.git

diff --git a/src/buffer.h b/src/buffer.h
index d3c8d20e65..280fc05c8d 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -20,6 +20,8 @@
 
 #include "support/limited_stack.h"
 #include "support/types.h"
+#include "support/docstring.h"
+#include "support/docstream.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signal.hpp>
@@ -31,6 +33,9 @@
 #include <vector>
 
 
+namespace lyx {
+
+
 class BufferParams;
 class ErrorItem;
 class FuncRequest;
@@ -49,6 +54,7 @@ class ParConstIterator;
 class ParIterator;
 class TeXErrors;
 class TexRow;
+class TocBackend;
 class Undo;
 class StableDocIterator;
 
@@ -106,17 +112,19 @@ public:
 
 	///
 	void insertStringAsLines(ParagraphList & plist,
-		lyx::pit_type &, lyx::pos_type &,
-		LyXFont const &, lyx::docstring const &, bool);
+		pit_type &, pos_type &,
+		LyXFont const &, docstring const &, bool);
 	///
 	ParIterator getParFromID(int id) const;
 	/// do we have a paragraph with this id?
 	bool hasParWithID(int id) const;
 
+	/// This signal is emitted when the buffer is changed.
+	boost::signal<void(bool)> changed;
 	/// This signal is emitted when some parsing error shows up.
 	boost::signal<void(std::string)> errors;
 	/// This signal is emitted when some message shows up.
-	boost::signal<void(std::string)> message;
+	boost::signal<void(docstring)> message;
 	/// This signal is emitted when the buffer busy status change.
 	boost::signal<void(bool)> busy;
 	/// This signal is emitted when the buffer readonly status change.
@@ -138,18 +146,14 @@ public:
 	/// Write file. Returns \c false if unsuccesful.
 	bool writeFile(std::string const &) const;
 
-	///
-	void writeFileAscii(std::string const &, OutputParams const &);
-	///
-	void writeFileAscii(std::ostream &, OutputParams const &);
 	/// Just a wrapper for the method below, first creating the ofstream.
-	void makeLaTeXFile(std::string const & filename,
+	bool makeLaTeXFile(std::string const & filename,
 			   std::string const & original_path,
 			   OutputParams const &,
 			   bool output_preamble = true,
 			   bool output_body = true);
 	///
-	void writeLaTeXSource(std::ostream & os,
+	void writeLaTeXSource(odocstream & os,
 			   std::string const & original_path,
 			   OutputParams const &,
 			   bool output_preamble = true,
@@ -159,13 +163,15 @@ public:
 			     OutputParams const & runparams_in,
 			     bool only_body = false);
 	///
-	void writeDocBookSource(std::ostream & os, std::string const & filename,
+	void writeDocBookSource(odocstream & os, std::string const & filename,
 			     OutputParams const & runparams_in,
 			     bool only_body = false);
 	/// returns the main language for the buffer (document)
 	Language const * getLanguage() const;
 	/// get l10n translated to the buffers language
-	std::string const B_(std::string const & l10n) const;
+	docstring const B_(std::string const & l10n) const;
+	/// translate \p label to the buffer language if possible
+	docstring const translateLabel(docstring const & label) const;
 
 	///
 	int runChktex();
@@ -206,7 +212,7 @@ public:
 	*/
 	std::string const getLatexName(bool no_path = true) const;
 
-	/// Get the name and type of the log.
+	/// Get thee name and type of the log.
 	std::pair<LogType, std::string> const getLogName() const;
 
 	/// Change name of buffer. Updates "read-only" flag.
@@ -257,7 +263,7 @@ public:
 	/// of loaded child documents).
 	std::vector<std::string> const & getBibfilesCache() const;
 	///
-	void getLabelList(std::vector<std::string> &) const;
+	void getLabelList(std::vector<docstring> &) const;
 
 	///
 	void changeLanguage(Language const * from, Language const * to);
@@ -327,11 +333,12 @@ public:
 	///
 	void buildMacros();
 	///
-	bool hasMacro(std::string const & name) const;
+	bool hasMacro(docstring const & name) const;
 	///
-	MacroData const & getMacro(std::string const & name) const;
+	MacroData const & getMacro(docstring const & name) const;
 	///
-	void insertMacro(std::string const & name, MacroData const & data);
+	void insertMacro(docstring const & name, MacroData const & data);
+
 	///
 	void saveCursor(StableDocIterator cursor, StableDocIterator anchor);
 	///
@@ -339,10 +346,11 @@ public:
 	///
 	StableDocIterator getAnchor() const { return anchor_; }
 	///
-	void changeRefsIfUnique(std::string const & from, std::string const & to);
-	/// get source code (latex/docbook) for some paragraphs, or all paragraphs
-	/// including preamble
-	void getSourceCode(std::ostream & os, lyx::pit_type par_begin, lyx::pit_type par_end, bool full_source);
+	void changeRefsIfUnique(docstring const & from, docstring const & to,
+		InsetBase::Code code);
+/// get source code (latex/docbook) for some paragraphs, or all paragraphs
+/// including preamble
+	void getSourceCode(odocstream & os, pit_type par_begin, pit_type par_end, bool full_source);
 
 	/// errorLists_ accessors.
 	//@{
@@ -350,6 +358,11 @@ public:
 	ErrorList & errorList(std::string const & type);
 	//@}
 
+	//@{
+	TocBackend & tocBackend();
+	TocBackend const & tocBackend() const;
+	//@}
+
 private:
 	/** Inserts a file into a document
 	    \return \c false if method fails.
@@ -376,4 +389,7 @@ private:
 	std::map<std::string, ErrorList> errorLists_;
 };
 
+
+} // namespace lyx
+
 #endif