]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/spacing-engraver.cc
Fix some bugs in the dynamic engraver and PostScript backend
[lilypond.git] / lily / spacing-engraver.cc
index c61dd3df3f9222e405240b1cbe68458690af3ecc..d567cb6ebc279d53e1f55ed741b7c9020bf2cf22 100644 (file)
-/*   
-  spacing-engraver.cc --  implement Spacing_engraver
-  
+/*
+  spacing-engraver.cc -- implement Spacing_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "musical-request.hh"
-#include "score-column.hh"
-#include "spacing-engraver.hh"
-#include "spacing-spanner.hh"
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "paper-column.hh"
+#include "engraver.hh"
+#include "pqueue.hh"
+#include "note-spacing.hh"
+#include "staff-spacing.hh"
+#include "pointer-group-interface.hh"
+#include "spanner.hh"
+
+#include "translator.icc"
+
+struct Rhythmic_tuple
+{
+  Grob_info info_;
+  Moment end_;
+
+  Rhythmic_tuple ()
+  {
+  }
+  Rhythmic_tuple (Grob_info i, Moment m)
+  {
+    info_ = i;
+    end_ = m;
+  }
+  static int time_compare (Rhythmic_tuple const &, Rhythmic_tuple const &);
+};
+
+/*
+  TODO: allow starting & stopping of spacing regions.
+*/
+/*
+  Acknowledge rhythmic elements, for initializing spacing fields in
+  the columns.
+*/
+class Spacing_engraver : public Engraver
+{
+  PQueue<Rhythmic_tuple> playing_durations_;
+  vector<Rhythmic_tuple> now_durations_;
+  vector<Rhythmic_tuple> stopped_durations_;
+  Moment now_;
+  Spanner *spacing_;
+
+  TRANSLATOR_DECLARATIONS (Spacing_engraver);
+
+protected:
+  DECLARE_ACKNOWLEDGER (staff_spacing);
+  DECLARE_ACKNOWLEDGER (note_spacing);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+
+  void start_translation_timestep ();
+  void stop_translation_timestep ();
+  void process_music ();
+  virtual void finalize ();
+};
 
 inline int
 compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b)
 {
-  return Rhythmic_tuple::time_compare (a,b);
+  return Rhythmic_tuple::time_compare (a, b);
 }
 
 int
 Rhythmic_tuple::time_compare (Rhythmic_tuple const &h1,
                              Rhythmic_tuple const &h2)
 {
-  
-  return (h1.end_ - h2.end_ ).sign ();
+  return (h1.end_ - h2.end_).main_part_.sign ();
 }
 
-Spacing_engraver::Spacing_engraver()
+Spacing_engraver::Spacing_engraver ()
 {
-  spacing_p_ = 0;
+  spacing_ = 0;
 }
 
 void
-Spacing_engraver::do_creation_processing ()
+Spacing_engraver::process_music ()
 {
-  spacing_p_  =new Spacing_spanner;
-  spacing_p_->set_bounds (LEFT, get_staff_info ().command_pcol_l ());  
-  announce_element (Score_element_info (spacing_p_, 0));
+  if (!spacing_)
+    {
+      spacing_ = make_spanner ("SpacingSpanner", SCM_EOL);
+      spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+    }
 }
 
 void
-Spacing_engraver::do_removal_processing ()
+Spacing_engraver::finalize ()
 {
-  Paper_column * p = get_staff_info ().command_pcol_l ();
+  if (spacing_)
+    {
+      Grob *p = unsmob_grob (get_property ("currentCommandColumn"));
 
-  spacing_p_->set_bounds (RIGHT, p);
-  typeset_element (spacing_p_);
-  spacing_p_ =0;
+      spacing_->set_bound (RIGHT, p);
+      spacing_ = 0;
+    }
 }
 
 void
-Spacing_engraver::acknowledge_element (Score_element_info i)
+Spacing_engraver::acknowledge_note_spacing (Grob_info i)
 {
-  if (Rhythmic_req * r = dynamic_cast<Rhythmic_req*>(i.req_l_))
+  Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ());
+}
+
+void
+Spacing_engraver::acknowledge_staff_spacing (Grob_info i)
+{
+  Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ());
+}
+
+void
+Spacing_engraver::acknowledge_rhythmic_head (Grob_info i)
+{
+  if (i.grob ()->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))
+      || i.grob ()->internal_has_interface (ly_symbol2scm ("multi-measure-interface")))
+    return;
+
+  /*
+    only pay attention to durations that are not grace notes.
+  */
+  if (!now_.grace_part_)
     {
-      Rhythmic_tuple t(i, now_mom () + r->length_mom ());
-      now_durations_.push (t);
+      Music *r = i.music_cause ();
+      if (r && r->is_mus_type ("rhythmic-event"))
+       {
+         Moment len = r->get_length ();
+         Rhythmic_tuple t (i, now_mom () + len);
+         now_durations_.push_back (t);
+       }
     }
 }
 
 void
