X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name.cc;h=8111c7711756e75fde147d0f14d6404d66a134d5;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=e00f05ace9879a40b078e66350a9bc2aa72a0dd4;hpb=c380a7abde14a60ebd6d8a6eab91ae4e13677a23;p=lilypond.git

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index e00f05ace9..8111c77117 100644
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -1,69 +1,51 @@
 /*
-  chord-name.cc -- implement Chord_name
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c)  1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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 = 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::rank_i (me->column_l ()) -
-	  me->line_l ()->spanned_rank_iv ()[LEFT] > 1)
-	me->suicide ();
+      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_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);
-
-  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 ();
-}
-
-
-ADD_INTERFACE (Chord_name, "chord-name-interface",
-  "generate a chord name",
-  "pitches chord inversion bass begin-of-line-visible");
+ADD_INTERFACE (Chord_name,
+               "A chord label (name or fretboard).",
 
+               /* properties */
+               "begin-of-line-visible "
+              );