X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-item.cc;h=c87f51ed7f226298f7528d8af356faff8aead0ce;hb=4eb6f42fc6ca20d65c788a73eb78dfcc22ea0453;hp=f1c8ec2232b5b983109072ced458a9d51e5fb7de;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/key-item.cc b/lily/key-item.cc
index f1c8ec2232..c87f51ed7f 100644
--- a/lily/key-item.cc
+++ b/lily/key-item.cc
@@ -26,46 +26,48 @@ const int SHARP_TOP_PITCH=4; /*  ais and bis typeset in lower octave */
 /*
   FIXME: key-item should just get a list of (position, acc), and leave
   the thinking to other parties.
- */
+
+  - TODO: put this in Scheme
+  
+  - lots of values trivially shared (key doesn't change very
+  often). Compute those once, and use that as cache for the rest.
+
+*/
 int
-Key_item::calculate_position (Grob *ki, SCM pair) 
+alteration_pos  (SCM what, int alter, int c0p)
 {
-  int p = gh_scm2int (gh_car (pair));
-  int a = gh_scm2int (gh_cdr (pair));  
-  int c0p = gh_scm2int (ki->get_grob_property ("c0-position"));
-  if (to_boolean (ki->get_grob_property ("multi-octave")))
-    {
-      return p + c0p;
-    }
-  else {
-    // 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.
-    int c0 = from_bottom_pos - 4;
+  if (gh_pair_p (what))
+    return gh_scm2int (gh_car (what)) * 7 + gh_scm2int (gh_cdr (what)) + c0p;
+
+  int p = gh_scm2int (what);
+
+  // 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.
+  int c0 = from_bottom_pos - 4;
 
     
-    if ((a<0 && ((p>FLAT_TOP_PITCH) || (p+c0>4)) && (p+c0>1)) 
-	||
- (a>0 && ((p>SHARP_TOP_PITCH) || (p+c0>5)) && (p+c0>2))) 
-      {
-	p -= 7; /* Typeset below c_position */
-      }
-    /* Provide for the four cases in which there's a glitch 
+  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))) 
+    {
+      p -= 7; /* Typeset below c_position */
+    }
+  /* Provide for the four cases in which there's a glitch 
        it's a hack, but probably not worth  
        the effort of finding a nicer solution.
        --dl. */
-    if (c0==2 && a>0 && p==3)
-      p -= 7;
-    if (c0==-3 && a>0 && p==-1)
-      p += 7;
-    if (c0==-4 && a<0 && p==-1)
-      p += 7;
-    if (c0==-2 && a<0 && p==-3)
-      p += 7;
+  if (c0==2 && alter >0 && p==3)
+    p -= 7;
+  if (c0==-3 && alter>0 && p==-1)
+    p += 7;
+  if (c0==-4 && alter<0 && p==-1)
+    p += 7;
+  if (c0==-2 && alter<0 && p==-3)
+    p += 7;
     
-    return p + c0;
-  }
+  return p + c0;
 }
 
 /*
@@ -78,7 +80,6 @@ Key_item::brew_molecule (SCM smob)
 {
   Grob*me =unsmob_grob (smob);
 
-
   Real inter = Staff_symbol_referencer::staff_space (me)/2.0;
   
   SCM newas = me->get_grob_property ("new-accidentals");  
@@ -87,11 +88,15 @@ Key_item::brew_molecule (SCM smob)
     SCM lists are stacks, so we work from right to left, ending with
     the cancellation signature.
   */
+  int c0p = gh_scm2int (me->get_grob_property ("c0-position"));
   for (SCM s = newas; gh_pair_p (s); s = gh_cdr (s))
     {
-      int a = gh_scm2int (gh_cdar (s));
-      Molecule m = Font_interface::get_default_font (me)->find_by_name ("accidentals-" + to_str (a));
-      m.translate_axis (calculate_position (me, gh_car (s)) * inter, Y_AXIS);
+      SCM what = gh_caar (s);
+      int alter = gh_scm2int (gh_cdar (s));
+      int pos = alteration_pos (what, alter, c0p);
+      
+      Molecule m = Font_interface::get_default_font (me)->find_by_name ("accidentals-" + to_str (alter));
+      m.translate_axis (pos * inter, Y_AXIS);
       mol.add_at_edge (X_AXIS, LEFT, m, 0);
     }
 
@@ -99,6 +104,7 @@ Key_item::brew_molecule (SCM smob)
   if (it->break_status_dir () != RIGHT)
     {
       SCM old = me->get_grob_property ("old-accidentals");
+      
       /*
 	Add half a space between  cancellation and key sig.
 
@@ -108,24 +114,25 @@ Key_item::brew_molecule (SCM smob)
       Interval y (0,0);
 
       mol.add_at_edge (X_AXIS, LEFT, Lookup::blank (Box (x,y)),0);
+
+      Molecule natural;
+      if (gh_pair_p (old))
+	natural=Font_interface::get_default_font (me)->find_by_name ("accidentals-0");
       
       for (; gh_pair_p (old); old = gh_cdr (old))
         {
-	  SCM found = SCM_EOL;
-
-	  /*
-	    find correspondences in pitches 
-	   */
-          for (SCM s = newas; gh_pair_p (s); s = gh_cdr (s))
-	    if (gh_caar (s) == gh_caar (old))
-	      found  = gh_car (s);
-		
-	  if (found == SCM_EOL || gh_cdr (found) != gh_cdar (old))
+	  SCM found = scm_assoc (gh_caar (old), newas);
+	  if (found == SCM_BOOL_F
+	      || gh_cdr (found) != gh_cdar (old))
 	    {
-              Molecule m =Font_interface::get_default_font (me)->find_by_name ("accidentals-0");
+	      SCM what = gh_caar (old);
+	      int alter = 0;
+	      int pos = alteration_pos (what, alter, c0p);
+
+	      Molecule m = natural;
+              m.translate_axis (pos* inter, Y_AXIS);
 
-              m.translate_axis (calculate_position (me, gh_car (old)) * inter, Y_AXIS);
-              mol.add_at_edge (X_AXIS, LEFT, m,0);	
+	      mol.add_at_edge (X_AXIS, LEFT, m, 0);
             }
         }
     }