fileformat change for my previous commit: Albanian and lower Sorbian support

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

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 121a453bde90844541953a01d809043169407c13..55754c0a56ffefc4829bb627f8f9ed939f8c3cf8 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -80,7 +80,7 @@ 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" , 2)),
-                   ("1_6", range(277,295), minor_versions("1.6" , 0))] # Pavel pdfoptions
+                   ("1_6", range(277,298), minor_versions("1.6" , 0))] # Uwe: Albanian, lower Sorbian
 
 
 def formats_list():
@@ -178,7 +178,6 @@ class LyX_base:
         self.default_layout = ''
         self.header = []
         self.preamble = []
-        self.manifest = []
         self.body = []
         self.status = 0
         self.encoding = encoding
@@ -203,7 +202,7 @@ class LyX_base:
 
 
     def read(self):
-        """Reads a file into the self.header, self.manifest and
+        """Reads a file into the self.header and
         self.body parts, from self.input."""
 
         while True:
@@ -235,27 +234,6 @@ class LyX_base:
             if check_token(line, '\\end_preamble'):
                 continue
 
-            if check_token(line, '\\begin_manifest'):
-                while 1:
-                    line = self.input.readline()
-                    if not line:
-                        self.error("Invalid LyX file.")
-
-                    line = trim_eol(line)
-                    if check_token(line, "\\end_manifest"):
-                        break
-
-                    if not line.startswith('\\filename') and \
-                       not line.startswith('\\inzipName') and \
-                       not line.startswith('\\embed'):
-                        self.warning("Malformed LyX file: Missing"
-                                     "'\\end_manifest'.")
-
-                    self.manifest.append(line)
-            
-            if check_token(line, '\\end_manifest'):
-                continue
-
             line = line.strip()
             if not line:
                 continue
@@ -311,14 +289,7 @@ class LyX_base:
         else:
             header = self.header
 
-        # LyX file format <= 284 does not have a manifest section
-        # so this section is set to None
-        if self.manifest is None:
-            manifest = []
-        else:
-            manifest = ['\\begin_manifest'] + self.manifest + ['\\end_manifest', '']
-
-        for line in header + [''] + manifest + self.body:
+        for line in header + [''] + self.body:
             self.output.write(line.encode(self.encoding)+"\n")