($(outdir)/%.pdf): add DVIPS_FLAGS. This will

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

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 8a93f264343059be76375c96d88d5dc7024a5071..a026118b98667e4b2dc3406725988d42bd772aa6 100644 (file)
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2002--2003 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2004 Juergen Reuter <reuter@ipd.uka.de>
   
  */
 #include "ligature-engraver.hh"
@@ -77,15 +77,7 @@ Ligature_engraver::Ligature_engraver ()
 bool
 Ligature_engraver::try_music (Music *m)
 {
-  if (m->is_mus_type ("abort-event"))
-    {
-      reqs_drul_[START] = 0;
-      reqs_drul_[STOP] = 0;
-      if (ligature_)
-       ligature_->suicide ();
-      ligature_ = 0;
-    }
-  else if (m->is_mus_type ("ligature-event"))
+  if (m->is_mus_type ("ligature-event"))
     {
       Direction d = to_dir (m->get_mus_property ("span-direction"));
       reqs_drul_[d] = m;
@@ -107,46 +99,46 @@ Ligature_engraver::create_ligature_spanner ()
  * This method should do something that comes close to the following
  * .ly snippet:
  *
- * \property Voice.NoteHead \override #'molecule-callback =
+ * \property Voice.NoteHead \override #'print-function =
  *     < value of #'ligature-primitive-callback of Voice.NoteHead >
  *
  * TODO: What we are doing here on the c++ level, should actually be
  * performed on the SCM level.  However, I do not know how to teach
- * lilypond to apply an \override and \revert on #'molecule-callback,
+ * lilypond to apply an \override and \revert on #'print-function,
  * whenever lily encounters a \[ and \] in an .ly file, respectively.
  * Also encounter, that lily should not crash if a user erronously
  * nests \[ and \].
  */
 void
-Ligature_engraver::override_molecule_callback ()
+Ligature_engraver::override_stencil_callback ()
 {
-  SCM symbol = ly_symbol2scm ("NoteHead");
-  SCM target_callback = ly_symbol2scm ("molecule-callback");
+  SCM target_callback = ly_symbol2scm ("print-function");
   SCM source_callback = ly_symbol2scm ("ligature-primitive-callback");
-  SCM noteHeadProperties = daddy_trans_->get_property ("NoteHead");
+  SCM noteHeadProperties = updated_grob_properties (daddy_trans_, ly_symbol2scm ("NoteHead"));
   SCM value = ly_cdr (scm_sloppy_assq (source_callback, noteHeadProperties));
-  daddy_trans_->execute_pushpop_property (symbol, target_callback, value);
+  execute_pushpop_property (daddy_trans_, ly_symbol2scm ("NoteHead"),
+                           target_callback, value);
 }
 
 /*
  * This method should do something that comes close to the following
  * .ly snippet:
  *
- * \property Voice.NoteHead \revert #'molecule-callback
+ * \property Voice.NoteHead \revert #'print-function
  *
  * TODO: What we are doing here on the c++ level, should actually be
  * performed on the SCM level.  However, I do not know how to teach
- * lilypond to apply an \override and \revert on #'molecule-callback,
+ * lilypond to apply an \override and \revert on #'print-function,
  * whenever lily encounters a \[ and \] in an .ly file, respectively.
  * Also encounter, that lily should not crash if a user erronously
  * nests \[ and \].
  */
 void
-Ligature_engraver::revert_molecule_callback ()
+Ligature_engraver::revert_stencil_callback ()
 {
   SCM symbol = ly_symbol2scm ("NoteHead");
-  SCM key = ly_symbol2scm ("molecule-callback");
-  daddy_trans_->execute_pushpop_property (symbol, key, SCM_UNDEFINED);
+  SCM key = ly_symbol2scm ("print-function");
+  execute_pushpop_property (daddy_trans_, symbol, key, SCM_UNDEFINED);
 }
 
 void
@@ -174,7 +166,7 @@ Ligature_engraver::process_music ()
       finished_ligature_ = ligature_;
       primitives_.clear ();
       ligature_ = 0;
-      revert_molecule_callback ();
+      revert_stencil_callback ();
     }
   last_bound_ = unsmob_grob (get_property ("currentMusicalColumn"));
 
@@ -214,7 +206,7 @@ Ligature_engraver::process_music ()
       ligature_start_mom_ = now_mom ();
       
       announce_grob(ligature_, reqs_drul_[START]->self_scm());
-      override_molecule_callback ();
+      override_stencil_callback ();
     }
 }
 
@@ -278,7 +270,7 @@ Ligature_engraver::acknowledge_grob (Grob_info info)
       if (Note_head::has_interface (info.grob_))
        {
          primitives_.push (info);
-         info.grob_->set_grob_property ("molecule-callback",
+         info.grob_->set_grob_property ("print-function",
                                         brew_ligature_primitive_proc);
        }
       if (Rest::has_interface (info.grob_))
@@ -294,7 +286,7 @@ 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 abort-event",
+/* accepts */     "ligature-event",
 /* acks  */      "note-head-interface rest-interface",
 /* reads */       "",
 /* write */       "");