X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name.cc;h=3ffc591bd83f649988cef92f41f53138cca542c4;hb=c44e624300d9877c1790830902a10fd3868dd6d3;hp=804b3fb2c8019c004c71ab016e89a2fda210ff55;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index 804b3fb2c8..3ffc591bd8 100644
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -3,66 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2007 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 "line-of-score.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 = dynamic_cast<Item*> (unsmob_element (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::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 (me->get_column ()->get_rank ()
+	  - me->get_system ()->spanned_rank_interval ()[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_element (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 (ly_symbol2scm ("chord-name-function"));
-  SCM text = gh_call2 (func, style, chord);
+ADD_INTERFACE (Chord_name,
+	       "A chord name.",
 
-  SCM properties = Font_interface::font_alist_chain (me);
-  Molecule mol = Text_item::text2molecule (me, text, properties);
-
-  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 ();
-}
+	       /* properties */	       
+	       "begin-of-line-visible "
+	       );