Author: rgheck
Date: Tue Jan 18 16:37:20 2011
New Revision: 37250
URL: http://www.lyx.org/trac/changeset/37250
Log:
Improve the prefs2prefs scripts a bit.
Modified:
lyx-devel/trunk/lib/scripts/prefs2prefs.py
lyx-devel/trunk/lib/scripts/prefs2prefs_lfuns.py
lyx-devel/trunk/lib/scripts/prefs2prefs_prefs.py
Modified: lyx-devel/trunk/lib/scripts/prefs2prefs.py
==============================================================================
--- lyx-devel/trunk/lib/scripts/prefs2prefs.py Tue Jan 18 16:30:59 2011
(r37249)
+++ lyx-devel/trunk/lib/scripts/prefs2prefs.py Tue Jan 18 16:37:20 2011
(r37250)
@@ -100,7 +100,7 @@
" Writes new format line "
(found, format_line) = find_format_line(lines)
if not found:
- lines.insert(format_line, "Format 1")
+ lines[format_line:format_line] = ("Format 1", "")
return
line = lines[format_line]
@@ -149,15 +149,16 @@
for (opt, param) in options:
if opt == "-l":
- from prefs2prefs_lfuns import conversions,
current_format
+ from prefs2prefs_lfuns import conversions
elif opt == "-p":
- from prefs2prefs_prefs import conversions,
current_format
+ from prefs2prefs_prefs import conversions
if not conversions:
usage()
print "\nNeither -l nor -p given"
sys.exit(1)
+ current_format = len(conversions)
lines = read(source)
format = get_format(lines)
Modified: lyx-devel/trunk/lib/scripts/prefs2prefs_lfuns.py
==============================================================================
--- lyx-devel/trunk/lib/scripts/prefs2prefs_lfuns.py Tue Jan 18 16:30:59
2011 (r37249)
+++ lyx-devel/trunk/lib/scripts/prefs2prefs_lfuns.py Tue Jan 18 16:37:20
2011 (r37250)
@@ -20,8 +20,6 @@
import sys, re
-current_format = 1
-
###########################################################
#
# Actual converter functions
Modified: lyx-devel/trunk/lib/scripts/prefs2prefs_prefs.py
==============================================================================
--- lyx-devel/trunk/lib/scripts/prefs2prefs_prefs.py Tue Jan 18 16:30:59
2011 (r37249)
+++ lyx-devel/trunk/lib/scripts/prefs2prefs_prefs.py Tue Jan 18 16:37:20
2011 (r37250)
@@ -17,8 +17,6 @@
# the new line, if so, which will be used to replace the old line.
-current_format = 1
-
###########################################################
#
# Conversion chain
