bool LaTeXFeatures::useBabel() const
{
- return lyxrc.language_use_babel ||
- (bufferParams().language->lang() != lyxrc.default_language &&
+ return (lyxrc.language_package_selection != LyXRC::LP_NONE) &&
+ ((bufferParams().language->lang() != lyxrc.default_language &&
!bufferParams().language->babel().empty()) ||
- this->hasLanguages();
+ this->hasLanguages());
}
"framed",
"soul",
"textcomp",
+ "subscript",
"pmboxdraw",
"bbding",
"ifsym",
"pdfpages",
"amscd",
"slashed",
- "multirow"
+ "multirow",
+ "tfrupee"
};
int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
// FIXME: currently, we can only load packages and macros known
// to LyX.
// However, with the Require tag of layouts/custom insets,
- // also inknown packages can be requested. They are silently
+ // also unknown packages can be requested. They are silently
// swallowed now. We should change this eventually.
//
packages << "\\PassOptionsToPackage{normalem}{ulem}\n"
"\\usepackage{ulem}\n";
- if (mustProvide("mhchem") &&
- params_.use_mhchem != BufferParams::package_off)
+ if (params_.use_mhchem == BufferParams::package_on ||
+ (mustProvide("mhchem") &&
+ params_.use_mhchem != BufferParams::package_off))
packages << "\\PassOptionsToPackage{version=3}{mhchem}\n"
"\\usepackage{mhchem}\n";
macros << changetracking_dvipost_def;
if (mustProvide("ct-xcolor-ulem")) {
- int const prec = macros.precision(2);
+ streamsize const prec = macros.precision(2);
RGBColor cadd = rgbFromHexName(lcolor.getX11Name(Color_addedtext));
macros << "\\providecolor{lyxadded}{rgb}{"
}
+string const LaTeXFeatures::getBabelPresettings() const
+{
+ ostringstream tmp;
+
+ LanguageList::const_iterator it = UsedLanguages_.begin();
+ LanguageList::const_iterator end = UsedLanguages_.end();
+ for (; it != end; ++it)
+ if (!(*it)->babel_presettings().empty())
+ tmp << (*it)->babel_presettings() << '\n';
+ if (!params_.language->babel_presettings().empty())
+ tmp << params_.language->babel_presettings() << '\n';
+
+ return tmp.str();
+}
+
+
string const LaTeXFeatures::getBabelPostsettings() const
{
ostringstream tmp;
LanguageList::const_iterator it = UsedLanguages_.begin();
- LanguageList::const_iterator end = UsedLanguages_.end();
+ LanguageList::const_iterator end = UsedLanguages_.end();
for (; it != end; ++it)
if (!(*it)->babel_postsettings().empty())
tmp << (*it)->babel_postsettings() << '\n';
}
+bool LaTeXFeatures::needBabelLangOptions() const
+{
+ if (!lyxrc.language_global_options || params_.language->asBabelOptions())
+ return true;
+
+ LanguageList::const_iterator it = UsedLanguages_.begin();
+ LanguageList::const_iterator end = UsedLanguages_.end();
+ for (; it != end; ++it)
+ if ((*it)->asBabelOptions())
+ return true;
+
+ return false;
+}
+
+
docstring const LaTeXFeatures::getTClassPreamble() const
{
// the text class specific preamble