Store both sets of font selections

[lyx.git] / src / version.h

diff --git a/src/version.h b/src/version.h
index 50f3ed132bdcde1d9f4074b3acefc50b897931ce..f6de3234708b693a6a19e16557d1161a38e0a88a 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -20,6 +20,8 @@ extern char const * const lyx_version;
 extern const int lyx_version_major;
 extern const int lyx_version_minor;
 ///
+extern char const * const lyx_git_commit_hash;
+///
 extern char const * const lyx_release_date;
 
 /// Package identifier (lyx[-<version-suffix>])
@@ -30,13 +32,19 @@ 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 427 // spitz: tipa inset
-#define LYX_FORMAT_TEX2LYX 427 // spitz: tipa inset
+#define LYX_FORMAT_LYX 501 // gb: store both TeX and non-TeX font selections
+#define LYX_FORMAT_TEX2LYX 501
 
 #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