X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2Fprefs2prefs_prefs.py;h=5e7c0bf62795c1c9ebf8e1bb7799aed73776cd58;hb=e5fc7327e398c6b243113f6a8f624ed917287ee4;hp=ff24273192c0d76fac26d5dfcafbc6e243dc0ca2;hpb=4f4383cac59f52decba400f2c78e267f7bb162e3;p=lyx.git

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index ff24273192..5e7c0bf627 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -94,9 +94,26 @@
 #   Add pygmentize_command for the python pygments syntax highlighter
 #   No conversion necessary.
 
-# Incremented to format 23, by lasgouttes
+# 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
+
 # NOTE: The format should also be updated in LYXRC.cpp and
 # in configure.py.
 
@@ -368,6 +385,16 @@ def remove_print_support(line):
 ####################################
 
 
+#################################
+# 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
 
@@ -376,11 +403,24 @@ 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, "")
+
 # 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,
@@ -410,5 +450,10 @@ conversions = [
 	[ 20, []],
 	[ 21, []],
 	[ 22, []],
-        [ 23, [remove_use_qimage]]
+	[ 23, []],
+	[ 24, [rename_collapsible]],
+	[ 25, [remove_use_qimage]],
+	[ 26, [remove_font_encoding]],
+	[ 27, []],
+	[ 28, [remove_date_insert_format]]
 ]