Correct Right Arrow key processing in Modules list

[lyx.git] / src / LaTeXFonts.h

diff --git a/src/LaTeXFonts.h b/src/LaTeXFonts.h
index 5150a9a306aba59515072d7f26edf43c07e0dc57..116ef082c711013b8360255c466cc69592e5dc45 100644 (file)
--- a/src/LaTeXFonts.h
+++ b/src/LaTeXFonts.h
@@ -27,7 +27,8 @@ class LaTeXFont {
 public:
        /// TeX font
        // FIXME Add fontenc tag to classes which is used if no font is specified?
-       LaTeXFont() : osfdefault_(false), switchdefault_(false), moreopts_(false) { fontenc_.push_back("T1"); }
+       LaTeXFont() : osfdefault_(false), switchdefault_(false), moreopts_(false),
+               osffontonly_(false) { fontenc_.push_back("T1"); }
        /// The font name
        docstring const & name() { return name_; }
        /// The name to appear in the document dialog
@@ -48,8 +49,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 & packageoptions() { return packageoptions_; }
        /// A package option for Old Style Figures
        docstring const & osfoption() { return osfoption_; }
        /// A package option for true SmallCaps
@@ -58,10 +57,12 @@ public:
        docstring const & osfscoption() { return osfscoption_; }
        /// A package option for font scaling
        docstring const & scaleoption() { return scaleoption_; }
+       /// A macro for font scaling
+       docstring const & scalecmd() { return scalecmd_; }
        /// 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 required_; }
        /// Does this font provide a given \p feature
        bool provides(std::string const & name, bool ot1,
                      bool complete, bool nomath);
@@ -69,6 +70,8 @@ public:
        bool switchdefault() const { return switchdefault_; }
        /// Does the font provide Old Style Figures as default?
        bool osfDefault() const { return osfdefault_; }
+       /// Does OSF font replace (rather than complement) the non-OSF one?
+       bool osfFontOnly() const { return osffontonly_; }
        /// Is this font available?
        bool available(bool ot1, bool nomath);
        /// Does this font provide an alternative without math?
@@ -86,10 +89,10 @@ 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);
+       docstring const getUsedFont(bool ot1, bool complete, bool nomath, bool osf);
        /// Return the actually used package
        docstring const getUsedPackage(bool ot1, bool complete, bool nomath);
        ///
@@ -105,7 +108,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);
@@ -140,9 +143,11 @@ private:
        ///
        docstring scaleoption_;
        ///
+       docstring scalecmd_;
+       ///
        std::vector<std::string> provides_;
        ///
-       docstring requires_;
+       docstring required_;
        ///
        docstring preamble_;
        ///
@@ -151,6 +156,8 @@ private:
        bool switchdefault_;
        ///
        bool moreopts_;
+       ///
+       bool osffontonly_;
 };