#include "Paragraph.h"
#include "ParagraphParameters.h"
#include "TextClass.h"
-#include "TexRow.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetArgument.h"
+#include "frontends/alert.h"
+
#include "support/lassert.h"
#include "support/convert.h"
#include "support/debug.h"
#include "support/lstrings.h"
#include "support/lyxalgo.h"
#include "support/textutils.h"
+#include "support/gettext.h"
#include <QThreadStorage>
#include <list>
+#include <stack>
using namespace std;
using namespace lyx::support;
struct OutputState
{
OutputState() : open_encoding_(none), cjk_inherited_(0),
- prev_env_language_(0), open_polyglossia_lang_("")
+ prev_env_language_(0), nest_level_(0)
{
}
- int open_encoding_;
+ OpenEncoding open_encoding_;
int cjk_inherited_;
Language const * prev_env_language_;
- string open_polyglossia_lang_;
+ int nest_level_;
+ stack<int> lang_switch_depth_; // Both are always empty when
+ stack<string> open_polyglossia_lang_; // not using polyglossia
};
}
+string const & openLanguageName(OutputState const * state)
+{
+ // Return a reference to the last active language opened with
+ // 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;
+
+ return state->open_polyglossia_lang_.empty()
+ ? empty
+ : state->open_polyglossia_lang_.top();
+}
+
+
+bool atSameLastLangSwitchDepth(OutputState const * state)
+{
+ // Return true if the actual nest level is the same at which the
+ // 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
+ : abs(state->lang_switch_depth_.top()) == state->nest_level_;
+}
+
+
+bool isLocalSwitch(OutputState const * state)
+{
+ // Return true if the language was opened by a local command switch.
+
+ return state->lang_switch_depth_.size()
+ && state->lang_switch_depth_.top() < 0;
+}
+
+
+bool langOpenedAtThisLevel(OutputState const * state)
+{
+ // Return true if the language was opened at the current nesting level.
+
+ return state->lang_switch_depth_.size()
+ && abs(state->lang_switch_depth_.top()) == state->nest_level_;
+}
+
+
string const getPolyglossiaEnvName(Language const * lang)
{
string result = lang->polyglossia();
"\\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 &&
!prev_par_lang.empty()) {
os << from_ascii(subst(
prev_par_lang))
// the '%' is necessary to prevent unwanted whitespace
<< "%\n";
+ if (using_begin_end)
+ popLanguageName();
}
+ // If no language was explicitly opened and we are using
+ // 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()
+ ? openLanguageName(state)
+ : doc_lang;
+
if ((lang_end_command.empty() ||
- par_lang != doc_lang) &&
+ par_lang != doc_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 (using_begin_end)
+ pushLanguageName(par_lang);
}
}
}
if (style.isEnvironment()) {
+ state->nest_level_ += 1;
os << "\\begin{" << from_ascii(style.latexname()) << '}';
if (!style.latexargs().empty()) {
OutputParams rp = 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
}
if (data.style->isEnvironment()) {
- os << breakln
- << "\\end{" << from_ascii(data.style->latexname()) << "}\n";
+ os << breakln;
+ 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{"
+ << openLanguageName(state)
+ << "}%\n";
+ }
+ popLanguageName();
+ }
+ }
+ state->nest_level_ -= 1;
+ os << "\\end{" << from_ascii(data.style->latexname()) << "}\n";
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());
}
}
} // namespace anon
+void pushLanguageName(string const & lang_name, bool localswitch)
+{
+ OutputState * state = getOutputState();
+
+ int nest_level = localswitch ? -state->nest_level_ : state->nest_level_;
+ state->lang_switch_depth_.push(nest_level);
+ state->open_polyglossia_lang_.push(lang_name);
+}
+
+
+void popLanguageName()
+{
+ OutputState * state = getOutputState();
+
+ state->lang_switch_depth_.pop();
+ state->open_polyglossia_lang_.pop();
+}
+
+
+string const & openLanguageName()
+{
+ OutputState * state = getOutputState();
+
+ return openLanguageName(state);
+}
+
+
void latexArgInsets(Paragraph const & par, otexstream & os,
OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, string const & prefix)
{
// 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(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}$$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";
+ 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();
+ bool const localswitch = text.inset().forceLocalFontSwitch()
+ || (using_begin_end && text.inset().forcePlainLayout());
if (localswitch) {
lang_begin_command = use_polyglossia ?
"\\text$$lang$$opts{" : lyxrc.language_command_local;
&& priorpar->getDepth() <= par.getDepth())
|| priorpar->getDepth() < par.getDepth())))
{
- if (!lang_end_command.empty() &&
+ if ((!using_begin_end || langOpenedAtThisLevel(state)) &&
+ !lang_end_command.empty() &&
prev_lang != outer_lang &&
- !prev_lang.empty())
+ !prev_lang.empty() &&
+ (!using_begin_end || !style.isEnvironment()))
{
os << from_ascii(subst(lang_end_command,
"$$lang",
prev_lang))
<< lang_command_termination;
+ if (using_begin_end)
+ popLanguageName();
}
// We need to open a new language if we couldn't close the previous
// 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)
+ if ((lang_end_command.empty() || par_lang != outer_lang
+ || (!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
// (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 (!use_polyglossia
+ if (!using_begin_end
// not for ArabTeX
&& par_language->lang() != "arabic_arabtex"
&& outer_language->lang() != "arabic_arabtex"
}
// With CJK, the CJK tag has to be closed first (see below)
if (runparams.encoding->package() != Encoding::CJK
+ && par_lang != openLanguageName(state)
&& !par_lang.empty()) {
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;
+ if (using_begin_end)
+ pushLanguageName(par_lang, localswitch);
}
}
}
// 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,
}
// With CJK, the CJK tag had to be closed first (see above)
if (runparams.encoding->package() == Encoding::CJK
+ && par_lang != openLanguageName(state)
&& !par_lang.empty()) {
os << from_ascii(subst(
lang_begin_command,
"$$lang",
par_lang))
<< lang_command_termination;
+ if (using_begin_end)
+ pushLanguageName(par_lang, localswitch);
}
runparams.encoding = encoding;
}
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.
-
Font const font = par.empty()
? par.getLayoutFont(bparams, outerfont)
: par.getFont(bparams, par.size() - 1, 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) {
+ if (is_command) {
os << '}';
if (!style.postcommandargs().empty())
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());
}
}
bool pending_newline = false;
bool unskip_newline = false;
+ bool close_lang_switch = false;
switch (style.latextype) {
case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
+ if ((nextpar && par_lang != nextpar_lang
+ && nextpar->getDepth() == par.getDepth())
+ || (atSameLastLangSwitchDepth(state) && nextpar
+ && nextpar->getDepth() < par.getDepth()))
+ close_lang_switch = using_begin_end;
if (nextpar && par.params().depth() < nextpar->params().depth())
pending_newline = true;
break;
// 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()))
+ && ((nextpar->layout() != par.layout()
+ || nextpar->params().depth() != par.params().depth())
+ || (!using_begin_end || par_lang != nextpar_lang)))
+ {
+ close_lang_switch = using_begin_end;
break;
+ }
}
// fall through possible
// 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
+ bool closing_rtl_ltr_environment = !using_begin_end
// not for ArabTeX
&& (par_language->lang() != "arabic_arabtex"
&& outer_language->lang() != "arabic_arabtex")
&& 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())))) {
+ || ((runparams.isLastPar || 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)
+ if (pending_newline || close_lang_switch)
os << '\n';
// when the paragraph uses CJK, the language has to be closed earlier
string const current_lang = use_polyglossia
? getPolyglossiaEnvName(current_language)
: current_language->babel();
- if (!current_lang.empty()) {
+ if (!current_lang.empty()
+ && current_lang != openLanguageName(state)) {
string bc = use_polyglossia ?
getPolyglossiaBegin(lang_begin_command, current_lang,
current_language->polyglossiaOpts())
os << bc;
pending_newline = !localswitch;
unskip_newline = !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 language afterwards
- if (style.isEnvironment())
- state->open_polyglossia_lang_ = par_lang;
- else {
+ } 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 != cur_lang
+ || (cur_lang != outer_lang
+ && nextpar
+ && style != nextpar->layout())))
+ || (atSameLastLangSwitchDepth(state)
+ && state->lang_switch_depth_.size()
+ && cur_lang != par_lang))
+ {
+ if (using_begin_end && !localswitch)
+ os << breakln;
os << from_ascii(subst(
lang_end_command,
"$$lang",
par_lang));
pending_newline = !localswitch;
unskip_newline = !localswitch;
+ if (using_begin_end)
+ popLanguageName();
}
}
}
// 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());
}
: 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 (using_begin_end)
+ pushLanguageName(mainlang);
}
ParagraphList const & paragraphs = text.paragraphs();
bool already_title = false;
DocumentClass const & tclass = bparams.documentClass();
+ // Did we already warn about inTitle layout mixing? (we only warn once)
+ bool gave_layout_warning = false;
for (; pit < runparams.par_end; ++pit) {
lastpit = pit;
ParagraphList::const_iterator par = paragraphs.constIterator(pit);
if (layout.intitle) {
if (already_title) {
- LYXERR0("Error in latexParagraphs: You"
- " should not mix title layouts"
- " with normal ones.");
+ if (!gave_layout_warning) {
+ gave_layout_warning = true;
+ frontend::Alert::warning(_("Error in latexParagraphs"),
+ bformat(_("You are using at least one "
+ "layout (%1$s) intended for the title, "
+ "after using non-title layouts. This "
+ "could lead to missing or incorrect output."
+ ), layout.name()));
+ }
} else if (!was_title) {
was_title = true;
if (tclass.titletype() == TITLE_ENVIRONMENT) {
}
// if "auto end" is switched off, explicitly close the language at the end
- // but only if the last par is in a babel language
- string const lang_end_command = runparams.use_polyglossia ?
- "\\end{$$lang}" : lyxrc.language_command_end;
+ // but only if the last par is in a babel or polyglossia language
if (maintext && !lyxrc.language_auto_end && !mainlang.empty() &&
paragraphs.at(lastpit).getParLanguage(bparams)->encoding()->package() != Encoding::CJK) {
os << from_utf8(subst(lang_end_command,
"$$lang",
mainlang))
<< '\n';
+ if (using_begin_end)
+ popLanguageName();
}
// If the last paragraph is an environment, we'll have to close
os << "\\end{CJK}\n";
state->open_encoding_ = none;
}
- // Likewise for polyglossia
- if (maintext && !is_child && state->open_polyglossia_lang_ != "") {
- os << "\\end{" << state->open_polyglossia_lang_ << "}\n";
- state->open_polyglossia_lang_ = "";
+ // Likewise for polyglossia or when using begin/end commands
+ string const & cur_lang = openLanguageName(state);
+ if (maintext && !is_child && !cur_lang.empty()) {
+ os << from_utf8(subst(lang_end_command,
+ "$$lang",
+ cur_lang))
+ << '\n';
+ if (using_begin_end)
+ popLanguageName();
}
// reset inherited encoding
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