From: Richard Heck <rgheck@comcast.net>
Date: Sun, 16 Jan 2011 03:59:43 +0000 (+0000)
Subject: A little more work on prefs2prefs.
X-Git-Tag: 2.0.0~1087
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f97bc9b9e754367c325f04448975993aafb152e7;p=lyx.git

A little more work on prefs2prefs.

More to come, Pavel!



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37225 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/scripts/prefs2prefs.py b/lib/scripts/prefs2prefs.py
index 046c58f36a..bdbc7e327a 100644
--- a/lib/scripts/prefs2prefs.py
+++ b/lib/scripts/prefs2prefs.py
@@ -137,8 +137,8 @@ def main(argv):
 		source = sys.stdin
 		output = sys.stdout
 	elif len(args) == 2:
-		source = open(args[1], 'rb')
-		output = open(args[2], 'wb')
+		source = open(args[0], 'rb')
+		output = open(args[1], 'wb')
 		opened_files = True
 	else:
 		usage()
diff --git a/lib/scripts/prefs2prefs_lfuns.py b/lib/scripts/prefs2prefs_lfuns.py
index 0606736dfd..55a95edc8a 100644
--- a/lib/scripts/prefs2prefs_lfuns.py
+++ b/lib/scripts/prefs2prefs_lfuns.py
@@ -28,8 +28,8 @@ current_format = 1
 #
 # These accept a line as argument and should return a list:
 #  (bool, newline)
-# where the bool indicates whether we changed anything. In 
-# that case, one normally returns: (False, []).
+# where the bool indicates whether we changed anything. If not,
+# one normally returns: (False, []).
 
 no_match = (False, [])
 
diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index f1404614ad..8eb3d2e65a 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -23,8 +23,22 @@ current_format = 1
 #
 # Conversion chain
 
+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")
+  line = line.lstrip()
+  for tag in tags:
+    if line.startswith(tag):
+      return (True, "")
+  return no_match
+
+
 conversions = [
 	[ # this will be a long list of conversions for format 0
-		
+    remove_obsolete
 	] # end conversions for format 0
 ]