* lily/stem.cc (height): robustness fix.

* lily/time-scaled-music.cc: remove file.

diff --git a/ChangeLog b/ChangeLog
index c1448ec2060e348ffb877f2da765f6ab3e97dd5e..df15f42c6e5663727a980b2bfd7b08d0c8704159 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-01-14  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/stem.cc (height): robustness fix.
+
        * lily/time-scaled-music.cc: remove file.
 
        * lily/include/music.hh (class Music): include SCM init argument.

diff --git a/lily/music.cc b/lily/music.cc
index db31a9aec19a8c03fdf74d84eed4a4a88032dcb5..f0622a731ed6b0b8f77b55b8bc796107bdcf7bd1 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -98,7 +98,7 @@ Music::get_length () const
       return *unsmob_moment (res);
     }
 
-  return *unsmob_moment (scm_call_1 (length_callback_, self_scm ()));
+  return Moment(0);
 }
 
 Moment

diff --git a/lily/stem.cc b/lily/stem.cc
index 6a1e2070912f60b828ec3ba81571b5a91f62079f..e79aabc56ef6efccedbae1bed456ac624a73dc56 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -516,6 +516,11 @@ Stem::height (SCM smob, SCM ax)
   if (Grob *b = get_beam (me))
     {
       Direction d = get_direction (me);
+      if (d == CENTER)
+       {
+         programming_error ("No stem direction");
+         d = UP;
+       }
       iv[d] += d * Beam::get_thickness (b) * 0.5 ;
     }
 

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 2b52cfd951f204b01c13a4ac60f9adaa4b792fd1..4578a7a481c8ab2037fa79d301a7c3557e90b2bd 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -556,7 +556,7 @@ Syntax @code{\\outputproperty @var{predicate} @var{prop}
 Syntax @code{\\times @var{fraction} @var{music}}, e.g.
 @code{\\times 2/3 @{ ... @}} for triplets.
  ")
-       (internal-class-name . "Time_scaled_music")
+       (internal-class-name . "Music_wrapper")
        (iterator-ctor . ,Time_scaled_music_iterator::constructor)
        (types . (time-scaled-music music-wrapper-music general-music))
        ))