Allow utf8x \inputencoding

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17164 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/FORMAT b/development/FORMAT
index eda72fdd8f9fb7867476a71b388d66ce335f3a19..08f3ed1446dcc90844085b94e64aadee34b66fec 100644 (file)
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -1,6 +1,10 @@
 LyX file-format changes
 -----------------------§
 
+2007-02-13  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * format incremented to 260: Allow utf8x \inputencoding
+
 2007-02-12  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * format incremented to 259:

diff --git a/lib/encodings b/lib/encodings
index 68dce4af552a24a9d70920181f6c51ef975bc5bf..db90f31121d7be5605b4a9c29c0934585ecb196a 100644 (file)
--- a/lib/encodings
+++ b/lib/encodings
@@ -6,6 +6,11 @@
 Encoding utf8 utf8 UTF-8
 End
 
+# This one is used by many CJK packages. utf8 is supposed to be the successor,
+# but does not have all features of utf8x yet.
+Encoding utf8x utf8x UTF-8
+End
+
 Encoding iso8859-1 latin1 ISO-8859-1
 End
 

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 4bd8aae94d6ec1dad88cc5874ab7fda766a69514..d0cba1fa0a89083070cf706ef245a964c8c3791e 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -74,7 +74,7 @@ format_relation = [("0_06",    [200], generate_minor_versions("0.6" , 4)),
                    ("1_2",     [220], generate_minor_versions("1.2" , 4)),
                    ("1_3",     [221], generate_minor_versions("1.3" , 7)),
                    ("1_4", range(222,246), generate_minor_versions("1.4" , 3)),
-                   ("1_5", range(246,260), generate_minor_versions("1.5" , 0))]
+                   ("1_5", range(246,261), generate_minor_versions("1.5" , 0))]
 
 
 def formats_list():

diff --git a/lib/lyx2lyx/lyx_1_5.py b/lib/lyx2lyx/lyx_1_5.py
index deae7fc3b5b3ad3e9cf3799e02ba4e327162d07e..a57282b2561d669f6c60844636e9a0f039e58f33 100644 (file)
--- a/lib/lyx2lyx/lyx_1_5.py
+++ b/lib/lyx2lyx/lyx_1_5.py
@@ -1181,6 +1181,19 @@ def normalize_font_whitespace(document):
 
         i = i + 1
 
+
+def revert_utf8x(document):
+    " Set utf8x encoding to utf8. "
+    i = find_token(document.header, "\\inputencoding", 0)
+    if i == -1:
+        document.header.append("\\inputencoding auto")
+    else:
+        inputenc = get_value(document.header, "\\inputencoding", i)
+        if inputenc == "utf8x":
+            document.header[i] = "\\inputencoding utf8"
+    document.inputencoding = get_value(document.header, "\\inputencoding", 0)
+
+
 ##
 # Conversion hub
 #
@@ -1199,9 +1212,11 @@ convert = [[246, []],
            [256, []],
            [257, [convert_caption]],
            [258, [convert_lyxline]],
-           [259, [convert_accent, normalize_font_whitespace]]]
+           [259, [convert_accent, normalize_font_whitespace]],
+           [260, []]]
 
-revert =  [[258, []],
+revert =  [[259, [revert_utf8x]],
+           [258, []],
            [257, []],
            [256, [revert_caption]],
            [255, [revert_encodings]],

diff --git a/src/buffer.C b/src/buffer.C
index 68a5f8f9dc3bcfc10c76eadc6f20a0ca94b77afd..32e172745f32bd3e640f692919d7ec3802688e1b 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -141,7 +141,7 @@ using std::string;
 
 namespace {
 
-int const LYX_FORMAT = 259;
+int const LYX_FORMAT = 260;
 
 } // namespace anon