X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name.cc;h=586801c3919d7935dc38b080bae68f2b31ee9ccb;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=c8e8e785ac8e55a7c419476a2c0f4a74c7fe1b8c;hpb=4f6b4a6446a913f89760e63b7f65c8bdb223a3a5;p=lilypond.git

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index c8e8e785ac..586801c391 100644
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -3,175 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord-name.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
-#include "score-element.hh"
-#include "paper-column.hh"
-#include "line-of-score.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;
-}
+#include "output-def.hh"
+#include "font-interface.hh"
+#include "paper-column.hh"
+#include "system.hh"
+#include "staff-symbol-referencer.hh"
+#include "text-interface.hh"
 
-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 = unsmob_item (smob);
   assert (me);
-    
-  SCM s = me->get_elt_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 ()) -
-	  /*
-	    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)
+      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);
-SCM
-Chord_name::brew_molecule (SCM smob) 
-{
-  Score_element *sc = unsmob_element (smob);
-  SCM style = sc->get_elt_property ("style");
-
-  if (!gh_string_p (style))
-    style = ly_str02scm ("banter");
+ADD_INTERFACE (Chord_name,
+	       "A chord name.",
 
-  SCM inversion = sc-> get_elt_property ("inversion");
-  if (inversion == SCM_EOL)
-    inversion = SCM_BOOL_F;
-
-  SCM bass =  sc->get_elt_property ("bass");
-  if (bass == SCM_EOL)
-    bass = SCM_BOOL_F;
-
-  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 "
+	       );