* lily/font-select.cc: new file handle font selection routines.

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

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index bce4eac95687ba275dcee37e064f11bd02341b0b..1d6af1f1fa6994dd1b6d92944c272fd9e6dd64ee 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -3,12 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2003 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
 #include "beaming.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "beam.hh"
 #include "stem.hh"
 #include "warn.hh"
@@ -18,6 +18,7 @@
 #include "engraver.hh"
 #include "item.hh"
 #include "spanner.hh"
+#include "duration.hh"
 
 /*
   TODO: figure what to do in grace?
@@ -152,23 +153,23 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom)
     }
 
   /* second guess: property generic time exception */
-  SCM m = gh_assoc (gh_append3 (function, wild, time), settings);
+  SCM m = scm_assoc (gh_append3 (function, wild, time), settings);
   
   if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
     moment = * unsmob_moment (ly_cdr (m));
 
   /* third guess: property time exception, specific for duration type */
-  m = gh_assoc (gh_append3 (function, type, time), settings);
+  m = scm_assoc (gh_append3 (function, type, time), settings);
   if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
     moment = * unsmob_moment (ly_cdr (m));
 
   /* fourth guess [user override]: property plain generic */
-  m = gh_assoc (gh_append3 (function, wild, wild), settings);
+  m = scm_assoc (gh_append3 (function, wild, wild), settings);
   if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
     moment = * unsmob_moment (ly_cdr (m));
 
   /* fifth guess [user override]: property plain, specific for duration type */
-  m = gh_assoc (gh_append3 (function, type, wild), settings);
+  m = scm_assoc (gh_append3 (function, type, wild), settings);
   if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
     moment = * unsmob_moment (ly_cdr (m));
   
@@ -267,7 +268,6 @@ Auto_beam_engraver::begin_beam ()
   beat_length_ = *unsmob_moment (get_property ("beatLength"));
 }
 
-
 void
 Auto_beam_engraver::junk_beam () 
 {
@@ -290,7 +290,6 @@ Auto_beam_engraver::end_beam ()
       junk_beam ();
     }
   else
-    
     {
       finished_beam_ = create_beam ();
       if (finished_beam_)
@@ -375,9 +374,8 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
   if (Stem::has_interface (info.grob_))
     {
       Item* stem = dynamic_cast<Item *> (info.grob_);
-                                      
-      Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.music_cause ());
-      if (!rhythmic_req)
+      Music* m = info.music_cause ();
+      if (!m->is_mus_type ("rhythmic-event"))
        {
          programming_error ("Stem must have rhythmic structure");
          return;
@@ -400,7 +398,7 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
          return ;
        }
              
-      int durlog  = unsmob_duration (rhythmic_req->get_mus_property ("duration"))->duration_log ();
+      int durlog  = unsmob_duration (m->get_mus_property ("duration"))->duration_log ();
       
       if (durlog <= 2)
        {
@@ -417,7 +415,7 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
        return ;
        
       
-      Moment dur = unsmob_duration (rhythmic_req->get_mus_property ("duration"))->length_mom ();
+      Moment dur = unsmob_duration (m->get_mus_property ("duration"))->get_length ();
       /* FIXME:
 
        This comment has been here since long:
@@ -453,7 +451,7 @@ Auto_beam_engraver::acknowledge_grob (Grob_info info)
                             durlog - 2);
       stems_->push (stem);
       last_add_mom_ = now;
-      extend_mom_ = (extend_mom_ >? now) + rhythmic_req->length_mom ();
+      extend_mom_ = (extend_mom_ >? now) + m->get_length ();
     }
 }
 
@@ -481,22 +479,19 @@ Auto_beam_engraver::process_acknowledged_grobs ()
            }
        }    
     }
-
-  /*
-    count_++ -> 
-
-        auto-beam-engraver.cc:459: warning: value computed is not used (gcc: 2.96) */
-  count_ = count_ + 1;
+  
+  count_ ++;
 }
 
 ENTER_DESCRIPTION (Auto_beam_engraver,
-/* descr */       "Generate beams based on measure characteristics and observed
-Stems.  Uses beatLength, measureLength and measurePosition to decide
-when to start and stop a beam.  Overriding beaming is done through
-@ref{Stem_engraver} properties stemLeftBeamCount and
-stemRightBeamCount.
-",
+/* descr */       "Generate beams based on measure characteristics and observed "
+"Stems.  Uses beatLength, measureLength and measurePosition to decide "
+"when to start and stop a beam.  Overriding beaming is done through "
+"@ref{Stem_engraver} properties stemLeftBeamCount and "
+"stemRightBeamCount. "
+,
 /* creats*/       "Beam",
-/* acks  */       "stem-interface rest-interface beam-interface bar-line-interface",
+/* accepts */     "",
+/* acks  */      "stem-interface rest-interface beam-interface bar-line-interface",
 /* reads */       "autoBeaming autoBeamSettings beatLength subdivideBeams",
 /* write */       "");