X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=440bb03c66c978a4ddcb3145de9da262f49bfaa9;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=99843639632c1e539cd5ba2213fb999dbb636c5b;hpb=030e249d91636dc29b122b9047bd3fb197393e94;p=lyx.git diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 9984363963..440bb03c66 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" @@ -52,6 +51,7 @@ enum OpenEncoding { static int open_encoding_ = none; static int cjk_inherited_ = 0; +Language const * prev_env_language_ = 0; ParagraphList::const_iterator @@ -74,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); @@ -107,16 +108,26 @@ 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(); + ParagraphList::const_iterator const priorpit = + pit == paragraphs.begin() ? pit : boost::prior(pit); + + bool const use_prev_env_language = prev_env_language_ != 0 + && priorpit->layout().isEnvironment() + && (priorpit->getDepth() > pit->getDepth() + || (priorpit->getDepth() == pit->getDepth() + && priorpit->layout() != pit->layout())); + Encoding const * const prev_encoding = runparams.encoding; Language const * const par_language = pit->getParLanguage(bparams); Language const * const doc_language = bparams.language; Language const * const prev_par_language = (pit != paragraphs.begin()) - ? boost::prior(pit)->getParLanguage(bparams) + ? (use_prev_env_language ? prev_env_language_ + : priorpit->getParLanguage(bparams)) : doc_language; if (par_language->babel() != prev_par_language->babel()) { @@ -169,8 +180,12 @@ TeXEnvironment(Buffer const & buf, << pit->params().labelWidthString() << "}\n"; } else if (style.labeltype == LABEL_BIBLIO) { - // ale970405 - os << '{' << bibitemWidest(buf) << "}\n"; + if (pit->params().labelWidthString().empty()) + os << '{' << bibitemWidest(buf) << "}\n"; + else + os << '{' + << pit->params().labelWidthString() + << "}\n"; } else os << from_ascii(style.latexparam()) << '\n'; texrow.newline(); @@ -236,11 +251,23 @@ TeXEnvironment(Buffer const & buf, if (style.isEnvironment()) { os << "\\end{" << from_ascii(style.latexname()) << "}\n"; texrow.newline(); + prev_env_language_ = par_language; + 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; + if (runparams.encoding != prev_encoding) { + runparams.encoding = prev_encoding; + if (!bparams.useXetex) + os << setEncoding(prev_encoding->iconvName()); + } } if (par != paragraphs.end()) @@ -294,7 +321,7 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, 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) { @@ -309,12 +336,12 @@ 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); + 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 @@ -332,12 +359,22 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, Language const * const outer_language = (runparams.local_font != 0) ? runparams.local_font->language() : doc_language; - // The previous language that was in effect is either the language of - // the previous paragraph, if there is one, or else the outer language - // if there is no previous paragraph + + // The previous language that was in effect is the language of the + // previous paragraph, unless the previous paragraph is inside an + // 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 + && priorpit->layout().isEnvironment() + && (priorpit->getDepth() > pit->getDepth() + || (priorpit->getDepth() == pit->getDepth() + && priorpit->layout() != pit->layout())); Language const * const prev_language = - (pit != paragraphs.begin()) ? - priorpit->getParLanguage(bparams) : outer_language; + (pit != paragraphs.begin()) + ? (use_prev_env_language ? prev_env_language_ + : priorpit->getParLanguage(bparams)) + : outer_language; if (par_language->babel() != prev_language->babel() // check if we already put language command in TeXEnvironment() @@ -442,11 +479,8 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, // With CJK, only add switch if we have CJK content at the beginning // of the paragraph if (encoding->package() != Encoding::CJK || i == 0) { - OutputParams tmp_rp = runparams; - runparams.moving_arg = false; pair enc_switch = switchEncoding(os, bparams, runparams, *encoding); - runparams = tmp_rp; // the following is necessary after a CJK environment in a multilingual // context (nesting issue). if (par_language->encoding()->package() == Encoding::CJK && @@ -479,6 +513,8 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, } } + Encoding const * const prev_encoding = runparams.encoding; + bool const useSetSpace = bparams.documentClass().provides("SetSpace"); if (pit->allowParagraphCustomization()) { if (pit->params().startOfAppendix()) { @@ -528,8 +564,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); @@ -560,8 +595,14 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, os << "\\" << from_ascii(font.latexSize()) << " \\par}"; } else if (need_par) { os << "\\par}"; - } else if (is_command) + } else if (is_command) { os << '}'; + if (runparams.encoding != prev_encoding) { + runparams.encoding = prev_encoding; + if (!bparams.useXetex) + os << setEncoding(prev_encoding->iconvName()); + } + } bool pending_newline = false; switch (style.latextype) { @@ -580,7 +621,7 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf, break; } - // fall through possible + // fall through possible default: // we don't need it for the last paragraph!!! if (nextpit != paragraphs.end()) @@ -630,11 +671,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()) { @@ -700,9 +748,11 @@ ParagraphList::const_iterator 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 // should be set back to that local_font's encoding. + // However, do not change the encoding when XeTeX is used. if (nextpit == paragraphs.end() && runparams_in.local_font != 0 && runparams_in.encoding != runparams_in.local_font->language()->encoding() - && (bparams.inputenc == "auto" || bparams.inputenc == "default")) { + && (bparams.inputenc == "auto" || bparams.inputenc == "default") + && (!bparams.useXetex)) { runparams_in.encoding = runparams_in.local_font->language()->encoding(); os << setEncoding(runparams_in.encoding->iconvName()); } @@ -766,7 +816,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 @@ -797,9 +847,8 @@ 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() ? - tclass.plainLayout() : - par->layout(); + Layout const & layout = text.inset().forcePlainLayout() ? + tclass.plainLayout() : par->layout(); if (layout.intitle) { if (already_title) {