From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 14 Jan 2005 12:45:24 +0000 (+0000)
Subject: * lily/stem.cc (height): robustness fix.
X-Git-Tag: release/2.5.14~261
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bdbafd18cf0bdeab1a29692205b5ac26febe53d4;p=lilypond.git

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

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

diff --git a/ChangeLog b/ChangeLog
index c1448ec206..df15f42c6e 100644
--- 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 db31a9aec1..f0622a731e 100644
--- 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 6a1e207091..e79aabc56e 100644
--- 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 2b52cfd951..4578a7a481 100644
--- 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))
 	))