* flower/file-path.cc (find): try to open directly as well, so we

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 56f191d887422181d500309c9f3964178d9cde64..049ed3184ebdc5a841b223c61faf59cdd4fa319b 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -7,16 +7,14 @@
   
  */
 
+#include "time-signature.hh"
 
-#include "stencil.hh"
 #include "text-item.hh"
-#include "time-signature.hh"
 #include "output-def.hh"
 #include "font-interface.hh"
 #include "warn.hh"
 #include "staff-symbol-referencer.hh"
 
-
 /*
   TODO:
 
@@ -29,31 +27,27 @@ MAKE_SCHEME_CALLBACK (Time_signature, print, 1);
 SCM
 Time_signature::print (SCM smob) 
 {
-  Grob * me = unsmob_grob (smob);
+  Grob *me = unsmob_grob (smob);
   SCM st = me->get_property ("style");
   SCM frac = me->get_property ("fraction");
   int n = 4;
   int d = 4;
-  if (ly_c_pair_p (frac))
+  if (scm_is_pair (frac))
     {
-      n = ly_scm2int (ly_car (frac));
-      d = ly_scm2int (ly_cdr (frac));
+      n = scm_to_int (scm_car (frac));
+      d = scm_to_int (scm_cdr (frac));
     }
 
   Stencil m;
   if (st == ly_symbol2scm ("single-digit"))
-    {
-      m = numbered_time_signature (me, n, 0);
-    }
-  else if (ly_c_symbol_p (st))
-    {
-      m = special_time_signature (me, st, n, d);
-    }
+    m = numbered_time_signature (me, n, 0);
+  else if (scm_is_symbol (st))
+    m = special_time_signature (me, st, n, d);
   else
     m = numbered_time_signature (me, n,d);
 
   if (Staff_symbol_referencer::line_count (me) % 2 == 0)
-    m.translate_axis (Staff_symbol_referencer::staff_space (me)/2 , Y_AXIS);
+    m.translate_axis (Staff_symbol_referencer::staff_space (me) / 2 , Y_AXIS);
 
   return m.smobbed_copy ();
 }
@@ -79,10 +73,10 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
        }
     }
 
-  String char_name = style + to_string (n) + "/" + to_string (d);
+  String char_name = style + to_string (n) + to_string (d);
   me->set_property ("font-encoding", ly_symbol2scm ("fetaMusic"));
   Stencil out = Font_interface::get_default_font (me)
-    ->find_by_name ("timesig-" + char_name);
+    ->find_by_name ("timesig." + char_name);
   if (!out.is_empty ())
     return out;
 
@@ -101,9 +95,9 @@ Time_signature::numbered_time_signature (Grob*me,int num, int den)
                                         ly_symbol2scm ("fetaNumber"))),
                    chain);
                                
-  SCM sn = Text_item::interpret_markup (me->get_paper ()->self_scm (), chain,
+  SCM sn = Text_interface::interpret_markup (me->get_layout ()->self_scm (), chain,
                                        scm_makfrom0str (to_string (num).to_str0 ()));
-  SCM sd = Text_item::interpret_markup (me->get_paper ()->self_scm (), chain,
+  SCM sd = Text_interface::interpret_markup (me->get_layout ()->self_scm (), chain,
                                        scm_makfrom0str (to_string (den).to_str0 ()));
 
   Stencil n = *unsmob_stencil (sn);