* lily/include/translator.hh (ENTER_DESCRIPTION): add

[lilypond.git] / lily / ambitus.cc

diff --git a/lily/ambitus.cc b/lily/ambitus.cc
index 8b5cf38395ba92d6080e997ca216a4194c391939..a7ee2c9a46fdc7e2e6cd37f509d342ce8471f336 100644 (file)
--- a/lily/ambitus.cc
+++ b/lily/ambitus.cc
@@ -65,9 +65,9 @@ number_accidentals (SCM key_signature, Pitch *pitch,
 
   SCM prev;
   if (ignore_octave_b)
-    prev = ly_assoc_cdr (gh_int2scm (notename), key_signature);
+    prev = ly_assoc_cdr (scm_int2num (notename), key_signature);
   else
-    prev = gh_assoc (gh_cons (gh_int2scm (octave), gh_int2scm (notename)),
+    prev = gh_assoc (gh_cons (scm_int2num (octave), scm_int2num (notename)),
                     key_signature);
 
   /* should really be true unless prev == SCM_BOOL_F */
@@ -78,9 +78,9 @@ number_accidentals (SCM key_signature, Pitch *pitch,
 
   /* If an accidental was not found */
   if (prev == SCM_BOOL_F)
-    prev = gh_assoc (gh_int2scm (notename), key_signature);
+    prev = gh_assoc (scm_int2num (notename), key_signature);
 
-  SCM prev_acc = (prev == SCM_BOOL_F) ? gh_int2scm (0) : ly_cdr (prev);
+  SCM prev_acc = (prev == SCM_BOOL_F) ? scm_int2num (0) : ly_cdr (prev);
   int sig_alteration = gh_number_p (prev_acc) ? gh_scm2int (prev_acc) : 0;
 
   if (alteration == sig_alteration) // no accidental at all needed
@@ -172,7 +172,7 @@ Ambitus::brew_molecule (SCM smob)
       me->programming_error ("Ambitus: reverse range");
     }
 
-  SCM c0 = me->get_grob_property ("centralCPosition");
+  SCM c0 = me->get_grob_property ("c0-position");
   if (gh_number_p (c0))
     {
       p_min += gh_scm2int (c0);
@@ -219,7 +219,7 @@ Ambitus::brew_molecule (SCM smob)
   molecule.add_molecule (ledger_lines);
 
   // add accidentals
-  SCM key_signature = me->get_grob_property ("keySignature");
+  SCM key_signature = me->get_grob_property ("key-signature");
   SCM scm_accidentals_style = me->get_grob_property ("accidentals-style");
   String accidentals_style;
   if (gh_symbol_p (scm_accidentals_style))
@@ -248,4 +248,4 @@ Ambitus::brew_molecule (SCM smob)
 
 ADD_INTERFACE (Ambitus, "ambitus-interface",
   "An ambitus represents the pitch range of a voice.",
-  "note-head-style join-heads");
+  "c0-position pitch-min pitch-max accidentals note-head-style join-heads");