Kornel's gcc compile fix.

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index b8ab8ba848aa158aa20708bcf53f105460f53869..0be946c37f42ee1a0c6d4eec607256b06e0e983d 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -25,6 +25,7 @@
 #include "support/copied_ptr.h"
 
 #include <list>
+#include <map>
 #include <vector>
 
 namespace lyx {
@@ -36,6 +37,8 @@ class BranchList;
 class Bullet;
 class DocumentClass;
 class Encoding;
+class HSpace;
+class IndicesList;
 class Language;
 class LatexFeatures;
 class LayoutFile;
@@ -88,6 +91,10 @@ public:
        ///
        bool hasClassDefaults() const;
 
+       ///
+       HSpace const & getIndentation() const;
+       ///
+       void setIndentation(HSpace const & indent);
        ///
        VSpace const & getDefSkip() const;
        ///
@@ -181,6 +188,12 @@ public:
        /* some LaTeX options */
        /// The graphics driver
        std::string graphicsDriver;
+       /// The default output format
+       std::string defaultOutputFormat;
+       /// customized bibliography processor
+       std::string bibtex_command;
+       /// customized index processor
+       std::string index_command;
        /// the rm font
        std::string fontsRoman;
        /// the sf font
@@ -189,6 +202,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
@@ -211,6 +226,9 @@ public:
        /// BranchList:
        BranchList & branchlist();
        BranchList const & branchlist() const;
+       /// IndicesList:
+       IndicesList & indiceslist();
+       IndicesList const & indiceslist() const;
        /**
         * The input encoding for LaTeX. This can be one of
         * - \c auto: find out the input encoding from the used languages
@@ -241,6 +259,8 @@ public:
        ///
        std::string master;
        ///
+       bool suppress_date;
+       ///
        std::string float_placement;
        ///
        unsigned int columns;
@@ -250,6 +270,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;
@@ -272,8 +294,10 @@ public:
        Package use_amsmath;
        /// Whether and how to load esint
        Package use_esint;
-       ///
+       /// Split bibliography?
        bool use_bibtopic;
+       /// Split the index?
+       bool use_indices;
        /// revision tracking for this buffer ?
        bool trackChanges;
        /** This param decides whether change tracking marks should be used
@@ -288,8 +312,8 @@ public:
        AuthorList & authors();
        AuthorList const & authors() const;
 
-       /// map of the file's author IDs to buffer author IDs
-       std::vector<unsigned int> author_map;
+       /// map of the file's author IDs to AuthorList indexes
+       std::map<unsigned int, int> author_map;
        ///
        std::string const dvips_options() const;
        /** The return value of paperSizeName() depends on the
@@ -313,11 +337,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 +372,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_;
        ///