quarter note beams

diff --git a/ChangeLog b/ChangeLog
index fc55e0ef80d8460c4e237fdbde59cd649d59369b..39be48aaa8bd1c8bb085a5f2d56b7cd836825a74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-07-13  Han-Wen  <hanwen@cs.uu.nl>
 
+       * lily/beam.cc (calc_stem_y): fix beams on quarter notes.
+
        * lily/stem-tremolo.cc (brew_molecule): add code for stem tremolos.
 
        * lily/auto-beam-engraver.cc (create_beam_p): remember Beam
@@ -22,7 +24,7 @@
        (quanting): add french beaming support (property french-beaming)
        (stem_beams): removed.
 
-2002-07-12  Mats Bengtsson  <matsb@s3.kth.se>
+i2002-07-12  Mats Bengtsson  <matsb@s3.kth.se>
 
        * lily/beam.cc (after_line_breaking): Set correct stem lengths
        also when beam positions are set manually.

diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly
index cf4ba665a4aac25090df2559110acc256108ff16..67601e418ea688cd81329ada35f1bd7863bf1680 100644 (file)
--- a/input/regression/beam-funky.ly
+++ b/input/regression/beam-funky.ly
@@ -5,7 +5,7 @@
 \score { \notes
 \relative c'
         {
-
+            \property Voice.Beam \set #'auto-knee-gap = #7
             \property Voice.subdivideBeams = ##t            
             \time 8/8
             [c,16  g'''16  

diff --git a/lily/beam.cc b/lily/beam.cc
index 2cd3887e2518a552a66a72d4607a9195e9ce6f9c..f505f25743b7d2b036372f157de2a3d45cf5b1eb 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -223,7 +223,8 @@ Beam::connect_beams (Grob *me)
            }
          while (flip (&d) != LEFT);
 
-         last_int =  new_slice;
+         if (!new_slice.empty_b())
+           last_int =  new_slice;
        }
       else
        {
@@ -1366,11 +1367,15 @@ Beam::calc_stem_y (Grob *me, Grob* s, Interval pos, bool french)
   Real stem_y = stem_y_beam0;
   if (french)
     {
-      stem_y += beam_space * where_are_the_whole_beams (beaming)[-my_dir];
+      Slice bm = where_are_the_whole_beams (beaming);
+      if (!bm.empty_b())
+       stem_y += beam_space * bm[-my_dir];
     }
   else
     {
-      stem_y += (Stem::beam_multiplicity(s)[my_dir]) * beam_space;
+      Slice bm = Stem::beam_multiplicity(s);
+      if (!bm.empty_b())
+       stem_y +=bm[my_dir] * beam_space;
     }
 
   return stem_y;

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index c32aeb71dc7937db2de0e1d389352e74ea79ffac..da6116ca6ac9e0a21dc244fcf4ae039ea32b585f 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -146,7 +146,7 @@
        (slope-limit . 0.2)
        (flag-width-function . ,default-beam-flag-width-function)
        (damping . 1)
-;;     (auto-knee-gap . 7)
+       (auto-knee-gap . 7)
        
        (font-name . "cmr10")
        (space-function . ,Beam::space_function)