Track whether we have warned about mixing layouts across e.g. branches.

[lyx.git] / src / LaTeXFonts.h

diff --git a/src/LaTeXFonts.h b/src/LaTeXFonts.h
index 50ec71ad907dc04d13671eddc9cc2a45c78a41f3..481c2f78cb4f48e40ccdf2d2916a4a53a234581f 100644 (file)
--- a/src/LaTeXFonts.h
+++ b/src/LaTeXFonts.h
@@ -48,8 +48,6 @@ public:
        docstring const & ot1font() { return ot1font_; }
        /// A font that provides Old Style Figures for this type face
        docstring const & osffont() { return osffont_; }
-       /// A package option needed to load this font
-       docstring const & packageoption() { return packageoption_; }
        /// A package option for Old Style Figures
        docstring const & osfoption() { return osfoption_; }
        /// A package option for true SmallCaps
@@ -61,7 +59,7 @@ public:
        /// Does this provide additional options?
        bool providesMoreOptions(bool ot1, bool complete, bool nomath);
        /// Alternative requirement to test for
-       docstring const & requires() { return requires_; }
+       docstring const & required() { return requires_; }
        /// Does this font provide a given \p feature
        bool provides(std::string const & name, bool ot1,
                      bool complete, bool nomath);
@@ -86,7 +84,7 @@ public:
        /// Return the LaTeX Code
        std::string const getLaTeXCode(bool dryrun, bool ot1, bool complete,
                                       bool sc, bool osf, bool nomath,
-                                      std::string const extraopts = std::string(),
+                                      std::string const & extraopts = std::string(),
                                       int const & scale = 100);
        /// Return the actually used font
        docstring const getUsedFont(bool ot1, bool complete, bool nomath);
@@ -105,7 +103,7 @@ private:
                                            bool sc,
                                            bool osf,
                                            int scale,
-                                           std::string const extraopts,
+                                           std::string const & extraopts,
                                            bool nomath);
        /// Return an alternative font
        LaTeXFont altFont(docstring const & name);
@@ -130,7 +128,7 @@ private:
        ///
        docstring osffont_;
        ///
-       docstring packageoption_;
+       docstring packageoptions_;
        ///
        docstring osfoption_;
        ///