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

Back to CJK sanity I: Fix bug 4698 and 4696.

Browse Source 
* lib/encodings:
* src/support/docstream.h:
	- JIS is not a valid iconv name. Rename to ISO-2022-JP

* src/output_latex.cpp:
	- fix wrong encoding switch.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25510 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2008-07-09 07:21:02 +00:00
parent 30f68a732b
commit 612e52b093
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/encodings
View File

@ -150,7 +150,7 @@ Encoding gbk GBK GBK variable CJK
End End
# For japanese # For japanese
Encoding jis JIS JIS variable CJK Encoding jis JIS ISO-2022-JP variable CJK
End End
# For korean # For korean

2
src/output_latex.cpp
View File

@ -700,10 +700,10 @@ TeXOnePar(Buffer const & buf,
// the inset, and we're using "auto" or "default" encoding, the encoding // the inset, and we're using "auto" or "default" encoding, the encoding
// should be set back to that local_font's encoding. // should be set back to that local_font's encoding.
if (nextpit == paragraphs.end() && runparams_in.local_font != 0 if (nextpit == paragraphs.end() && runparams_in.local_font != 0
&& runparams_in.encoding != runparams_in.local_font->language()->encoding()
&& (bparams.inputenc == "auto" || bparams.inputenc == "default")) { && (bparams.inputenc == "auto" || bparams.inputenc == "default")) {
runparams_in.encoding = runparams_in.local_font->language()->encoding(); runparams_in.encoding = runparams_in.local_font->language()->encoding();
os << setEncoding(runparams_in.encoding->iconvName()); os << setEncoding(runparams_in.encoding->iconvName());
} }
// Otherwise, the current encoding should be set for the next paragraph. // Otherwise, the current encoding should be set for the next paragraph.
else else

6
src/support/docstream.cpp
View File

@ -220,14 +220,14 @@ protected:
encoding_ == "GB" || encoding_ == "GB" ||
encoding_ == "EUC-TW") encoding_ == "EUC-TW")
return 4; return 4;
else if (encoding_ == "EUC-JP") else if (encoding_ == "EUC-JP" ||
encoding_ == "ISO-2022-JP")
return 3; return 3;
else if (encoding_ == "BIG5" || else if (encoding_ == "BIG5" ||
encoding_ == "EUC-KR" || encoding_ == "EUC-KR" ||
encoding_ == "EUC-CN" || encoding_ == "EUC-CN" ||
encoding_ == "SJIS" || encoding_ == "SJIS" ||
encoding_ == "GBK" || encoding_ == "GBK")
encoding_ == "JIS" )
return 2; return 2;
else else
return 1; return 1;