Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / lily / chord-name.cc

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index 80c58ee5e5166199e45165d60b9ff8600f94e5dc..db784b8d2562b9cdd8b81d3b1a43dfd59320cfac 100644 (file)
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -1,40 +1,40 @@
 /*
-  chord-name.cc -- implement Chord_name
+  chord-name.cc -- implement Chord_label
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord-name.hh"
-#include "molecule.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 label (name or fretboard).",
 
-ADD_INTERFACE (Chord_name, "chord-name-interface",
-  "generate a chord name",
-  "pitches chord style inversion bass begin-of-line-visible");
-
+              /* properties */        
+              "begin-of-line-visible "
+              );