X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=24e5b7fb819d661511d4321c3b4288ab83f4c736;hb=0da95572ad97ea111b8461a0ebaa61f4383bfb7d;hp=07659495965259f50fb67f2d1457a9f20d2e491c;hpb=f476d9c85ad63353b978481fde59659b870758fe;p=lyx.git diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 0765949596..24e5b7fb81 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -12,12 +12,14 @@ #include "output_latex.h" +#include "BiblioInfo.h" #include "Buffer.h" #include "BufferParams.h" #include "Encoding.h" #include "Font.h" #include "InsetList.h" #include "Language.h" +#include "LaTeXFeatures.h" #include "Layout.h" #include "LyXRC.h" #include "OutputParams.h" @@ -85,11 +87,12 @@ OutputState * getOutputState() } -string const & openPolyglossiaLang(OutputState const * state) +string const & openLanguageName(OutputState const * state) { // Return a reference to the last active language opened with - // polyglossia. If none or when using babel, return a reference - // to an empty string. + // polyglossia or when using begin/end commands. If none or when + // using babel with only a begin command, return a reference to + // an empty string. static string const empty; @@ -102,12 +105,31 @@ string const & openPolyglossiaLang(OutputState const * state) bool atSameLastLangSwitchDepth(OutputState const * state) { // Return true if the actual nest level is the same at which the - // language was switched when using polyglossia. Instead, return - // always true when using babel. + // language was switched when using polyglossia or begin/end + // commands. Instead, return always true when using babel with + // only a begin command. return state->lang_switch_depth_.size() == 0 ? true - : state->lang_switch_depth_.top() == state->nest_level_; + : abs(state->lang_switch_depth_.top()) == state->nest_level_; +} + + +bool isLocalSwitch(OutputState const * state) +{ + // Return true if the language was opened by a local command switch. + + return state->lang_switch_depth_.size() + && state->lang_switch_depth_.top() < 0; +} + + +bool langOpenedAtThisLevel(OutputState const * state) +{ + // Return true if the language was opened at the current nesting level. + + return state->lang_switch_depth_.size() + && abs(state->lang_switch_depth_.top()) == state->nest_level_; } @@ -122,11 +144,16 @@ string const getPolyglossiaEnvName(Language const * lang) string const getPolyglossiaBegin(string const & lang_begin_command, - string const & lang, string const & opts) + string const & lang, string const & opts, + bool const localswitch = false) { string result; - if (!lang.empty()) - result = subst(lang_begin_command, "$$lang", lang); + if (!lang.empty()) { + // we need to revert the upcasing done in getPolyglossiaEnvName() + // in case we have a local polyglossia command (\textarabic). + string language = localswitch ? ascii_lowercase(lang) : lang; + result = subst(lang_begin_command, "$$lang", language); + } string options = opts.empty() ? string() : "[" + opts + "]"; result = subst(result, "$$opts", options); @@ -191,12 +218,14 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, "\\begin{$$lang}" : lyxrc.language_command_begin; string const lang_end_command = use_polyglossia ? "\\end{$$lang}" : lyxrc.language_command_end; + bool const using_begin_end = use_polyglossia || + !lang_end_command.empty(); // For polyglossia, switch language outside of environment, if possible. if (par_lang != prev_par_lang) { - if (!lang_end_command.empty() && + if ((!using_begin_end || langOpenedAtThisLevel(state)) && + !lang_end_command.empty() && prev_par_lang != doc_lang && - atSameLastLangSwitchDepth(state) && !prev_par_lang.empty()) { os << from_ascii(subst( lang_end_command, @@ -204,15 +233,21 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, prev_par_lang)) // the '%' is necessary to prevent unwanted whitespace << "%\n"; - if (use_polyglossia) { - state->lang_switch_depth_.pop(); - state->open_polyglossia_lang_.pop(); - } + if (using_begin_end) + popLanguageName(); } + // If no language was explicitly opened and we are using + // polyglossia or begin/end commands, then the current + // language is the document language. + string const & cur_lang = using_begin_end + && state->lang_switch_depth_.size() + ? openLanguageName(state) + : doc_lang; + if ((lang_end_command.empty() || par_lang != doc_lang || - par_lang != openPolyglossiaLang(state)) && + par_lang != cur_lang) && !par_lang.empty()) { string bc = use_polyglossia ? getPolyglossiaBegin(lang_begin_command, par_lang, @@ -221,10 +256,8 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, os << bc; // the '%' is necessary to prevent unwanted whitespace os << "%\n"; - if (use_polyglossia) { - state->lang_switch_depth_.push(state->nest_level_); - state->open_polyglossia_lang_.push(par_lang); - } + if (using_begin_end) + pushLanguageName(par_lang); } } @@ -236,8 +269,10 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, data.leftindent_open = true; } - if (style.isEnvironment()) { + if (style.isEnvironment()) state->nest_level_ += 1; + + if (style.isEnvironment() && !style.latexname().empty()) { os << "\\begin{" << from_ascii(style.latexname()) << '}'; if (!style.latexargs().empty()) { OutputParams rp = runparams; @@ -264,9 +299,14 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, data.cjk_nested = false; if (data.par_language->encoding()->package() == Encoding::CJK && state->open_encoding_ != CJK && pit->isMultiLingual(bparams)) { - if (prev_par_language->encoding()->package() == Encoding::CJK) - os << "\\begin{CJK}{" << from_ascii(data.par_language->encoding()->latexName()) + if (prev_par_language->encoding()->package() == Encoding::CJK) { + docstring const cjkenc = (bparams.encoding().name() == "utf8-cjk" + && LaTeXFeatures::isAvailable("CJKutf8")) ? + from_ascii("UTF8") + : from_ascii(data.par_language->encoding()->latexName()); + os << "\\begin{CJK}{" << cjkenc << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; + } state->open_encoding_ = CJK; data.cjk_nested = true; } @@ -288,19 +328,26 @@ static void finishEnvironment(otexstream & os, OutputParams const & runparams, if (data.style->isEnvironment()) { os << breakln; - // Close any polyglossia language opened at this nest level - if (runparams.use_polyglossia) { - OutputState * state = getOutputState(); - while (state->lang_switch_depth_.size() - && state->lang_switch_depth_.top() == state->nest_level_) { - os << "\\end{" << openPolyglossiaLang(state) - << "}%\n"; - state->lang_switch_depth_.pop(); - state->open_polyglossia_lang_.pop(); + bool const using_begin_end = + runparams.use_polyglossia || + !lyxrc.language_command_end.empty(); + // Close any language opened at this nest level + if (using_begin_end) { + while (langOpenedAtThisLevel(state)) { + if (isLocalSwitch(state)) { + os << "}"; + } else { + os << "\\end{" + << openLanguageName(state) + << "}%\n"; + } + popLanguageName(); } } state->nest_level_ -= 1; - os << "\\end{" << from_ascii(data.style->latexname()) << "}\n"; + string const & name = data.style->latexname(); + if (!name.empty()) + os << "\\end{" << from_ascii(name) << "}\n"; state->prev_env_language_ = data.par_language; if (runparams.encoding != data.prev_encoding) { runparams.encoding = data.prev_encoding; @@ -475,19 +522,20 @@ void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeX } -} // namespace anon +} // namespace -void pushPolyglossiaLang(string const & lang_name) +void pushLanguageName(string const & lang_name, bool localswitch) { OutputState * state = getOutputState(); - state->lang_switch_depth_.push(state->nest_level_); + int nest_level = localswitch ? -state->nest_level_ : state->nest_level_; + state->lang_switch_depth_.push(nest_level); state->open_polyglossia_lang_.push(lang_name); } -void popPolyglossiaLang() +void popLanguageName() { OutputState * state = getOutputState(); @@ -496,43 +544,65 @@ void popPolyglossiaLang() } -void latexArgInsets(Paragraph const & par, otexstream & os, - OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, string const & prefix) +string const & openLanguageName() { - map ilist; - vector required; + OutputState * state = getOutputState(); - InsetList::const_iterator it = par.insetList().begin(); - InsetList::const_iterator end = par.insetList().end(); - for (; it != end; ++it) { - if (it->inset->lyxCode() == ARG_CODE) { - InsetArgument const * ins = - static_cast(it->inset); - if (ins->name().empty()) - LYXERR0("Error: Unnamed argument inset!"); - else { - string const name = prefix.empty() ? ins->name() : split(ins->name(), ':'); - unsigned int const nr = convert(name); - ilist[nr] = ins; - Layout::LaTeXArgMap::const_iterator const lit = - latexargs.find(ins->name()); - if (lit != latexargs.end()) { - Layout::latexarg const & arg = (*lit).second; - if (!arg.requires.empty()) { - vector req = getVectorFromString(arg.requires); - required.insert(required.end(), req.begin(), req.end()); - } - } - } + return openLanguageName(state); +} + + +namespace { + +void addArgInsets(Paragraph const & par, string const & prefix, + Layout::LaTeXArgMap const & latexargs, + map & ilist, + vector & required) +{ + for (auto const & table : par.insetList()) { + InsetArgument const * arg = table.inset->asInsetArgument(); + if (!arg) + continue; + if (arg->name().empty()) { + LYXERR0("Error: Unnamed argument inset!"); + continue; + } + string const name = prefix.empty() ? + arg->name() : split(arg->name(), ':'); + // why converting into an integer? + unsigned int const nr = convert(name); + if (ilist.find(nr) == ilist.end()) + ilist[nr] = arg; + Layout::LaTeXArgMap::const_iterator const lit = + latexargs.find(arg->name()); + if (lit != latexargs.end()) { + Layout::latexarg const & larg = lit->second; + vector req = getVectorFromString(larg.requires); + move(req.begin(), req.end(), back_inserter(required)); } } +} + +} // namespace + + +void latexArgInsets(Paragraph const & par, otexstream & os, + OutputParams const & runparams, + Layout::LaTeXArgMap const & latexargs, + string const & prefix) +{ + map ilist; + vector required; + addArgInsets(par, prefix, latexargs, ilist, required); getArgInsets(os, runparams, latexargs, ilist, required, prefix); } -void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pit, - otexstream & os, OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, - string const & prefix) +void latexArgInsets(ParagraphList const & pars, + ParagraphList::const_iterator pit, + otexstream & os, OutputParams const & runparams, + Layout::LaTeXArgMap const & latexargs, + string const & prefix) { map ilist; vector required; @@ -556,44 +626,40 @@ void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pi ParagraphList::const_iterator spit = lyx::prev(pit, offset); for (; spit != pars.end(); ++spit) { - if (spit->layout() != current_layout || spit->params().depth() < current_depth) + if (spit->layout() != current_layout || + spit->params().depth() < current_depth) break; if (spit->params().depth() > current_depth) continue; - InsetList::const_iterator it = spit->insetList().begin(); - InsetList::const_iterator end = spit->insetList().end(); - for (; it != end; ++it) { - if (it->inset->lyxCode() == ARG_CODE) { - InsetArgument const * ins = - static_cast(it->inset); - if (ins->name().empty()) - LYXERR0("Error: Unnamed argument inset!"); - else { - string const name = prefix.empty() ? ins->name() : split(ins->name(), ':'); - unsigned int const nr = convert(name); - if (ilist.find(nr) == ilist.end()) - ilist[nr] = ins; - Layout::LaTeXArgMap::const_iterator const lit = - latexargs.find(ins->name()); - if (lit != latexargs.end()) { - Layout::latexarg const & arg = (*lit).second; - if (!arg.requires.empty()) { - vector req = getVectorFromString(arg.requires); - required.insert(required.end(), req.begin(), req.end()); - } - } - } - } - } + addArgInsets(*spit, prefix, latexargs, ilist, required); + } + getArgInsets(os, runparams, latexargs, ilist, required, prefix); +} + + +void latexArgInsetsForParent(ParagraphList const & pars, otexstream & os, + OutputParams const & runparams, + Layout::LaTeXArgMap const & latexargs, + string const & prefix) +{ + map ilist; + vector required; + + for (Paragraph const & par : pars) { + if (par.layout().hasArgs()) + // The InsetArguments inside this paragraph refer to this paragraph + continue; + addArgInsets(par, prefix, latexargs, ilist, required); } getArgInsets(os, runparams, latexargs, ilist, required, prefix); } + namespace { // output the proper paragraph start according to latextype. void parStartCommand(Paragraph const & par, otexstream & os, - OutputParams const & runparams, Layout const & style) + OutputParams const & runparams, Layout const & style) { switch (style.latextype) { case LATEX_COMMAND: @@ -620,7 +686,7 @@ void parStartCommand(Paragraph const & par, otexstream & os, } } -} // namespace anon +} // namespace // FIXME: this should be anonymous void TeXOnePar(Buffer const & buf, @@ -629,7 +695,8 @@ void TeXOnePar(Buffer const & buf, otexstream & os, OutputParams const & runparams_in, string const & everypar, - int start_pos, int end_pos) + int start_pos, int end_pos, + bool const force) { BufferParams const & bparams = runparams_in.is_child ? buf.masterParams() : buf.params(); @@ -640,7 +707,7 @@ void TeXOnePar(Buffer const & buf, Layout const & style = text.inset().forcePlainLayout() ? bparams.documentClass().plainLayout() : par.layout(); - if (style.inpreamble) + if (style.inpreamble && !force) return; LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " ptr " << &par << " '" @@ -674,18 +741,22 @@ void TeXOnePar(Buffer const & buf, os << '\n'; } - par.latex(bparams, outerfont, os, runparams, start_pos, end_pos); + par.latex(bparams, outerfont, os, runparams, start_pos, end_pos, force); return; } Paragraph const * nextpar = runparams.isLastPar ? 0 : ¶graphs.at(pit + 1); + bool const intitle_command = style.intitle && style.latextype == LATEX_COMMAND; + if (style.pass_thru) { Font const outerfont = text.outerFont(pit); parStartCommand(par, os, runparams, style); + if (intitle_command) + os << '{'; - par.latex(bparams, outerfont, os, runparams, start_pos, end_pos); + par.latex(bparams, outerfont, os, runparams, start_pos, end_pos, force); // I did not create a parEndCommand for this minuscule // task because in the other user of parStartCommand @@ -726,18 +797,39 @@ void TeXOnePar(Buffer const & buf, // environment with nesting depth greater than (or equal to, but with // a different layout) the current one. If there is no previous // paragraph, the previous language is the outer language. + // Note further that we take the outer language also if the prior par + // is PassThru, since in that case it has latex_language, and all secondary + // languages have been closed (#10793). bool const use_prev_env_language = state->prev_env_language_ != 0 && priorpar && priorpar->layout().isEnvironment() && (priorpar->getDepth() > par.getDepth() || (priorpar->getDepth() == par.getDepth() && priorpar->layout() != par.layout())); - Language const * const prev_language = - (pit != 0) - ? (use_prev_env_language ? state->prev_env_language_ - : priorpar->getParLanguage(bparams)) - : outer_language; + // We need to ignore previous intitle commands since languages + // are switched locally there (# 11514) + // There might be paragraphs before the title, so we check this. + Paragraph * prior_nontitle_par = nullptr; + if (!intitle_command) { + pit_type ppit = pit; + while (ppit > 0) { + --ppit; + Paragraph const * tmppar = ¶graphs.at(ppit); + if (tmppar->layout().intitle && tmppar->layout().isCommand()) + continue; + prior_nontitle_par = const_cast(tmppar); + break; + } + } + Language const * const prev_language = + runparams_in.for_search + ? languages.getLanguage("ignore") + : (prior_nontitle_par && !prior_nontitle_par->isPassThru()) + ? (use_prev_env_language + ? state->prev_env_language_ + : prior_nontitle_par->getParLanguage(bparams)) + : outer_language; bool const use_polyglossia = runparams.use_polyglossia; string const par_lang = use_polyglossia ? @@ -755,37 +847,56 @@ void TeXOnePar(Buffer const & buf, "\\end{$$lang}" : lyxrc.language_command_end; // the '%' is necessary to prevent unwanted whitespace string lang_command_termination = "%\n"; + bool const using_begin_end = use_polyglossia || + !lang_end_command.empty(); - // In some insets (such as Arguments), we cannot use \selectlanguage + // For InTitle commands, we need to switch the language inside the command + // (see #10849); thus open the command here. + if (intitle_command) { + parStartCommand(par, os, runparams, style); + os << '{'; + } + + // In some insets (such as Arguments), we cannot use \selectlanguage. + // Also, if an RTL language is set via environment in polyglossia, + // only a nested \\text command will reset the direction for LTR + // languages (see # 10111). + bool const in_polyglossia_rtl_env = + use_polyglossia + && runparams.local_font != 0 + && outer_language->rightToLeft() + && !par_language->rightToLeft(); bool const localswitch = text.inset().forceLocalFontSwitch() - || (use_polyglossia && text.inset().forcePlainLayout()); + || (using_begin_end && text.inset().forcePlainLayout()) + || in_polyglossia_rtl_env; if (localswitch) { lang_begin_command = use_polyglossia ? "\\text$$lang$$opts{" : lyxrc.language_command_local; lang_end_command = "}"; lang_command_termination.clear(); } - - if (par_lang != prev_lang - // check if we already put language command in TeXEnvironment() - && !(style.isEnvironment() - && (pit == 0 || (priorpar->layout() != par.layout() - && priorpar->getDepth() <= par.getDepth()) - || priorpar->getDepth() < par.getDepth()))) - { - if (!lang_end_command.empty() && - prev_lang != outer_lang && - !prev_lang.empty() && - (!use_polyglossia || !style.isEnvironment())) - { + + bool const localswitch_needed = localswitch && par_lang != outer_lang; + + // localswitches need to be closed and reopened at each par + if ((par_lang != prev_lang || localswitch_needed) + // check if we already put language command in TeXEnvironment() + && !(style.isEnvironment() + && (pit == 0 || (priorpar->layout() != par.layout() + && priorpar->getDepth() <= par.getDepth()) + || priorpar->getDepth() < par.getDepth()))) { + if (!localswitch + && (!using_begin_end || langOpenedAtThisLevel(state)) + && !lang_end_command.empty() + && prev_lang != outer_lang + && !prev_lang.empty() + && (!using_begin_end || !style.isEnvironment())) { os << from_ascii(subst(lang_end_command, - "$$lang", - prev_lang)) + "$$lang", + prev_lang)) << lang_command_termination; - if (use_polyglossia && !localswitch) { - state->lang_switch_depth_.pop(); - state->open_polyglossia_lang_.pop(); - } + if (using_begin_end) + popLanguageName(); } // We need to open a new language if we couldn't close the previous @@ -794,7 +905,7 @@ void TeXOnePar(Buffer const & buf, // outer_language (which is currently in effect once the previous one // is closed). if ((lang_end_command.empty() || par_lang != outer_lang - || (!use_polyglossia + || (!using_begin_end || (style.isEnvironment() && par_lang != prev_lang))) && !par_lang.empty()) { // If we're inside an inset, and that inset is within an \L or \R @@ -802,7 +913,7 @@ void TeXOnePar(Buffer const & buf, // language paragraph should appear within an \L or \R (in addition // to, outside of, the normal language switch commands). // This behavior is not correct for ArabTeX, though. - if (!use_polyglossia + if (!using_begin_end // not for ArabTeX && par_language->lang() != "arabic_arabtex" && outer_language->lang() != "arabic_arabtex" @@ -835,17 +946,17 @@ void TeXOnePar(Buffer const & buf, } // With CJK, the CJK tag has to be closed first (see below) if (runparams.encoding->package() != Encoding::CJK - && par_lang != openPolyglossiaLang(state) + && (par_lang != openLanguageName(state) || localswitch || intitle_command) && !par_lang.empty()) { string bc = use_polyglossia ? - getPolyglossiaBegin(lang_begin_command, par_lang, par_language->polyglossiaOpts()) + getPolyglossiaBegin(lang_begin_command, par_lang, + par_language->polyglossiaOpts(), + localswitch) : subst(lang_begin_command, "$$lang", par_lang); os << bc; os << lang_command_termination; - if (use_polyglossia && !localswitch) { - state->lang_switch_depth_.push(state->nest_level_); - state->open_polyglossia_lang_.push(par_lang); - } + if (using_begin_end) + pushLanguageName(par_lang, localswitch); } } } @@ -886,7 +997,11 @@ void TeXOnePar(Buffer const & buf, // context (nesting issue). if (par_language->encoding()->package() == Encoding::CJK && state->open_encoding_ != CJK && state->cjk_inherited_ == 0) { - os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName()) + docstring const cjkenc = (bparams.encoding().name() == "utf8-cjk" + && LaTeXFeatures::isAvailable("CJKutf8")) ? + from_ascii("UTF8") + : from_ascii(par_language->encoding()->latexName()); + os << "\\begin{CJK}{" << cjkenc << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; state->open_encoding_ = CJK; } @@ -897,17 +1012,17 @@ void TeXOnePar(Buffer const & buf, } // With CJK, the CJK tag had to be closed first (see above) if (runparams.encoding->package() == Encoding::CJK - && par_lang != openPolyglossiaLang(state) + && par_lang != openLanguageName(state) && !par_lang.empty()) { - os << from_ascii(subst( - lang_begin_command, - "$$lang", - par_lang)) - << lang_command_termination; - if (use_polyglossia && !localswitch) { - state->lang_switch_depth_.push(state->nest_level_); - state->open_polyglossia_lang_.push(par_lang); - } + string bc = use_polyglossia ? + getPolyglossiaBegin(lang_begin_command, par_lang, + par_language->polyglossiaOpts(), + localswitch) + : subst(lang_begin_command, "$$lang", par_lang); + os << bc + << lang_command_termination; + if (using_begin_end) + pushLanguageName(par_lang, localswitch); } runparams.encoding = encoding; } @@ -924,34 +1039,39 @@ void TeXOnePar(Buffer const & buf, os << "\n\\appendix\n"; } - if (!par.params().spacing().isDefault() - && (pit == 0 || !priorpar->hasSameLayout(par))) - { - os << from_ascii(par.params().spacing().writeEnvirBegin(useSetSpace)) - << '\n'; - } + // InTitle commands must use switches (not environments) + // inside the commands (see #9332) + if (style.intitle) { + if (!par.params().spacing().isDefault()) + { + if (runparams.moving_arg) + os << "\\protect"; + os << from_ascii(par.params().spacing().writeCmd(useSetSpace)); + } + } else { + if (!par.params().spacing().isDefault() + && (pit == 0 || !priorpar->hasSameLayout(par))) + { + os << from_ascii(par.params().spacing().writeEnvirBegin(useSetSpace)) + << '\n'; + } - if (style.isCommand()) { - os << '\n'; + if (style.isCommand()) { + os << '\n'; + } } } - parStartCommand(par, os, runparams, style); + // For InTitle commands, we already started the command before + // the language switch + if (!intitle_command) + parStartCommand(par, os, runparams, style); + Font const outerfont = text.outerFont(pit); // FIXME UNICODE os << from_utf8(everypar); - par.latex(bparams, outerfont, os, runparams, start_pos, end_pos); - - // Make sure that \\par is done with the font of the last - // character if this has another size as the default. - // This is necessary because LaTeX (and LyX on the screen) - // calculates the space between the baselines according - // to this font. (Matthias) - // - // We must not change the font for the last paragraph - // of non-multipar insets, tabular cells or commands, - // since this produces unwanted whitespace. + par.latex(bparams, outerfont, os, runparams, start_pos, end_pos, force); Font const font = par.empty() ? par.getLayoutFont(bparams, outerfont) @@ -959,20 +1079,16 @@ void TeXOnePar(Buffer const & buf, bool const is_command = style.isCommand(); - if (style.resfont.size() != font.fontInfo().size() - && (nextpar || maintext - || (text.inset().paragraphs().size() > 1 - && text.inset().lyxCode() != CELL_CODE)) - && !is_command) { - os << '{'; - os << "\\" << from_ascii(font.latexSize()) << " \\par}"; - } else if (is_command) { - os << '}'; - if (!style.postcommandargs().empty()) - latexArgInsets(par, os, runparams, style.postcommandargs(), "post:"); - if (runparams.encoding != prev_encoding) { - runparams.encoding = prev_encoding; - os << setEncoding(prev_encoding->iconvName()); + // InTitle commands need to be closed after the language has been closed. + if (!intitle_command) { + if (is_command) { + os << '}'; + if (!style.postcommandargs().empty()) + latexArgInsets(par, os, runparams, style.postcommandargs(), "post:"); + if (runparams.encoding != prev_encoding) { + runparams.encoding = prev_encoding; + os << setEncoding(prev_encoding->iconvName()); + } } } @@ -986,7 +1102,7 @@ void TeXOnePar(Buffer const & buf, && nextpar->getDepth() == par.getDepth()) || (atSameLastLangSwitchDepth(state) && nextpar && nextpar->getDepth() < par.getDepth())) - close_lang_switch = use_polyglossia; + close_lang_switch = using_begin_end; if (nextpar && par.params().depth() < nextpar->params().depth()) pending_newline = true; break; @@ -996,21 +1112,22 @@ void TeXOnePar(Buffer const & buf, if (nextpar && ((nextpar->layout() != par.layout() || nextpar->params().depth() != par.params().depth()) - || (!use_polyglossia || par_lang != nextpar_lang))) + || (!using_begin_end || par_lang != nextpar_lang))) { - close_lang_switch = use_polyglossia; + close_lang_switch = using_begin_end; break; } } - - // fall through possible + // possible + // fall through default: - // we don't need it for the last paragraph!!! - if (nextpar) + // we don't need it for the last paragraph and in InTitle commands!!! + if (nextpar && !intitle_command) pending_newline = true; } - if (par.allowParagraphCustomization()) { + // InTitle commands use switches (not environments) for space settings + if (par.allowParagraphCustomization() && !style.intitle) { if (!par.params().spacing().isDefault() && (runparams.isLastPar || !nextpar->hasSameLayout(par))) { if (pending_newline) @@ -1026,10 +1143,11 @@ void TeXOnePar(Buffer const & buf, } } - // Closing the language is needed for the last paragraph; it is also - // needed if we're within an \L or \R that we may have opened above (not - // necessarily in this paragraph) and are about to close. - bool closing_rtl_ltr_environment = !use_polyglossia + // Closing the language is needed for the last paragraph in a given language + // as well as for any InTitleCommand (since these set the language locally); + // it is also needed if we're within an \L or \R that we may have opened above + // (not necessarily in this paragraph) and are about to close. + bool closing_rtl_ltr_environment = !using_begin_end // not for ArabTeX && (par_language->lang() != "arabic_arabtex" && outer_language->lang() != "arabic_arabtex") @@ -1040,16 +1158,18 @@ void TeXOnePar(Buffer const & buf, &&((nextpar && par_lang != nextpar_lang) || (runparams.isLastPar && par_lang != outer_lang)); - if (closing_rtl_ltr_environment - || ((runparams.isLastPar || close_lang_switch) - && (par_lang != outer_lang || (use_polyglossia + if (localswitch_needed + || (intitle_command && using_begin_end) + || closing_rtl_ltr_environment + || (((runparams.isLastPar && !runparams.inbranch) || close_lang_switch) + && (par_lang != outer_lang || (using_begin_end && style.isEnvironment() && par_lang != nextpar_lang)))) { // Since \selectlanguage write the language to the aux file, // we need to reset the language at the end of footnote or // float. - if (pending_newline || close_lang_switch) + if (!localswitch && (pending_newline || close_lang_switch)) os << '\n'; // when the paragraph uses CJK, the language has to be closed earlier @@ -1065,36 +1185,38 @@ void TeXOnePar(Buffer const & buf, ? getPolyglossiaEnvName(current_language) : current_language->babel(); if (!current_lang.empty() - && current_lang != openPolyglossiaLang(state)) { + && current_lang != openLanguageName(state)) { string bc = use_polyglossia ? getPolyglossiaBegin(lang_begin_command, current_lang, - current_language->polyglossiaOpts()) + current_language->polyglossiaOpts(), + localswitch) : subst(lang_begin_command, "$$lang", current_lang); os << bc; pending_newline = !localswitch; unskip_newline = !localswitch; - if (use_polyglossia && !localswitch) { - state->lang_switch_depth_.push( - state->nest_level_); - state->open_polyglossia_lang_.push(current_lang); - } + if (using_begin_end) + pushLanguageName(current_lang, localswitch); } - } else if (!par_lang.empty()) { - // If we are in an environment, we have to close the "outer" language afterwards - string const & pol_lang = openPolyglossiaLang(state); + } else if ((!using_begin_end || + langOpenedAtThisLevel(state)) && + !par_lang.empty()) { + // If we are in an environment, we have to + // close the "outer" language afterwards + string const & cur_lang = openLanguageName(state); if (!style.isEnvironment() || (close_lang_switch && atSameLastLangSwitchDepth(state) && par_lang != outer_lang - && (par_lang != pol_lang - || (pol_lang != outer_lang + && (par_lang != cur_lang + || (cur_lang != outer_lang && nextpar && style != nextpar->layout()))) || (atSameLastLangSwitchDepth(state) && state->lang_switch_depth_.size() - && pol_lang != par_lang)) + && cur_lang != par_lang) + || in_polyglossia_rtl_env) { - if (use_polyglossia && !localswitch) + if (using_begin_end && !localswitch) os << breakln; os << from_ascii(subst( lang_end_command, @@ -1102,10 +1224,8 @@ void TeXOnePar(Buffer const & buf, par_lang)); pending_newline = !localswitch; unskip_newline = !localswitch; - if (use_polyglossia && !localswitch) { - state->lang_switch_depth_.pop(); - state->open_polyglossia_lang_.pop(); - } + if (using_begin_end) + popLanguageName(); } } } @@ -1113,6 +1233,19 @@ void TeXOnePar(Buffer const & buf, if (closing_rtl_ltr_environment) os << "}"; + // InTitle commands need to be closed after the language has been closed. + if (intitle_command) { + if (is_command) { + os << '}'; + if (!style.postcommandargs().empty()) + latexArgInsets(par, os, runparams, style.postcommandargs(), "post:"); + if (runparams.encoding != prev_encoding) { + runparams.encoding = prev_encoding; + os << setEncoding(prev_encoding->iconvName()); + } + } + } + bool const last_was_separator = par.size() > 0 && par.isEnvSeparator(par.size() - 1); @@ -1121,7 +1254,7 @@ void TeXOnePar(Buffer const & buf, // prevent unwanted whitespace os << '%'; if (!os.afterParbreak() && !last_was_separator) - os << breakln; + os << '\n'; } // if this is a CJK-paragraph and the next isn't, close CJK @@ -1214,20 +1347,20 @@ void TeXOnePar(Buffer const & buf, && !text.inset().getLayout().parbreakIsNewline() && style.latextype != LATEX_ITEM_ENVIRONMENT && style.latextype != LATEX_LIST_ENVIRONMENT - && style.align == par.getAlign() + && style.align == par.getAlign(bparams) && nextpar->getDepth() == par.getDepth() - && nextpar->getAlign() == par.getAlign()) + && nextpar->getAlign(bparams) == par.getAlign(bparams)) || (!next_layout.isEnvironment() && nextpar->getDepth() > par.getDepth() - && nextpar->getAlign() == par.getAlign()) + && nextpar->getAlign(bparams) == next_layout.align) || (!style.isEnvironment() && next_layout.latextype == LATEX_ENVIRONMENT && nextpar->getDepth() < par.getDepth()) || (style.isCommand() && !next_layout.isEnvironment() - && style.align == par.getAlign() - && next_layout.align == nextpar->getAlign()) - || (style.align != par.getAlign() + && style.align == par.getAlign(bparams) + && next_layout.align == nextpar->getAlign(bparams)) + || (style.align != par.getAlign(bparams) && tclass.isDefaultLayout(next_layout))) { os << '\n'; } @@ -1252,18 +1385,35 @@ void latexParagraphs(Buffer const & buf, { os << "% LaTeX Output Error\n"; return; } ); BufferParams const & bparams = buf.params(); + BufferParams const & mparams = buf.masterParams(); bool const maintext = text.isMainText(); bool const is_child = buf.masterBuffer() != &buf; + bool const multibib_child = maintext && is_child + && mparams.multibib == "child"; + + if (multibib_child && mparams.useBiblatex()) + os << "\\newrefsection"; + else if (multibib_child && mparams.useBibtopic() + && !buf.masterBibInfo().empty()) { + os << "\\begin{btUnit}\n"; + runparams.openbtUnit = true; + } // Open a CJK environment at the beginning of the main buffer // if the document's language is a CJK language // (but not in child documents) OutputState * state = getOutputState(); - if (maintext && !is_child - && bparams.encoding().package() == Encoding::CJK) { - os << "\\begin{CJK}{" << from_ascii(bparams.encoding().latexName()) - << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; + if (maintext && !is_child && !bparams.useNonTeXFonts + && bparams.language->encoding()->package() == Encoding::CJK + && (bparams.encoding().name() == "utf8-cjk" + || bparams.encoding().iconvName() != "UTF-8")) { + docstring const cjkenc = (bparams.encoding().name() == "utf8-cjk" + && LaTeXFeatures::isAvailable("CJKutf8")) ? + from_ascii("UTF8") + : from_ascii(bparams.encoding().latexName()); + os << "\\begin{CJK}{" << cjkenc + << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; state->open_encoding_ = CJK; } // if "auto begin" is switched off, explicitly switch the @@ -1273,6 +1423,10 @@ void latexParagraphs(Buffer const & buf, : bparams.language->babel(); string const lang_begin_command = runparams.use_polyglossia ? "\\begin{$$lang}$$opts" : lyxrc.language_command_begin; + string const lang_end_command = runparams.use_polyglossia ? + "\\end{$$lang}" : lyxrc.language_command_end; + bool const using_begin_end = runparams.use_polyglossia || + !lang_end_command.empty(); if (maintext && !lyxrc.language_auto_begin && !mainlang.empty()) { @@ -1283,10 +1437,8 @@ void latexParagraphs(Buffer const & buf, : subst(lang_begin_command, "$$lang", mainlang); os << bc; os << '\n'; - if (runparams.use_polyglossia) { - state->lang_switch_depth_.push(state->nest_level_); - state->open_polyglossia_lang_.push(mainlang); - } + if (using_begin_end) + pushLanguageName(mainlang); } ParagraphList const & paragraphs = text.paragraphs(); @@ -1319,7 +1471,7 @@ void latexParagraphs(Buffer const & buf, if (layout.intitle) { if (already_title) { - if (!gave_layout_warning) { + if (!gave_layout_warning && !runparams.dryrun) { gave_layout_warning = true; frontend::Alert::warning(_("Error in latexParagraphs"), bformat(_("You are using at least one " @@ -1336,7 +1488,7 @@ void latexParagraphs(Buffer const & buf, << "}\n"; } } - } else if (was_title && !already_title) { + } else if (was_title && !already_title && !layout.inpreamble) { if (tclass.titletype() == TITLE_ENVIRONMENT) { os << "\\end{" << from_ascii(tclass.titlename()) << "}\n"; @@ -1349,13 +1501,23 @@ void latexParagraphs(Buffer const & buf, was_title = false; } + if (layout.isCommand() && !layout.latexname().empty() + && layout.latexname() == bparams.multibib) { + if (runparams.openbtUnit) + os << "\\end{btUnit}\n"; + if (!bparams.useBiblatex() + && !buf.masterBibInfo().empty()) { + os << '\n' << "\\begin{btUnit}\n"; + runparams.openbtUnit = true; + } + } if (!layout.isEnvironment() && par->params().leftIndent().zero()) { // This is a standard top level paragraph, TeX it and continue. TeXOnePar(buf, text, pit, os, runparams, everypar); continue; } - + TeXEnvironmentData const data = prepareEnvironment(buf, text, par, os, runparams); // pit can be changed in TeXEnvironment. @@ -1381,20 +1543,21 @@ void latexParagraphs(Buffer const & buf, } } + if (maintext && !is_child && runparams.openbtUnit) + os << "\\end{btUnit}\n"; + // if "auto end" is switched off, explicitly close the language at the end // but only if the last par is in a babel or polyglossia language - string const lang_end_command = runparams.use_polyglossia ? - "\\end{$$lang}" : lyxrc.language_command_end; + Language const * const lastpar_language = + paragraphs.at(lastpit).getParLanguage(bparams); if (maintext && !lyxrc.language_auto_end && !mainlang.empty() && - paragraphs.at(lastpit).getParLanguage(bparams)->encoding()->package() != Encoding::CJK) { + lastpar_language->encoding()->package() != Encoding::CJK) { os << from_utf8(subst(lang_end_command, "$$lang", mainlang)) << '\n'; - if (runparams.use_polyglossia) { - state->lang_switch_depth_.pop(); - state->open_polyglossia_lang_.pop(); - } + if (using_begin_end) + popLanguageName(); } // If the last paragraph is an environment, we'll have to close @@ -1403,17 +1566,30 @@ void latexParagraphs(Buffer const & buf, os << "\\end{CJK}\n"; state->open_encoding_ = none; } - // Likewise for polyglossia - string const & pol_lang = openPolyglossiaLang(state); - if (maintext && !is_child && !pol_lang.empty()) { + // Likewise for polyglossia or when using begin/end commands + // or at the very end of an active branch inset with a language switch + Language const * const outer_language = (runparams.local_font != 0) + ? runparams.local_font->language() : bparams.language; + string const & prev_lang = runparams.use_polyglossia + ? getPolyglossiaEnvName(outer_language) + : outer_language->babel(); + string const lastpar_lang = runparams.use_polyglossia ? + getPolyglossiaEnvName(lastpar_language): lastpar_language->babel(); + string const & cur_lang = openLanguageName(state); + if (((runparams.inbranch && langOpenedAtThisLevel(state) && prev_lang != cur_lang) + || (maintext && !is_child)) && !cur_lang.empty()) { os << from_utf8(subst(lang_end_command, "$$lang", - pol_lang)) + cur_lang)) << '\n'; - if (runparams.use_polyglossia) { - state->lang_switch_depth_.pop(); - state->open_polyglossia_lang_.pop(); - } + if (using_begin_end) + popLanguageName(); + } else if (runparams.inbranch && !using_begin_end + && prev_lang != lastpar_lang && !lastpar_lang.empty()) { + // with !using_begin_end, cur_lang is empty, so we need to + // compare against the paragraph language (and we are in the + // last paragraph at this point) + os << subst(lang_begin_command, "$$lang", prev_lang) << '\n'; } // reset inherited encoding @@ -1422,6 +1598,11 @@ void latexParagraphs(Buffer const & buf, if (state->cjk_inherited_ == 0) state->open_encoding_ = CJK; } + + if (multibib_child && mparams.useBibtopic()) { + os << "\\end{btUnit}\n"; + runparams.openbtUnit = false; + } } @@ -1433,15 +1614,17 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, // * with useNonTeXFonts: "utf8plain", // * with XeTeX and TeX fonts: "ascii" (inputenc fails), // * with LuaTeX and TeX fonts: only one encoding accepted by luainputenc. - if (runparams.isFullUnicode()) + if (runparams.isFullUnicode() || newEnc.name() == "inherit") return make_pair(false, 0); Encoding const & oldEnc = *runparams.encoding; bool moving_arg = runparams.moving_arg; - // If we switch from/to CJK, we need to switch anyway, despite custom inputenc - bool const from_to_cjk = - (oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK) - || (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK); + // If we switch from/to CJK, we need to switch anyway, despite custom inputenc, + // except if we use CJKutf8 + bool const from_to_cjk = + ((oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK) + || (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK)) + && (bparams.encoding().name() != "utf8-cjk" || !LaTeXFeatures::isAvailable("CJKutf8")); if (!force && !from_to_cjk && ((bparams.inputenc != "auto" && bparams.inputenc != "default") || moving_arg)) return make_pair(false, 0); @@ -1513,7 +1696,11 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, os << "\\egroup"; count += 7; } - os << "\\begin{CJK}{" << inputenc_arg << "}{" + docstring const cjkenc = (bparams.encoding().name() == "utf8-cjk" + && LaTeXFeatures::isAvailable("CJKutf8")) ? + from_ascii("UTF8") + : from_ascii(bparams.encoding().latexName()); + os << "\\begin{CJK}{" << cjkenc << "}{" << from_ascii(bparams.fonts_cjk) << "}"; state->open_encoding_ = CJK; return make_pair(true, count + 15);