patch::: 1.3.103.jcn3: Re: LilyPond 1.3.103

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 2912f3b37a5db75760b03826297016fa7b017b70..e6afe98bd224321c2b328c201673f6be3aa20da1 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -9,9 +9,10 @@
 
 
 #include "molecule.hh"
+#include "text-item.hh"
 #include "time-signature.hh"
 #include "paper-def.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
 
 MAKE_SCHEME_CALLBACK(Time_signature,brew_molecule,1);
 
@@ -49,33 +50,50 @@ Time_signature::brew_molecule (SCM smob)
 Molecule
 Time_signature::special_time_signature (Score_element*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 = me->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 = me->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 (me, n,d);
+  return time_signature (me, n, d);
 }
 
 
 Molecule
 Time_signature::time_signature (Score_element*me,int num, int den)
 {
-  String sty = "timesig";
+  SCM chain = Font_interface::font_alist_chain (me);
 
-  /*
-    UGH: need to look at fontsize.
-   */
-  Molecule n (me->lookup_l ()->text (sty, to_str (num), me->paper_l ()));
-  Molecule d (me->lookup_l ()->text (sty, to_str (den), me->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;