* lily/paper-outputter.cc (output_expr):

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index cec29c08678a29e4f227dcbfc51343626134d3e4..bb7e3a6cb5e5247bbf4f91ca0ee9ac6c33248555 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -16,7 +16,7 @@
 #include "engraver.hh"
 #include "group-interface.hh"
 #include "directional-element-interface.hh"
-#include "translator-group.hh"
+#include "context.hh"
 #include "axis-group-interface.hh"
 #include "script.hh"
 
@@ -56,7 +56,7 @@ class Dynamic_engraver : public Engraver
   
   void typeset_all ();
 
-TRANSLATOR_DECLARATIONS(Dynamic_engraver );
+TRANSLATOR_DECLARATIONS (Dynamic_engraver );
   
 protected:
   virtual void finalize ();
@@ -97,7 +97,7 @@ Dynamic_engraver::try_music (Music * m)
   else if (m->is_mus_type ("decrescendo-event")
           || m->is_mus_type ("crescendo-event"))
     {
-      Direction d = to_dir (m->get_mus_property ("span-direction"));
+      Direction d = to_dir (m->get_property ("span-direction"));
 
       accepted_spanreqs_drul_[d] = m;
       if (current_cresc_ev_ && d == START)
@@ -119,7 +119,7 @@ Dynamic_engraver::process_music ()
          Music * rq = accepted_spanreqs_drul_[START];
          if (script_ev_)
            rq =  script_ev_ ;
-         announce_grob(line_spanner_, rq ? rq->self_scm(): SCM_EOL);
+         announce_grob (line_spanner_, rq ? rq->self_scm (): SCM_EOL);
        }
     }
   
@@ -141,16 +141,16 @@ Dynamic_engraver::process_music ()
   if (script_ev_)
     {
       script_ = make_item ("DynamicText");
-      script_->set_grob_property ("text",
-                                  script_ev_->get_mus_property ("text"));
+      script_->set_property ("text",
+                                  script_ev_->get_property ("text"));
 
       
-      if (Direction d = to_dir (script_ev_->get_mus_property ("direction")))
+      if (Direction d = to_dir (script_ev_->get_property ("direction")))
        set_grob_direction (line_spanner_, d);
 
       Axis_group_interface::add_element (line_spanner_, script_);
 
-      announce_grob(script_, script_ev_->self_scm());
+      announce_grob (script_, script_ev_->self_scm ());
     }
 
   Music *stop_ev = accepted_spanreqs_drul_ [STOP] ?
@@ -180,7 +180,7 @@ Dynamic_engraver::process_music ()
        }
       else if (accepted_spanreqs_drul_[STOP] )
        {
-         accepted_spanreqs_drul_[STOP]->origin ()->warning(_ ("can't find start of (de)crescendo"));
+         accepted_spanreqs_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo"));
          stop_ev = 0;
        }
       
@@ -201,7 +201,7 @@ Dynamic_engraver::process_music ()
        {
          current_cresc_ev_ = accepted_spanreqs_drul_[START];
 
-         if (Direction d = to_dir (current_cresc_ev_->get_mus_property ("direction")))
+         if (Direction d = to_dir (current_cresc_ev_->get_property ("direction")))
            set_grob_direction (line_spanner_, d);
 
          /*
@@ -209,7 +209,7 @@ Dynamic_engraver::process_music ()
          */
 
          String start_type = 
-           ly_symbol2string (current_cresc_ev_->get_mus_property ("name"));
+           ly_symbol2string (current_cresc_ev_->get_property ("name"));
 
          /*
            ugh. Use push/pop?
@@ -223,7 +223,7 @@ Dynamic_engraver::process_music ()
          if (!gh_symbol_p (s) || s == ly_symbol2scm ("hairpin"))
            {
              cresc_  = make_spanner ("Hairpin");
-             cresc_->set_grob_property ("grow-direction",
+             cresc_->set_property ("grow-direction",
                                           gh_int2scm ((start_type == "crescendo")
                                                       ? BIGGER : SMALLER));
              
@@ -238,8 +238,8 @@ Dynamic_engraver::process_music ()
          else
            {
              cresc_  = make_spanner ("TextSpanner");
-             cresc_->set_grob_property ("style", s);
-             daddy_trans_->set_property ((start_type
+             cresc_->set_property ("style", s);
+             daddy_context_->set_property ((start_type
                                            + "Spanner").to_str0 (), SCM_EOL);
              s = get_property ((start_type + "Text").to_str0 ());
              /*
@@ -247,9 +247,9 @@ Dynamic_engraver::process_music ()
              */
              if (gh_string_p (s) || gh_pair_p (s))
                {
-                 cresc_->set_grob_property ("edge-text",
+                 cresc_->set_property ("edge-text",
                                             gh_cons (s, scm_makfrom0str ("")));
-                 daddy_trans_->set_property ((start_type + "Text").to_str0 (),
+                 daddy_context_->set_property ((start_type + "Text").to_str0 (),
                                                SCM_EOL);
                }
            }
@@ -262,7 +262,7 @@ Dynamic_engraver::process_music ()
 
          add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
          
-         announce_grob(cresc_, accepted_spanreqs_drul_[START]->self_scm());
+         announce_grob (cresc_, accepted_spanreqs_drul_[START]->self_scm ());
        }
     }
 }
