The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit e7d1e5b0c96d14802ac1a157da95d6dfe2954860
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Sun Jun 24 14:39:57 2012 +0200

    tex2lyx comment corrections
    
    tex2lyx/Preamble.cpp, tex2lyx/text.cpp: add info about CJK languages

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 2f2499b..2331721 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -44,9 +44,10 @@ Preamble preamble;
 
 namespace {
 
-//add these to known_languages when updating to lyxformat 268:
-//"chinese-simplified", "chinese-traditional", "japanese", "korean"
-// This requires first that support for CJK languages is added: bug #4377.
+// "chinese-simplified", "chinese-traditional", "japanese-cjk", "korean"
+// cannot be supported because it is impossible to determine the correct 
document
+// language if CJK is used.
+// FIXME: missing support for "japanese" (non-CJK)
 /**
  * known babel language names (including synonyms)
  * not in standard babel: arabic, arabtex, armenian, belarusian, 
serbian-latin, thai
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index add0541..8ebed0f 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -159,7 +159,7 @@ const char * const supported_CJK_encodings[] = {
 "EUC-JP", "KS", "GB", "UTF8", 0};
 
 /**
- * the same as supported_CJK_encodings with .lyx names
+ * the same as supported_CJK_encodings with their corresponding LyX language 
name
  * please keep this in sync with supported_CJK_encodings line by line!
  */
 const char * const coded_supported_CJK_encodings[] = {

-----------------------------------------------------------------------

Summary of changes:
 src/tex2lyx/Preamble.cpp |    7 ++++---
 src/tex2lyx/text.cpp     |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to