X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.h;h=07d71d280413ae5f9780a7f02e726be5ecc643ea;hb=2e57f2ff0ae7cd4a6efbf634ffe6d2f4379d9cfc;hp=3cb1edd795f79042cb6fd6766691007d4c1362de;hpb=9548351ef8ceaa1c779267e4eeccd3a0d83a0374;p=lyx.git

diff --git a/src/lyxfont.h b/src/lyxfont.h
index 3cb1edd795..07d71d2804 100644
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -12,10 +12,6 @@
 #ifndef LYXFONT_H
 #define LYXFONT_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include <iosfwd>
 
 #include "LString.h"
@@ -59,6 +55,8 @@ public:
 		///
 		EUFRAK_FAMILY,
 		///
+		WASY_FAMILY,
+		///
 		INHERIT_FAMILY,
 		///
 		IGNORE_FAMILY,
@@ -280,11 +278,7 @@ public:
 	void reduce(LyXFont const & tmplt);
 
 	/// Realize font from a template (INHERIT are realized)
-#ifndef INHERIT_LANGUAGE
 	LyXFont & realize(LyXFont const & tmplt);
-#else
-	LyXFont & realize(LyXFont const & tmplt, Language const * language);
-#endif
 	/// Is a given font fully resolved?
 	bool resolved() const;
 
@@ -292,12 +286,7 @@ public:
 	LyXFont & lyxRead(LyXLex &);
 
 	/// Writes the changes from this font to orgfont in .lyx format in file
-#ifndef INHERIT_LANGUAGE
 	void lyxWriteChanges(LyXFont const & orgfont, std::ostream &) const;
-#else
-	void lyxWriteChanges(LyXFont const & orgfont, Language const * doclang,
-			     std::ostream &) const;
-#endif
 
 	/** Writes the head of the LaTeX needed to change to this font.
 	    Writes to string, the head of the LaTeX needed to change
@@ -425,6 +414,7 @@ bool LyXFont::isSymbolFont() const
 	case LyXFont::CMEX_FAMILY:
 	case LyXFont::MSA_FAMILY:
 	case LyXFont::MSB_FAMILY:
+	case LyXFont::WASY_FAMILY:
 		return true;
 	default:
 		return false;
@@ -457,5 +447,4 @@ bool operator!=(LyXFont const & font1, LyXFont const & font2)
 	return !(font1 == font2);
 }
 
-
 #endif