#include "OutputParams.h"
#include "Paragraph.h"
#include "ParagraphParameters.h"
+#include "texstream.h"
#include "TextClass.h"
#include "insets/InsetBibitem.h"
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
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());
}
}
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());
}
}
// get the first paragraph in sequence with this layout and depth
pit_type offset = 0;
while (true) {
- if (prev(pit, offset) == pars.begin())
+ if (lyx::prev(pit, offset) == pars.begin())
break;
- ParagraphList::const_iterator priorpit = prev(pit, offset + 1);
+ ParagraphList::const_iterator priorpit = lyx::prev(pit, offset + 1);
if (priorpit->layout() == current_layout
&& priorpit->params().depth() == current_depth)
++offset;
break;
}
- ParagraphList::const_iterator spit = prev(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)
// 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
getPolyglossiaEnvName(prev_language) : prev_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}$$opts" : lyxrc.language_command_begin;
string lang_end_command = use_polyglossia ?
"$$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
// 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,
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());
}
}
&& 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.
// 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())) {
}
// 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());
}
"$$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
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
projects / lyx.git / blobdiff