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

tex2lyx: fix some issues spotted by Vincent

Browse Source
This commit is contained in:
Uwe Stöhr 2012-06-27 02:52:09 +02:00
parent 6ea89fa255
commit 62db3d535d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tex2lyx/Preamble.cpp
View File

@ -754,7 +754,7 @@ void Preamble::handle_package(Parser &p, string const & name,
else if (name == "CJK") { else if (name == "CJK") {
// It is impossible to determine the document language if CJK is used. // It is impossible to determine the document language if CJK is used.
// All we can do is to notify the user that he has to set this by hisself. // All we can do is to notify the user that he has to set this by himself.
have_CJK = true; have_CJK = true;
// set the encoding to "auto" because it might be set to "default" by the babel handling // set the encoding to "auto" because it might be set to "default" by the babel handling
// and this would not be correct for CJK // and this would not be correct for CJK

5
src/tex2lyx/text.cpp
View File

@ -1472,7 +1472,7 @@ void parse_environment(Parser & p, ostream & os, bool outer,
// LyX doesn't support the second argument so if // LyX doesn't support the second argument so if
// this is used we need to output everything as ERT // this is used we need to output everything as ERT
string const mapping = p.getArg('{', '}'); string const mapping = p.getArg('{', '}');
if ( (!mapping.empty() && mapping != " ") if ((!mapping.empty() && mapping != " ")
|| (!is_known(encoding, supported_CJK_encodings))) { || (!is_known(encoding, supported_CJK_encodings))) {
parent_context.check_layout(os); parent_context.check_layout(os);
handle_ert(os, "\\begin{" + name + "}{" + encoding + "}{" + mapping + "}", handle_ert(os, "\\begin{" + name + "}{" + encoding + "}{" + mapping + "}",
@ -1480,7 +1480,6 @@ void parse_environment(Parser & p, ostream & os, bool outer,
// we must parse the content as verbatim because e.g. SJIS can contain // we must parse the content as verbatim because e.g. SJIS can contain
// normally invalid characters // normally invalid characters
string const s = p.plainEnvironment("CJK"); string const s = p.plainEnvironment("CJK");
string::const_iterator it2 = s.begin();
for (string::const_iterator it = s.begin(), et = s.end(); it != et; ++it) { for (string::const_iterator it = s.begin(), et = s.end(); it != et; ++it) {
if (*it == '\\') if (*it == '\\')
handle_ert(os, "\\", parent_context); handle_ert(os, "\\", parent_context);
@ -2113,7 +2112,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
<< "\\begin_layout Plain Layout\n" << "\\begin_layout Plain Layout\n"
<< "This document contains text in Chinese, Japanese or Korean.\n" << "This document contains text in Chinese, Japanese or Korean.\n"
<< " It was therefore impossible for tex2lyx to set the correct document langue for your document." << " It was therefore impossible for tex2lyx to set the correct document langue for your document."
<< " Please set in the document settings by yourself!\n" << " Please set the language manually in the document settings.\n"
<< "\\end_layout\n"; << "\\end_layout\n";
end_inset(os); end_inset(os);
have_CJK = false; have_CJK = false;