Fix bug 3313 (unicode error when invoking lyx2lyx) by Anders Ekberg

[lyx.git] / lib / lyx2lyx / LyX.py

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index d0cba1fa0a89083070cf706ef245a964c8c3791e..0a9e44c6d892a43a613c172b27b5ffdb1cf113b5 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -26,8 +26,11 @@ import sys
 import re
 import time
 
-import lyx2lyx_version
-version_lyx2lyx = lyx2lyx_version.version
+try:
+    import lyx2lyx_version
+    version_lyx2lyx = lyx2lyx_version.version
+except: # we are running from build directory so assume the last version
+    version_lyx2lyx = '1.5.0svn'
 
 default_debug_level = 2
 
@@ -73,8 +76,8 @@ format_relation = [("0_06",    [200], generate_minor_versions("0.6" , 4)),
                    ("1_1_6_3", [218], ["1.1.6.3","1.1.6.4","1.1"]),
                    ("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,261), generate_minor_versions("1.5" , 0))]
+                   ("1_4", range(222,246), generate_minor_versions("1.4" , 4)),
+                   ("1_5", range(246,277), generate_minor_versions("1.5" , 0))]
 
 
 def formats_list():
@@ -257,6 +260,7 @@ class LyX_Base:
         " Writes the LyX file to self.output."
         self.set_version()
         self.set_format()
+        self.set_textclass()
         if self.encoding == "auto":
             self.encoding = get_encoding(self.language, self.encoding, self.format, self.cjk_encoding)
 
@@ -364,6 +368,11 @@ class LyX_Base:
         self.header[i] = "\\lyxformat %s" % format
 
 
+    def set_textclass(self):
+        i = find_token(self.header, "\\textclass", 0)
+        self.header[i] = "\\textclass %s" % self.textclass
+
+
     def set_parameter(self, param, value):
         " Set the value of the header parameter."
         i = find_token(self.header, '\\' + param, 0)