GuiDocument.cpp: remove unneeded conversion

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index b8ab8ba848aa158aa20708bcf53f105460f53869..40fee96f6090d3f6e6d686d845f3a988456bf10d 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -181,6 +181,8 @@ public:
        /* some LaTeX options */
        /// The graphics driver
        std::string graphicsDriver;
+       /// The default output format
+       std::string defaultOutputFormat;
        /// the rm font
        std::string fontsRoman;
        /// the sf font
@@ -189,6 +191,8 @@ public:
        std::string fontsTypewriter;
        /// the default family (rm, sf, tt)
        std::string fontsDefaultFamily;
+       /// use the XeTeX processor
+       bool useXetex;
        /// use expert Small Caps
        bool fontsSC;
        /// use Old Style Figures
@@ -250,6 +254,8 @@ public:
        PageSides sides;
        ///
        std::string pagestyle;
+       ///
+       RGBColor backgroundcolor;
        /// \param index should lie in the range 0 <= \c index <= 3.
        Bullet & temp_bullet(size_type index);
        Bullet const & temp_bullet(size_type index) const;
@@ -313,11 +319,14 @@ public:
        /// handle inputenc etc.
        void writeEncodingPreamble(odocstream & os, LaTeXFeatures & features,
                                              TexRow & texrow) const;
+       ///
+       std::string const parseFontName(std::string const & name) const;
        /// set up the document fonts
        std::string const loadFonts(std::string const & rm,
                                     std::string const & sf, std::string const & tt,
                                     bool const & sc, bool const & osf,
-                                    int const & sfscale, int const & ttscale) const;
+                                    int const & sfscale, int const & ttscale,
+                                    bool const & xetex) const;
 
        /// get the appropriate cite engine (natbib handling)
        CiteEngine citeEngine() const;
@@ -345,20 +354,6 @@ private:
        void readModules(Lexer &);
        ///
        void readRemovedModules(Lexer &);
-       /// Called when the document class changes. Removes modules
-       /// excluded by, provided by, etc, the document class.
-       /// \return true if modules were consistent, false if changes had
-       /// to be made.
-       bool removeBadModules();
-       /// Adds default modules, if they're addable.
-       void addDefaultModules();
-       /// checks for consistency among modules: makes sure requirements
-       /// are met, no modules exclude one another, etc, and resolves any
-       /// such conflicts, leaving us with a consistent collection.
-       /// \return true if modules were consistent, false if changes had
-       /// to be made.
-       bool checkModuleConsistency();
-
        /// for use with natbib
        CiteEngine cite_engine_;
        ///