Re: "Format" change proposal

[Pavel Sanda]

Jean-Marc Lasgouttes wrote:
> Le 08/02/2011 14:11, Pavel Sanda a écrit :
>> would you have problem with having
>> #LyX 1.6 created this file. For more info see http://www.lyx.org/
>
> Go ahead.

like this.
pavel

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 4b98221..1c301b4 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1187,7 +1187,7 @@ 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
-       ofs << "#LyX " << lyx_version
+       ofs << "#LyX " << lyx_version_major << "." << lyx_version_minor
            << " created this file. For more info see http://www.lyx.org/\n";
            << "\\lyxformat " << LYX_FORMAT << "\n"
            << "\\begin_document\n";
diff --git a/src/version.cpp b/src/version.cpp
index 0bc2be0..00dd34f 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -14,6 +14,9 @@
 ///
 char const * lyx_version = PACKAGE_VERSION;
 ///
+int lyx_version_major = LYX_MAJOR_VERSION;
+int lyx_version_minor = LYX_MINOR_VERSION;
+///
 char const * lyx_release_date = LYX_DATE;
 
 /// Package identifier (lyx[-<version-suffix>])
diff --git a/src/version.h b/src/version.h
index 864b212..5eaccc5 100644
--- a/src/version.h
+++ b/src/version.h
@@ -14,8 +14,11 @@
 
 //namespace lyx {
 
-///
+///About dialog, inset info, export headers
 extern char const * lyx_version;
+//.lyx header. We don't want lyx_version because of VCS conflicts.
+extern const int lyx_version_major;
+extern const int lyx_version_minor;
 ///
 extern char const * lyx_release_date;