release: 1.1.0

[lilypond.git] / lily / local-key-item.cc

diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc
index 2d24d07959568fa89eb61694559f1a45e28dd3dc..a0dc2907a6b4f72326b8d1c2fe4bc1b9b5cef7b1 100644 (file)
--- a/lily/local-key-item.cc
+++ b/lily/local-key-item.cc
@@ -1,11 +1,10 @@
 /*
-  local-key-item.cc -- implement Local_key_item, Local_acc
+  local-key-item.cc -- implement Local_key_item, Musical_pitch
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include "dimen.hh"
 #include "local-key-item.hh"
 #include "molecule.hh"
 #include "scalar.hh"
@@ -15,44 +14,34 @@
 #include "note-head.hh"
 #include "misc.hh"
 
-
-
-Local_key_item::Local_key_item (int i)
+Local_key_item::Local_key_item ()
 {
-  c0_position  = i;
+  c0_position_i_ = 0;
 }
 
 void
 Local_key_item::add_support (Item*head_l)
 {
+  if (support_items_.find_l(head_l))
+    return ;
   support_items_.push (head_l);
   add_dependency (head_l);
 }
 
 void
-Local_key_item::add (Melodic_req*m_l)
-{
-  add (m_l->octave_i_, m_l->notename_i_, m_l->accidental_i_);
-}
-
-void
-Local_key_item::add (int o, int p , int a)
+Local_key_item::add (Musical_pitch p)
 {
-  Local_acc l;
-  l.octave_i_ = o;
-  l.name_i_ = p;
-  l.accidental_i_ = a;
-  for (int i=0; i< accs.size(); i++)
-    if (!Local_acc::compare (l, accs[i]))
+  for (int i=0; i< accidental_pitch_arr_.size(); i++)
+    if (!Musical_pitch::compare (p, accidental_pitch_arr_[i]))
       return;
   
-  accs.push (l);
+  accidental_pitch_arr_.push (p);
 }
 
 void
 Local_key_item::do_pre_processing()
 {
-  accs.sort (Local_acc::compare);
+  accidental_pitch_arr_.sort (Musical_pitch::compare);
 }
 
 Molecule*
@@ -62,26 +51,28 @@ Local_key_item::brew_molecule_p() const
 
   Molecule *octave_mol_p = 0;
   int lastoct = -100;
-  for  (int i = 0; i <  accs.size(); i++) 
+  for  (int i = 0; i <  accidental_pitch_arr_.size(); i++) 
     {
       // do one octave
-      if (accs[i].octave_i_ != lastoct) 
+      if (accidental_pitch_arr_[i].octave_i_ != lastoct) 
        {
          if (octave_mol_p)
            {
              Real dy =lastoct*7*paper()->internote_f ();
-             octave_mol_p->translate (dy, Y_AXIS);
-             output->add (*octave_mol_p);
+             octave_mol_p->translate_axis (dy, Y_AXIS);
+             output->add_molecule (*octave_mol_p);
              delete octave_mol_p;
            }
          octave_mol_p= new Molecule;
        }
-      lastoct = accs[i].octave_i_;
       
-      Real dy = (accs[i].name_i_ + c0_position) * paper()->internote_f ();
-      Atom a (paper()->lookup_l ()->accidental (accs[i].accidental_i_));
-      a.dim_[X_AXIS] += 1 PT; // todo
-      a.translate (dy, Y_AXIS);
+      lastoct = accidental_pitch_arr_[i].octave_i_;
+      Real dy =
+       (c0_position_i_ + accidental_pitch_arr_[i].notename_i_)
+       * paper()->internote_f ();
+      Atom a (lookup_l ()->accidental (accidental_pitch_arr_[i].accidental_i_));
+
+      a.translate_axis (dy, Y_AXIS);
       Molecule m(a);
       octave_mol_p->add_at_edge (X_AXIS, RIGHT, m);
     }
@@ -89,41 +80,44 @@ Local_key_item::brew_molecule_p() const
   if (octave_mol_p)
     {
       Real dy =lastoct*7*paper()->internote_f ();
-      octave_mol_p->translate (dy, Y_AXIS);
-      output->add (*octave_mol_p);
+      octave_mol_p->translate_axis (dy, Y_AXIS);
+      output->add_molecule (*octave_mol_p);
       delete octave_mol_p;
     }
   
- if (accs.size()) 
+ if (accidental_pitch_arr_.size()) 
     {
       Box b(Interval (0, paper()->internote_f ()), Interval (0,0));
-      Molecule m (paper()->lookup_l ()->fill (b));
+      Molecule m (lookup_l ()->fill (b));
       output->add_at_edge (X_AXIS, RIGHT, m);
     }
-  Interval head_width=itemlist_width (support_items_);
-  output->translate (-output->extent().x ().right + head_width.left , X_AXIS);
+
+  Interval x_int;
+  for (int i=0; i < support_items_.size(); i++) 
+    {
+      Graphical_axis_group *common = 
+       common_group (support_items_[i], X_AXIS);
+
+      Real x = support_items_[i]->relative_coordinate (common, X_AXIS)  
+       -relative_coordinate (common, X_AXIS);
+
+      x_int.unite (x + support_items_[i]->width());
+    }
+  if (x_int.empty_b ())
+    x_int = Interval(0,0);
+  
+  output->translate_axis (-output->extent()[X_AXIS][RIGHT] + x_int[LEFT], X_AXIS);
   
   return output;
 }
 
-int
-Local_acc::compare (Local_acc&a, Local_acc&b)
-{
-  if (a.octave_i_ - b.octave_i_)
-    return a.octave_i_ - b.octave_i_;
-  if (a.name_i_ - b.name_i_)
-    return a.name_i_ - b.name_i_;
-  
-  return a.accidental_i_ - b.accidental_i_;
-};
-
 IMPLEMENT_IS_TYPE_B1(Local_key_item,Item);
 
 void
-Local_key_item::do_substitute_dependency (Score_elem*o,Score_elem*n)
+Local_key_item::do_substitute_dependency (Score_element*o,Score_element*n)
 {
-  Item* o_l = o->item();
-  Item* n_l = n?n->item():0;
+  Item* o_l = dynamic_cast <Item *> (o);
+  Item* n_l = n?dynamic_cast <Item *> (n):0;
 
   support_items_.substitute (o_l, n_l);
 }