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

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index 5595759236..cfb21d18e9 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--2004 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,49 +20,21 @@ 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;
 }
 
-MAKE_SCHEME_CALLBACK (Chord_name,brew_molecule,1);
-SCM
-Chord_name::brew_molecule (SCM smob) 
-{
-  Grob *me = unsmob_grob (smob);
-  SCM style = me->get_grob_property ("style");
-
-  if (!gh_symbol_p (style))
-    style = ly_symbol2scm ("banter");
-
-  SCM chord = me->get_grob_property ("chord");
-  SCM func = me->get_grob_property ("chord-name-function");
-  SCM text = gh_call2 (func, style, chord);
 
-  SCM properties = Font_interface::font_alist_chain (me);
-  Molecule mol = Text_item::text2molecule (me, text, properties);
+ADD_INTERFACE (Chord_name, "chord-name-interface",
+  "generate a chord name",
+  "pitches chord style inversion bass begin-of-line-visible");
 
-  SCM space =  me->get_grob_property ("word-space");
-  if (gh_number_p (space))
-    {
-      Molecule m;
-      m.set_empty (false);
-      mol.add_at_edge (X_AXIS, RIGHT, m, gh_scm2double (space)*
-		       Staff_symbol_referencer::staff_space (me));
-    }
-
-  return mol.smobbed_copy ();
-}