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 564b66ea9a9d131f97bcb48d6d8c6cb0edba0dd0..6e35416a1896982813cdf3a32df6bb802decd76c 100644 (file)
--- a/lily/local-key-item.cc
+++ b/lily/local-key-item.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.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"
@@ -16,105 +16,87 @@
 
 Local_key_item::Local_key_item ()
 {
-  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);
+  c0_position_i_ = 0;
 }
 
 void
-Local_key_item::add (Musical_pitch p)
+Local_key_item::add_pitch (Musical_pitch p, bool cautionary)
 {
-  for (int i=0; i< accs.size(); i++)
-    if (!Musical_pitch::compare (p, accs[i]))
+  for (int i=0; i< accidental_arr_.size(); i++)
+    if (!Musical_pitch::compare (p, accidental_arr_[i].pitch_))
       return;
-  
-  accs.push (p);
+
+  Local_key_cautionary_tuple t;
+  t.pitch_ = p;
+  t.cautionary_b_ = cautionary;
+  accidental_arr_.push (t);
 }
 
+
 void
 Local_key_item::do_pre_processing()
 {
-  accs.sort (Musical_pitch::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;
-
+  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 (octave_mol_p)
            {
-             Real dy =lastoct*7*paper()->internote_f ();
+             Real dy =lastoct*7* note_distance;
              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].notename_i_ + c0_position_i_) * paper()->internote_f ();
-      Atom a (lookup_l ()->accidental (accs[i].accidental_i_));
-
-      a.translate_axis (dy, Y_AXIS);
-      Molecule m(a);
-      octave_mol_p->add_at_edge (X_AXIS, RIGHT, m);
+      
+      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 (octave_mol_p)
     {
-      Real dy =lastoct*7*paper()->internote_f ();
+      Real dy =lastoct*7*note_distance;
       octave_mol_p->translate_axis (dy, Y_AXIS);
       output->add_molecule (*octave_mol_p);
       delete octave_mol_p;
     }
   
- if (accs.size()) 
+ if (accidental_arr_.size()) 
     {
-      Box b(Interval (0, paper()->internote_f ()), Interval (0,0));
+      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);
+      output->add_at_edge (X_AXIS, RIGHT, m, 0);
     }
 
-  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;
 }
 
-IMPLEMENT_IS_TYPE_B1(Local_key_item,Item);
-
 void
-Local_key_item::do_substitute_dependency (Score_element*o,Score_element*n)
+Local_key_item::do_substitute_element_pointer (Score_element *o, Score_element*n)
 {
-  Item* o_l = o->access_Item ();
-  Item* n_l = n?n->access_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);
+  
 }