X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fversion.h;h=5d75b100a309029f923fb3aba986225c0c3e01b3;hb=90f7007a2e6c78ffd031e4636ff909ab1bc2ddec;hp=dfda1f859d012e752980b17c7954d291c1345188;hpb=d34752f50bb52dd99a222972033ee960c24ad2ab;p=lyx.git

diff --git a/src/version.h b/src/version.h
index dfda1f859d..5d75b100a3 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,8 +1,50 @@
-/* Version and release date definition */
+// -*- 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;
 ///
-#define LYX_VERSION "1.1.6pre2"
-///
-#define LYX_RELEASE "Wed, Nov 22, 2000"
-/* This version string is intended to be used in files created by LyX */
-///
-#define LYX_DOCVERSION "LyX 1.1"
+extern char const * const lyx_release_date;
+
+/// Package identifier (lyx[-<version-suffix>])
+extern char const * const lyx_package;
+
+/// This is the version information shown by 'lyx -version'
+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 459 // spitz: new beamer frame layouts
+#define LYX_FORMAT_TEX2LYX 459 // spitz: new beamer frame layouts
+
+#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