File format bump after r39982 (renaming of the japanese encodings for pLaTeX).

[lyx.git] / src / version.h

diff --git a/src/version.h b/src/version.h
index a779496c890880e60c313b6ff155d91f20a533cb..dd0ad2ba2a6e1f10ba313547b5d91eb1269e2b2b 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -12,12 +12,33 @@
 #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;
+
+/// 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 417 // jrioux : rename the japanese encodings
+#define LYX_FORMAT_TEX2LYX 417
+
+#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
 
 #endif