The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 62db3d535d4d0ef76214bda575b7dc0407103919
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Wed Jun 27 02:52:09 2012 +0200
tex2lyx: fix some issues spotted by Vincent
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index e4dc488..dc258ea 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -754,7 +754,7 @@ void Preamble::handle_package(Parser &p, string const &
name,
else if (name == "CJK") {
// 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;
// set the encoding to "auto" because it might be set to
"default" by the babel handling
// and this would not be correct for CJK
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 6d32c8b..2962cff 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -1472,7 +1472,7 @@ void parse_environment(Parser & p, ostream & os, bool
outer,
// LyX doesn't support the second argument so if
// this is used we need to output everything as ERT
string const mapping = p.getArg('{', '}');
- if ( (!mapping.empty() && mapping != " ")
+ if ((!mapping.empty() && mapping != " ")
|| (!is_known(encoding, supported_CJK_encodings))) {
parent_context.check_layout(os);
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
// normally invalid characters
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) {
if (*it == '\\')
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"
<< "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."
- << " Please set in the document settings by yourself!\n"
+ << " Please set the language manually in the document
settings.\n"
<< "\\end_layout\n";
end_inset(os);
have_CJK = false;
-----------------------------------------------------------------------
Summary of changes:
src/tex2lyx/Preamble.cpp | 2 +-
src/tex2lyx/text.cpp | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
hooks/post-receive
--
The LyX Source Repository
