* lily/context-def.cc (path_to_acceptable_context): bugfix, depth

[lilypond.git] / lily / stem-engraver.cc

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 710d993f965d7859e3dd4a0bdd05fa91b5afa6be..d665a96d068d45588ae0545b0037910665912e64 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -1,15 +1,14 @@
 /*
-  stem-grav.cc -- implement Stem_engraver
+  stem-engraver.cc -- implement Stem_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "context.hh"
 #include "directional-element-interface.hh"
 #include "engraver.hh"
-#include "event.hh"
 #include "item.hh"
 #include "misc.hh"
 #include "rhythmic-head.hh"
@@ -18,20 +17,21 @@
 #include "stem-tremolo.hh"
 #include "stem.hh"
 
-
 /**
-  Make stems upon receiving noteheads.
- */
+   Make stems upon receiving noteheads.
+*/
 class Stem_engraver : public Engraver
 {
-  Grob  *stem_;
+  Grob *stem_;
   Grob *tremolo_;
   Music *rhythmic_ev_;
-  Music* tremolo_ev_;
+  Music *tremolo_ev_;
+
   TRANSLATOR_DECLARATIONS (Stem_engraver);
 
 protected:
   void make_stem (Grob_info);
+
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
   virtual bool try_music (Music *);
@@ -42,7 +42,7 @@ Stem_engraver::Stem_engraver ()
   tremolo_ev_ = 0;
   stem_ = 0;
   tremolo_ = 0;
-  rhythmic_ev_ =0;
+  rhythmic_ev_ = 0;
 }
 
 void
@@ -55,7 +55,7 @@ Stem_engraver::make_stem (Grob_info gi)
   /*
     docme: why do we take duration-log from request, not from note
     head?
-   */
+  */
   int duration_log = gi.music_cause ()->duration_log ();
   stem_->set_property ("duration-log", scm_int2num (duration_log));
 
@@ -85,7 +85,7 @@ Stem_engraver::make_stem (Grob_info gi)
        - (duration_log > 2 ? duration_log - 2 : 0);
       if (tremolo_flags <= 0)
        {
-         tremolo_ev_->origin ()->warning (_("tremolo duration is too long"));
+         tremolo_ev_->origin ()->warning (_ ("tremolo duration is too long"));
          tremolo_flags = 0;
        }
 
@@ -94,7 +94,7 @@ Stem_engraver::make_stem (Grob_info gi)
          tremolo_ = make_item ("StemTremolo", tremolo_ev_->self_scm ());
 
          /* The number of tremolo flags is the number of flags of the
-           tremolo-type minus the number of flags of the note itself.  */
+            tremolo-type minus the number of flags of the note itself.  */
          tremolo_->set_property ("flag-count", scm_int2num (tremolo_flags));
          tremolo_->set_parent (stem_, X_AXIS);
          stem_->set_property ("tremolo-flag", tremolo_->self_scm ());
@@ -111,20 +111,19 @@ Stem_engraver::acknowledge_grob (Grob_info gi)
       if (Rhythmic_head::get_stem (gi.grob_))
        return;
 
-      Music * cause = gi.music_cause ();
+      Music *cause = gi.music_cause ();
       if (!cause)
-       return ;
-      
+       return;
+
       if (!stem_)
        make_stem (gi);
-      
+
       int duration_log = cause->duration_log ();
       if (Stem::duration_log (stem_) != duration_log)
        {
          // FIXME: 
-         gi.music_cause ()->origin ()->warning (_f ("Adding note head to incompatible stem (type = %d)", 1 << Stem::duration_log (stem_)));
-         
-         gi.music_cause ()->origin ()->warning (_f ("Don't you want polyphonic voices instead?"));
+         gi.music_cause ()->origin ()->warning (_f ("adding note head to incompatible stem (type = %d)", 1 << Stem::duration_log (stem_)));
+         gi.music_cause ()->origin ()->warning (_f ("maybe input should specify polyphonic voices"));
        }
 
       Stem::add_head (stem_, gi.grob_);
@@ -141,13 +140,13 @@ Stem_engraver::stop_translation_timestep ()
       SCM prop = get_property ("stemLeftBeamCount");
       if (scm_is_number (prop))
        {
-         Stem::set_beaming (stem_,scm_to_int (prop),LEFT);
+         Stem::set_beaming (stem_, scm_to_int (prop), LEFT);
          context ()->unset_property (ly_symbol2scm ("stemLeftBeamCount"));
        }
       prop = get_property ("stemRightBeamCount");
       if (scm_is_number (prop))
        {
-         Stem::set_beaming (stem_,scm_to_int (prop), RIGHT);
+         Stem::set_beaming (stem_, scm_to_int (prop), RIGHT);
          context ()->unset_property (ly_symbol2scm ("stemRightBeamCount"));
        }
       stem_ = 0;
@@ -166,11 +165,11 @@ Stem_engraver::try_music (Music *m)
   return false;
 }
 
-ENTER_DESCRIPTION (Stem_engraver,
-/* descr */       "Create stems and single-stem tremolos.  It also works together with "
-"the beam engraver for overriding beaming.",
-/* creats*/       "Stem StemTremolo",
-/* accepts */     "tremolo-event",
-/* acks  */      "rhythmic-head-interface",
-/* reads */       "tremoloFlags stemLeftBeamCount stemRightBeamCount",
-/* write */       "");
+ADD_TRANSLATOR (Stem_engraver,
+               /* descr */ "Create stems and single-stem tremolos.  It also works together with "
+               "the beam engraver for overriding beaming.",
+               /* creats*/ "Stem StemTremolo",
+               /* accepts */ "tremolo-event",
+               /* acks  */ "rhythmic-head-interface",
+               /* reads */ "tremoloFlags stemLeftBeamCount stemRightBeamCount",
+               /* write */ "");