X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Flily-version.cc;h=1df780b8e1ec05edf7a5a3a951b0d374f397d5e8;hb=7a154de04023d59019bdd498b525580890fd2152;hp=b6a37c812b785ac2b838e8ffbdfe4233e4b41b55;hpb=63c9cee8ce190aaae4a5db3d2e200d35a570838d;p=lilypond.git

diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index b6a37c812b..1df780b8e1 100644
--- a/lily/lily-version.cc
+++ b/lily/lily-version.cc
@@ -1,23 +1,37 @@
-#include <stdio.h>
+/*
+  lily-version.cc -- implement version strings
 
-#include "config.hh"
-#include "version.hh"
+  source file of the GNU LilyPond music typesetter
 
- #define VERSION_SZ  MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL MY_PATCH_LEVEL
+  (c) 1999--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-//#define VERSION_SZ TOPLEVEL_VERSION
-//#define VERSION_SZ "version"
-static char *s = "GNU LilyPond " VERSION_SZ ;
+#include "lily-version.hh"
+
+#include "config.hh"
+#include "version.hh"
 
+string
+version_string ()
+{
+  string str = MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL;
+  string mpl ("." MY_PATCH_LEVEL);
+  if (mpl != ".")
+    str += mpl;
+  return str;
+}
 
-char const *
-lily_version_number_sz()
+string
+gnu_lilypond_string ()
 {
-  return VERSION_SZ;
+  string str = "GNU LilyPond";
+  return str;
 }
 
-char const * 
-lily_version_sz()
+string
+gnu_lilypond_version_string ()
 {
-	return s;
+  string str = gnu_lilypond_string () + " " + version_string ();
+  return str;
 }
+