X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.h;h=8c3cd68b9ab81533781025c285766b17bcf7568e;hb=f448e22d483e1370bcbfbb7be8cb47ad7251ed77;hp=1446ebe64a55c39a0e08ad3c96b3406ebbb17cf9;hpb=38f5ce268a94c6d47f77fbdd6b6dd9c8bd34b7f6;p=lyx.git

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 1446ebe64a..8c3cd68b9a 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -21,27 +21,28 @@
 #include <set>
 
 #include "LString.h"
+#include "layout.h"
 
 class BufferParams; 
-class LyXTextClass;
 struct Language;
 
 /** The packages and commands that a buffer needs. This struct
-  contains an entry for each of the latex packages and
-  commands that a buffer might need. This struct is supposed to be
-  extended as the need arises. Remember to update the validate function
-  in buffer.C and paragraph.C when you do so. */
+    contains an entry for each of the latex packages and
+    commands that a buffer might need. This struct is supposed to be
+    extended as the need arises. Remember to update the validate function
+    in buffer.C and paragraph.C when you do so.
+*/
 struct LaTeXFeatures {
 	///
-	LaTeXFeatures(BufferParams const &, int n) ;
+	LaTeXFeatures(BufferParams const &, LyXTextClass::size_type n) ;
 	/// The packaes needed by the document
-	string getPackages();
+	string const getPackages();
 	/// The macros definitions needed by the document
-	string getMacros();
+	string const getMacros();
 	/// The definitions needed by the document's textclass
-	string getTClassPreamble();
+	string const getTClassPreamble();
 	///
-	string getIncludedFiles();
+	string const getIncludedFiles(string const fname) const;
 
 	///
 	void showStruct();
@@ -52,17 +53,14 @@ struct LaTeXFeatures {
 	/// Static preamble bits from the external material insets
 	string externalPreambles;
 
-	//@Man: Packages
-	//@{
+	///
+	bool array;
 	///
 	bool color;     // color.sty
-#ifdef USE_GRAPHICX
 	///
 	bool graphicx; // graphicx.sty
-#else
 	///
 	bool graphics;  // graphics.sty
-#endif
 	///
 	bool setspace;  // setspace.sty
 	///
@@ -93,11 +91,7 @@ struct LaTeXFeatures {
 	bool prettyref; // prettyref.sty
 	///
 	bool chess;	// chess.sty
-	//@}
 
-	
-	//@Man: Commands
-	//@{
 	///
 	bool lyx;
 	///
@@ -106,10 +100,7 @@ struct LaTeXFeatures {
 	bool noun;
 	/// \lyxarrow
 	bool lyxarrow;
-	//@}
-	
-	//@Man: Quotes
-	//@{
+
 	///
 	bool quotesinglbase;
 	///
@@ -122,25 +113,17 @@ struct LaTeXFeatures {
 	bool guillemotleft;
 	///
 	bool guillemotright;
-	//@}
-	
-	//@Man: Math mode
-	//@{
+
 	///
 	bool amsstyle;
 	///
 	bool boldsymbol;
 	///
 	bool binom;
-	//@}
 	
-	//@Man: Layouts
-	//@{
 	std::vector<bool> layout;
-	//@}
-	
-	//@Man: Special features
-	//@{
+
+	///
 	bool LyXParagraphIndent;
 	///
 	bool NeedLyXFootnoteCode;
@@ -155,12 +138,13 @@ struct LaTeXFeatures {
 	///
 	FloatList usedFloats;
 	///
-	typedef map<string , string> FileMap;
+	typedef std::map<string , string> FileMap;
+	///
+	FileMap IncludedFiles;
 	///
-	FileMap IncludedFiles;                                                                     
-	//@}
 	BufferParams const & bufferParams() const;
 private:
+	///
 	BufferParams const & params;
 };