commit fadb93ae687c5ce118ecfdad321dba2a564d6e5d
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Thu Nov 2 16:51:23 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, 9 insertions(+), 4 deletions(-)
diff --git a/lib/configure.py b/lib/configure.py
index 6c32a80..32216d7 100644
--- 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 77f3fd8..c510be6 100644
--- 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 e98eae5..7cfa2a3 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 = 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[] = {
