Build: Fix dependencies for ly-grammar.txt (issue 3577).

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 06f16cf8a83bd52a80cebf22017650f138c3be62..0a718f8f025fde752d3ccac7dc92237cefc51bf9 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);
 }
@@ -215,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"))
@@ -380,7 +380,7 @@ Dynamic_engraver::typeset_all ()
       else if (!r && !l)
         {
           /*
-            This is a isolated dynamic apparently, and does not even have
+            This is an isolated dynamic apparently, and does not even have
             any interesting support item.
           */
           Grob *cc = unsmob_grob (get_property ("currentMusicalColumn"));