X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFonts.h;h=a77902a5800e985c38f5c9dcb238933e00887da7;hb=4300feb8595c8542050adedf664cd4bfda7ede12;hp=8c9da88e5eca9b3d1342d2ad75e7466cc85c0bfe;hpb=a063defd9f7c56e2ecb5ff11f0ad9bf62fa267ad;p=lyx.git

diff --git a/src/LaTeXFonts.h b/src/LaTeXFonts.h
index 8c9da88e5e..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
@@ -64,13 +64,13 @@ public:
 	bool osfDefault() const { return osfdefault_; }
 	/// Is this font available?
 	bool available(bool ot1, bool nomath);
-	/// Does this font provide an alternative without math? 
+	/// 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 nomath);
 	/// Does this font provide optional true SmallCaps?
 	bool providesSC(bool ot1, bool complete, bool nomath);
-	/** does this font provide OSF and Small Caps only via 
+	/** does this font provide OSF and Small Caps only via
 	 * a single, undifferentiated expert option?
 	 */
 	bool hasMonolithicExpertSet(bool ot1, bool complete, bool nomath);
@@ -82,12 +82,14 @@ public:
 				       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 
+	/// Return the preferred available package
 	std::string const getAvailablePackage(bool dryrun);
 	/// Return the package options
 	std::string const getPackageOptions(bool ot1,
@@ -131,14 +133,14 @@ private:
 	///
 	docstring requires_;
 	///
-	std::string preamble_;
+	docstring preamble_;
 	///
 	bool osfdefault_;
 	///
 	bool switchdefault_;
 };
-  
-  
+
+
 /** The list of available LaTeX fonts
  */
 class LaTeXFonts {