}
-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;
"\\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);
}
}
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;
} // namespace anon
-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 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.
"\\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());
+ || (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() &&
- (!use_polyglossia || !style.isEnvironment()))
+ (!using_begin_end || !style.isEnvironment()))
{
os << from_ascii(subst(lang_end_command,
"$$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"
}
// With CJK, the CJK tag has to be closed first (see below)
if (runparams.encoding->package() != Encoding::CJK
- && par_lang != openPolyglossiaLang(state)
+ && 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 (use_polyglossia)
- pushPolyglossiaLang(par_lang, localswitch);
+ if (using_begin_end)
+ pushLanguageName(par_lang, localswitch);
}
}
}
}
// 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);
+ 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:");
&& 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;
break;
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;
}
}
// 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")
if (closing_rtl_ltr_environment
|| ((runparams.isLastPar || close_lang_switch)
- && (par_lang != outer_lang || (use_polyglossia
+ && (par_lang != outer_lang || (using_begin_end
&& style.isEnvironment()
&& par_lang != nextpar_lang)))) {
// Since \selectlanguage write the language to the aux file,
? 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())
os << bc;
pending_newline = !localswitch;
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))
{
- if (use_polyglossia && !localswitch)
+ if (using_begin_end && !localswitch)
os << breakln;
os << from_ascii(subst(
lang_end_command,
par_lang));
pending_newline = !localswitch;
unskip_newline = !localswitch;
- if (use_polyglossia)
- popPolyglossiaLang();
+ if (using_begin_end)
+ popLanguageName();
}
}
}
// 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
: 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();
// 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;
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 (runparams.use_polyglossia)
- popPolyglossiaLang();
+ 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
- string const & pol_lang = openPolyglossiaLang(state);
- if (maintext && !is_child && !pol_lang.empty()) {
+ // 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",
- pol_lang))
+ cur_lang))
<< '\n';
- if (runparams.use_polyglossia)
- popPolyglossiaLang();
+ if (using_begin_end)
+ popLanguageName();
}
// reset inherited encoding
projects / lyx.git / blobdiff