anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.lyx.org:lyx

Browse Source
This commit is contained in:
Kornel Benko 2012-06-23 15:42:10 +02:00
commit 1c7d4c8f6f
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/output_latex.cpp
View File

@ -109,16 +109,16 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
: priorpit->getParLanguage(bparams)) : priorpit->getParLanguage(bparams))
: doc_language; : doc_language;
bool const use_pg = runparams.use_polyglossia; bool const use_polyglossia = runparams.use_polyglossia;
string const par_lang = use_pg ? string const par_lang = use_polyglossia ?
getPolyglossiaEnvName(data.par_language) : data.par_language->babel(); getPolyglossiaEnvName(data.par_language) : data.par_language->babel();
string const prev_par_lang = use_pg ? string const prev_par_lang = use_polyglossia ?
getPolyglossiaEnvName(prev_par_language) : prev_par_language->babel(); getPolyglossiaEnvName(prev_par_language) : prev_par_language->babel();
string const doc_lang = use_pg ? string const doc_lang = use_polyglossia ?
getPolyglossiaEnvName(doc_language) : doc_language->babel(); getPolyglossiaEnvName(doc_language) : doc_language->babel();
string const lang_begin_command = use_pg ? string const lang_begin_command = use_polyglossia ?
"\\begin{$$lang}" : lyxrc.language_command_begin; "\\begin{$$lang}" : lyxrc.language_command_begin;
string const lang_end_command = use_pg ? string const lang_end_command = use_polyglossia ?
"\\end{$$lang}" : lyxrc.language_command_end; "\\end{$$lang}" : lyxrc.language_command_end;
if (par_lang != prev_par_lang) { if (par_lang != prev_par_lang) {
@ -140,7 +140,7 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
lang_begin_command, lang_begin_command,
"$$lang", "$$lang",
par_lang)); par_lang));
if (runparams.use_polyglossia if (use_polyglossia
&& !data.par_language->polyglossiaOpts().empty()) && !data.par_language->polyglossiaOpts().empty())
os << "[" os << "["
<< from_ascii(data.par_language->polyglossiaOpts()) << from_ascii(data.par_language->polyglossiaOpts())
@ -505,18 +505,18 @@ void TeXOnePar(Buffer const & buf,
: outer_language; : outer_language;
bool const use_pg = runparams.use_polyglossia; bool const use_polyglossia = runparams.use_polyglossia;
string const par_lang = use_pg ? string const par_lang = use_polyglossia ?
getPolyglossiaEnvName(par_language): par_language->babel(); getPolyglossiaEnvName(par_language): par_language->babel();
string const prev_lang = use_pg ? string const prev_lang = use_polyglossia ?
getPolyglossiaEnvName(prev_language) : prev_language->babel(); getPolyglossiaEnvName(prev_language) : prev_language->babel();
string const doc_lang = use_pg ? string const doc_lang = use_polyglossia ?
getPolyglossiaEnvName(doc_language) : doc_language->babel(); getPolyglossiaEnvName(doc_language) : doc_language->babel();
string const outer_lang = use_pg ? string const outer_lang = use_polyglossia ?
getPolyglossiaEnvName(outer_language) : outer_language->babel(); getPolyglossiaEnvName(outer_language) : outer_language->babel();
string const lang_begin_command = use_pg ? string const lang_begin_command = use_polyglossia ?
"\\begin{$$lang}" : lyxrc.language_command_begin; "\\begin{$$lang}" : lyxrc.language_command_begin;
string const lang_end_command = use_pg ? string const lang_end_command = use_polyglossia ?
"\\end{$$lang}" : lyxrc.language_command_end; "\\end{$$lang}" : lyxrc.language_command_end;
if (par_lang != prev_lang if (par_lang != prev_lang
@ -549,7 +549,7 @@ void TeXOnePar(Buffer const & buf,
// language paragraph should appear within an \L or \R (in addition // language paragraph should appear within an \L or \R (in addition
// to, outside of, the normal language switch commands). // to, outside of, the normal language switch commands).
// This behavior is not correct for ArabTeX, though. // This behavior is not correct for ArabTeX, though.
if (!runparams.use_polyglossia if (!use_polyglossia
// not for ArabTeX // not for ArabTeX
&& par_language->lang() != "arabic_arabtex" && par_language->lang() != "arabic_arabtex"
&& outer_language->lang() != "arabic_arabtex" && outer_language->lang() != "arabic_arabtex"
@ -586,7 +586,7 @@ void TeXOnePar(Buffer const & buf,
lang_begin_command, lang_begin_command,
"$$lang", "$$lang",
par_lang)); par_lang));
if (runparams.use_polyglossia if (use_polyglossia
&& !par_language->polyglossiaOpts().empty()) && !par_language->polyglossiaOpts().empty())
os << "[" os << "["
<< from_ascii(par_language->polyglossiaOpts()) << from_ascii(par_language->polyglossiaOpts())
@ -752,7 +752,7 @@ void TeXOnePar(Buffer const & buf,
// Closing the language is needed for the last paragraph; it is also // 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 // 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. // necessarily in this paragraph) and are about to close.
bool closing_rtl_ltr_environment = !runparams.use_polyglossia bool closing_rtl_ltr_environment = !use_polyglossia
// not for ArabTeX // not for ArabTeX
&& (par_language->lang() != "arabic_arabtex" && (par_language->lang() != "arabic_arabtex"
&& outer_language->lang() != "arabic_arabtex") && outer_language->lang() != "arabic_arabtex")
@ -781,7 +781,7 @@ void TeXOnePar(Buffer const & buf,
(runparams.isLastPar && runparams.master_language) (runparams.isLastPar && runparams.master_language)
? runparams.master_language ? runparams.master_language
: outer_language; : outer_language;
string const current_lang = runparams.use_polyglossia string const current_lang = use_polyglossia
? getPolyglossiaEnvName(current_language) ? getPolyglossiaEnvName(current_language)
: current_language->babel(); : current_language->babel();
if (!current_lang.empty()) { if (!current_lang.empty()) {