lilypond-1.5.18

diff --git a/VERSION b/VERSION
index d157673176f006141436febe3d979dcae60e2466..af6498780207a313257cab548ac0f752e4cb3a1e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
-PATCH_LEVEL=17
+PATCH_LEVEL=18
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/lily/grob.cc b/lily/grob.cc
index f55ee2f8e257b73fe4ac3b41ae317a9a0a8e4f4e..bd716106db64817a6b0354e1601e38c8c77136a5 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -354,7 +354,9 @@ Grob::add_dependency (Grob*e)
       CRITERION is either a SMOB pointer to the desired line, or a number
       representing the break direction. Do not modify SRC.
 
-      It is rather tightly coded, since it takes a lot of time.
+      It is rather tightly coded, since it takes a lot of time; it is
+      one of the top functions in the profile.
+
 */
 SCM
 Grob::handle_broken_grobs (SCM src, SCM criterion)
@@ -363,7 +365,7 @@ Grob::handle_broken_grobs (SCM src, SCM criterion)
   Grob *sc = unsmob_grob (src);
   if (sc)
     {
-      if (gh_number_p (criterion))
+      if (SCM_INUMP (criterion))
        {
          Item * i = dynamic_cast<Item*> (sc);
          Direction d = to_dir (criterion);
@@ -388,22 +390,23 @@ Grob::handle_broken_grobs (SCM src, SCM criterion)
            return SCM_UNDEFINED;
 
          /* now: sc && sc->line_l () == line */
-         if (!line
+         if (!line)
+           return sc->self_scm();
              /*
                This was introduced in 1.3.49 as a measure to prevent
                programming errors. It looks expensive (?). TODO:
                benchmark , document when (what kind of programming
                errors) this happens.
               */
-             || (sc->common_refpoint (line, X_AXIS)
-                 && sc->common_refpoint (line, Y_AXIS)))
+         if (sc->common_refpoint (line, X_AXIS)
+              && sc->common_refpoint (line, Y_AXIS))
            {
              return sc->self_scm ();
            }
          return SCM_UNDEFINED;
        }
     }
-  else if (gh_pair_p (src))
+  else if (SCM_CONSP (src))
     {
       SCM oldcar =ly_car (src);
       /*
@@ -427,7 +430,7 @@ Grob::handle_broken_grobs (SCM src, SCM criterion)
        }
 
       SCM newcdr = handle_broken_grobs (oldcdr, criterion);
-      return gh_cons (newcar, newcdr);
+      return scm_cons (newcar, newcdr);
     }
   else
     return src;

diff --git a/midi2ly/GNUmakefile b/midi2ly/GNUmakefile
index d585c5c702aa63559cac876f2221ece98a4b9317..3ef74f698a225667283b974affab956e4bd68184 100644 (file)
--- a/midi2ly/GNUmakefile
+++ b/midi2ly/GNUmakefile
@@ -3,8 +3,8 @@
 
 depth = ..
 
-NAME = midi2ly
-MODULE_NAME = midi2ly
+NAME = midi2ly-old
+MODULE_NAME = midi2ly-old
 
 SUBDIRS = include
 MODULE_LIBS=$(depth)/flower

diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
index a61a9b1d58ab9d3e129a96b57afdb1fe9cecacfc..1df3d26a3b890fb463678983f57edbcf4e3119d2 100644 (file)
--- a/scripts/GNUmakefile
+++ b/scripts/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ..
 
-SEXECUTABLES=convert-ly lilypond-book ly2dvi abc2ly as2text etf2ly musedata2ly pmx2ly mup2ly
+SEXECUTABLES=convert-ly lilypond-book ly2dvi abc2ly as2text etf2ly musedata2ly pmx2ly mup2ly midi2ly
 STEPMAKE_TEMPLATES=script help2man po
 HELP2MAN_EXECS = $(SEXECUTABLES)