Fix screen display of parts and chapters in default classes

[lyx.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index 112b51c5e3cd0d40feb6b98c18d7143e0432a58d..b70c237db4d14498f798ea42e60c2a2036b9400d 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;
 
@@ -239,12 +239,8 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
            && language() != prev.language()) {
                if (!language()->polyglossia().empty()) {
                        string tmp;
-                       if (needs_cprotection) {
-                               if (contains(runparams.active_chars, '^'))
-                                       // cprotect relies on ^ being on catcode 7
-                                       tmp += "\\begingroup\\catcode`\\^=7";
+                       if (needs_cprotection)
                                tmp += "\\cprotect";
-                       }
                        tmp += "\\text" + language()->polyglossia();
                        if (!language()->polyglossiaOpts().empty()) {
                                tmp += "[" + language()->polyglossiaOpts() + "]";
@@ -252,12 +248,8 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                                        // We need to strip the command for
                                        // the pdf string, see #11813
                                        string tmpp;
-                                       if (needs_cprotection) {
-                                               if (contains(runparams.active_chars, '^'))
-                                                       // cprotect relies on ^ being on catcode 7
-                                                       os << "\\begingroup\\catcode`\\^=7";
+                                       if (needs_cprotection)
                                                tmpp = "\\cprotect";
-                                       }
                                        tmp = tmpp + "\\texorpdfstring{" + tmp + "}{}";
                                }
                        }
@@ -273,9 +265,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
            language() != prev.language()) {
                if (language()->lang() == "farsi") {
                        if (needs_cprotection) {
-                               if (contains(runparams.active_chars, '^'))
-                                       // cprotect relies on ^ being on catcode 7
-                                       os << "\\begingroup\\catcode`\\^=7";
                                os << "\\cprotect";
                                count += 9;
                        }
@@ -284,9 +273,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                } else if (!isRightToLeft() &&
                            base.language()->lang() == "farsi") {
                        if (needs_cprotection) {
-                               if (contains(runparams.active_chars, '^'))
-                                       // cprotect relies on ^ being on catcode 7
-                                       os << "\\begingroup\\catcode`\\^=7";
                                os << "\\cprotect";
                                count += 9;
                        }
@@ -294,9 +280,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                        count += 8;
                } else if (language()->lang() == "arabic_arabi") {
                        if (needs_cprotection) {
-                               if (contains(runparams.active_chars, '^'))
-                                       // cprotect relies on ^ being on catcode 7
-                                       os << "\\begingroup\\catcode`\\^=7";
                                os << "\\cprotect";
                                count += 9;
                        }
@@ -305,9 +288,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                } else if (!isRightToLeft() &&
                                base.language()->lang() == "arabic_arabi") {
                        if (needs_cprotection) {
-                               if (contains(runparams.active_chars, '^'))
-                                       // cprotect relies on ^ being on catcode 7
-                                       os << "\\begingroup\\catcode`\\^=7";
                                os << "\\cprotect";
                                count += 9;
                        }
@@ -316,9 +296,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                // currently the remaining RTL languages are arabic_arabtex and hebrew
                } else if (isRightToLeft() != prev.isRightToLeft()) {
                        if (needs_cprotection) {
-                               if (contains(runparams.active_chars, '^'))
-                                       // cprotect relies on ^ being on catcode 7
-                                       os << "\\begingroup\\catcode`\\^=7";
                                os << "\\cprotect";
                                count += 9;
                        }
@@ -333,13 +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{")) {
-                               if (contains(runparams.active_chars, '^'))
-                                       // cprotect relies on ^ being on catcode 7
-                                       os << "\\begingroup\\catcode`\\^=7";
-                               os << "\\cprotect";
-                               count += 9;
-                       }
                        os << from_ascii(tmp);
                        count += tmp.length();
                        if (!lyxrc.language_command_end.empty())
@@ -380,9 +350,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                        count += strlen(LaTeXFamilySwitchNames[f.family()]) + 1;
                } else {
                        if (needs_cprotection) {
-                               if (contains(runparams.active_chars, '^'))
-                                       // cprotect relies on ^ being on catcode 7
-                                       os << "\\begingroup\\catcode`\\^=7";
                                os << "\\cprotect";
                                count += 9;
                        }
@@ -400,9 +367,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                        count += strlen(LaTeXSeriesSwitchNames[f.series()]) + 1;
                } else {
                        if (needs_cprotection) {
-                               if (contains(runparams.active_chars, '^'))
-                                       // cprotect relies on ^ being on catcode 7
-                                       os << "\\begingroup\\catcode`\\^=7";
                                os << "\\cprotect";
                                count += 9;
                        }
@@ -420,9 +384,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                        count += strlen(LaTeXShapeSwitchNames[f.shape()]) + 1;
                } else {
                        if (needs_cprotection) {
-                               if (contains(runparams.active_chars, '^'))
-                                       // cprotect relies on ^ being on catcode 7
-                                       os << "\\begingroup\\catcode`\\^=7";
                                os << "\\cprotect";
                                count += 9;
                        }
@@ -439,9 +400,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                        ++count;
                } else if (f.color() != Color_none) {
                        if (needs_cprotection) {
-                               if (contains(runparams.active_chars, '^'))
-                                       // cprotect relies on ^ being on catcode 7
-                                       os << "\\begingroup\\catcode`\\^=7";
                                os << "\\cprotect";
                                count += 9;
                        }
@@ -483,9 +441,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
        }
        if (f.emph() == FONT_ON) {
                if (needs_cprotection) {
-                       if (contains(runparams.active_chars, '^'))
-                               // cprotect relies on ^ being on catcode 7
-                               os << "\\begingroup\\catcode`\\^=7";
                        os << "\\cprotect";
                        count += 9;
                }
@@ -495,9 +450,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
        // \noun{} is a LyX special macro
        if (f.noun() == FONT_ON) {
                if (needs_cprotection) {
-                       if (contains(runparams.active_chars, '^'))
-                               // cprotect relies on ^ being on catcode 7
-                               os << "\\begingroup\\catcode`\\^=7";
                        os << "\\cprotect";
                        count += 9;
                }
@@ -509,9 +461,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
        // which prevents linebreaks (#8424, #8733)
        if (f.underbar() == FONT_ON) {
                if (needs_cprotection) {
-                       if (contains(runparams.active_chars, '^'))
-                               // cprotect relies on ^ being on catcode 7
-                               os << "\\begingroup\\catcode`\\^=7";
                        os << "\\cprotect";
                        count += 9;
                }
@@ -521,9 +470,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
        }
        if (f.uuline() == FONT_ON) {
                if (needs_cprotection) {
-                       if (contains(runparams.active_chars, '^'))
-                               // cprotect relies on ^ being on catcode 7
-                               os << "\\begingroup\\catcode`\\^=7";
                        os << "\\cprotect";
                        count += 9;
                }
@@ -533,9 +479,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
        }
        if (f.strikeout() == FONT_ON) {
                if (needs_cprotection) {
-                       if (contains(runparams.active_chars, '^'))
-                               // cprotect relies on ^ being on catcode 7
-                               os << "\\begingroup\\catcode`\\^=7";
                        os << "\\cprotect";
                        count += 9;
                }
@@ -545,9 +488,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
        }
        if (f.xout() == FONT_ON) {
                if (needs_cprotection) {
-                       if (contains(runparams.active_chars, '^'))
-                               // cprotect relies on ^ being on catcode 7
-                               os << "\\begingroup\\catcode`\\^=7";
                        os << "\\cprotect";
                        count += 9;
                }
@@ -563,9 +503,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                        count += 15;
                }
                if (needs_cprotection) {
-                       if (contains(runparams.active_chars, '^'))
-                               // cprotect relies on ^ being on catcode 7
-                               os << "\\begingroup\\catcode`\\^=7";
                        os << "\\cprotect";
                        count += 9;
                }
@@ -585,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;
 
@@ -927,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() : "");
 }