X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.h;h=17b2359b11a0217262fd774c19e269f87863c828;hb=267e4d92ea8799f94180852fec717e7e74fe2ab6;hp=aedd3236f50f182f65a38001b06b1bb2dc076256;hpb=e9c7fc6da6401df5d2f509db67ae6b49a5fef335;p=lyx.git

diff --git a/src/lyxfont.h b/src/lyxfont.h
index aedd3236f5..17b2359b11 100644
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.   
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -19,24 +19,12 @@
 #include <iosfwd>
 
 #include "LString.h"
-#include "language.h"
 #include "LColor.h"
 
-// It might happen that locale.h defines ON and OFF. This is not good
-// for us, since we use these names below. But of course this is due
-// to some old compilers. Than is broken when it comes to C++ scoping.
-#include "gettext.h" // so that we are sure tht it won't be included
-// later. 
-#ifdef ON
-#undef ON
-#endif
-
-#ifdef OFF
-#undef OFF
-#endif
-
 class LyXLex;
 class BufferParams;
+class Language;
+
 
 ///
 class LyXFont {
@@ -57,9 +45,27 @@ public:
 		///
 		SYMBOL_FAMILY,
 		///
+		CMR_FAMILY,
+		///
+		CMSY_FAMILY,
+		///
+		CMM_FAMILY,
+		///
+		CMEX_FAMILY,
+		///
+		MSA_FAMILY,
+		///
+		MSB_FAMILY,
+		///
+		EUFRAK_FAMILY,
+		///
+		WASY_FAMILY,
+		///
 		INHERIT_FAMILY,
 		///
-		IGNORE_FAMILY
+		IGNORE_FAMILY,
+		///
+		NUM_FAMILIES = INHERIT_FAMILY
 	};
 
 	///
@@ -121,7 +127,7 @@ public:
 		///
 		IGNORE_SIZE
 	};
- 
+
 	/// Used for emph, underbar, noun and latex toggles
 	enum FONT_MISC_STATE {
 		///
@@ -155,9 +161,6 @@ public:
 	///
 	LyXFont();
 
-	// LyXFont x(LyXFont ...) and LyXFont x = LyXFont ...
-	LyXFont(LyXFont const & x);
- 
 	/// Shortcut initialization
 	explicit
 	LyXFont(LyXFont::FONT_INIT1);
@@ -174,38 +177,32 @@ public:
 	/// Shortcut initialization
 	LyXFont(LyXFont::FONT_INIT3, Language const * l);
 
-	/// LyXFont x, y; x = y;
-	LyXFont & operator=(LyXFont const & x);
- 
 	/// Decreases font size by one
 	LyXFont & decSize();
- 
+
 	/// Increases font size by one
 	LyXFont & incSize();
- 
+
 	///
 	FONT_FAMILY family() const;
- 
+
 	///
 	FONT_SERIES series() const;
- 
+
 	///
 	FONT_SHAPE shape() const;
- 
+
 	///
 	FONT_SIZE size() const;
- 
+
 	///
 	FONT_MISC_STATE emph() const;
- 
+
 	///
 	FONT_MISC_STATE underbar() const;
- 
-	///
-	FONT_MISC_STATE noun() const;
 
 	///
-	FONT_MISC_STATE latex() const;
+	FONT_MISC_STATE noun() const;
 
 	///
 	FONT_MISC_STATE number() const;
@@ -213,7 +210,7 @@ public:
 	///
 	LColor::color color() const;
 
- 	///
+	///
 	Language const * language() const;
 
 	///
@@ -221,7 +218,10 @@ public:
 
 	///
 	bool isVisibleRightToLeft() const;
-	
+
+	///
+	bool isSymbolFont() const;
+
 	///
 	LyXFont & setFamily(LyXFont::FONT_FAMILY f);
 	///
@@ -237,38 +237,33 @@ public:
 	///
 	LyXFont & setNoun(LyXFont::FONT_MISC_STATE n);
 	///
-	LyXFont & setLatex(LyXFont::FONT_MISC_STATE l);
-	///
 	LyXFont & setNumber(LyXFont::FONT_MISC_STATE n);
 	///
 	LyXFont & setColor(LColor::color c);
- 	///
+	///
 	LyXFont & setLanguage(Language const * l);
 
 	/// Set family after LyX text format
 	LyXFont & setLyXFamily(string const &);
- 
+
 	/// Set series after LyX text format
 	LyXFont & setLyXSeries(string const &);
- 
+
 	/// Set shape after LyX text format
 	LyXFont & setLyXShape(string const &);
- 
+
 	/// Set size after LyX text format
 	LyXFont & setLyXSize(string const &);
- 
+
 	/// Returns misc flag after LyX text format
 	LyXFont::FONT_MISC_STATE setLyXMisc(string const &);
 
 	/// Sets color after LyX text format
 	LyXFont & setLyXColor(string const &);
- 
-	/// Sets size after GUI name
-	LyXFont & setGUISize(string const &);
- 
+
 	/// Returns size of font in LaTeX text notation
 	string const latexSize() const;
- 
+
 	/** Updates font settings according to request.
 	    If an attribute is IGNORE, the attribute is left as it is.
 	    When toggleall = true, all properties that matches the font in use
@@ -278,23 +273,22 @@ public:
 	    a INHERIT_FAMILY was asked for.  This is necessary for the
 	    toggle-user-defined-style button on the toolbar.
 	*/
- 	void update(LyXFont const & newfont, 
+	void update(LyXFont const & newfont,
 		    Language const * default_lang,
 		    bool toggleall = false);
- 
+
 	/** Reduce font to fall back to template where possible.
 	    Equal fields are reduced to INHERIT */
 	void reduce(LyXFont const & tmplt);
- 
+
 	/// Realize font from a template (INHERIT are realized)
 	LyXFont & realize(LyXFont const & tmplt);
-
 	/// Is a given font fully resolved?
 	bool resolved() const;
- 
+
 	/// Read a font specification from LyXLex. Used for layout files.
 	LyXFont & lyxRead(LyXLex &);
- 
+
 	/// Writes the changes from this font to orgfont in .lyx format in file
 	void lyxWriteChanges(LyXFont const & orgfont, std::ostream &) const;
 
@@ -323,22 +317,13 @@ public:
 	friend
 	bool operator==(LyXFont const & font1, LyXFont const & font2);
 
-	///
-	friend 
-	bool operator!=(LyXFont const & font1, LyXFont const & font2);
-
-	/// compares two fonts, ignoring the setting of the Latex part.
-	bool equalExceptLatex(LyXFont const &) const;
-
 	/// Converts logical attributes to concrete shape attribute
 	LyXFont::FONT_SHAPE realShape() const;
-private:
-	///
+
+	/** Compaq cxx 6.5 requires that the definition be public so that
+	    it can compile operator==()
+	 */
 	struct FontBits {
-		///
-		bool operator==(FontBits const & fb1) const;
-		///
-		bool operator!=(FontBits const & fb1) const;
 		///
 		FONT_FAMILY family;
 		///
@@ -356,21 +341,22 @@ private:
 		///
 		FONT_MISC_STATE noun;
 		///
-		FONT_MISC_STATE latex;
+		FONT_MISC_STATE number;
 	};
+private:
+
 	///
 	FontBits bits;
+
 	///
 	Language const * lang;
-	///
-	FONT_MISC_STATE number_;
-	
+
 	/// Sane font
 	static FontBits sane;
-	
+
 	/// All inherit font
 	static FontBits inherit;
- 
+
 	/// All ignore font
 	static FontBits ignore;
 
@@ -379,108 +365,16 @@ private:
 					 LyXFont::FONT_MISC_STATE org);
 };
 
