X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFonts.h;h=a77902a5800e985c38f5c9dcb238933e00887da7;hb=e50a7d5b12389f8aea9cc228a0bb382292ee9440;hp=54ed5ad9c4f97c11c7faed97fb285f7f3b7b16c7;hpb=f4261030e208e9af74a38ed35fa809c90f920758;p=lyx.git

diff --git a/src/LaTeXFonts.h b/src/LaTeXFonts.h
index 54ed5ad9c4..a77902a580 100644
--- a/src/LaTeXFonts.h
+++ b/src/LaTeXFonts.h
@@ -26,7 +26,7 @@ class Lexer;
 class LaTeXFont {
 public:
 	/// TeX font
-	LaTeXFont() : switchdefault_(false) {}
+	LaTeXFont() : osfdefault_(false), switchdefault_(false) {}
 	/// The font name
 	docstring const & name() { return name_; }
 	/// The name to appear in the document dialog
@@ -35,14 +35,14 @@ public:
 	docstring const & family() { return family_; }
 	/// The package that provides this font
 	docstring const & package() { return package_; }
-	/// Alternative packages if package() is not available
-	std::vector<docstring> const & altpackages() { return altpackages_; }
-	/// A package that provides all families
-	docstring const & completepackage() { return completepackage_; }
-	/// A package specifically needed for OT1 font encoding
-	docstring const & ot1package() { return ot1package_; }
-	/// A package that provides Old Style Figures for this font
-	docstring const & osfpackage() { return osfpackage_; }
+	/// Alternative font if package() is not available
+	std::vector<docstring> const & altfonts() { return altfonts_; }
+	/// A font that provides all families
+	docstring const & completefont() { return completefont_; }
+	/// A font specifically needed for OT1 font encoding
+	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
@@ -56,36 +56,50 @@ 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) const;
+	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 = false) const;
+	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 = false) const;
+	bool providesOSF(bool ot1, bool complete, bool nomath);
 	/// Does this font provide optional true SmallCaps?
-	bool providesSC(bool ot1 = false) const;
+	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 = false) const;
+	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, 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 
-	std::string const getAvailablePackage(bool dryrun,
-					      bool ot1,
-					      bool complete,
-					      bool & alt);
+	/// 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);
 	///
 	docstring name_;
 	///
@@ -95,13 +109,15 @@ private:
 	///
 	docstring package_;
 	///
-	std::vector<docstring> altpackages_;
+	std::vector<docstring> altfonts_;
 	///
-	docstring completepackage_;
+	docstring completefont_;
 	///
-	docstring ot1package_;
+	docstring nomathfont_;
 	///
-	docstring osfpackage_;
+	docstring ot1font_;
+	///
+	docstring osffont_;
 	///
 	docstring packageoption_;
 	///
@@ -117,14 +133,14 @@ private:
 	///
 	docstring requires_;
 	///
-	bool switchdefault_;
+	docstring preamble_;
 	///
-	bool available_;
+	bool osfdefault_;
 	///
-	bool available_ot1_;
+	bool switchdefault_;
 };
-  
-  
+
+
 /** The list of available LaTeX fonts
  */
 class LaTeXFonts {
@@ -135,11 +151,15 @@ public:
 	TexFontMap getLaTeXFonts();
 	/// Get a specific LaTeXFont \p name
 	LaTeXFont getLaTeXFont(docstring const & name);
+	/// Get a specific AltFont \p name
+	LaTeXFont getAltFont(docstring const & name);
 private:
 	///
 	void readLaTeXFonts();
 	///
 	TexFontMap texfontmap_;
+	///
+	TexFontMap texaltfontmap_;
 };
 
 /// Implementation is in LyX.cpp