lilypond-1.2.3

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index c6177c5f7a6725338621e9d625f6abf6c0440647..e72ffb29ab13891fcadefd354191cb3361809ffc 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -297,15 +297,15 @@ Auto_beam_engraver::acknowledge_element (Score_element_info info)
     {
       if (Beam *b = dynamic_cast<Beam *> (info.elem_l_))
        {
-         junk_beam ();
+         end_beam ();
        }
       else if (Chord_tremolo *b = dynamic_cast<Chord_tremolo*> (info.elem_l_))
        {
-         junk_beam ();
+         end_beam ();
        }
       else if (Bar *b = dynamic_cast<Bar *> (info.elem_l_))
        {
-         junk_beam ();
+         end_beam ();
        }
       else if (Rest* rest_l = dynamic_cast<Rest *> (info.elem_l_))
        {

diff --git a/ly/auto-beam-settings.ly b/ly/auto-beam-settings.ly
index fb80c544d2d8d7cdf7292265ee1bfcff003970ab..dfdd44297e4015dec431427c87315c728cc3eab3 100644 (file)
--- a/ly/auto-beam-settings.ly
+++ b/ly/auto-beam-settings.ly
@@ -26,7 +26,7 @@ time3_2beamAutoEnd_16 = "1/4";
 time3_2beamAutoEnd_32 = "1/8";
 
 time3_4beamAutoBegin_8 = "1/4";
-time3_4beamAutoEnd_8 = "3/4";
+time3_4beamAutoEnd = "3/4";
 time3_4beamAutoBegin_16 = "1/16";
 time3_4beamAutoEnd_16 = "1/4";
 %time3_4beamAutoBegin_32 = "1/8";
@@ -40,25 +40,25 @@ time3_8beamAutoEnd = "3/8";
 %   end beams with 32th notes each 1/8 note
 %   end beams with 1/8 triplets each 1/4 note
 
-time4_4beamAutoEnd_8 = "1/2";
+time4_4beamAutoEnd = "1/2";
 time4_4beamAutoEnd_12 = "1/4";
 time4_4beamAutoEnd_32 = "1/8";
 
-time4_8beamAutoEnd_8 = "1/4";
+time4_8beamAutoEnd = "1/4";
 time4_8beamAutoEnd_16 = "1/4";
 time4_8beamAutoEnd_32 = "1/8";
 
 time4_16beamAutoEnd = "1/8";
 
-time6_8beamAutoEnd_8 = "3/8";
+time6_8beamAutoEnd = "3/8";
 time6_8beamAutoEnd_16 = "3/8";
 time6_8beamAutoEnd_32 = "1/8";
 
-time9_8beamAutoEnd_8 = "3/8";
+time9_8beamAutoEnd = "3/8";
 time9_8beamAutoEnd_16 = "3/8";
 time9_8beamAutoEnd_32 = "1/8";
 
-time12_8beamAutoEnd_8 = "3/8";
+time12_8beamAutoEnd = "3/8";
 time12_8beamAutoEnd_16 = "3/8";
 time12_8beamAutoEnd_32 = "1/8";
 
@@ -86,4 +86,3 @@ see also input/test/auto-beam-override.ly
 
 %}
 
-