From 0fb13b648c2bf418412b8090d21c5801f2638eba Mon Sep 17 00:00:00 2001
From: Julien Rioux <jrioux@lyx.org>
Date: Mon, 12 Sep 2011 20:43:06 +0000
Subject: [PATCH] * prefs2prefs.py : Use a list of [format, conversions] pair.

    Use a list of [int, list of functions] pair, representing
      - int: the format number, and
      - list of functions: what needs to be done to the file to
                           update it to the given format number.

    This matches what is done in lyx2lyx and helps keeping track of
    format numbers and their corresponding conversion routines.

    Also, add another sanity check.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39668 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/scripts/prefs2prefs.py       | 13 ++++++++++---
 lib/scripts/prefs2prefs_lfuns.py |  4 ++--
 lib/scripts/prefs2prefs_prefs.py |  4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/scripts/prefs2prefs.py b/lib/scripts/prefs2prefs.py
index b29bb74528..3026d06163 100644
--- a/lib/scripts/prefs2prefs.py
+++ b/lib/scripts/prefs2prefs.py
@@ -167,17 +167,24 @@ def main(argv):
 	format = get_format(lines)
 
 	while format < current_format:
-		for c in conversions[format]:
+		target_format, convert = conversions[format]
+		old_format = format
+
+		# make sure the conversion list is sequential
+		if int(old_format) + 1 != target_format:
+			sys.stderr.write("Something is wrong with the conversion chain.\n")
+			sys.exit(1)
+
+		for c in convert:
 			for i in range(len(lines)):
 				(update, newline) = c(lines[i])
 				if update:
 					lines[i] = newline
 
 		update_format(lines)
+		format = get_format(lines)
 
 		# sanity check
-		old_format = format
-		format = get_format(lines)
 		if int(old_format) + 1 != int(format):
 			sys.stderr.write("Failed to convert to new format!\n")
 			sys.exit(1)
diff --git a/lib/scripts/prefs2prefs_lfuns.py b/lib/scripts/prefs2prefs_lfuns.py
index 8c334a8c92..1295a7dc30 100644
--- a/lib/scripts/prefs2prefs_lfuns.py
+++ b/lib/scripts/prefs2prefs_lfuns.py
@@ -154,7 +154,7 @@ def Bar2bar(line):
 # Conversion chain
 
 conversions = [
-	[ # this will be a long list of conversions for format 0
+	[  1, [ # this will be a long list of conversions to format 1
 		next_inset_toggle,
 		next_inset_modify,
 		optional_insert,
@@ -165,6 +165,6 @@ conversions = [
 		paragraph_spacing,
 		tabular_feature,
 		Bar2bar
-	] # end conversions for format 0
+	]],
 ]
 
diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 7a2cdd69bc..ae5b5ca0fe 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -101,11 +101,11 @@ def export_menu(line):
 
 
 conversions = [
-	[ # this will be a long list of conversions for format 0
+	[  1, [ # this will be a long list of conversions to format 1
 		export_menu,
 		latex_flavor,
 		remove_obsolete,
 		language_use_babel,
 		language_package
-	] # end conversions for format 0
+	]],
 ]