X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=5d385e5e09929b54bed248091641bd30007a3b67;hb=aef8746712ccc64f1f10073fe6d011ff1d7eb4a4;hp=f04f0054bcf267c086b3ca6cd2bb029a4c0d8c1e;hpb=b555f31a34112761f360ec69c996abcb3272e135;p=lyx.git diff --git a/src/output_latex.cpp b/src/output_latex.cpp index f04f0054bc..5d385e5e09 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -24,7 +24,6 @@ #include "Paragraph.h" #include "ParagraphParameters.h" #include "TextClass.h" -#include "TexRow.h" #include "insets/InsetBibitem.h" #include "insets/InsetArgument.h" @@ -33,12 +32,11 @@ #include "support/convert.h" #include "support/debug.h" #include "support/lstrings.h" +#include "support/lyxalgo.h" #include "support/textutils.h" #include -#include -#include #include using namespace std; @@ -59,12 +57,13 @@ enum OpenEncoding { struct OutputState { OutputState() : open_encoding_(none), cjk_inherited_(0), - prev_env_language_(0) + prev_env_language_(0), open_polyglossia_lang_("") { } - int open_encoding_; + OpenEncoding open_encoding_; int cjk_inherited_; Language const * prev_env_language_; + string open_polyglossia_lang_; }; @@ -89,6 +88,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; @@ -116,7 +129,7 @@ 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); OutputState * state = getOutputState(); bool const use_prev_env_language = state->prev_env_language_ != 0 @@ -161,17 +174,13 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, if ((lang_end_command.empty() || par_lang != doc_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"; } } @@ -184,6 +193,8 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, } if (style.isEnvironment()) { + if (par_lang != doc_lang) + state->open_polyglossia_lang_ = par_lang; os << "\\begin{" << from_ascii(style.latexname()) << '}'; if (!style.latexargs().empty()) { OutputParams rp = runparams; @@ -224,6 +235,7 @@ static void finishEnvironment(otexstream & os, OutputParams const & runparams, TeXEnvironmentData const & data) { 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 @@ -237,8 +249,7 @@ static void finishEnvironment(otexstream & os, OutputParams const & runparams, 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()); } } @@ -247,8 +258,7 @@ static void finishEnvironment(otexstream & os, OutputParams const & runparams, 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()); } } @@ -460,9 +470,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; @@ -470,7 +480,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) @@ -554,7 +564,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) @@ -626,6 +636,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 @@ -659,22 +671,23 @@ 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(); 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(); } @@ -694,6 +707,8 @@ void TeXOnePar(Buffer const & buf, "$$lang", prev_lang)) << lang_command_termination; + if (prev_lang == state->open_polyglossia_lang_) + state->open_polyglossia_lang_ = ""; } // We need to open a new language if we couldn't close the previous @@ -742,15 +757,10 @@ 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.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; } } @@ -760,6 +770,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, @@ -849,10 +860,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. - // Spitz: We need for the last par, actually. See #9231. + // 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) @@ -861,6 +871,9 @@ void TeXOnePar(Buffer const & buf, bool const is_command = style.isCommand(); if (style.resfont.size() != font.fontInfo().size() + && (nextpar || maintext + || (text.inset().paragraphs().size() > 1 + && text.inset().lyxCode() != CELL_CODE)) && !is_command) { os << '{'; os << "\\" << from_ascii(font.latexSize()) << " \\par}"; @@ -870,8 +883,7 @@ 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()); } } @@ -926,13 +938,12 @@ 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())))) { + && par_lang != outer_lang)) { // Since \selectlanguage write the language to the aux file, // we need to reset the language at the end of footnote or // float. @@ -953,20 +964,24 @@ void TeXOnePar(Buffer const & buf, ? getPolyglossiaEnvName(current_language) : current_language->babel(); if (!current_lang.empty()) { + 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; + } + } else if (!par_lang.empty()) { + // If we are in an environment, we have to close the "outer" language afterwards + if (!style.isEnvironment() || state->open_polyglossia_lang_ != par_lang) { os << from_ascii(subst( - lang_begin_command, + lang_end_command, "$$lang", - current_lang)); + par_lang)); pending_newline = !localswitch; unskip_newline = !localswitch; } - } else if (!par_lang.empty()) { - os << from_ascii(subst( - lang_end_command, - "$$lang", - par_lang)); - pending_newline = !localswitch; - unskip_newline = !localswitch; } } } @@ -988,7 +1003,7 @@ void TeXOnePar(Buffer const & buf, // also if the next paragraph is a multilingual environment (because of nesting) if (nextpar && state->open_encoding_ == CJK - && (nextpar->getParLanguage(bparams)->encoding()->package() != 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())) { @@ -1026,14 +1041,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()); } @@ -1071,6 +1086,7 @@ void TeXOnePar(Buffer const & buf, 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() @@ -1131,19 +1147,16 @@ 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'; } @@ -1232,7 +1245,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() && @@ -1241,6 +1254,8 @@ void latexParagraphs(Buffer const & buf, "$$lang", mainlang)) << '\n'; + if (state->open_polyglossia_lang_ == mainlang) + state->open_polyglossia_lang_ = ""; } // If the last paragraph is an environment, we'll have to close @@ -1249,6 +1264,14 @@ void latexParagraphs(Buffer const & buf, os << "\\end{CJK}\n"; state->open_encoding_ = none; } + // Likewise for polyglossia + if (maintext && !is_child && state->open_polyglossia_lang_ != "") { + os << from_utf8(subst(lang_end_command, + "$$lang", + state->open_polyglossia_lang_)) + << '\n'; + state->open_polyglossia_lang_ = ""; + } // reset inherited encoding if (state->cjk_inherited_ > 0) { @@ -1263,6 +1286,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