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

Coding style/de-indent

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36939 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2010-12-18 16:32:29 +00:00
parent 41aa051d22
commit 2ab1601311
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/output_latex.cpp
View File

@ -590,8 +590,8 @@ void TeXOnePar(Buffer const & buf,
// Switch file encoding if necessary; no need to do this for "default" // Switch file encoding if necessary; no need to do this for "default"
// encoding, since this only affects the position of the outputted // encoding, since this only affects the position of the outputted
// \inputencoding command; the encoding switch will occur when necessary // \inputencoding command; the encoding switch will occur when necessary
if (bparams.inputenc == "auto" && if (bparams.inputenc == "auto"
runparams.encoding->package() != Encoding::none) { && runparams.encoding->package() != Encoding::none) {
// Look ahead for future encoding changes. // Look ahead for future encoding changes.
// We try to output them at the beginning of the paragraph, // We try to output them at the beginning of the paragraph,
// since the \inputencoding command is not allowed e.g. in // since the \inputencoding command is not allowed e.g. in
@ -602,9 +602,9 @@ void TeXOnePar(Buffer const & buf,
char_type const c = par.getChar(i); char_type const c = par.getChar(i);
Encoding const * const encoding = Encoding const * const encoding =
par.getFontSettings(bparams, i).language()->encoding(); par.getFontSettings(bparams, i).language()->encoding();
if (encoding->package() != Encoding::CJK && if (encoding->package() != Encoding::CJK
runparams.encoding->package() == Encoding::inputenc && && runparams.encoding->package() == Encoding::inputenc
c < 0x80) && c < 0x80)
continue; continue;
if (par.isInset(i)) if (par.isInset(i))
break; break;
@ -613,13 +613,15 @@ void TeXOnePar(Buffer const & buf,
// encoding to that required by the language of c. // encoding to that required by the language of c.
// With CJK, only add switch if we have CJK content at the beginning // With CJK, only add switch if we have CJK content at the beginning
// of the paragraph // of the paragraph
if (encoding->package() != Encoding::CJK || i == 0) { if (i != 0 && encoding->package() == Encoding::CJK)
continue;
pair<bool, int> enc_switch = switchEncoding(os, bparams, runparams, pair<bool, int> enc_switch = switchEncoding(os, bparams, runparams,
*encoding); *encoding);
// the following is necessary after a CJK environment in a multilingual // the following is necessary after a CJK environment in a multilingual
// context (nesting issue). // context (nesting issue).
if (par_language->encoding()->package() == Encoding::CJK && if (par_language->encoding()->package() == Encoding::CJK
open_encoding_ != CJK && cjk_inherited_ == 0) { && open_encoding_ != CJK && 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"; << "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
open_encoding_ = CJK; open_encoding_ = CJK;
@ -646,7 +648,6 @@ void TeXOnePar(Buffer const & buf,
break; break;
} }
} }
}
runparams.moving_arg |= style.needprotect; runparams.moving_arg |= style.needprotect;
Encoding const * const prev_encoding = runparams.encoding; Encoding const * const prev_encoding = runparams.encoding;