lilypond-1.3.7

diff --git a/CHANGES b/CHANGES
index 97960cac4eece2849f72958f344e9ac65d097f92..1f9988ce1f1ada8e262b245526dc1e9be9ab3ce2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,31 @@
+
+pl 6.uu2
+       - bf: PS font selecting.
+
+pl 6.uu1
+       - bf: ls-latex
+       - mudela-book --no-pictures
+       - bf: ly2dvi
+       - convert-mudela: beamAuto moment syntax. 
+
+pl 6.jcn3
+       - fixed scm output
+
+pl 6.jcn2
+       - half-baken ly-gulp-file in scm
+       - resurrected scm output through guile
+
+pl 5.mb1
+       - bf: version of init.sly, init.fly
+       - Clarify necessary version of texinfo
+       - bf: texi files, minor errors and syntax compatible with 
+         older makeinfo
+
+pl 6.jcn1
+       - bf: scm output
+
+*******
+
 pl 5.hwn2
        - Bach preludes: mutopification
        - dots are Directional_element too; use \property dotDirection

diff --git a/lily/stem-info.cc b/lily/stem-info.cc
index d7e80d24250029c46f3df123d5ffc548325fb49e..6269efb796bdac48142c5d8c8fc916cfae42585a 100644 (file)
--- a/lily/stem-info.cc
+++ b/lily/stem-info.cc
@@ -10,7 +10,7 @@
 #include "proto.hh"
 #include "misc.hh"
 #include "cross-staff.hh"
-
+#include "debug.hh"
 #include "stem.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
@@ -41,8 +41,16 @@ Stem_info::Stem_info (Stem*s, int mult)
   set_direction (stem_l_->get_direction ());
   SCM bd = stem_l_->remove_elt_property ("beam-dir");
   
-  beam_dir_ = gh_scm2int (bd);
-
+  if (gh_number_p (bd))
+    {
+      beam_dir_ = gh_scm2int (bd);
+    }
+  else
+    {
+      programming_error ("Beam direction not set."); 
+      beam_dir_ = UP;          //  GURAUGRNAGURAGU! urg !
+    }
+  
   Paper_def* paper_l = stem_l_->paper_l ();
   Real internote_f = stem_l_->staff_line_leading_f ()/2;
   Real interbeam_f = paper_l->interbeam_f (mult_i_);