X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-version.cc;h=2163e0b472274df01a8a280837f20aae65bf159c;hb=09bf9a18185476020686ff65b5d70b57051be780;hp=fcf2f8e8e3f9b2e0c35e4c315fc981aabcc32215;hpb=5cfb4ad642561dcb61593b1aeb24717c5eb110da;p=lilypond.git

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