Fix inconsistent version in .lyx files (#7951)

LyX, lyx2lyx and tex2lyx produce now all the same version indicator consisting
only of the major and minor version. It is not decided yet whether future
development versions will add a -dev suffix, but for 2.1.0 this change fixes
the inconsistencies.

diff --git a/lib/lyx2lyx/lyx2lyx_version.py.in b/lib/lyx2lyx/lyx2lyx_version.py.in
index e99da0bf64dc1dc84700c64894be95e27492b2ae..d3b6609986f14388752e83bc5dbfa3b3c8f19deb 100644 (file)
--- a/lib/lyx2lyx/lyx2lyx_version.py.in
+++ b/lib/lyx2lyx/lyx2lyx_version.py.in
@@ -16,7 +16,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-version = "@PACKAGE_VERSION@"
+# Important: Keep the version formatting in sync with LyX and
+#            tex2lyx (bug 7951)
+version = "@LYX_MAJOR_VERSION@.@LYX_MINOR_VERSION@"
 
 if __name__ == "__main__":
     pass

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 014dcd6929cb8df769eee32b63d8aedb727635a4..6ef03f6c785b7dcae83379cc4eb7f5be5f35071e 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1404,6 +1404,8 @@ bool Buffer::write(ostream & ofs) const
        // The top of the file should not be written by params().
 
        // write out a comment in the top of the file
+       // Important: Keep the version formatting in sync with lyx2lyx and
+       //            tex2lyx (bug 7951)
        ofs << "#LyX " << lyx_version_major << "." << lyx_version_minor
            << " created this file. For more info see http://www.lyx.org/\n"
            << "\\lyxformat " << LYX_FORMAT << "\n"

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 9759663808c3d32bfe7cbffb09e47e492d791478..0dda8de51b654e1529da082ee2373d920a414425 100644 (file)
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -21,6 +21,7 @@
 #include "Layout.h"
 #include "Lexer.h"
 #include "TextClass.h"
+#include "version.h"
 
 #include "support/convert.h"
 #include "support/FileName.h"
@@ -1040,7 +1041,10 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc)
        }
 
        // output the LyX file settings
-       os << "#LyX file created by tex2lyx " << PACKAGE_VERSION << "\n"
+       // Important: Keep the version formatting in sync with LyX and
+       //            lyx2lyx (bug 7951)
+       os << "#LyX file created by tex2lyx " << lyx_version_major << '.'
+          << lyx_version_minor << '\n'
           << "\\lyxformat " << LYX_FORMAT << '\n'
           << "\\begin_document\n"
           << "\\begin_header\n"

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index dcd4d5bd43ff926d3d961ca4ce30309a74703d72..5a738409799eb6f778989c309ef8d25cdd055d2f 100644 (file)
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,4 +1,4 @@
-#LyX file created by tex2lyx 2.1.0
+#LyX file created by tex2lyx 2.1
 \lyxformat 474
 \begin_document
 \begin_header

diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index 61071a79fabf1a0d88ff9bd83c43a7dddfa7ee49..894bb062da25379762376697767182d03b2d3692 100644 (file)
--- a/src/tex2lyx/test/CJKutf8.lyx.lyx
+++ b/src/tex2lyx/test/CJKutf8.lyx.lyx
@@ -1,4 +1,4 @@
-#LyX file created by tex2lyx 2.1.0
+#LyX file created by tex2lyx 2.1
 \lyxformat 474
 \begin_document
 \begin_header

diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx
index 8bb60fcb317927d1006f7b6ddeb388faf4a4d8dc..12f4950441df1779fd2cf6a58ba72fb93cccf5db 100644 (file)
--- a/src/tex2lyx/test/DummyDocument.lyx.lyx
+++ b/src/tex2lyx/test/DummyDocument.lyx.lyx
@@ -1,4 +1,4 @@
-#LyX file created by tex2lyx 2.1.0
+#LyX file created by tex2lyx 2.1
 \lyxformat 474
 \begin_document
 \begin_header

diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx
index 3d7022364c22ec066179f52e5b2c922b3fdbfa5e..4335937fb7c8ae51791629385bde4f893a27dcc3 100644 (file)
--- a/src/tex2lyx/test/Dummy~Document.lyx.lyx
+++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx
@@ -1,4 +1,4 @@
-#LyX file created by tex2lyx 2.1.0
+#LyX file created by tex2lyx 2.1
 \lyxformat 474
 \begin_document
 \begin_header

diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index fd6f4c3cdb546382be08c9c347d3b5eeca8daf95..bcf4c0f5662be76967288975da21feb082a83f7e 100644 (file)
--- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
+++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
@@ -1,4 +1,4 @@
-#LyX file created by tex2lyx 2.1.0
+#LyX file created by tex2lyx 2.1
 \lyxformat 474
 \begin_document
 \begin_header

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 90824d41afc2dffd5af114bb3b12f3b93b181c53..c09701a262c37a396f964b01b8e734d23daf3898 100644 (file)
--- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
+++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
@@ -1,4 +1,4 @@
-#LyX file created by tex2lyx 2.1.0
+#LyX file created by tex2lyx 2.1
 \lyxformat 474
 \begin_document
 \begin_header

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index 608948c5c25b0b617c03ffb19ed61d3d892173ca..c7ba2a51dcb091795a6654ebd68809cd40f99b83 100644 (file)
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1,4 +1,4 @@
-#LyX file created by tex2lyx 2.1.0
+#LyX file created by tex2lyx 2.1
 \lyxformat 474
 \begin_document
 \begin_header

diff --git a/src/tex2lyx/test/test-modules.lyx.lyx b/src/tex2lyx/test/test-modules.lyx.lyx
index 8cd8b65f46c8a6d3f43137b1d99cc1ac0a1b0965..4fd4178775dcc98a88f3d6905cb2aecf850aab5c 100644 (file)
--- a/src/tex2lyx/test/test-modules.lyx.lyx
+++ b/src/tex2lyx/test/test-modules.lyx.lyx
@@ -1,4 +1,4 @@
-#LyX file created by tex2lyx 2.1.0
+#LyX file created by tex2lyx 2.1
 \lyxformat 474
 \begin_document
 \begin_header

diff --git a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
index 37d43938d6d66cee157fec59334a46440219ffcb..b29f4c127f7fd5a47a4f1b32274b735c65f956ff 100644 (file)
--- a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
+++ b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
@@ -1,4 +1,4 @@
-#LyX file created by tex2lyx 2.1.0
+#LyX file created by tex2lyx 2.1
 \lyxformat 474
 \begin_document
 \begin_header

diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx
index adcc292c1c84aa287262bd3f46a6b3c849c30ea5..e7de51d1cd8f3ba937de863b982f7e9675f0f549 100644 (file)
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/src/tex2lyx/test/test-structure.lyx.lyx
@@ -1,4 +1,4 @@
-#LyX file created by tex2lyx 2.1.0
+#LyX file created by tex2lyx 2.1
 \lyxformat 474
 \begin_document
 \begin_header

diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index ec4c54080f6ac7a62343b9e0ad4bb7527c578dcf..21ecd0afed7a1fbcff4e1221af0115157dae5527 100644 (file)
--- a/src/tex2lyx/test/test.lyx.lyx
+++ b/src/tex2lyx/test/test.lyx.lyx
@@ -1,4 +1,4 @@
-#LyX file created by tex2lyx 2.1.0
+#LyX file created by tex2lyx 2.1
 \lyxformat 474
 \begin_document
 \begin_header

diff --git a/src/tex2lyx/test/verbatim.lyx.lyx b/src/tex2lyx/test/verbatim.lyx.lyx
index 8d7d3cea973a12b09c259e913c80d7006e8b5fd8..f0a1d2b7c91ec62e95f43963f14df156d2bc26e4 100644 (file)
--- a/src/tex2lyx/test/verbatim.lyx.lyx
+++ b/src/tex2lyx/test/verbatim.lyx.lyx
@@ -1,4 +1,4 @@
-#LyX file created by tex2lyx 2.1.0
+#LyX file created by tex2lyx 2.1
 \lyxformat 474
 \begin_document
 \begin_header