Unify naming of menu items

[features.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index a8c8275c944878538a5ea40f3cff5cad4907127d..aed80592a58fde7cb34bb0c4d976fb88bc53ddb8 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -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())
@@ -526,7 +522,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 +864,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() : "");
 }