Do not check for LaTeX fonts if we use nonTeXFont

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 772f42de84924d4d97e0c05e6433f76e9a66e0c2..306e5bc3d2691383193de70b95a5bf5db697b8f8 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -16,6 +16,7 @@
 #define BUFFERPARAMS_H
 
 #include "Citation.h"
+#include "DocumentClassPtr.h"
 #include "Format.h"
 #include "LayoutModuleList.h"
 #include "OutputParams.h"
@@ -123,17 +124,21 @@ public:
        bool setBaseClass(std::string const & classname);
        /// Adds the module information to the baseClass information to
        /// create our local DocumentClass.
+       /// NOTE: This should NEVER be called externally unless one immediately goes
+       /// on to class BufferView::updateDocumentClass(). The exception, of course,
+       /// is in GuiDocument, where we use a BufferParams simply to hold a copy of
+       /// the parameters from the active Buffer.
        void makeDocumentClass();
        /// Returns the DocumentClass currently in use: the BaseClass as modified
        /// by modules.
        DocumentClass const & documentClass() const;
        /// \return A pointer to the DocumentClass currently in use: the BaseClass
        /// as modified by modules.
-       DocumentClass const * documentClassPtr() const;
+       DocumentClassConstPtr  documentClassPtr() const;
        /// This bypasses the baseClass and sets the textClass directly.
        /// Should be called with care and would be better not being here,
        /// but it seems to be needed by CutAndPaste::putClipboard().
-       void setDocumentClass(DocumentClass const * const);
+       void setDocumentClass(DocumentClassConstPtr);
        /// List of modules in use
        LayoutModuleList const & getModules() const { return layout_modules_; }
        /// List of default modules the user has removed
@@ -195,6 +200,9 @@ public:
        /// returns the main font for the buffer (document)
        Font const getFont() const;
 
+       /// translate quote style string to enum value
+       InsetQuotes::QuoteLanguage getQuoteStyle(std::string const qs) const;
+
        /* these are for the PaperLayout */
        /// the papersize
        PAPER_SIZE papersize;
@@ -240,6 +248,8 @@ public:
        std::string fonts_sans;
        /// the tt font
        std::string fonts_typewriter;
+       /// the math font
+       std::string fonts_math;
        /// the default family (rm, sf, tt)
        std::string fonts_default_family;
        /// use the fonts of the OS (OpenType, True Type) directly
@@ -398,12 +408,7 @@ public:
        ///
        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,
-                                    bool const & use_nonlatexfonts,
-                                    LaTeXFeatures & features) const;
+       std::string const loadFonts(LaTeXFeatures & features) const;
 
        /// the cite engine modules
        LayoutModuleList const & citeEngine() const
@@ -500,7 +505,7 @@ private:
        /// the type of cite engine (authoryear or numerical)
        CiteEngineType cite_engine_type_;
        ///
-       DocumentClass * doc_class_;
+       DocumentClassPtr doc_class_;
        ///
        LayoutModuleList layout_modules_;
        /// this is for modules that are required by the document class but that