X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fversion.h;h=ab712d5875f0c5f9c2b85ec63193b78e434f2adf;hb=80dfb44171bdb081ec56ae9bd7bcc301359cb1ab;hp=22b0be74d3af11a5009a4b206f6f92edb0b8d9c8;hpb=53c3269cf5474dbcdb5564f9157ee332faf8d331;p=lyx.git

diff --git a/src/version.h b/src/version.h
index 22b0be74d3..ab712d5875 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,26 +1,50 @@
-/* -*- C++ -*- */
-/* * This file is part of
-   * ======================================================
-   *
-   *           LyX, the High Level Word Processor
-   *
-   *           Copyright 1995 Matthias Ettrich
-   *           Copyright 1995, 2001 The LyX Team.
-   *
-   *======================================================*/
+// -*- C++ -*-
+/**
+ * \file version.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Jean-Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef VERSION_H
 #define VERSION_H
 
+//namespace lyx {
+
+///About dialog, inset info, export headers
+extern char const * 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_version;
-///
-extern char const * lyx_release_date;
+extern char const * const lyx_release_date;
 
-/// This version string is intended to be used in files created by LyX 
-extern char const * lyx_docversion;
+/// Package identifier (lyx[-<version-suffix>])
+extern char const * const lyx_package;
 
 /// This is the version information shown by 'lyx -version'
-extern char const * lyx_version_info;
+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 474 // rgh: dummy format change for Chunk switch
+#define LYX_FORMAT_TEX2LYX 474
+
+#if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
+#ifndef _MSC_VER
+#warning "tex2lyx produces an out of date file format."
+#warning "Please update tex2lyx as soon as possible, since it depends implicitly"
+#warning "on the current file format in some places (this causes bugs like #7780)."
+#else
+#pragma message("warning: tex2lyx produces an out of date file format. " \
+	"Please update tex2lyx as soon as possible, since it depends implicitly " \
+	"on the current file format in some places (this causes bugs like #7780).")
+#endif
+#endif
+
+//} // namespace lyx
 
 #endif