* mf/merge.pe.in: Set font names, version, license GPL.

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index be45079d32b51e6a42f084ef7197f6df791b692b..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 "paper-def.hh"
+#include "output-def.hh"
 #include "font-interface.hh"
 #include "warn.hh"
 #include "staff-symbol-referencer.hh"
 
-
 /*
   TODO:
 
@@ -29,35 +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 (gh_pair_p (frac))
+  if (scm_is_pair (frac))
     {
-      n = gh_scm2int (ly_car (frac));
-      d = gh_scm2int (ly_cdr (frac));
+      n = scm_to_int (scm_car (frac));
+      d = scm_to_int (scm_cdr (frac));
     }
 
   Stencil m;
-  if (gh_symbol_p (st))
-    {
-      String style (ly_scm2string (scm_symbol_to_string (st)));
-      if (style[0]=='1')
-       {
-         m = numbered_time_signature (me, n, 0);
-       }
-      else
-       {
-         m = special_time_signature (me, st, n, d);
-       }
-    }
+  if (st == ly_symbol2scm ("single-digit"))
+    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 ();
 }
@@ -83,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);
-  me->set_property ("font-encoding", ly_symbol2scm ("music"));
+  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,14 +91,14 @@ Stencil
 Time_signature::numbered_time_signature (Grob*me,int num, int den)
 {
   SCM chain = me->get_property_alist_chain (Font_interface::text_font_alist_chain (me));
-  chain = scm_cons (scm_list_1 (gh_cons (ly_symbol2scm ("font-encoding"),
-                                        ly_symbol2scm ("number"))),
+  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 sd = Text_item::interpret_markup (me->get_paper ()->self_scm (), chain,
-                                scm_makfrom0str (to_string (den).to_str0 ()));
+  SCM sn = Text_interface::interpret_markup (me->get_layout ()->self_scm (), chain,
+                                       scm_makfrom0str (to_string (num).to_str0 ()));
+  SCM sd = Text_interface::interpret_markup (me->get_layout ()->self_scm (), chain,
+                                       scm_makfrom0str (to_string (den).to_str0 ()));
 
   Stencil n = *unsmob_stencil (sn);
   Stencil d = *unsmob_stencil (sd);
@@ -141,7 +131,7 @@ ADD_INTERFACE (Time_signature, "time-signature-interface",
 "        4/4 and 2/2 are typeset as C and struck C, respectively.  All\n"
 "        other time signatures are written with two digits.\n"
 "\n"
-"      @item @code{neo_mensural}\n"
+"      @item @code{neomensural}\n"
 "        2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8 and 9/8 are\n"
 "        typeset with neo-mensural style mensuration marks.  All other time\n"
 "        signatures are written with two digits.\n"
@@ -151,10 +141,9 @@ ADD_INTERFACE (Time_signature, "time-signature-interface",
 "        typeset with mensural style mensuration marks.  All other time\n"
 "        signatures are written with two digits.\n"
 "\n"
-"      @item @code{1xxx}\n"
+"      @item @code{single-digit}\n"
 "        All time signatures are typeset with a single\n"
-"        digit, e.g. 3/2 is written as 3. (Any symbol starting\n"
-"      with the digit @code{1} will do.)\n"
+"        digit, e.g. 3/2 is written as 3.\n"
 "    @end table\n"
 "\n"
 "See also the test-file @file{input/test/time.ly}.\n",