Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / lib / scripts / prefs2prefs_prefs.py

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 8d02f711e37317731057df1ab9acc4f830a396a1..977d2612bc254a64ad59d0db0896cdd08f139c28 100644 (file)
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# file prefs2prefs-lfuns.py
+# file prefs2prefs-prefs.py
 # This file is part of LyX, the document processor.
 # Licence details can be found in the file COPYING.
 
@@ -41,6 +41,14 @@
 
 # Incremented to format 8, 288c1e0f by rgh
 #   Add "nice" flag for converters
+#   No conversion necessary.
+
+# Incremented to format 9, a18af620 by spitz
+#  Remove default_language rc.
+
+# Incremented to format 10, 4985015 by tommaso
+#  Add close_buffer_with_last_view in preferences.
+#  No conversion necessary.
 
 import re
 
@@ -83,8 +91,8 @@ def simple_renaming(line, old, new):
 
 no_match = (False, [])
 
-########################
-### Format 1 conversions
+######################################
+### Format 1 conversions (for LyX 2.0)
 
 def remove_obsolete(line):
        tags = ("\\use_tempdir", "\\spell_command", "\\personal_dictionary",
@@ -98,6 +106,7 @@ def remove_obsolete(line):
                        return (True, "")
        return no_match
 
+
 def language_use_babel(line):
        if not line.lower().startswith("\language_use_babel"):
                return no_match
@@ -110,9 +119,11 @@ def language_use_babel(line):
        newline = "\\language_package_selection " + newval
        return (True, newline)
 
+
 def language_package(line):
        return simple_renaming(line, "\\language_package", "\\language_custom_package")
 
+
 lfre = re.compile(r'^\\converter\s+"?(\w+)"?\s+"?(\w+)"?\s+"([^"]*?)"\s+"latex"', re.IGNORECASE)
 def latex_flavor(line):
        if not line.lower().startswith("\\converter"):
@@ -137,6 +148,7 @@ def latex_flavor(line):
        return (True,
                "\\converter \"%s\" \"%s\" \"%s\" \"latex=%s\"" % (conv, fmat, args, flavor))
 
+
 emre = re.compile(r'^\\format\s+(.*)\s+"(document[^"]*?)"', re.IGNORECASE)
 def export_menu(line):
        if not line.lower().startswith("\\format"):
@@ -149,6 +161,11 @@ def export_menu(line):
        return (True,
                "\\Format %s \"%s,menu=export\"" % (fmat, opts))
 
+# End format 1 conversions (for LyX 2.0)
+########################################
+
+#################################
+# Conversions from LyX 2.0 to 2.1
 zipre = re.compile(r'^\\format\s+("?dia"?\s+.*)\s+"([^"]*?)"', re.IGNORECASE)
 def zipped_native(line):
        if not line.lower().startswith("\\format"):
@@ -219,12 +236,18 @@ def add_mime_types(line):
                converted = converted + '       ""'
        return (True, converted)
 
+def remove_default_language(line):
+       if not line.lower().startswith("\\default_language"):
+               return no_match
+       return (True, "")
+
 
-########################
+# End conversions for LyX 2.0 to 2.1
+####################################
 
 
 conversions = [
-       [  1, [ # this will be a long list of conversions to format 1
+       [  1, [ # there were several conversions for format 1
                export_menu,
                latex_flavor,
                remove_obsolete,
@@ -237,5 +260,7 @@ conversions = [
        [ 5, []],
        [ 6, []],
        [ 7, [add_mime_types]],
-       [ 8, []]
+       [ 8, []],
+       [ 9, [ remove_default_language ]],
+       [ 10, []]
 ]