]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/separating-line-group-engraver.cc
Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman
[lilypond.git] / lily / separating-line-group-engraver.cc
index d767d1bade302f61c32628c8e8b8233c2ee95889..b2aeb9b2ab4e72fe492f84114cb1cd1e06cb59a2 100644 (file)
-/*   
-'  separating-line-group-engraver.cc --  implement Separating_line_group_engraver
-  
+/*
+  separating-line-group-engraver.cc -- implement Separating_line_group_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include <iostream.h>
+
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "engraver.hh"
 
 #include "separating-group-spanner.hh"
 #include "separation-item.hh"
 #include "paper-column.hh"
-#include "paper-def.hh"
-#include "engraver.hh"
+#include "output-def.hh"
 #include "axis-group-interface.hh"
+#include "note-spacing.hh"
+#include "accidental-placement.hh"
+#include "context.hh"
+#include "spanner.hh"
+#include "grob-array.hh"
+#include "pointer-group-interface.hh"
+
+#include "translator.icc"
+
+struct Spacings
+{
+  Item *staff_spacing_;
+  vector<Item*> note_spacings_;
+
+  Spacings ()
+  {
+    staff_spacing_ = 0;
+  }
+
+  bool is_empty () const
+  {
+    return !staff_spacing_ && !note_spacings_.size ();
+  }
+  void clear ()
+  {
+    staff_spacing_ = 0;
+    note_spacings_.clear ();
+  }
+};
 
 class Separating_line_group_engraver : public Engraver
 {
 protected:
-  Item * break_malt_p_;
-  Item * musical_malt_p_;
-
-  /*
-    malt_p_ : we used to have a Single_malt_grouping_item
-    
-   */
-  Item * last_step_musical_malt_p_;
-  Item * last_nonnil_musical_malt_p_;
-  Item * last_nonnil_break_malt_p_;
-  
-  Spanner * sep_span_p_;
-  
-  virtual void acknowledge_grob (Grob_info);
-  virtual void initialize ();
+  Item *break_item_;
+  Item *musical_item_;
+  Item *last_musical_item_;
+
+  Spacings current_spacings_;
+  Spacings last_spacings_;
+
+  Spanner *sep_span_;
+
+  DECLARE_ACKNOWLEDGER (item);
+  void process_music ();
   virtual void finalize ();
-  virtual void stop_translation_timestep ();
+  void stop_translation_timestep ();
+  void start_translation_timestep ();
 public:
-  Separating_line_group_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS (Separating_line_group_engraver);
 };
 
 Separating_line_group_engraver::Separating_line_group_engraver ()
 {
-  last_step_musical_malt_p_ = 0;
-  last_nonnil_break_malt_p_ = 0;
-  last_nonnil_musical_malt_p_ = 0;
-  
-  sep_span_p_ = 0;
-  break_malt_p_ = 0;
-  musical_malt_p_ =0;
+  sep_span_ = 0;
+  break_item_ = 0;
+  musical_item_ = 0;
 }
 
 void
-Separating_line_group_engraver::initialize ()
+Separating_line_group_engraver::process_music ()
 {
-  sep_span_p_ = new Spanner (get_property ("SeparatingGroupSpanner"));
+  if (!sep_span_)
+    {
+      sep_span_ = make_spanner ("SeparatingGroupSpanner", SCM_EOL);
 
-  announce_grob (sep_span_p_, 0);
-  sep_span_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+      sep_span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+    }
 }
