]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/dynamic-engraver.cc
Clean up g++ 4.6.1 compiler warnings (-Wunused-but-set-variable).
[lilypond.git] / lily / dynamic-engraver.cc
index 5c3d0feecdf2627da0f4ffca841dc5ef864298a9..06f16cf8a83bd52a80cebf22017650f138c3be62 100644 (file)
@@ -1,13 +1,25 @@
 /*
-  dynamic-engraver.cc -- implement Dynamic_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "axis-group-interface.hh"
 #include "context.hh"
+#include "engraver.hh"
 #include "dimensions.hh"
 #include "directional-element-interface.hh"
 #include "engraver.hh"
@@ -24,6 +36,7 @@
 #include "stream-event.hh"
 #include "warn.hh"
 #include "spanner.hh"
+#include "text-interface.hh"
 
 #include "translator.icc"
 
@@ -57,17 +70,13 @@ class Dynamic_engraver : public Engraver
 
   Drul_array<Stream_event *> accepted_spanevents_drul_;
 
-  vector<Note_column*> pending_columns_;
-  vector<Grob*> pending_elements_;
+  vector<Note_column *> pending_columns_;
+  vector<Grob *> pending_elements_;
 
   void typeset_all ();
 
   TRANSLATOR_DECLARATIONS (Dynamic_engraver);
-  DECLARE_ACKNOWLEDGER (accidental);
-  DECLARE_ACKNOWLEDGER (script);
-  DECLARE_ACKNOWLEDGER (stem_tremolo);
   DECLARE_ACKNOWLEDGER (note_column);
-  DECLARE_ACKNOWLEDGER (slur);
   DECLARE_TRANSLATOR_LISTENER (absolute_dynamic);
   DECLARE_TRANSLATOR_LISTENER (span_dynamic);
 
@@ -109,7 +118,7 @@ Dynamic_engraver::listen_span_dynamic (Stream_event *ev)
 
   if (d == START)
     ASSIGN_EVENT_ONCE (accepted_spanevents_drul_[START], ev);
-  
+
   /* Cancel any ongoing crescendo, either explicitly by \! or
      implicitly by a new crescendo. Also avoid warning if cresc is
      cancelled both implicitly and explicitly. */
@@ -123,12 +132,12 @@ Dynamic_engraver::process_music ()
   if (accepted_spanevents_drul_[START] || accepted_spanevents_drul_[STOP] || script_ev_)
     {
       if (!line_spanner_)
-       {
-         Stream_event *rq = accepted_spanevents_drul_[START];
-         line_spanner_ = make_spanner ("DynamicLineSpanner", rq ? rq->self_scm () : SCM_EOL);
-         if (script_ev_)
-           rq = script_ev_;
-       }
+        {
+          Stream_event *rq = accepted_spanevents_drul_[START];
+          line_spanner_ = make_spanner ("DynamicLineSpanner", rq ? rq->self_scm () : SCM_EOL);
+          if (script_ev_)
+            rq = script_ev_;
+        }
     }
 
   /*
@@ -148,134 +157,134 @@ Dynamic_engraver::process_music ()
     {
       script_ = make_item ("DynamicText", script_ev_->self_scm ());
       script_->set_property ("text",
-                            script_ev_->get_property ("text"));
+                             script_ev_->get_property ("text"));
 
       if (Direction d = to_dir (script_ev_->get_property ("direction")))
-       set_grob_direction (line_spanner_, d);
+        set_grob_direction (line_spanner_, d);
       else if (Direction d = to_dir (line_spanner_->get_property ("direction")))
-       set_grob_direction (script_, d);
+        set_grob_direction (script_, d);
 
       Axis_group_interface::add_element (line_spanner_, script_);
     }
 
-  Stream_event *stop_ev = accepted_spanevents_drul_ [STOP]
-    ? accepted_spanevents_drul_[STOP] : script_ev_;
-
   if (accepted_spanevents_drul_[STOP] || script_ev_)
     {
       /*
-       finish side position alignment if the (de)cresc ends here, and
-       there are no new dynamics.
+        finish side position alignment if the (de)cresc ends here, and
+        there are no new dynamics.
       */
 
       if (cresc_)
