Amend bd6d09fc

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

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 8ea20723ab5286bf63106cc7def69d7fd0900c3b..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
@@ -111,6 +111,24 @@
 # 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.
 
@@ -405,6 +423,16 @@ def remove_font_encoding(line):
                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
 ####################################
 
@@ -446,5 +474,10 @@ conversions = [
        [ 24, [rename_collapsible]],
        [ 25, [remove_use_qimage]],
        [ 26, [remove_font_encoding]],
-       [ 27, []]
+       [ 27, []],
+       [ 28, [remove_date_insert_format]],
+       [ 29, [remove_use_pixmap_cache]],
+       [ 30, []],
+       [ 31, []],
+       [ 32, []]
 ]