We only support gcc >= 4.9.

[lyx.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index a8c8275c944878538a5ea40f3cff5cad4907127d..26218eeeac280dde50a82bba5400b1f2f8cfd30e 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -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;
 
@@ -310,10 +310,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                        string const tmp =
                                subst(lyxrc.language_command_local,
                                      "$$lang", language()->babel());
-                       if (needs_cprotection && !prefixIs(tmp, "\\begin{")) {
-                               os << "\\cprotect";
-                               count += 9;
-                       }
                        os << from_ascii(tmp);
                        count += tmp.length();
                        if (!lyxrc.language_command_end.empty())
@@ -403,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()))
                           << "}{";
@@ -526,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;
 
@@ -868,7 +860,7 @@ ostream & operator<<(ostream & os, FontInfo const & f)
 ostream & operator<<(ostream & os, Font const & font)
 {
        return os << font.bits_
-               << " lang: " << (font.lang_ ? font.lang_->lang() : nullptr);
+               << " lang: " << (font.lang_ ? font.lang_->lang() : "");
 }