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.
{
if (usePolyglossia())
return false;
- return (lyxrc.language_package_selection != LyXRC::LP_NONE)
- || (bufferParams().language->lang() != lyxrc.default_language
- && !bufferParams().language->babel().empty())
- || this->hasLanguages();
+ if (bufferParams().lang_package == "default")
+ return (lyxrc.language_package_selection != LyXRC::LP_NONE)
+ || (bufferParams().language->lang() != lyxrc.default_language
+ && !bufferParams().language->babel().empty())
+ || this->hasLanguages();
+ return (bufferParams().lang_package != "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")
- && this->hasPolyglossiaLanguages();
+ if (bufferParams().lang_package == "default")
+ return (lyxrc.language_package_selection == LyXRC::LP_AUTO)
+ && isRequired("polyglossia")
+ && isAvailable("polyglossia")
+ && !params_.documentClass().provides("babel")
+ && this->hasPolyglossiaLanguages();
+ return (bufferParams().lang_package == "auto")
+ && isRequired("polyglossia")
+ && isAvailable("polyglossia")
+ && !params_.documentClass().provides("babel")
+ && this->hasPolyglossiaLanguages();
}
// use the "H" modifier. This includes modified table and
// figure floats. (Lgb)
Floating const & fl = params_.documentClass().floats().getType(name);
- if (!fl.floattype().empty() && fl.needsFloatPkg()) {
+ if (!fl.floattype().empty() && fl.usesFloatPkg()) {
require("float");
}
}
"framed",
"soul",
"textcomp",
- "fixltx2e",
"pmboxdraw",
"bbding",
"ifsym",
"marvosym",
"txfonts",
+ "pxfonts",
+ "mathdesign",
"mathrsfs",
+ "mathabx",
"ascii",
"url",
"covington",
"csquotes",
"enumitem",
"endnotes",
+ "hhline",
"ifthen",
- "amsthm",
// listings is handled in BufferParams.cpp
"bm",
"pdfpages",
// 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)
+ string const amsPackages = loadAMSPackages();
+ if (!params_.useNonTeXFonts && !amsPackages.empty())
+ packages << amsPackages;
+
+ // 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
if (mustProvide("yhmath"))
packages << "\\usepackage{yhmath}\n";
+ if (mustProvide("undertilde") &&
+ params_.use_undertilde != BufferParams::package_off)
+ packages << "\\usepackage{undertilde}\n";
+
// [x]color and pdfcolmk are handled in getColorOptions() above
// makeidx.sty
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")) &&
+ if (mustProvide("esint") &&
params_.use_esint != BufferParams::package_off)
packages << "\\usepackage{esint}\n";
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';
}
+string const LaTeXFeatures::loadAMSPackages() const
+{
+ ostringstream tmp;
+ if (mustProvide("amsthm"))
+ tmp << "\\usepackage{amsthm}\n";
+
+ if (mustProvide("amsmath")
+ && 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::getTClassPreamble() const
{
// the text class specific preamble
namespace {
-docstring const getFloatI18nPreamble(docstring const & type, docstring const & name, docstring const & lang)
+docstring const getFloatI18nPreamble(docstring const & type,
+ docstring const & name, Language const * lang,
+ Encoding const & enc, bool const polyglossia)
{
+ docstring const language = polyglossia ? from_ascii(lang->polyglossia())
+ : from_ascii(lang->babel());
+ docstring const langenc = from_ascii(lang->encoding()->iconvName());
+ docstring const texenc = from_ascii(lang->encoding()->latexName());
+ docstring const bufenc = from_ascii(enc.iconvName());
+ docstring const s1 = docstring(1, 0xF0000);
+ docstring const s2 = docstring(1, 0xF0001);
+ docstring const translated = (langenc == bufenc) ? name
+ : from_ascii("\\inputencoding{") + texenc + from_ascii("}")
+ + s1 + langenc + s2 + translated + s1 + bufenc + s2;
+
odocstringstream os;
- os << "\\addto\\captions" << lang
- << "{\\renewcommand{\\" << type << "name}{" << name << "}}\n";
+ os << "\\addto\\captions" << language
+ << "{\\renewcommand{\\" << type << "name}{" << translated << "}}\n";
return os.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(),
+ buffer().params().encoding(),
+ 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(),
+ buffer().params().encoding(),
+ use_polyglossia));
for (lang_it lit = lbeg; lit != lend; ++lit)
- snippets.insert(tclass[*cit].babelpreamble(*lit));
+ snippets.insert(tclass[*cit].babelpreamble(
+ *lit,
+ buffer().params().encoding(),
+ 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();
for (; fit != fend; ++fit) {
Floating const & fl = floats.getType(fit->first);
+ // we assume builtin floats are translated
+ if (fl.isPredefined())
+ continue;
docstring const type = from_ascii(fl.floattype());
docstring const flname = from_utf8(fl.name());
- docstring name = translateIfPossible(flname,
- buffer().language()->code());
- snippets.insert(getFloatI18nPreamble(
- type, name,
- from_ascii(buffer().language()->babel())));
- for (lang_it lit = lbeg; lit != lend; ++lit) {
- name = translateIfPossible(flname,
- (*lit)->code());
+ docstring name = buffer().language()->translateLayout(fl.name());
+ // only request translation if we have a real translation
+ // (that differs from the source)
+ if (flname != name)
snippets.insert(getFloatI18nPreamble(
- type, name,
- from_ascii((*lit)->babel())));
+ type, name, buffer().language(),
+ buffer().params().encoding(),
+ use_polyglossia));
+ for (lang_it lit = lbeg; lit != lend; ++lit) {
+ string const code = (*lit)->code();
+ name = (*lit)->translateLayout(fl.name());
+ // we assume we have a suitable translation if
+ // either the language is English (we need to
+ // translate into English if English is a secondary
+ // language) or if translateIfPossible returns
+ // something different to the English source.
+ bool const have_translation =
+ (flname != name || contains(code, "en"));
+ if (have_translation)
+ snippets.insert(getFloatI18nPreamble(
+ type, name, *lit,
+ buffer().params().encoding(),
+ use_polyglossia));
}
}
}
Floating const & fl = floats.getType(cit->first);
// For builtin floats we do nothing.
- if (!fl.needsFloatPkg())
+ if (fl.isPredefined())
continue;
// We have to special case "table" and "figure"
docstring const ext = from_ascii(fl.ext());
docstring const within = from_ascii(fl.within());
docstring const style = from_ascii(fl.style());
- docstring const name = translateIfPossible(
- from_utf8(fl.name()),
- buffer().language()->code());
+ docstring const name =
+ buffer().language()->translateLayout(fl.name());
os << "\\floatstyle{" << style << "}\n"
<< "\\newfloat{" << type << "}{" << placement
<< "}{" << ext << '}';
}
+void LaTeXFeatures::resolveAlternatives()
+{
+ for (Features::iterator it = features_.begin(); it != features_.end();) {
+ if (contains(*it, '|')) {
+ vector<string> const alternatives = getVectorFromString(*it, "|");
+ vector<string>::const_iterator const end = alternatives.end();
+ vector<string>::const_iterator ita = alternatives.begin();
+ for (; ita != end; ++ita) {
+ if (isRequired(*ita))
+ break;
+ }
+ if (ita == end)
+ require(alternatives.front());
+ features_.erase(it);
+ it = features_.begin();
+ } else
+ ++it;
+ }
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff