* The grand 2005-2006 replace.

[lilypond.git] / lily / lilypond-version.cc

diff --git a/lily/lilypond-version.cc b/lily/lilypond-version.cc
index 309420e660cd010311b49a8509ae5bba59402386..93a5ceba88128a47263880af2f635478f5ee6805 100644 (file)
--- a/lily/lilypond-version.cc
+++ b/lily/lilypond-version.cc
@@ -3,10 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
-
+  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include <ctype.h>
+
 #include "lilypond-input-version.hh"
 #include "string-convert.hh"
 #include "array.hh"
@@ -20,13 +21,21 @@ Lilypond_version::Lilypond_version (int major, int minor, int patch)
 
 Lilypond_version::Lilypond_version (String str)
 {
+  major_ = 0; 
+  minor_ = 0;
+  patch_ = 0;
+  
   Array<String> version;
   version = String_convert::split (str, '.');
+
+  if (version.size () > 0 && isdigit (version[0][0]))
+    major_ = version[0].to_int ();
+  if (version.size () > 1 && isdigit (version[1][0]))
+    minor_ = version[1].to_int ();
   
-  major_ = version[0].to_int ();
-  minor_ = version[1].to_int ();
   patch_ = 0;
-  if (version.size () >= 3)
+  if (version.size () >= 3
+      && isdigit (version[2][0]))
     patch_ = version[2].to_int ();
 
   if (version.size () >= 4)
@@ -34,14 +43,14 @@ Lilypond_version::Lilypond_version (String str)
 }
 
 String
-Lilypond_version::string () const
+Lilypond_version::to_string () const
 {
-  return to_string (major_) + "." + to_string (minor_) + "." + to_string (patch_);
+  return ::to_string (major_) + "." + ::to_string (minor_) + "." + ::to_string (patch_);
 }
 
 Lilypond_version::operator int () const
 {
-    // ugh
+  // ugh
   return 100000 * major_ + 1000 * minor_ + patch_;
 }