2003 -> 2004

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

diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index 7b3c9ab3a1872aff183e7fd687061b641d949d22..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
 */
@@ -17,7 +17,7 @@
 #include "lookup.hh"
 #include "lily-guile.hh"
 #include "lily-proto.hh"
-
+#include "accidental-interface.hh"
 
 struct Key_signature_interface
 {
@@ -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)
@@ -99,12 +101,12 @@ Key_signature_interface::brew_molecule (SCM smob)
   Grob*me =unsmob_grob (smob);
 
   Real inter = Staff_symbol_referencer::staff_space (me)/2.0;
-  
+
   SCM scm_style = me->get_grob_property ("style");
   String style;
   if (gh_symbol_p (scm_style))
     {
-      style = ly_scm2string (scm_symbol_to_string (scm_style));
+      style = ly_symbol2string (scm_style);
     }
   else
     {
@@ -115,25 +117,34 @@ Key_signature_interface::brew_molecule (SCM smob)
   Molecule mol;
 
   SCM c0s = me->get_grob_property ("c0-position");
-  int c0p=0;
+  int c0p = 0;
   if (gh_number_p (c0s))
-     c0p = gh_scm2int (c0s);
+    c0p = gh_scm2int (c0s);
 
   /*
     SCM lists are stacks, so we work from right to left, ending with
     the cancellation signature.
   */
 
+  Font_metric *fm = Font_interface::get_default_font (me);
   for (SCM s = newas; gh_pair_p (s); s = ly_cdr (s))
     {
-      SCM what = ly_caar (s);
-      int alter = gh_scm2int (ly_cdar (s));
-      int pos = alteration_pos (what, alter, c0p);
-      
-      Molecule m = Font_interface::get_default_font (me)->
-         find_by_name (String ("accidentals-") + style + to_string (alter));
-      m.translate_axis (pos * inter, Y_AXIS);
-      mol.add_at_edge (X_AXIS, LEFT, m, 0);
+      int alteration = gh_scm2int (ly_cdar (s));
+      String font_char =
+       Accidental_interface::get_fontcharname (style, alteration);
+      Molecule acc (fm->find_by_name ("accidentals-" + font_char));
+
+      if (acc.is_empty ())
+       {
+         me->warning (_f ("accidental `%s' not found", font_char));
+       }
+      else
+       {
+         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, 0);
+       }
     }
 
   Item *it = dynamic_cast<Item*> (me) ;
@@ -149,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))
@@ -163,8 +174,8 @@ Key_signature_interface::brew_molecule (SCM smob)
              || ly_cdr (found) != ly_cdar (old))
            {
              SCM what = ly_caar (old);
-             int alter = 0;
-             int pos = alteration_pos (what, alter, c0p);
+             int alteration = 0;
+             int pos = alteration_pos (what, alteration, c0p);
 
              Molecule m = natural;
               m.translate_axis (pos* inter, Y_AXIS);
@@ -175,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);
             }
         }
     }