X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFonts.h;h=90d91b35190a54cb7d55324aadb1e0843cb62e33;hb=5c03cb340c2214a3142f254622b0efaaa654ec44;hp=f4f09b717f15896d760740ae25b5a02a9a0567a1;hpb=9cbba74a62bce39c5128800474edcb45028a6df2;p=lyx.git

diff --git a/src/LaTeXFonts.h b/src/LaTeXFonts.h
index f4f09b717f..90d91b3519 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
@@ -70,6 +70,10 @@ public:
 	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 
+	 * 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 nomath);
 	/// Return the LaTeX Code
@@ -78,6 +82,8 @@ 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);
 	///
@@ -127,7 +133,7 @@ private:
 	///
 	docstring requires_;
 	///
-	std::string preamble_;
+	docstring preamble_;
 	///
 	bool osfdefault_;
 	///