* lily/stem.cc (head_count): Change function name. Change property

[lilypond.git] / lily / auto-beam-engraver.cc

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 54ac1c8ead3a3219796acf6fbce2f0c69c64df93..5126db27dbea7046bf1c20bb4c46a6fd4120ffee 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
@@ -13,7 +13,7 @@
 #include "stem.hh"
 #include "debug.hh"
 #include "engraver-group-engraver.hh"
-#include "bar.hh"
+#include "bar-line.hh"
 #include "rest.hh"
 #include "engraver.hh"
 #include "item.hh"
@@ -191,8 +191,8 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom)
 void
 Auto_beam_engraver::consider_begin (Moment test_mom)
 {
-  bool off = to_boolean (get_property ("noAutoBeaming"));
-  if (!stem_l_arr_p_ && ! off)
+  bool on = to_boolean (get_property ("autoBeaming"));
+  if (!stem_l_arr_p_ && on)
     {
       bool b = test_moment (START, test_mom);
       if (b)
@@ -206,7 +206,7 @@ Auto_beam_engraver::consider_end (Moment test_mom)
   if (stem_l_arr_p_)
     {
       /* Allow already started autobeam to end:
-        don't check for noAutoBeaming */
+        don't check for autoBeaming */
       bool b = test_moment (STOP, test_mom);
       if (b)
        end_beam ();
@@ -235,7 +235,7 @@ Auto_beam_engraver::create_beam_p ()
       Beam::add_stem (beam_p, (*stem_l_arr_p_)[i]);
     }
   
-  announce_grob (beam_p, 0);
+  announce_grob(beam_p, SCM_EOL);
 
   return beam_p;
 }
@@ -346,7 +346,7 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
        {
          end_beam ();
        }
-      else if (Bar::has_interface (info.grob_l_))
+      else if (Bar_line::has_interface (info.grob_l_))
        {
          end_beam ();
        }
@@ -370,7 +370,7 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
       /*
        Don't (start) auto-beam over empty stems; skips or rests
        */
-      if (!Stem::heads_i (stem_l))
+      if (!Stem::head_count (stem_l))
        {
          if (stem_l_arr_p_)
            end_beam ();
@@ -481,5 +481,5 @@ stemRightBeamCount.
 ",
 /* creats*/       "Beam",
 /* acks  */       "stem-interface rest-interface beam-interface bar-line-interface",
-/* reads */       "noAutoBeaming autoBeamSettings subdivideBeams",
+/* reads */       "autoBeaming autoBeamSettings subdivideBeams",
 /* write */       "");