#include "output_latex.h"
+#include "BiblioInfo.h"
#include "Buffer.h"
#include "BufferParams.h"
#include "Encoding.h"
#include "Font.h"
#include "InsetList.h"
#include "Language.h"
+#include "LaTeXFeatures.h"
#include "Layout.h"
#include "LyXRC.h"
#include "OutputParams.h"
struct OutputState
{
OutputState() : open_encoding_(none), cjk_inherited_(0),
- prev_env_language_(0), nest_level_(0)
+ prev_env_language_(nullptr), nest_level_(0)
{
}
OpenEncoding open_encoding_;
}
-string const & openPolyglossiaLang(OutputState const * state)
+string const & openLanguageName(OutputState const * state)
{
// Return a reference to the last active language opened with
- // polyglossia. If none or when using babel, return a reference
- // to an empty string.
+ // polyglossia or when using begin/end commands. If none or when
+ // using babel with only a begin command, return a reference to
+ // an empty string.
static string const empty;
bool atSameLastLangSwitchDepth(OutputState const * state)
{
// Return true if the actual nest level is the same at which the
- // language was switched when using polyglossia. Instead, return
- // always true when using babel.
+ // language was switched when using polyglossia or begin/end
+ // commands. Instead, return always true when using babel with
+ // only a begin command.
return state->lang_switch_depth_.size() == 0
? true
bool isLocalSwitch(OutputState const * state)
{
- // Return true if the language was opened by the \text<lang> command.
+ // Return true if the language was opened by a local command switch.
return state->lang_switch_depth_.size()
&& state->lang_switch_depth_.top() < 0;
string const getPolyglossiaBegin(string const & lang_begin_command,
- string const & lang, string const & opts)
+ string const & lang, string const & opts,
+ bool const localswitch = false)
{
string result;
- if (!lang.empty())
- result = subst(lang_begin_command, "$$lang", lang);
+ if (!lang.empty()) {
+ // we need to revert the upcasing done in getPolyglossiaEnvName()
+ // in case we have a local polyglossia command (\textarabic).
+ string language = localswitch ? ascii_lowercase(lang) : lang;
+ result = subst(lang_begin_command, "$$lang", language);
+ }
string options = opts.empty() ?
string() : "[" + opts + "]";
result = subst(result, "$$opts", options);
pit == paragraphs.begin() ? pit : prev(pit, 1);
OutputState * state = getOutputState();
- bool const use_prev_env_language = state->prev_env_language_ != 0
+ bool const use_prev_env_language = state->prev_env_language_ != nullptr
&& priorpit->layout().isEnvironment()
&& (priorpit->getDepth() > pit->getDepth()
|| (priorpit->getDepth() == pit->getDepth()
"\\begin{$$lang}" : lyxrc.language_command_begin;
string const lang_end_command = use_polyglossia ?
"\\end{$$lang}" : lyxrc.language_command_end;
+ bool const using_begin_end = use_polyglossia ||
+ !lang_end_command.empty();
// For polyglossia, switch language outside of environment, if possible.
if (par_lang != prev_par_lang) {
- if (!lang_end_command.empty() &&
+ if ((!using_begin_end || langOpenedAtThisLevel(state)) &&
+ !lang_end_command.empty() &&
prev_par_lang != doc_lang &&
- atSameLastLangSwitchDepth(state) &&
!prev_par_lang.empty()) {
os << from_ascii(subst(
lang_end_command,
prev_par_lang))
// the '%' is necessary to prevent unwanted whitespace
<< "%\n";
- if (use_polyglossia)
- popPolyglossiaLang();
+ if (using_begin_end)
+ popLanguageName();
}
// If no language was explicitly opened and we are using
- // polyglossia, then the current polyglossia language is
- // the document language.
- string const & pol_lang = use_polyglossia
+ // polyglossia or begin/end commands, then the current
+ // language is the document language.
+ string const & cur_lang = using_begin_end
&& state->lang_switch_depth_.size()
- ? openPolyglossiaLang(state)
+ ? openLanguageName(state)
: doc_lang;
if ((lang_end_command.empty() ||
par_lang != doc_lang ||
- par_lang != pol_lang) &&
+ par_lang != cur_lang) &&
!par_lang.empty()) {
string bc = use_polyglossia ?
getPolyglossiaBegin(lang_begin_command, par_lang,
os << bc;
// the '%' is necessary to prevent unwanted whitespace
os << "%\n";
- if (use_polyglossia)
- pushPolyglossiaLang(par_lang);
+ if (using_begin_end)
+ pushLanguageName(par_lang);
}
}
data.leftindent_open = true;
}
- if (style.isEnvironment()) {
+ if (style.isEnvironment())
state->nest_level_ += 1;
+
+ if (style.isEnvironment() && !style.latexname().empty()) {
os << "\\begin{" << from_ascii(style.latexname()) << '}';
if (!style.latexargs().empty()) {
OutputParams rp = runparams;
<< "}\n";
} else
os << from_ascii(style.latexparam()) << '\n';
+ if (style.latextype == LATEX_BIB_ENVIRONMENT
+ || style.latextype == LATEX_ITEM_ENVIRONMENT
+ || style.latextype == LATEX_LIST_ENVIRONMENT) {
+ OutputParams rp = runparams;
+ rp.local_font = &pit->getFirstFontSettings(bparams);
+ latexArgInsets(paragraphs, pit, os, rp, style.listpreamble(),
+ "listpreamble:");
+ }
}
data.style = &style;
// in multilingual environments, the CJK tags have to be nested properly
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 (!bparams.useNonTeXFonts
+ && (bparams.inputenc == "auto-legacy"
+ || bparams.inputenc == "auto-legacy-plain")
+ && 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())
<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
+ }
state->open_encoding_ = CJK;
data.cjk_nested = true;
}
if (data.style->isEnvironment()) {
os << breakln;
- // Close any polyglossia language opened at this nest level
- if (runparams.use_polyglossia) {
+ bool const using_begin_end =
+ runparams.use_polyglossia ||
+ !lyxrc.language_command_end.empty();
+ // Close any language opened at this nest level
+ if (using_begin_end) {
while (langOpenedAtThisLevel(state)) {
if (isLocalSwitch(state)) {
os << "}";
} else {
os << "\\end{"
- << openPolyglossiaLang(state)
+ << openLanguageName(state)
<< "}%\n";
}
- popPolyglossiaLang();
+ popLanguageName();
}
}
state->nest_level_ -= 1;
- os << "\\end{" << from_ascii(data.style->latexname()) << "}\n";
+ string const & name = data.style->latexname();
+ if (!name.empty())
+ os << "\\end{" << from_ascii(name) << "}\n";
state->prev_env_language_ = data.par_language;
if (runparams.encoding != data.prev_encoding) {
runparams.encoding = data.prev_encoding;
pit_type & pit, otexstream & os)
{
ParagraphList const & paragraphs = text.paragraphs();
- ParagraphList::const_iterator par = paragraphs.constIterator(pit);
+ ParagraphList::const_iterator ipar = paragraphs.constIterator(pit);
LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << pit);
- Layout const & current_layout = par->layout();
- depth_type const current_depth = par->params().depth();
- Length const & current_left_indent = par->params().leftIndent();
+ Layout const & current_layout = ipar->layout();
+ depth_type const current_depth = ipar->params().depth();
+ Length const & current_left_indent = ipar->params().leftIndent();
// This is for debugging purpose at the end.
pit_type const par_begin = pit;
// Default and preset args are always output, so if they require
// other arguments, consider this.
- Layout::LaTeXArgMap::const_iterator lit = latexargs.begin();
- Layout::LaTeXArgMap::const_iterator const lend = latexargs.end();
- for (; lit != lend; ++lit) {
- Layout::latexarg arg = (*lit).second;
+ for (auto const & larg : latexargs) {
+ Layout::latexarg const & arg = larg.second;
if ((!arg.presetarg.empty() || !arg.defaultarg.empty()) && !arg.requires.empty()) {
vector<string> req = getVectorFromString(arg.requires);
required.insert(required.end(), req.begin(), req.end());
latexargs.find(ins->name());
if (lait != latexargs.end()) {
Layout::latexarg arg = (*lait).second;
- docstring ldelim = arg.mandatory ?
+ docstring ldelim;
+ docstring rdelim;
+ if (!arg.nodelims) {
+ ldelim = arg.mandatory ?
from_ascii("{") : from_ascii("[");
- docstring rdelim = arg.mandatory ?
+ rdelim = arg.mandatory ?
from_ascii("}") : from_ascii("]");
+ }
if (!arg.ldelim.empty())
ldelim = arg.ldelim;
if (!arg.rdelim.empty())
rdelim = arg.rdelim;
ins->latexArgument(os, runparams, ldelim, rdelim, arg.presetarg);
+ if (prefix == "listpreamble:")
+ os << breakln;
inserted = true;
}
}
}
}
}
+ if (runparams.for_search) {
+ // Mark end of arguments for findadv() only
+ os << "\\endarguments{}";
+ }
}
-} // namespace anon
+} // namespace
-void pushPolyglossiaLang(string const & lang_name, bool localswitch)
+void pushLanguageName(string const & lang_name, bool localswitch)
{
OutputState * state = getOutputState();
}
-void popPolyglossiaLang()
+void popLanguageName()
{
OutputState * state = getOutputState();
}
-void latexArgInsets(Paragraph const & par, otexstream & os,
- OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, string const & prefix)
+string const & openLanguageName()
{
- map<int, InsetArgument const *> ilist;
- vector<string> required;
+ OutputState * state = getOutputState();
- InsetList::const_iterator it = par.insetList().begin();
- InsetList::const_iterator end = par.insetList().end();
- for (; it != end; ++it) {
- if (it->inset->lyxCode() == ARG_CODE) {
- InsetArgument const * ins =
- static_cast<InsetArgument const *>(it->inset);
- if (ins->name().empty())
- LYXERR0("Error: Unnamed argument inset!");
- else {
- string const name = prefix.empty() ? ins->name() : split(ins->name(), ':');
- unsigned int const nr = convert<unsigned int>(name);
- ilist[nr] = ins;
- Layout::LaTeXArgMap::const_iterator const lit =
- latexargs.find(ins->name());
- if (lit != latexargs.end()) {
- Layout::latexarg const & arg = (*lit).second;
- if (!arg.requires.empty()) {
- vector<string> req = getVectorFromString(arg.requires);
- required.insert(required.end(), req.begin(), req.end());
- }
- }
- }
+ return openLanguageName(state);
+}
+
+
+namespace {
+
+void addArgInsets(Paragraph const & par, string const & prefix,
+ Layout::LaTeXArgMap const & latexargs,
+ map<int, InsetArgument const *> & ilist,
+ vector<string> & required)
+{
+ for (auto const & table : par.insetList()) {
+ InsetArgument const * arg = table.inset->asInsetArgument();
+ if (!arg)
+ continue;
+ if (arg->name().empty()) {
+ LYXERR0("Error: Unnamed argument inset!");
+ continue;
+ }
+ string const name = prefix.empty() ?
+ arg->name() : split(arg->name(), ':');
+ // why converting into an integer?
+ unsigned int const nr = convert<unsigned int>(name);
+ if (ilist.find(nr) == ilist.end())
+ ilist[nr] = arg;
+ Layout::LaTeXArgMap::const_iterator const lit =
+ latexargs.find(arg->name());
+ if (lit != latexargs.end()) {
+ Layout::latexarg const & larg = lit->second;
+ vector<string> req = getVectorFromString(larg.requires);
+ move(req.begin(), req.end(), back_inserter(required));
}
}
+}
+
+} // namespace
+
+
+void latexArgInsets(Paragraph const & par, otexstream & os,
+ OutputParams const & runparams,
+ Layout::LaTeXArgMap const & latexargs,
+ string const & prefix)
+{
+ map<int, InsetArgument const *> ilist;
+ vector<string> required;
+ addArgInsets(par, prefix, latexargs, ilist, required);
getArgInsets(os, runparams, latexargs, ilist, required, prefix);
}
-void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pit,
- otexstream & os, OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs,
- string const & prefix)
+void latexArgInsets(ParagraphList const & pars,
+ ParagraphList::const_iterator pit,
+ otexstream & os, OutputParams const & runparams,
+ Layout::LaTeXArgMap const & latexargs,
+ string const & prefix)
{
map<int, InsetArgument const *> ilist;
vector<string> required;
ParagraphList::const_iterator spit = lyx::prev(pit, offset);
for (; spit != pars.end(); ++spit) {
- if (spit->layout() != current_layout || spit->params().depth() < current_depth)
+ if (spit->layout() != current_layout ||
+ spit->params().depth() < current_depth)
break;
if (spit->params().depth() > current_depth)
continue;
- InsetList::const_iterator it = spit->insetList().begin();
- InsetList::const_iterator end = spit->insetList().end();
- for (; it != end; ++it) {
- if (it->inset->lyxCode() == ARG_CODE) {
- InsetArgument const * ins =
- static_cast<InsetArgument const *>(it->inset);
- if (ins->name().empty())
- LYXERR0("Error: Unnamed argument inset!");
- else {
- string const name = prefix.empty() ? ins->name() : split(ins->name(), ':');
- unsigned int const nr = convert<unsigned int>(name);
- if (ilist.find(nr) == ilist.end())
- ilist[nr] = ins;
- Layout::LaTeXArgMap::const_iterator const lit =
- latexargs.find(ins->name());
- if (lit != latexargs.end()) {
- Layout::latexarg const & arg = (*lit).second;
- if (!arg.requires.empty()) {
- vector<string> req = getVectorFromString(arg.requires);
- required.insert(required.end(), req.begin(), req.end());
- }
- }
- }
- }
- }
+ addArgInsets(*spit, prefix, latexargs, ilist, required);
+ }
+ getArgInsets(os, runparams, latexargs, ilist, required, prefix);
+}
+
+
+void latexArgInsetsForParent(ParagraphList const & pars, otexstream & os,
+ OutputParams const & runparams,
+ Layout::LaTeXArgMap const & latexargs,
+ string const & prefix)
+{
+ map<int, InsetArgument const *> ilist;
+ vector<string> required;
+
+ for (Paragraph const & par : pars) {
+ if (par.layout().hasArgs())
+ // The InsetArguments inside this paragraph refer to this paragraph
+ continue;
+ addArgInsets(par, prefix, latexargs, ilist, required);
}
getArgInsets(os, runparams, latexargs, ilist, required, prefix);
}
+
namespace {
// output the proper paragraph start according to latextype.
void parStartCommand(Paragraph const & par, otexstream & os,
- OutputParams const & runparams, Layout const & style)
+ OutputParams const & runparams, Layout const & style)
{
switch (style.latextype) {
case LATEX_COMMAND:
+ if (par.needsCProtection(runparams.moving_arg)) {
+ if (contains(runparams.active_chars, '^'))
+ // cprotect relies on ^ being on catcode 7
+ os << "\\begingroup\\catcode`\\^=7";
+ os << "\\cprotect";
+ }
os << '\\' << from_ascii(style.latexname());
// Command arguments
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_ENVIRONMENT:
+ if (runparams.for_search) {
+ os << "\\latexenvironment{" << style.latexname() << "}{";
+ }
break;
case LATEX_BIB_ENVIRONMENT:
// ignore this, the inset will write itself
}
}
-} // namespace anon
+} // namespace
// FIXME: this should be anonymous
void TeXOnePar(Buffer const & buf,
otexstream & os,
OutputParams const & runparams_in,
string const & everypar,
- int start_pos, int end_pos)
+ int start_pos, int end_pos,
+ bool const force)
{
BufferParams const & bparams = runparams_in.is_child
? buf.masterParams() : buf.params();
Layout const & style = text.inset().forcePlainLayout() ?
bparams.documentClass().plainLayout() : par.layout();
- if (style.inpreamble)
+ if (style.inpreamble && !force)
return;
LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " ptr " << &par << " '"
OutputParams runparams = runparams_in;
runparams.isLastPar = (pit == pit_type(paragraphs.size() - 1));
- // We reinitialze par begin and end to be on the safe side
+ // We reinitialize par begin and end to be on the safe side
// with embedded inset as we don't know if they set those
// value correctly.
runparams.par_begin = 0;
Font const outerfont = text.outerFont(pit);
// No newline before first paragraph in this lyxtext
- if (pit > 0) {
+ if (pit > 0 && !text.inset().getLayout().parbreakIgnored()) {
os << '\n';
if (!text.inset().getLayout().parbreakIsNewline())
os << '\n';
}
- par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
+ par.latex(bparams, outerfont, os, runparams, start_pos, end_pos, force);
return;
}
Paragraph const * nextpar = runparams.isLastPar
- ? 0 : ¶graphs.at(pit + 1);
+ ? nullptr : ¶graphs.at(pit + 1);
+
+ bool const intitle_command = style.intitle && style.isCommand();
if (style.pass_thru) {
Font const outerfont = text.outerFont(pit);
parStartCommand(par, os, runparams, style);
+ if (style.isCommand() && style.needprotect)
+ // Due to the moving argument, some fragile
+ // commands (labels, index entries)
+ // are output after this command (#2154)
+ runparams.postpone_fragile_stuff = true;
+ if (intitle_command)
+ os << '{';
- par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
+ par.latex(bparams, outerfont, os, runparams, start_pos, end_pos, force);
// I did not create a parEndCommand for this minuscule
// task because in the other user of parStartCommand
// the code is different (JMarc)
- if (style.isCommand())
- os << "}\n";
+ if (style.isCommand()) {
+ os << "}";
+ if (par.needsCProtection(runparams.moving_arg)
+ && contains(runparams.active_chars, '^'))
+ os << "\\endgroup";
+ os << "\n";
+ }
else
os << '\n';
if (!style.parbreak_is_newline) {
// This paragraph's language
Language const * const par_language = par.getParLanguage(bparams);
Language const * const nextpar_language = nextpar ?
- nextpar->getParLanguage(bparams) : 0;
+ nextpar->getParLanguage(bparams) : nullptr;
// The document's language
Language const * const doc_language = bparams.language;
// The language that was in effect when the environment this paragraph is
// inside of was opened
Language const * const outer_language =
- (runparams.local_font != 0) ?
+ (runparams.local_font != nullptr) ?
runparams.local_font->language() : doc_language;
- Paragraph const * priorpar = (pit == 0) ? 0 : ¶graphs.at(pit - 1);
+ Paragraph const * priorpar = (pit == 0) ? nullptr : ¶graphs.at(pit - 1);
// 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 = state->prev_env_language_ != 0
+ // Note further that we take the outer language also if the prior par
+ // is PassThru, since in that case it has latex_language, and all secondary
+ // languages have been closed (#10793).
+ bool const use_prev_env_language = state->prev_env_language_ != nullptr
&& priorpar
&& priorpar->layout().isEnvironment()
&& (priorpar->getDepth() > par.getDepth()
|| (priorpar->getDepth() == par.getDepth()
- && priorpar->layout() != par.layout()));
+ && priorpar->layout() != par.layout()));
+
+ // We need to ignore previous intitle commands since languages
+ // are switched locally there (# 11514)
+ // There might be paragraphs before the title, so we check this.
+ Paragraph * prior_nontitle_par = nullptr;
+ if (!intitle_command) {
+ pit_type ppit = pit;
+ while (ppit > 0) {
+ --ppit;
+ Paragraph const * tmppar = ¶graphs.at(ppit);
+ if (tmppar->layout().intitle && tmppar->layout().isCommand())
+ continue;
+ prior_nontitle_par = const_cast<Paragraph*>(tmppar);
+ break;
+ }
+ }
Language const * const prev_language =
- (pit != 0)
- ? (use_prev_env_language ? state->prev_env_language_
- : priorpar->getParLanguage(bparams))
- : outer_language;
-
+ runparams_in.for_search
+ ? languages.getLanguage("ignore")
+ : (prior_nontitle_par && !prior_nontitle_par->isPassThru())
+ ? (use_prev_env_language
+ ? state->prev_env_language_
+ : prior_nontitle_par->getParLanguage(bparams))
+ : outer_language;
bool const use_polyglossia = runparams.use_polyglossia;
string const par_lang = use_polyglossia ?
"\\end{$$lang}" : lyxrc.language_command_end;
// the '%' is necessary to prevent unwanted whitespace
string lang_command_termination = "%\n";
+ bool const using_begin_end = use_polyglossia ||
+ !lang_end_command.empty();
- // In some insets (such as Arguments), we cannot use \selectlanguage
- bool const localswitch = text.inset().forceLocalFontSwitch()
- || (use_polyglossia && text.inset().forcePlainLayout());
+ // For InTitle commands, we need to switch the language inside the command
+ // (see #10849); thus open the command here.
+ if (intitle_command) {
+ parStartCommand(par, os, runparams, style);
+ if (style.isCommand() && style.needprotect)
+ // Due to the moving argument, some fragile
+ // commands (labels, index entries)
+ // are output after this command (#2154)
+ runparams.postpone_fragile_stuff = true;
+ os << '{';
+ }
+
+ // In some insets (such as Arguments), we cannot use \selectlanguage.
+ // 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 in_polyglossia_rtl_env =
+ use_polyglossia
+ && runparams.local_font != nullptr
+ && outer_language->rightToLeft()
+ && !par_language->rightToLeft();
+ bool const localswitch = runparams_in.for_search
+ || text.inset().forceLocalFontSwitch()
+ || (using_begin_end && text.inset().forcePlainLayout())
+ || in_polyglossia_rtl_env;
if (localswitch) {
lang_begin_command = use_polyglossia ?
"\\text$$lang$$opts{" : lyxrc.language_command_local;
lang_command_termination.clear();
}
- 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())))
- {
- if (!lang_end_command.empty() &&
- prev_lang != outer_lang &&
- !prev_lang.empty() &&
- (!use_polyglossia || !style.isEnvironment()))
- {
+ bool const localswitch_needed = localswitch && par_lang != outer_lang;
+
+ // localswitches need to be closed and reopened at each par
+ 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())))) {
+ if (!localswitch
+ && (!using_begin_end || langOpenedAtThisLevel(state))
+ && !lang_end_command.empty()
+ && prev_lang != outer_lang
+ && !prev_lang.empty()
+ && (!using_begin_end || !style.isEnvironment())) {
os << from_ascii(subst(lang_end_command,
- "$$lang",
- prev_lang))
+ "$$lang",
+ prev_lang))
<< lang_command_termination;
- if (use_polyglossia)
- popPolyglossiaLang();
+ if (using_begin_end)
+ popLanguageName();
}
// We need to open a new language if we couldn't close the previous
// outer_language (which is currently in effect once the previous one
// is closed).
if ((lang_end_command.empty() || par_lang != outer_lang
- || (!use_polyglossia
+ || (!using_begin_end
|| (style.isEnvironment() && par_lang != prev_lang)))
&& !par_lang.empty()) {
// If we're inside an inset, and that inset is within an \L or \R
// 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 (!use_polyglossia
+ if (!using_begin_end
// 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 != nullptr
// is the inset within an \L or \R?
//
// FIXME: currently, we don't check this; this means that
os << "\\L{";
}
// With CJK, the CJK tag has to be closed first (see below)
- if (runparams.encoding->package() != Encoding::CJK
- && par_lang != openPolyglossiaLang(state)
+ if ((runparams.encoding->package() != Encoding::CJK
+ || bparams.useNonTeXFonts
+ || runparams.for_search)
+ && (par_lang != openLanguageName(state) || localswitch || intitle_command)
&& !par_lang.empty()) {
string bc = use_polyglossia ?
- getPolyglossiaBegin(lang_begin_command, par_lang, par_language->polyglossiaOpts())
+ getPolyglossiaBegin(lang_begin_command, par_lang,
+ par_language->polyglossiaOpts(),
+ localswitch)
: subst(lang_begin_command, "$$lang", par_lang);
os << bc;
os << lang_command_termination;
- if (use_polyglossia)
- pushPolyglossiaLang(par_lang, localswitch);
+ if (using_begin_end)
+ pushLanguageName(par_lang, localswitch);
}
}
}
- // Switch file encoding if necessary; no need to do this for "default"
+ // Switch file encoding if necessary; no need to do this for "auto-legacy-plain"
// encoding, since this only affects the position of the outputted
// \inputencoding command; the encoding switch will occur when necessary
- if (bparams.inputenc == "auto"
+ if (bparams.inputenc == "auto-legacy"
&& !runparams.isFullUnicode() // Xe/LuaTeX use one document-wide encoding (see also switchEncoding())
+ && runparams.encoding->package() != Encoding::japanese
&& runparams.encoding->package() != Encoding::none) {
// Look ahead for future encoding changes.
// We try to output them at the beginning of the paragraph,
// 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())
+ os << "\\begin{CJK}{"
+ << from_ascii(par_language->encoding()->latexName())
<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
state->open_encoding_ = CJK;
}
}
// With CJK, the CJK tag had to be closed first (see above)
if (runparams.encoding->package() == Encoding::CJK
- && par_lang != openPolyglossiaLang(state)
+ && par_lang != openLanguageName(state)
&& !par_lang.empty()) {
- os << from_ascii(subst(
- lang_begin_command,
- "$$lang",
- par_lang))
- << lang_command_termination;
- if (use_polyglossia)
- pushPolyglossiaLang(par_lang, localswitch);
+ os << subst(lang_begin_command, "$$lang", par_lang)
+ << lang_command_termination;
+ if (using_begin_end)
+ pushLanguageName(par_lang, localswitch);
}
runparams.encoding = encoding;
}
}
runparams.moving_arg |= style.needprotect;
+ if (style.needmboxprotect)
+ ++runparams.inulemcmd;
Encoding const * const prev_encoding = runparams.encoding;
bool const useSetSpace = bparams.documentClass().provides("SetSpace");
os << "\n\\appendix\n";
}
- if (!par.params().spacing().isDefault()
- && (pit == 0 || !priorpar->hasSameLayout(par)))
- {
- os << from_ascii(par.params().spacing().writeEnvirBegin(useSetSpace))
- << '\n';
- }
+ // InTitle commands must use switches (not environments)
+ // inside the commands (see #9332)
+ if (style.intitle) {
+ if (!par.params().spacing().isDefault())
+ {
+ if (runparams.moving_arg)
+ os << "\\protect";
+ os << from_ascii(par.params().spacing().writeCmd(useSetSpace));
+ }
+ } else {
+ if (!par.params().spacing().isDefault()
+ && (pit == 0 || !priorpar->hasSameLayout(par)))
+ {
+ os << from_ascii(par.params().spacing().writeEnvirBegin(useSetSpace))
+ << '\n';
+ }
- if (style.isCommand()) {
- os << '\n';
+ if (style.isCommand()) {
+ os << '\n';
+ }
}
}
- parStartCommand(par, os, runparams, style);
+ // For InTitle commands, we already started the command before
+ // the language switch
+ if (!intitle_command) {
+ parStartCommand(par, os, runparams, style);
+ if (style.isCommand() && style.needprotect)
+ // Due to the moving argument, some fragile
+ // commands (labels, index entries)
+ // are output after this command (#2154)
+ runparams.postpone_fragile_stuff = true;
+ }
+
Font const outerfont = text.outerFont(pit);
// FIXME UNICODE
os << from_utf8(everypar);
- par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
-
- // Make sure that \\par is done with the font of the last
- // character if this has another size as the default.
- // This is necessary because LaTeX (and LyX on the screen)
- // calculates the space between the baselines according
- // to this font. (Matthias)
- //
- // We must not change the font for the last paragraph
- // of non-multipar insets, tabular cells or commands,
- // since this produces unwanted whitespace.
+ par.latex(bparams, outerfont, os, runparams, start_pos, end_pos, force);
Font const font = par.empty()
? par.getLayoutFont(bparams, outerfont)
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}";
- } else if (is_command) {
- os << '}';
- if (!style.postcommandargs().empty())
- latexArgInsets(par, os, runparams, style.postcommandargs(), "post:");
- if (runparams.encoding != prev_encoding) {
- runparams.encoding = prev_encoding;
- os << setEncoding(prev_encoding->iconvName());
+ // InTitle commands need to be closed after the language has been closed.
+ if (!intitle_command) {
+ if (is_command) {
+ os << '}';
+ if (!style.postcommandargs().empty())
+ latexArgInsets(par, os, runparams, style.postcommandargs(), "post:");
+ if (!runparams.post_macro.empty()) {
+ // Output the stored fragile commands (labels, indices etc.)
+ // that need to be output after the command with moving argument.
+ os << runparams.post_macro;
+ runparams.post_macro.clear();
+ }
+ if (par.needsCProtection(runparams.moving_arg)
+ && contains(runparams.active_chars, '^'))
+ os << "\\endgroup";
+ if (runparams.encoding != prev_encoding) {
+ runparams.encoding = prev_encoding;
+ os << setEncoding(prev_encoding->iconvName());
+ }
}
}
&& nextpar->getDepth() == par.getDepth())
|| (atSameLastLangSwitchDepth(state) && nextpar
&& nextpar->getDepth() < par.getDepth()))
- close_lang_switch = use_polyglossia;
+ close_lang_switch = using_begin_end;
if (nextpar && par.params().depth() < nextpar->params().depth())
- pending_newline = true;
+ pending_newline = !text.inset().getLayout().parbreakIgnored();
break;
case LATEX_ENVIRONMENT: {
- // if its the last paragraph of the current environment
+ // if it's the last paragraph of the current environment
// skip it otherwise fall through
if (nextpar
&& ((nextpar->layout() != par.layout()
|| nextpar->params().depth() != par.params().depth())
- || (!use_polyglossia || par_lang != nextpar_lang)))
+ || (!using_begin_end || par_lang != nextpar_lang)))
{
- close_lang_switch = use_polyglossia;
+ close_lang_switch = using_begin_end;
break;
}
}
-
- // fall through possible
+ // possible
+ // fall through
default:
- // we don't need it for the last paragraph!!!
- if (nextpar)
- pending_newline = true;
+ // we don't need it for the last paragraph and in InTitle commands!!!
+ if (nextpar && !intitle_command)
+ pending_newline = !text.inset().getLayout().parbreakIgnored();
}
- if (par.allowParagraphCustomization()) {
+ // InTitle commands use switches (not environments) for space settings
+ if (par.allowParagraphCustomization() && !style.intitle) {
if (!par.params().spacing().isDefault()
&& (runparams.isLastPar || !nextpar->hasSameLayout(par))) {
if (pending_newline)
}
}
- // Closing the language is needed for the last paragraph; it is also
- // needed if we're within an \L or \R that we may have opened above (not
- // necessarily in this paragraph) and are about to close.
- bool closing_rtl_ltr_environment = !use_polyglossia
+ // Closing the language is needed for the last paragraph in a given language
+ // as well as for any InTitleCommand (since these set the language locally);
+ // it is also needed if we're within an \L or \R that we may have opened above
+ // (not necessarily in this paragraph) and are about to close.
+ bool closing_rtl_ltr_environment = !using_begin_end
// not for ArabTeX
&& (par_language->lang() != "arabic_arabtex"
&& outer_language->lang() != "arabic_arabtex")
// have we opened an \L or \R environment?
- && runparams.local_font != 0
+ && runparams.local_font != nullptr
&& runparams.local_font->isRightToLeft() != par_language->rightToLeft()
// are we about to close the language?
&&((nextpar && par_lang != nextpar_lang)
|| (runparams.isLastPar && par_lang != outer_lang));
- if (closing_rtl_ltr_environment
- || ((runparams.isLastPar || close_lang_switch)
- && (par_lang != outer_lang || (use_polyglossia
+ if (localswitch_needed
+ || (intitle_command && using_begin_end)
+ || closing_rtl_ltr_environment
+ || (((runparams.isLastPar && !runparams.inbranch) || close_lang_switch)
+ && (par_lang != outer_lang || (using_begin_end
&& style.isEnvironment()
&& par_lang != nextpar_lang)))) {
// Since \selectlanguage write the language to the aux file,
// we need to reset the language at the end of footnote or
// float.
- if (pending_newline || close_lang_switch)
+ if (!localswitch && (pending_newline || close_lang_switch))
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)
+ || bparams.useNonTeXFonts
+ || runparams_in.for_search) {
if (lang_end_command.empty()) {
// If this is a child, we should restore the
// master language after the last paragraph.
? getPolyglossiaEnvName(current_language)
: current_language->babel();
if (!current_lang.empty()
- && current_lang != openPolyglossiaLang(state)) {
+ && current_lang != openLanguageName(state)) {
string bc = use_polyglossia ?
getPolyglossiaBegin(lang_begin_command, current_lang,
- current_language->polyglossiaOpts())
+ current_language->polyglossiaOpts(),
+ localswitch)
: subst(lang_begin_command, "$$lang", current_lang);
os << bc;
- pending_newline = !localswitch;
+ pending_newline = !localswitch
+ && !text.inset().getLayout().parbreakIgnored();
unskip_newline = !localswitch;
- if (use_polyglossia)
- pushPolyglossiaLang(current_lang, localswitch);
+ if (using_begin_end)
+ pushLanguageName(current_lang, localswitch);
}
- } else if (!par_lang.empty()) {
- // If we are in an environment, we have to close the "outer" language afterwards
- string const & pol_lang = openPolyglossiaLang(state);
+ } else if ((!using_begin_end ||
+ langOpenedAtThisLevel(state)) &&
+ !par_lang.empty()) {
+ // If we are in an environment, we have to
+ // close the "outer" language afterwards
+ string const & cur_lang = openLanguageName(state);
if (!style.isEnvironment()
|| (close_lang_switch
&& atSameLastLangSwitchDepth(state)
&& par_lang != outer_lang
- && (par_lang != pol_lang
- || (pol_lang != outer_lang
+ && (par_lang != cur_lang
+ || (cur_lang != outer_lang
&& nextpar
&& style != nextpar->layout())))
|| (atSameLastLangSwitchDepth(state)
&& state->lang_switch_depth_.size()
- && pol_lang != par_lang))
+ && cur_lang != par_lang)
+ || in_polyglossia_rtl_env)
{
- if (use_polyglossia && !localswitch)
+ if (using_begin_end && !localswitch)
os << breakln;
os << from_ascii(subst(
lang_end_command,
"$$lang",
par_lang));
- pending_newline = !localswitch;
+ pending_newline = !localswitch
+ && !text.inset().getLayout().parbreakIgnored();
unskip_newline = !localswitch;
- if (use_polyglossia)
- popPolyglossiaLang();
+ if (using_begin_end)
+ popLanguageName();
}
}
}
if (closing_rtl_ltr_environment)
os << "}";
+ // InTitle commands need to be closed after the language has been closed.
+ if (intitle_command) {
+ os << '}';
+ if (!style.postcommandargs().empty())
+ latexArgInsets(par, os, runparams, style.postcommandargs(), "post:");
+ if (!runparams.post_macro.empty()) {
+ // Output the stored fragile commands (labels, indices etc.)
+ // that need to be output after the command with moving argument.
+ os << runparams.post_macro;
+ runparams.post_macro.clear();
+ }
+ if (par.needsCProtection(runparams.moving_arg)
+ && contains(runparams.active_chars, '^'))
+ os << "\\endgroup";
+ if (runparams.encoding != prev_encoding) {
+ runparams.encoding = prev_encoding;
+ os << setEncoding(prev_encoding->iconvName());
+ }
+ }
+
bool const last_was_separator =
par.size() > 0 && par.isEnvSeparator(par.size() - 1);
// prevent unwanted whitespace
os << '%';
if (!os.afterParbreak() && !last_was_separator)
- os << breakln;
+ os << '\n';
}
// 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
+ if (nextpar && state->open_encoding_ == CJK
+ && bparams.encoding().iconvName() != "UTF-8"
+ && bparams.encoding().package() != Encoding::CJK
&& (nextpar_language->encoding()->package() != Encoding::CJK
- || (nextpar->layout().isEnvironment() && nextpar->isMultiLingual(bparams)))
+ || (nextpar->layout().isEnvironment() && nextpar->isMultiLingual(bparams)))
// inbetween environments, CJK has to be closed later (nesting!)
&& (!style.isEnvironment() || !nextpar->layout().isEnvironment())) {
os << "\\end{CJK}\n";
}
// 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}";
break;
}
case inputenc: {
+ // FIXME: If we are in an inset and the switch happened outside this inset,
+ // do not switch back at the end of the inset (bug #8479)
+ // The following attempt does not help with listings-caption in a CJK document:
+ // if (runparams_in.local_font != 0
+ // && runparams_in.encoding == runparams_in.local_font->language()->encoding())
+ // break;
os << "\\egroup";
state->open_encoding_ = none;
break;
}
}
- // If this is the last paragraph, and a local_font was set upon entering
- // 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.
- if (runparams.isLastPar && runparams_in.local_font != 0
+ // Information about local language is stored as a font feature.
+ // If this is the last paragraph of the inset and a local_font was set upon entering
+ // and we are mixing encodings ("auto-legacy" or "auto-legacy-plain" and no XeTeX or LuaTeX),
+ // ensure the encoding is set back to the default encoding of the local language.
+ if (runparams.isLastPar && runparams_in.local_font != nullptr
&& runparams_in.encoding != runparams_in.local_font->language()->encoding()
- && (bparams.inputenc == "auto" || bparams.inputenc == "default")
+ && (bparams.inputenc == "auto-legacy" || bparams.inputenc == "auto-legacy-plain")
&& !runparams.isFullUnicode()
) {
runparams_in.encoding = runparams_in.local_font->language()->encoding();
else
runparams_in.encoding = runparams.encoding;
+ // Also pass the post_macros upstream
+ runparams_in.post_macro = runparams.post_macro;
+
// we don't need a newline for the last paragraph!!!
// Note from JMarc: we will re-add a \n explicitly in
// TeXEnvironment, because it is needed in this case
if (nextpar && !os.afterParbreak() && !last_was_separator) {
- // Make sure to start a new line
- os << breakln;
Layout const & next_layout = nextpar->layout();
+ if (!text.inset().getLayout().parbreakIgnored())
+ // Make sure to start a new line
+ os << breakln;
// A newline '\n' is always output before a command,
// so avoid doubling it.
if (!next_layout.isCommand()) {
if ((style == next_layout
&& !style.parbreak_is_newline
&& !text.inset().getLayout().parbreakIsNewline()
+ && !text.inset().getLayout().parbreakIgnored()
&& style.latextype != LATEX_ITEM_ENVIRONMENT
&& style.latextype != LATEX_LIST_ENVIRONMENT
- && style.align == par.getAlign()
+ && style.align == par.getAlign(bparams)
&& nextpar->getDepth() == par.getDepth()
- && nextpar->getAlign() == par.getAlign())
+ && nextpar->getAlign(bparams) == par.getAlign(bparams))
|| (!next_layout.isEnvironment()
&& nextpar->getDepth() > par.getDepth()
- && nextpar->getAlign() == par.getAlign())
+ && nextpar->getAlign(bparams) == next_layout.align)
|| (!style.isEnvironment()
&& next_layout.latextype == LATEX_ENVIRONMENT
&& nextpar->getDepth() < par.getDepth())
|| (style.isCommand()
&& !next_layout.isEnvironment()
- && style.align == par.getAlign()
- && next_layout.align == nextpar->getAlign())
- || (style.align != par.getAlign()
+ && style.align == par.getAlign(bparams)
+ && next_layout.align == nextpar->getAlign(bparams))
+ || (style.align != par.getAlign(bparams)
&& tclass.isDefaultLayout(next_layout))) {
os << '\n';
}
if (multibib_child && mparams.useBiblatex())
os << "\\newrefsection";
- else if (multibib_child && mparams.useBibtopic()) {
+ else if (multibib_child && mparams.useBibtopic()
+ && !buf.masterBibInfo().empty()) {
os << "\\begin{btUnit}\n";
runparams.openbtUnit = true;
}
// 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)
+ // if the document's main encoding requires the CJK package
+ // or the document encoding is utf8 and the CJK package is required
+ // (but not in child documents or documents using system fonts):
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.encoding().package() == Encoding::CJK
+ || (bparams.encoding().name() == "utf8"
+ && runparams.use_CJK))
+ ) {
+ 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
: bparams.language->babel();
string const lang_begin_command = runparams.use_polyglossia ?
"\\begin{$$lang}$$opts" : lyxrc.language_command_begin;
+ string const lang_end_command = runparams.use_polyglossia ?
+ "\\end{$$lang}" : lyxrc.language_command_end;
+ bool const using_begin_end = runparams.use_polyglossia ||
+ !lang_end_command.empty();
if (maintext && !lyxrc.language_auto_begin &&
!mainlang.empty()) {
: subst(lang_begin_command, "$$lang", mainlang);
os << bc;
os << '\n';
- if (runparams.use_polyglossia)
- pushPolyglossiaLang(mainlang);
+ if (using_begin_end)
+ pushLanguageName(mainlang);
}
ParagraphList const & paragraphs = text.paragraphs();
<< "}\n";
}
}
- } else if (was_title && !already_title) {
+ } else if (was_title && !already_title && !layout.inpreamble) {
if (tclass.titletype() == TITLE_ENVIRONMENT) {
os << "\\end{" << from_ascii(tclass.titlename())
<< "}\n";
&& layout.latexname() == bparams.multibib) {
if (runparams.openbtUnit)
os << "\\end{btUnit}\n";
- if (!bparams.useBiblatex()) {
+ if (!bparams.useBiblatex()
+ && !buf.masterBibInfo().empty()) {
os << '\n' << "\\begin{btUnit}\n";
runparams.openbtUnit = true;
}
TeXOnePar(buf, text, pit, os, runparams, everypar);
continue;
}
-
+
TeXEnvironmentData const data =
prepareEnvironment(buf, text, par, os, runparams);
// pit can be changed in TeXEnvironment.
finishEnvironment(os, runparams, data);
}
+ // FIXME: uncomment the content or remove this block
if (pit == runparams.par_end) {
// Make sure that the last paragraph is
// correctly terminated (because TeXOnePar does
// if "auto end" is switched off, explicitly close the language at the end
// 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;
+ Language const * const lastpar_language =
+ paragraphs.at(lastpit).getParLanguage(bparams);
if (maintext && !lyxrc.language_auto_end && !mainlang.empty() &&
- paragraphs.at(lastpit).getParLanguage(bparams)->encoding()->package() != Encoding::CJK) {
+ lastpar_language->encoding()->package() != Encoding::CJK) {
os << from_utf8(subst(lang_end_command,
"$$lang",
mainlang))
<< '\n';
- if (runparams.use_polyglossia)
- popPolyglossiaLang();
+ if (using_begin_end)
+ popLanguageName();
}
// 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
- string const & pol_lang = openPolyglossiaLang(state);
- if (maintext && !is_child && !pol_lang.empty()) {
+ // Likewise for polyglossia or when using begin/end commands
+ // or at the very end of an active branch inset with a language switch
+ Language const * const outer_language = (runparams.local_font != nullptr)
+ ? runparams.local_font->language() : bparams.language;
+ string const & prev_lang = runparams.use_polyglossia
+ ? getPolyglossiaEnvName(outer_language)
+ : outer_language->babel();
+ string const lastpar_lang = runparams.use_polyglossia ?
+ getPolyglossiaEnvName(lastpar_language): lastpar_language->babel();
+ string const & cur_lang = openLanguageName(state);
+ if (((runparams.inbranch && langOpenedAtThisLevel(state) && prev_lang != cur_lang)
+ || (maintext && !is_child)) && !cur_lang.empty()) {
os << from_utf8(subst(lang_end_command,
"$$lang",
- pol_lang))
+ cur_lang))
<< '\n';
- if (runparams.use_polyglossia)
- popPolyglossiaLang();
+ if (using_begin_end)
+ popLanguageName();
+ } else if (runparams.inbranch && !using_begin_end
+ && prev_lang != lastpar_lang && !lastpar_lang.empty()) {
+ // with !using_begin_end, cur_lang is empty, so we need to
+ // compare against the paragraph language (and we are in the
+ // last paragraph at this point)
+ os << subst(lang_begin_command, "$$lang", prev_lang) << '\n';
}
// reset inherited encoding
}
}
-
+// Switch the input encoding for some part(s) of the document.
pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
OutputParams const & runparams, Encoding const & newEnc,
- bool force)
+ bool force, bool noswitchmacro)
{
- // 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())
+ // Never switch encoding with XeTeX/LuaTeX
+ // or if we're in a moving argument or inherit the outer encoding.
+ if (runparams.isFullUnicode() || newEnc.name() == "inherit")
+ return make_pair(false, 0);
+
+ // Only switch for auto-selected legacy encodings (inputenc setting
+ // "auto-legacy" or "auto-legacy-plain").
+ // The "listings" environment can force a switch also with other
+ // encoding settings (it does not support variable width encodings
+ // (utf8, jis, ...) under 8-bit latex engines).
+ if (!force && ((bparams.inputenc != "auto-legacy" && bparams.inputenc != "auto-legacy-plain")
+ || runparams.moving_arg))
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
- bool const from_to_cjk =
- (oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK)
- || (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK);
- if (!force && !from_to_cjk
- && ((bparams.inputenc != "auto" && bparams.inputenc != "default") || moving_arg))
- return make_pair(false, 0);
-
- // Do nothing if the encoding is unchanged.
- if (oldEnc.name() == newEnc.name())
+ // Do not switch, if the encoding is unchanged or switching is not supported.
+ if (oldEnc.name() == newEnc.name()
+ || oldEnc.package() == Encoding::japanese
+ || oldEnc.package() == Encoding::none
+ || newEnc.package() == Encoding::none
+ || runparams.for_search)
return make_pair(false, 0);
-
// FIXME We ignore encoding switches from/to encodings that do
// neither support the inputenc package nor the CJK package here.
- // 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)
- return make_pair(false, 0);
+ // This may fail for characters not supported by "unicodesymbols"
+ // or for non-ASCII characters in "listings"
+ // but it is the best we can do.
+ // change encoding
LYXERR(Debug::LATEX, "Changing LaTeX encoding from "
- << oldEnc.name() << " to " << newEnc.name());
+ << oldEnc.name() << " to " << newEnc.name());
os << setEncoding(newEnc.iconvName());
- if (bparams.inputenc == "default")
- return make_pair(true, 0);
+ if (bparams.inputenc == "auto-legacy-plain")
+ return make_pair(true, 0);
docstring const inputenc_arg(from_ascii(newEnc.latexName()));
OutputState * state = getOutputState();
switch (newEnc.package()) {
case Encoding::none:
case Encoding::japanese:
- // shouldn't ever reach here, see above
+ // shouldn't ever reach here (see above) but avoids warning.
return make_pair(true, 0);
case Encoding::inputenc: {
int count = inputenc_arg.length();
state->open_encoding_ = none;
count += 7;
}
- if (runparams.local_font != 0
+ if (runparams.local_font != nullptr
&& oldEnc.package() == Encoding::CJK) {
// within insets, \inputenc switches need
// to be embraced within \bgroup...\egroup;
count += 7;
state->open_encoding_ = inputenc;
}
- // with the japanese option, inputenc is omitted.
- if (runparams.use_japanese)
+ if (noswitchmacro)
return make_pair(true, count);
os << "\\inputencoding{" << inputenc_arg << '}';
return make_pair(true, count + 16);
os << "\\egroup";
count += 7;
}
- os << "\\begin{CJK}{" << inputenc_arg << "}{"
+ os << "\\begin{CJK}{"
+ << from_ascii(newEnc.latexName()) << "}{"
<< 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
projects / lyx.git / blobdiff