*** empty log message ***

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

diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc
index 7ccd2179ed400d6028d748ea0201524bc77378ae..14008669491601e87255fd3db72384a3c6c81354 100644 (file)
--- a/lily/key-signature-interface.cc
+++ b/lily/key-signature-interface.cc
@@ -11,7 +11,7 @@
 #include "item.hh"
 
 #include "stencil.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "font-interface.hh"
 #include "staff-symbol-referencer.hh"
 #include "lookup.hh"
@@ -46,9 +46,6 @@ const int NATURAL_TOP_PITCH = 4;
   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.
 
   TODO: can  we do without c0pos? it's partly musical. 
 
@@ -56,10 +53,10 @@ const int NATURAL_TOP_PITCH = 4;
 int
 alteration_pos  (SCM what, int alter, int c0p)
 {
-  if (gh_pair_p (what))
-    return gh_scm2int (ly_car (what)) * 7 + gh_scm2int (ly_cdr (what)) + c0p;
+  if (ly_c_pair_p (what))
+    return ly_scm2int (ly_car (what)) * 7 + ly_scm2int (ly_cdr (what)) + c0p;
 
-  int p = gh_scm2int (what);
+  int p = ly_scm2int (what);
 
   // Find the c in the range -4 through 2
   int from_bottom_pos = c0p + 4;
@@ -74,6 +71,7 @@ alteration_pos  (SCM what, int alter, int c0p)
     {
       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.
@@ -104,7 +102,7 @@ Key_signature_interface::print (SCM smob)
 
   SCM scm_style = me->get_property ("style");
   String style;
-  if (gh_symbol_p (scm_style))
+  if (ly_c_symbol_p (scm_style))
     {
       style = ly_symbol2string (scm_style);
     }
@@ -118,8 +116,8 @@ Key_signature_interface::print (SCM smob)
 
   SCM c0s = me->get_property ("c0-position");
   int c0p = 0;
-  if (gh_number_p (c0s))
-    c0p = gh_scm2int (c0s);
+  if (ly_c_number_p (c0s))
+    c0p = ly_scm2int (c0s);
 
   /*
     SCM lists are stacks, so we work from right to left, ending with
@@ -127,9 +125,9 @@ Key_signature_interface::print (SCM smob)
   */
 
   Font_metric *fm = Font_interface::get_default_font (me);
-  for (SCM s = newas; gh_pair_p (s); s = ly_cdr (s))
+  for (SCM s = newas; ly_c_pair_p (s); s = ly_cdr (s))
     {
-      int alteration = gh_scm2int (ly_cdar (s));
+      int alteration = ly_scm2int (ly_cdar (s));
       String font_char =
        Accidental_interface::get_fontcharname (style, alteration);
       Stencil acc (fm->find_by_name ("accidentals-" + font_char));
@@ -163,11 +161,11 @@ Key_signature_interface::print (SCM smob)
       mol.add_at_edge (X_AXIS, LEFT, Lookup::blank (Box (x,y)), 0, 0);
 
       Stencil natural;
-      if (gh_pair_p (old))
+      if (ly_c_pair_p (old))
        natural=Font_interface::get_default_font (me)->
            find_by_name (String ("accidentals-") + style + String ("0"));
       
-      for (; gh_pair_p (old); old = ly_cdr (old))
+      for (; ly_c_pair_p (old); old = ly_cdr (old))
         {
          SCM found = scm_assoc (ly_caar (old), newas);
          if (found == SCM_BOOL_F
@@ -198,4 +196,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.",
-  "c0-position old-accidentals new-accidentals");
+  "style c0-position old-accidentals new-accidentals");