Correct Right Arrow key processing in Modules list

[lyx.git] / src / LaTeXFonts.h

diff --git a/src/LaTeXFonts.h b/src/LaTeXFonts.h
index 6d08cb9fced8fa8759eadf4d862102fad972822f..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
@@ -56,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);
@@ -67,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?
@@ -87,7 +92,7 @@ public:
                                       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);
        ///
@@ -138,9 +143,11 @@ private:
        ///
        docstring scaleoption_;
        ///
+       docstring scalecmd_;
+       ///
        std::vector<std::string> provides_;
        ///
-       docstring requires_;
+       docstring required_;
        ///
        docstring preamble_;
        ///
@@ -149,6 +156,8 @@ private:
        bool switchdefault_;
        ///
        bool moreopts_;
+       ///
+       bool osffontonly_;
 };