*** empty log message ***

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

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 5e2f63ff0ae5250a7c782d32c7333486502121e2..609978af4a65a604528c8bcabcfff7d6233a4b21 100644 (file)
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -1,12 +1,13 @@
-/*   
+/*
   ligature-engraver.cc -- implement Ligature_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2002--2004 Juergen Reuter <reuter@ipd.uka.de>
-  
- */
+
+  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+*/
+
 #include "ligature-engraver.hh"
+
 #include "spanner.hh"
 #include "score-engraver.hh"
 #include "note-head.hh"
@@ -14,7 +15,6 @@
 #include "warn.hh"
 #include "context.hh"
 
-
 /*
  * This abstract class provides the general framework for ligatures of
  * any kind.  It cares for handling start/stop ligatures requests and
@@ -58,7 +58,7 @@
  * Mensural_ligature_engraver) to the proper translator
  * (e.g. VoiceContext) to choose between various representations.
  * Since adding/removing an engraver to a translator is a global
- * action in the paper block, you can not mix various representations
+ * action in the layout block, you cannot mix various representations
  * _within_ the same score.  Hence, for selecting a representation,
  * one would rather like to have a property that can be set e.g. for
  * several staves individually.  However, it seems that this approach
@@ -115,9 +115,9 @@ Ligature_engraver::override_stencil_callback ()
 {
   SCM target_callback = ly_symbol2scm ("print-function");
   SCM source_callback = ly_symbol2scm ("ligature-primitive-callback");
-  SCM noteHeadProperties = updated_grob_properties (daddy_context_, ly_symbol2scm ("NoteHead"));
-  SCM value = ly_cdr (scm_sloppy_assq (source_callback, noteHeadProperties));
-  execute_pushpop_property (daddy_context_, ly_symbol2scm ("NoteHead"),
+  SCM noteHeadProperties = updated_grob_properties (context (), ly_symbol2scm ("NoteHead"));
+  SCM value = scm_cdr (scm_sloppy_assq (source_callback, noteHeadProperties));
+  execute_pushpop_property (context (), ly_symbol2scm ("NoteHead"),
                            target_callback, value);
 }
 
@@ -139,7 +139,7 @@ Ligature_engraver::revert_stencil_callback ()
 {
   SCM symbol = ly_symbol2scm ("NoteHead");
   SCM key = ly_symbol2scm ("print-function");
-  execute_pushpop_property (daddy_context_, symbol, key, SCM_UNDEFINED);
+  execute_pushpop_property (context (), symbol, key, SCM_UNDEFINED);
 }
 
 void
@@ -187,11 +187,11 @@ Ligature_engraver::process_music ()
 
       prev_start_req_ = reqs_drul_[START];
       ligature_ = create_ligature_spanner ();
-      brew_ligature_primitive_proc =
-       ligature_->get_property ("ligature-primitive-callback");
+      brew_ligature_primitive_proc
+       = ligature_->get_property ("ligature-primitive-callback");
       if (brew_ligature_primitive_proc == SCM_EOL)
        {
-         warning ("Ligature_engraver: ligature-primitive-callback undefined");
+         programming_error ("Ligature_engraver: ligature-primitive-callback undefined");
        }
 
       Grob *bound = unsmob_grob (get_property ("currentMusicalColumn"));
@@ -205,8 +205,9 @@ Ligature_engraver::process_music ()
        }
 
       ligature_start_mom_ = now_mom ();
-      
-      announce_grob(ligature_, reqs_drul_[START]->self_scm());
+
+      // TODO: dump cause into make_item/spanner. 
+      // announce_grob (ligature_, reqs_drul_[START]->self_scm ());
       override_stencil_callback ();
     }
 }
@@ -272,11 +273,11 @@ Ligature_engraver::acknowledge_grob (Grob_info info)
        {
          primitives_.push (info);
          info.grob_->set_property ("print-function",
-                                        brew_ligature_primitive_proc);
+                                   brew_ligature_primitive_proc);
        }
       if (Rest::has_interface (info.grob_))
        {
-         info.music_cause ()->origin ()->warning (_ ("ligature may not contain rest; ignoring rest"));
+         info.music_cause ()->origin ()->warning (_ ("ignoring rest: ligature may not contain rest"));
          prev_start_req_->origin ()->warning (_ ("ligature was started here"));
          // TODO: maybe better should stop ligature here rather than
          // ignoring the rest?
@@ -284,10 +285,10 @@ Ligature_engraver::acknowledge_grob (Grob_info info)
     }
 }
 
-ENTER_DESCRIPTION (Ligature_engraver,
-/* descr */       "Abstract class; a concrete subclass handles Ligature_events by engraving Ligatures in a concrete style.",
-/* creats */      "",
-/* accepts */     "ligature-event",
-/* acks  */      "note-head-interface rest-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Ligature_engraver,
+               /* descr */ "Abstract class; a concrete subclass handles Ligature_events by engraving Ligatures in a concrete style.",
+               /* creats */ "",
+               /* accepts */ "ligature-event",
+               /* acks  */ "note-head-interface rest-interface",
+               /* reads */ "",
+               /* write */ "");