X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=61bd0a7a03da8ae4b5e004bb1049b65065e32a63;hb=dc7c7ca03eca25cf7a6395c155b70dac1594e481;hp=ac8a5b661c3c681dd6c148c68ad071f1af09d800;hpb=148f2d648c8b43fd61120dca45a825b5b0ce4e91;p=lyx.git diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index ac8a5b661c..61bd0a7a03 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -60,6 +60,11 @@ namespace lyx { 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}}"); @@ -158,7 +163,9 @@ static docstring const tabularnewline_def = from_ascii( 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. @@ -285,10 +292,33 @@ LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p, 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; + 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 +{ + 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(); } @@ -440,7 +470,7 @@ void LaTeXFeatures::useFloat(string const & name, bool subfloat) // 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"); } } @@ -474,6 +504,19 @@ bool LaTeXFeatures::hasLanguages() const } +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; @@ -490,6 +533,20 @@ string LaTeXFeatures::getLanguages() const } +std::map LaTeXFeatures::getPolyglossiaLanguages() const +{ + std::map 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 LaTeXFeatures::getEncodingSet(string const & doc_encoding) const { // This does only find encodings of languages supported by babel, but @@ -549,14 +606,15 @@ char const * simplefeatures[] = { "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 *); @@ -576,12 +634,12 @@ string const LaTeXFeatures::getColorOptions() 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"; } @@ -632,7 +690,7 @@ string const LaTeXFeatures::getPackages() 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. // @@ -650,21 +708,17 @@ string const LaTeXFeatures::getPackages() const // 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 @@ -702,12 +756,12 @@ string const LaTeXFeatures::getPackages() const } // 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"; } @@ -719,11 +773,6 @@ string const LaTeXFeatures::getPackages() const 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")) && @@ -766,8 +815,9 @@ string const LaTeXFeatures::getPackages() const 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"; @@ -782,6 +832,10 @@ string const LaTeXFeatures::getPackages() const "\\makenomenclature\n"; } + // fixltx2e provides subscript + if (mustProvide("subscript") && !isRequired("fixltx2e")) + packages << "\\usepackage{subscript}\n"; + return packages.str(); } @@ -813,8 +867,12 @@ docstring const LaTeXFeatures::getMacros() const 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'; @@ -822,10 +880,10 @@ docstring const LaTeXFeatures::getMacros() const 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" @@ -836,7 +894,7 @@ docstring const LaTeXFeatures::getMacros() const macros << textgreek_def << '\n'; } - if (mustProvide("textcyr")) + if (!usePolyglossia() && mustProvide("textcyr")) macros << textcyr_def << '\n'; if (mustProvide("lyxmathsym")) @@ -922,7 +980,7 @@ docstring const LaTeXFeatures::getMacros() const 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}{" @@ -947,12 +1005,28 @@ docstring const LaTeXFeatures::getMacros() const } +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'; @@ -963,6 +1037,50 @@ string const LaTeXFeatures::getBabelPostsettings() const } +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::getTClassPreamble() const { // the text class specific preamble @@ -1050,7 +1168,7 @@ docstring const getFloatI18nPreamble(docstring const & type, docstring const & n } -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 @@ -1063,33 +1181,56 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel) const list::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(); 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 (use_polyglossia && flname != name) snippets.insert(getFloatI18nPreamble( type, name, - from_ascii((*lit)->babel()))); + from_ascii(buffer().language()->polyglossia()))); + else if (flname != name) + snippets.insert(getFloatI18nPreamble( + type, name, + from_ascii(buffer().language()->babel()))); + 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 (use_polyglossia && have_translation) + snippets.insert(getFloatI18nPreamble( + type, name, + from_ascii((*lit)->polyglossia()))); + else if (have_translation) + snippets.insert(getFloatI18nPreamble( + type, name, + from_ascii((*lit)->babel()))); } } } @@ -1178,7 +1319,7 @@ void LaTeXFeatures::getFloatDefinitions(odocstream & os) const 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" @@ -1206,9 +1347,8 @@ void LaTeXFeatures::getFloatDefinitions(odocstream & os) const 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 << '}';