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

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index bcc0abea3d..2fcff940bb 100644
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -1,154 +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--2000 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 "lookup.hh"
-#include "score-element.hh"
-
-/*
-  TODO: move text lookup out of Chord_name
- */
 
-/*
-  word is roman text or property-styled text:
-   "text"
-   ("text" . property-alist)
- */
+#include "output-def.hh"
+#include "font-interface.hh"
+#include "paper-column.hh"
+#include "system.hh"
+#include "staff-symbol-referencer.hh"
+#include "text-interface.hh"
 
-Molecule
-Chord_name::ly_word2molecule (Score_element * me, SCM word, Real* x) 
+MAKE_SCHEME_CALLBACK (Chord_name, after_line_breaking, 1);
+SCM
+Chord_name::after_line_breaking (SCM smob)
 {
-  *x = 0;
+  Item *me = Item::unsmob (smob);
+  assert (me);
 
-  SCM options_alist = SCM_EOL;
-  if (gh_pair_p (word))
+  SCM s = me->get_property ("begin-of-line-visible");
+  if (to_boolean (s))
     {
-      options_alist = gh_cdr (word);
-      word = gh_car (word);
+      if (me->get_column ()->get_rank ()
+          - me->get_system ()->spanned_rank_interval ()[LEFT] > 1)
+        me->suicide ();
     }
-
-  if (gh_string_p (word))
-    {
-      /*
-	UGH. Should read from font metric structure.
-      */
-      Real ex = me->lookup_l ()->text ("", "x",
-				   me->paper_l ()).extent (Y_AXIS).length ();
-      Real em = me->lookup_l ()->text ("", "m",
-				   me->paper_l ()).extent (X_AXIS).length ();
-
-      String w = ly_scm2string (word);
-
-      String style;
-      SCM s = scm_assoc (ly_symbol2scm ("style"), options_alist);
-      if (s != SCM_BOOL_F)
-	{
-	  style = ly_scm2string (gh_cdr (s));
-	}
-
-      Offset offset;
-      int size = 0;
-      /*
-	urg, `type'
-      */
-      s = scm_assoc (ly_symbol2scm ("type"), options_alist);
-      if (s != SCM_BOOL_F && ly_scm2string (gh_cdr (s)) == "super")
-	{
-	  Real super_y = ex / 2;
-	  offset = Offset (0, super_y);
-	  if (!size)
-	    size = -2;
-	}
-
-      s = scm_assoc (ly_symbol2scm ("size"), options_alist);
-      if (s != SCM_BOOL_F)
-	{
-	  size = gh_scm2int (gh_cdr (s));
-	}
-
-      s = scm_assoc (ly_symbol2scm ("offset"), options_alist);
-      if (s != SCM_BOOL_F)
-	{
-	  // hmm
-	  SCM o = gh_cdr (s);
-	  if (gh_pair_p (o))
-	    offset = Offset (0, gh_scm2double (gh_cdr (o))) * ex;
-	  *x = gh_scm2double (gh_car (o)) * em;
-	}
-
-      Molecule mol;
-      s = scm_assoc (ly_symbol2scm ("font"), options_alist);
-      if (s != SCM_BOOL_F && ly_scm2string (gh_cdr (s)) == "feta")
-        mol = me->paper_l ()->lookup_l (size)->afm_find (w);
-      else
-	mol = me->paper_l ()->lookup_l (size)->text (style, w, me->paper_l ());
-
-      mol.translate (offset);
-      return mol;
-    }
-  return Molecule ();
+  return SCM_UNSPECIFIED;
 }
 
-/*
-  ;; text: list of word
-  ;; word: string + optional list of property
-  ;; property: align, kern, font (?), size
- */
-Molecule
-Chord_name::ly_text2molecule (Score_element * me, SCM text) 
-{
-  Molecule mol;
-  if (gh_list_p (text))
-    {
-      while (gh_cdr (text) != SCM_EOL)
-        {
-	  Real x;
-	  Molecule m = ly_word2molecule (me, gh_car (text), &x);
-	  if (!m.empty_b ())
-	    mol.add_at_edge (X_AXIS, RIGHT, m, x);
-	  text = gh_cdr (text);
-	}
-      text = gh_car (text);
-    }  
-  Real x;
-  Molecule m = ly_word2molecule (me,text, &x);
-  if (!m.empty_b ())
-    mol.add_at_edge (X_AXIS, RIGHT, m, x);
-  return mol;
-}
-
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Chord_name,brew_molecule);
-
-SCM
-Chord_name::brew_molecule (SCM smob) 
-{
-  Score_element *sc = unsmob_element (smob);
-  SCM style = sc->get_elt_property ("style");
-  if (style == SCM_UNDEFINED)
-    style = ly_str02scm ("banter");
-
-  SCM inversion = sc-> get_elt_property ("inversion");
-  if (inversion == SCM_UNDEFINED)
-    inversion = SCM_BOOL_F;
-
-  SCM bass =  sc->get_elt_property ("bass");
-  if (bass == SCM_UNDEFINED)
-    bass = SCM_BOOL_F;
+ADD_INTERFACE (Chord_name,
+               "A chord label (name or fretboard).",
 
-  SCM pitches =  sc->get_elt_property ("pitches");
-
-  SCM text = scm_eval (gh_list (ly_symbol2scm ("chord::user-name"),
-				style,
-				ly_quote_scm (pitches),
-				ly_quote_scm (gh_cons (inversion, bass)),
-				SCM_UNDEFINED));
-
-  return ly_text2molecule (sc, text).create_scheme ();
-}
+               /* properties */
+               "begin-of-line-visible "
+              );