commit 7bdcfbc218f1408bd30be7d0a2f5971688d436b5
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Wed Jun 11 16:04:28 2025 +0200
Update prefs format, make bookmarks visible by default
Final touch to ticket #2496
---
lib/scripts/prefs2prefs_prefs.py | 16 +++++++++++++++-
src/LyXRC.cpp | 2 +-
src/LyXRC.h | 2 +-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index eb66f57d0b..a8e5e3a118 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -175,6 +175,9 @@
# Add \ui_theme, by koji
# No conversion necessary.
+# Incremented to format 40
+# Rename \experimental:bookmarks_visibility to \bookmarks_visibility
+
# NOTE: The format should also be updated in LYXRC.cpp and
# in configure.py (search for lyxrc_fileformat).
@@ -515,6 +518,16 @@ def remove_fullscreen_widthlimit(line):
####################################
+#################################
+# Conversions from LyX 2.4 to 2.5
+
+def bookmarks_visibility(line):
+ return simple_renaming(line, "\\experimental:bookmarks_visibility",
"\\bookmarks_visibility")
+
+
+# End conversions for LyX 2.4 to 2.5
+####################################
+
############################################################
# Format-conversion map. Also add empty format changes here.
@@ -564,5 +577,6 @@ conversions = [
[ 36, [add_spellcheck_default]],
[ 37, [remove_fullscreen_widthlimit]],
[ 38, []],
- [ 39, []]
+ [ 39, []],
+ [ 40, [bookmarks_visibility]],
]
diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 7dd14fa035..a8fafae2ae 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -60,7 +60,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 = 39; // spitz: \color_scheme
{system|light|dark}
+static unsigned int const LYXRC_FILEFORMAT = 40; // graduate
\\experimental:bookmark_visibility and change default
// when adding something to this array keep it sorted!
LexerKeyword lyxrcTags[] = {
{ "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND },
diff --git a/src/LyXRC.h b/src/LyXRC.h
index c69311d16d..cf492d2bdc 100644
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -583,7 +583,7 @@ public:
};
///
- BookmarksVisibility bookmarks_visibility = BMK_NONE;
+ BookmarksVisibility bookmarks_visibility = BMK_MARGIN;
///
DrawStrategy draw_strategy = DrawStrategy::Partial;
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
