Update source file headers. Fixes using standard GNU package conventions.

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 2453188fff76d573dc0584b024b039def46dacd8..1b83b07a85ce638cab4ff0c448318779c01dbde5 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -1,17 +1,26 @@
 /*
-  engraver.cc -- implement Engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  Sourcefile of GNU LilyPond music type setter
+  Copyright (C) 1997--2009 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"
 
 #include "context.hh"
 #include "international.hh"
-#include "item.hh"
-#include "lilypond-key.hh"
 #include "music.hh"
 #include "paper-column.hh"
 #include "score-engraver.hh"
@@ -72,7 +81,8 @@ Engraver::announce_end_grob (Grob *e, SCM cause)
     {
       cause = m->to_event ()->unprotect ();
     }
-  if (unsmob_stream_event (cause) || unsmob_grob (cause))
+  if (e->get_property ("cause") == SCM_EOL
+      && (unsmob_stream_event (cause) || unsmob_grob (cause)))
     e->set_property ("cause", cause);
 
   Grob_info i (this, e);
@@ -92,38 +102,47 @@ Engraver::Engraver ()
 static SCM creation_callback = SCM_EOL;
 LY_DEFINE (ly_set_grob_creation_callback, "ly:set-grob-creation-callback",
           1, 0, 0, (SCM cb),
-          "Specify a procedure that will be called every time a new grob "
-          "is created. The callback will receive as arguments the grob "
-          "that was created, the name of the C++ source file that caused "
-          "the grob to be created and the corresponding line number in the "
-          "C++ source file.")
+          "Specify a procedure that will be called every time a new grob"
+          " is created.  The callback will receive as arguments the grob"
+          " that was created, the name of the C++ source file that caused"
+          " the grob to be created, and the corresponding line number in"
+          " the C++ source file.")
 {
-  if (!ly_is_procedure (cb))
-    warning (_ ("not setting creation callback: not a procedure"));
-  else
-    creation_callback = cb;
+  LY_ASSERT_TYPE (ly_is_procedure, cb, 1);
 
-  return SCM_EOL;
+  creation_callback = cb;
+
+  return SCM_UNSPECIFIED;
 }
 #endif
 
 Grob *
-Engraver::internal_make_grob (SCM symbol, SCM cause, char const *name, char const *file, int line, char const *fun)
+Engraver::internal_make_grob (SCM symbol,
+                             SCM cause,
+                             char const * /* name */,
+                             char const *file,
+                             int line,
+                             char const *fun)
 {
+#ifdef NDEBUG
+  (void)file;
+  (void)line;
+  (void)fun;
+#endif
+
   SCM props = updated_grob_properties (context (), symbol);
 
-  Object_key const *key = context ()->get_grob_key (name);
   Grob *grob = 0;
 
   SCM handle = scm_sloppy_assq (ly_symbol2scm ("meta"), props);
   SCM klass = scm_cdr (scm_sloppy_assq (ly_symbol2scm ("class"), scm_cdr (handle)));
 
   if (klass == ly_symbol2scm ("Item"))
-    grob = new Item (props, key);
+    grob = new Item (props);
   else if (klass == ly_symbol2scm ("Spanner"))
-    grob = new Spanner (props, key);
+    grob = new Spanner (props);
   else if (klass == ly_symbol2scm ("Paper_column"))
-    grob = new Paper_column (props, key);
+    grob = new Paper_column (props);
 
   assert (grob);
   announce_grob (grob, cause);
@@ -131,15 +150,17 @@ Engraver::internal_make_grob (SCM symbol, SCM cause, char const *name, char cons
 #ifndef NDEBUG
   if (ly_is_procedure (creation_callback))
     scm_apply_0 (creation_callback,
-                scm_list_n (grob->self_scm (), scm_makfrom0str (file),
-                            scm_from_int (line), scm_makfrom0str (fun), SCM_UNDEFINED));
+                scm_list_n (grob->self_scm (), scm_from_locale_string (file),
+                            scm_from_int (line), scm_from_locale_string (fun), SCM_UNDEFINED));
 #endif
 
   return grob;
 }
 
 Item *
-Engraver::internal_make_item (SCM x, SCM cause, char const *name, char const *file, int line, char const *fun)
+Engraver::internal_make_item (SCM x, SCM cause,
+                             char const *name,
+                             char const *file, int line, char const *fun)
 {
   Item *it = dynamic_cast<Item *> (internal_make_grob (x, cause, name, file, line, fun));
   assert (it);
@@ -147,7 +168,8 @@ Engraver::internal_make_item (SCM x, SCM cause, char const *name, char const *fi
 }
 
 Paper_column *
-Engraver::internal_make_column (SCM x, char const *name, char const *file, int line, char const *fun)
+Engraver::internal_make_column (SCM x, char const *name,
+                               char const *file, int line, char const *fun)
 {
   return dynamic_cast<Paper_column *> (internal_make_grob (x, SCM_EOL, name, file, line, fun));
 }
@@ -163,9 +185,16 @@ Engraver::internal_make_spanner (SCM x, SCM cause, char const *name, char const
 #include "translator.icc"
 
 ADD_TRANSLATOR (Engraver,
-               "Base class for engravers. Does nothing, so it is not used.",
-               "",
+               /* doc */
+               "Base class for engravers.  Does nothing, so it is not used.",
+
+               /* create */
                "",
+
+               /* read */
                "",
-               "");
+
+               /* write */
+               ""
+               );