-       {
-         assert (!finished_cresc_ && cresc_);
-
-         if (script_)
-           {
-             cresc_->set_bound (RIGHT, script_);
-             add_bound_item (line_spanner_, script_);
-           }
-
-         finished_cresc_ = cresc_;
-         cresc_ = 0;
-         current_cresc_ev_ = 0;
-       }
+        {
+          assert (!finished_cresc_ && cresc_);
+
+          if (script_)
+            {
+              cresc_->set_bound (RIGHT, script_);
+              add_bound_item (line_spanner_, script_);
+            }
+
+          finished_cresc_ = cresc_;
+          announce_end_grob (finished_cresc_, SCM_EOL);
+          cresc_ = 0;
+          current_cresc_ev_ = 0;
+        }
       else if (accepted_spanevents_drul_[STOP])
-       {
-         accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo"));
-         stop_ev = 0;
-       }
+        accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo"));
     }
 
   if (accepted_spanevents_drul_[START])
     {
       if (current_cresc_ev_)
-       {
-         string msg = _ ("already have a decrescendo");
-         if (current_cresc_ev_->in_event_class ("crescendo-event"))
-           msg = _ ("already have a crescendo");
-
-         accepted_spanevents_drul_[START]->origin ()->warning (msg);
-         current_cresc_ev_->origin ()->warning (_ ("cresc starts here"));
-       }
+        {
+          string msg = _ ("already have a decrescendo");
+          if (current_cresc_ev_->in_event_class ("crescendo-event"))
+            msg = _ ("already have a crescendo");
+
+          accepted_spanevents_drul_[START]->origin ()->warning (msg);
+          current_cresc_ev_->origin ()->warning (_ ("cresc starts here"));
+        }
       else
-       {
-         current_cresc_ev_ = accepted_spanevents_drul_[START];
-
-         if (Direction d = to_dir (current_cresc_ev_->get_property ("direction")))
-           set_grob_direction (line_spanner_, d);
-
-         /*
-           TODO: Use symbols.
-         */
-         
-         SCM start_sym = current_cresc_ev_->get_property ("class");
-         string start_type;
-         
-         if (start_sym == ly_symbol2scm ("decrescendo-event"))
-           start_type = "decrescendo";
-         else if (start_sym == ly_symbol2scm ("crescendo-event"))
-           start_type = "crescendo";
-         else
-           {
-             programming_error ("unknown dynamic spanner type");
-             return;
-           }
-
-         /*
-           UGH. TODO: should read from original event, so appearance
-           may be altered with \tweak.
-          */
-         SCM s = get_property ((start_type + "Spanner").c_str ());
-         if (!scm_is_symbol (s) || s == ly_symbol2scm ("hairpin"))
-           {
-             cresc_ = make_spanner ("Hairpin", accepted_spanevents_drul_[START]->self_scm ());
-             if (finished_cresc_)
-               {
-                 Pointer_group_interface::add_grob (finished_cresc_,
-                                                    ly_symbol2scm ("adjacent-hairpins"),
-                                                    cresc_);
-
-                 Pointer_group_interface::add_grob (cresc_,
-                                                    ly_symbol2scm ("adjacent-hairpins"),
-                                                    finished_cresc_);
-               }
-           }
-
-         /*
-           This is a convenient (and legacy) interface to TextSpanners
-           for use in (de)crescendi.
-           Hmm.
-         */
-         else
-           {
-             cresc_ = make_spanner ("DynamicTextSpanner", accepted_spanevents_drul_[START]->self_scm ());
-             cresc_->set_property ("style", s);
-             context ()->set_property ((start_type
-                                        + "Spanner").c_str (), SCM_EOL);
-             s = get_property ((start_type + "Text").c_str ());
-             /*
-               FIXME: use get_markup () to check type.
-             */
-             if (scm_is_string (s) || scm_is_pair (s))
-               {
-                 cresc_->set_property ("edge-text",
-                                       scm_cons (s, scm_makfrom0str ("")));
-                 context ()->set_property ((start_type + "Text").c_str (),
-                                           SCM_EOL);
-               }
-           }
-
-         if (script_)
-           {
-             cresc_->set_bound (LEFT, script_);
-             add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
-           }
-
-         Axis_group_interface::add_element (line_spanner_, cresc_);
-       }
+        {
+          current_cresc_ev_ = accepted_spanevents_drul_[START];
+
+          if (Direction d = to_dir (current_cresc_ev_->get_property ("direction")))
+            set_grob_direction (line_spanner_, d);
+
+          /*
+            TODO: Use symbols.
+          */
+
+          SCM start_sym = current_cresc_ev_->get_property ("class");
+          string start_type;
+
+          if (start_sym == ly_symbol2scm ("decrescendo-event"))
+            start_type = "decrescendo";
+          else if (start_sym == ly_symbol2scm ("crescendo-event"))
+            start_type = "crescendo";
+          else
+            {
+              programming_error ("unknown dynamic spanner type");
+              return;
+            }
+
+          /*
+            UGH. TODO: should read from original event, so appearance
+            may be altered with \tweak.
+           */
+          SCM s = get_property ((start_type + "Spanner").c_str ());
+          if (!scm_is_symbol (s) || s == ly_symbol2scm ("hairpin"))
+            {
+              cresc_ = make_spanner ("Hairpin", accepted_spanevents_drul_[START]->self_scm ());
+              if (finished_cresc_)
+                {
+                  Pointer_group_interface::add_grob (finished_cresc_,
+                                                     ly_symbol2scm ("adjacent-hairpins"),
+                                                     cresc_);
+
+                  Pointer_group_interface::add_grob (cresc_,
+                                                     ly_symbol2scm ("adjacent-hairpins"),
+                                                     finished_cresc_);
+                }
+            }
+
+          /*
+            This is a convenient (and legacy) interface to TextSpanners
+            for use in (de)crescendi.
+            Hmm.
+          */
+          else
+            {
+              cresc_ = make_spanner ("DynamicTextSpanner", accepted_spanevents_drul_[START]->self_scm ());
+              cresc_->set_property ("style", s);
+              context ()->set_property ((start_type
+                                         + "Spanner").c_str (), SCM_EOL);
+              s = get_property ((start_type + "Text").c_str ());
+              if (Text_interface::is_markup (s))
+                {
+                  cresc_->set_property ("text", s);
+                  context ()->set_property ((start_type + "Text").c_str (),
+                                            SCM_EOL);
+                }
+
+              if (script_)
+                {
+                  set_nested_property (cresc_,
+                                       scm_list_3 (ly_symbol2scm ("bound-details"),
+                                                   ly_symbol2scm ("left"),
+                                                   ly_symbol2scm ("attach-dir")
+                                                  ),
+                                       scm_from_int (RIGHT));
+                }
+            }
+
+          if (script_)
+            {
+              cresc_->set_bound (LEFT, script_);
+              add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
+            }
+          Axis_group_interface::add_element (line_spanner_, cresc_);
+        }
     }
 }
 
