X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.h;h=488932d208f592e52bd8299aa101b0bfb9c8c9be;hb=67f9c9fdae42211aa3ff8d0c6f62485bd721d8eb;hp=1706ea2ab0409da4163aed511626391ae2ad557a;hpb=2e7ac7ca77bef2290428603b0a19a9517f675f26;p=lyx.git

diff --git a/src/lyxfont.h b/src/lyxfont.h
index 1706ea2ab0..488932d208 100644
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxfont.h
+ * \file src/lyxfont.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,8 +15,8 @@
 #ifndef LYXFONT_H
 #define LYXFONT_H
 
-#include "support/std_string.h"
 #include <iosfwd>
+#include <string>
 
 class LColor_color;
 class LyXLex;
@@ -233,25 +233,25 @@ public:
 	void setLanguage(Language const * l);
 
 	/// Set family after LyX text format
-	LyXFont & setLyXFamily(string const &);
+	LyXFont & setLyXFamily(std::string const &);
 
 	/// Set series after LyX text format
-	LyXFont & setLyXSeries(string const &);
+	LyXFont & setLyXSeries(std::string const &);
 
 	/// Set shape after LyX text format
-	LyXFont & setLyXShape(string const &);
+	LyXFont & setLyXShape(std::string const &);
 
 	/// Set size after LyX text format
-	LyXFont & setLyXSize(string const &);
+	LyXFont & setLyXSize(std::string const &);
 
 	/// Returns misc flag after LyX text format
-	LyXFont::FONT_MISC_STATE setLyXMisc(string const &);
+	LyXFont::FONT_MISC_STATE setLyXMisc(std::string const &);
 
 	/// Sets color after LyX text format
-	LyXFont & setLyXColor(string const &);
+	LyXFont & setLyXColor(std::string const &);
 
 	/// Returns size of font in LaTeX text notation
-	string const latexSize() const;
+	std::string const latexSize() const;
 
 	/** Updates font settings according to request.
 	    If an attribute is IGNORE, the attribute is left as it is.
@@ -289,7 +289,7 @@ public:
 	int latexWriteStartChanges(std::ostream &, LyXFont const & base,
 				   LyXFont const & prev) const;
 
-	/** Writes tha tail of the LaTeX needed to chagne to this font.
+	/** Writes the tail of the LaTeX needed to change to this font.
 	    Returns number of chars written. Base is the font state we want
 	    to achieve.
 	*/
@@ -297,7 +297,7 @@ public:
 				 LyXFont const & next) const;
 
 	/// Build GUI description of font state
-	string const stateText(BufferParams * params) const;
+	std::string const stateText(BufferParams * params) const;
 
 	///
 	LColor_color realColor() const;
@@ -305,6 +305,9 @@ public:
 	///
 	friend
 	bool operator==(LyXFont const & font1, LyXFont const & font2);
+	///
+	friend
+	std::ostream & operator<<(std::ostream & os, LyXFont const & font);
 
 	/// Converts logical attributes to concrete shape attribute
 	LyXFont::FONT_SHAPE realShape() const;
@@ -335,22 +338,16 @@ public:
 		FONT_MISC_STATE number;
 	};
 private:
-
 	///
 	FontBits bits;
-
 	///
 	Language const * lang;
-
 	/// Sane font
 	static FontBits sane;
-
 	/// All inherit font
 	static FontBits inherit;
-
 	/// All ignore font
 	static FontBits ignore;
-
 	/// Updates a misc setting according to request
 	LyXFont::FONT_MISC_STATE setMisc(LyXFont::FONT_MISC_STATE newfont,
 					 LyXFont::FONT_MISC_STATE org);
@@ -362,10 +359,14 @@ private:
  *  having to expose lyxfont.h.
  */
 class LyXFont_size {
-        LyXFont::FONT_SIZE val_;
 public:
+	///
 	LyXFont_size(LyXFont::FONT_SIZE val) : val_(val) {}
-        operator LyXFont::FONT_SIZE() const{ return val_; }
+	///
+	operator LyXFont::FONT_SIZE() const { return val_; }
+private:
+	///
+	LyXFont::FONT_SIZE val_;
 };
 
 
@@ -444,8 +445,7 @@ bool operator!=(LyXFont::FontBits const & lhs, LyXFont::FontBits const & rhs)
 inline
 bool operator==(LyXFont const & font1, LyXFont const & font2)
 {
-	return font1.bits == font2.bits &&
-		font1.lang == font2.lang;
+	return font1.bits == font2.bits && font1.lang == font2.lang;
 }
 
 ///