release: 0.1.12

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

diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc
index f6d8b9ba7f6a8101b2aa78288c74b1a93888547f..33037e26ead1c56da0334263fa58bb6c13a82cba 100644 (file)
--- a/lily/local-key-item.cc
+++ b/lily/local-key-item.cc
@@ -1,7 +1,7 @@
 /*
   local-key-item.cc -- implement Local_key_item, Local_acc
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
@@ -12,96 +12,110 @@
 #include "lookup.hh"
 #include "paper-def.hh"
 #include "musical-request.hh"
-#include "notehead.hh"
+#include "note-head.hh"
 #include "misc.hh"
 
 
 
-Local_key_item::Local_key_item(int i)
+Local_key_item::Local_key_item (int i)
 {
-    c0_position  = i;
+  c0_position  = i;
 }
 
 void
-Local_key_item::add(Item*head_l)
+Local_key_item::add_support (Item*head_l)
 {
-    support_items_.push(head_l);
-    add_dependency(head_l);
+  support_items_.push (head_l);
+  add_dependency (head_l);
 }
 
 void
-Local_key_item::add(Melodic_req*m_l)
+Local_key_item::add (Melodic_req*m_l)
 {
-    add(m_l->octave_i_, m_l->notename_i_, m_l->accidental_i_);
+  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_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]))
+  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]))
            return;
-    
-    accs.push(l);
+  
+  accs.push (l);
 }
 
 void
 Local_key_item::do_pre_processing()
 {
-    accs.sort(Local_acc::compare);
+  accs.sort (Local_acc::compare);
 }
 
 Molecule*
-Local_key_item::brew_molecule_p()const
+Local_key_item::brew_molecule_p() const
 {
-    Molecule* output = new Molecule;
-    Molecule*octmol = 0;
-    int lastoct = -100;
-    for  (int i = 0; i <  accs.size(); i++) {
+  Molecule* output = new Molecule;
+  Molecule*octmol = 0;
+  int lastoct = -100;
+  for  (int i = 0; i <  accs.size(); i++) 
+    {
        // do one octave
-       if (accs[i].octave_i_ != lastoct) {
-           if (octmol){
-               Real dy =lastoct*7*paper()->internote();
-               octmol->translate(Offset(0, dy));
-               output->add(*octmol);
+       if (accs[i].octave_i_ != lastoct) 
+         {
+           if (octmol)
+             {
+               Real dy =lastoct*7*paper()->internote_f ();
+               octmol->translate (dy, Y_AXIS);
+               output->add (*octmol);
                delete octmol;
-           }
+             }
            octmol= new Molecule;
-       }
+         }
        lastoct = accs[i].octave_i_;
-       Symbol s =paper()->lookup_l()->accidental(accs[i].accidental_i_);   
-       Atom a(s);
-       Real dy = (accs[i].name_i_ + c0_position) * paper()->internote();
-       a.translate(Offset(0,dy));
+       Symbol s =paper()->lookup_l ()->accidental (accs[i].accidental_i_);   
+       Atom a (s);
+       Real dy = (accs[i].name_i_ + c0_position) * paper()->internote_f ();
+       a.translate (dy, Y_AXIS);
 
-       octmol->add_right(a);
+       octmol->add_right (a);
     }
 
-    if (octmol){
-       Real dy =lastoct*7*paper()->internote();
-       octmol->translate(Offset(0, dy));
-       output->add(*octmol);
+  if (octmol)
+    {
+       Real dy =lastoct*7*paper()->internote_f ();
+       octmol->translate (dy, Y_AXIS);
+       output->add (*octmol);
        delete octmol;
     }
 
-    Interval head_width=itemlist_width(support_items_);
-    output->translate(Offset(-output->extent().x.right + head_width.left ,0));
-    
-    return output;
+  Interval head_width=itemlist_width (support_items_);
+  output->translate (-output->extent().x ().right + head_width.left , X_AXIS);
+  
+  return output;
 }
 
 int
-Local_acc::compare(Local_acc&a, Local_acc&b)
+Local_acc::compare (Local_acc&a, Local_acc&b)
 {
-    if (a.octave_i_ - b.octave_i_)
+  if (a.octave_i_ - b.octave_i_)
        return a.octave_i_ - b.octave_i_;
-    if (a.name_i_ - b.name_i_)
+  if (a.name_i_ - b.name_i_)
        return a.name_i_ - b.name_i_;
-    
-    return a.accidental_i_ - b.accidental_i_;
+  
+  return a.accidental_i_ - b.accidental_i_;
 };
-IMPLEMENT_STATIC_NAME(Local_key_item);
+
+IMPLEMENT_IS_TYPE_B1(Local_key_item,Item);
+
+void
+Local_key_item::do_substitute_dependency (Score_elem*o,Score_elem*n)
+{
+  Item* o_l = o->item();
+  Item* n_l = n?n->item():0;
+
+  support_items_.substitute (o_l, n_l);
+}