X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.h;h=58f2696fa6e531ace6d6812aeee8b7e15841916d;hb=aef8746712ccc64f1f10073fe6d011ff1d7eb4a4;hp=49c8f31b5b9ed52ffba3ce325fa43c156c0feb59;hpb=a8cd9a4b8fd325b00c75f601c66c6d618ba276db;p=lyx.git

diff --git a/src/Font.h b/src/Font.h
index 49c8f31b5b..58f2696fa6 100644
--- a/src/Font.h
+++ b/src/Font.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author Dekel Tsur
@@ -15,11 +15,6 @@
 #ifndef FONT_H
 #define FONT_H
 
-#ifdef TEX2LYX
-#include "tex2lyx/Font.h"
-#else
-
-#include "ColorCode.h"
 #include "FontInfo.h"
 
 #include "support/strfwd.h"
@@ -27,11 +22,11 @@
 
 namespace lyx {
 
-class Lexer;
 class BufferParams;
 class Language;
 class LaTeXFeatures;
 class OutputParams;
+class otexstream;
 
 ///
 class Font {
@@ -53,10 +48,6 @@ public:
 	///
 	void setLanguage(Language const * l);
 
-	/// Returns misc flag after LyX text format
-	FontState setLyXMisc(std::string const &);
-
-
 	/// Returns size of font in LaTeX text notation
 	std::string const latexSize() const;
 
@@ -90,7 +81,7 @@ public:
 	    Returns number of chars written. Base is the font state we want
 	    to achieve.
 	*/
-	int latexWriteEndChanges(odocstream &, BufferParams const & bparams,
+	int latexWriteEndChanges(otexstream &, BufferParams const & bparams,
 				 OutputParams const & runparams,
 				 Font const & base,
 				 Font const & next,
@@ -121,7 +112,6 @@ private:
 	FontInfo bits_;
 	///
 	Language const * lang_;
-
 	/// Did latexWriteStartChanges open an encoding environment?
 	mutable bool open_encoding_;
 };
@@ -146,26 +136,6 @@ bool operator!=(Font const & font1, Font const & font2)
  */
 std::string const freefont2string();
 
-
-/// Set family after LyX text format
-void setLyXFamily(std::string const &, FontInfo &);
-
-/// Set series after LyX text format
-void setLyXSeries(std::string const &, FontInfo &);
-
-/// Set shape after LyX text format
-void setLyXShape(std::string const &, FontInfo &);
-
-/// Set size after LyX text format
-void setLyXSize(std::string const &, FontInfo &);
-
-/// Sets color after LyX text format
-void setLyXColor(std::string const &, FontInfo &);
-
-/// Read a font specification from Lexer. Used for layout files.
-FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
-
 } // namespace lyx
 
-#endif // TEX2LYX
 #endif