X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=cdd42aaf4325222dffc0f18efff4d343bca6e20c;hb=b6846bdace3bb9e8619faeea2a0921d7664c3a61;hp=1aa55e30180e2d55be68708aa1c298506988e57e;hpb=898c621b845b461d17a0b97989148656a58f865f;p=lyx.git diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 1aa55e3018..cdd42aaf43 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -21,7 +21,6 @@ #include "LyXRC.h" #include "OutputParams.h" #include "Paragraph.h" -#include "paragraph_funcs.h" #include "ParagraphParameters.h" #include "TextClass.h" #include "TexRow.h" @@ -75,12 +74,13 @@ TeXDeeper(Buffer const & buf, ParagraphList const & paragraphs = text.paragraphs(); + bool const force_plain_layout = text.inset().forcePlainLayout(); while (par != paragraphs.end() && par->params().depth() == pit->params().depth()) { // FIXME This test should not be necessary. // We should perhaps issue an error if it is. - Layout const & style = par->forcePlainLayout() ? - buf.params().documentClass().plainLayout() : par->layout(); + Layout const & style = force_plain_layout + ? buf.params().documentClass().plainLayout() : par->layout(); if (style.isEnvironment()) { par = TeXEnvironment(buf, text, par, os, texrow, runparams); @@ -108,7 +108,7 @@ TeXEnvironment(Buffer const & buf, // FIXME This test should not be necessary. // We should perhaps issue an error if it is. - Layout const & style = pit->forcePlainLayout() ? + Layout const & style = text.inset().forcePlainLayout() ? bparams.documentClass().plainLayout() : pit->layout(); ParagraphList const & paragraphs = text.paragraphs(); @@ -181,7 +181,7 @@ TeXEnvironment(Buffer const & buf, << "}\n"; } else if (style.labeltype == LABEL_BIBLIO) { if (pit->params().labelWidthString().empty()) - os << '{' << bibitemWidest(buf) << "}\n"; + os << '{' << bibitemWidest(buf, runparams) << "}\n"; else os << '{' << pit->params().labelWidthString() @@ -252,14 +252,22 @@ TeXEnvironment(Buffer const & buf, os << "\\end{" << from_ascii(style.latexname()) << "}\n"; texrow.newline(); prev_env_language_ = par_language; - runparams.encoding = prev_encoding; + if (runparams.encoding != prev_encoding) { + runparams.encoding = prev_encoding; + if (!bparams.useXetex) + os << setEncoding(prev_encoding->iconvName()); + } } if (leftindent_open) { os << "\\end{LyXParagraphLeftIndent}\n"; texrow.newline(); prev_env_language_ = par_language; - runparams.encoding = prev_encoding; + if (runparams.encoding != prev_encoding) { + runparams.encoding = prev_encoding; + if (!bparams.useXetex) + os << setEncoding(prev_encoding->iconvName()); + } } if (par != paragraphs.end()) @@ -311,9 +319,18 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, OutputParams runparams = runparams_in; runparams.isLastPar = nextpit == paragraphs.end(); + 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. + if (pit == paragraphs.begin() && !maintext + && (cjk_inherited_ > 0 || open_encoding_ == CJK)) { + cjk_inherited_ += 1; + open_encoding_ = none; + } + if (runparams.verbatim) { int const dist = distance(paragraphs.begin(), pit); - Font const outerfont = outerFont(dist, paragraphs); + Font const outerfont = text.outerFont(dist); // No newline if only one paragraph in this lyxtext if (dist > 0) { @@ -328,20 +345,9 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, // FIXME This check should not really be needed. // Perhaps we should issue an error if it is. - Layout const style = pit->forcePlainLayout() ? + Layout const style = text.inset().forcePlainLayout() ? bparams.documentClass().plainLayout() : pit->layout(); - runparams.moving_arg |= style.needprotect; - - bool const maintext = text.isMainText(buf); - // we are at the beginning of an inset and CJK is already open; - // we count inheritation levels to get the inset nesting right. - if (pit == paragraphs.begin() && !maintext - && (cjk_inherited_ > 0 || open_encoding_ == CJK)) { - cjk_inherited_ += 1; - open_encoding_ = none; - } - // This paragraph's language Language const * const par_language = pit->getParLanguage(bparams); // The document's language @@ -454,7 +460,9 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, // Look ahead for future encoding changes. // We try to output them at the beginning of the paragraph, // since the \inputencoding command is not allowed e.g. in - // sections. + // sections. For this reason we only set runparams.moving_arg + // after checking for the encoding change, otherwise the + // change would be always avoided by switchEncoding(). for (pos_type i = 0; i < pit->size(); ++i) { char_type const c = pit->getChar(i); Encoding const * const encoding = @@ -505,6 +513,7 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, } } + runparams.moving_arg |= style.needprotect; Encoding const * const prev_encoding = runparams.encoding; bool const useSetSpace = bparams.documentClass().provides("SetSpace"); @@ -556,8 +565,7 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, break; } - Font const outerfont = outerFont(distance(paragraphs.begin(), pit), - paragraphs); + Font const outerfont = text.outerFont(distance(paragraphs.begin(), pit)); // FIXME UNICODE os << from_utf8(everypar); @@ -590,7 +598,11 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, os << "\\par}"; } else if (is_command) { os << '}'; - runparams.encoding = prev_encoding; + if (runparams.encoding != prev_encoding) { + runparams.encoding = prev_encoding; + if (!bparams.useXetex) + os << setEncoding(prev_encoding->iconvName()); + } } bool pending_newline = false; @@ -660,11 +672,18 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, // when the paragraph uses CJK, the language has to be closed earlier if (font.language()->encoding()->package() != Encoding::CJK) { if (lyxrc.language_command_end.empty()) { - if (!prev_language->babel().empty()) { + // If this is a child, we should restore the + // master language after the last paragraph. + Language const * const current_language = + (nextpit == paragraphs.end() + && runparams.master_language) + ? runparams.master_language + : outer_language; + if (!current_language->babel().empty()) { os << from_ascii(subst( lyxrc.language_command_begin, "$$lang", - prev_language->babel())); + current_language->babel())); pending_newline = true; } } else if (!par_language->babel().empty()) { @@ -798,7 +817,7 @@ void latexParagraphs(Buffer const & buf, const_cast(runparams).par_end = 0; } - bool const maintext = text.isMainText(buf); + bool const maintext = text.isMainText(); bool const is_child = buf.masterBuffer() != &buf; // Open a CJK environment at the beginning of the main buffer @@ -811,7 +830,7 @@ void latexParagraphs(Buffer const & buf, texrow.newline(); open_encoding_ = CJK; } - // if "auto begin" is switched off, explicitely switch the + // if "auto begin" is switched off, explicitly switch the // language on at start if (maintext && !lyxrc.language_auto_begin && !bparams.language->babel().empty()) { @@ -829,7 +848,7 @@ void latexParagraphs(Buffer const & buf, lastpar = par; // FIXME This check should not be needed. We should // perhaps issue an error if it is. - Layout const & layout = par->forcePlainLayout() ? + Layout const & layout = text.inset().forcePlainLayout() ? tclass.plainLayout() : par->layout(); if (layout.intitle) { @@ -885,7 +904,7 @@ void latexParagraphs(Buffer const & buf, texrow.newline(); } - // if "auto end" is switched off, explicitely close the language at the end + // if "auto end" is switched off, explicitly close the language at the end // but only if the last par is in a babel language if (maintext && !lyxrc.language_auto_end && !bparams.language->babel().empty() && lastpar->getParLanguage(bparams)->encoding()->package() != Encoding::CJK) {