* lily/stem-tremolo.cc (translated_stencil): new function.

[lilypond.git] / lily / system.cc

diff --git a/lily/system.cc b/lily/system.cc
index d1581b9e06eb8dab032e7b0f1e1f5f3998969da6..07c705ffe6ba4dfb13f80531b532af5be32a5c99 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -23,7 +23,6 @@
 #include "staff-symbol-referencer.hh"
 #include "tweak-registration.hh"
 #include "warn.hh"
-#include "warn.hh"
 
 System::System (System const &src, int count)
   : Spanner (src, count)
@@ -47,13 +46,14 @@ System::init_elements ()
 {
   SCM scm_arr = Grob_array::make_array ();
   all_elements_ = unsmob_grob_array (scm_arr);
+  all_elements_->set_ordered (false);
   set_object ("all-elements", scm_arr);
 }
 
 Grob *
-System::clone (int count) const
+System::clone (int index) const
 {
-  return new System (*this, count);
+  return new System (*this, index);
 }
 
 int
@@ -171,7 +171,7 @@ System::get_paper_systems ()
   for (vsize i = 0; i < broken_intos_.size (); i++)
     {
       System *child = dynamic_cast<System*> (broken_intos_[i]);
-      child->all_elements_->uniq ();
+      child->all_elements_->remove_duplicates ();
     }
 
   if (be_verbose_global)
@@ -184,6 +184,7 @@ System::get_paper_systems ()
        progress_indication ("[");
 
       System *system = dynamic_cast<System *> (broken_intos_[i]);
+
       system->post_processing ();
       scm_vector_set_x (lines, scm_from_int (i),
                        system->get_paper_system ());
@@ -205,6 +206,11 @@ System::break_into_pieces (vector<Column_x_positions> const &breaking)
       vector<Grob*> c (breaking[i].cols_);
       pscore_->typeset_system (system);
 
+      int st = Paper_column::get_rank (c[0]);
+      int end = Paper_column::get_rank (c.back ());
+      Interval iv (pure_height (this, st, end));
+      system->set_property ("pure-Y-extent", ly_interval2scm (iv));
+
       system->set_bound (LEFT, c[0]);
       system->set_bound (RIGHT, c.back ());
       for (vsize j = 0; j < c.size (); j++)
@@ -212,6 +218,7 @@ System::break_into_pieces (vector<Column_x_positions> const &breaking)
          c[j]->translate_axis (breaking[i].config_[j], X_AXIS);
          dynamic_cast<Paper_column *> (c[j])->system_ = system;
        }
+      
       set_loose_columns (system, &breaking[i]);
       broken_intos_.push_back (system);
     }
@@ -310,7 +317,7 @@ System::post_processing ()
      anyway. */
 
   vector<Grob*> all_elts_sorted (all_elements_->array ());
-  vector_sort (all_elts_sorted, default_compare);
+  vector_sort (all_elts_sorted, std::less<Grob*> ());
   uniq (all_elts_sorted);
   this->get_stencil ();
   for (vsize i = all_elts_sorted.size (); i--;)
@@ -320,46 +327,61 @@ System::post_processing ()
     }
 }
 
+struct Layer_entry
+{
+  Grob *grob_;
+  int layer_;
+};
+
+bool
+operator< (Layer_entry  const &a,
+          Layer_entry  const &b)
+{
+  return a.layer_ < b.layer_;
+}
+
+
 SCM
 System::get_paper_system ()
 {
-  static int const LAYER_COUNT = 3;
-
   SCM exprs = SCM_EOL;
   SCM *tail = &exprs;
 
-  /* Output stencils in three layers: 0, 1, 2.  Default layer: 1.
-
-  FIXME: softcode this.
-  */
-  for (int i = 0; i < LAYER_COUNT; i++)
-    for (vsize j = 0; j < all_elements_->size (); j++)
-      {
-       Grob *g = all_elements_->grob (j);
-       if (robust_scm2int (g->get_property ("layer"), 1) != i)
-         continue;
-       
-       Stencil st = g->get_print_stencil ();
+  vector<Layer_entry> entries;
+  for (vsize j = 0; j < all_elements_->size (); j++)
+    {
+      Layer_entry e;
+      e.grob_ = all_elements_->grob (j);
+      e.layer_ = robust_scm2int (e.grob_->get_property ("layer"), 1);
+      
+      entries.push_back (e); 
+    }
 
-       if (st.expr() == SCM_EOL)
-         continue;
+  vector_sort (entries, std::less<Layer_entry> ());
+  for (vsize j = 0; j < entries.size (); j++)
+    {
+      Grob *g = entries[j].grob_;
+      Stencil st = g->get_print_stencil ();
 
-       Offset o;
-       for (int a = X_AXIS; a < NO_AXES; a++)
-         o[Axis (a)] = g->relative_coordinate (this, Axis (a));
+      if (st.expr() == SCM_EOL)
+       continue;
+      
+      Offset o;
+      for (int a = X_AXIS; a < NO_AXES; a++)
+       o[Axis (a)] = g->relative_coordinate (this, Axis (a));
 
-       Offset extra = robust_scm2offset (g->get_property ("extra-offset"),
-                                         Offset (0, 0))
-         * Staff_symbol_referencer::staff_space (g);
+      Offset extra = robust_scm2offset (g->get_property ("extra-offset"),
+                                       Offset (0, 0))
+       * Staff_symbol_referencer::staff_space (g);
 
-       /* Must copy the stencil, for we cannot change the stencil
-          cached in G.  */
+      /* Must copy the stencil, for we cannot change the stencil
+        cached in G.  */
 
-       st.translate (o + extra);
+      st.translate (o + extra);
 
-       *tail = scm_cons (st.expr (), SCM_EOL);
-       tail = SCM_CDRLOC (*tail);
-      }
+      *tail = scm_cons (st.expr (), SCM_EOL);
+      tail = SCM_CDRLOC (*tail);
+    }
 
   if (Stencil *me = get_stencil ())
     exprs = scm_cons (me->expr (), exprs);
@@ -375,14 +397,12 @@ System::get_paper_system ()
   Prob *pl = make_paper_system (prop_init);
   paper_system_set_stencil (pl, sys_stencil);
 
-  /* backwards-compatibility hack for the old page-breaker */
-  SCM turn_perm = left_bound->get_property ("page-break-permission");
-  if (!scm_is_symbol (turn_perm))
-    pl->set_property ("penalty", scm_from_double (10001.0));
-  else if (turn_perm == ly_symbol2scm ("force"))
-    pl->set_property ("penalty", scm_from_double (-10001.0));
-  else
-    pl->set_property ("penalty", scm_from_double (0.0));
+  /* information that the page breaker might need */
+  Grob *right_bound = this->get_bound (RIGHT);
+  pl->set_property ("page-break-permission", right_bound->get_property ("page-break-permission"));
+  pl->set_property ("page-turn-permission", right_bound->get_property ("page-turn-permission"));
+  pl->set_property ("page-break-penalty", right_bound->get_property ("page-break-penalty"));
+  pl->set_property ("page-turn-penalty", right_bound->get_property ("page-turn-penalty"));
   
   if (!scm_is_pair (pl->get_property ("refpoint-Y-extent")))
     {
@@ -488,5 +508,6 @@ ADD_INTERFACE (System, "system-interface",
               /* properties */
               "all-elements "
               "columns "
+              "pure-Y-extent "
               "spaceable-staves "
               )