Fix #10778 (issue with CJK and language nesting)

[lyx.git] / src / Font.h

diff --git a/src/Font.h b/src/Font.h
index 9b36822cab9deb01df1c5639ffa7f2ebcd4572f6..8b8ddf8d28acb308bf616c614e6213315e167696 100644 (file)
--- 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 {
@@ -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,10 +81,11 @@ 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,
+                                bool & needPar,
                                 bool const & closeLanguage = true) const;
 
 
@@ -121,7 +113,6 @@ private:
        FontInfo bits_;
        ///
        Language const * lang_;
-
        /// Did latexWriteStartChanges open an encoding environment?
        mutable bool open_encoding_;
 };
@@ -146,26 +137,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