anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Collapsable -> Collapsible (part 5)

Browse Source 
Preferences update and prefs2prefs routine.

This was forgotten in the process.
This commit is contained in:
Juergen Spitzmueller 2017-11-02 16:51:23 +01:00
parent 43a6fe8375
commit fadb93ae68
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/configure.py
View File

@ -1790,7 +1790,7 @@ if __name__ == '__main__':
lyx_check_config = True lyx_check_config = True
lyx_kpsewhich = True lyx_kpsewhich = True
outfile = 'lyxrc.defaults' outfile = 'lyxrc.defaults'
lyxrc_fileformat = 23 lyxrc_fileformat = 24
rc_entries = '' rc_entries = ''
lyx_keep_temps = False lyx_keep_temps = False
version_suffix = '' version_suffix = ''

9
lib/scripts/prefs2prefs_prefs.py
View File

@ -99,6 +99,9 @@
# Japanese documents via pLaTeX. # Japanese documents via pLaTeX.
# No conversion necessary. # No conversion necessary.
# Incremented to format 24, by spitz
# Rename collapsable to collapsible
# NOTE: The format should also be updated in LYXRC.cpp and # NOTE: The format should also be updated in LYXRC.cpp and
# in configure.py. # in configure.py.
@ -372,7 +375,8 @@ def remove_print_support(line):
################################# #################################
# Conversions from LyX 2.2 to 2.3 # 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 # End conversions for LyX 2.2 to 2.3
#################################### ####################################
@ -410,5 +414,6 @@ conversions = [
[ 20, []], [ 20, []],
[ 21, []], [ 21, []],
[ 22, []], [ 22, []],
[ 23, []] [ 23, []],
[ 24, [rename_collapsible]]
] ]

2
src/LyXRC.cpp
View File

@ -59,7 +59,7 @@ namespace {
// The format should also be updated in configure.py, and conversion code // The format should also be updated in configure.py, and conversion code
// should be added to prefs2prefs_prefs.py. // 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! // when adding something to this array keep it sorted!
LexerKeyword lyxrcTags[] = { LexerKeyword lyxrcTags[] = {