We only support gcc >= 4.9.

[lyx.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index 1d6d0800c7b531d0cf18838a96c37053e787251b..26218eeeac280dde50a82bba5400b1f2f8cfd30e 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -112,29 +112,20 @@ void Font::setLanguage(Language const * l)
 }
 
 
-void Font::setProperties(FontInfo const & f)
-{
-       bits_.setFamily(f.family());
-       bits_.setSeries(f.series());
-       bits_.setShape(f.shape());
-       bits_.setSize(f.size());
-}
-
-
 /// 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());
 }
@@ -237,8 +228,8 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                                    OutputParams const & runparams,
                                    Font const & base,
                                    Font const & prev,
-                                   bool const & multipar_inset,
-                                   bool const & needs_cprotection) const
+                                   bool non_inherit_inset,
+                                   bool needs_cprotection) const
 {
        int count = 0;
 
@@ -352,7 +343,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                count += strlen(LaTeXSizeSwitchNames[f.size()]) + 1;
        }
        if (f.family() != INHERIT_FAMILY) {
-               if (multipar_inset) {
+               if (non_inherit_inset) {
                        os << '{';
                        ++count;
                        os << '\\' << LaTeXFamilySwitchNames[f.family()] << termcmd;
@@ -369,7 +360,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                }
        }
        if (f.series() != INHERIT_SERIES) {
-               if (multipar_inset) {
+               if (non_inherit_inset) {
                        os << '{';
                        ++count;
                        os << '\\' << LaTeXSeriesSwitchNames[f.series()] << termcmd;
@@ -386,7 +377,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                }
        }
        if (f.shape() != INHERIT_SHAPE) {
-               if (multipar_inset) {
+               if (non_inherit_inset) {
                        os << '{';
                        ++count;
                        os << '\\' << LaTeXShapeSwitchNames[f.shape()] << termcmd;
@@ -402,16 +393,12 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                        count += strlen(LaTeXShapeCommandNames[f.shape()]) + 2;
                }
        }
-       if (f.color() != Color_inherit && f.color() != Color_ignore && !multipar_inset) {
+       if (f.color() != Color_inherit && f.color() != Color_ignore) {
                if (f.color() == Color_none && p.color() != Color_none) {
                        // Color none: Close previous color, if any
                        os << '}';
                        ++count;
                } else if (f.color() != Color_none) {
-                       if (needs_cprotection) {
-                               os << "\\cprotect";
-                               count += 9;
-                       }
                        os << "\\textcolor{"
                           << from_ascii(lcolor.getLaTeXName(f.color()))
                           << "}{";
@@ -448,7 +435,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                        count += 9;
                }
        }
-       if (f.emph() == FONT_ON && !multipar_inset) {
+       if (f.emph() == FONT_ON) {
                if (needs_cprotection) {
                        os << "\\cprotect";
                        count += 9;
@@ -457,7 +444,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                count += 6;
        }
        // \noun{} is a LyX special macro
-       if (f.noun() == FONT_ON && !multipar_inset) {
+       if (f.noun() == FONT_ON) {
                if (needs_cprotection) {
                        os << "\\cprotect";
                        count += 9;
@@ -468,7 +455,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
        // The ulem commands need to be on the deepest nesting level
        // because ulem puts every nested group or macro in a box,
        // which prevents linebreaks (#8424, #8733)
-       if (f.underbar() == FONT_ON && !multipar_inset) {
+       if (f.underbar() == FONT_ON) {
                if (needs_cprotection) {
                        os << "\\cprotect";
                        count += 9;
@@ -477,7 +464,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                count += 7;
                ++runparams.inulemcmd;
        }
-       if (f.uuline() == FONT_ON && !multipar_inset) {
+       if (f.uuline() == FONT_ON) {
                if (needs_cprotection) {
                        os << "\\cprotect";
                        count += 9;
@@ -486,7 +473,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                count += 8;
                ++runparams.inulemcmd;
        }
-       if (f.strikeout() == FONT_ON && !multipar_inset) {
+       if (f.strikeout() == FONT_ON) {
                if (needs_cprotection) {
                        os << "\\cprotect";
                        count += 9;
@@ -495,7 +482,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                count += 6;
                ++runparams.inulemcmd;
        }
-       if (f.xout() == FONT_ON && !multipar_inset) {
+       if (f.xout() == FONT_ON) {
                if (needs_cprotection) {
                        os << "\\cprotect";
                        count += 9;
@@ -504,7 +491,7 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
                count += 6;
                ++runparams.inulemcmd;
        }
-       if (f.uwave() == FONT_ON && !multipar_inset) {
+       if (f.uwave() == FONT_ON) {
                if (runparams.inulemcmd) {
                        // needed with nested uwave in xout
                        // see https://tex.stackexchange.com/a/263042
@@ -531,8 +518,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
                                  Font const & base,
                                  Font const & next,
                                  bool & needPar,
-                                 bool const & closeLanguage,
-                                 bool const & multipar_inset) const
+                                 bool closeLanguage) const
 {
        int count = 0;
 
@@ -542,15 +528,15 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
        FontInfo f = bits_;
        f.reduce(base.bits_);
 
-       if (f.family() != INHERIT_FAMILY && !multipar_inset) {
+       if (f.family() != INHERIT_FAMILY) {
                os << '}';
                ++count;
        }
-       if (f.series() != INHERIT_SERIES && !multipar_inset) {
+       if (f.series() != INHERIT_SERIES) {
                os << '}';
                ++count;
        }
-       if (f.shape() != INHERIT_SHAPE && !multipar_inset) {
+       if (f.shape() != INHERIT_SHAPE) {
                os << '}';
                ++count;
        }
@@ -568,17 +554,15 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
        }
        if (f.size() != INHERIT_SIZE) {
                // We do not close size group in front of
-               // insets with allowMultiPar() true (as opposed
+               // insets with InheritFont() false (as opposed
                // to all other font properties) (#8384)
-               if (!multipar_inset) {
-                       if (needPar && !closeLanguage) {
-                               os << "\\par";
-                               count += 4;
-                               needPar = false;
-                       }
-                       os << '}';
-                       ++count;
+               if (needPar && !closeLanguage) {
+                       os << "\\par";
+                       count += 4;
+                       needPar = false;
                }
+               os << '}';
+               ++count;
        }
        if (f.underbar() == FONT_ON) {
                os << '}';
@@ -876,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() : "");
 }