* The grand 2005-2006 replace.

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

diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index 375bac59b323a982f55c12b79d8a61395e28c285..28db248a6dc78f12f62b01e5f96e5c0d97f71a9d 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   keyplacement by Mats Bengtsson
 */
@@ -51,8 +51,8 @@ alteration_pos (SCM what, int alter, int c0p)
 
   // Find the c in the range -4 through 2
   int from_bottom_pos = c0p + 4;
-  from_bottom_pos = from_bottom_pos%7;
-  from_bottom_pos = (from_bottom_pos + 7)%7; // Precaution to get positive.
+  from_bottom_pos = from_bottom_pos % 7;
+  from_bottom_pos = (from_bottom_pos + 7) % 7; // Precaution to get positive.
   int c0 = from_bottom_pos - 4;
 
   if ((alter < 0 && ((p > FLAT_TOP_PITCH) || (p + c0 > 4)) && (p + c0 > 1))
@@ -86,22 +86,18 @@ MAKE_SCHEME_CALLBACK (Key_signature_interface, print, 1);
 SCM
 Key_signature_interface::print (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Item *me = dynamic_cast<Item *> (unsmob_grob (smob));
 
   Real inter = Staff_symbol_referencer::staff_space (me) / 2.0;
 
   SCM scm_style = me->get_property ("style");
   String style;
   if (scm_is_symbol (scm_style))
-    {
-      style = ly_symbol2string (scm_style);
-    }
+    style = ly_symbol2string (scm_style);
   else
-    {
-      style = "";
-    }
+    style = "";
 
-  SCM newas = me->get_property ("new-accidentals");
+  SCM newas = me->get_property ("alteration-alist");
   Stencil mol;
 
   SCM c0s = me->get_property ("c0-position");
@@ -114,6 +110,7 @@ Key_signature_interface::print (SCM smob)
     the cancellation signature.
   */
 
+  int last_pos = -1000;
   Font_metric *fm = Font_interface::get_default_font (me);
   for (SCM s = newas; scm_is_pair (s); s = scm_cdr (s))
     {
@@ -123,55 +120,26 @@ Key_signature_interface::print (SCM smob)
       Stencil acc (fm->find_by_name ("accidentals." + font_char));
 
       if (acc.is_empty ())
-       {
-         me->warning (_f ("accidental `%s' not found", font_char));
-       }
+       me->warning (_f ("accidental `%s' not found", font_char));
       else
        {
          SCM what = scm_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, 0);
-       }
-    }
-
-  Item *it = dynamic_cast<Item *> (me);
-  if (it->break_status_dir () != RIGHT)
-    {
-      SCM old = me->get_property ("old-accidentals");
-
-      Stencil natural;
-      if (scm_is_pair (old))
-       natural = Font_interface::get_default_font (me)->
-         find_by_name (String ("accidentals.") + style + String ("0"));
 
-      int last_pos = -100;
-      for (; scm_is_pair (old); old = scm_cdr (old))
-       {
-         SCM found = scm_assoc (scm_caar (old), newas);
-         if (found == SCM_BOOL_F
-             || scm_cdr (found) != scm_cdar (old))
-           {
-             SCM what = scm_caar (old);
-             int alteration = 0;
-             int pos = alteration_pos (what, alteration, c0p);
-
-             Stencil m = natural;
-             m.translate_axis (pos * inter, Y_AXIS);
-
-             /*
-               The natural sign (unlike flat & sharp)
-               has vertical edges on both sides. A little padding is
-               needed to prevent collisions.
-             */
-             Real padding = 0.0;
-             if (last_pos < pos + 2
-                 && last_pos > pos - 6)
-               padding = 0.3;
-
-             mol.add_at_edge (X_AXIS, LEFT, m, padding, 0);
-             last_pos = pos;
-           }
+         /*
+           The natural sign (unlike flat & sharp)
+           has vertical edges on both sides. A little padding is
+           needed to prevent collisions.
+         */
+         Real padding = 0.0;
+         if (alteration == 0
+             && last_pos < pos + 2
+             && last_pos > pos - 6)
+           padding = 0.3;
+
+         mol.add_at_edge (X_AXIS, LEFT, acc, padding, 0);
+         last_pos = pos;
        }
     }
 
@@ -182,4 +150,4 @@ Key_signature_interface::print (SCM smob)
 
 ADD_INTERFACE (Key_signature_interface, "key-signature-interface",
               "A group of accidentals, to be printed as signature sign.",
-              "style c0-position old-accidentals new-accidentals");
+              "style c0-position alteration-alist");