X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name.cc;h=e2ec6929e9dda58a4a9e60f47edd58d7613271ee;hb=5287c2ed78ed3d434d67651896902f23a9b52eb1;hp=5595759236497b5e46ad44620b9483ac9ef7e2f5;hpb=0817e0513d1016ff22a633b6fee20ddba2a062f2;p=lilypond.git

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index 5595759236..e2ec6929e9 100644
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord-name.hh"
@@ -12,7 +12,7 @@
 #include "font-interface.hh"
 #include "grob.hh"
 #include "paper-column.hh"
-#include "line-of-score.hh"
+#include "system.hh"
 #include "staff-symbol-referencer.hh"
 #include "text-item.hh"
 
@@ -20,19 +20,14 @@ MAKE_SCHEME_CALLBACK (Chord_name,after_line_breaking,1);
 SCM
 Chord_name::after_line_breaking (SCM smob)
 {
-  Item* me = dynamic_cast<Item*> (unsmob_grob (smob));
+  Item* me = unsmob_item (smob);
   assert (me);
     
   SCM s = me->get_grob_property ("begin-of-line-visible");
   if (to_boolean (s))
     {
-      if (Paper_column::rank_i (me->column_l ()) -
-	  /*
-	    hmm, what's my column number in this line?
-	    why doesn't this work?
-	    me->line_l ()->rank_i_ > 2)
-	  */
-	  me->line_l ()->spanned_rank_iv ()[LEFT] > 1)
+      if (Paper_column::get_rank (me->get_column ()) -
+	  me->get_system ()->spanned_rank_iv ()[LEFT] > 1)
 	me->suicide ();
     }
   return SCM_UNSPECIFIED;
@@ -66,3 +61,9 @@ Chord_name::brew_molecule (SCM smob)
 
   return mol.smobbed_copy ();
 }
+
+
+ADD_INTERFACE (Chord_name, "chord-name-interface",
+  "generate a chord name",
+  "pitches chord chord-name-function inversion bass begin-of-line-visible");
+