whitespace.

[lyx.git] / lib / scripts / prefs2prefs_prefs.py

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 996f9ee28ec865268bf8031060a520ccc02a6cd6..ff3183696f7bcb422d948bb3eb1296ccee48159f 100644 (file)
--- 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,41 @@
 # 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.
+
+# NOTE: The format should also be updated in LYXRC.cpp and
+# in configure.py.
+
 import re
 
 ###########################################################
@@ -77,7 +111,7 @@ def get_format(line):
                        return entries
                elif not line[i].isspace():
                        beg = i
-                       while not line[i].isspace():
+                       while i < len(line) and not line[i].isspace():
                                i = i + 1
                        end = i
                        entries.append(line[beg:end])
@@ -99,10 +133,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 +273,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,14 +295,15 @@ 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.
                # The only converter to pdf that stays untouched is dvi->pdf:
                # All other converters are likely meant for graphics.
-               if (entries[1] == 'pdf' and entries[2] == 'eps') or \
-                  (entries[1] != 'ps'  and entries[2] == 'pdf'):
+               if len(entries) > 2 and \
+                  ((entries[1] == 'pdf' and entries[2] == 'eps') or \
+                  (entries[1] != 'ps'  and entries[2] == 'pdf')):
                        if entries[1] == 'pdf':
                                converted = entries[0] + ' pdf6 ' + entries[2]
                        else:
@@ -283,11 +320,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,
@@ -305,5 +371,14 @@ 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, []]
 ]