-///
-std::ostream & operator<<(std::ostream &, LyXFont::FONT_MISC_STATE);
-
-///
-inline
-bool operator==(LyXFont const & font1, LyXFont const & font2) {
-	return font1.bits == font2.bits &&
-		font1.lang == font2.lang &&
-		font1.number_ == font2.number_;
-}
-
-///
-inline
-bool operator!=(LyXFont const & font1, LyXFont const & font2) {
-	return !(font1 == font2);
-}
-
-
-inline
-LyXFont::LyXFont()
-{
-	bits = sane;
-	lang = default_language;
-	number_ = OFF;
-}
-
-
-inline
-LyXFont::LyXFont(LyXFont const & x)
-{
-	bits = x.bits;
-	lang = x.lang;
-	number_ = x.number_;
-}
-
-
-inline
-LyXFont::LyXFont(LyXFont::FONT_INIT1)
-{
-	bits = inherit;
-	lang = default_language;
-	number_ = OFF;
-}
-
-
-inline
-LyXFont::LyXFont(LyXFont::FONT_INIT2)
-{
-	bits = ignore;
-	lang = ignore_language;
-	number_ = IGNORE;
-}
-
-
-inline
-LyXFont::LyXFont(LyXFont::FONT_INIT3)
-{
-	bits = sane;
-	lang = default_language;
-	number_ = OFF;
-}
-
-
-inline
-LyXFont::LyXFont(LyXFont::FONT_INIT1, Language const * l)
-{
-	bits = inherit;
-	lang = l;
-	number_ = OFF;
-}
-
 
 inline
-LyXFont::LyXFont(LyXFont::FONT_INIT2, Language const * l)
-{
-	bits = ignore;
-	lang = l;
-	number_ = IGNORE;
-}
-
-
-inline
-LyXFont::LyXFont(LyXFont::FONT_INIT3, Language const * l)
-{
-	bits = sane;
-	lang = l;
-	number_ = OFF;
-}
-
-
-inline
-LyXFont & LyXFont::operator=(LyXFont const & x) 
+LyXFont::FONT_SHAPE LyXFont::shape() const
 {
-	bits = x.bits;
-	lang = x.lang;
-	number_ = x.number_;
-	return *this;
+	return bits.shape;
 }
 
 
 inline