@@ -332,26 +341,19 @@ Dynamic_engraver::typeset_all ()
 {
   if (finished_cresc_)
     {
-      bool use_bar = to_boolean (get_property ("hairpinToBarline"))
-       && scm_is_string (get_property ("whichBar"))
-       && !script_ev_;
-                         
-      
-      if (!finished_cresc_->get_bound (RIGHT)
-         || use_bar)
-       {
-         Grob *column_bound = unsmob_grob (use_bar
-                                           ? get_property ("currentCommandColumn")
-                                           : get_property ("currentMusicalColumn"));
-           
-         finished_cresc_->set_bound (RIGHT, script_
-                                     ? script_
-                                     : column_bound);
-
-         if (finished_line_spanner_)
-           add_bound_item (finished_line_spanner_,
-                           finished_cresc_->get_bound (RIGHT));
-       }
+      if (!finished_cresc_->get_bound (RIGHT))
+        {
+
+          Grob *column_bound = unsmob_grob (get_property ("currentMusicalColumn"));
+
+          finished_cresc_->set_bound (RIGHT, script_
+                                      ? script_
+                                      : column_bound);
+
+          if (finished_line_spanner_)
+            add_bound_item (finished_line_spanner_,
+                            finished_cresc_->get_bound (RIGHT));
+        }
       finished_cresc_ = 0;
     }
 
@@ -359,63 +361,37 @@ Dynamic_engraver::typeset_all ()
   if (finished_line_spanner_)
     {
       /*
-       We used to have
+        We used to have
 
-       extend-spanner-over-elements (finished_line_spanner_);
+        extend-spanner-over-elements (finished_line_spanner_);
 
-       but this is rather kludgy, since finished_line_spanner_
-       typically has a staff-symbol field set , extending it over the
-       entire staff.
+        but this is rather kludgy, since finished_line_spanner_
+        typically has a staff-symbol field set , extending it over the
+        entire staff.
 
       */
 
       Grob *l = finished_line_spanner_->get_bound (LEFT);
       Grob *r = finished_line_spanner_->get_bound (RIGHT);
       if (!r && l)
-       finished_line_spanner_->set_bound (RIGHT, l);
+        finished_line_spanner_->set_bound (RIGHT, l);
       else if (!l && r)
-       finished_line_spanner_->set_bound (LEFT, r);
+        finished_line_spanner_->set_bound (LEFT, r);
       else if (!r && !l)
-       {
-         /*
-           This is a isolated dynamic apparently, and does not even have
-           any interesting support item.
-         */
-         Grob *cc = unsmob_grob (get_property ("currentMusicalColumn"));
-         Item *ci = dynamic_cast<Item *> (cc);
-         finished_line_spanner_->set_bound (RIGHT, ci);
-         finished_line_spanner_->set_bound (LEFT, ci);
-       }
-
+        {
+          /*
+            This is a isolated dynamic apparently, and does not even have
+            any interesting support item.
+          */
+          Grob *cc = unsmob_grob (get_property ("currentMusicalColumn"));
+          Item *ci = dynamic_cast<Item *> (cc);
+          finished_line_spanner_->set_bound (RIGHT, ci);
+          finished_line_spanner_->set_bound (LEFT, ci);
+        }
       finished_line_spanner_ = 0;
     }
 }
 
