Sanitize CJK support (fix bug 3561, 4349 and 4337):

[features.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index ce59fd231b54af77fd375cd7defcae6cad2978c9..7821c58e85685f79818793b7da8832135c302c3f 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -464,7 +464,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 
        if (language()->encoding()->package() == Encoding::CJK) {
                pair<bool, int> const c = switchEncoding(os, bparams,
-                               runparams.moving_arg, *(runparams.encoding),
+                               runparams, *(runparams.encoding),
                                *(language()->encoding()));
                if (c.first) {
                        open_encoding_ = true;
@@ -635,7 +635,7 @@ int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
                // to do correct environment nesting
                Encoding const * const ascii = encodings.getFromLyXName("ascii");
                pair<bool, int> const c = switchEncoding(os, bparams,
-                               runparams.moving_arg, *(runparams.encoding),
+                               runparams, *(runparams.encoding),
                                *ascii);
                BOOST_ASSERT(c.first);
                count += c.second;