X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=63e61ac4b13fd746c486abf971aaca24caf21079;hb=726b602329029099ddb7d1ac8033186eb39c132a;hp=5c1746dcb7bd21ab7ba1b81d2d19c4631a5b6078;hpb=3626b4610979f9da6d1b9b44328da6925323597b;p=lyx.git diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 5c1746dcb7..63e61ac4b1 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -390,7 +390,6 @@ void TeXOnePar(Buffer const & buf, string const & everypar, int start_pos, int end_pos) { - BufferParams const & bparams = buf.params(); ParagraphList const & paragraphs = text.paragraphs(); Paragraph const & par = paragraphs.at(pit); @@ -406,7 +405,7 @@ void TeXOnePar(Buffer const & buf, << everypar << "'"); OutputParams runparams = runparams_in; - runparams.isLastPar = (pit == paragraphs.size() - 1); + runparams.isLastPar = (pit == pit_type(paragraphs.size() - 1)); // We reinitialze par begin and end to be on the safe side // with embedded inset as we don't know if they set those // value correctly. @@ -486,7 +485,7 @@ void TeXOnePar(Buffer const & buf, && priorpar->layout().isEnvironment() && (priorpar->getDepth() > par.getDepth() || (priorpar->getDepth() == par.getDepth() - && priorpar->layout() != par.layout())); + && priorpar->layout() != par.layout())); Language const * const prev_language = (pit != 0) ? (use_prev_env_language ? prev_env_language_ @@ -509,12 +508,11 @@ void TeXOnePar(Buffer const & buf, lang_end_command = "\\end{$$lang}"; } 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()))) + // 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 && @@ -533,20 +531,19 @@ 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) && - !par_lang.empty()) { + if ((lang_end_command.empty() || par_lang != outer_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 // 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 (!runparams.use_polyglossia && + if (!runparams.use_polyglossia // not for ArabTeX - (par_language->lang() != "arabic_arabtex" && - outer_language->lang() != "arabic_arabtex") && + && par_language->lang() != "arabic_arabtex" + && outer_language->lang() != "arabic_arabtex" // are we in an inset? - runparams.local_font != 0 && + && runparams.local_font != 0 // is the inset within an \L or \R? // // FIXME: currently, we don't check this; this means that @@ -554,9 +551,7 @@ void TeXOnePar(Buffer const & buf, // doesn't seem to hurt (though latex will complain) // // is this paragraph in the opposite direction? - runparams.local_font->isRightToLeft() != - par_language->rightToLeft() - ) { + && runparams.local_font->isRightToLeft() != par_language->rightToLeft()) { // FIXME: I don't have a working copy of the Arabi package, so // I'm not sure if the farsi and arabic_arabi stuff is correct // or not... @@ -595,8 +590,8 @@ void TeXOnePar(Buffer const & buf, // Switch file encoding if necessary; no need to do this for "default" // encoding, since this only affects the position of the outputted // \inputencoding command; the encoding switch will occur when necessary - if (bparams.inputenc == "auto" && - runparams.encoding->package() != Encoding::none) { + if (bparams.inputenc == "auto" + && runparams.encoding->package() != Encoding::none) { // 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 @@ -607,9 +602,9 @@ void TeXOnePar(Buffer const & buf, char_type const c = par.getChar(i); Encoding const * const encoding = par.getFontSettings(bparams, i).language()->encoding(); - if (encoding->package() != Encoding::CJK && - runparams.encoding->package() == Encoding::inputenc && - c < 0x80) + if (encoding->package() != Encoding::CJK + && runparams.encoding->package() == Encoding::inputenc + && c < 0x80) continue; if (par.isInset(i)) break; @@ -618,38 +613,39 @@ void TeXOnePar(Buffer const & buf, // encoding to that required by the language of c. // With CJK, only add switch if we have CJK content at the beginning // of the paragraph - if (encoding->package() != Encoding::CJK || i == 0) { - pair enc_switch = switchEncoding(os, bparams, runparams, - *encoding); - // 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) { - os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName()) - << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; - open_encoding_ = CJK; + if (i != 0 && encoding->package() == Encoding::CJK) + continue; + + pair enc_switch = switchEncoding(os, bparams, runparams, + *encoding); + // 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) { + os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName()) + << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n"; + open_encoding_ = CJK; + texrow.newline(); + } + if (encoding->package() != Encoding::none && enc_switch.first) { + if (enc_switch.second > 0) { + // the '%' is necessary to prevent unwanted whitespace + os << "%\n"; texrow.newline(); } - if (encoding->package() != Encoding::none && enc_switch.first) { - if (enc_switch.second > 0) { - // the '%' is necessary to prevent unwanted whitespace - os << "%\n"; - texrow.newline(); - } - // With CJK, the CJK tag had to be closed first (see above) - if (runparams.encoding->package() == Encoding::CJK) { - os << from_ascii(subst( - lang_begin_command, - "$$lang", - par_lang)) - // the '%' is necessary to prevent unwanted whitespace - << "%\n"; - texrow.newline(); - } - runparams.encoding = encoding; + // With CJK, the CJK tag had to be closed first (see above) + if (runparams.encoding->package() == Encoding::CJK) { + os << from_ascii(subst( + lang_begin_command, + "$$lang", + par_lang)) + // the '%' is necessary to prevent unwanted whitespace + << "%\n"; + texrow.newline(); } - break; + runparams.encoding = encoding; } + break; } } @@ -749,8 +745,9 @@ void TeXOnePar(Buffer const & buf, 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())) + if (nextpar + && (nextpar->layout() != par.layout() + || nextpar->params().depth() != par.params().depth())) break; } @@ -763,8 +760,7 @@ void TeXOnePar(Buffer const & buf, if (par.allowParagraphCustomization()) { if (!par.params().spacing().isDefault() - && (runparams.isLastPar || !nextpar->hasSameLayout(par))) - { + && (runparams.isLastPar || !nextpar->hasSameLayout(par))) { if (pending_newline) { os << '\n'; texrow.newline(); @@ -981,7 +977,7 @@ void latexParagraphs(Buffer const & buf, pit_type pit = runparams.par_begin; // lastpit is for the language check after the loop. - pit_type lastpit; + pit_type lastpit = pit; // variables used in the loop: bool was_title = false; bool already_title = false;