]> git.lyx.org Git - features.git/blobdiff - src/Font.cpp
Find: Renamend for_searchAdv to for_serach in src/OutputParams.h
[features.git] / src / Font.cpp
index fda0854fe1f9819dabbf90564dc127f7fa88b8bb..514bf03725fc40f6b3584b6920bab9eabeade35b 100644 (file)
@@ -114,18 +114,18 @@ void Font::setLanguage(Language const * l)
 
 /// Updates font settings according to request
 void Font::update(Font const & newfont,
-                    Language const * document_language,
+                    Language const * default_lang,
                     bool toggleall)
 {
        bits_.update(newfont.fontInfo(), toggleall);
 
        if (newfont.language() == language() && toggleall)
-               if (language() == document_language)
+               if (language() == default_lang)
                        setLanguage(default_language);
                else
-                       setLanguage(document_language);
+                       setLanguage(default_lang);
        else if (newfont.language() == reset_language)
-               setLanguage(document_language);
+               setLanguage(default_lang);
        else if (newfont.language() != ignore_language)
                setLanguage(newfont.language());
 }
@@ -228,8 +228,8 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                                    OutputParams const & runparams,
                                    Font const & base,
                                    Font const & prev,
-                                   bool const & non_inherit_inset,
-                                   bool const & needs_cprotection) const
+                                   bool non_inherit_inset,
+                                   bool needs_cprotection) const
 {
        int count = 0;
 
@@ -399,10 +399,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                        os << '}';
                        ++count;
                } else if (f.color() != Color_none) {
-                       if (needs_cprotection) {
-                               os << "\\cprotect";
-                               count += 9;
-                       }
                        os << "\\textcolor{"
                           << from_ascii(lcolor.getLaTeXName(f.color()))
                           << "}{";
@@ -522,7 +518,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
                                  Font const & base,
                                  Font const & next,
                                  bool & needPar,
-                                 bool const & closeLanguage) const
+                                 bool closeLanguage) const
 {
        int count = 0;
 
@@ -635,7 +631,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
                bool const using_begin_end =
                        runparams.use_polyglossia ||
                                !lyxrc.language_command_end.empty();
-               if (using_begin_end)
+               if (using_begin_end && !languageStackEmpty())
                        popLanguageName();
        }
 
@@ -762,34 +758,34 @@ void Font::validate(LaTeXFeatures & features) const
        Language const * doc_language = bparams.language;
 
        if (bits_.noun() == FONT_ON) {
-               LYXERR(Debug::LATEX, "font.noun: " << bits_.noun());
+               LYXERR(Debug::OUTFILE, "font.noun: " << bits_.noun());
                features.require("noun");
-               LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText()));
+               LYXERR(Debug::OUTFILE, "Noun enabled. Font: " << to_utf8(stateText()));
        }
        if (bits_.underbar() == FONT_ON) {
-               LYXERR(Debug::LATEX, "font.underline: " << bits_.underbar());
+               LYXERR(Debug::OUTFILE, "font.underline: " << bits_.underbar());
                features.require("ulem");
-               LYXERR(Debug::LATEX, "Underline enabled. Font: " << to_utf8(stateText()));
+               LYXERR(Debug::OUTFILE, "Underline enabled. Font: " << to_utf8(stateText()));
        }
        if (bits_.strikeout() == FONT_ON) {
-               LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout());
+               LYXERR(Debug::OUTFILE, "font.strikeout: " << bits_.strikeout());
                features.require("ulem");
-               LYXERR(Debug::LATEX, "Strike out enabled. Font: " << to_utf8(stateText()));
+               LYXERR(Debug::OUTFILE, "Strike out enabled. Font: " << to_utf8(stateText()));
        }
        if (bits_.xout() == FONT_ON) {
-               LYXERR(Debug::LATEX, "font.xout: " << bits_.xout());
+               LYXERR(Debug::OUTFILE, "font.xout: " << bits_.xout());
                features.require("ulem");
-               LYXERR(Debug::LATEX, "Cross out enabled. Font: " << to_utf8(stateText()));
+               LYXERR(Debug::OUTFILE, "Cross out enabled. Font: " << to_utf8(stateText()));
        }
        if (bits_.uuline() == FONT_ON) {
-               LYXERR(Debug::LATEX, "font.uuline: " << bits_.uuline());
+               LYXERR(Debug::OUTFILE, "font.uuline: " << bits_.uuline());
                features.require("ulem");
-               LYXERR(Debug::LATEX, "Double underline enabled. Font: " << to_utf8(stateText()));
+               LYXERR(Debug::OUTFILE, "Double underline enabled. Font: " << to_utf8(stateText()));
        }
        if (bits_.uwave() == FONT_ON) {
-               LYXERR(Debug::LATEX, "font.uwave: " << bits_.uwave());
+               LYXERR(Debug::OUTFILE, "font.uwave: " << bits_.uwave());
                features.require("ulem");
-               LYXERR(Debug::LATEX, "Wavy underline enabled. Font: " << to_utf8(stateText()));
+               LYXERR(Debug::OUTFILE, "Wavy underline enabled. Font: " << to_utf8(stateText()));
        }
        switch (bits_.color()) {
                case Color_none:
@@ -815,7 +811,7 @@ void Font::validate(LaTeXFeatures & features) const
                        break;
                default:
                        features.require("color");
-                       LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText()));
+                       LYXERR(Debug::OUTFILE, "Color enabled. Font: " << to_utf8(stateText()));
        }
 
        // FIXME: Do something for background and soul package?
@@ -827,7 +823,7 @@ void Font::validate(LaTeXFeatures & features) const
            && lang_ != latex_language)
        {
                features.useLanguage(lang_);
-               LYXERR(Debug::LATEX, "Found language " << lang_->lang());
+               LYXERR(Debug::OUTFILE, "Found language " << lang_->lang());
        }
 }