anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-19 05:53:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* output_latex:cpp:

Browse Source 
- fix some CJK nesting issues.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@27666 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2008-11-22 16:43:06 +00:00
parent e8da0b0ff7
commit 78129d4511
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/output_latex.cpp
View File

@ -188,8 +188,9 @@ TeXEnvironment(Buffer const & buf,
bool cjk_nested = false;
if (par_language->encoding()->package() == Encoding::CJK &&
open_encoding_ != CJK && pit->isMultiLingual(bparams)) {
os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName())
<< "}{" << from_ascii(bparams.fontsCJK) << "}%\n";
if (prev_par_language->encoding()->package() == Encoding::CJK)
os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName())
<< "}{" << from_ascii(bparams.fontsCJK) << "}%\n";
open_encoding_ = CJK;
cjk_nested = true;
texrow.newline();
@ -668,8 +669,8 @@ TeXOnePar(Buffer const & buf,
if (nextpit != paragraphs.end() && open_encoding_ == CJK &&
(nextpit->getParLanguage(bparams)->encoding()->package() != Encoding::CJK ||
nextpit->layout().isEnvironment() && nextpit->isMultiLingual(bparams))
// in environments, CJK has to be closed later (nesting!)
&& !style.isEnvironment()) {
// inbetween environments, CJK has to be closed later (nesting!)
&& (!style.isEnvironment() || !nextpit->layout().isEnvironment())) {
os << "\\end{CJK}\n";
open_encoding_ = none;
}

2
status.16x
View File

@ -69,6 +69,8 @@ What's new
- Fix export to latex in the presence of an encoding switch (bug 5489).
- Fix nesting of \begin{CJK} and \end{CJK} with other environments.
- Fix export of straight quotes in Hebrew and Greek context.