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 a5e9e340b950d9930aec7765e2bb75cc33b3a497..5d4a769b4667906c427afcbca76c182bcee2ced2 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.
 
@@ -39,6 +39,10 @@
 # Incremented to format 7, r40789 by gb
 #   Add mime type to file format
 
+# Incremented to format 8, 288c1e0f by rgh
+#   Add "nice" flag for converters
+#   No conversion necessary.
+
 import re
 
 ###########################################################
@@ -80,8 +84,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",
@@ -95,6 +99,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
@@ -107,9 +112,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"):
@@ -134,6 +141,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"):
@@ -146,6 +154,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"):
@@ -216,22 +229,23 @@ def add_mime_types(line):
                converted = converted + '       ""'
        return (True, converted)
 
-
-########################
+# 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,
                language_use_babel,
                language_package
        ]],
-       [  2, []],
-       [  3, [ zipped_native ]],
-       [  4, [ remove_default_papersize ]],
-       [  5, []],
-       [  6, []],
-       [  7, [add_mime_types]],
+       [ 2, []],
+       [ 3, [ zipped_native ]],
+       [ 4, [ remove_default_papersize ]],
+       [ 5, []],
+       [ 6, []],
+       [ 7, [add_mime_types]],
+       [ 8, []]
 ]