X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.cpp;h=5704940ecd30413daf0a78b3a04c54668100a0ca;hb=0b54650f0e7f1eae39f93444cac6c8525811975b;hp=73b47436b8a0bee2d86c84d21618d28d6d056f45;hpb=fc4ca364033b65e232b6867e9518d6e6d00c3ace;p=lyx.git diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 73b47436b8..5704940ecd 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -28,11 +28,11 @@ #include "ColorSet.h" #include "Converter.h" #include "Encoding.h" -#include "HSpace.h" #include "IndicesList.h" #include "Language.h" #include "LaTeXFeatures.h" #include "LaTeXFonts.h" +#include "Length.h" #include "ModuleList.h" #include "Font.h" #include "Lexer.h" @@ -102,9 +102,20 @@ static char const * const tex_graphics[] = { }; - namespace lyx { +// XeTeX with TeX fonts: +// run in 8-bit emulation mode and trick `inputenc` into working with XeTeX +static docstring const xetex_pre_inputenc = from_ascii( + "\\XeTeXinputencoding \"bytes\" % current file\n" + "\\XeTeXdefaultencoding \"bytes\" % included files\n" + "\\makeatletter\n" + "\\let\\origUmathchar\\Umathchar\n" + "\\let\\Umathchar\\@undefined\n"); +static docstring const xetex_post_inputenc = from_ascii( + "\\let\\Umathchar\\origUmathchar\n" + "\\makeatother\n"); + // Local translators namespace { @@ -308,7 +319,7 @@ bool inSystemDir(FileName const & document_dir, string & system_dir) string dir = document_dir.absFileName(); - for (int i = 0; i < 2; ++i) { + for (int i = 0; i < 3; ++i) { dir = addPath(dir, ".."); if (!fileSearch(dir, "configure.py").empty() && !fileSearch(dir, "chkconfig.ltx").empty()) { @@ -323,7 +334,7 @@ bool inSystemDir(FileName const & document_dir, string & system_dir) return false; } -} // anon namespace +} // namespace class BufferParams::Impl @@ -338,11 +349,11 @@ public: IndicesList indiceslist; Spacing spacing; Length parindent; + Length mathindent; /** This is the amount of space used for paragraph_separation "skip", * and for detached paragraphs in "indented" documents. */ VSpace defskip; - HSpace math_indentation; PDFOptions pdfoptions; LayoutFileIndex baseClass_; FormatList exportableFormatList; @@ -380,12 +391,12 @@ BufferParams::BufferParams() : pimpl_(new Impl) { setBaseClass(defaultBaseclass()); - cite_engine_.push_back("basic"); + cite_engine_ = "basic"; cite_engine_type_ = ENGINE_TYPE_DEFAULT; makeDocumentClass(); paragraph_separation = ParagraphIndentSeparation; is_math_indent = false; - math_indentation = "default"; + math_numbering_side = DEFAULT; quotes_style = InsetQuotesParams::EnglishQuotes; dynamic_quotes = false; fontsize = "default"; @@ -394,7 +405,7 @@ BufferParams::BufferParams() papersize = PAPER_DEFAULT; orientation = ORIENTATION_PORTRAIT; use_geometry = false; - biblio_style = "plain"; + biblio_style = string(); use_bibtopic = false; multibib = string(); use_indices = false; @@ -406,7 +417,7 @@ BufferParams::BufferParams() secnumdepth = 3; tocdepth = 3; language = default_language; - fontenc = "global"; + fontenc = "auto"; fonts_roman[0] = "default"; fonts_roman[1] = "default"; fonts_sans[0] = "default"; @@ -435,6 +446,7 @@ BufferParams::BufferParams() columns = 1; listings_params = string(); pagestyle = "default"; + tablestyle = "default"; suppress_date = false; justification = true; // no color is the default (white) @@ -459,8 +471,10 @@ BufferParams::BufferParams() html_css_as_file = false; display_pixel_ratio = 1.0; + shell_escape = false; output_sync = false; use_refstyle = true; + use_minted = false; // map current author author_map_[pimpl_->authorlist.get(0).bufferId()] = 0; @@ -629,15 +643,15 @@ PDFOptions const & BufferParams::pdfoptions() const } -HSpace const & BufferParams::getMathIndentation() const +Length const & BufferParams::getMathIndent() const { - return pimpl_->math_indentation; + return pimpl_->mathindent; } -void BufferParams::setMathIndentation(HSpace const & indent) +void BufferParams::setMathIndent(Length const & indent) { - pimpl_->math_indentation = indent; + pimpl_->mathindent = indent; } @@ -667,6 +681,19 @@ void BufferParams::setDefSkip(VSpace const & vs) } +BufferParams::MathNumber BufferParams::getMathNumber() const +{ + if (math_numbering_side != DEFAULT) + return math_numbering_side; + // FIXME: do not hardcode language here + else if (language->lang() == "arabic_arabi" + || documentClass().provides("leqno")) + return LEFT; + else + return RIGHT; +} + + string BufferParams::readToken(Lexer & lex, string const & token, FileName const & filepath) { @@ -835,7 +862,12 @@ string BufferParams::readToken(Lexer & lex, string const & token, lex >> parsep; paragraph_separation = parseptranslator().find(parsep); } else if (token == "\\paragraph_indentation") { - lex >> pimpl_->parindent; + lex.next(); + string parindent = lex.getString(); + if (parindent == "default") + pimpl_->parindent = Length(); + else + pimpl_->parindent = Length(parindent); } else if (token == "\\defskip") { lex.next(); string const defskip = lex.getString(); @@ -847,8 +879,20 @@ string BufferParams::readToken(Lexer & lex, string const & token, lex >> is_math_indent; } else if (token == "\\math_indentation") { lex.next(); - string math_indentation = lex.getString(); - pimpl_->math_indentation = HSpace(math_indentation); + string mathindent = lex.getString(); + if (mathindent == "default") + pimpl_->mathindent = Length(); + else + pimpl_->mathindent = Length(mathindent); + } else if (token == "\\math_numbering_side") { + string tmp; + lex >> tmp; + if (tmp == "left") + math_numbering_side = LEFT; + else if (tmp == "right") + math_numbering_side = RIGHT; + else + math_numbering_side = DEFAULT; } else if (token == "\\quotes_style") { string qstyle; lex >> qstyle; @@ -869,8 +913,7 @@ string BufferParams::readToken(Lexer & lex, string const & token, use_package(package, packagetranslator().find(use)); } else if (token == "\\cite_engine") { lex.eatLine(); - vector engine = getVectorFromString(lex.getString()); - setCiteEngine(engine); + cite_engine_ = lex.getString(); } else if (token == "\\cite_engine_type") { string engine_type; lex >> engine_type; @@ -1021,6 +1064,8 @@ string BufferParams::readToken(Lexer & lex, string const & token, sides = sidestranslator().find(psides); } else if (token == "\\paperpagestyle") { lex >> pagestyle; + } else if (token == "\\tablestyle") { + lex >> tablestyle; } else if (token == "\\bullet") { readBullets(lex); } else if (token == "\\bulletLaTeX") { @@ -1039,6 +1084,8 @@ string BufferParams::readToken(Lexer & lex, string const & token, spacing().set(spacetranslator().find(nspacing), tmp_val); } else if (token == "\\float_placement") { lex >> float_placement; + } else if (token == "\\float_alignment") { + lex >> float_alignment; } else if (prefixIs(token, "\\pdf_") || token == "\\use_hyperref") { string toktmp = pdfoptions().readToken(lex, token); @@ -1069,6 +1116,8 @@ string BufferParams::readToken(Lexer & lex, string const & token, lex >> output_sync_macro; } else if (token == "\\use_refstyle") { lex >> use_refstyle; + } else if (token == "\\use_minted") { + lex >> use_minted; } else { lyxerr << "BufferParams::readToken(): Unknown token: " << token << endl; @@ -1086,7 +1135,7 @@ namespace { return "\"" + str + "\""; return str; } -} +} // namespace void BufferParams::writeFile(ostream & os, Buffer const * buf) const @@ -1227,9 +1276,10 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const os << "\\bibtex_command " << bibtex_command << '\n'; os << "\\index_command " << index_command << '\n'; - if (!float_placement.empty()) { + if (!float_placement.empty()) os << "\\float_placement " << float_placement << '\n'; - } + if (!float_alignment.empty()) + os << "\\float_alignment " << float_alignment << '\n'; os << "\\paperfontsize " << fontsize << '\n'; spacing().writeFile(os); @@ -1245,17 +1295,10 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const os << "\n\\cite_engine "; - if (!cite_engine_.empty()) { - LayoutModuleList::const_iterator be = cite_engine_.begin(); - LayoutModuleList::const_iterator en = cite_engine_.end(); - for (LayoutModuleList::const_iterator it = be; it != en; ++it) { - if (it != be) - os << ','; - os << *it; - } - } else { + if (!cite_engine_.empty()) + os << cite_engine_; + else os << "basic"; - } os << "\n\\cite_engine_type " << theCiteEnginesList.getTypeAsString(cite_engine_type_); @@ -1276,6 +1319,7 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const << "\n\\suppress_date " << convert(suppress_date) << "\n\\justification " << convert(justification) << "\n\\use_refstyle " << use_refstyle + << "\n\\use_minted " << use_minted << '\n'; if (isbackgroundcolor == true) os << "\\backgroundcolor " << lyx::X11hexname(backgroundcolor) << '\n'; @@ -1342,18 +1386,32 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const << "\n\\paragraph_separation " << string_paragraph_separation[paragraph_separation]; if (!paragraph_separation) - os << "\n\\paragraph_indentation " << Lexer::quoteString(pimpl_->parindent.asString()); + os << "\n\\paragraph_indentation " + << (getParIndent().empty() ? "default" : getParIndent().asString()); else os << "\n\\defskip " << getDefSkip().asLyXCommand(); os << "\n\\is_math_indent " << is_math_indent; - if (is_math_indent && getMathIndentation().asLyXCommand() != "default") - os << "\n\\math_indentation " << getMathIndentation().asLyXCommand(); + if (is_math_indent) + os << "\n\\math_indentation " + << (getMathIndent().empty() ? "default" : getMathIndent().asString()); + os << "\n\\math_numbering_side "; + switch(math_numbering_side) { + case LEFT: + os << "left"; + break; + case RIGHT: + os << "right"; + break; + case DEFAULT: + os << "default"; + } os << "\n\\quotes_style " << string_quotes_style[quotes_style] << "\n\\dynamic_quotes " << dynamic_quotes << "\n\\papercolumns " << columns << "\n\\papersides " << sides - << "\n\\paperpagestyle " << pagestyle << '\n'; + << "\n\\paperpagestyle " << pagestyle + << "\n\\tablestyle " << tablestyle << '\n'; if (!listings_params.empty()) os << "\\listings_params \"" << InsetListingsParams(listings_params).encodedString() << "\"\n"; @@ -1506,7 +1564,7 @@ void BufferParams::validate(LaTeXFeatures & features) const if (useNonTeXFonts && fontsMath() != "auto") features.require("unicode-math"); - + if (use_microtype) features.require("microtype"); @@ -1632,6 +1690,18 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, if (is_math_indent) clsoptions << "fleqn,"; + switch(math_numbering_side) { + case LEFT: + clsoptions << "leqno,"; + break; + case RIGHT: + clsoptions << "reqno,"; + features.require("amsmath"); + break; + case DEFAULT: + break; + } + // language should be a parameter to \documentclass if (language->babel() == "hebrew" && default_language->babel() != "hebrew") @@ -1642,7 +1712,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, bool const use_babel = features.useBabel() && !features.isProvided("babel"); bool const use_polyglossia = features.usePolyglossia(); bool const global = lyxrc.language_global_options; - if (use_babel || (use_polyglossia && global)) { + if (features.useBabel() || (use_polyglossia && global)) { language_options << features.getBabelLanguages(); if (!language->babel().empty()) { if (!language_options.str().empty()) @@ -1690,6 +1760,16 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, os << "\\usepackage{unicode-math}\n"; } + // load CJK support package before font selection + // (see autotests/export/latex/CJK/micro-sign_utf8-cjk-libertine.lyx) + if (!useNonTeXFonts && encoding().package() != Encoding::none && inputenc != "utf8x" + && (encoding().package() == Encoding::CJK || features.mustProvide("CJK"))) { + if (inputenc == "utf8-cjk" || inputenc == "utf8") + os << "\\usepackage{CJKutf8}\n"; + else + os << "\\usepackage[encapsulated]{CJK}\n"; + } + // font selection must be done before loading fontenc.sty string const fonts = loadFonts(features); if (!fonts.empty()) @@ -1700,7 +1780,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, << from_ascii(fonts_default_family) << "}\n"; // set font encoding - // XeTeX and LuaTeX (with OS fonts) do not need fontenc + // non-TeX fonts use font encoding TU (set by fontspec) if (!useNonTeXFonts && !features.isProvided("fontenc") && main_font_encoding() != "default") { // get main font encodings @@ -1714,6 +1794,12 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, } } + // Load textcomp and pmboxdraw before (lua)inputenc (#11454) + if (features.mustProvide("textcomp")) + os << "\\usepackage{textcomp}\n"; + if (features.mustProvide("pmboxdraw")) + os << "\\usepackage{pmboxdraw}\n"; + // handle inputenc etc. writeEncodingPreamble(os, features); @@ -1959,9 +2045,9 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, if (is_math_indent) { // when formula indentation // only output something when it is not the default - if (getMathIndentation().asLyXCommand() != "default") { + if (!getMathIndent().empty()) { os << "\\setlength{\\mathindent}{" - << from_utf8(getMathIndentation().asLatexCommand()) + << from_utf8(getMathIndent().asString()) << "}\n"; } } @@ -1990,13 +2076,12 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg144349.html os << from_ascii(features.getColorOptions()); - // If we use hyperref, jurabib, japanese, varioref or vietnamese, + // If we use hyperref, jurabib, japanese or varioref, // we have to call babel before if (use_babel && (features.isRequired("jurabib") || features.isRequired("hyperref") || features.isRequired("varioref") - || features.isRequired("vietnamese") || features.isRequired("japanese"))) { os << features.getBabelPresettings(); // FIXME UNICODE @@ -2035,8 +2120,8 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, OutputParams tmp_params = features.runparams(); pdfoptions().writeLaTeX(tmp_params, os, features.isProvided("hyperref")); - // correctly break URLs with hyperref and dvi output - if (features.runparams().flavor == OutputParams::LATEX + // correctly break URLs with hyperref and dvi/ps output + if (features.runparams().hyperref_driver == "dvips" && features.isAvailable("breakurl")) os << "\\usepackage{breakurl}\n"; } else if (features.isRequired("nameref")) @@ -2188,12 +2273,11 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, << "\\makeatother\n\n"; // We try to load babel late, in case it interferes with other packages. - // Jurabib, hyperref, varioref, bicaption and listings (bug 8995) have to be - // called after babel, though. + // Jurabib, hyperref, varioref, bicaption, menukeys and listings (bug 8995) + // have to be called after babel, though. if (use_babel && !features.isRequired("jurabib") && !features.isRequired("hyperref") - && !features.isRequired("varioref") - && !features.isRequired("vietnamese") + && !features.isRequired("varioref") && !features.isRequired("japanese")) { os << features.getBabelPresettings(); // FIXME UNICODE @@ -2203,14 +2287,34 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, } if (features.isRequired("bicaption")) os << "\\usepackage{bicaption}\n"; - if (!listings_params.empty() || features.mustProvide("listings")) - os << "\\usepackage{listings}\n"; - if (!listings_params.empty()) { - os << "\\lstset{"; + if (!listings_params.empty() + || features.mustProvide("listings") + || features.mustProvide("minted")) { + if (use_minted) + os << "\\usepackage{minted}\n"; + else + os << "\\usepackage{listings}\n"; + } + string lst_params = listings_params; + // If minted, do not output the language option (bug 11203) + if (use_minted && contains(lst_params, "language=")) { + vector opts = + getVectorFromString(lst_params, ",", false); + for (size_t i = 0; i < opts.size(); ++i) { + if (prefixIs(opts[i], "language=")) + opts.erase(opts.begin() + i--); + } + lst_params = getStringFromVector(opts, ","); + } + if (!lst_params.empty()) { + if (use_minted) + os << "\\setminted{"; + else + os << "\\lstset{"; // do not test validity because listings_params is // supposed to be valid string par = - InsetListingsParams(listings_params).separatedParams(true); + InsetListingsParams(lst_params).separatedParams(true); os << from_utf8(par); os << "}\n"; } @@ -2219,9 +2323,10 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, // (the rest is obsoleted by the new TU encoding). // It needs to be loaded at least after amsmath, amssymb, // esint and the other packages that provide special glyphs - if (features.mustProvide("tipa") && useNonTeXFonts) { - // The package officially only supports XeTeX, but also works - // with LuaTeX. Thus we work around its XeTeX test. + if (features.mustProvide("tipa") && useNonTeXFonts + && !features.isProvided("xunicode")) { + // The `xunicode` package officially only supports XeTeX, + // but also works with LuaTeX. We work around its XeTeX test. if (features.runparams().flavor != OutputParams::XETEX) { os << "% Pretend to xunicode that we are XeTeX\n" << "\\def\\XeTeXpicfile{}\n"; @@ -2229,6 +2334,10 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, os << "\\usepackage{xunicode}\n"; } + // covington must be loaded after beamerarticle + if (features.isRequired("covington")) + os << "\\usepackage{covington}\n"; + // Polyglossia must be loaded last ... if (use_polyglossia) { // call the package @@ -2254,15 +2363,25 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, } // ... but before biblatex (see #7065) - if (features.mustProvide("biblatex")) { + if ((features.mustProvide("biblatex") + || features.isRequired("biblatex-chicago")) + && !features.isProvided("biblatex-chicago") + && !features.isProvided("biblatex-natbib") + && !features.isProvided("natbib-internal") + && !features.isProvided("natbib") + && !features.isProvided("jurabib")) { + // The biblatex-chicago package has a differing interface + // it uses a wrapper package and loads styles via fixed options + bool const chicago = features.isRequired("biblatex-chicago"); string delim = ""; string opts; os << "\\usepackage"; if (!biblatex_bibstyle.empty() - && (biblatex_bibstyle == biblatex_citestyle)) { + && (biblatex_bibstyle == biblatex_citestyle) + && !chicago) { opts = "style=" + biblatex_bibstyle; delim = ","; - } else { + } else if (!chicago) { if (!biblatex_bibstyle.empty()) { opts = "bibstyle=" + biblatex_bibstyle; delim = ","; @@ -2285,11 +2404,19 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, opts += delim + "backend=bibtex"; delim = ","; } + if (!bib_encoding.empty() && encodings.fromLyXName(bib_encoding)) { + opts += delim + "bibencoding=" + + encodings.fromLyXName(bib_encoding)->latexName(); + delim = ","; + } if (!biblio_opts.empty()) opts += delim + biblio_opts; if (!opts.empty()) os << "[" << opts << "]"; - os << "{biblatex}\n"; + if (chicago) + os << "{biblatex-chicago}\n"; + else + os << "{biblatex}\n"; } @@ -2302,8 +2429,14 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, os << '\n'; } + // Since menukeys uses catoptions, which does some heavy changes on key-value options, + // it is recommended to load menukeys as the last package (even after hyperref) + if (features.isRequired("menukeys")) + os << "\\usepackage{menukeys}\n"; + docstring const i18npreamble = - features.getTClassI18nPreamble(use_babel, use_polyglossia); + features.getTClassI18nPreamble(use_babel, use_polyglossia, + use_minted); if (!i18npreamble.empty()) os << i18npreamble + '\n'; @@ -2318,6 +2451,7 @@ void BufferParams::useClassDefaults() sides = tclass.sides(); columns = tclass.columns(); pagestyle = tclass.pagestyle(); + tablestyle = tclass.tablestyle(); use_default_options = true; // Only if class has a ToC hierarchy if (tclass.hasTocLevels()) { @@ -2334,6 +2468,7 @@ bool BufferParams::hasClassDefaults() const return sides == tclass.sides() && columns == tclass.columns() && pagestyle == tclass.pagestyle() + && tablestyle == tclass.tablestyle() && use_default_options && secnumdepth == tclass.secnumdepth() && tocdepth == tclass.tocdepth(); @@ -2360,7 +2495,7 @@ void BufferParams::setDocumentClass(DocumentClassConstPtr tc) } -bool BufferParams::setBaseClass(string const & classname) +bool BufferParams::setBaseClass(string const & classname, string const & path) { LYXERR(Debug::TCLASS, "setBaseClass: " << classname); LayoutFileList & bcl = LayoutFileList::get(); @@ -2376,7 +2511,7 @@ bool BufferParams::setBaseClass(string const & classname) bcl.addEmptyClass(classname); } - bool const success = bcl[classname].load(); + bool const success = bcl[classname].load(path); if (!success) { docstring s = bformat(_("Due to some error in it, the layout file:\n" @@ -2417,18 +2552,12 @@ void BufferParams::makeDocumentClass(bool const clone) invalidateConverterCache(); LayoutModuleList mods; - LayoutModuleList ces; LayoutModuleList::iterator it = layout_modules_.begin(); LayoutModuleList::iterator en = layout_modules_.end(); for (; it != en; ++it) mods.push_back(*it); - it = cite_engine_.begin(); - en = cite_engine_.end(); - for (; it != en; ++it) - ces.push_back(*it); - - doc_class_ = getDocumentClass(*baseClass(), mods, ces, clone); + doc_class_ = getDocumentClass(*baseClass(), mods, cite_engine_, clone); TextClass::ReturnValues success = TextClass::OK; if (!forced_local_layout_.empty()) @@ -2450,12 +2579,6 @@ bool BufferParams::layoutModuleCanBeAdded(string const & modName) const } -bool BufferParams::citationModuleCanBeAdded(string const & modName) const -{ - return cite_engine_.moduleCanBeAdded(modName, baseClass()); -} - - docstring BufferParams::getLocalLayout(bool forced) const { if (forced) @@ -2509,7 +2632,7 @@ FormatList const & BufferParams::exportableFormats(bool only_viewable) const { FormatList & cached = only_viewable ? pimpl_->viewableFormatList : pimpl_->exportableFormatList; - bool & valid = only_viewable ? + bool & valid = only_viewable ? pimpl_->isViewCacheValid : pimpl_->isExportCacheValid; if (valid) return cached; @@ -2519,13 +2642,17 @@ FormatList const & BufferParams::exportableFormats(bool only_viewable) const if (useNonTeXFonts) { excludes.insert("latex"); excludes.insert("pdflatex"); - } - FormatList result = - theConverters().getReachable(backs[0], only_viewable, true, excludes); + } else if (inputenc != "ascii" && inputenc != "utf8" + && inputenc != "utf8x" && inputenc != "utf8-plain") + // XeTeX with TeX fonts requires input encoding ascii or utf8 + // (https://www.tug.org/pipermail/xetex/2010-April/016452.html). + excludes.insert("xetex"); + FormatList result = theConverters().getReachable(backs[0], only_viewable, + true, excludes); for (vector::const_iterator it = backs.begin() + 1; it != backs.end(); ++it) { - FormatList r = theConverters().getReachable(*it, only_viewable, - false, excludes); + FormatList r = theConverters().getReachable(*it, only_viewable, + false, excludes); result.insert(result.end(), r.begin(), r.end()); } sort(result.begin(), result.end(), Format::formatSorter); @@ -2549,12 +2676,22 @@ vector BufferParams::backends() const v.push_back("pdflatex"); v.push_back("latex"); } - v.push_back("xetex"); + if (useNonTeXFonts || inputenc == "ascii" || inputenc == "utf8" + || inputenc == "utf8x" || inputenc == "utf8-plain") + v.push_back("xetex"); v.push_back("luatex"); v.push_back("dviluatex"); } - } else - v.push_back(buffmt); + } else { + string rbuffmt = buffmt; + // If we use an OutputFormat in Japanese docs, + // we need special format in order to get the path + // via pLaTeX (#8823) + if (documentClass().hasOutputFormat() + && encoding().package() == Encoding::japanese) + rbuffmt += "-ja"; + v.push_back(rbuffmt); + } v.push_back("xhtml"); v.push_back("text"); @@ -2597,9 +2734,8 @@ OutputParams::FLAVOR BufferParams::getOutputFlavor(string const & format) const if (find(backs.begin(), backs.end(), dformat) == backs.end()) { // Get shortest path to format Graph::EdgePath path; - for (vector::const_iterator it = backs.begin(); - it != backs.end(); ++it) { - Graph::EdgePath p = theConverters().getPath(*it, dformat); + for (auto const & bvar : backs) { + Graph::EdgePath p = theConverters().getPath(bvar, dformat); if (!p.empty() && (path.empty() || p.size() < path.size())) { path = p; } @@ -2619,14 +2755,15 @@ string BufferParams::getDefaultOutputFormat() const if (!default_output_format.empty() && default_output_format != "default") return default_output_format; - if (isDocBook() - || encoding().package() == Encoding::japanese) { + if (isDocBook()) { FormatList const & formats = exportableFormats(true); if (formats.empty()) return string(); // return the first we find return formats.front()->name(); } + if (encoding().package() == Encoding::japanese) + return lyxrc.default_platex_view_format; if (useNonTeXFonts) return lyxrc.default_otf_view_format; return lyxrc.default_view_format; @@ -3033,26 +3170,32 @@ string const BufferParams::dvips_options() const string const BufferParams::main_font_encoding() const { - return font_encodings().empty() ? "default" : font_encodings().back(); + if (font_encodings().empty()) { + if (ascii_lowercase(language->fontenc(*this)) == "none") + return "none"; + return "default"; + } + return font_encodings().back(); } vector const BufferParams::font_encodings() const { - string doc_fontenc = (fontenc == "global") ? lyxrc.fontenc : fontenc; + string doc_fontenc = (fontenc == "auto") ? string() : fontenc; vector fontencs; // "default" means "no explicit font encoding" if (doc_fontenc != "default") { - fontencs = getVectorFromString(doc_fontenc); - if (!language->fontenc().empty() - && ascii_lowercase(language->fontenc()) != "none") { - vector fencs = getVectorFromString(language->fontenc()); - vector::const_iterator fit = fencs.begin(); - for (; fit != fencs.end(); ++fit) { - if (find(fontencs.begin(), fontencs.end(), *fit) == fontencs.end()) - fontencs.push_back(*fit); + if (!doc_fontenc.empty()) + // If we have a custom setting, we use only that! + return getVectorFromString(doc_fontenc); + if (!language->fontenc(*this).empty() + && ascii_lowercase(language->fontenc(*this)) != "none") { + vector fencs = getVectorFromString(language->fontenc(*this)); + for (auto & fe : fencs) { + if (find(fontencs.begin(), fontencs.end(), fe) == fontencs.end()) + fontencs.push_back(fe); } } } @@ -3098,12 +3241,8 @@ docstring BufferParams::getGraphicsDriver(string const & package) const void BufferParams::writeEncodingPreamble(otexstream & os, LaTeXFeatures & features) const { - // XeTeX/LuaTeX: (see also #9740) - // With Unicode fonts we use utf8-plain without encoding package. - // With TeX fonts, we cannot use utf8-plain, but "inputenc" fails. - // XeTeX must use ASCII encoding (see Buffer.cpp), - // for LuaTeX, we load "luainputenc" (see below). - if (useNonTeXFonts || features.runparams().flavor == OutputParams::XETEX) + // With no-TeX fonts we use utf8-plain without encoding package. + if (useNonTeXFonts) return; if (inputenc == "auto") { @@ -3113,21 +3252,22 @@ void BufferParams::writeEncodingPreamble(otexstream & os, language->encoding()->package(); // Create list of inputenc options: - set encodings; + set encoding_set; // luainputenc fails with more than one encoding - if (!features.runparams().isFullUnicode()) // if we reach this point, this means LuaTeX with TeX fonts + if (features.runparams().flavor != OutputParams::LUATEX + && features.runparams().flavor != OutputParams::DVILUATEX) // list all input encodings used in the document - encodings = features.getEncodingSet(doc_encoding); + encoding_set = features.getEncodingSet(doc_encoding); // If the "japanese" package (i.e. pLaTeX) is used, // inputenc must be omitted. // see http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129680.html - if ((!encodings.empty() || package == Encoding::inputenc) + if ((!encoding_set.empty() || package == Encoding::inputenc) && !features.isRequired("japanese") && !features.isProvided("inputenc")) { os << "\\usepackage["; - set::const_iterator it = encodings.begin(); - set::const_iterator const end = encodings.end(); + set::const_iterator it = encoding_set.begin(); + set::const_iterator const end = encoding_set.end(); if (it != end) { os << from_ascii(*it); ++it; @@ -3135,7 +3275,7 @@ void BufferParams::writeEncodingPreamble(otexstream & os, for (; it != end; ++it) os << ',' << from_ascii(*it); if (package == Encoding::inputenc) { - if (!encodings.empty()) + if (!encoding_set.empty()) os << ','; os << from_ascii(doc_encoding); } @@ -3145,17 +3285,16 @@ void BufferParams::writeEncodingPreamble(otexstream & os, else os << "]{inputenc}\n"; } - if (package == Encoding::CJK || features.mustProvide("CJK")) { - if (language->encoding()->name() == "utf8-cjk" - && LaTeXFeatures::isAvailable("CJKutf8")) - os << "\\usepackage{CJKutf8}\n"; - else - os << "\\usepackage{CJK}\n"; - } } else if (inputenc != "default") { switch (encoding().package()) { case Encoding::none: + case Encoding::CJK: case Encoding::japanese: + if (encoding().iconvName() != "UTF-8" + && !features.runparams().isFullUnicode()) + // don't default to [utf8]{inputenc} with TeXLive >= 18 + os << "\\ifdefined\\UseRawInputEncoding\n" + << " \\UseRawInputEncoding\\fi\n"; break; case Encoding::inputenc: // do not load inputenc if japanese is used @@ -3163,31 +3302,24 @@ void BufferParams::writeEncodingPreamble(otexstream & os, if (features.isRequired("japanese") || features.isProvided("inputenc")) break; + if (features.runparams().flavor == OutputParams::XETEX) + os << xetex_pre_inputenc; os << "\\usepackage[" << from_ascii(encoding().latexName()); if (features.runparams().flavor == OutputParams::LUATEX || features.runparams().flavor == OutputParams::DVILUATEX) os << "]{luainputenc}\n"; else os << "]{inputenc}\n"; + if (features.runparams().flavor == OutputParams::XETEX) + os << xetex_post_inputenc; break; - case Encoding::CJK: - if (encoding().name() == "utf8-cjk" - && LaTeXFeatures::isAvailable("CJKutf8")) - os << "\\usepackage{CJKutf8}\n"; - else - os << "\\usepackage{CJK}\n"; - break; - } - // Load the CJK package if needed by a secondary language. - // If the main encoding is some variant of UTF8, use CJKutf8. - if (encoding().package() != Encoding::CJK && features.mustProvide("CJK")) { - if (encoding().iconvName() == "UTF-8" - && LaTeXFeatures::isAvailable("CJKutf8")) - os << "\\usepackage{CJKutf8}\n"; - else - os << "\\usepackage{CJK}\n"; } } + if (inputenc == "default" || features.isRequired("japanese")) { + // don't default to [utf8]{inputenc} with TeXLive >= 18 + os << "\\ifdefined\\UseRawInputEncoding\n"; + os << " \\UseRawInputEncoding\\fi\n"; + } } @@ -3299,12 +3431,6 @@ string const BufferParams::loadFonts(LaTeXFeatures & features) const Encoding const & BufferParams::encoding() const { // Main encoding for LaTeX output. - // - // Exception: XeTeX with 8-bit TeX fonts requires ASCII (see #9740). - // As the "flavor" is only known once export started, this - // cannot be handled here. Instead, runparams.encoding is set - // to ASCII in Buffer::makeLaTeXFile (for export) - // and Buffer::writeLaTeXSource (for preview). if (useNonTeXFonts) return *(encodings.fromLyXName("utf8-plain")); if (inputenc == "auto" || inputenc == "default") @@ -3318,32 +3444,11 @@ Encoding const & BufferParams::encoding() const } -bool BufferParams::addCiteEngine(string const & engine) -{ - LayoutModuleList::const_iterator it = cite_engine_.begin(); - LayoutModuleList::const_iterator en = cite_engine_.end(); - for (; it != en; ++it) - if (*it == engine) - return false; - cite_engine_.push_back(engine); - return true; -} - - -bool BufferParams::addCiteEngine(vector const & engine) -{ - vector::const_iterator it = engine.begin(); - vector::const_iterator en = engine.end(); - bool ret = true; - for (; it != en; ++it) - if (!addCiteEngine(*it)) - ret = false; - return ret; -} - - string const & BufferParams::defaultBiblioStyle() const { + if (!biblio_style.empty()) + return biblio_style; + map const & bs = documentClass().defaultBiblioStyle(); auto cit = bs.find(theCiteEnginesList.getTypeAsString(citeEngineType())); if (cit != bs.end()) @@ -3373,20 +3478,6 @@ string BufferParams::getCiteAlias(string const & s) const } -void BufferParams::setCiteEngine(string const & engine) -{ - clearCiteEngine(); - addCiteEngine(engine); -} - - -void BufferParams::setCiteEngine(vector const & engine) -{ - clearCiteEngine(); - addCiteEngine(engine); -} - - vector BufferParams::citeCommands() const { static CitationStyle const default_style; @@ -3450,8 +3541,7 @@ string const BufferParams::bibtexCommand() const bool BufferParams::useBiblatex() const { - return theCiteEnginesList[citeEngine().list().front()] - ->getCiteFramework() == "biblatex"; + return theCiteEnginesList[citeEngine()]->getCiteFramework() == "biblatex"; } @@ -3461,4 +3551,32 @@ void BufferParams::invalidateConverterCache() const pimpl_->isViewCacheValid = false; } + +// We shouldn't need to reset the params here, since anything +// we need will be recopied. +void BufferParams::copyForAdvFR(const BufferParams & bp) +{ + string const & lang = bp.language->lang(); + setLanguage(lang); + layout_modules_ = bp.layout_modules_; + string const & doc_class = bp.documentClass().name(); + setBaseClass(doc_class); +} + + +void BufferParams::setBibFileEncoding(string const & file, string const & enc) +{ + bib_encodings[file] = enc; +} + + +string const BufferParams::bibFileEncoding(string const & file) const +{ + if (bib_encodings.find(file) == bib_encodings.end()) + return string(); + return bib_encodings.find(file)->second; +} + + + } // namespace lyx