* stepmake/aclocal.m4: version check patch (thanks MWD)

* ly/music-functions-init.ly: robustness. Don't crash if
currentBarNumber is not a number.

diff --git a/ChangeLog b/ChangeLog
index a352e1bb5e199b3e29857ff65d6e1d05fea0a185..2e409e3ef641abc6844b47706df81d88b182f0d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-08-09  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * stepmake/aclocal.m4: version check patch (thanks MWD)
+
+       * ly/music-functions-init.ly: robustness. Don't crash if
+       currentBarNumber is not a number.
+
        * VERSION (PATCH_LEVEL): bump.
 
 2006-08-08  Han-Wen Nienhuys  <hanwen@lilypond.org>

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 659629a021628ec7796b1a1f821a63b86ffe9066..4ed75b741857838a914aee3c16b57a309cf1ac85 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -109,7 +109,7 @@ partCombineListener = \layout {
     \context {
        \Score
        skipTypesetting = ##t
-       ignoreBarChecks = ##t 
+       ignoreBarChecks = ##t
     }
 }
 

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index fe8453536e4fd7b01ac7d68a936592060c63640b..7aa6dede0834eeafcf81d249ab2fbf1b10af49b3 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -115,7 +115,7 @@ barNumberCheck =
               (lambda (c)
                 (let*
                     ((cbn (ly:context-property c 'currentBarNumber)))
-                  (if (not (= cbn n))
+                  (if (and  (number? cbn) (not (= cbn n)))
                       (ly:input-message location "Barcheck failed got ~a expect ~a"
                                         cbn n))))))
 

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 96959c09f7443eaefcaddd1eb8eba9961e13f0e4..813b8309775e6c9f7b0fa021b305a336473cb0fb 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -32,7 +32,7 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
     ## for compatibility reasons.
     
     ## grab the first version number in  --version output.
-    eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep ' [0-9][0-9]*\.[0-9]' \
+    eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '\(^\| \)[0-9][0-9]*\.[0-9]' \
         | head -n 1 \
        | tr ' ' '\n' | grep '[0-9]\.[0-9]' | head -n 1 | sed 's/\([0-9.]*\).*/\1/g'\`\"