X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flilypond-version.cc;h=35c2afb1d2fccafe30cd54047f9c52306e90ab48;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=80db99522595fec08e13bef902572dd7f2e30ef3;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/lilypond-version.cc b/lily/lilypond-version.cc
index 80db995225..35c2afb1d2 100644
--- a/lily/lilypond-version.cc
+++ b/lily/lilypond-version.cc
@@ -3,12 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lilypond-input-version.hh"
+#include <ctype.h>
+
+#include "lilypond-version.hh"
 #include "string-convert.hh"
-#include "array.hh"
+#include "misc.hh"
 
 Lilypond_version::Lilypond_version (int major, int minor, int patch)
 {
@@ -17,25 +19,35 @@ Lilypond_version::Lilypond_version (int major, int minor, int patch)
   patch_ = patch;
 }
 
-Lilypond_version::Lilypond_version (String str)
+Lilypond_version::Lilypond_version (string str)
 {
-  Array<String> version;
-  version = String_convert::split (str, '.');
-
-  major_ = version[0].to_int ();
-  minor_ = version[1].to_int ();
+  major_ = 0; 
+  minor_ = 0;
+  patch_ = 0;
+  
+  vector<string> version;
+  version = string_split (str, '.');
+
+  if (version.size () > 0 && isdigit (version[0][0]))
+    major_ = String_convert::dec2int (version[0]);
+  if (version.size () > 1 && isdigit (version[1][0]))
+    minor_ = String_convert::dec2int (version[1]);
+  
   patch_ = 0;
-  if (version.size () >= 3)
-    patch_ = version[2].to_int ();
+  if (version.size () >= 3
+      && isdigit (version[2][0]))
+    patch_ = String_convert::dec2int (version[2]);
 
   if (version.size () >= 4)
     extra_patch_string_ = version[3];
 }
 
-String
+string
 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