remove all INHERIT_LANG and INHERIT_LANGUAGE commented code.

[features.git] / src / paragraph.C

diff --git a/src/paragraph.C b/src/paragraph.C
index fe8cf4f368657cfa9632ceb52f6f3a82215597b4..1779d7482a2d81bd161e50f4870bacb269ebd44b 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -254,11 +254,7 @@ void Paragraph::write(Buffer const * buf, ostream & os,
                // Write font changes
                LyXFont font2 = getFontSettings(bparams, i);
                if (font2 != font1) {
-#ifndef INHERIT_LANGUAGE
                        font2.lyxWriteChanges(font1, os);
-#else
-                       font2.lyxWriteChanges(font1, bparams.language, os);
-#endif
                        column = 0;
                        font1 = font2;
                }
@@ -476,10 +472,6 @@ LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
                retfont = getFontSettings(bparams, pos - 1);
        } else
                retfont = LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams));
-#ifdef INHERIT_LANGUAGE
-       if (retfont.language() == inherit_language)
-               retfont.setLanguage(bparams.language);
-#endif
 
        return retfont;
 }
@@ -520,11 +512,7 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams,
                layoutfont = lout->font;
 
        LyXFont tmpfont = getFontSettings(bparams, pos);
-#ifndef INHERIT_LANGUAGE
        tmpfont.realize(layoutfont);
-#else
-       tmpfont.realize(layoutfont, bparams.language);
-#endif
 
        return pimpl_->realizeFont(tmpfont, bparams);
 }
@@ -1692,17 +1680,7 @@ Language const *
 Paragraph::getParLanguage(BufferParams const & bparams) const
 {
        if (!empty()) {
-#ifndef INHERIT_LANGUAGE
                return getFirstFontSettings().language();
-#else
-               Language const * lang = getFirstFontSettings().language();
-#ifdef WITH_WARNINGS
-#warning We should make this somewhat better, any ideas? (Jug)
-#endif
-               if (lang == inherit_language || lang == ignore_language)
-                       lang = bparams.language;
-               return lang;
-#endif
        } else if (previous_)
                return previous_->getParLanguage(bparams);
        else
@@ -1741,9 +1719,6 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams)
        for (; cit != end; ++cit)
                if (cit->font().language() != ignore_language &&
                    cit->font().language() != latex_language &&
-#ifdef INHERIT_LANGUAGE
-                       cit->font().language() != inherit_language &&
-#endif
                        cit->font().language() != doc_language)
                        return true;
        return false;