X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flyx2lyx%2FLyX.py;h=7e0276199b07d9f3c5b60fb27927942b076d0c1d;hb=9da74fe2078e24e1e7891784ecbfe33ff77e7f85;hp=9a1147565a88ff9aea51bb2d10309644b568721d;hpb=c0c780d71951030f037039d01c9e03f668eac201;p=lyx.git

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 9a1147565a..7e0276199b 100644
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -1,5 +1,6 @@
 # This file is part of lyx2lyx
 # -*- coding: utf-8 -*-
+# Copyright (C) 2002-2011 The LyX Team
 # Copyright (C) 2002-2004 Dekel Tsur <dekel@lyx.org>
 # Copyright (C) 2002-2006 José Matos <jamatos@lyx.org>
 #
@@ -15,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 " The LyX module has all the rules related with different lyx file formats."
 
@@ -32,7 +33,7 @@ try:
     import lyx2lyx_version
     version__ = lyx2lyx_version.version
 except: # we are running from build directory so assume the last version
-    version__ = '2.0.0svn'
+    version__ = '2.1'
 
 default_debug__ = 2
 
@@ -80,8 +81,10 @@ format_relation = [("0_06",    [200], minor_versions("0.6" , 4)),
                    ("1_3",     [221], minor_versions("1.3" , 7)),
                    ("1_4", range(222,246), minor_versions("1.4" , 5)),
                    ("1_5", range(246,277), minor_versions("1.5" , 7)),
-                   ("1_6", range(277,346), minor_versions("1.6" , 0)),
-                   ("2_0",     [],    minor_versions("2.0", 0))]
+                   ("1_6", range(277,346), minor_versions("1.6" , 10)),
+                   ("2_0", range(347,414), minor_versions("2.0", 0)),
+                   ("2_1",     [], minor_versions("2.1", 0))
+                  ]
 
 ####################################################################
 # This is useful just for development versions                     #
@@ -124,7 +127,11 @@ def format_info():
 
 def get_end_format():
     " Returns the more recent file format available."
-    return format_relation[-1][1][-1]
+    # this check will fail only when we have a new version
+    # and there is no format change yet.
+    if format_relation[-1][1]:
+      return format_relation[-1][1][-1]
+    return format_relation[-2][1][-1]
 
 
 def get_backend(textclass):
@@ -323,6 +330,8 @@ class LyX_base:
         self.initial_version = self.read_version()
 
         # Second pass over header and preamble, now we know the file encoding
+        # Do not forget the textclass (Debian bug #700828)
+        self.textclass = self.textclass.decode(self.encoding)
         for i in range(len(self.header)):
             self.header[i] = self.header[i].decode(self.encoding)
         for i in range(len(self.preamble)):
@@ -628,6 +637,8 @@ class LyX_base:
         return mode, steps
 
 
+# Part of an unfinished attempt to make lyx2lyx gave a more
+# structured view of the document.
 #    def get_toc(self, depth = 4):
 #        " Returns the TOC of this LyX document."
 #        paragraphs_filter = {'Title' : 0,'Chapter' : 1, 'Section' : 2,
@@ -754,6 +765,8 @@ class File(LyX_base):
 #        self.body.extend(['','\\end_body', '\\end_document'])
 
 
+# Part of an unfinished attempt to make lyx2lyx gave a more
+# structured view of the document.
 #class Paragraph:
 #    # unfinished implementation, it is missing the Text and Insets
 #    # representation.