missing lyx2lyx stuff for the fileformat change to 297

 (previous fileformat change to 296 by Richard is not yet described in FORMAT)

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

diff --git a/development/FORMAT b/development/FORMAT
index 118d8c6657052735ffd96b93b93407e070336f33..0a6adfcc381f512cff9a933fad6d6c16ee13e726 100644 (file)
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -1,6 +1,13 @@
 LyX file-format changes
 -----------------------
 
+2007-10-29 Uwe Stöhr <uwestoehr@web.de>
+       * Format incremented to 297: support for Albanian, lower Sorbian,
+         fixed upper Sorbian language
+
+2007-10-?? Richard Heck <rgheck@bobjweil.com>
+       * Format incremented to 296: ??
+
 2007-10-12 Uwe Stöhr <uwestoehr@web.de>
        * Format incremented to 295: get rid of the htmlurl command that was
          needed for docbook, add the option to create a hyperlink instead
@@ -878,5 +885,3 @@ renamed as "size_kind" and "lyxsize_kind" respectively.
 
  \end_inset
 
-
-

diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py
index 495ea3506c446d34e4daa7ab8c8817104c7a84af..066b2f09a94403675f610e72344cb827607fe6f6 100644 (file)
--- a/lib/lyx2lyx/lyx_1_6.py
+++ b/lib/lyx2lyx/lyx_1_6.py
@@ -655,7 +655,7 @@ def revert_include(document):
 
 def revert_albanian(document):
     "Set language Albanian to English"
-    # Set document language from Vietnamese to English
+    # Set document language from Albanian to English
     i = 0
     if document.language == "albanian":
         document.language = "english"
@@ -673,7 +673,7 @@ def revert_albanian(document):
 
 def revert_lowersorbian(document):
     "Set language lower Sorbian to English"
-    # Set document language from Vietnamese to English
+    # Set document language from lower Sorbian to English
     i = 0
     if document.language == "lowersorbian":
         document.language = "english"
@@ -689,6 +689,42 @@ def revert_lowersorbian(document):
         j = j + 1
 
 
+def revert_uppersorbian(document):
+    "Set language uppersorbian to usorbian as this was used in LyX 1.5"
+    # Set document language from uppersorbian to usorbian
+    i = 0
+    if document.language == "uppersorbian":
+        document.language = "usorbian"
+        i = find_token(document.header, "\\language", 0)
+        if i != -1:
+            document.header[i] = "\\language usorbian"
+    j = 0
+    while True:
+        j = find_token(document.body, "\\lang uppersorbian", j)
+        if j == -1:
+            return
+        document.body[j] = document.body[j].replace("\\lang uppersorbian", "\\lang usorbian")
+        j = j + 1
+
+
+def convert_usorbian(document):
+    "Set language uppersorbian to usorbian as this was used in LyX 1.5"
+    # Set document language from uppersorbian to usorbian
+    i = 0
+    if document.language == "usorbian":
+        document.language = "uppersorbian"
+        i = find_token(document.header, "\\language", 0)
+        if i != -1:
+            document.header[i] = "\\language uppersorbian"
+    j = 0
+    while True:
+        j = find_token(document.body, "\\lang usorbian", j)
+        if j == -1:
+            return
+        document.body[j] = document.body[j].replace("\\lang usorbian", "\\lang uppersorbian")
+        j = j + 1
+
+
 ##
 # Conversion hub
 #
@@ -714,10 +750,10 @@ convert = [[277, [fix_wrong_tables]],
            [294, [convert_pdf_options]],
            [295, [convert_htmlurl, convert_url]],
            [296, [convert_include]],
-           [297, []]
+           [297, [convert_usorbian]]
           ]
 
-revert =  [[296, [revert_albanian, revert_lowersorbian]],
+revert =  [[296, [revert_albanian, revert_lowersorbian, revert_uppersorbian]],
            [295, [revert_include]],
            [294, [revert_href]],
            [293, [revert_pdf_options_2]],