X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-engraver.cc;h=137040766a5f6a1c710595b350f1a6dd039c4691;hb=d8c3e0af38c0a9645fec2e49ecf32c8170f70e0b;hp=6ca9368d8688def88f123241518690948e3222c5;hpb=68f8545bd6a0221ee1100336e4ad49399a7ffaa4;p=lilypond.git

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 6ca9368d86..137040766a 100644
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  stem-engraver.cc -- implement Stem_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
@@ -23,9 +34,6 @@
 
 #include "translator.icc"
 
-/**
-   Make stems upon receiving noteheads.
-*/
 class Stem_engraver : public Engraver
 {
   Grob *stem_;
@@ -58,26 +66,17 @@ Stem_engraver::make_stem (Grob_info gi)
      stem needs a rhythmic structure to fit it into a beam.  */
   stem_ = make_item ("Stem", gi.grob ()->self_scm ());
 
-  /*
-    we take the duration log from the Event, since the duration-log
-    for a note head is always <= 2.
-  */
-  Stream_event *ev = gi.event_cause ();
-  Duration *dur = unsmob_duration (ev->get_property ("duration"));
-
-  stem_->set_property ("duration-log", dur ? scm_from_int (dur->duration_log ()) : 0);
-
   if (tremolo_ev_)
     {
       /* Stem tremolo is never applied to a note by default,
-	 is must me requested.  But there is a default for the
+	 it must be requested.  But there is a default for the
 	 tremolo value:
 
 	 c4:8 c c:
 
-	 the first and last (quarter) note bothe get one tremolo flag.  */
+	 the first and last (quarter) note both get one tremolo flag.  */
       int requested_type
-	= scm_to_int (tremolo_ev_->get_property ("tremolo-type"));
+	= robust_scm2int (tremolo_ev_->get_property ("tremolo-type"), 0);
       SCM f = get_property ("tremoloFlags");
       if (!requested_type)
 	{
@@ -89,6 +88,14 @@ Stem_engraver::make_stem (Grob_info gi)
       else
 	context ()->set_property ("tremoloFlags", scm_from_int (requested_type));
 
+
+      /*
+	we take the duration log from the Event, since the duration-log
+	for a note head is always <= 2.
+      */
+      Stream_event *ev = gi.event_cause ();
+      Duration *dur = unsmob_duration (ev->get_property ("duration"));
+      
       int tremolo_flags = intlog2 (requested_type) - 2
 	- (dur->duration_log () > 2 ? dur->duration_log () - 2 : 0);
       if (tremolo_flags <= 0)
@@ -132,7 +139,7 @@ Stem_engraver::acknowledge_rhythmic_head (Grob_info gi)
       // FIXME: 
       gi.event_cause ()->origin ()->warning (_f ("adding note head to incompatible stem (type = %d)",
 						 1 << Stem::duration_log (stem_)));
-      gi.event_cause ()->origin ()->warning (_f ("maybe input should specify polyphonic voices"));
+      gi.event_cause ()->origin ()->warning (_ ("maybe input should specify polyphonic voices"));
     }
 
   Stem::add_head (stem_, gi.grob ());
@@ -172,14 +179,19 @@ Stem_engraver::listen_tremolo (Stream_event *ev)
 ADD_ACKNOWLEDGER (Stem_engraver, rhythmic_head);
 
 ADD_TRANSLATOR (Stem_engraver,
-		/* doc */ "Create stems and single-stem tremolos.  It also works together with "
-		"the beam engraver for overriding beaming.",
+		/* doc */
+		"Create stems and single-stem tremolos.  It also works"
+		" together with the beam engraver for overriding beaming.",
+
 		/* create */
 		"Stem "
 		"StemTremolo ",
-		/* accept */ "tremolo-event",
+
 		/* read */
 		"tremoloFlags "
 		"stemLeftBeamCount "
 		"stemRightBeamCount ",
-		/* write */ "");
+
+		/* write */
+		""
+		);