X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2Fprefs2prefs_prefs.py;h=68b4d837dc2bdd01e6702999c3d6cd4c4e0c5a9c;hb=933a7dee00aed0401c7b0a6f4adf222f6b46ab86;hp=c8497fa3ebe2b5b7d3dd14abcd1d6be6f4abe306;hpb=6eb0b47a8a67ce4f5efa48a282dff298957d3c25;p=lyx.git

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index c8497fa3eb..68b4d837dc 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # file prefs2prefs-prefs.py
@@ -53,6 +52,51 @@
 # Incremented to format 11, by gb
 #   Split pdf format into pdf and pdf6
 
+# Incremented to format 12, by vfr
+#   Add option to use the system's theme icons
+#   No conversion necessary.
+
+# Incremented to format 13, by bh
+#   Rename mac_like_word_movement to mac_like_cursor_movement
+
+# Incremented to format 14, by spitz
+#   New RC default_otf_view_format
+#   No conversion necessary.
+
+# Incremented to format 15, by prannoy
+#   Add fullscreen_statusbar
+#   No conversion necessary.
+
+# Incremented to format 16, by lasgouttes
+#  Remove force_paint_single_char rc.
+
+# 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.
+
+# NOTE: The format should also be updated in LYXRC.cpp and
+# in configure.py.
+
 import re
 
 ###########################################################
@@ -99,10 +143,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):
@@ -239,6 +283,8 @@ def add_mime_types(line):
 		converted = converted + '       ""'
 	return (True, converted)
 
+re_converter = re.compile(r'^\\converter\s+', re.IGNORECASE)
+
 def split_pdf_format(line):
 	# strictly speaking, a new format would not require to bump the
 	# version number, but the old pdf format was hardcoded at several
@@ -259,7 +305,7 @@ def split_pdf_format(line):
 		if entries[1] == 'pdf':
 			converted = line + "\n" + entries[0] + ' pdf6 "' + entries[2] + '"'
 			return (True, converted)
-	elif line.lower().startswith("\\converter"):
+	elif re_converter.match(line):
 		entries = get_format(line)
 		# The only converter from pdf that is touched is pdf->eps:
 		# All other converters are likely meant for further processing on export.
@@ -284,11 +330,40 @@ def remove_default_language(line):
 		return no_match
 	return (True, "")
 
+def mac_cursor_movement(line):
+	return simple_renaming(line, "\\mac_like_word_movement", "\\mac_like_cursor_movement")
 
 # End conversions for LyX 2.0 to 2.1
 ####################################
 
 
+#################################
+# Conversions from LyX 2.1 to 2.2
+
+def remove_force_paint_single_char(line):
+	if not line.lower().startswith("\\force_paint_single_char"):
+		return no_match
+	return (True, "")
+
+def remove_rtl(line):
+	if not line.lower().startswith("\\rtl "):
+		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 = [
 	[  1, [ # there were several conversions for format 1
 		export_menu,
@@ -306,5 +381,16 @@ conversions = [
 	[ 8, []],
 	[ 9, [ remove_default_language ]],
 	[ 10, []],
-	[ 11, [split_pdf_format]]
+	[ 11, [split_pdf_format]],
+	[ 12, []],
+	[ 13, [mac_cursor_movement]],
+	[ 14, []],
+	[ 15, []],
+	[ 16, [remove_force_paint_single_char]],
+	[ 17, [remove_rtl]],
+	[ 18, []],
+	[ 19, [remove_print_support]],
+	[ 20, []],
+	[ 21, []],
+	[ 22, []]
 ]