commit 891a7ef79f9b42e638ccd254a4681f9e8532ca8f
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Thu Nov 2 16:26:45 2017 +0100
Collapsable -> Collapsible (part 5)
Preferences update and prefs2prefs routine.
This was forgotten in the process.
---
lib/configure.py | 2 +-
lib/scripts/prefs2prefs_prefs.py | 9 ++++++++-
src/LyXRC.cpp | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/lib/configure.py b/lib/configure.py
index 63b88f7..6cbb73d 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1794,7 +1794,7 @@ if __name__ == '__main__':
lyx_check_config = True
lyx_kpsewhich = True
outfile = 'lyxrc.defaults'
- lyxrc_fileformat = 24
+ lyxrc_fileformat = 25
rc_entries = ''
lyx_keep_temps = False
version_suffix = ''
diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index b8f6940..159b020 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -102,6 +102,9 @@
# Incremented to format 24, by lasgouttes
# Remove use_qimage preference
+# Incremented to format 25, by spitz
+# Rename collapsable to collapsible
+
# NOTE: The format should also be updated in LYXRC.cpp and
# in configure.py.
@@ -390,6 +393,9 @@ def remove_use_qimage(line):
return no_match
return (True, "")
+def rename_collapsible(line):
+ return simple_renaming(line, "\\set_color \"collapsable", "\\set_color
\"collapsible")
+
# End conversions for LyX 2.3 to 2.4
####################################
@@ -428,5 +434,6 @@ conversions = [
[ 21, []],
[ 22, []],
[ 23, []],
- [ 24, [remove_use_qimage]]
+ [ 24, [remove_use_qimage]],
+ [ 25, [rename_collapsible]]
]
diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 5d3c040..654468e 100644
--- 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 = 24; // lasgouttes: remove qimage
+static unsigned int const LYXRC_FILEFORMAT = 25; // spitz: rename collapsible
// when adding something to this array keep it sorted!
LexerKeyword lyxrcTags[] = {
