X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFonts.h;h=481c2f78cb4f48e40ccdf2d2916a4a53a234581f;hb=861c6167ca5f1329e16dd788489a7c03772e2332;hp=7087649a4dcfc8c8b217fc6a5cb2c2486b1331f9;hpb=dcd0586b75321545bc5536d5d4ea33991f3a9a11;p=lyx.git

diff --git a/src/LaTeXFonts.h b/src/LaTeXFonts.h
index 7087649a4d..481c2f78cb 100644
--- a/src/LaTeXFonts.h
+++ b/src/LaTeXFonts.h
@@ -27,7 +27,7 @@ class LaTeXFont {
 public:
 	/// TeX font
 	// FIXME Add fontenc tag to classes which is used if no font is specified?
-	LaTeXFont() : osfdefault_(false), switchdefault_(false) { fontenc_.push_back("T1"); }
+	LaTeXFont() : osfdefault_(false), switchdefault_(false), moreopts_(false) { fontenc_.push_back("T1"); }
 	/// The font name
 	docstring const & name() { return name_; }
 	/// The name to appear in the document dialog
@@ -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
@@ -58,8 +56,10 @@ public:
 	docstring const & osfscoption() { return osfscoption_; }
 	/// A package option for font scaling
 	docstring const & scaleoption() { return scaleoption_; }
+	/// 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);
@@ -84,6 +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(),
 				       int const & scale = 100);
 	/// Return the actually used font
 	docstring const getUsedFont(bool ot1, bool complete, bool nomath);
@@ -102,6 +103,7 @@ private:
 					    bool sc,
 					    bool osf,
 					    int scale,
+					    std::string const & extraopts,
 					    bool nomath);
 	/// Return an alternative font
 	LaTeXFont altFont(docstring const & name);
@@ -126,7 +128,7 @@ private:
 	///
 	docstring osffont_;
 	///
-	docstring packageoption_;
+	docstring packageoptions_;
 	///
 	docstring osfoption_;
 	///
@@ -145,6 +147,8 @@ private:
 	bool osfdefault_;
 	///
 	bool switchdefault_;
+	///
+	bool moreopts_;
 };