-
 void
 Separating_line_group_engraver::finalize ()
 {
-  sep_span_p_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
-  typeset_grob (sep_span_p_);
-  sep_span_p_ =0;
-}
-
-void
-Separating_line_group_engraver::acknowledge_grob (Grob_info i)
-{
-  Item * it = dynamic_cast <Item *> (i.elem_l_);
-  if (!it)
-    return;
-  if (it->parent_l (X_AXIS)
-      && it->parent_l (X_AXIS)->has_extent_callback_b
- (Axis_group_interface::group_extent_callback_proc, X_AXIS))
+  if (!sep_span_)
     return;
 
-  
-  bool ib =Item::breakable_b (it);
-  Item *&p_ref_ (ib ? break_malt_p_
-                : musical_malt_p_);
+  SCM ccol = get_property ("currentCommandColumn");
+  Grob *column = unsmob_grob (ccol);
 
-  if (!p_ref_)
+  sep_span_->set_bound (RIGHT, unsmob_grob (ccol));
+  sep_span_ = 0;
+
+  for (vsize i = 0; i < last_spacings_.note_spacings_.size (); i++)
     {
-      p_ref_ = new Item
- (get_property ("SeparationItem"));
-         
-      if (ib)
-       p_ref_->set_grob_property ("breakable", SCM_BOOL_T);
-      announce_grob (p_ref_, 0);
+      Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i],
+                                        ly_symbol2scm ("right-items"),
+                                        column);
     }
-  Separation_item::add_item (p_ref_,it);
+
+  if (last_spacings_.staff_spacing_
+      && last_spacings_.staff_spacing_->get_column () == column)
+    last_spacings_.staff_spacing_->suicide ();
 }
 
 void
