Scons: update_po target, part one: language_l10n.pot

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 3b5e883d23ebe492690d6efdac707c37bd1cda4b..05949567d55e9fd3a291d8cc17276cbcb71e234c 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -23,7 +23,6 @@
 #include "LColor.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
-#include "output_latex.h"
 
 #include "support/lstrings.h"
 
@@ -738,13 +737,11 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
 /// Writes the head of the LaTeX needed to impose this font
 // Returns number of chars written.
 int LyXFont::latexWriteStartChanges(odocstream & os, LyXFont const & base,
-                                    LyXFont const & prev,
-                                    BufferParams const & bparams) const
+                                    LyXFont const & prev) const
 {
        bool env = false;
 
-       int count = switchEncoding(os, bparams, *(prev.language()->encoding()),
-                                  *(language()->encoding()));
+       int count = 0;
        if (language()->babel() != base.language()->babel() &&
            language() != prev.language()) {
                if (isRightToLeft() != prev.isRightToLeft()) {
@@ -836,8 +833,7 @@ int LyXFont::latexWriteStartChanges(odocstream & os, LyXFont const & base,
 // Returns number of chars written
 // This one corresponds to latexWriteStartChanges(). (Asger)
 int LyXFont::latexWriteEndChanges(odocstream & os, LyXFont const & base,
-                                  LyXFont const & next,
-                                  BufferParams const & bparams) const
+                                  LyXFont const & next) const
 {
        int count = 0;
        bool env = false;
@@ -901,8 +897,6 @@ int LyXFont::latexWriteEndChanges(odocstream & os, LyXFont const & base,
                os << '}';
                ++count;
        }
-       count += switchEncoding(os, bparams, *(language()->encoding()),
-                               *(next.language()->encoding()));
 
        return count;
 }