Fix grammar

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

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 159b0207ad582603fa4b39b8249dfc4f0e4967f9..06790723768a21f8a368ae934f2fe6b90201310b 100644 (file)
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -99,11 +99,23 @@
 #   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 25, by spitz
-#   Rename collapsable to collapsible
+# 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
 
 # NOTE: The format should also be updated in LYXRC.cpp and
 # in configure.py.
@@ -379,7 +391,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
 ####################################
@@ -393,8 +406,20 @@ def remove_use_qimage(line):
                return no_match
        return (True, "")
 
-def rename_collapsible(line):
-       return simple_renaming(line, "\\set_color \"collapsable", "\\set_color \"collapsible")
+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
 ####################################
@@ -434,6 +459,10 @@ conversions = [
        [ 21, []],
        [ 22, []],
        [ 23, []],
-       [ 24, [remove_use_qimage]],
-       [ 25, [rename_collapsible]]
+       [ 24, [rename_collapsible]],
+       [ 25, [remove_use_qimage]],
+       [ 26, [remove_font_encoding]],
+       [ 27, []],
+       [ 28, [remove_date_insert_format]],
+       [ 29, [remove_use_pixmap_cache]]
 ]