Le 20/12/2015 10:16, Georg Baum a écrit :
I assume that the cited message was supposed to go to the list, so I
cite it completely.
Am 20.12.2015 um 05:20 schrieb Richard Heck:
On 12/19/2015 05:55 PM, Guillaume Munch wrote:
Le 19/12/2015 10:17, Georg Baum a écrit :
Unfortunately we have a regression now: Both tex2lyx and lyx2lyx output
these parameters in a different order than LyX.
In which sense is it a regression? Where is it important to have the
same order?
Having the same order avoids artificial changes if someone edits a
document produced by tex2lyx or lyx2lyx. This is mainly important for
documents under version control, and such a change could create a
similar merge conflict as the one which should be avoided by the changed
order. For the same reason all LyX files (docs, examples templates etc)
should be updated at once to the new format IMHO, so that we do not see
artificial changes as in b5c693eb0f99a.
Currently, both lyx2lyx and tex2lyx do not produce exactly the same
files as LyX (there are e.g. insignificant whitespace changes), but some
work has been done in the past to make the output as similar as
possible, and we should not throw away this work now by declaring that
we don't care anymore.
OK.
I assume Georg means that the tex2lyx tests will now fail, since there
will be
differences in the order in which these parameters are output. Of course
that can
be fixed by adapting the test files.
The tex2lyx tests do not fail currently, since the output order in
tex2lyx has not been changed. But you are right, if the order in tex2lyx
is changed, then the references must be updated, too.
Georg
Also, lyx2lyx might rely on the old order for backward conversion.
Did you check that it still works?
Yes, it does not depend on the order.
This is very difficult, maybe impossible, to know without tests...which
of course
we do not have.
It is a big problem with the lyx2lyx code, one I work hard to correct
along the way,
that people tend to make assumptions about the exact order in which
different lines will
appear, and even how many lines there are between different parameters.
As a result,
even the addition of blank lines where they shouldn't matter can break
lyx2lyx. And, in
the past, has. It isn't sufficient, therefore, to check places in which
output_changes and tracking_changes are actually mentioned in the
lyx2lyx code. Other code might assume
that the line that comes three lines after some other line is this or
that, and now it isn't.
Granted, code that makes such assumptions is inherently fragile and
should have been
written differently. But be that as it may, there's a lot of such code.
I think maybe what we need here is a format change, and lyx2lyx
reversion code that
ensures the old order. Then lyx2lyx code that assumes the old order will
still work.
I should have thought of both these things. At least the latter, since,
as I said, I've had
to deal with such bugs before, and they are not fun.
Thanks for the patient explanations. That starts making too much for a
quick workaround. I would suggest reverting dc016de3.
If what we need is a format change, then it is better to implement the
solution n°3 (attached) described at
<http://thread.gmane.org/gmane.editors.lyx.devel/157824/focus=157993>.
On the one hand, the format change is very simple. On the other hand, I
do not like to suggest such a change at the last minute, and we should
not do this if anybody has a doubt. I had been counting on a quick
workaround such as dc016de3 to be available, as I was told. But, as I
gathered from the conversation, the proposed change is the most
consensual. It was favoured by Günter and Pavel, it is similar to what
Jean-Marc suggested and also similar in LibreOffice to saving to the
.fodt format.
Notes:
* The GUI can be updated later.
* I do not update the documentation yet, but I checked that the update
completes successfully.
* I made sure that there is not minor difference between lyx, tex2lyx
and lyx2lyx when writing the new parameter (it is always right before
\origin).
Guillaume
>From c25d226afe043ead37151e86b4eb0cf65b12e288 Mon Sep 17 00:00:00 2001
From: Guillaume Munch <g...@lyx.org>
Date: Sun, 20 Dec 2015 13:08:49 +0000
Subject: [PATCH 1/3] Revert "Work around bug #9841"
This reverts commit dc016de34eab3fe24d9673a48cabf754bebbadaa.
See discussion at http://mid.gmane.org/n53ar8$1tj$1...@ger.gmane.org
---
src/BufferParams.cpp | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index e3121c7..dfa13ec 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1274,14 +1274,9 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const
}
os << "\\tracking_changes " << convert<string>(track_changes) << '\n'
+ << "\\output_changes " << convert<string>(output_changes) << '\n'
<< "\\html_math_output " << html_math_output << '\n'
<< "\\html_css_as_file " << html_css_as_file << '\n'
- // \output_changes is output at a distance from \tracking changes as a
- // workaround to bug #9841: both parameters can be seen as per-user
- // preferences and therefore can cause undesirable merge conflicts, in a
- // multi-author setting, if it were treated as a single block by the
- // version control system.
- << "\\output_changes " << convert<string>(output_changes) << '\n'
<< "\\html_be_strict " << convert<string>(html_be_strict) << '\n';
if (html_math_img_scale != 1.0)
--
2.1.4
>From 5a3a9a7890c25a0f063d051e21c5b4da35fb46fa Mon Sep 17 00:00:00 2001
From: Guillaume Munch <g...@lyx.org>
Date: Sun, 20 Dec 2015 16:37:29 +0000
Subject: [PATCH 2/3] Add \store_user_preferences parameter (#9841)
Increment LyX format to 504.
With this new parameter, the user can indicate that some other parameters that
are frequently switched must not be recorded in the file (as if they were a
temporary user preference rather than a document setting). This will play nicer
with version control systems.
See the discussion, e.g.:
http://thread.gmane.org/gmane.editors.lyx.devel/157824/focus=157993 (third
solution mentioned)
TODO:
* The interface remains to be set up. We cannot change this setting from LyX
for now.
* If store_user_prefs is false, we should read the user setting as a
per-user-per-document (session) setting (e.g. like the cursor position).
* Once the above is done, we can treat \justification the same way (but it would
be even better if \justification was moved to lyxrc).
---
development/FORMAT | 7 +++++++
lib/lyx2lyx/LyX.py | 3 ++-
lib/lyx2lyx/lyx_2_2.py | 21 ++++++++++++++++++++-
src/Buffer.cpp | 6 ++++--
src/BufferParams.cpp | 18 +++++++++++++++---
src/BufferParams.h | 5 ++++-
src/tex2lyx/Preamble.cpp | 2 ++
src/tex2lyx/Preamble.h | 1 +
src/version.h | 4 ++--
9 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/development/FORMAT b/development/FORMAT
index c4d9b4d..5151d9e 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,13 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx.
-----------------------
+2015-12-20 Guillaume Munch <g...@lyx.org>
+ * Format incremented to 504
+ New parameter "\store_user_preferences". When set to false, various
+ settings are no longer written to the file (only with a default
+ value). These include for now \tracking_changes and \output_changes. See
+ <http://www.lyx.org/trac/ticket/9841>.
+
2015-11-24 Uwe Stöhr <uwesto...@web.de>
* Format incremented to 503
No new parameters.
diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index d9ad0d6..6bc0fb6 100644
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -80,12 +80,13 @@ format_relation = [("0_06", [200], minor_versions("0.6" , 4)),
("1_1_6_3", [218], ["1.1", "1.1.6.3","1.1.6.4"]),
("1_2", [220], minor_versions("1.2" , 4)),
("1_3", [221], minor_versions("1.3" , 7)),
+ # Note that range(i,j) is up to j *excluded*.
("1_4", list(range(222,246)), minor_versions("1.4" , 5)),
("1_5", list(range(246,277)), minor_versions("1.5" , 7)),
("1_6", list(range(277,346)), minor_versions("1.6" , 10)),
("2_0", list(range(346,414)), minor_versions("2.0" , 8)),
("2_1", list(range(414,475)), minor_versions("2.1" , 0)),
- ("2_2", list(range(475,504)), minor_versions("2.2" , 0))
+ ("2_2", list(range(475,505)), minor_versions("2.2" , 0))
]
####################################################################
diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py
index 130011e..8c49c34 100644
--- a/lib/lyx2lyx/lyx_2_2.py
+++ b/lib/lyx2lyx/lyx_2_2.py
@@ -2136,6 +2136,23 @@ def revert_verbatim_star(document):
revert_verbatim(document, True)
+def convert_store_prefs(document):
+ " Add store_user_preferences parameter. "
+ i = find_token(document.header, '\\origin', 0)
+ if i == -1:
+ document.warning("Malformed lyx document: Missing '\\origin'.")
+ return
+ document.header.insert(i, '\\store_user_preferences true')
+
+
+def revert_store_prefs(document):
+ " Remove store_user_preferences parameter."
+ i = find_token(document.header, "\\store_user_preferences", 0)
+ if i == -1:
+ return
+ del document.header[i]
+
+
##
# Conversion hub
#
@@ -2173,10 +2190,12 @@ convert = [
[500, []],
[501, [convert_fontsettings]],
[502, []],
- [503, []]
+ [503, []],
+ [504, [convert_store_prefs]]
]
revert = [
+ [503, [revert_store_prefs]],
[502, [revert_verbatim_star]],
[501, [revert_solution]],
[500, [revert_fontsettings]],
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index eac9821..95a08c5 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2758,12 +2758,14 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
break;
case LFUN_CHANGES_TRACK:
- undo().recordUndoBufferParams(CursorData());
+ if (params().store_user_preferences)
+ undo().recordUndoBufferParams(CursorData());
params().track_changes = !params().track_changes;
break;
case LFUN_CHANGES_OUTPUT:
- undo().recordUndoBufferParams(CursorData());
+ if (params().store_user_preferences)
+ undo().recordUndoBufferParams(CursorData());
params().output_changes = !params().output_changes;
if (params().output_changes) {
bool dvipost = LaTeXFeatures::isAvailable("dvipost");
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index dfa13ec..2dea5c1 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -369,6 +369,7 @@ BufferParams::BufferParams()
biblio_style = "plain";
use_bibtopic = false;
use_indices = false;
+ store_user_preferences = true;
track_changes = false;
output_changes = false;
use_default_options = true;
@@ -673,6 +674,8 @@ string BufferParams::readToken(Lexer & lex, string const & token,
frontend::Alert::warning(_("Document class not available"),
msg, true);
}
+ } else if (token == "\\store_user_preferences") {
+ lex >> store_user_preferences;
} else if (token == "\\origin") {
lex.eatLine();
origin = lex.getString();
@@ -1015,6 +1018,9 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const
// The top of the file is written by the buffer.
// Prints out the buffer info into the .lyx file given by file
+ os << "\\store_user_preferences "
+ << convert<string>(store_user_preferences) << '\n';
+
// the document directory
// use realPath() instead of absFileName() for comparing
// so we can catch also eventually used symbolic parts of the path.
@@ -1273,9 +1279,15 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const
}
}
- os << "\\tracking_changes " << convert<string>(track_changes) << '\n'
- << "\\output_changes " << convert<string>(output_changes) << '\n'
- << "\\html_math_output " << html_math_output << '\n'
+ os << "\\tracking_changes "
+ << (store_user_preferences ? convert<string>(track_changes) : "false")
+ << '\n';
+
+ os << "\\output_changes "
+ << (store_user_preferences ? convert<string>(output_changes) : "false")
+ << '\n';
+
+ os << "\\html_math_output " << html_math_output << '\n'
<< "\\html_css_as_file " << html_css_as_file << '\n'
<< "\\html_be_strict " << convert<string>(html_be_strict) << '\n';
diff --git a/src/BufferParams.h b/src/BufferParams.h
index 79af8f2..5c981f4 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -381,11 +381,14 @@ public:
bool use_bibtopic;
/// Split the index?
bool use_indices;
- /// revision tracking for this buffer ?
+ /// Store user preferences?
+ bool store_user_preferences;
+ /// revision tracking for this buffer ? (this is a user preference)
bool track_changes;
/** This param decides whether change tracking marks should be used
* in output (irrespective of how these marks are actually defined;
* for instance, they may differ for DVI and PDF generation)
+ * This is a user preference.
*/
bool output_changes;
///
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 01587cc..db263f1 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -536,6 +536,7 @@ Preamble::Preamble() : one_language(true), explicit_babel(false),
h_secnumdepth = "3";
h_shortcut[0] = "idx";
h_spacing = "single";
+ h_store_user_preferences = "true";
h_suppress_date = "false";
h_textclass = "article";
h_tocdepth = "3";
@@ -1102,6 +1103,7 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc, string const & outfiled
<< "\\lyxformat " << LYX_FORMAT << '\n'
<< "\\begin_document\n"
<< "\\begin_header\n"
+ << "\\store_user_preferences " << h_store_user_preferences << "\n"
<< "\\origin " << origin << "\n"
<< "\\textclass " << h_textclass << "\n";
string const raw = subdoc ? empty_string() : h_preamble.str();
diff --git a/src/tex2lyx/Preamble.h b/src/tex2lyx/Preamble.h
index 1c3fe66..09abdb2 100644
--- a/src/tex2lyx/Preamble.h
+++ b/src/tex2lyx/Preamble.h
@@ -191,6 +191,7 @@ private:
std::string h_shortcut[99];
std::string h_spacing;
std::string h_suppress_date;
+ std::string h_store_user_preferences;
std::string h_textclass;
std::string h_tocdepth;
std::string h_tracking_changes;
diff --git a/src/version.h b/src/version.h
index fff8c5a..fdde2a4 100644
--- a/src/version.h
+++ b/src/version.h
@@ -32,8 +32,8 @@ extern char const * const lyx_version_info;
// Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 503 // uwestoehr: support for verbatim* environment
-#define LYX_FORMAT_TEX2LYX 503
+#define LYX_FORMAT_LYX 504 // gm: add store_user_preferences parameter
+#define LYX_FORMAT_TEX2LYX 504
#if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
#ifndef _MSC_VER
--
2.1.4
>From 739c489957d95abc4af000bd2ef332fa585504a1 Mon Sep 17 00:00:00 2001
From: Guillaume Munch <g...@lyx.org>
Date: Sun, 20 Dec 2015 17:56:40 +0000
Subject: [PATCH 3/3] Update tex2lyx tests
Just add \store_user_preferences as expected.
---
src/tex2lyx/test/CJK.lyx.lyx | 3 ++-
src/tex2lyx/test/CJKutf8.lyx.lyx | 3 ++-
src/tex2lyx/test/DummyDocument.lyx.lyx | 3 ++-
src/tex2lyx/test/Dummy~Document.lyx.lyx | 3 ++-
src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx | 3 ++-
src/tex2lyx/test/algo2e.lyx.lyx | 3 ++-
src/tex2lyx/test/box-color-size-space-align.lyx.lyx | 3 ++-
src/tex2lyx/test/test-insets-basic.lyx.lyx | 3 ++-
src/tex2lyx/test/test-insets.lyx.lyx | 3 ++-
src/tex2lyx/test/test-memoir.lyx.lyx | 3 ++-
src/tex2lyx/test/test-modules.lyx.lyx | 3 ++-
src/tex2lyx/test/test-refstyle-theorems.lyx.lyx | 3 ++-
src/tex2lyx/test/test-scr.lyx.lyx | 3 ++-
src/tex2lyx/test/test-structure.lyx.lyx | 3 ++-
src/tex2lyx/test/test.lyx.lyx | 3 ++-
src/tex2lyx/test/verbatim.lyx.lyx | 3 ++-
16 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 46b602a..59cd0a4 100644
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass article
\begin_preamble
diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index 1db5855..b0c3b46 100644
--- a/src/tex2lyx/test/CJKutf8.lyx.lyx
+++ b/src/tex2lyx/test/CJKutf8.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass article
\begin_preamble
diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx
index effaf8b..c042c0c 100644
--- a/src/tex2lyx/test/DummyDocument.lyx.lyx
+++ b/src/tex2lyx/test/DummyDocument.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass article
\use_default_options false
diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx
index cf3acba..cb6daae 100644
--- a/src/tex2lyx/test/Dummy~Document.lyx.lyx
+++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass article
\use_default_options false
diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index 6685a03..8fdd086 100644
--- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
+++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass article
\begin_preamble
diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx
index 9bbecd3..a22460f 100644
--- a/src/tex2lyx/test/algo2e.lyx.lyx
+++ b/src/tex2lyx/test/algo2e.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass article
\begin_preamble
diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
index 5f56411..b7a0bc9 100644
--- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
+++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass article
\begin_preamble
diff --git a/src/tex2lyx/test/test-insets-basic.lyx.lyx b/src/tex2lyx/test/test-insets-basic.lyx.lyx
index 366f7fb..5d6aef8 100644
--- a/src/tex2lyx/test/test-insets-basic.lyx.lyx
+++ b/src/tex2lyx/test/test-insets-basic.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass article
\begin_preamble
diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index 5b125a3..b317cb2 100644
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass article
\begin_preamble
diff --git a/src/tex2lyx/test/test-memoir.lyx.lyx b/src/tex2lyx/test/test-memoir.lyx.lyx
index 9be82a5..108486c 100644
--- a/src/tex2lyx/test/test-memoir.lyx.lyx
+++ b/src/tex2lyx/test/test-memoir.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass memoir
\begin_preamble
diff --git a/src/tex2lyx/test/test-modules.lyx.lyx b/src/tex2lyx/test/test-modules.lyx.lyx
index fb49a44..26c4a13 100644
--- a/src/tex2lyx/test/test-modules.lyx.lyx
+++ b/src/tex2lyx/test/test-modules.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass amsart
\begin_preamble
diff --git a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
index 4a99ba8..91bcf31 100644
--- a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
+++ b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass book
\begin_preamble
diff --git a/src/tex2lyx/test/test-scr.lyx.lyx b/src/tex2lyx/test/test-scr.lyx.lyx
index ac150e6..5d8d132 100644
--- a/src/tex2lyx/test/test-scr.lyx.lyx
+++ b/src/tex2lyx/test/test-scr.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass scrbook
\begin_preamble
diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx
index d167f37..49053cd 100644
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/src/tex2lyx/test/test-structure.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass article
\begin_preamble
diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index 935bced..20046ff 100644
--- a/src/tex2lyx/test/test.lyx.lyx
+++ b/src/tex2lyx/test/test.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass article
\begin_preamble
diff --git a/src/tex2lyx/test/verbatim.lyx.lyx b/src/tex2lyx/test/verbatim.lyx.lyx
index d5732c1..bfc6a8a 100644
--- a/src/tex2lyx/test/verbatim.lyx.lyx
+++ b/src/tex2lyx/test/verbatim.lyx.lyx
@@ -1,7 +1,8 @@
#LyX file created by tex2lyx 2.2
-\lyxformat 503
+\lyxformat 504
\begin_document
\begin_header
+\store_user_preferences true
\origin roundtrip
\textclass article
\use_default_options false
--
2.1.4
