small fixes

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

diff --git a/lily/a2-engraver.cc b/lily/a2-engraver.cc
index 39a6a9ff3a19b2cb827171aa3a6a80a626777744..51d1183ec13e78118885c9a6e38360da573acb9e 100644 (file)
--- a/lily/a2-engraver.cc
+++ b/lily/a2-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
@@ -15,6 +15,7 @@
 #include "side-position-interface.hh"
 #include "directional-element-interface.hh"
 #include "multi-measure-rest.hh"
+#include "tie.hh"
 
 class A2_engraver : public Engraver
 {
@@ -55,7 +56,7 @@ A2_engraver::create_grobs ()
        {
          text_p_ = new Item (get_property ("TextScript"));
          Side_position_interface::set_axis (text_p_, Y_AXIS);
-         announce_grob (text_p_, 0);
+         announce_grob(text_p_, SCM_EOL);
       
          Direction dir = UP;
          SCM text = SCM_EOL;
@@ -140,9 +141,7 @@ A2_engraver::acknowledge_grob (Grob_info i)
   if (!to_boolean (get_property ("noDirection"))
       && (Stem::has_interface (i.grob_l_)
          || Slur::has_interface (i.grob_l_)
-         // || Tie::has_interface (i.grob_l_)
-         || i.grob_l_->has_interface (ly_symbol2scm ("tie-interface"))
-         
+         || Tie::has_interface (i.grob_l_)
          /*
            Usually, dynamics are removed by *_devnull_engravers for the
            second voice.  On the one hand, we don't want all dynamics for
@@ -150,9 +149,9 @@ A2_engraver::acknowledge_grob (Grob_info i)
            hand, colliding of scripts may be worse.
            So, we don't set directions for these when we're playing solo.
          */
-         || (i.grob_l_->has_interface (ly_symbol2scm ("dynamic-interface"))
+         || (i.grob_l_->internal_has_interface (ly_symbol2scm ("dynamic-interface"))
              && state_ != SOLO)
-         || (i.grob_l_->has_interface (ly_symbol2scm ("text-interface"))
+         || (i.grob_l_->internal_has_interface (ly_symbol2scm ("text-interface"))
              && state_ != SOLO)
          ))
     {