release commit

[lilypond.git] / lily / accidental.cc

diff --git a/lily/accidental.cc b/lily/accidental.cc
index 6df7e5116d0c308822f08c09b36a9aade550e76f..521c2e5985a805ba352a951f587f022fb4832823 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "accidental-interface.hh"
@@ -23,8 +23,12 @@
 Stencil
 parenthesize (Grob *me, Stencil m)
 {
-  Stencil open = Font_interface::get_default_font (me)->find_by_name ("accidentals.leftparen");
-  Stencil close = Font_interface::get_default_font (me)->find_by_name ("accidentals.rightparen");
+  Font_metric * font
+    = Font_interface::get_default_font (me); 
+  Stencil open
+    = font->find_by_name ("accidentals.leftparen");
+  Stencil close
+    = font->find_by_name ("accidentals.rightparen");
 
   m.add_at_edge (X_AXIS, LEFT, Stencil (open), 0, 0);
   m.add_at_edge (X_AXIS, RIGHT, Stencil (close), 0, 0);
@@ -32,6 +36,9 @@ parenthesize (Grob *me, Stencil m)
   return m;
 }
 
+/*
+  Hmm. Need separate callback, or perhaps #'live bool property.
+ */
 MAKE_SCHEME_CALLBACK (Accidental_interface, after_line_breaking, 1);
 SCM
 Accidental_interface::after_line_breaking (SCM smob)
@@ -39,7 +46,7 @@ Accidental_interface::after_line_breaking (SCM smob)
   Grob *me = unsmob_grob (smob);
   Grob *tie = unsmob_grob (me->get_object ("tie"));
 
-  if (tie && !tie->original_)
+  if (tie && !tie->original ())
     me->suicide ();
   return SCM_UNSPECIFIED;
 }
@@ -214,7 +221,7 @@ Accidental_interface::print (SCM smob)
                                 (ly_symbol2scm ("font-size"),
                                  scm_from_int (-2))),
                     ac);
-      fm = select_font (me->get_layout (), ac);
+      fm = select_font (me->layout (), ac);
     }
   else
     fm = Font_interface::get_default_font (me);