Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index 0db5cf7b69be290076c63ac55dc1668542ffde6c..d0f30268eb4f4e016c5652045ccf52d99cd7ae98 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   keyplacement by Mats Bengtsson
 */
@@ -20,7 +20,7 @@
 struct Key_signature_interface
 {
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_GROB_INTERFACE();
+  DECLARE_GROB_INTERFACE ();
 };
 
 
@@ -36,13 +36,6 @@ Key_signature_interface::print (SCM 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);
-  else
-    style = "";
-
   Stencil mol;
 
   SCM c0s = me->get_property ("c0-position");
@@ -56,6 +49,9 @@ Key_signature_interface::print (SCM smob)
   */
 
   int last_pos = -1000;
+  SCM last_glyph_name = SCM_BOOL_F;
+  SCM padding_pairs = me->get_property ("padding-pairs");
+    
   Font_metric *fm = Font_interface::get_default_font (me);
   SCM alist = me->get_property ("glyph-name-alist");
 
@@ -65,15 +61,17 @@ Key_signature_interface::print (SCM smob)
        ? scm_from_int (0)
        : scm_cdar (s);
 
-      SCM glyph_name = ly_assoc_get (alt, alist, SCM_BOOL_F);
-      if (!scm_is_string (glyph_name))
+      SCM glyph_name_scm = ly_assoc_get (alt, alist, SCM_BOOL_F);
+      if (!scm_is_string (glyph_name_scm))
        {
          me->warning (_f ("No glyph found for alteration: %s",
                           ly_scm2rational (alt).to_string ().c_str ()));
          continue;
        }
-      
-      Stencil acc (fm->find_by_name (ly_scm2string (glyph_name)));
+
+      string glyph_name = ly_scm2string (glyph_name_scm);
+
+      Stencil acc (fm->find_by_name (glyph_name));
 
       if (acc.is_empty ())
        me->warning (_ ("alteration not found"));
@@ -91,14 +89,21 @@ Key_signature_interface::print (SCM smob)
            has vertical edges on both sides. A little padding is
            needed to prevent collisions.
          */
-         Real padding = 0.0;
-         if (is_cancellation
+         Real padding = robust_scm2double (me->get_property ("padding"),
+                                           0.0);
+         SCM handle = scm_assoc (scm_cons (glyph_name_scm, last_glyph_name),
+                                 padding_pairs);
+         if (scm_is_pair (handle))
+           padding = robust_scm2double (scm_cdr (handle), 0.0);
+         else if (glyph_name ==  "accidentals.natural"
              && last_pos < pos + 2
              && last_pos > pos - 6)
-           padding = 0.3;
+           padding += 0.3;
 
-         mol.add_at_edge (X_AXIS, LEFT, acc, padding, 0);
+         mol.add_at_edge (X_AXIS, LEFT, acc, padding);
+         
          last_pos = pos;
+         last_glyph_name = glyph_name_scm;
        }
     }
 
@@ -110,8 +115,10 @@ Key_signature_interface::print (SCM smob)
 ADD_INTERFACE (Key_signature_interface,
               "A group of accidentals, to be printed as signature sign.",
 
+              /* properties */
               "alteration-alist "
               "c0-position "
               "glyph-name-alist "
-              "style "
+              "padding "
+              "padding-pairs "
               );