Doc-de: update to notation manual 5

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 0107e7f436c6a9baefd7368615666d9e970684cf..c492e59c5540809829324fbf50bdcb6ad8f4ba88 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 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
@@ -121,7 +121,7 @@ Dynamic_engraver::listen_span_dynamic (Stream_event *ev)
 
   /* Cancel any ongoing crescendo, either explicitly by \! or
      implicitly by a new crescendo. Also avoid warning if cresc is
-     cancelled both implicitly and explicitly. */
+     canceled both implicitly and explicitly. */
   if ((d == STOP || current_cresc_ev_) && !accepted_spanevents_drul_[STOP])
     ASSIGN_EVENT_ONCE (accepted_spanevents_drul_[STOP], ev);
 }
@@ -167,9 +167,6 @@ Dynamic_engraver::process_music ()
       Axis_group_interface::add_element (line_spanner_, script_);
     }
 
-  Stream_event *stop_ev = accepted_spanevents_drul_ [STOP]
-                          ? accepted_spanevents_drul_[STOP] : script_ev_;
-
   if (accepted_spanevents_drul_[STOP] || script_ev_)
     {
       /*
@@ -193,10 +190,7 @@ Dynamic_engraver::process_music ()
           current_cresc_ev_ = 0;
         }
       else if (accepted_spanevents_drul_[STOP])
-        {
-          accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo"));
-          stop_ev = 0;
-        }
+        accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo"));
     }
 
   if (accepted_spanevents_drul_[START])
@@ -221,7 +215,7 @@ Dynamic_engraver::process_music ()
             TODO: Use symbols.
           */
 
-          SCM start_sym = current_cresc_ev_->get_property ("class");
+          SCM start_sym = scm_car (current_cresc_ev_->get_property ("class"));
           string start_type;
 
           if (start_sym == ly_symbol2scm ("decrescendo-event"))