commit e9deea03dba07eed607d72f85e8b8ea5336485d9
Author: Scott Kostyshak <[email protected]>
Date: Sun Apr 23 15:02:39 2017 -0400
Update the formats of lyxrc.dist.in to 21
In the end, no changes were needed. This was decided by prefs2prefs
for MacOSX and cygwin, and by manual inspection for Win32.
---
development/MacOSX/lyxrc.dist.in | 2 +-
.../Win32/packaging/installer/setup/configure.nsh | 2 +-
development/cygwin/lyxrc.dist.in | 2 +-
lib/scripts/prefs2prefs_prefs.py | 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/development/MacOSX/lyxrc.dist.in b/development/MacOSX/lyxrc.dist.in
index b01005d..e48e93d 100644
--- a/development/MacOSX/lyxrc.dist.in
+++ b/development/MacOSX/lyxrc.dist.in
@@ -10,7 +10,7 @@
# This file is written by LyX, if you want to make your own
# modifications you should do them from inside LyX and save
-Format 19
+Format 21
\bind_file "mac"
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index cd5c4fa..2a35e37 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -157,7 +157,7 @@ Section -Configure
Delete "$INSTDIR\Resources\lyxrc.dist"
FileOpen $R1 "$INSTDIR\Resources\lyxrc.dist" w
# set the format to the latest LyXRC format
- FileWrite $R1 'Format 19$\r$\n'
+ FileWrite $R1 'Format 21$\r$\n'
# set some general things
FileWrite $R1 '\screen_zoom 120$\r$\n'
${if} "$PathPrefix" != ""
diff --git a/development/cygwin/lyxrc.dist.in b/development/cygwin/lyxrc.dist.in
index 6e43a96..6b5a1af 100644
--- a/development/cygwin/lyxrc.dist.in
+++ b/development/cygwin/lyxrc.dist.in
@@ -10,7 +10,7 @@
# The file lyxrc.dist gives initial global options for all LyX users.
# Almost all settings here can be overridden through the preferences in LyX.
-Format 19
+Format 21
\screen_dpi 96
\screen_zoom 150
diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 290a871..b4acdc7 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -88,6 +88,7 @@
# Add jbibtex_alternatives, allow "automatic" value
# of bibtex_command and jbibtex_command (actually the
# default now)
+# No conversion necessary.
# NOTE: The format should also be updated in LYXRC.cpp and
# in configure.py.
