X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclass.h;h=45cb28f7e1c72498c7d124c0189b88658e32b383;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=57345d8353b352615bb15b29688f45cf2faa956c;hpb=8e7bbcba29cabe45122f57260cad75b83556d6c0;p=lyx.git

diff --git a/src/lyxtextclass.h b/src/lyxtextclass.h
index 57345d8353..45cb28f7e1 100644
--- a/src/lyxtextclass.h
+++ b/src/lyxtextclass.h
@@ -17,6 +17,9 @@
 
 #include <vector>
 
+
+namespace lyx {
+
 class LyXLex;
 class Counters;
 class FloatList;
@@ -31,7 +34,7 @@ public:
 	std::string latexparam;
 	LyXFont font;
 	LyXFont labelfont;
-	std::string preamble;
+	docstring preamble;
 };
 
 
@@ -84,7 +87,7 @@ public:
 	LyXLayout_ptr const & operator[](std::string const & vname) const;
 
 	/// Sees to that the textclass structure has been loaded
-	bool load(std::string const & path=std::string()) const;
+	bool load(std::string const & path = std::string()) const;
 	/// Has this layout file been loaded yet?
 	bool loaded() const { return loaded_; }
 
@@ -119,7 +122,7 @@ public:
 	///
 	std::string const & pagestyle() const;
 	///
-	std::string const & preamble() const;
+	docstring const & preamble() const;
 
 	/// Packages that are already loaded by the class
 	enum Provides {
@@ -153,7 +156,7 @@ public:
 	///
 	int tocdepth() const;
 
-	/// Can be LaTeX, LinuxDoc, etc.
+	/// Can be LaTeX, DocBook, etc.
 	OutputType outputType() const;
 
 	///
@@ -202,7 +205,7 @@ private:
 	///
 	std::string defaultlayout_;
 	/// preamble text to support layout styles
-	std::string preamble_;
+	docstring preamble_;
 	/// latex packages loaded by document class.
 	Provides provides_;
 	///
@@ -213,7 +216,7 @@ private:
 	int secnumdepth_;
 	/// header depth to appear in table of contents
 	int tocdepth_;
-	/// Can be LaTeX, LinuxDoc, etc.
+	/// Can be LaTeX, DocBook, etc.
 	OutputType outputType_;
 	/** Base font. The paragraph and layout fonts are resolved against
 	    this font. This has to be fully instantiated. Attributes
@@ -267,4 +270,7 @@ void operator|=(LyXTextClass::Provides & p1, LyXTextClass::Provides p2)
 /// convert page sides option to text 1 or 2
 std::ostream & operator<<(std::ostream & os, LyXTextClass::PageSides p);
 
+
+} // namespace lyx
+
 #endif