Collapsable -> Collapsible (part 5)

Preferences update and prefs2prefs routine.

This was forgotten in the process.

diff --git a/lib/configure.py b/lib/configure.py
index 6c32a80f842b30c5d844906923fa60f682497462..32216d75b2150298b12e9c5e1e6ce4bef7c81c2c 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1790,7 +1790,7 @@ if __name__ == '__main__':
     lyx_check_config = True
     lyx_kpsewhich = True
     outfile = 'lyxrc.defaults'
-    lyxrc_fileformat = 23
+    lyxrc_fileformat = 24
     rc_entries = ''
     lyx_keep_temps = False
     version_suffix = ''

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 77f3fd8106a711e46eb8b36b42cb617225f3377b..c510be60315b57b746c8e67ca688504c1058a25b 100644 (file)
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -99,6 +99,9 @@
 #   Japanese documents via pLaTeX.
 #   No conversion necessary.
 
+# Incremented to format 24, by spitz
+#   Rename collapsable to collapsible
+
 # NOTE: The format should also be updated in LYXRC.cpp and
 # in configure.py.
 
@@ -372,7 +375,8 @@ def remove_print_support(line):
 #################################
 # Conversions from LyX 2.2 to 2.3
 
-# Only format changes that don't require conversion
+def rename_collapsible(line):
+       return simple_renaming(line, "\\set_color \"collapsable", "\\set_color \"collapsible")
 
 # End conversions for LyX 2.2 to 2.3
 ####################################
@@ -410,5 +414,6 @@ conversions = [
        [ 20, []],
        [ 21, []],
        [ 22, []],
-       [ 23, []]
+       [ 23, []],
+       [ 24, [rename_collapsible]]
 ]

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index e98eae5cf08cd3110e510e2e4d4c3df965a9d030..7cfa2a3445b1924f0ff547e206ddfbf566325b63 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -59,7 +59,7 @@ namespace {
 
 // The format should also be updated in configure.py, and conversion code
 // should be added to prefs2prefs_prefs.py.
-static unsigned int const LYXRC_FILEFORMAT = 23; // spitz: default_platex_view_format
+static unsigned int const LYXRC_FILEFORMAT = 24; // spitz: rename collapsible
 
 // when adding something to this array keep it sorted!
 LexerKeyword lyxrcTags[] = {