2003 -> 2004

[lilypond.git] / lily / ambitus.cc

diff --git a/lily/ambitus.cc b/lily/ambitus.cc
index 2a3a29f23b0f4e8cbd011fa17a07ede79d1c76e8..8fe9770d1c8c3c68fa10ff6f23457bfb33412e9c 100644 (file)
--- a/lily/ambitus.cc
+++ b/lily/ambitus.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2003 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2004 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "staff-symbol-referencer.hh"
@@ -71,7 +71,7 @@ number_accidentals (SCM key_signature, Pitch *pitch,
   if (ignore_octave_b)
     prev = ly_assoc_cdr (scm_int2num (notename), key_signature);
   else
-    prev = gh_assoc (gh_cons (scm_int2num (octave), scm_int2num (notename)),
+    prev = scm_assoc (gh_cons (scm_int2num (octave), scm_int2num (notename)),
                     key_signature);
 
   /* should really be true unless prev == SCM_BOOL_F */
@@ -82,7 +82,7 @@ number_accidentals (SCM key_signature, Pitch *pitch,
 
   /* If an accidental was not found */
   if (prev == SCM_BOOL_F)
-    prev = gh_assoc (scm_int2num (notename), key_signature);
+    prev = scm_assoc (scm_int2num (notename), key_signature);
 
   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;
@@ -110,7 +110,7 @@ add_accidentals (Item *me, Molecule *head, int num_acc,
       Molecule accidental (Font_interface::get_default_font (me)->
                           find_by_name (String ("accidentals-") +
                                         accidentals_style +
-                                        to_string (pitch->get_alteration())));
+                                        to_string (pitch->get_alteration ())));
       accidental.translate_axis (yoffs, Y_AXIS);
       head->add_at_edge (X_AXIS,  LEFT, accidental, 0.1, 0);
     }
@@ -143,7 +143,7 @@ Ambitus::brew_molecule (SCM smob)
     {
       note_head_style = String ("noteheads-2");
     }
-  if (Font_interface::get_default_font (me)->find_by_name (note_head_style).empty_b ())
+  if (Font_interface::get_default_font (me)->find_by_name (note_head_style).is_empty ())
     {
       String message = "Ambitus: no such note head: `" + note_head_style + "'";
       me->warning (_ (message.to_str0 ()));
@@ -198,12 +198,12 @@ Ambitus::brew_molecule (SCM smob)
   if (to_boolean (me->get_grob_property ("join-heads")) &&
       ((p_max - p_min) >= 3))
     {
-      Real linethickness = me->get_paper ()->get_var ("linethickness");
-      Real blotdiameter = me->get_paper ()->get_var ("blotdiameter");
+      Real linethickness = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+      Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
       Interval x_extent = 0.5 * Interval (-linethickness, +linethickness);
       Interval y_extent = 0.5 * Interval (p_min + 1.35, p_max - 1.35);
       Box line_box (x_extent, y_extent);
-      Molecule line = Lookup::roundfilledbox (line_box, blotdiameter);
+      Molecule line = Lookup::round_filled_box (line_box, blotdiameter);
       line.translate_axis (0.5 * head_min.extent (X_AXIS).length (), X_AXIS);
       molecule.add_molecule (line);
     }
@@ -217,11 +217,11 @@ Ambitus::brew_molecule (SCM smob)
   Molecule ledger_lines;
   int interspaces = Staff_symbol_referencer::line_count (me) - 1;
   ledger_lines =
-    Note_head::brew_ledger_lines (me, p_min, interspaces, l_extents, true);
+    Note_head::brew_ledger_lines (me, p_min, interspaces, l_extents, 0,true);
   ledger_lines.translate_axis (0.5 * p_min, Y_AXIS);
   molecule.add_molecule (ledger_lines);
   ledger_lines =
-    Note_head::brew_ledger_lines (me, p_max, interspaces, l_extents, true);
+    Note_head::brew_ledger_lines (me, p_max, interspaces, l_extents, 0, true);
   ledger_lines.translate_axis (0.5 * p_max, Y_AXIS);
   molecule.add_molecule (ledger_lines);