X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2Fprefs2prefs_prefs.py;h=d3a70d26574eb9d550530f533c92c63824ee9e64;hb=0b56495e48437bec97117de8c6ac1825a8cf3fb1;hp=68b4d837dc2bdd01e6702999c3d6cd4c4e0c5a9c;hpb=ae561677184931cd3ebdae8c419e9a8c5dd623b1;p=lyx.git

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 68b4d837dc..d3a70d2657 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -4,15 +4,15 @@
 # This file is part of LyX, the document processor.
 # Licence details can be found in the file COPYING.
 
-# author Richard Heck
+# author Richard Kimberly Heck
 
 # Full author contact details are available in file CREDITS
 
 # 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
@@ -94,6 +94,53 @@
 #   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.
+
+# Incremented to format 33, by sanda
+#   Add \citation_search, \citation_search_pattern
+#   and \citation_search_view.
+#   No conversion necessary.
+
+# Incremented to format 34, by yuriy
+#   Rename *.kmap files for Cyrillic languages
+
+# Incremented to format 35, by spitz
+#   \set_color now takes three arguments
+#   \set_color lyxname x11hexname x11darkhexname
+
 # NOTE: The format should also be updated in LYXRC.cpp and
 # in configure.py.
 
@@ -364,6 +411,68 @@ def remove_print_support(line):
 # 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, "")
+
+def rename_cyrillic_kmap_files(line):
+	line = line.lower()
+	if not (line.startswith("\\kbmap_primary ")
+			or line.startswith("\\kbmap_secondary ")):
+		return no_match
+	line = line.replace('"bg-bds-1251"', '"bulgarian"')
+	line = line.replace('"koi8-r"', '"russian"')
+	line = line.replace('"koi8-u"', '"ukrainian"')
+	return (True, line)
+
+def add_dark_color(line):
+	if not line.lower().startswith("\\set_color "):
+		return no_match
+	colre = re.compile(r'^\\set_color\s+("[^"]+")\s+("[^"]+")\s*$', re.IGNORECASE)
+	m = colre.match(line)
+	if not m:
+		return no_match
+	line += " " + m.group(2)
+	return (True, line)
+
+# 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,
@@ -392,5 +501,18 @@ conversions = [
 	[ 19, [remove_print_support]],
 	[ 20, []],
 	[ 21, []],
-	[ 22, []]
+	[ 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, []],
+	[ 33, []],
+	[ 34, [rename_cyrillic_kmap_files]],
+	[ 35, [add_dark_color]]
 ]