Typo

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 8beb09623b562cb336a335dfa39362897c787b5e..d515ef488606490cc77a717d64a6a34523638137 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1036,6 +1036,8 @@ void TeXOnePar(Buffer const & buf,
        }
 
        runparams.moving_arg |= style.needprotect;
+       if (style.needmboxprotect)
+               ++runparams.inulemcmd;
        Encoding const * const prev_encoding = runparams.encoding;
 
        bool const useSetSpace = bparams.documentClass().provides("SetSpace");
@@ -1415,11 +1417,8 @@ void latexParagraphs(Buffer const & buf,
        if (maintext && !is_child && !bparams.useNonTeXFonts
            && (bparams.encoding().package() == Encoding::CJK
                        || (bparams.encoding().name() == "utf8"
-                               && bparams.language->encoding()->package() == Encoding::CJK)
-                               //  FIXME: should test if any language requires CJK
-                               //  && LaTeXFeatures::mustProvide("CJK"))
-                               // error: cannot call member function ‘bool lyx::LaTeXFeatures::mustProvide(const string&) const’ without object 
-                  )) {
+                               && runparams.use_CJK))
+          ) {
                docstring const cjkenc = bparams.encoding().iconvName() == "UTF-8"
                                                                 ? from_ascii("UTF8") : from_ascii(bparams.encoding().latexName());
                os << "\\begin{CJK}{" << cjkenc
@@ -1611,14 +1610,7 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
 
        Encoding const & oldEnc = *runparams.encoding;
        bool moving_arg = runparams.moving_arg;
-       // If we switch from/to CJK, we need to switch anyway, despite custom inputenc,
-       // except if we use CJKutf8 or explicitely set inputenc to a CJK encoding
-       bool const from_to_cjk =
-               ((oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK)
-                || (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK))
-               && bparams.encoding().iconvName() != "UTF8"
-               && bparams.encoding().package() != Encoding::CJK;
-       if (!force && !from_to_cjk
+       if (!force
            && ((bparams.inputenc != "auto" && bparams.inputenc != "default") || moving_arg))
                return make_pair(false, 0);
 
@@ -1692,9 +1684,8 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
                                os << "\\egroup";
                                count += 7;
                        }
-                       docstring const cjkenc = (bparams.encoding().iconvName() == "UTF-8"
-                                                                         ? from_ascii("UTF8") : from_ascii(newEnc.latexName()));
-                       os << "\\begin{CJK}{" << cjkenc << "}{"
+                       os << "\\begin{CJK}{"
+                          << from_ascii(newEnc.latexName()) << "}{"
                           << from_ascii(bparams.fonts_cjk) << "}";
                        state->open_encoding_ = CJK;
                        return make_pair(true, count + 15);