#include "Font.h"
#include "InsetList.h"
#include "Language.h"
+#include "LaTeXFeatures.h"
#include "Layout.h"
#include "LyXRC.h"
#include "OutputParams.h"
data.cjk_nested = false;
if (data.par_language->encoding()->package() == Encoding::CJK &&
state->open_encoding_ != CJK && pit->isMultiLingual(bparams)) {
- if (prev_par_language->encoding()->package() == Encoding::CJK)
- os << "\\begin{CJK}{" << from_ascii(data.par_language->encoding()->latexName())
+ if (prev_par_language->encoding()->package() == Encoding::CJK) {
+ docstring const cjkenc = (bparams.encoding().name() == "utf8-cjk"
+ && LaTeXFeatures::isAvailable("CJKutf8")) ?
+ from_ascii("UTF8")
+ : from_ascii(data.par_language->encoding()->latexName());
+ os << "\\begin{CJK}{" << cjkenc
<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
+ }
state->open_encoding_ = CJK;
data.cjk_nested = true;
}
break;
case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
- os << "\\" + style.itemcommand();
- // Item arguments
- if (!style.itemargs().empty())
- latexArgInsets(par, os, runparams, style.itemargs(), "item:");
- os << " ";
+ if (runparams.for_search) {
+ os << "\\" + style.itemcommand() << "{" << style.latexname() << "}";
+ }
+ else {
+ os << "\\" + style.itemcommand();
+ // Item arguments
+ if (!style.itemargs().empty())
+ latexArgInsets(par, os, runparams, style.itemargs(), "item:");
+ os << " ";
+ }
break;
case LATEX_BIB_ENVIRONMENT:
// ignore this, the inset will write itself
|| (priorpar->getDepth() == par.getDepth()
&& priorpar->layout() != par.layout()));
Language const * const prev_language =
- (priorpar && !priorpar->isPassThru())
- ? (use_prev_env_language ? state->prev_env_language_
- : priorpar->getParLanguage(bparams))
- : outer_language;
+ runparams_in.for_search ?
+ languages.getLanguage("ignore")
+ :(priorpar && !priorpar->isPassThru())
+ ? (use_prev_env_language ? state->prev_env_language_
+ : priorpar->getParLanguage(bparams))
+ : outer_language;
bool const use_polyglossia = runparams.use_polyglossia;
string const par_lang = use_polyglossia ?
// Also, if an RTL language is set via environment in polyglossia,
// only a nested \\text<lang> command will reset the direction for LTR
// languages (see # 10111).
- bool const pg_rtl_env =
- use_polyglossia && outer_language->rightToLeft() && !par_language->rightToLeft();
- bool const localswitch = text.inset().forceLocalFontSwitch()
+ bool const in_polyglossia_rtl_env =
+ use_polyglossia
+ && runparams.local_font != 0
+ && outer_language->rightToLeft()
+ && !par_language->rightToLeft();
+ bool const localswitch = runparams_in.for_search
+ || text.inset().forceLocalFontSwitch()
|| (using_begin_end && text.inset().forcePlainLayout())
- || pg_rtl_env;
+ || in_polyglossia_rtl_env;
if (localswitch) {
lang_begin_command = use_polyglossia ?
"\\text$$lang$$opts{" : lyxrc.language_command_local;
lang_end_command = "}";
lang_command_termination.clear();
}
-
+
bool const localswitch_needed = localswitch && par_lang != outer_lang;
// localswitches need to be closed and reopened at each par
- if ((par_lang != prev_lang || localswitch_needed)
+ if (runparams_in.for_search || ((par_lang != prev_lang || localswitch_needed)
// 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()))) {
+ || priorpar->getDepth() < par.getDepth())))) {
if (!localswitch
&& (!using_begin_end || langOpenedAtThisLevel(state))
&& !lang_end_command.empty()
- && prev_lang != outer_lang
+ && prev_lang != outer_lang
&& !prev_lang.empty()
&& (!using_begin_end || !style.isEnvironment())) {
os << from_ascii(subst(lang_end_command,
os << "\\L{";
}
// With CJK, the CJK tag has to be closed first (see below)
- if (runparams.encoding->package() != Encoding::CJK
+ if ((runparams.encoding->package() != Encoding::CJK || runparams.for_search)
&& (par_lang != openLanguageName(state) || localswitch)
&& !par_lang.empty()) {
string bc = use_polyglossia ?
// context (nesting issue).
if (par_language->encoding()->package() == Encoding::CJK
&& state->open_encoding_ != CJK && state->cjk_inherited_ == 0) {
- os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName())
+ docstring const cjkenc = (bparams.encoding().name() == "utf8-cjk"
+ && LaTeXFeatures::isAvailable("CJKutf8")) ?
+ from_ascii("UTF8")
+ : from_ascii(par_language->encoding()->latexName());
+ os << "\\begin{CJK}{" << cjkenc
<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
state->open_encoding_ = CJK;
}
os << '\n';
// when the paragraph uses CJK, the language has to be closed earlier
- if (font.language()->encoding()->package() != Encoding::CJK) {
+ if ((font.language()->encoding()->package() != Encoding::CJK) || runparams_in.for_search) {
if (lang_end_command.empty()) {
// If this is a child, we should restore the
// master language after the last paragraph.
|| (atSameLastLangSwitchDepth(state)
&& state->lang_switch_depth_.size()
&& cur_lang != par_lang)
- || pg_rtl_env)
+ || in_polyglossia_rtl_env)
{
if (using_begin_end && !localswitch)
os << breakln;
// if this is a CJK-paragraph and the next isn't, close CJK
// also if the next paragraph is a multilingual environment (because of nesting)
if (nextpar
- && state->open_encoding_ == CJK
+ && (state->open_encoding_ == CJK && bparams.encoding().iconvName() != "UTF-8")
&& (nextpar_language->encoding()->package() != Encoding::CJK
|| (nextpar->layout().isEnvironment() && nextpar->isMultiLingual(bparams)))
// inbetween environments, CJK has to be closed later (nesting!)
}
// If this is the last paragraph, close the CJK environment
- // if necessary. If it's an environment, we'll have to \end that first.
- if (runparams.isLastPar && !style.isEnvironment()) {
+ // if necessary. If it's an environment or nested in an environment,
+ // we'll have to \end that first.
+ if (runparams.isLastPar && !style.isEnvironment()
+ && par.params().depth() < 1) {
switch (state->open_encoding_) {
case CJK: {
// do nothing at the end of child documents
if (maintext && buf.masterBuffer() != &buf)
break;
- // end of main text
+ // end of main text: also insert a \clearpage (see #5386)
if (maintext) {
- os << "\n\\end{CJK}\n";
+ os << "\n\\clearpage\n\\end{CJK}\n";
// end of an inset
} else
os << "\\end{CJK}";
}
// Open a CJK environment at the beginning of the main buffer
- // if the document's language is a CJK language
- // (but not in child documents)
+ // (but not in child documents or documents using system fonts)
+ // if the document's language is a CJK language (with some exceptions)
+ // or the document encoding is utf8-cjk:
OutputState * state = getOutputState();
- if (maintext && !is_child
- && bparams.encoding().package() == Encoding::CJK) {
- os << "\\begin{CJK}{" << from_ascii(bparams.encoding().latexName())
- << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
+ if (maintext && !is_child && !bparams.useNonTeXFonts
+ && ((bparams.language->encoding()->package() == Encoding::CJK
+ && (bparams.encoding().iconvName() != "UTF-8"
+ || bparams.encoding().name() == "utf8-cjk"
+ || bparams.encoding().name() == "utf8" ))
+ || (bparams.encoding().name() == "utf8-cjk"
+ && LaTeXFeatures::isAvailable("CJKutf8")))) {
+ docstring const cjkenc = bparams.encoding().iconvName() == "UTF-8"
+ ? from_ascii("UTF8") : from_ascii(bparams.encoding().latexName());
+ os << "\\begin{CJK}{" << cjkenc
+ << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
state->open_encoding_ = CJK;
}
// if "auto begin" is switched off, explicitly switch the
// If the last paragraph is an environment, we'll have to close
// CJK at the very end to do proper nesting.
if (maintext && !is_child && state->open_encoding_ == CJK) {
- os << "\\end{CJK}\n";
+ os << "\\clearpage\n\\end{CJK}\n";
state->open_encoding_ = none;
}
// Likewise for polyglossia or when using begin/end commands
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
+ // If we switch from/to CJK, we need to switch anyway, despite custom inputenc,
+ // except if we use CJKutf8
bool const from_to_cjk =
- (oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK)
- || (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK);
+ ((oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK)
+ || (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK))
+ && ((bparams.encoding().name() != "utf8-cjk" && bparams.encoding().name() != "utf8")
+ || !LaTeXFeatures::isAvailable("CJKutf8"));
if (!force && !from_to_cjk
&& ((bparams.inputenc != "auto" && bparams.inputenc != "default") || moving_arg))
return make_pair(false, 0);
// This does of course only work in special cases (e.g. switch from
// tis620-0 to latin1, but the text in latin1 contains ASCII only),
// but it is the best we can do
- if (oldEnc.package() == Encoding::none
- || newEnc.package() == Encoding::none)
+ //
+ // 2019-01-08 Possibly no longer required since tis620-0 is supported
+ // by inputenc (but check special encodings "utf8-plain" and "default").
+ if (oldEnc.package() == Encoding::none || newEnc.package() == Encoding::none)
return make_pair(false, 0);
- LYXERR(Debug::LATEX, "Changing LaTeX encoding from "
- << oldEnc.name() << " to " << newEnc.name());
- os << setEncoding(newEnc.iconvName());
- if (bparams.inputenc == "default")
- return make_pair(true, 0);
+ // change encoding (not required with UTF8)
+ if (bparams.encoding().iconvName() != "UTF-8") {
+ LYXERR(Debug::LATEX, "Changing LaTeX encoding from "
+ << oldEnc.name() << " to " << newEnc.name());
+ os << setEncoding(newEnc.iconvName());
+ if (bparams.inputenc == "default")
+ return make_pair(true, 0);
+ }
docstring const inputenc_arg(from_ascii(newEnc.latexName()));
OutputState * state = getOutputState();
os << "\\egroup";
count += 7;
}
- os << "\\begin{CJK}{" << inputenc_arg << "}{"
+ docstring const cjkenc = (bparams.encoding().iconvName() == "UTF-8"
+ && LaTeXFeatures::isAvailable("CJKutf8"))
+ ? from_ascii("UTF8") : from_ascii(newEnc.latexName());
+ os << "\\begin{CJK}{" << cjkenc << "}{"
<< from_ascii(bparams.fonts_cjk) << "}";
state->open_encoding_ = CJK;
return make_pair(true, count + 15);
}
// Dead code to avoid a warning:
return make_pair(true, 0);
-
}
} // namespace lyx