Amend bd6d09fc

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

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index b8f69405c402b058e16c5fd987b02925439f031d..6bbb8ac0bc5471b74d3c5ec2c5f9cc9ced2826c4 100644 (file)
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -10,9 +10,9 @@
 
 # This file houses conversion information for the preferences file.
 
-# The converter functions take a line as argument and return a list: 
-#      (Bool, NewLine), 
-# where the Bool says if  we've modified anything and the NewLine is 
+# The converter functions take a line as argument and return a list:
+#      (Bool, NewLine),
+# where the Bool says if  we've modified anything and the NewLine is
 # the new line, if so, which will be used to replace the old line.
 
 # Incremented to format 2, r39670 by jrioux
@@ -99,9 +99,36 @@
 #   Japanese documents via pLaTeX.
 #   No conversion necessary.
 
-# Incremented to format 24, by lasgouttes
+# Incremented to format 24, by spitz
+#   Rename collapsable to collapsible
+
+# Incremented to format 25, by lasgouttes
 #   Remove use_qimage preference
 
+# Incremented to format 26, by spitz
+#   Rename font_encoding preference
+
+# Incremented to format 27, by spitz
+#   Add optional flavor value to needaux flag
+
+# Incremented to format 28, by spitz
+#   Remove date_insert_format
+
+# Incremented to format 29, by lasgouttes
+#   Remove use_pixmap_cache
+
+# Incremented to format 30, by lasgouttes
+#   Add respect_os_kbd_language.
+#   No convergence necessary.
+
+# Incremented to format 31, by spitz
+#   Add ct_additions_underlined.
+#   No convergence necessary.
+
+# Incremented to format 32, by spitz
+#   Add ct_markup_copied.
+#   No convergence necessary.
+
 # NOTE: The format should also be updated in LYXRC.cpp and
 # in configure.py.
 
@@ -376,7 +403,8 @@ def remove_print_support(line):
 #################################
 # Conversions from LyX 2.2 to 2.3
 
-# Only format changes that don't require conversion
+def rename_collapsible(line):
+       return simple_renaming(line, "\\set_color \"collapsable", "\\set_color \"collapsible")
 
 # End conversions for LyX 2.2 to 2.3
 ####################################
@@ -390,6 +418,21 @@ def remove_use_qimage(line):
                return no_match
        return (True, "")
 
+def remove_font_encoding(line):
+       if not line.lower().startswith("\\font_encoding "):
+               return no_match
+       return (True, "")
+
+def remove_date_insert_format(line):
+       if not line.lower().startswith("\\date_insert_format "):
+               return no_match
+       return (True, "")
+
+def remove_use_pixmap_cache(line):
+       if not line.lower().startswith("\\use_pixmap_cache "):
+               return no_match
+       return (True, "")
+
 # End conversions for LyX 2.3 to 2.4
 ####################################
 
@@ -428,5 +471,13 @@ conversions = [
        [ 21, []],
        [ 22, []],
        [ 23, []],
-       [ 24, [remove_use_qimage]]
+       [ 24, [rename_collapsible]],
+       [ 25, [remove_use_qimage]],
+       [ 26, [remove_font_encoding]],
+       [ 27, []],
+       [ 28, [remove_date_insert_format]],
+       [ 29, [remove_use_pixmap_cache]],
+       [ 30, []],
+       [ 31, []],
+       [ 32, []]
 ]