2003 -> 2004

[lilypond.git] / lily / key-signature-interface.cc

diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index 76bf41d2b0468b9ac766c8163bb25a71cbda6ff6..762b25e05b8fef6808456b25c680cfcc44dee145 100644 (file)
--- a/lily/key-signature-interface.cc
+++ b/lily/key-signature-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
   keyplacement by Mats Bengtsson
 */
@@ -50,6 +50,8 @@ const int NATURAL_TOP_PITCH = 4;
   - lots of values trivially shared (key doesn't change very
   often). Compute those once, and use that as cache for the rest.
 
+  TODO: can  we do without c0pos? it's partly musical. 
+
 */
 int
 alteration_pos  (SCM what, int alter, int c0p)
@@ -132,7 +134,7 @@ Key_signature_interface::brew_molecule (SCM smob)
        Accidental_interface::get_fontcharname (style, alteration);
       Molecule acc (fm->find_by_name ("accidentals-" + font_char));
 
-      if (acc.empty_b())
+      if (acc.is_empty ())
        {
          me->warning (_f ("accidental `%s' not found", font_char));
        }
@@ -141,7 +143,7 @@ Key_signature_interface::brew_molecule (SCM smob)
          SCM what = ly_caar (s);
          int pos = alteration_pos (what, alteration, c0p);
          acc.translate_axis (pos * inter, Y_AXIS);
-         mol.add_at_edge (X_AXIS, LEFT, acc, 0);
+         mol.add_at_edge (X_AXIS, LEFT, acc, 0, 0);
        }
     }
 
@@ -158,7 +160,7 @@ Key_signature_interface::brew_molecule (SCM smob)
       Interval x (0, inter);
       Interval y (0,0);
 
-      mol.add_at_edge (X_AXIS, LEFT, Lookup::blank (Box (x,y)),0);
+      mol.add_at_edge (X_AXIS, LEFT, Lookup::blank (Box (x,y)), 0, 0);
 
       Molecule natural;
       if (gh_pair_p (old))
@@ -184,7 +186,7 @@ Key_signature_interface::brew_molecule (SCM smob)
                needed to prevent collisions.
               */
              Real padding = 0.1 ;
-             mol.add_at_edge (X_AXIS, LEFT, m, padding);
+             mol.add_at_edge (X_AXIS, LEFT, m, padding, 0);
             }
         }
     }