@@ -289,7 +289,7 @@ Dynamic_engraver::finalize ()
   typeset_all ();
   
   if (line_spanner_
-      && !line_spanner_->live())
+      && !line_spanner_->live ())
     line_spanner_ = 0;
   if (line_spanner_)
     {
@@ -298,7 +298,7 @@ Dynamic_engraver::finalize ()
     }
 
   if (cresc_
-      && !cresc_->live())
+      && !cresc_->live ())
     cresc_ = 0;
   if (cresc_)
     {
@@ -318,10 +318,10 @@ Dynamic_engraver::typeset_all ()
     Maybe just check at typeset_grob ()?
   */
   if (finished_cresc_
-      && !finished_cresc_->live())
+      && !finished_cresc_->live ())
     finished_cresc_ = 0;
   if (finished_line_spanner_
-      && !finished_line_spanner_->live())
+      && !finished_line_spanner_->live ())
     finished_line_spanner_ = 0;
 
   if (finished_cresc_)
@@ -391,7 +391,7 @@ Dynamic_engraver::acknowledge_grob (Grob_info i)
     {
       if (line_spanner_
          /* Don't refill killed spanner */
-         && line_spanner_->live())
+         && line_spanner_->live ())
        {
          Side_position_interface::add_support (line_spanner_,i.grob_);
          add_bound_item (line_spanner_,dynamic_cast<Item*> (i.grob_));
@@ -399,7 +399,7 @@ Dynamic_engraver::acknowledge_grob (Grob_info i)
 
       if (script_ && !script_->get_parent (X_AXIS))
        {
-         SCM head = scm_last_pair (i.grob_->get_grob_property ("heads"));
+         SCM head = scm_last_pair (i.grob_->get_property ("heads"));
          if (gh_pair_p (head))
            script_->set_parent (unsmob_grob (head),  X_AXIS);
        }
@@ -407,7 +407,7 @@ Dynamic_engraver::acknowledge_grob (Grob_info i)
     }
   else if (Script_interface::has_interface (i.grob_) && script_)
     {
-      SCM p = i.grob_->get_grob_property ("script-priority");
+      SCM p = i.grob_->get_property ("script-priority");
 
       /*
        UGH.
@@ -415,14 +415,14 @@ Dynamic_engraver::acknowledge_grob (Grob_info i)
        DynamicText doesn't really have a script-priority field.
        */
       if (gh_number_p (p)
-         && gh_scm2int (p) < gh_scm2int (script_->get_grob_property ("script-priority")))
+         && gh_scm2int (p) < gh_scm2int (script_->get_property ("script-priority")))
        {
          Side_position_interface::add_support (line_spanner_, i.grob_);
 
        }         
     }
 }
-ENTER_DESCRIPTION(Dynamic_engraver,
+ENTER_DESCRIPTION (Dynamic_engraver,
 /* descr */       
 "This engraver creates hairpins, dynamic texts, and their vertical\n"
 "alignments.  The symbols are collected onto a DynamicLineSpanner grob\n"