``slikken kreng''

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

diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index 802a6bf015657e20661e2a260fb49348d40dcf43..7b3c9ab3a1872aff183e7fd687061b641d949d22 100644 (file)
--- a/lily/key-signature-interface.cc
+++ b/lily/key-signature-interface.cc
@@ -1,4 +1,3 @@
-
 /*
   key-item.cc -- implement Key_signature_interface
 
@@ -23,6 +22,8 @@
 struct Key_signature_interface
 {
   DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
+
+  static bool has_interface (Grob*);
 };
 
 
@@ -32,6 +33,13 @@ struct Key_signature_interface
 const int FLAT_TOP_PITCH=2; /* fes,ges,as and bes typeset in lower octave */
 const int SHARP_TOP_PITCH=4; /*  ais and bis typeset in lower octave */
 
+/*
+  TODO: look this up. I'm not sure where the naturals ought to go. 
+ */
+const int NATURAL_TOP_PITCH = 4;  
+
+
+
 
 /*
   FIXME: key-item should just get a list of (position, acc), and leave
@@ -58,9 +66,9 @@ alteration_pos  (SCM what, int alter, int c0p)
   int c0 = from_bottom_pos - 4;
 
     
-  if ((alter <0 && ((p>FLAT_TOP_PITCH) || (p+c0>4)) && (p+c0>1)) 
-      ||
-      (alter >0 && ((p>SHARP_TOP_PITCH) || (p+c0>5)) && (p+c0>2))) 
+  if ((alter <0 && ((p>FLAT_TOP_PITCH) || (p+c0>4)) && (p+c0>1))
+      || (alter >0 && ((p > SHARP_TOP_PITCH) || (p+c0>5)) && (p+c0>2))
+      || (alter == 0 && ((p > NATURAL_TOP_PITCH) || (p + c0>5)) && (p + c0>2)))
     {
       p -= 7; /* Typeset below c_position */
     }
@@ -123,7 +131,7 @@ Key_signature_interface::brew_molecule (SCM smob)
       int pos = alteration_pos (what, alter, c0p);
       
       Molecule m = Font_interface::get_default_font (me)->
-         find_by_name (String ("accidentals-") + style + to_str (alter));
+         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);
     }
@@ -161,7 +169,13 @@ Key_signature_interface::brew_molecule (SCM smob)
              Molecule m = natural;
               m.translate_axis (pos* inter, Y_AXIS);
 
-             mol.add_at_edge (X_AXIS, LEFT, m, 0);
+             /*
+               The natural sign (unlike flat & sharp)
+               has vertical edges on both sides. A little padding is
+               needed to prevent collisions.
+              */
+             Real padding = 0.1 ;
+             mol.add_at_edge (X_AXIS, LEFT, m, padding);
             }
         }
     }
@@ -172,5 +186,5 @@ Key_signature_interface::brew_molecule (SCM smob)
 }
 
 ADD_INTERFACE (Key_signature_interface, "key-signature-interface",
-  "A group of  accidentals.",
+  "A group of accidentals, to be printed as signature sign.",
   "c0-position old-accidentals new-accidentals");