X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fchord-name.cc;h=6cfe2def109a7e7f4fee0c21a1c615d98a95be09;hb=f01d48144dd62b47a76506e8a8bf1bb81d1d1130;hp=1077e3ec6f2467436d595d1830691a884ee9ca75;hpb=402045837e7134cdf90d1fcf31768c62227a4936;p=lilypond.git

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index 1077e3ec6f..6cfe2def10 100644
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -3,38 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord-name.hh"
-#include "stencil.hh"
-#include "paper-def.hh"
+
+#include "output-def.hh"
 #include "font-interface.hh"
-#include "grob.hh"
 #include "paper-column.hh"
 #include "system.hh"
 #include "staff-symbol-referencer.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
 
-MAKE_SCHEME_CALLBACK (Chord_name,after_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Chord_name, after_line_breaking, 1);
 SCM
 Chord_name::after_line_breaking (SCM smob)
 {
-  Item* me = unsmob_item (smob);
+  Item *me = unsmob_item (smob);
   assert (me);
-    
-  SCM s = me->get_grob_property ("begin-of-line-visible");
+
+  SCM s = me->get_property ("begin-of-line-visible");
   if (to_boolean (s))
     {
-      if (Paper_column::get_rank (me->get_column ()) -
-	  me->get_system ()->spanned_rank_iv ()[LEFT] > 1)
+      if (me->get_column ()->get_rank ()
+	  - me->get_system ()->spanned_rank_interval ()[LEFT] > 1)
 	me->suicide ();
     }
   return SCM_UNSPECIFIED;
 }
 
+ADD_INTERFACE (Chord_name,
+	       "A chord name.",
 
-ADD_INTERFACE (Chord_name, "chord-name-interface",
-  "generate a chord name",
-  "begin-of-line-visible");
-
+	       /* properties */	       
+	       "begin-of-line-visible "
+	       );