X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=b6ed0cec18d886ecdc9a7d7bcc0880197eac2202;hb=bf56e2c8e1afa857cd5e313c19948040e41b8227;hp=4f8f14a86a75d9f3e32b4ebee63bd0a1cb3f7c42;hpb=936773c4f71a795179ea63f2d5b6f521ef9d97f8;p=lyx.git diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 4f8f14a86a..b6ed0cec18 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -23,21 +23,26 @@ #include "OutputParams.h" #include "Paragraph.h" #include "ParagraphParameters.h" +#include "texstream.h" #include "TextClass.h" -#include "TexRow.h" #include "insets/InsetBibitem.h" #include "insets/InsetArgument.h" +#include "frontends/alert.h" + #include "support/lassert.h" #include "support/convert.h" #include "support/debug.h" #include "support/lstrings.h" +#include "support/lyxalgo.h" #include "support/textutils.h" +#include "support/gettext.h" + +#include -#include -#include #include +#include using namespace std; using namespace lyx::support; @@ -53,13 +58,75 @@ enum OpenEncoding { CJK }; -// FIXME THREAD -// There could easily be a conflict here, with the export process -// setting this one way, and a View>Source process (possbily for -// another Buffer) resetting it. -static int open_encoding_ = none; -static int cjk_inherited_ = 0; -Language const * prev_env_language_ = 0; + +struct OutputState +{ + OutputState() : open_encoding_(none), cjk_inherited_(0), + prev_env_language_(0), nest_level_(0) + { + } + OpenEncoding open_encoding_; + int cjk_inherited_; + Language const * prev_env_language_; + int nest_level_; + stack lang_switch_depth_; // Both are always empty when + stack open_polyglossia_lang_; // not using polyglossia +}; + + +OutputState * getOutputState() +{ + // FIXME An instance of OutputState should be kept around for each export + // instead of using local thread storage + static QThreadStorage outputstate; + if (!outputstate.hasLocalData()) + outputstate.setLocalData(new OutputState); + return outputstate.localData(); +} + + +string const & openPolyglossiaLang(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. + + static string const empty; + + return state->open_polyglossia_lang_.empty() + ? empty + : state->open_polyglossia_lang_.top(); +} + + +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. + + return state->lang_switch_depth_.size() == 0 + ? true + : abs(state->lang_switch_depth_.top()) == state->nest_level_; +} + + +bool isLocalSwitch(OutputState const * state) +{ + // Return true if the language was opened by the \text command. + + 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_; +} string const getPolyglossiaEnvName(Language const * lang) @@ -72,6 +139,20 @@ string const getPolyglossiaEnvName(Language const * lang) } +string const getPolyglossiaBegin(string const & lang_begin_command, + string const & lang, string const & opts) +{ + string result; + if (!lang.empty()) + result = subst(lang_begin_command, "$$lang", lang); + string options = opts.empty() ? + string() : "[" + opts + "]"; + result = subst(result, "$$opts", options); + + return result; +} + + struct TeXEnvironmentData { bool cjk_nested; @@ -99,9 +180,10 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, ParagraphList const & paragraphs = text.paragraphs(); ParagraphList::const_iterator const priorpit = - pit == paragraphs.begin() ? pit : boost::prior(pit); + pit == paragraphs.begin() ? pit : prev(pit, 1); - bool const use_prev_env_language = prev_env_language_ != 0 + OutputState * state = getOutputState(); + bool const use_prev_env_language = state->prev_env_language_ != 0 && priorpit->layout().isEnvironment() && (priorpit->getDepth() > pit->getDepth() || (priorpit->getDepth() == pit->getDepth() @@ -112,7 +194,7 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, Language const * const doc_language = bparams.language; Language const * const prev_par_language = (pit != paragraphs.begin()) - ? (use_prev_env_language ? prev_env_language_ + ? (use_prev_env_language ? state->prev_env_language_ : priorpit->getParLanguage(bparams)) : doc_language; @@ -128,9 +210,11 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, string const lang_end_command = use_polyglossia ? "\\end{$$lang}" : lyxrc.language_command_end; + // For polyglossia, switch language outside of environment, if possible. if (par_lang != prev_par_lang) { if (!lang_end_command.empty() && prev_par_lang != doc_lang && + atSameLastLangSwitchDepth(state) && !prev_par_lang.empty()) { os << from_ascii(subst( lang_end_command, @@ -138,22 +222,31 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, prev_par_lang)) // the '%' is necessary to prevent unwanted whitespace << "%\n"; + if (use_polyglossia) + popPolyglossiaLang(); } + // If no language was explicitly opened and we are using + // polyglossia, then the current polyglossia language is + // the document language. + string const & pol_lang = use_polyglossia + && state->lang_switch_depth_.size() + ? openPolyglossiaLang(state) + : doc_lang; + if ((lang_end_command.empty() || - par_lang != doc_lang) && + par_lang != doc_lang || + par_lang != pol_lang) && !par_lang.empty()) { - os << from_ascii(subst( - lang_begin_command, - "$$lang", - par_lang)); - if (use_polyglossia - && !data.par_language->polyglossiaOpts().empty()) - os << "[" - << from_ascii(data.par_language->polyglossiaOpts()) - << "]"; - // the '%' is necessary to prevent unwanted whitespace - os << "%\n"; + string bc = use_polyglossia ? + getPolyglossiaBegin(lang_begin_command, par_lang, + data.par_language->polyglossiaOpts()) + : subst(lang_begin_command, "$$lang", par_lang); + os << bc; + // the '%' is necessary to prevent unwanted whitespace + os << "%\n"; + if (use_polyglossia) + pushPolyglossiaLang(par_lang); } } @@ -166,6 +259,7 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, } if (style.isEnvironment()) { + state->nest_level_ += 1; os << "\\begin{" << from_ascii(style.latexname()) << '}'; if (!style.latexargs().empty()) { OutputParams rp = runparams; @@ -191,56 +285,64 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, // in multilingual environments, the CJK tags have to be nested properly data.cjk_nested = false; if (data.par_language->encoding()->package() == Encoding::CJK && - open_encoding_ != CJK && pit->isMultiLingual(bparams)) { + 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()) << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; - open_encoding_ = CJK; + state->open_encoding_ = CJK; data.cjk_nested = true; } return data; } -static void finishEnvironment(Buffer const & buf, Text const & text, - pit_type nextpit, otexstream & os, - OutputParams const & runparams, +static void finishEnvironment(otexstream & os, OutputParams const & runparams, TeXEnvironmentData const & data) { - if (open_encoding_ == CJK && data.cjk_nested) { + OutputState * state = getOutputState(); + // BufferParams const & bparams = buf.params(); // FIXME: for speedup shortcut below, would require passing of "buf" as argument + if (state->open_encoding_ == CJK && data.cjk_nested) { // We need to close the encoding even if it does not change // to do correct environment nesting os << "\\end{CJK}\n"; - open_encoding_ = none; + state->open_encoding_ = none; } if (data.style->isEnvironment()) { - os << breakln - << "\\end{" << from_ascii(data.style->latexname()) << "}\n"; - prev_env_language_ = data.par_language; + os << breakln; + // Close any polyglossia language opened at this nest level + if (runparams.use_polyglossia) { + while (langOpenedAtThisLevel(state)) { + if (isLocalSwitch(state)) { + os << "}"; + } else { + os << "\\end{" + << openPolyglossiaLang(state) + << "}%\n"; + } + popPolyglossiaLang(); + } + } + state->nest_level_ -= 1; + os << "\\end{" << from_ascii(data.style->latexname()) << "}\n"; + state->prev_env_language_ = data.par_language; if (runparams.encoding != data.prev_encoding) { runparams.encoding = data.prev_encoding; - if (!runparams.isFullUnicode()) - os << setEncoding(data.prev_encoding->iconvName()); + os << setEncoding(data.prev_encoding->iconvName()); } } if (data.leftindent_open) { os << breakln << "\\end{LyXParagraphLeftIndent}\n"; - prev_env_language_ = data.par_language; + state->prev_env_language_ = data.par_language; if (runparams.encoding != data.prev_encoding) { runparams.encoding = data.prev_encoding; - if (!runparams.isFullUnicode()) - os << setEncoding(data.prev_encoding->iconvName()); + os << setEncoding(data.prev_encoding->iconvName()); } } // Check whether we should output a blank line after the environment - DocumentClass const & tclass = buf.params().documentClass(); - ParagraphList const & pars = text.paragraphs(); - bool next_style_is_default = (nextpit >= runparams.par_end) ? false - : tclass.isDefaultLayout(pars.constIterator(nextpit)->layout()); - if (!data.style->nextnoindent && next_style_is_default) + if (!data.style->nextnoindent) os << '\n'; } @@ -306,7 +408,7 @@ void TeXEnvironment(Buffer const & buf, Text const & text, prepareEnvironment(buf, text, par, os, runparams); // Recursive call to TeXEnvironment! TeXEnvironment(buf, text, runparams, pit, os); - finishEnvironment(buf, text, pit + 1, os, runparams, data); + finishEnvironment(os, runparams, data); } if (pit != runparams.par_end) @@ -321,6 +423,18 @@ void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeX if (argnr == 0) return; + // Default and preset args are always output, so if they require + // other arguments, consider this. + Layout::LaTeXArgMap::const_iterator lit = latexargs.begin(); + Layout::LaTeXArgMap::const_iterator const lend = latexargs.end(); + for (; lit != lend; ++lit) { + Layout::latexarg arg = (*lit).second; + if ((!arg.presetarg.empty() || !arg.defaultarg.empty()) && !arg.requires.empty()) { + vector req = getVectorFromString(arg.requires); + required.insert(required.end(), req.begin(), req.end()); + } + } + for (unsigned int i = 1; i <= argnr; ++i) { map::const_iterator lit = ilist.find(i); bool inserted = false; @@ -388,6 +502,25 @@ void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeX } // namespace anon +void pushPolyglossiaLang(string const & lang_name, bool localswitch) +{ + OutputState * state = getOutputState(); + + 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() +{ + OutputState * state = getOutputState(); + + state->lang_switch_depth_.pop(); + state->open_polyglossia_lang_.pop(); +} + + void latexArgInsets(Paragraph const & par, otexstream & os, OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, string const & prefix) { @@ -435,9 +568,9 @@ void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pi // get the first paragraph in sequence with this layout and depth pit_type offset = 0; while (true) { - if (boost::prior(pit, offset) == pars.begin()) + if (lyx::prev(pit, offset) == pars.begin()) break; - ParagraphList::const_iterator priorpit = boost::prior(pit, offset + 1); + ParagraphList::const_iterator priorpit = lyx::prev(pit, offset + 1); if (priorpit->layout() == current_layout && priorpit->params().depth() == current_depth) ++offset; @@ -445,7 +578,7 @@ void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pi break; } - ParagraphList::const_iterator spit = boost::prior(pit, offset); + ParagraphList::const_iterator spit = lyx::prev(pit, offset); for (; spit != pars.end(); ++spit) { if (spit->layout() != current_layout || spit->params().depth() < current_depth) @@ -529,7 +662,7 @@ void TeXOnePar(Buffer const & buf, Paragraph const & par = paragraphs.at(pit); // FIXME This check should not really be needed. // Perhaps we should issue an error if it is. - Layout const style = text.inset().forcePlainLayout() ? + Layout const & style = text.inset().forcePlainLayout() ? bparams.documentClass().plainLayout() : par.layout(); if (style.inpreamble) @@ -549,10 +682,11 @@ void TeXOnePar(Buffer const & buf, bool const maintext = text.isMainText(); // we are at the beginning of an inset and CJK is already open; // we count inheritation levels to get the inset nesting right. + OutputState * state = getOutputState(); if (pit == 0 && !maintext - && (cjk_inherited_ > 0 || open_encoding_ == CJK)) { - cjk_inherited_ += 1; - open_encoding_ = none; + && (state->cjk_inherited_ > 0 || state->open_encoding_ == CJK)) { + state->cjk_inherited_ += 1; + state->open_encoding_ = none; } if (text.inset().isPassThru()) { @@ -600,6 +734,8 @@ void TeXOnePar(Buffer const & buf, // This paragraph's language Language const * const par_language = par.getParLanguage(bparams); + Language const * const nextpar_language = nextpar ? + nextpar->getParLanguage(bparams) : 0; // The document's language Language const * const doc_language = bparams.language; // The language that was in effect when the environment this paragraph is @@ -615,7 +751,7 @@ 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. - bool const use_prev_env_language = prev_env_language_ != 0 + bool const use_prev_env_language = state->prev_env_language_ != 0 && priorpar && priorpar->layout().isEnvironment() && (priorpar->getDepth() > par.getDepth() @@ -623,7 +759,7 @@ void TeXOnePar(Buffer const & buf, && priorpar->layout() != par.layout())); Language const * const prev_language = (pit != 0) - ? (use_prev_env_language ? prev_env_language_ + ? (use_prev_env_language ? state->prev_env_language_ : priorpar->getParLanguage(bparams)) : outer_language; @@ -633,22 +769,24 @@ void TeXOnePar(Buffer const & buf, getPolyglossiaEnvName(par_language): par_language->babel(); string const prev_lang = use_polyglossia ? getPolyglossiaEnvName(prev_language) : prev_language->babel(); - string const doc_lang = use_polyglossia ? - getPolyglossiaEnvName(doc_language) : doc_language->babel(); string const outer_lang = use_polyglossia ? getPolyglossiaEnvName(outer_language) : outer_language->babel(); + string const nextpar_lang = nextpar_language ? (use_polyglossia ? + getPolyglossiaEnvName(nextpar_language) : + nextpar_language->babel()) : string(); string lang_begin_command = use_polyglossia ? - "\\begin{$$lang}" : lyxrc.language_command_begin; + "\\begin{$$lang}$$opts" : lyxrc.language_command_begin; string lang_end_command = use_polyglossia ? "\\end{$$lang}" : lyxrc.language_command_end; // the '%' is necessary to prevent unwanted whitespace string lang_command_termination = "%\n"; // In some insets (such as Arguments), we cannot use \selectlanguage - bool const localswitch = !use_polyglossia - && text.inset().getLayout().forcelocalfontswitch(); + bool const localswitch = text.inset().forceLocalFontSwitch() + || (use_polyglossia && text.inset().forcePlainLayout()); if (localswitch) { - lang_begin_command = lyxrc.language_command_local; + lang_begin_command = use_polyglossia ? + "\\text$$lang$$opts{" : lyxrc.language_command_local; lang_end_command = "}"; lang_command_termination.clear(); } @@ -662,12 +800,15 @@ void TeXOnePar(Buffer const & buf, { if (!lang_end_command.empty() && prev_lang != outer_lang && - !prev_lang.empty()) + !prev_lang.empty() && + (!use_polyglossia || !style.isEnvironment())) { os << from_ascii(subst(lang_end_command, "$$lang", prev_lang)) << lang_command_termination; + if (use_polyglossia) + popPolyglossiaLang(); } // We need to open a new language if we couldn't close the previous @@ -675,7 +816,9 @@ void TeXOnePar(Buffer const & buf, // the previous one, if the current language is different than the // outer_language (which is currently in effect once the previous one // is closed). - if ((lang_end_command.empty() || par_lang != outer_lang) + if ((lang_end_command.empty() || par_lang != outer_lang + || (!use_polyglossia + || (style.isEnvironment() && par_lang != prev_lang))) && !par_lang.empty()) { // If we're inside an inset, and that inset is within an \L or \R // (or equivalents), then within the inset, too, any opposite @@ -715,17 +858,15 @@ 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.empty()) { - os << from_ascii(subst( - lang_begin_command, - "$$lang", - par_lang)); - if (use_polyglossia - && !par_language->polyglossiaOpts().empty()) - os << "[" - << from_ascii(par_language->polyglossiaOpts()) - << "]"; + string bc = use_polyglossia ? + getPolyglossiaBegin(lang_begin_command, par_lang, par_language->polyglossiaOpts()) + : subst(lang_begin_command, "$$lang", par_lang); + os << bc; os << lang_command_termination; + if (use_polyglossia) + pushPolyglossiaLang(par_lang, localswitch); } } } @@ -734,6 +875,7 @@ void TeXOnePar(Buffer const & buf, // encoding, since this only affects the position of the outputted // \inputencoding command; the encoding switch will occur when necessary if (bparams.inputenc == "auto" + && !runparams.isFullUnicode() // Xe/LuaTeX use one document-wide encoding (see also switchEncoding()) && runparams.encoding->package() != Encoding::none) { // Look ahead for future encoding changes. // We try to output them at the beginning of the paragraph, @@ -764,10 +906,10 @@ void TeXOnePar(Buffer const & buf, // the following is necessary after a CJK environment in a multilingual // context (nesting issue). if (par_language->encoding()->package() == Encoding::CJK - && open_encoding_ != CJK && cjk_inherited_ == 0) { + && state->open_encoding_ != CJK && state->cjk_inherited_ == 0) { os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName()) << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; - open_encoding_ = CJK; + state->open_encoding_ = CJK; } if (encoding->package() != Encoding::none && enc_switch.first) { if (enc_switch.second > 0) { @@ -776,12 +918,15 @@ 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.empty()) { os << from_ascii(subst( lang_begin_command, "$$lang", par_lang)) << lang_command_termination; + if (use_polyglossia) + pushPolyglossiaLang(par_lang, localswitch); } runparams.encoding = encoding; } @@ -823,9 +968,9 @@ void TeXOnePar(Buffer const & buf, // calculates the space between the baselines according // to this font. (Matthias) // - // Is this really needed ? (Dekel) - // We do not need to use to change the font for the last paragraph - // or for a command. + // We must not change the font for the last paragraph + // of non-multipar insets, tabular cells or commands, + // since this produces unwanted whitespace. Font const font = par.empty() ? par.getLayoutFont(bparams, outerfont) @@ -834,7 +979,9 @@ void TeXOnePar(Buffer const & buf, bool const is_command = style.isCommand(); if (style.resfont.size() != font.fontInfo().size() - && nextpar + && (nextpar || maintext + || (text.inset().paragraphs().size() > 1 + && text.inset().lyxCode() != CELL_CODE)) && !is_command) { os << '{'; os << "\\" << from_ascii(font.latexSize()) << " \\par}"; @@ -844,35 +991,41 @@ void TeXOnePar(Buffer const & buf, latexArgInsets(par, os, runparams, style.postcommandargs(), "post:"); if (runparams.encoding != prev_encoding) { runparams.encoding = prev_encoding; - if (!runparams.isFullUnicode()) - os << setEncoding(prev_encoding->iconvName()); + os << setEncoding(prev_encoding->iconvName()); } } bool pending_newline = false; bool unskip_newline = false; + bool close_lang_switch = false; switch (style.latextype) { case LATEX_ITEM_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT: - if (nextpar - && (par.params().depth() < nextpar->params().depth()) - && !par.isEnvSeparator(par.size() - 1)) + if ((nextpar && par_lang != nextpar_lang + && nextpar->getDepth() == par.getDepth()) + || (atSameLastLangSwitchDepth(state) && nextpar + && nextpar->getDepth() < par.getDepth())) + close_lang_switch = use_polyglossia; + if (nextpar && par.params().depth() < nextpar->params().depth()) pending_newline = true; break; case LATEX_ENVIRONMENT: { // if its the last paragraph of the current environment // skip it otherwise fall through if (nextpar - && (nextpar->layout() != par.layout() - || nextpar->params().depth() != par.params().depth())) + && ((nextpar->layout() != par.layout() + || nextpar->params().depth() != par.params().depth()) + || (!use_polyglossia || par_lang != nextpar_lang))) + { + close_lang_switch = use_polyglossia; break; + } } // fall through possible default: // we don't need it for the last paragraph!!! - // or if the last thing is an environment separator - if (nextpar && !par.isEnvSeparator(par.size() - 1)) + if (nextpar) pending_newline = true; } @@ -903,18 +1056,19 @@ void TeXOnePar(Buffer const & buf, && runparams.local_font != 0 && runparams.local_font->isRightToLeft() != par_language->rightToLeft() // are we about to close the language? - &&((nextpar && par_language->babel() != (nextpar->getParLanguage(bparams))->babel()) - || (runparams.isLastPar && par_language->babel() != outer_language->babel())); + &&((nextpar && par_lang != nextpar_lang) + || (runparams.isLastPar && par_lang != outer_lang)); if (closing_rtl_ltr_environment - || (runparams.isLastPar - && ((!use_polyglossia && par_language->babel() != outer_language->babel()) - || (use_polyglossia && par_language->polyglossia() != outer_language->polyglossia())))) { + || ((runparams.isLastPar || close_lang_switch) + && (par_lang != outer_lang || (use_polyglossia + && 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) + if (pending_newline || close_lang_switch) os << '\n'; // when the paragraph uses CJK, the language has to be closed earlier @@ -929,50 +1083,77 @@ void TeXOnePar(Buffer const & buf, string const current_lang = use_polyglossia ? getPolyglossiaEnvName(current_language) : current_language->babel(); - if (!current_lang.empty()) { + if (!current_lang.empty() + && current_lang != openPolyglossiaLang(state)) { + string bc = use_polyglossia ? + getPolyglossiaBegin(lang_begin_command, current_lang, + current_language->polyglossiaOpts()) + : subst(lang_begin_command, "$$lang", current_lang); + os << bc; + pending_newline = !localswitch; + unskip_newline = !localswitch; + if (use_polyglossia) + pushPolyglossiaLang(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); + if (!style.isEnvironment() + || (close_lang_switch + && atSameLastLangSwitchDepth(state) + && par_lang != outer_lang + && (par_lang != pol_lang + || (pol_lang != outer_lang + && nextpar + && style != nextpar->layout()))) + || (atSameLastLangSwitchDepth(state) + && state->lang_switch_depth_.size() + && pol_lang != par_lang)) + { + if (use_polyglossia && !localswitch) + os << breakln; os << from_ascii(subst( - lang_begin_command, + lang_end_command, "$$lang", - current_lang)); + par_lang)); pending_newline = !localswitch; unskip_newline = !localswitch; + if (use_polyglossia) + popPolyglossiaLang(); } - } else if (!par_lang.empty()) { - os << from_ascii(subst( - lang_end_command, - "$$lang", - par_lang)); - pending_newline = !localswitch; - unskip_newline = !localswitch; } } } if (closing_rtl_ltr_environment) os << "}"; + bool const last_was_separator = + par.size() > 0 && par.isEnvSeparator(par.size() - 1); + if (pending_newline) { if (unskip_newline) // prevent unwanted whitespace os << '%'; - os << '\n'; + if (!os.afterParbreak() && !last_was_separator) + os << breakln; } // if this is a CJK-paragraph and the next isn't, close CJK // also if the next paragraph is a multilingual environment (because of nesting) if (nextpar - && open_encoding_ == CJK - && (nextpar->getParLanguage(bparams)->encoding()->package() != Encoding::CJK + && state->open_encoding_ == CJK + && (nextpar_language->encoding()->package() != Encoding::CJK || (nextpar->layout().isEnvironment() && nextpar->isMultiLingual(bparams))) // inbetween environments, CJK has to be closed later (nesting!) && (!style.isEnvironment() || !nextpar->layout().isEnvironment())) { os << "\\end{CJK}\n"; - open_encoding_ = none; + state->open_encoding_ = none; } // If this is the last paragraph, close the CJK environment // if necessary. If it's an environment, we'll have to \end that first. if (runparams.isLastPar && !style.isEnvironment()) { - switch (open_encoding_) { + switch (state->open_encoding_) { case CJK: { // do nothing at the end of child documents if (maintext && buf.masterBuffer() != &buf) @@ -983,12 +1164,12 @@ void TeXOnePar(Buffer const & buf, // end of an inset } else os << "\\end{CJK}"; - open_encoding_ = none; + state->open_encoding_ = none; break; } case inputenc: { os << "\\egroup"; - open_encoding_ = none; + state->open_encoding_ = none; break; } case none: @@ -999,14 +1180,14 @@ void TeXOnePar(Buffer const & buf, } // If this is the last paragraph, and a local_font was set upon entering - // the inset, and we're using "auto" or "default" encoding, the encoding + // the inset, and we're using "auto" or "default" encoding, and not + // compiling with XeTeX or LuaTeX, the encoding // should be set back to that local_font's encoding. - // However, do not change the encoding when a fully unicode aware backend - // such as XeTeX is used. if (runparams.isLastPar && runparams_in.local_font != 0 && runparams_in.encoding != runparams_in.local_font->language()->encoding() && (bparams.inputenc == "auto" || bparams.inputenc == "default") - && (!runparams.isFullUnicode())) { + && !runparams.isFullUnicode() + ) { runparams_in.encoding = runparams_in.local_font->language()->encoding(); os << setEncoding(runparams_in.encoding->iconvName()); } @@ -1018,7 +1199,7 @@ void TeXOnePar(Buffer const & buf, // we don't need a newline for the last paragraph!!! // Note from JMarc: we will re-add a \n explicitly in // TeXEnvironment, because it is needed in this case - if (nextpar && !par.isEnvSeparator(par.size() - 1)) { + if (nextpar && !os.afterParbreak() && !last_was_separator) { // Make sure to start a new line os << breakln; Layout const & next_layout = nextpar->layout(); @@ -1035,13 +1216,16 @@ void TeXOnePar(Buffer const & buf, // unchanged, or (case 2) the following is a // non-environment paragraph whose depth is increased // but whose alignment is unchanged, or (case 3) the + // paragraph is not an environment and the next one is a + // non-itemize-like env at lower depth, or (case 4) the // paragraph is a command not followed by an environment // and the alignment of the current and next paragraph - // is unchanged, or (case 4) the current alignment is + // is unchanged, or (case 5) the current alignment is // changed and a standard paragraph follows. DocumentClass const & tclass = bparams.documentClass(); if ((style == next_layout && !style.parbreak_is_newline + && !text.inset().getLayout().parbreakIsNewline() && style.latextype != LATEX_ITEM_ENVIRONMENT && style.latextype != LATEX_LIST_ENVIRONMENT && style.align == par.getAlign() @@ -1050,6 +1234,9 @@ void TeXOnePar(Buffer const & buf, || (!next_layout.isEnvironment() && nextpar->getDepth() > par.getDepth() && nextpar->getAlign() == par.getAlign()) + || (!style.isEnvironment() + && next_layout.latextype == LATEX_ENVIRONMENT + && nextpar->getDepth() < par.getDepth()) || (style.isCommand() && !next_layout.isEnvironment() && style.align == par.getAlign() @@ -1086,11 +1273,12 @@ void latexParagraphs(Buffer const & buf, // 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"; - open_encoding_ = CJK; + state->open_encoding_ = CJK; } // if "auto begin" is switched off, explicitly switch the // language on at start @@ -1098,20 +1286,19 @@ void latexParagraphs(Buffer const & buf, ? getPolyglossiaEnvName(bparams.language) : bparams.language->babel(); string const lang_begin_command = runparams.use_polyglossia ? - "\\begin{$$lang}" : lyxrc.language_command_begin; + "\\begin{$$lang}$$opts" : lyxrc.language_command_begin; if (maintext && !lyxrc.language_auto_begin && !mainlang.empty()) { // FIXME UNICODE - os << from_utf8(subst(lang_begin_command, - "$$lang", - mainlang)); - if (runparams.use_polyglossia - && !bparams.language->polyglossiaOpts().empty()) - os << "[" - << from_ascii(bparams.language->polyglossiaOpts()) - << "]"; + string bc = runparams.use_polyglossia ? + getPolyglossiaBegin(lang_begin_command, mainlang, + bparams.language->polyglossiaOpts()) + : subst(lang_begin_command, "$$lang", mainlang); + os << bc; os << '\n'; + if (runparams.use_polyglossia) + pushPolyglossiaLang(mainlang); } ParagraphList const & paragraphs = text.paragraphs(); @@ -1131,6 +1318,8 @@ void latexParagraphs(Buffer const & buf, bool already_title = false; DocumentClass const & tclass = bparams.documentClass(); + // Did we already warn about inTitle layout mixing? (we only warn once) + bool gave_layout_warning = false; for (; pit < runparams.par_end; ++pit) { lastpit = pit; ParagraphList::const_iterator par = paragraphs.constIterator(pit); @@ -1142,9 +1331,15 @@ void latexParagraphs(Buffer const & buf, if (layout.intitle) { if (already_title) { - LYXERR0("Error in latexParagraphs: You" - " should not mix title layouts" - " with normal ones."); + if (!gave_layout_warning) { + gave_layout_warning = true; + frontend::Alert::warning(_("Error in latexParagraphs"), + bformat(_("You are using at least one " + "layout (%1$s) intended for the title, " + "after using non-title layouts. This " + "could lead to missing or incorrect output." + ), layout.name())); + } } else if (!was_title) { was_title = true; if (tclass.titletype() == TITLE_ENVIRONMENT) { @@ -1177,7 +1372,7 @@ void latexParagraphs(Buffer const & buf, prepareEnvironment(buf, text, par, os, runparams); // pit can be changed in TeXEnvironment. TeXEnvironment(buf, text, runparams, pit, os); - finishEnvironment(buf, text, pit + 1, os, runparams, data); + finishEnvironment(os, runparams, data); } if (pit == runparams.par_end) { @@ -1199,7 +1394,7 @@ void latexParagraphs(Buffer const & buf, } // if "auto end" is switched off, explicitly close the language at the end - // but only if the last par is in a babel language + // 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; if (maintext && !lyxrc.language_auto_end && !mainlang.empty() && @@ -1208,20 +1403,32 @@ void latexParagraphs(Buffer const & buf, "$$lang", mainlang)) << '\n'; + if (runparams.use_polyglossia) + popPolyglossiaLang(); } // If the last paragraph is an environment, we'll have to close // CJK at the very end to do proper nesting. - if (maintext && !is_child && open_encoding_ == CJK) { + if (maintext && !is_child && state->open_encoding_ == CJK) { os << "\\end{CJK}\n"; - open_encoding_ = none; + state->open_encoding_ = none; + } + // Likewise for polyglossia + string const & pol_lang = openPolyglossiaLang(state); + if (maintext && !is_child && !pol_lang.empty()) { + os << from_utf8(subst(lang_end_command, + "$$lang", + pol_lang)) + << '\n'; + if (runparams.use_polyglossia) + popPolyglossiaLang(); } // reset inherited encoding - if (cjk_inherited_ > 0) { - cjk_inherited_ -= 1; - if (cjk_inherited_ == 0) - open_encoding_ = CJK; + if (state->cjk_inherited_ > 0) { + state->cjk_inherited_ -= 1; + if (state->cjk_inherited_ == 0) + state->open_encoding_ = CJK; } } @@ -1230,6 +1437,13 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, OutputParams const & runparams, Encoding const & newEnc, bool force) { + // XeTeX/LuaTeX use only one encoding per document: + // * 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()) + 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 @@ -1260,6 +1474,7 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, return make_pair(true, 0); docstring const inputenc_arg(from_ascii(newEnc.latexName())); + OutputState * state = getOutputState(); switch (newEnc.package()) { case Encoding::none: case Encoding::japanese: @@ -1268,15 +1483,15 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, case Encoding::inputenc: { int count = inputenc_arg.length(); if (oldEnc.package() == Encoding::CJK && - open_encoding_ == CJK) { + state->open_encoding_ == CJK) { os << "\\end{CJK}"; - open_encoding_ = none; + state->open_encoding_ = none; count += 9; } else if (oldEnc.package() == Encoding::inputenc && - open_encoding_ == inputenc) { + state->open_encoding_ == inputenc) { os << "\\egroup"; - open_encoding_ = none; + state->open_encoding_ = none; count += 7; } if (runparams.local_font != 0 @@ -1286,7 +1501,7 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, // else CJK fails. os << "\\bgroup"; count += 7; - open_encoding_ = inputenc; + state->open_encoding_ = inputenc; } // with the japanese option, inputenc is omitted. if (runparams.use_japanese) @@ -1297,18 +1512,18 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, case Encoding::CJK: { int count = inputenc_arg.length(); if (oldEnc.package() == Encoding::CJK && - open_encoding_ == CJK) { + state->open_encoding_ == CJK) { os << "\\end{CJK}"; count += 9; } if (oldEnc.package() == Encoding::inputenc && - open_encoding_ == inputenc) { + state->open_encoding_ == inputenc) { os << "\\egroup"; count += 7; } os << "\\begin{CJK}{" << inputenc_arg << "}{" << from_ascii(bparams.fonts_cjk) << "}"; - open_encoding_ = CJK; + state->open_encoding_ = CJK; return make_pair(true, count + 15); } }