2003 -> 2004

[lilypond.git] / lily / system.cc

diff --git a/lily/system.cc b/lily/system.cc
index a776eeba9a4f5f45c0a5ca78b6fe33a21926263b..dc7bba5b15f6d985c2083a7a36d5152f2aedc824 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "input-smob.hh"
@@ -21,6 +21,7 @@
 #include "molecule.hh"
 #include "all-font-metrics.hh"
 #include "spacing-interface.hh"
+#include "staff-symbol-referencer.hh"
 
 // todo: use map.
 void
@@ -60,6 +61,51 @@ System::spanner_count () const
 }
   
 
+int
+scm_default_compare (const void * a, const void *b)
+{
+  SCM pa = *(SCM *)a;
+  SCM pb = *(SCM *)b;
+
+  if (pa < pb) return -1 ;
+  else if (pa > pb) return 1;
+  else return 0;
+}
+
+/*
+  modify L in place: sort it 
+*/
+
+SCM
+uniquify_list (SCM l)
+{
+  int len = scm_ilength (l);
+  SCM  * arr = new SCM[len];
+  int k = 0;
+  for (SCM s =l ; SCM_NNULLP (s); s = SCM_CDR(s))
+    arr[k++] = SCM_CAR(s);
+
+  assert (k == len);
+  qsort (arr, len, sizeof (SCM), &scm_default_compare);
+
+  k = 0;
+  SCM s =l;
+  for (int i = 0; i < len ; i++)
+    {
+      if (i && arr[i] == arr[i-1])
+       continue;
+
+      SCM_SETCAR(s, arr[i]);
+
+      if (i < len - 1)
+       s = SCM_CDR(s);
+    }
+
+  SCM_SETCDR(s, SCM_EOL);
+  delete arr;
+  
+  return l; 
+}
 
 void
 System::typeset_grob (Grob * elem)
@@ -68,7 +114,7 @@ System::typeset_grob (Grob * elem)
     programming_error ("Adding element twice.");
   
   elem->pscore_ = pscore_;
-  Pointer_group_interface::add_grob (this, ly_symbol2scm ("all-elements"),elem);
+  Pointer_group_interface::add_grob (this, ly_symbol2scm ("all-elements"), elem);
   scm_gc_unprotect_object (elem->self_scm ());
 }
 
@@ -124,6 +170,22 @@ System::output_lines ()
     }
   handle_broken_dependencies ();
 
+  /*
+    Because the this->get_grob_property (all-elements) contains items
+    in 3 versions, handle_broken_dependencies () will leave duplicated
+    items in all-elements. Strictly speaking this is harmless, but it
+    leads to duplicated symbols in the output. uniquify_list() makes
+    sure that no duplicates are in the list.
+   */
+  for (int i=0; i < broken_intos_.size (); i++)
+    {
+      /*
+       don't do this: strange side effects.
+       */
+      //    SCM al = broken_intos_[i]->get_grob_property ("all-elements");
+      //      al  = uniquify_list (al); 
+    }
+  
   if (verbose_global_b)
     progress_indication (_f ("Element count %d.",  count + element_count ()));
 
@@ -134,7 +196,8 @@ System::output_lines ()
 
       if (verbose_global_b)
        progress_indication ("[");
-      system->post_processing (i+1 == broken_intos_.size ());
+      bool last = i+1 == broken_intos_.size ();
+      system->post_processing (last);
 
       if (verbose_global_b)
        {
@@ -176,7 +239,6 @@ set_loose_columns (System* which, Column_x_positions const *posns)
       
       if (col->system_)
        continue;
-
       
       Item * left = 0;
       Item * right = 0;
@@ -196,13 +258,17 @@ set_loose_columns (System* which, Column_x_positions const *posns)
          if (!left && l)
            {
              left = l->get_column ();
+             if (!left->get_system ())
+               left = left->find_prebroken_piece (RIGHT);
            }
 
          divide_over ++;
-
          loose = right = r->get_column ();
        }
       while (1);
+
+      if (!right->get_system ())
+       right = right->find_prebroken_piece (LEFT);
       
       /*
        We divide the remaining space of the column over the left and
@@ -212,7 +278,7 @@ set_loose_columns (System* which, Column_x_positions const *posns)
       Grob * common = right->common_refpoint (left, X_AXIS);
       
       Real rx =        right->extent(common, X_AXIS)[LEFT];
-      Real lx =  left->extent(common, X_AXIS)[RIGHT];
+      Real lx = left->extent(common, X_AXIS)[RIGHT];
       Real total_dx = rx - lx;
       Interval cval =col->extent (col, X_AXIS);
 
@@ -240,6 +306,7 @@ set_loose_columns (System* which, Column_x_positions const *posns)
        dx *= 0.5;
 
       col->system_ = which;
+      col->translate_axis (- col->relative_coordinate (common, X_AXIS), X_AXIS);
       col->translate_axis (lx + dx - cval[LEFT], X_AXIS); 
     }
 }
@@ -368,6 +435,11 @@ System::pre_processing ()
     }
 }
 
+
+  const int LAYER_COUNT= 3;
+
+
+
 void
 System::post_processing (bool last_line)
 {
@@ -396,11 +468,23 @@ System::post_processing (bool last_line)
     generate all molecules  to trigger all font loads.
 
     (ugh. This is not very memory efficient.)  */
+
+  SCM all = get_grob_property ("all-elements")  ;
+  all = uniquify_list (all);
+
+  /*
+    triger font loads first.
+
+    This might seem inefficient, but Molecules are cached per grob
+    anyway.
+    */
   this->get_molecule();
-  for (SCM s = get_grob_property ("all-elements"); gh_pair_p (s); s = ly_cdr (s))
+  for (SCM s = all; gh_pair_p (s); s = ly_cdr (s))
     {
-      unsmob_grob (ly_car (s))->get_molecule ();
+      Grob * g = unsmob_grob (ly_car (s));
+      g->get_molecule ();
     }
+  
   /*
     font defs;
    */
@@ -448,8 +532,10 @@ System::post_processing (bool last_line)
        SCM e = sc->get_grob_property ("extra-offset");
        if (gh_pair_p (e))
          {
-           o[X_AXIS] += gh_scm2double (ly_car (e));
-           o[Y_AXIS] += gh_scm2double (ly_cdr (e));      
+           Offset z = ly_scm2offset (e);
+           z *= Staff_symbol_referencer::staff_space (sc);
+           
+           o += z;
          }
        
        output_molecule (m->get_expr (), o);