-Spacing_engraver::do_pre_move_processing ()
+Spacing_engraver::stop_translation_timestep ()
 {
+  Paper_column *musical_column
+    = dynamic_cast<Paper_column *> (unsmob_grob (get_property ("currentMusicalColumn")));
+
+  SCM proportional = get_property ("proportionalNotationDuration");
+  if (unsmob_moment (proportional))
+    {
+      musical_column->set_property ("shortest-playing-duration", proportional);
+      musical_column->set_property ("shortest-starter-duration", proportional);
+      return;
+    }
+
   Moment shortest_playing;
   shortest_playing.set_infinite (1);
-  for (int i=0; i < playing_durations_.size (); i++)
+  for (vsize i = 0; i < playing_durations_.size (); i++)
     {
-      Moment m = (playing_durations_[i].info_.req_l_)->length_mom ();
-      if (m)
-       shortest_playing = shortest_playing <? m;
+      Music *mus = playing_durations_[i].info_.music_cause ();
+      if (mus)
+       {
+         Moment m = mus->get_length ();
+         shortest_playing = min (shortest_playing, m);
+       }
     }
+  Moment starter;
+  starter.set_infinite (1);
 
-  Moment starter, inf;
-  inf.set_infinite (1);
-  starter=inf;
-  for (int i=0; i < now_durations_.size (); i++)
+  for (vsize i = 0; i < now_durations_.size (); i++)
     {
-      Moment m = now_durations_[i].info_.req_l_->length_mom ();
-      if (m)
-       starter = starter <? m;
-
-      playing_durations_.insert (now_durations_[i]);
+      Moment m = now_durations_[i].info_.music_cause ()->get_length ();
+      if (m.to_bool ())
+       {
+         starter = min (starter, m);
+         playing_durations_.insert (now_durations_[i]);
+       }
     }
   now_durations_.clear ();
-  
-  shortest_playing = shortest_playing <? starter;
-  
-  Score_column * sc
-    = dynamic_cast<Score_column*> (get_staff_info ().musical_pcol_l ());
-
-  sc->shortest_playing_mom_ = shortest_playing;
-  sc->shortest_starter_mom_ = starter;
+
+  shortest_playing = min (shortest_playing, starter);
+
+  assert (starter.to_bool ());
+  SCM sh = shortest_playing.smobbed_copy ();
+  SCM st = starter.smobbed_copy ();
+
+  musical_column->set_property ("shortest-playing-duration", sh);
+  musical_column->set_property ("shortest-starter-duration", st);
 }
 
 void
-Spacing_engraver::do_post_move_processing ()
+Spacing_engraver::start_translation_timestep ()
 {
-  Moment now = now_mom ();
+  now_ = now_mom ();
   stopped_durations_.clear ();
-  while (playing_durations_.size () && playing_durations_.front ().end_ < now)
+  while (playing_durations_.size () && playing_durations_.front ().end_ < now_)
     playing_durations_.delmin ();
-  while (playing_durations_.size () && playing_durations_.front ().end_ == now)
-    stopped_durations_.push (playing_durations_.get ());
+  while (playing_durations_.size () && playing_durations_.front ().end_ == now_)
+    stopped_durations_.push_back (playing_durations_.get ());
 }
 
-ADD_THIS_TRANSLATOR(Spacing_engraver);
+ADD_ACKNOWLEDGER (Spacing_engraver, staff_spacing);
+ADD_ACKNOWLEDGER (Spacing_engraver, note_spacing);
+ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_head);
+
+ADD_TRANSLATOR (Spacing_engraver,
+               "make a SpacingSpanner and do "
+               "bookkeeping of shortest starting and playing notes  ",
 
+               /* create */ "SpacingSpanner",
+               /* accept */ "",
+               /* read */
+               "currentMusicalColumn "
+               "currentCommandColumn "
+               "proportionalNotationDuration",
+               
+               /* write */ "");