Imported Upstream version 2.14.2

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 43c1264741c186131dc34b54d72ec5f22f25db00..04e571f68a953d0197908dc3a75386cd6e7eecc7 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -1,14 +1,26 @@
 /*
-  beam-engraver.cc -- implement Beam_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2009 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 "beam.hh"
 #include "beaming-pattern.hh"
 #include "context.hh"
+#include "directional-element-interface.hh"
 #include "drul-array.hh"
 #include "duration.hh"
 #include "engraver.hh"
@@ -37,6 +49,8 @@ protected:
 
   Stream_event *stop_ev_;
 
+  Direction forced_direction_;
+
   Beaming_pattern *beam_info_;
   Beaming_pattern *finished_beam_info_;
 
@@ -48,7 +62,7 @@ protected:
 
   Beaming_options beaming_options_;
   Beaming_options finished_beaming_options_;
-  
+
   void typeset_beam ();
   void set_melisma (bool);
 
@@ -91,6 +105,7 @@ Beam_engraver::Beam_engraver ()
   finished_beam_ = 0;
   finished_beam_info_ = 0;
   beam_info_ = 0;
+  forced_direction_ = CENTER;
   stop_ev_ = 0;
   start_ev_ = 0;
   prev_start_ev_ = 0;
@@ -103,7 +118,13 @@ Beam_engraver::listen_beam (Stream_event *ev)
   Direction d = to_dir (ev->get_property ("span-direction"));
 
   if (d == START && valid_start_point ())
-    ASSIGN_EVENT_ONCE (start_ev_, ev);
+    {
+      ASSIGN_EVENT_ONCE (start_ev_, ev);
+
+      Direction updown = to_dir (ev->get_property ("direction"));
+      if (updown)
+       forced_direction_ = updown;
+    }
   else if (d == STOP && valid_end_point ())
     ASSIGN_EVENT_ONCE (stop_ev_, ev);
 }
@@ -130,7 +151,9 @@ Beam_engraver::process_music ()
       set_melisma (true);
       prev_start_ev_ = start_ev_;
       beam_ = make_spanner ("Beam", start_ev_->self_scm ());
-      Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0)));
+
+      Moment mp (robust_scm2moment (get_property ("measurePosition"),
+                                   Moment (0)));
 
       beam_start_location_ = mp;
       beam_start_mom_ = now_mom ();
@@ -144,7 +167,7 @@ Beam_engraver::process_music ()
   if (stop_ev_ && beam_)
     {
       announce_end_grob (beam_, stop_ev_->self_scm ());
-      
+
     }
 }
 
@@ -155,13 +178,20 @@ Beam_engraver::typeset_beam ()
     {
       if (!finished_beam_->get_bound (RIGHT))
        finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
-      
+      if (forced_direction_)
+       {
+         Grob *stem = finished_beam_->get_bound (RIGHT);
+         set_grob_direction (stem, forced_direction_);
+         forced_direction_ = CENTER;
+       }
       finished_beam_info_->beamify (finished_beaming_options_);
+
       Beam::set_beaming (finished_beam_, finished_beam_info_);
 
       delete finished_beam_info_;
       finished_beam_info_ = 0;
       finished_beam_ = 0;
+
     }
 }
 
@@ -171,9 +201,7 @@ Beam_engraver::start_translation_timestep ()
   start_ev_ = 0;
 
   if (beam_)
-    {
-      set_melisma (true);
-    }
+    set_melisma (true);
 }
 
 void
@@ -184,7 +212,7 @@ Beam_engraver::stop_translation_timestep ()
       finished_beam_ = beam_;
       finished_beam_info_ = beam_info_;
       finished_beaming_options_ = beaming_options_;
-      
+
       stop_ev_ = 0;
       beam_ = 0;
       beam_info_ = 0;
@@ -214,20 +242,16 @@ Beam_engraver::acknowledge_rest (Grob_info info)
 {
   if (beam_
       && !scm_is_number (info.grob ()->get_property_data ("staff-position")))
-    {
-      chain_offset_callback (info.grob (),
-                            Beam::rest_collision_callback_proc, Y_AXIS);
-    }
+    chain_offset_callback (info.grob (),
+                          Beam::rest_collision_callback_proc, Y_AXIS);
 }
 
-
-
 void
 Beam_engraver::acknowledge_stem (Grob_info info)
 {
   if (!beam_)
     return;
-  
+
   Moment now = now_mom ();
   if (!valid_start_point ())
     return;
@@ -236,8 +260,6 @@ Beam_engraver::acknowledge_stem (Grob_info info)
   if (Stem::get_beam (stem))
     return;
 
-  
-  
   Stream_event *ev = info.ultimate_event_cause ();
   if (!ev->in_event_class ("rhythmic-event"))
     {
@@ -258,8 +280,10 @@ Beam_engraver::acknowledge_stem (Grob_info info)
       */
     }
 
-  stem->set_property ("duration-log",
-                     scm_from_int (durlog));
+  if (forced_direction_)
+    set_grob_direction (stem, forced_direction_);
+
+  stem->set_property ("duration-log", scm_from_int (durlog));
   Moment stem_location = now - beam_start_mom_ + beam_start_location_;
   beam_info_->add_stem (stem_location,
                        max (durlog- 2, 0),
@@ -274,13 +298,14 @@ ADD_TRANSLATOR (Beam_engraver,
                /* doc */
                "Handle @code{Beam} events by engraving beams.  If omitted,"
                " then notes are printed with flags instead of beams.",
-               
+
                /* create */
                "Beam ",
 
                /* read */
+                "baseMoment "
                "beamMelismaBusy "
-               "beatLength "
+               "beatStructure "
                "subdivideBeams ",
 
                /* write */
@@ -293,7 +318,7 @@ public:
   TRANSLATOR_DECLARATIONS (Grace_beam_engraver);
 
   DECLARE_TRANSLATOR_LISTENER (beam);
-  
+
 protected:
   virtual bool valid_start_point ();
   virtual bool valid_end_point ();
@@ -341,13 +366,14 @@ ADD_TRANSLATOR (Grace_beam_engraver,
                "Handle @code{Beam} events by engraving beams.  If omitted,"
                " then notes are printed with flags instead of beams.  Only"
                " engraves beams when we are at grace points in time.",
-               
+
                /* create */
                "Beam ",
 
                /* read */
+                "baseMoment "
                "beamMelismaBusy "
-               "beatLength "
+               "beatStructure "
                "subdivideBeams ",
 
                /* write */