X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name.cc;h=5595759236497b5e46ad44620b9483ac9ef7e2f5;hb=0817e0513d1016ff22a633b6fee20ddba2a062f2;hp=bb6fbbc1ea915bfa8620d030fc7d8b6ad4b6e938;hpb=41e82f1eed38b69f60f74221c52ce14692318d6d;p=lilypond.git

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index bb6fbbc1ea..5595759236 100644
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -3,149 +3,66 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord-name.hh"
-#include "musical-request.hh"
-#include "warn.hh"
-#include "debug.hh"
 #include "molecule.hh"
 #include "paper-def.hh"
-#include "lookup.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 styled text:
-   "text"
-   ("style" . "text")
- */
-Molecule
-Chord_name::ly_word2molecule (SCM word) const
+MAKE_SCHEME_CALLBACK (Chord_name,after_line_breaking,1);
+SCM
+Chord_name::after_line_breaking (SCM smob)
 {
-  Dictionary<SCM> option_dict;
-  if (gh_pair_p (word))
+  Item* me = dynamic_cast<Item*> (unsmob_grob (smob));
+  assert (me);
+    
+  SCM s = me->get_grob_property ("begin-of-line-visible");
+  if (to_boolean (s))
     {
-      SCM options = gh_cdr (word);
-      word = gh_car (word);
-      while (gh_pair_p (options))
-        {
-	  SCM option = gh_car (options);
-	  if (option != SCM_UNDEFINED && option != SCM_BOOL_F
-	      && gh_pair_p (option))
-	    {
-	      SCM key = gh_car (option);
-	      SCM val = gh_cdr (option);
-	      String k;
-	      if (gh_symbol_p (key))
-		k = ly_symbol2string (key);
-	      else if (gh_string_p (key))
-	        k = ly_scm2string (key);
-              else
-	        continue;
-              option_dict[k] = val;
-	    }
-	  options = gh_cdr (options);
-        }
+      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)
+	me->suicide ();
     }
-  Real ex = lookup_l ()->text ("", "x", paper_l ()).extent
-	    ()[Y_AXIS].length ();
-  if (gh_string_p (word))
-    {
-      String w = ly_scm2string (word);
-      Molecule mol;
-      Offset offset;
-
-      int size = 0;
-      if (option_dict.elem_b ("size"))
-        size = gh_scm2int (option_dict["size"]);
-
-      String style;
-      if (option_dict.elem_b ("style"))
-        style = ly_scm2string (option_dict["style"]);
-
-      if (option_dict.elem_b ("type")
-	  && ly_scm2string (option_dict["type"]) == "super")
-	{
-	  Real super_y = ex / 2;
-	  //super_y += -acc.extent ()[Y_AXIS][MIN];
-	  offset = Offset (0, super_y);
-	  if (!size)
-	    size = -2;
-	}
-      if (option_dict.elem_b ("offset"))
-	{
-	  // hmm
-	  SCM s = option_dict["offset"];
-	  if (gh_pair_p (s))
-	    offset = Offset (gh_scm2double (gh_car (s)),
-			     gh_scm2double (gh_cdr (s))) * ex;
-	}
-      if (option_dict.elem_b ("font") 
-	  && ly_scm2string (option_dict["font"]) == "feta")
-        mol = paper_l ()->lookup_l (size)->afm_find (w);
-      else
-	mol = paper_l ()->lookup_l (size)->text (style, w, 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 (SCM text) const
-{
-  Molecule mol;
-  if (gh_list_p (text))
-    {
-      while (gh_cdr (text) != SCM_EOL)
-        {
-	  Molecule m = ly_word2molecule (gh_car (text));
-	  if (!m.empty_b ())
-	    mol.add_at_edge (X_AXIS, RIGHT, m, 0);
-	  text = gh_cdr (text);
-	}
-      text = gh_car (text);
-    }  
-  Molecule m = ly_word2molecule (text);
-  if (!m.empty_b ())
-    mol.add_at_edge (X_AXIS, RIGHT, m, 0);
-  return mol;
+  return SCM_UNSPECIFIED;
 }
 
-Molecule 
-Chord_name::do_brew_molecule () const
+MAKE_SCHEME_CALLBACK (Chord_name,brew_molecule,1);
+SCM
+Chord_name::brew_molecule (SCM smob) 
 {
-  SCM style = get_elt_property ("style");
-  if (style == SCM_UNDEFINED)
-    style = ly_str02scm ("banter");
+  Grob *me = unsmob_grob (smob);
+  SCM style = me->get_grob_property ("style");
 
-  SCM inversion = get_elt_property ("inversion");
-  if (inversion == SCM_UNDEFINED)
-    inversion = SCM_BOOL_F;
+  if (!gh_symbol_p (style))
+    style = ly_symbol2scm ("banter");
 
-  SCM bass = get_elt_property ("bass");
-  if (bass == SCM_UNDEFINED)
-    bass = SCM_BOOL_F;
+  SCM chord = me->get_grob_property ("chord");
+  SCM func = me->get_grob_property ("chord-name-function");
+  SCM text = gh_call2 (func, style, chord);
 
-  SCM pitches = get_elt_property ("pitches");
+  SCM properties = Font_interface::font_alist_chain (me);
+  Molecule mol = Text_item::text2molecule (me, text, properties);
 
-  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));
+  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 (text);
+  return mol.smobbed_copy ();
 }