* lily/lexer.ll: change is_string -> ly_c_string_p

[lilypond.git] / lily / span-arpeggio-engraver.cc

diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc
index 9b33ae95f3f997829f9a99f1b27ebd392b3a7559..2bd12b0b3190cc58163180429827ccca815ac851 100644 (file)
--- a/lily/span-arpeggio-engraver.cc
+++ b/lily/span-arpeggio-engraver.cc
@@ -24,7 +24,7 @@
 class Span_arpeggio_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Span_arpeggio_engraver);
+  TRANSLATOR_DECLARATIONS (Span_arpeggio_engraver);
   
 protected:
   virtual void acknowledge_grob (Grob_info);
@@ -45,8 +45,8 @@ Span_arpeggio_engraver::Span_arpeggio_engraver ()
 void
 Span_arpeggio_engraver::acknowledge_grob (Grob_info info)
 {
-    if (info.origin_transes (this).size ()
-        && Arpeggio::has_interface (info.grob_))
+  if (Arpeggio::has_interface (info.grob_)
+      && info.origin_contexts (this).size ()) // huh? what's this test for? 
     {
       arpeggios_.push (info.grob_);
     }
@@ -66,7 +66,7 @@ Span_arpeggio_engraver::process_acknowledged_grobs ()
       && to_boolean (get_property ("connectArpeggios")))
     {
       span_arpeggio_ = make_item ("Arpeggio");
-      announce_grob(span_arpeggio_, SCM_EOL);      
+      announce_grob (span_arpeggio_, SCM_EOL);      
     }
 }
 
@@ -81,18 +81,18 @@ Span_arpeggio_engraver::stop_translation_timestep ()
        */
       for (int i=0; i < arpeggios_.size (); i ++)
        {
-         for (SCM s = arpeggios_[i]->get_grob_property ("stems");
-              gh_pair_p (s); s = ly_cdr (s))
+         for (SCM s = arpeggios_[i]->get_property ("stems");
+              ly_c_pair_p (s); s = ly_cdr (s))
            Group_interface::add_thing (span_arpeggio_, ly_symbol2scm ("stems"), ly_car (s));
-         for (SCM s = arpeggios_[i]->get_grob_property ("side-support-elements");
-              gh_pair_p (s); s = ly_cdr (s))
+         for (SCM s = arpeggios_[i]->get_property ("side-support-elements");
+              ly_c_pair_p (s); s = ly_cdr (s))
            Group_interface::add_thing (span_arpeggio_, ly_symbol2scm ("side-support-elements"), ly_car (s));
 
          /*
            we can't kill the children, since we don't want to the
            previous note to bump into the span arpeggio; so we make
            it transparent.  */
-         arpeggios_[i]->set_grob_property ("print-function", SCM_EOL);
+         arpeggios_[i]->set_property ("print-function", SCM_EOL);
        }
       
       typeset_grob (span_arpeggio_);
@@ -103,7 +103,7 @@ Span_arpeggio_engraver::stop_translation_timestep ()
 
 
 
-ENTER_DESCRIPTION(Span_arpeggio_engraver,
+ENTER_DESCRIPTION (Span_arpeggio_engraver,
 /* descr */       "",
 /* creats*/       "Arpeggio",
 /* accepts */     "",