release: 1.3.0

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

diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc
index eab94bf65940bdb67c6befcc6cf603b7e8b2b951..6e35416a1896982813cdf3a32df6bb802decd76c 100644 (file)
--- a/lily/local-key-item.cc
+++ b/lily/local-key-item.cc
@@ -1,121 +1,102 @@
 /*
-  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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-
 #include "local-key-item.hh"
 #include "molecule.hh"
-#include "scalar.hh"
+
 #include "lookup.hh"
 #include "paper-def.hh"
 #include "musical-request.hh"
 #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)
+Local_key_item::add_pitch (Musical_pitch p, bool cautionary)
 {
-  support_items_.push (head_l);
-  add_dependency (head_l);
-}
+  for (int i=0; i< accidental_arr_.size(); i++)
+    if (!Musical_pitch::compare (p, accidental_arr_[i].pitch_))
+      return;
 
-void
-Local_key_item::add (Melodic_req*m_l)
-{
-  add (m_l->octave_i_, m_l->notename_i_, m_l->accidental_i_);
+  Local_key_cautionary_tuple t;
+  t.pitch_ = p;
+  t.cautionary_b_ = cautionary;
+  accidental_arr_.push (t);
 }
 
-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]))
-      return;
-  
-  accs.push (l);
-}
 
 void
 Local_key_item::do_pre_processing()
 {
-  accs.sort (Local_acc::compare);
+  accidental_arr_.sort (Local_key_cautionary_tuple::compare);
+  Note_head_side::do_pre_processing ();
 }
 
 Molecule*
-Local_key_item::brew_molecule_p() const
+Local_key_item::do_brew_molecule_p() const
 {
-  Molecule* output = new Molecule;
-  Molecule*octmol = 0;
+  Molecule*output = new Molecule;
+  Real note_distance = staff_line_leading_f ()/2;
+  Molecule *octave_mol_p = 0;
   int lastoct = -100;
-  for  (int i = 0; i <  accs.size(); i++) 
+  
+  for  (int i = 0; i <  accidental_arr_.size(); i++) 
     {
+      Musical_pitch p (accidental_arr_[i].pitch_);
       // do one octave
-      if (accs[i].octave_i_ != lastoct) 
+      if (p.octave_i_ != lastoct) 
        {
-         if (octmol)
+         if (octave_mol_p)
            {
-             Real dy =lastoct*7*paper()->internote_f ();
-             octmol->translate (dy, Y_AXIS);
-             output->add (*octmol);
-             delete octmol;
+             Real dy =lastoct*7* note_distance;
+             octave_mol_p->translate_axis (dy, Y_AXIS);
+             output->add_molecule (*octave_mol_p);
+             delete octave_mol_p;
            }
-         octmol= new Molecule;
+         octave_mol_p= 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_f ();
-      a.translate (dy, Y_AXIS);
-
-      octmol->add_at_edge (X_AXIS, RIGHT, a);
+      
+      lastoct = p.octave_i_;
+      Real dy =
+       (c0_position_i_ + p.notename_i_)
+       * note_distance;
+      Molecule m (lookup_l ()->accidental (p.accidental_i_, 
+                                          accidental_arr_[i].cautionary_b_));
+
+      m.translate_axis (dy, Y_AXIS);
+      octave_mol_p->add_at_edge (X_AXIS, RIGHT, m, 0);
     }
 
-  if (octmol)
+  if (octave_mol_p)
     {
-      Real dy =lastoct*7*paper()->internote_f ();
-      octmol->translate (dy, Y_AXIS);
-      output->add (*octmol);
-      delete octmol;
+      Real dy =lastoct*7*note_distance;
+      octave_mol_p->translate_axis (dy, Y_AXIS);
+      output->add_molecule (*octave_mol_p);
+      delete octave_mol_p;
     }
-
-  Interval head_width=itemlist_width (support_items_);
-  output->translate (-output->extent().x ().right + head_width.left , X_AXIS);
   
+ if (accidental_arr_.size()) 
+    {
+      Box b(Interval (0, 0.6 * note_distance), Interval (0,0));
+      Molecule m (lookup_l ()->fill (b));
+      output->add_at_edge (X_AXIS, RIGHT, m, 0);
+    }
+
   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_element_pointer (Score_element *o, Score_element*n)
 {
-  Item* o_l = o->item();
-  Item* n_l = n?n->item():0;
-
-  support_items_.substitute (o_l, n_l);
+  Note_head_side::do_substitute_element_pointer (o,n);
+  Staff_symbol_referencer::do_substitute_element_pointer (o,n);
+  
 }