release: 1.1.29

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

diff --git a/lily/key-item.cc b/lily/key-item.cc
index d6e9aecb8652c2d5dd5ac88bc45866efe6011d9a..695de425afac40ecb11872423276f6812c518e5d 100644 (file)
--- a/lily/key-item.cc
+++ b/lily/key-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996, 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
   keyplacement by Mats Bengtsson
 */
@@ -73,10 +73,12 @@ Key_item::calculate_position(int p, int a) const
 }
 
 /*
-  TODO space the `natural' signs wider
+  TODO
+  - space the `natural' signs wider
+  - dehair this
  */
 Molecule*
-Key_item::brew_molecule_p() const
+Key_item::do_brew_molecule_p() const
 {
   Molecule*output = new Molecule;
   Real inter = paper()->internote_f ();
@@ -97,7 +99,7 @@ Key_item::brew_molecule_p() const
             {
               Molecule m =lookup_l ()->accidental (0,false);
               m.translate_axis (calculate_position(old_pitch_arr_[i], old_acc_arr_[i]) * inter, Y_AXIS);
-              output->add_at_edge (X_AXIS, RIGHT, m);  
+              output->add_at_edge (X_AXIS, RIGHT, m,0);        
             }
         }
 
@@ -109,14 +111,14 @@ Key_item::brew_molecule_p() const
       Interval x(0, inter);
       Interval y(0,0);
 
-      output->add_at_edge (X_AXIS, RIGHT, lookup_l()->fill (Box(x,y)));
+      output->add_at_edge (X_AXIS, RIGHT, lookup_l()->fill (Box(x,y)),0);
     }
  
   for (int i =0; i < pitch_arr_.size(); i++) 
     {
       Molecule m =lookup_l ()->accidental (acc_arr_[i],false);
       m.translate_axis (calculate_position(pitch_arr_[i], acc_arr_[i]) * inter, Y_AXIS);
-      output->add_at_edge (X_AXIS, RIGHT, m);  
+      output->add_at_edge (X_AXIS, RIGHT, m, 0);
     }
   if (pitch_arr_.size()) 
     {
@@ -124,7 +126,7 @@ Key_item::brew_molecule_p() const
                                          Interval (0, paper()->note_width ()),
                                          Interval (0,0))));
       
-      output->add_at_edge (X_AXIS, RIGHT, m);
+      output->add_at_edge (X_AXIS, RIGHT, m,0 );
     }
   return output;
 }