Imported Upstream version 2.14.2

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

diff --git a/lily/grace-engraver.cc b/lily/grace-engraver.cc
index c377166d63198ba5fbb905f3e5ba2a032df55616..5055b86807dbb445ea91417cbbc8b6ec14c783d0 100644 (file)
--- a/lily/grace-engraver.cc
+++ b/lily/grace-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  grace-engraver.cc -- implement Grace_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2009 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"
@@ -80,10 +91,8 @@ Grace_engraver::consider_change_grace_settings ()
                = scm_cons (scm_cons (c->self_scm (), entry), grace_settings_);
            }
          else
-           {
-             programming_error ("cannot find context: ");
-             scm_display (context_name, scm_current_error_port ());
-           }
+             programming_error ("cannot find context from graceSettings: "
+                                + ly_symbol2string (context_name));
        }
     }