-LyXFont::FONT_FAMILY LyXFont::family() const 
+LyXFont::FONT_FAMILY LyXFont::family() const
 {
 	return bits.family;
 }
@@ -493,13 +387,6 @@ LyXFont::FONT_SERIES LyXFont::series() const
 }
 
 
-inline
-LyXFont::FONT_SHAPE LyXFont::shape() const
-{
-	return bits.shape;
-}
-
-
 inline
 LyXFont::FONT_SIZE LyXFont::size() const
 {
@@ -514,13 +401,6 @@ LyXFont::FONT_MISC_STATE LyXFont::emph() const
 }
 
 
-inline
-LyXFont::FONT_MISC_STATE LyXFont::underbar() const
-{
-	return bits.underbar;
-}
-
-
 inline
 LyXFont::FONT_MISC_STATE LyXFont::noun() const
 {
@@ -529,131 +409,47 @@ LyXFont::FONT_MISC_STATE LyXFont::noun() const
 
 
 inline
-LyXFont::FONT_MISC_STATE LyXFont::latex() const 
-{
-	return bits.latex;
-}
-
-
-inline
-LColor::color LyXFont::color() const 
-{
-	return bits.color;
-}
-
-
-inline
-Language const * LyXFont::language() const 
-{
-	return lang;
-}
-
-
-inline
-LyXFont::FONT_MISC_STATE LyXFont::number() const 
-{
-	return number_;
-}
-
-
-inline
-bool LyXFont::isRightToLeft() const 
-{
-	return lang->RightToLeft();
-}
-
-
-inline
-bool LyXFont::isVisibleRightToLeft() const 
+bool LyXFont::isSymbolFont() const
 {
-	return (lang->RightToLeft() && latex() != ON && number() != ON);
+	switch (family()) {
+	case LyXFont::SYMBOL_FAMILY:
+	case LyXFont::CMSY_FAMILY:
+	case LyXFont::CMM_FAMILY:
+	case LyXFont::CMEX_FAMILY:
+	case LyXFont::MSA_FAMILY:
+	case LyXFont::MSB_FAMILY:
+	case LyXFont::WASY_FAMILY:
+		return true;
+	default:
+		return false;
+	}
 }
 
+///
+std::ostream & operator<<(std::ostream &, LyXFont::FONT_MISC_STATE);
 
-inline
-LyXFont & LyXFont::setFamily(LyXFont::FONT_FAMILY f)
-{
-	bits.family = f;
-	return *this;
-}
-
-
-inline
-LyXFont & LyXFont::setSeries(LyXFont::FONT_SERIES s)
-{
-	bits.series = s;
-	return *this;
-}
-
-
-inline
-LyXFont & LyXFont::setShape(LyXFont::FONT_SHAPE s)
-{
-	bits.shape = s;
-	return *this;
-}
-
-
-inline
-LyXFont & LyXFont::setSize(LyXFont::FONT_SIZE s)
-{
-	bits.size = s;
-	return *this;
-}
-
-
-inline
-LyXFont & LyXFont::setEmph(LyXFont::FONT_MISC_STATE e)
-{
-	bits.emph = e;
-	return *this;
-}
-
-
-inline
-LyXFont & LyXFont::setUnderbar(LyXFont::FONT_MISC_STATE u)
-{
-	bits.underbar = u;
-	return *this;
-}
-
-
-inline
-LyXFont & LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
-{
-	bits.noun = n;
-	return *this;
-}
+bool operator==(LyXFont::FontBits const & lhs, LyXFont::FontBits const & rhs);
 
 inline
-LyXFont & LyXFont::setLatex(LyXFont::FONT_MISC_STATE l)
+bool operator!=(LyXFont::FontBits const & lhs, LyXFont::FontBits const & rhs)
 {
-	bits.latex = l;
-	return *this;
+	return !(lhs == rhs);
 }
 
-
+///
 inline
-LyXFont & LyXFont::setColor(LColor::color c)
+bool operator==(LyXFont const & font1, LyXFont const & font2)
 {
-	bits.color = c;
-	return *this;
+	return font1.bits == font2.bits &&
+		font1.lang == font2.lang;
 }
 
-
+///
 inline
-LyXFont & LyXFont::setLanguage(Language const * l)
+bool operator!=(LyXFont const & font1, LyXFont const & font2)
 {
-	lang = l;
-	return *this;
+	return !(font1 == font2);
 }
 
 
-inline
-LyXFont & LyXFont::setNumber(LyXFont::FONT_MISC_STATE n)
-{
-	number_ = n;
-	return *this;
-}
-
 #endif