-
-void
-Dynamic_engraver::acknowledge_accidental (Grob_info info)
-{
-  if (line_spanner_)
-    Side_position_interface::add_support (line_spanner_, info.grob ());
-}
-
-
-void
-Dynamic_engraver::acknowledge_stem_tremolo (Grob_info info)
-{
-  if (line_spanner_)
-    Side_position_interface::add_support (line_spanner_, info.grob ());
-}
-
-
-void
-Dynamic_engraver::acknowledge_slur (Grob_info info)
-{
-  if (line_spanner_)
-    Side_position_interface::add_support (line_spanner_, info.grob ());
-}
-
-
 void
 Dynamic_engraver::acknowledge_note_column (Grob_info info)
 {
@@ -434,62 +410,44 @@ Dynamic_engraver::acknowledge_note_column (Grob_info info)
     {
       extract_grob_set (info.grob (), "note-heads", heads);
       if (heads.size ())
-       {
-         Grob *head = heads[0];
-         script_->set_parent (head, X_AXIS);
-         Self_alignment_interface::set_center_parent (script_, X_AXIS);
-       }
+        {
+          Grob *head = heads[0];
+          script_->set_parent (head, X_AXIS);
+          Self_alignment_interface::set_center_parent (script_, X_AXIS);
+        }
     }
 
   if (cresc_)
     {
       if (!cresc_->get_bound (LEFT))
-       {
-         cresc_->set_bound (LEFT, info.grob ());
-         add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
-       }
+        {
+          cresc_->set_bound (LEFT, info.grob ());
+          add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
+        }
     }
 
   if (finished_cresc_ && !finished_cresc_->get_bound (RIGHT))
     finished_cresc_->set_bound (RIGHT, info.grob ());
 }
 
-void
-Dynamic_engraver::acknowledge_script (Grob_info info)
-{
-  if (!line_spanner_ || !script_)
-    return;
-
-  SCM p = info.grob ()->get_property ("script-priority");
-
-  /*
-    UGH.
-
-    DynamicText doesn't really have a script-priority field.
-  */
-  if (scm_is_number (p)
-      && scm_to_int (p)
-      < scm_to_int (script_->get_property ("script-priority")))
-    Side_position_interface::add_support (line_spanner_, info.grob ());
-}
-
-ADD_ACKNOWLEDGER (Dynamic_engraver, accidental);
-ADD_ACKNOWLEDGER (Dynamic_engraver, script);
 ADD_ACKNOWLEDGER (Dynamic_engraver, note_column);
-ADD_ACKNOWLEDGER (Dynamic_engraver, slur);
-ADD_ACKNOWLEDGER (Dynamic_engraver, stem_tremolo);
 
 ADD_TRANSLATOR (Dynamic_engraver,
-               /* doc */
-               "This engraver creates hairpins, dynamic texts, and their vertical\n"
-               "alignments.  The symbols are collected onto a DynamicLineSpanner grob\n"
-               "which takes care of vertical positioning.  ",
-
-               /* create */
-               "DynamicLineSpanner "
-               "DynamicText "
-               "Hairpin "
-               "TextSpanner ",
-
-               /* read */ "",
-               /* write */ "");
+                /* doc */
+                "Create hairpins, dynamic texts, and their vertical"
+                " alignments.  The symbols are collected onto a"
+                " @code{DynamicLineSpanner} grob which takes care of vertical"
+                " positioning.",
+
+                /* create */
+                "DynamicLineSpanner "
+                "DynamicTextSpanner "
+                "DynamicText "
+                "Hairpin ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );