X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.h;h=86df589be609d14678af1b5925e69c3cae8a555a;hb=53c5edb99e5566fd7c0a1192a697b7b7796919d8;hp=ad1a4a17f0eba7aa59e5fc2c1a8bf9b3f2404408;hpb=eca4bcddc99c8d8eb4c0e1b647cc3ba13c3ea5ae;p=lyx.git

diff --git a/src/lyxfont.h b/src/lyxfont.h
index ad1a4a17f0..86df589be6 100644
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -19,25 +19,13 @@
 #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
+#include "language.h"
 
 class LyXLex;
 class BufferParams;
 
+
 ///
 class LyXFont {
 public:
@@ -155,9 +143,6 @@ public:
 	///
 	LyXFont();
 
-	// LyXFont x(LyXFont ...) and LyXFont x = LyXFont ...
-	LyXFont(LyXFont const & x);
- 
 	/// Shortcut initialization
 	explicit
 	LyXFont(LyXFont::FONT_INIT1);
@@ -174,9 +159,6 @@ 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();
  
@@ -263,11 +245,6 @@ public:
 	/// Sets color after LyX text format
 	LyXFont & setLyXColor(string const &);
 
-#if 0
-	/// Sets size after GUI name
-	LyXFont & setGUISize(string const &);
-#endif
-	
 	/// Returns size of font in LaTeX text notation
 	string const latexSize() const;
  
@@ -325,10 +302,6 @@ 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;
 
@@ -359,13 +332,15 @@ private:
 		FONT_MISC_STATE noun;
 		///
 		FONT_MISC_STATE latex;
+		///
+		FONT_MISC_STATE number;
 	};
+
 	///
 	FontBits bits;
+	
 	///
 	Language const * lang;
-	///
-	FONT_MISC_STATE number_;
 	
 	/// Sane font
 	static FontBits sane;
@@ -381,104 +356,18 @@ 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)
+LyXFont::FONT_SHAPE LyXFont::shape() const
 {
-	bits = sane;
-	lang = l;
-	number_ = OFF;
+	return bits.shape;
 }
 
 
 inline
-LyXFont & LyXFont::operator=(LyXFont const & x) 
-{
-	bits = x.bits;
-	lang = x.lang;
-	number_ = x.number_;
-	return *this;
-}
+LyXFont::LyXFont()
+	: bits(sane), lang(default_language)
+{}
 
 
 inline
@@ -495,13 +384,6 @@ LyXFont::FONT_SERIES LyXFont::series() const
 }
 
 
-inline
-LyXFont::FONT_SHAPE LyXFont::shape() const
-{
-	return bits.shape;
-}
-
-
 inline
 LyXFont::FONT_SIZE LyXFont::size() const
 {
@@ -516,13 +398,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
 {
@@ -530,132 +405,21 @@ 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 
-{
-	return (lang->RightToLeft() && latex() != ON && number() != ON);
-}
-
-
-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;
-}
-
-inline
-LyXFont & LyXFont::setLatex(LyXFont::FONT_MISC_STATE l)
-{
-	bits.latex = l;
-	return *this;
-}
-
-
-inline
-LyXFont & LyXFont::setColor(LColor::color c)
-{
-	bits.color = c;
-	return *this;
-}
-
+///
+std::ostream & operator<<(std::ostream &, LyXFont::FONT_MISC_STATE);
 
+///
 inline
-LyXFont & LyXFont::setLanguage(Language const * l)
+bool operator==(LyXFont const & font1, LyXFont const & font2)
 {
-	lang = l;
-	return *this;
+	return font1.bits == font2.bits &&
+		font1.lang == font2.lang;
 }
 
-
+///
 inline
-LyXFont & LyXFont::setNumber(LyXFont::FONT_MISC_STATE n)
+bool operator!=(LyXFont const & font1, LyXFont const & font2)
 {
-	number_ = n;
-	return *this;
+	return !(font1 == font2);
 }
-
 #endif