The way this was previously, it had to fail if the GUI language

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

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 9776cfeb453957379da5ac4c971392e2c0e6afe0..85fa90e0c19cac759cb0323da05ba771e1cabd42 100644 (file)
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -73,6 +73,13 @@
 # Incremented to format 17, by lasgouttes
 #  Remove rtl_support rc.
 
+# Incremented to format 18, by ef
+#   Add option to allow saving the document directory
+#   No conversion necessary.
+
+# Incremented to format 19, by rgh
+#   remove print support
+
 # NOTE: The format should also be updated in LYXRC.cpp and
 # in configure.py.
 
@@ -122,10 +129,10 @@ no_match = (False, [])
 
 def remove_obsolete(line):
        tags = ("\\use_tempdir", "\\spell_command", "\\personal_dictionary",
-                               "\\plaintext_roff_command", "\\use_alt_language", 
-                               "\\use_escape_chars", "\\use_input_encoding",
-                               "\\use_personal_dictionary", "\\use_pspell",
-                               "\\use_spell_lib")
+               "\\plaintext_roff_command", "\\use_alt_language",
+               "\\use_escape_chars", "\\use_input_encoding",
+               "\\use_personal_dictionary", "\\use_pspell",
+               "\\use_spell_lib")
        line = line.lower().lstrip()
        for tag in tags:
                if line.lower().startswith(tag):
@@ -329,6 +336,17 @@ def remove_rtl(line):
                return no_match
        return (True, "")
 
+def remove_print_support(line):
+       tags = ("\\printer", "\\print_adapt_output", "\\print_command",
+               "\\print_evenpage_flag", "\\print_oddpage_flag", "\\print_pagerange_flag",
+               "\\print_copies_flag", "\\print_collcopies_flag", "\\print_reverse_flag",
+               "\\print_to_printer", "\\print_to_file", "\\print_file_extension")
+       line = line.lower().lstrip()
+       for tag in tags:
+               if line.lower().startswith(tag):
+                       return (True, "")
+       return no_match
+
 # End conversions for LyX 2.1 to 2.2
 ####################################
 
@@ -355,5 +373,7 @@ conversions = [
        [ 14, []],
        [ 15, []],
        [ 16, [remove_force_paint_single_char]],
-       [ 17, [remove_rtl]]
+       [ 17, [remove_rtl]],
+       [ 18, []],
+       [ 19, [remove_print_support]]
 ]