X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fchord-name.cc;h=dd06b0bbdf76bdf767f67915dea053b215e51f0a;hb=a478e5ad057eaf795f915e2b31293e947364d41d;hp=3d786acc8182ae746c968ba96db344292d4f8278;hpb=eae90c59e6fc5a916c6736d2ca56486b045768a5;p=lilypond.git

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index 3d786acc81..dd06b0bbdf 100644
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -9,131 +9,21 @@
 #include "chord-name.hh"
 #include "molecule.hh"
 #include "paper-def.hh"
-#include "lookup.hh"
-#include "score-element.hh"
+#include "font-interface.hh"
+#include "grob.hh"
 #include "paper-column.hh"
 #include "line-of-score.hh"
+#include "staff-symbol-referencer.hh"
+#include "text-item.hh"
 
-/*
-  TODO: move text lookup out of Chord_name
- */
-
-/*
-  word is roman text or property-styled text:
-   "text"
-   ("text" . property-alist)
- */
-
-Molecule
-Chord_name::ly_word2molecule (Score_element * me, SCM word, Real* x) 
-{
-  *x = 0;
-
-  SCM options_alist = SCM_EOL;
-  if (gh_pair_p (word))
-    {
-      options_alist = gh_cdr (word);
-      word = gh_car (word);
-    }
-
-  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 ();
-}
-
-/*
-  ;; 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_CALLBACK (Chord_name, after_line_breaking);
+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 = dynamic_cast<Item*> (unsmob_grob (smob));
   assert (me);
     
-  SCM s = me->get_elt_property ("begin-of-line-visible");
+  SCM s = me->get_grob_property ("begin-of-line-visible");
   if (to_boolean (s))
     {
       if (Paper_column::rank_i (me->column_l ()) -
@@ -148,31 +38,31 @@ Chord_name::after_line_breaking (SCM smob)
   return SCM_UNSPECIFIED;
 }
 
-MAKE_SCHEME_CALLBACK (Chord_name, brew_molecule);
+MAKE_SCHEME_CALLBACK (Chord_name,brew_molecule,1);
 SCM
 Chord_name::brew_molecule (SCM smob) 
 {
-  Score_element *sc = unsmob_element (smob);
-  SCM style = sc->get_elt_property ("style");
+  Grob *me = unsmob_grob (smob);
+  SCM style = me->get_grob_property ("style");
 
-  if (!gh_string_p (style))
-    style = ly_str02scm ("banter");
+  if (!gh_symbol_p (style))
+    style = ly_symbol2scm ("banter");
 
-  SCM inversion = sc-> get_elt_property ("inversion");
-  if (inversion == SCM_EOL)
-    inversion = SCM_BOOL_F;
+  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);
 
-  SCM bass =  sc->get_elt_property ("bass");
-  if (bass == SCM_EOL)
-    bass = SCM_BOOL_F;
+  SCM properties = Font_interface::font_alist_chain (me);
+  Molecule mol = Text_item::text2molecule (me, text, properties);
 
-  SCM pitches =  sc->get_elt_property ("pitches");
-  SCM text = scm_eval2 (gh_list (ly_symbol2scm ("chord::user-name"),
-				style,
-				ly_quote_scm (pitches),
-				ly_quote_scm (gh_cons (inversion, bass)),
-				SCM_UNDEFINED),
-			SCM_EOL);
+  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 ly_text2molecule (sc, text).create_scheme ();
+  return mol.smobbed_copy ();
 }