X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name.cc;h=2fcff940bbd81e2d607ca8fea39c69f8b83edf25;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=1077e3ec6f2467436d595d1830691a884ee9ca75;hpb=402045837e7134cdf90d1fcf31768c62227a4936;p=lilypond.git

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index 1077e3ec6f..2fcff940bb 100644
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -1,40 +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--2004 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 "stencil.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 = Item::unsmob (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)
-	me->suicide ();
+      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",
-  "begin-of-line-visible");
-
+               /* properties */
+               "begin-of-line-visible "
+              );