cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / bufferparams.h

diff --git a/src/bufferparams.h b/src/bufferparams.h
index bfbaf7c936d45aac2ec900fe4c8505c986502f5a..4be55bdf4c3bfb9953ab6df9dd5ee2bd69a6de22 100644 (file)
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -147,8 +147,22 @@ public:
        /* some LaTeX options */
        /// The graphics driver
        std::string graphicsDriver;
-       ///
-       std::string fonts;
+       /// the rm font
+       std::string fontsRoman;
+       /// the sf font
+       std::string fontsSans;
+       /// the tt font
+       std::string fontsTypewriter;
+       /// the default family (rm, sf, tt)
+       std::string fontsDefaultFamily;
+       /// use expert Small Caps
+       bool fontsSC;
+       /// use Old Style Figures
+       bool fontsOSF;
+       /// the scale factor of the sf font
+       int fontsSansScale;
+       /// the scale factor of the tt font
+       int fontsTypewriterScale;
        ///
        Spacing & spacing();
        Spacing const & spacing() const;
@@ -161,7 +175,15 @@ public:
        /// BranchList:
        BranchList & branchlist();
        BranchList const & branchlist() const;
-       ///
+       /**
+        * The input encoding for LaTeX. This can be one of
+        * - auto: find out the input encoding from the used languages
+        * - default: Don't load the inputenc package and hope that it will
+        *   work (unlikely)
+        * - any encoding supported by the inputenc package
+        * The encoding of the LyX file is always utf8 and has nothing to
+        * do with this setting.
+        */
        std::string inputenc;
        ///
        std::string preamble;
@@ -205,7 +227,7 @@ public:
        bool use_bibtopic;
        /// revision tracking for this buffer ?
        bool tracking_changes;
-       /** This param decides if change tracking marks should be output
+       /** This param decides whether change tracking marks should be output
         *  (using the dvipost package) or if the current "state" of the
         *  document should be output instead. Since dvipost needs dvi
         *  specials, it only works with dvi/ps output (the param will be
@@ -223,13 +245,18 @@ public:
        AuthorList const & authors() const;
 
        /// map of the file's author IDs to buffer author IDs
-       std::vector<int> author_map;
+       std::vector<unsigned int> author_map;
        ///
        std::string const dvips_options() const;
        ///
        std::string const paperSizeName() const;
        ///
        std::string const babelCall(std::string const & lang_opts) const;
+       /// set up the document fonts
+       std::string const loadFonts(LaTeXFeatures & features, 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;
        /// path of the current buffer
        std::string filepath;