static docstring const lyx_def = from_ascii(
"\\providecommand{\\LyX}{L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}");
+static docstring const lyx_hyperref_def = from_ascii(
+ "\\providecommand{\\LyX}{\\texorpdfstring%\n"
+ " {L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}\n"
+ " {LyX}}");
+
static docstring const noun_def = from_ascii(
"\\newcommand{\\noun}[1]{\\textsc{#1}}");
static docstring const lyxgreyedout_def = from_ascii(
"%% The greyedout annotation environment\n"
- "\\newenvironment{lyxgreyedout}{\\textcolor{note_fontcolor}\\bgroup}{\\egroup}\n");
+ "\\newenvironment{lyxgreyedout}\n"
+ " {\\textcolor{note_fontcolor}\\bgroup\\ignorespaces}\n"
+ " {\\ignorespacesafterend\\egroup}\n");
// We want to omit the file extension for includegraphics, but this does not
// work when the filename contains other dots.
"\\newcommand{\\ogonek}[1]{\\mathpalette\\doogonek{#1}}\n");
static docstring const lyxref_def = from_ascii(
- "\\makeatletter\n"
- "\\def\\lyxref#1{\\@lyxref#1:@@@@@:}\n"
- "\\def\\@lyxref#1:#2:{%\n"
- "\\ifthenelse{\\equal{#2}{@@@@@}}%\n"
- " {\\ref{#1}}%\n"
- " {\\@@lyxref#1:#2:}%\n"
- "}\n"
- "\\def\\@@lyxref#1:#2:@@@@@:{%\n"
- " \\RS@ifundefined{#1ref}%\n"
- " {\\ref{#1:#2}}%\n"
- " {\\RS@nameuse{#1ref}{#2}}%\n"
- "}\n"
- "\\RS@ifundefined{\thmref}\n"
- " {\\def\\RSthmtxt{theorem~}\\newref{thm}{name = \\RSthmtxt}}\n"
- " {}\n"
- "\\makeatother\n"
- );
+ "\\RS@ifundefined{subref}\n"
+ " {\\def\\RSsubtxt{section~}\\newref{sub}{name = \\RSsubtxt}}\n"
+ " {}\n"
+ "\\RS@ifundefined{thmref}\n"
+ " {\\def\\RSthmtxt{theorem~}\\newref{thm}{name = \\RSthmtxt}}\n"
+ " {}\n"
+ "\\RS@ifundefined{lemref}\n"
+ " {\\def\\RSlemtxt{lemma~}\\newref{lem}{name = \\RSlemtxt}}\n"
+ " {}\n");
+
/////////////////////////////////////////////////////////////////////
//
bool LaTeXFeatures::useBabel() const
{
- return lyxrc.language_use_babel ||
- (bufferParams().language->lang() != lyxrc.default_language &&
- !bufferParams().language->babel().empty()) ||
- this->hasLanguages();
+ if (usePolyglossia())
+ return false;
+ return (lyxrc.language_package_selection != LyXRC::LP_NONE)
+ || (bufferParams().language->lang() != lyxrc.default_language
+ && !bufferParams().language->babel().empty())
+ || this->hasLanguages();
+}
+
+
+bool LaTeXFeatures::usePolyglossia() const
+{
+ return (lyxrc.language_package_selection == LyXRC::LP_AUTO)
+ && isRequired("polyglossia")
+ && isAvailable("polyglossia")
+ && !params_.documentClass().provides("babel")
+ && this->hasPolyglossiaLanguages();
}
}
+bool LaTeXFeatures::hasPolyglossiaLanguages() const
+{
+ LanguageList::const_iterator const begin = UsedLanguages_.begin();
+ for (LanguageList::const_iterator cit = begin;
+ cit != UsedLanguages_.end();
+ ++cit) {
+ if ((*cit)->polyglossia().empty())
+ return false;
+ }
+ return true;
+}
+
+
string LaTeXFeatures::getLanguages() const
{
ostringstream languages;
}
+std::map<std::string, std::string> LaTeXFeatures::getPolyglossiaLanguages() const
+{
+ std::map<std::string, std::string> languages;
+
+ LanguageList::const_iterator const begin = UsedLanguages_.begin();
+ for (LanguageList::const_iterator cit = begin;
+ cit != UsedLanguages_.end();
+ ++cit) {
+ languages[(*cit)->polyglossia()] = (*cit)->polyglossiaOpts();
+ }
+ return languages;
+}
+
+
set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
{
// This does only find encodings of languages supported by babel, but
"csquotes",
"enumitem",
"endnotes",
+ "hhline",
"ifthen",
- "amsthm",
// listings is handled in BufferParams.cpp
"bm",
"pdfpages",
"amscd",
"slashed",
- "multirow"
+ "multirow",
+ "tfrupee"
};
int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
if (mustProvide("color") || mustProvide("xcolor")) {
string const package =
(mustProvide("xcolor") ? "xcolor" : "color");
- if (params_.graphicsDriver == "default"
- || params_.graphicsDriver == "none")
+ if (params_.graphics_driver == "default"
+ || params_.graphics_driver == "none")
colors << "\\usepackage{" << package << "}\n";
else
colors << "\\usepackage["
- << params_.graphicsDriver
+ << params_.graphics_driver
<< "]{" << package << "}\n";
}
// 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.
//
// than those above.
//
- // esint is preferred for esintoramsmath
- if ((mustProvide("amsmath")
- && params_.use_amsmath != BufferParams::package_off)
- || (mustProvide("esintoramsmath")
- && params_.use_esint == BufferParams::package_off
- && params_.use_amsmath != BufferParams::package_off)) {
- packages << "\\usepackage{amsmath}\n";
- } else {
- // amsbsy and amstext are already provided by amsmath
- if (mustProvide("amsbsy"))
- packages << "\\usepackage{amsbsy}\n";
- if (mustProvide("amstext"))
- packages << "\\usepackage{amstext}\n";
- }
-
+ // if fontspec is used, AMS packages have to be loaded before
+ // fontspec (in BufferParams)
+ if (!params_.useNonTeXFonts && !loadAMSPackages().empty())
+ packages << loadAMSPackages();
+
+ // fixltx2e must be loaded after amsthm, since amsthm produces an error with
+ // the redefined \[ command (bug 7233). Load is as early as possible, since
+ // other packages might profit from it.
+ if (mustProvide("fixltx2e"))
+ packages << "\\usepackage{fixltx2e}\n";
+
// wasysym is a simple feature, but it must be after amsmath if both
// are used
// wasysym redefines some integrals (e.g. iint) from amsmath. That
}
// graphicx.sty
- if (mustProvide("graphicx") && params_.graphicsDriver != "none") {
- if (params_.graphicsDriver == "default")
+ if (mustProvide("graphicx") && params_.graphics_driver != "none") {
+ if (params_.graphics_driver == "default")
packages << "\\usepackage{graphicx}\n";
else
packages << "\\usepackage["
- << params_.graphicsDriver
+ << params_.graphics_driver
<< "]{graphicx}\n";
}
if (mustProvide("setspace") && !tclass.provides("SetSpace"))
packages << "\\usepackage{setspace}\n";
- // amssymb.sty
- if (mustProvide("amssymb")
- || params_.use_amsmath == BufferParams::package_on)
- packages << "\\usepackage{amssymb}\n";
-
// esint must be after amsmath and wasysym, since it will redeclare
// inconsistent integral symbols
if ((mustProvide("esint") || mustProvide("esintoramsmath")) &&
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";
"\\makenomenclature\n";
}
+ // fixltx2e provides subscript
+ if (mustProvide("subscript") && !isRequired("fixltx2e"))
+ packages << "\\usepackage{subscript}\n";
+
return packages.str();
}
macros << papersizepdf_def << '\n';
}
- if (mustProvide("LyX"))
- macros << lyx_def << '\n';
+ if (mustProvide("LyX")) {
+ if (isRequired("hyperref"))
+ macros << lyx_hyperref_def << '\n';
+ else
+ macros << lyx_def << '\n';
+ }
if (mustProvide("noun"))
macros << noun_def << '\n';
if (mustProvide("lyxarrow"))
macros << lyxarrow_def << '\n';
- if (mustProvide("textgreek")) {
+ if (!usePolyglossia() && mustProvide("textgreek")) {
// Avoid a LaTeX error if times fonts are used and the grtimes
// package is installed but actual fonts are not (bug 6469).
- if (params_.fontsRoman == "times")
+ if (params_.fonts_roman == "times")
macros << subst(textgreek_def,
from_ascii("\\greektext #1"),
from_ascii("%\n \\IfFileExists"
macros << textgreek_def << '\n';
}
- if (mustProvide("textcyr"))
+ if (!usePolyglossia() && mustProvide("textcyr"))
macros << textcyr_def << '\n';
if (mustProvide("lyxmathsym"))
// floats
getFloatDefinitions(macros);
- if (mustProvide("refstyle"))
- macros << lyxref_def << '\n';
-
+ if (mustProvide("refstyle"))
+ macros << lyxref_def << '\n';
+
// change tracking
if (mustProvide("ct-dvipost"))
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::getBabelOptions() const
+string const LaTeXFeatures::getBabelPresettings() 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_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();
for (; it != end; ++it)
- if (!(*it)->latex_options().empty())
- tmp << (*it)->latex_options() << '\n';
- if (!params_.language->latex_options().empty())
- tmp << params_.language->latex_options() << '\n';
+ if (!(*it)->babel_postsettings().empty())
+ tmp << (*it)->babel_postsettings() << '\n';
+ if (!params_.language->babel_postsettings().empty())
+ tmp << params_.language->babel_postsettings() << '\n';
+
+ return tmp.str();
+}
+
+
+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;
+}
+
+
+string const LaTeXFeatures::loadAMSPackages() const
+{
+ ostringstream tmp;
+ if (mustProvide("amsthm"))
+ tmp << "\\usepackage{amsthm}\n";
+
+ // esint is preferred for esintoramsmath
+ if ((mustProvide("amsmath")
+ && params_.use_amsmath != BufferParams::package_off)
+ || (mustProvide("esintoramsmath")
+ && params_.use_esint == BufferParams::package_off
+ && params_.use_amsmath != BufferParams::package_off)) {
+ tmp << "\\usepackage{amsmath}\n";
+ } else {
+ // amsbsy and amstext are already provided by amsmath
+ if (mustProvide("amsbsy"))
+ tmp << "\\usepackage{amsbsy}\n";
+ if (mustProvide("amstext"))
+ tmp << "\\usepackage{amstext}\n";
+ }
+
+ if (mustProvide("amssymb")
+ || params_.use_amsmath == BufferParams::package_on)
+ tmp << "\\usepackage{amssymb}\n";
return tmp.str();
}
}
-docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel) const
+docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel, bool use_polyglossia) const
{
DocumentClass const & tclass = params_.documentClass();
// collect preamble snippets in a set to prevent multiple identical
list<docstring>::const_iterator end = usedLayouts_.end();
for (; cit != end; ++cit) {
// language dependent commands (once per document)
- snippets.insert(tclass[*cit].langpreamble(buffer().language()));
+ snippets.insert(tclass[*cit].langpreamble(buffer().language(),
+ use_polyglossia));
// commands for language changing (for multilanguage documents)
- if (use_babel && !UsedLanguages_.empty()) {
- snippets.insert(tclass[*cit].babelpreamble(buffer().language()));
+ if ((use_babel || use_polyglossia) && !UsedLanguages_.empty()) {
+ snippets.insert(tclass[*cit].babelpreamble(buffer().language(),
+ use_polyglossia));
for (lang_it lit = lbeg; lit != lend; ++lit)
- snippets.insert(tclass[*cit].babelpreamble(*lit));
+ snippets.insert(tclass[*cit].babelpreamble(*lit, use_polyglossia));
}
}
- if (use_babel && !UsedLanguages_.empty()) {
+ if ((use_babel || use_polyglossia) && !UsedLanguages_.empty()) {
FloatList const & floats = params_.documentClass().floats();
UsedFloats::const_iterator fit = usedFloats_.begin();
UsedFloats::const_iterator fend = usedFloats_.end();
docstring const flname = from_utf8(fl.name());
docstring name = translateIfPossible(flname,
buffer().language()->code());
- snippets.insert(getFloatI18nPreamble(
- type, name,
- from_ascii(buffer().language()->babel())));
+ if (use_polyglossia)
+ snippets.insert(getFloatI18nPreamble(
+ type, name,
+ from_ascii(buffer().language()->polyglossia())));
+ else
+ snippets.insert(getFloatI18nPreamble(
+ type, name,
+ from_ascii(buffer().language()->babel())));
for (lang_it lit = lbeg; lit != lend; ++lit) {
name = translateIfPossible(flname,
(*lit)->code());
- snippets.insert(getFloatI18nPreamble(
- type, name,
- from_ascii((*lit)->babel())));
+ if (use_polyglossia)
+ snippets.insert(getFloatI18nPreamble(
+ type, name,
+ from_ascii((*lit)->polyglossia())));
+ else
+ snippets.insert(getFloatI18nPreamble(
+ type, name,
+ from_ascii((*lit)->babel())));
}
}
}
projects / lyx.git / blobdiff