mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 19:07:45 +00:00
Swap prefs format 24 and 25, since the former will not be backported.
This commit is contained in:
parent
891a7ef79f
commit
f2b6ff0870
@ -99,12 +99,12 @@
|
||||
# Japanese documents via pLaTeX.
|
||||
# No conversion necessary.
|
||||
|
||||
# Incremented to format 24, by lasgouttes
|
||||
# Remove use_qimage preference
|
||||
|
||||
# Incremented to format 25, by spitz
|
||||
# Incremented to format 24, by spitz
|
||||
# Rename collapsable to collapsible
|
||||
|
||||
# Incremented to format 25, by lasgouttes
|
||||
# Remove use_qimage preference
|
||||
|
||||
# NOTE: The format should also be updated in LYXRC.cpp and
|
||||
# in configure.py.
|
||||
|
||||
@ -379,7 +379,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
|
||||
####################################
|
||||
@ -393,9 +394,6 @@ 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
|
||||
####################################
|
||||
|
||||
@ -434,6 +432,6 @@ conversions = [
|
||||
[ 21, []],
|
||||
[ 22, []],
|
||||
[ 23, []],
|
||||
[ 24, [remove_use_qimage]],
|
||||
[ 25, [rename_collapsible]]
|
||||
[ 24, [rename_collapsible]],
|
||||
[ 25, [remove_use_qimage]]
|
||||
]
|
||||
|
@ -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 = 25; // spitz: rename collapsible
|
||||
static unsigned int const LYXRC_FILEFORMAT = 25; // lasgouttes: remove qimage
|
||||
|
||||
// when adding something to this array keep it sorted!
|
||||
LexerKeyword lyxrcTags[] = {
|
||||
|
Loading…
Reference in New Issue
Block a user