X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2Fprefs2prefs_prefs.py;h=6bbb8ac0bc5471b74d3c5ec2c5f9cc9ced2826c4;hb=92c4bb46828941a36cb464bb2202607fe2abb934;hp=9776cfeb453957379da5ac4c971392e2c0e6afe0;hpb=41740ea915ee7a95206d780b6256e660cef39c6e;p=lyx.git

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 9776cfeb45..6bbb8ac0bc 100644
--- 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
@@ -73,6 +73,62 @@
 # 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
+
+# Incremented to format 20, by tommaso
+#   Add options to forbid/ignore 'needauth' option
+#   No conversion necessary.
+
+# Incremented to format 21, by spitz
+#   Add jbibtex_alternatives, allow "automatic" value
+#   of bibtex_command and jbibtex_command (actually the
+#   default now)
+#   No conversion necessary.
+
+# Incremented to format 22, by ef
+#   Add pygmentize_command for the python pygments syntax highlighter
+#   No conversion necessary.
+
+# Incremented to format 23, by spitz
+#   Add default_platex_view_format, a default output format for
+#   Japanese documents via pLaTeX.
+#   No conversion necessary.
+
+# 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.
 
@@ -122,10 +178,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,9 +385,62 @@ 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
 ####################################
 
+
+#################################
+# Conversions from LyX 2.2 to 2.3
+
+def rename_collapsible(line):
+	return simple_renaming(line, "\\set_color \"collapsable", "\\set_color \"collapsible")
+
+# End conversions for LyX 2.2 to 2.3
+####################################
+
+
+#################################
+# Conversions from LyX 2.3 to 2.4
+
+def remove_use_qimage(line):
+	if not line.lower().startswith("\\use_qimage "):
+		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
+####################################
+
+
+
+############################################################
+# Format-conversion map. Also add empty format changes here.
+
 conversions = [
 	[  1, [ # there were several conversions for format 1
 		export_menu,
@@ -355,5 +464,20 @@ conversions = [
 	[ 14, []],
 	[ 15, []],
 	[ 16, [remove_force_paint_single_char]],
-	[ 17, [remove_rtl]]
+	[ 17, [remove_rtl]],
+	[ 18, []],
+	[ 19, [remove_print_support]],
+	[ 20, []],
+	[ 21, []],
+	[ 22, []],
+	[ 23, []],
+	[ 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, []]
 ]