X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.h;h=58f2696fa6e531ace6d6812aeee8b7e15841916d;hb=7c3fd636469b0a7f50f3515d100d9e957cda16b9;hp=97d403627ecd1087ada19c1e54b155946d7974da;hpb=29c40527e56424d9c66ffb2e6c9709d8e4a30e1e;p=lyx.git diff --git a/src/Font.h b/src/Font.h index 97d403627e..58f2696fa6 100644 --- a/src/Font.h +++ b/src/Font.h @@ -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 { @@ -47,20 +42,12 @@ public: /// Language const * language() const { return lang_; } /// - void setMisspelled(bool misspelled) { misspelled_ = misspelled; } - /// - bool isMisspelled() const { return misspelled_; } - /// bool isRightToLeft() const; /// bool isVisibleRightToLeft() const; /// 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; @@ -94,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, @@ -125,9 +112,6 @@ private: FontInfo bits_; /// Language const * lang_; - /// - bool misspelled_; - /// Did latexWriteStartChanges open an encoding environment? mutable bool open_encoding_; }; @@ -137,8 +121,7 @@ private: inline bool operator==(Font const & font1, Font const & font2) { - return font1.bits_ == font2.bits_ && font1.lang_ == font2.lang_ - && font1.misspelled_ == font2.misspelled_; + return font1.bits_ == font2.bits_ && font1.lang_ == font2.lang_; } /// @@ -153,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