X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFonts.h;h=7087649a4dcfc8c8b217fc6a5cb2c2486b1331f9;hb=f5f2f5b7eaca90ba9bbddee3cea54708c9b98a36;hp=034658e8a253e0af806d6929d86fd637df07fc88;hpb=a5151c92a9259ac20ba0b0056230b3297ded723f;p=lyx.git

diff --git a/src/LaTeXFonts.h b/src/LaTeXFonts.h
index 034658e8a2..7087649a4d 100644
--- a/src/LaTeXFonts.h
+++ b/src/LaTeXFonts.h
@@ -26,7 +26,8 @@ class Lexer;
 class LaTeXFont {
 public:
 	/// TeX font
-	LaTeXFont() : switchdefault_(false) {}
+	// FIXME Add fontenc tag to classes which is used if no font is specified?
+	LaTeXFont() : osfdefault_(false), switchdefault_(false) { fontenc_.push_back("T1"); }
 	/// The font name
 	docstring const & name() { return name_; }
 	/// The name to appear in the document dialog
@@ -35,6 +36,10 @@ public:
 	docstring const & family() { return family_; }
 	/// The package that provides this font
 	docstring const & package() { return package_; }
+	/// Does this provide a specific font encoding?
+	bool hasFontenc(std::string const &) const;
+	/// The font encoding(s)
+	std::vector<std::string> const & fontencs() const { return fontenc_; }
 	/// Alternative font if package() is not available
 	std::vector<docstring> const & altfonts() { return altfonts_; }
 	/// A font that provides all families
@@ -56,38 +61,48 @@ public:
 	/// Alternative requirement to test for
 	docstring const & requires() { return requires_; }
 	/// Does this font provide a given \p feature
-	bool provides(std::string const & name, bool ot1, bool complete);
+	bool provides(std::string const & name, bool ot1,
+		      bool complete, bool nomath);
 	/// Issue the familydefault switch
 	bool switchdefault() const { return switchdefault_; }
 	/// Does the font provide Old Style Figures as default?
 	bool osfDefault() const { return osfdefault_; }
 	/// Is this font available?
-	bool available(bool ot1);
+	bool available(bool ot1, bool nomath);
+	/// Does this font provide an alternative without math?
+	bool providesNoMath(bool ot1, bool complete);
 	/// Does this font provide Old Style Figures?
-	bool providesOSF(bool ot1, bool complete);
+	bool providesOSF(bool ot1, bool complete, bool nomath);
 	/// Does this font provide optional true SmallCaps?
-	bool providesSC(bool ot1, bool complete);
+	bool providesSC(bool ot1, bool complete, bool nomath);
+	/** does this font provide OSF and Small Caps only via
+	 * a single, undifferentiated expert option?
+	 */
+	bool hasMonolithicExpertSet(bool ot1, bool complete, bool nomath);
 	/// Does this font provide scaling?
-	bool providesScale(bool ot1, bool complete);
+	bool providesScale(bool ot1, bool complete, bool nomath);
 	/// Return the LaTeX Code
 	std::string const getLaTeXCode(bool dryrun, bool ot1, bool complete,
-				       bool sc, bool osf,
+				       bool sc, bool osf, bool nomath,
 				       int const & scale = 100);
 	/// Return the actually used font
-	docstring const getUsedFont(bool ot1, bool complete);
+	docstring const getUsedFont(bool ot1, bool complete, bool nomath);
+	/// Return the actually used package
+	docstring const getUsedPackage(bool ot1, bool complete, bool nomath);
 	///
 	bool read(Lexer & lex);
 	///
 	bool readFont(Lexer & lex);
 private:
-	/// Return the preferred available package 
+	/// Return the preferred available package
 	std::string const getAvailablePackage(bool dryrun);
 	/// Return the package options
 	std::string const getPackageOptions(bool ot1,
 					    bool complete,
 					    bool sc,
 					    bool osf,
-					    int scale);
+					    int scale,
+					    bool nomath);
 	/// Return an alternative font
 	LaTeXFont altFont(docstring const & name);
 	///
@@ -99,10 +114,14 @@ private:
 	///
 	docstring package_;
 	///
+	std::vector<std::string> fontenc_;
+	///
 	std::vector<docstring> altfonts_;
 	///
 	docstring completefont_;
 	///
+	docstring nomathfont_;
+	///
 	docstring ot1font_;
 	///
 	docstring osffont_;
@@ -121,12 +140,14 @@ private:
 	///
 	docstring requires_;
 	///
+	docstring preamble_;
+	///
 	bool osfdefault_;
 	///
 	bool switchdefault_;
 };
-  
-  
+
+
 /** The list of available LaTeX fonts
  */
 class LaTeXFonts {