tex2lyx/text.cpp: code simplification

[lyx.git] / src / version.h

diff --git a/src/version.h b/src/version.h
index b13632fe54a19c5f183cf90cd080169247bf52de..99ae9e13371f1f4d98f8c3bd8d815ba2d5192bba 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -14,13 +14,30 @@
 
 //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;
+
+/// 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 416 //uwestoehr : support for horizontal spaces (bug 7728)
+#define LYX_FORMAT_TEX2LYX 416
+
+#if LYX_FORMAT_FOR_TEX2LYX != LYX_FORMAT_FOR_LYX
+#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)."
+#endif
 
 //} // namespace lyx