release: 1.3.109

[lilypond.git] / lily / time-signature.cc

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index bbefb9dcfaf3e1f6dd7ad7a3b7017648e76e2e0d..263cccb14972bb9e0cf4a3c4549b2bf4a8a15f92 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -9,24 +9,21 @@
 
 
 #include "molecule.hh"
+#include "text-item.hh"
 #include "time-signature.hh"
 #include "paper-def.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
 
-Time_signature::Time_signature (SCM s)
-  :  Item (s)
-{
-
-}
-
-// ugh.!
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACKS(Time_signature)
-Molecule 
-Time_signature::do_brew_molecule () const
+MAKE_SCHEME_CALLBACK(Time_signature,brew_molecule,1);
+/*
+  TODO: make different functions for special and normal timesigs.
+ */
+SCM
+Time_signature::brew_molecule (SCM smob) 
 {
-  SCM st = get_elt_property ("style");
-
-  SCM frac = get_elt_property ("fraction");
+  Grob * me = unsmob_element (smob);
+  SCM st = me->get_grob_property ("style");
+  SCM frac = me->get_grob_property ("fraction");
   int n = 4;
   int d = 4;
   if (gh_pair_p (frac))
@@ -36,52 +33,69 @@ Time_signature::do_brew_molecule () const
     }
 
   
-  if (gh_string_p (st))
+  if (gh_symbol_p (st))
     {
-      String style (ly_scm2string (st));
+      String style (ly_scm2string (scm_symbol_to_string (st)));
       if (style[0]=='1')
        {
-         return time_signature (n, 0);
+         return time_signature (me, n, 0).smobbed_copy ();
        }
       else
        {
-         return special_time_signature (style, n, d);
+         return special_time_signature (me, style, n, d).smobbed_copy ();
        }
     }
   else
-    return     time_signature (n,d);
+    return time_signature (me, n,d).smobbed_copy ();
 }
 
 Molecule
-Time_signature::special_time_signature (String s, int n, int d) const
+Time_signature::special_time_signature (Grob*me, String s, int n, int d)
 {
-  // First guess: s contains only the signature style
+  /*
+    Randomly probing the font sucks?
+  */
+  
+  SCM alist_chain = Font_interface::font_alist_chain (me);
+  
+  SCM style_chain =
+    Font_interface::add_style (me, ly_symbol2scm ("timesig-symbol"),
+                              alist_chain);
+
+  Font_metric *feta = Font_interface::get_font (me, style_chain);
+
+  /*
+    First guess: s contains only the signature style, append fraction.
+  */
   String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d);
   
-  Molecule m = lookup_l ()->afm_find (symbolname, false);
+  Molecule m = feta->find_by_name (symbolname);
   if (!m.empty_b()) 
     return m;
 
-  // Second guess: s contains the full signature name
-  m = lookup_l ()->afm_find ("timesig-"+s, false);
+  /*
+    Second guess: s contains the full signature name
+  */
+  m = feta->find_by_name ("timesig-" + s);
   if (!m.empty_b ()) 
     return m;
 
   // Resort to default layout with numbers
-  return time_signature (n,d);
+  return time_signature (me, n, d);
 }
 
 
 Molecule
-Time_signature::time_signature (int num, int den) const
+Time_signature::time_signature (Grob*me,int num, int den)
 {
-  String sty = "timesig";
+  SCM chain = Font_interface::font_alist_chain (me);
 
-  /*
-    UGH: need to look at fontsize.
-   */
-  Molecule n (lookup_l ()->text (sty, to_str (num), paper_l ()));
-  Molecule d (lookup_l ()->text (sty, to_str (den), paper_l ()));
+  Molecule n = Text_item::text2molecule (me,
+                                        ly_str02scm (to_str (num).ch_C ()),
+                                        chain);
+  Molecule d = Text_item::text2molecule (me,
+                                        ly_str02scm (to_str (den).ch_C ()),
+                                        chain);
   n.align_to (X_AXIS, CENTER);
   d.align_to (X_AXIS, CENTER);
   Molecule m;