release: 1.5.29

[lilypond.git] / lily / clef-item.cc

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 1cdc84a57aab91cebe006a12603f72f0cbf6e52e..b1cde0874f7693228643c2e26d565469804e2ed7 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -16,11 +16,11 @@
 /*
  FIXME: should use symbol for #'style.
 */
-MAKE_SCHEME_CALLBACK(Clef,before_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Clef,before_line_breaking,1);
 SCM
 Clef::before_line_breaking (SCM smob)
 {
-  Item * s = dynamic_cast<Item*> (unsmob_grob (smob));
+  Item * s = unsmob_item (smob);
 
   SCM glyph = s->get_grob_property ("glyph-name");
   
@@ -28,12 +28,12 @@ Clef::before_line_breaking (SCM smob)
     {
       String str = ly_scm2string (glyph);
 
-      if (to_boolean (s->get_grob_property ("non-default")) &&
-         s->break_status_dir() != RIGHT &&
-         to_boolean (s->get_grob_property ("full-size-change")))
+      if (to_boolean (s->get_grob_property ("non-default"))
+         && s->break_status_dir () != RIGHT
+         && !to_boolean (s->get_grob_property ("full-size-change")))
        {
          str += "_change";
-         s->set_grob_property ("glyph-name", ly_str02scm (str.ch_C()));          
+         s->set_grob_property ("glyph-name", ly_str02scm (str.ch_C ()));         
        }
     }
   else
@@ -58,7 +58,7 @@ Clef::set_interface (Grob* me)
   me->set_interface (ly_symbol2scm ("clef-interface"));
 }
 
-MAKE_SCHEME_CALLBACK(Clef,brew_molecule,1)
+MAKE_SCHEME_CALLBACK (Clef,brew_molecule,1)
 SCM
 Clef::brew_molecule (SCM smob) 
 {