-Separating_line_group_engraver::stop_translation_timestep ()
+Separating_line_group_engraver::acknowledge_item (Grob_info i)
 {
-  if (break_malt_p_)
-    {
-      Separating_group_spanner::add_spacing_unit (sep_span_p_, break_malt_p_);
+  Item *it = i.item ();
+  if (it->get_parent (X_AXIS)
+      && it->get_parent (X_AXIS) == it->get_parent (Y_AXIS)
+      && Axis_group_interface::has_axis (it->get_parent (X_AXIS), X_AXIS)
+      && Axis_group_interface::has_axis (it->get_parent (Y_AXIS), Y_AXIS))
+    return;
 
-      typeset_grob (break_malt_p_);
+  if (to_boolean (it->get_property ("no-spacing-rods")))
+    return;
 
-      last_nonnil_break_malt_p_ = break_malt_p_;
-      break_malt_p_ =0;
+  if (Note_spacing::has_interface (it))
+    {
+      current_spacings_.note_spacings_.push_back (it);
+      return;
     }
 
-  if (musical_malt_p_)
-    {
-      Separating_group_spanner::add_spacing_unit (sep_span_p_, musical_malt_p_);
+  bool ib = Item::is_non_musical (it);
+  Item *&p_ref_ (ib ? break_item_
+                : musical_item_);
 
+  if (!p_ref_)
+    {
+      p_ref_ = make_item ("SeparationItem", SCM_EOL);
 
-      /* TODO
+      if (ib)
+       {
+         p_ref_->set_property ("non-musical", SCM_BOOL_T);
+         context ()->set_property ("breakableSeparationItem", p_ref_->self_scm ());
+       }
 
-        move this mucketry into separation-spanner.
-        
-       */
-      if (last_nonnil_break_malt_p_ && last_nonnil_musical_malt_p_)
+      if (to_boolean (get_property ("createSpacing"))
+         && p_ref_ == break_item_)
        {
-         cout << now_mom ().str () <<endl;
-         Item *col =     last_nonnil_break_malt_p_->column_l();
-         if (!col)
-           col = dynamic_cast<Item*> (unsmob_grob (get_property ("currentCommandColumn")));
-         
-         SCM between = col->get_grob_property ("between-cols");
-
-         SCM left = last_nonnil_musical_malt_p_->column_l()->self_scm ();
-         SCM right = get_property ("currentMusicalColumn"); // musical_malt_p_->column_l()->self_scm ();
-         if (gh_pair_p (between))
+         Item *it = make_item ("StaffSpacing", SCM_EOL);
+         current_spacings_.staff_spacing_ = it;
+         Pointer_group_interface::add_grob (it, ly_symbol2scm ("left-items"),
+                                            break_item_);
+
+         if (int i = last_spacings_.note_spacings_.size ())
            {
-             /*
-               ugh. set_..._x ()
-              */
-             if (Paper_column::rank_i (unsmob_grob (gh_car (between))) < Paper_column::rank_i (unsmob_grob (left)))
-               gh_set_car_x (between, left);
-             if (Paper_column::rank_i (unsmob_grob (gh_cdr (between))) > Paper_column::rank_i (unsmob_grob (right)))
-               gh_set_cdr_x (between, right);
+             for (; i--;)
+               Pointer_group_interface::add_grob (last_spacings_.note_spacings_[i],
+                                                  ly_symbol2scm ("right-items"),
+                                                  break_item_);
            }
-         else
+         else if (last_spacings_.staff_spacing_)
            {
-             col->set_grob_property ("between-cols", gh_cons (left, right));
+             SCM ri = last_spacings_.staff_spacing_->get_object ("right-items");
+             Grob_array *ga = unsmob_grob_array (ri);
+             if (!ga)
+               {
+                 SCM ga_scm = Grob_array::make_array ();
+                 last_spacings_.staff_spacing_->set_object ("right-items", ga_scm);
+                 ga = unsmob_grob_array (ga_scm);
+               }
+
+             ga->clear ();
+             ga->add (break_item_);
            }
        }
-      
-      if (last_step_musical_malt_p_)
-       {
-         Paper_column *col = 
-           last_step_musical_malt_p_->column_l();
-         SCM newtup = gh_cons (last_step_musical_malt_p_->self_scm (),
-                               musical_malt_p_->self_scm ());
-         col->set_grob_property ("spacing-sequence",
-                                 gh_cons (newtup,
-                                          col->get_grob_property ("spacing-sequence")));
-       }
+    }
 
-      
+  if (Accidental_placement::has_interface (it))
+    Separation_item::add_conditional_item (p_ref_, it);
+  else
+    Separation_item::add_item (p_ref_, it);
+}
 
-      last_nonnil_break_malt_p_ = 0;
-      last_nonnil_musical_malt_p_ = musical_malt_p_;
-      typeset_grob (musical_malt_p_);
+void
+Separating_line_group_engraver::start_translation_timestep ()
+{
+  if (break_item_)
+    {
+      context ()->unset_property (ly_symbol2scm ("breakableSeparationItem"));
+      break_item_ = 0;
     }
-  last_step_musical_malt_p_ = musical_malt_p_;
-  musical_malt_p_ =0;
-
 }
 
+void
+Separating_line_group_engraver::stop_translation_timestep ()
+{
+  if (break_item_)
+    Separating_group_spanner::add_spacing_unit (sep_span_, break_item_);
 
+  if (Item *sp = current_spacings_.staff_spacing_)
+    {
+      /*
+       TODO: should really look at the left-items of following
+       note-spacing grobs.
+      */
+      if (musical_item_)
+       Pointer_group_interface::add_grob (sp, ly_symbol2scm ("right-items"),
+                                          musical_item_);
+    }
+
+  if (!current_spacings_.is_empty ())
+    last_spacings_ = current_spacings_;
+
+  current_spacings_.clear ();
+
+  if (musical_item_)
+    Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_);
+
+  musical_item_ = 0;
+}
 
-ADD_THIS_TRANSLATOR (Separating_line_group_engraver);
+ADD_ACKNOWLEDGER (Separating_line_group_engraver, item);
+ADD_TRANSLATOR (Separating_line_group_engraver,
+               /* doc */ "Generates objects for computing spacing parameters.",
 
+               /* create */
+               "SeparationItem "
+               "SeparatingGroupSpanner "
+               "StaffSpacing",
+               /* read */ "createSpacing",
+               /* write */ "breakableSeparationItem");