new file, move from

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 7d414ab26841e28afa1e85e0cc07f285d2388bc2..d6e3b16f3efdbbbbd6c43301dd77b4c3191bd802 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -11,7 +11,7 @@
 #include "stencil.hh"
 #include "text-item.hh"
 #include "time-signature.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "font-interface.hh"
 #include "warn.hh"
 #include "staff-symbol-referencer.hh"
@@ -34,14 +34,14 @@ Time_signature::print (SCM smob)
   SCM frac = me->get_property ("fraction");
   int n = 4;
   int d = 4;
-  if (gh_pair_p (frac))
+  if (ly_c_pair_p (frac))
     {
-      n = gh_scm2int (ly_car (frac));
-      d = gh_scm2int (ly_cdr (frac));
+      n = ly_scm2int (ly_car (frac));
+      d = ly_scm2int (ly_cdr (frac));
     }
 
   Stencil m;
-  if (gh_symbol_p (st))
+  if (ly_c_symbol_p (st))
     {
       String style (ly_scm2string (scm_symbol_to_string (st)));
       if (style[0]=='1')
@@ -84,7 +84,7 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
     }
 
   String char_name = style + to_string (n) + "/" + to_string (d);
-  me->set_property ("font-family", ly_symbol2scm ("music"));
+  me->set_property ("font-encoding", ly_symbol2scm ("fetaMusic"));
   Stencil out = Font_interface::get_default_font (me)
     ->find_by_name ("timesig-" + char_name);
   if (!out.is_empty ())
@@ -100,14 +100,15 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
 Stencil
 Time_signature::numbered_time_signature (Grob*me,int num, int den)
 {
-  SCM number_def = scm_list_1 (gh_cons (ly_symbol2scm ("font-encoding"),
-                                       ly_symbol2scm ("number")));
-                                       
-  SCM chain = me->get_property_alist_chain (number_def);
+  SCM chain = me->get_property_alist_chain (Font_interface::text_font_alist_chain (me));
+  chain = scm_cons (scm_list_1 (scm_cons (ly_symbol2scm ("font-encoding"),
+                                        ly_symbol2scm ("fetaNumber"))),
+                   chain);
+                               
   SCM sn = Text_item::interpret_markup (me->get_paper ()->self_scm (), chain,
-                                scm_makfrom0str (to_string (num).to_str0 ()));
+                                       scm_makfrom0str (to_string (num).to_str0 ()));
   SCM sd = Text_item::interpret_markup (me->get_paper ()->self_scm (), chain,
-                                scm_makfrom0str (to_string (den).to_str0 ()));
+                                       scm_makfrom0str (to_string (den).to_str0 ()));
 
   Stencil n = *unsmob_stencil (sn);
   Stencil d = *unsmob_stencil (sd);