X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=c24a5320e117cdebdb48711c67772be31a5ae8a2;hb=4ed0312c51704780af1c452d3a82a84171b3725a;hp=8f8459ffa724baa01dff408732f284dc3d956403;hpb=7ca2f2b58d6c85e1383b3f4aba16f8a8c95fd325;p=lyx.git diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 8f8459ffa7..c24a5320e1 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -185,8 +185,9 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, bparams.documentClass().plainLayout() : pit->layout(); ParagraphList const & paragraphs = text.paragraphs(); + bool const firstpar = pit == paragraphs.begin(); ParagraphList::const_iterator const priorpit = - pit == paragraphs.begin() ? pit : prev(pit, 1); + firstpar ? pit : prev(pit, 1); OutputState * state = getOutputState(); bool const use_prev_env_language = state->prev_env_language_ != nullptr @@ -199,10 +200,13 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, data.par_language = pit->getParLanguage(bparams); Language const * const doc_language = bparams.language; Language const * const prev_par_language = - (pit != paragraphs.begin()) - ? (use_prev_env_language ? state->prev_env_language_ - : priorpit->getParLanguage(bparams)) - : doc_language; + // use font at inset or document language in first paragraph + firstpar ? (runparams.local_font ? + runparams.local_font->language() + : doc_language) + : (use_prev_env_language ? + state->prev_env_language_ + : priorpit->getParLanguage(bparams)); bool const use_polyglossia = runparams.use_polyglossia; string const par_lang = use_polyglossia ? @@ -219,11 +223,14 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, !lang_end_command.empty(); // For polyglossia, switch language outside of environment, if possible. + // However, if we are at the start of an inset, do not close languages + // opened outside. if (par_lang != prev_par_lang) { - if ((!using_begin_end || langOpenedAtThisLevel(state)) && - !lang_end_command.empty() && - prev_par_lang != doc_lang && - !prev_par_lang.empty()) { + if (!firstpar + && (!using_begin_end || langOpenedAtThisLevel(state)) + && !lang_end_command.empty() + && prev_par_lang != doc_lang + && !prev_par_lang.empty()) { os << from_ascii(subst( lang_end_command, "$$lang", @@ -320,10 +327,12 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, static void finishEnvironment(otexstream & os, OutputParams const & runparams, - TeXEnvironmentData const & data) + TeXEnvironmentData const & data, bool const maintext, + bool const lastpar) { OutputState * state = getOutputState(); - // BufferParams const & bparams = buf.params(); // FIXME: for speedup shortcut below, would require passing of "buf" as argument + // 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 @@ -349,6 +358,11 @@ static void finishEnvironment(otexstream & os, OutputParams const & runparams, popLanguageName(); } } + if (data.style->latextype == LATEX_BIB_ENVIRONMENT) + // bibliography needs a blank line after + // each item for backref to function properly + // (see #12041) + os << '\n'; state->nest_level_ -= 1; string const & name = data.style->latexname(); if (!name.empty()) @@ -358,6 +372,20 @@ static void finishEnvironment(otexstream & os, OutputParams const & runparams, runparams.encoding = data.prev_encoding; os << setEncoding(data.prev_encoding->iconvName()); } + // If this is the last par of an inset, the language needs + // to be closed after the environment + if (lastpar && !maintext) { + if (using_begin_end && langOpenedAtThisLevel(state)) { + if (isLocalSwitch(state)) { + os << "}"; + } else { + os << "\\end{" + << openLanguageName(state) + << "}%\n"; + } + popLanguageName(); + } + } } if (data.leftindent_open) { @@ -381,7 +409,7 @@ void TeXEnvironment(Buffer const & buf, Text const & text, { ParagraphList const & paragraphs = text.paragraphs(); ParagraphList::const_iterator ipar = paragraphs.iterator_at(pit); - LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << pit); + LYXERR(Debug::OUTFILE, "TeXEnvironment for paragraph " << pit); Layout const & current_layout = ipar->layout(); depth_type const current_depth = ipar->params().depth(); @@ -433,15 +461,20 @@ void TeXEnvironment(Buffer const & buf, Text const & text, // Do not output empty environments if the whole paragraph has // been deleted with ct and changes are not output. + bool output_changes; + if (!runparams.find_effective()) + output_changes = buf.params().output_changes; + else + output_changes = runparams.find_with_deleted(); if (size_t(pit + 1) < paragraphs.size()) { ParagraphList::const_iterator nextpar = paragraphs.iterator_at(pit + 1); Paragraph const & cpar = paragraphs.at(pit); if ((par->layout() != nextpar->layout() || par->params().depth() == nextpar->params().depth() || par->params().leftIndent() == nextpar->params().leftIndent()) - && !runparams.for_search && !cpar.empty() - && cpar.isDeleted(0, cpar.size()) && !buf.params().output_changes) { - if (!buf.params().output_changes && !cpar.parEndChange().deleted()) + && !cpar.empty() + && cpar.isDeleted(0, cpar.size()) && !output_changes) { + if (!output_changes && !cpar.parEndChange().deleted()) os << '\n' << '\n'; continue; } @@ -452,11 +485,12 @@ 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(os, runparams, data); + bool const lastpar = size_t(pit + 1) >= paragraphs.size(); + finishEnvironment(os, runparams, data, text.isMainText(), lastpar); } if (pit != runparams.par_end) - LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << par_begin << " done."); + LYXERR(Debug::OUTFILE, "TeXEnvironment for paragraph " << par_begin << " done."); } @@ -544,7 +578,7 @@ void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeX } } } - if (runparams.for_search) { + if (runparams.find_effective() && argnr > 1) { // Mark end of arguments for findadv() only os << "\\endarguments{}"; } @@ -573,6 +607,14 @@ void popLanguageName() } +bool languageStackEmpty() +{ + OutputState * state = getOutputState(); + + return state->lang_switch_depth_.empty(); +} + + string const & openLanguageName() { OutputState * state = getOutputState(); @@ -704,7 +746,7 @@ void parStartCommand(Paragraph const & par, otexstream & os, break; case LATEX_ITEM_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT: - if (runparams.for_search) { + if (runparams.find_effective()) { os << "\\" + style.itemcommand() << "{" << style.latexname() << "}"; } else { @@ -716,7 +758,7 @@ void parStartCommand(Paragraph const & par, otexstream & os, } break; case LATEX_ENVIRONMENT: - if (runparams.for_search) { + if (runparams.find_effective()) { os << "\\latexenvironment{" << style.latexname() << "}{"; } break; @@ -754,12 +796,12 @@ void TeXOnePar(Buffer const & buf, // Do not output empty commands if the whole paragraph has // been deleted with ct and changes are not output. - if (!runparams_in.for_search && style.latextype != LATEX_ENVIRONMENT + if (!runparams_in.find_with_deleted() && style.latextype != LATEX_ENVIRONMENT && !par.empty() && par.isDeleted(0, par.size()) && !bparams.output_changes) return; - LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " ptr " << &par << " '" - << everypar << "'"); + LYXERR(Debug::OUTFILE, "TeXOnePar for paragraph " << pit << " ptr " << &par << " '" + << everypar << "'"); OutputParams runparams = runparams_in; runparams.isLastPar = (pit == pit_type(paragraphs.size() - 1)); @@ -891,10 +933,12 @@ void TeXOnePar(Buffer const & buf, break; } } + bool const have_prior_nptpar = + prior_nontitle_par && !prior_nontitle_par->isPassThru(); Language const * const prev_language = - runparams_in.for_search + runparams_in.find_effective() ? languages.getLanguage("ignore") - : (prior_nontitle_par && !prior_nontitle_par->isPassThru()) + : (have_prior_nptpar) ? (use_prev_env_language ? state->prev_env_language_ : prior_nontitle_par->getParLanguage(bparams)) @@ -940,9 +984,11 @@ void TeXOnePar(Buffer const & buf, use_polyglossia && runparams.local_font != nullptr && outer_language->rightToLeft() - && !par_language->rightToLeft(); + && !par_language->rightToLeft() + && !(have_prior_nptpar + && (prev_language->rightToLeft() != par_language->rightToLeft())); bool const localswitch = - (runparams_in.for_search + (runparams_in.find_effective() || text.inset().forceLocalFontSwitch() || (using_begin_end && text.inset().forcePlainLayout()) || in_polyglossia_rtl_env) @@ -957,7 +1003,7 @@ void TeXOnePar(Buffer const & buf, bool const localswitch_needed = localswitch && par_lang != outer_lang; // localswitches need to be closed and reopened at each par - if (runparams_in.for_search || ((par_lang != prev_lang || localswitch_needed) + if (runparams_in.find_effective() || ((par_lang != prev_lang || localswitch_needed) // check if we already put language command in TeXEnvironment() && !(style.isEnvironment() && (pit == 0 || (priorpar->layout() != par.layout() @@ -1017,7 +1063,7 @@ void TeXOnePar(Buffer const & buf, else if (outer_language->lang() == "arabic_arabi") os << "\\textLR{"; // remaining RTL languages currently is hebrew - else if (par_language->rightToLeft()) + else if (par_language->rightToLeft() && !runparams.isFullUnicode()) os << "\\R{"; else os << "\\L{"; @@ -1025,7 +1071,7 @@ void TeXOnePar(Buffer const & buf, // With CJK, the CJK tag has to be closed first (see below) if ((runparams.encoding->package() != Encoding::CJK || bparams.useNonTeXFonts - || runparams.for_search) + || runparams.find_effective()) && (par_lang != openLanguageName(state) || localswitch || intitle_command) && !par_lang.empty()) { string bc = use_polyglossia ? @@ -1128,7 +1174,7 @@ void TeXOnePar(Buffer const & buf, && (pit == 0 || !priorpar->hasSameLayout(par))) { os << from_ascii(par.params().spacing().writeEnvirBegin(useSetSpace)) - << '\n'; + << '\n'; } if (style.isCommand()) { @@ -1266,7 +1312,7 @@ void TeXOnePar(Buffer const & buf, // when the paragraph uses CJK, the language has to be closed earlier if ((font.language()->encoding()->package() != Encoding::CJK) || bparams.useNonTeXFonts - || runparams_in.for_search) { + || runparams_in.find_effective()) { if (lang_end_command.empty()) { // If this is a child, we should restore the // master language after the last paragraph. @@ -1445,29 +1491,30 @@ void TeXOnePar(Buffer const & buf, // Note from JMarc: we will re-add a \n explicitly in // TeXEnvironment, because it is needed in this case if (nextpar && !os.afterParbreak() && !last_was_separator) { - Layout const & next_layout = nextpar->layout(); if (!text.inset().getLayout().parbreakIgnored() && !merged_par) // Make sure to start a new line os << breakln; // A newline '\n' is always output before a command, // so avoid doubling it. + Layout const & next_layout = nextpar->layout(); if (!next_layout.isCommand()) { // Here we now try to avoid spurious empty lines by - // outputting a paragraph break only if: (case 1) the - // paragraph style allows parbreaks and no \begin, \end - // or \item tags are going to follow (i.e., if the next - // isn't the first or the current isn't the last - // paragraph of an environment or itemize) and the - // depth and alignment of the following paragraph is - // 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 5) the current alignment is - // changed and a standard paragraph follows. + // outputting a paragraph break only if: + // (case 1) the paragraph style allows parbreaks and + // no \begin, \end or \item tags are going to follow + // (i.e., if the next isn't the first or the current + // isn't the last paragraph of an environment or itemize) + // and the depth and alignment of the following paragraph is + // 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 5) the current alignment is changed and a + // standard paragraph follows. DocumentClass const & tclass = bparams.documentClass(); if ((style == next_layout && !style.parbreak_is_newline @@ -1477,7 +1524,8 @@ void TeXOnePar(Buffer const & buf, && style.latextype != LATEX_LIST_ENVIRONMENT && style.align == par.getAlign(bparams) && nextpar->getDepth() == par.getDepth() - && nextpar->getAlign(bparams) == par.getAlign(bparams)) + && (nextpar->getAlign(bparams) == par.getAlign(bparams) + || par.params().spacing() != nextpar->params().spacing())) || (!next_layout.isEnvironment() && nextpar->getDepth() > par.getDepth() && nextpar->getAlign(bparams) == next_layout.align) @@ -1492,8 +1540,15 @@ void TeXOnePar(Buffer const & buf, && tclass.isDefaultLayout(next_layout))) { // and omit paragraph break if it has been deleted with ct // and changes are not shown in output - if (!merged_par) - os << '\n'; + if (!merged_par) { + if (runparams.isNonLong) + // This is to allow parbreak in multirow + // It could also be used for other non-long + // contexts + os << "\\endgraf\n"; + else + os << '\n'; + } } } } @@ -1502,8 +1557,8 @@ void TeXOnePar(Buffer const & buf, if (intitle_command) state->nest_level_ -= 1; - LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " done; ptr " - << &par << " next " << nextpar); + LYXERR(Debug::OUTFILE, "TeXOnePar for paragraph " << pit << " done; ptr " + << &par << " next " << nextpar); return; } @@ -1654,14 +1709,29 @@ void latexParagraphs(Buffer const & buf, // Do not output empty environments if the whole paragraph has // been deleted with ct and changes are not output. - if (size_t(pit + 1) < paragraphs.size()) { + bool output_changes; + if (!runparams.find_effective()) + output_changes = bparams.output_changes; + else + output_changes = runparams.find_with_deleted(); + bool const lastpar = size_t(pit + 1) >= paragraphs.size(); + if (!lastpar) { ParagraphList::const_iterator nextpar = paragraphs.iterator_at(pit + 1); Paragraph const & cpar = paragraphs.at(pit); if ((par->layout() != nextpar->layout() || par->params().depth() == nextpar->params().depth() || par->params().leftIndent() == nextpar->params().leftIndent()) - && !runparams.for_search && !cpar.empty() - && cpar.isDeleted(0, cpar.size()) && !bparams.output_changes) { + && !cpar.empty() + && cpar.isDeleted(0, cpar.size()) && !output_changes) { + if (!cpar.parEndChange().deleted()) + os << '\n' << '\n'; + continue; + } + } else { + // This is the last par + Paragraph const & cpar = paragraphs.at(pit); + if ( !cpar.empty() + && cpar.isDeleted(0, cpar.size()) && !output_changes) { if (!cpar.parEndChange().deleted()) os << '\n' << '\n'; continue; @@ -1672,7 +1742,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(os, runparams, data); + finishEnvironment(os, runparams, data, maintext, lastpar); } // FIXME: uncomment the content or remove this block @@ -1712,7 +1782,7 @@ void latexParagraphs(Buffer const & buf, << '\n'; // If we have language_auto_begin, the stack will // already be empty, nothing to pop() - if (using_begin_end && !lyxrc.language_auto_begin) + if (using_begin_end && langOpenedAtThisLevel(state)) popLanguageName(); } @@ -1786,7 +1856,7 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, || oldEnc.package() == Encoding::japanese || oldEnc.package() == Encoding::none || newEnc.package() == Encoding::none - || runparams.for_search) + || runparams.find_effective()) return make_pair(false, 0); // FIXME We ignore encoding switches from/to encodings that do // neither support the inputenc package nor the CJK package here. @@ -1795,7 +1865,7 @@ pair switchEncoding(odocstream & os, BufferParams const & bparams, // but it is the best we can do. // change encoding - LYXERR(Debug::LATEX, "Changing LaTeX encoding from " + LYXERR(Debug::OUTFILE, "Changing LaTeX encoding from " << oldEnc.name() << " to " << newEnc.name()); os << setEncoding(newEnc.iconvName()); if (bparams.inputenc == "auto-legacy-plain")