X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature.cc;h=1b2ed673f402cd1c93faacc8e43c284031a7816d;hb=ab6842155a003ba7d9243507594e3e973ebbb3e4;hp=0b22eff640aa0406580a2a16999b320c2dede184;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 0b22eff640..1b2ed673f4 100644
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,9 +23,7 @@
 #include "font-interface.hh"
 #include "international.hh"
 #include "output-def.hh"
-#include "staff-symbol-referencer.hh"
 #include "text-interface.hh"
-#include "warn.hh"
 
 /*
   TODO:
@@ -57,22 +55,19 @@ Time_signature::print (SCM smob)
   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);
-
   return m.smobbed_copy ();
 }
 
 Stencil
 Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
 {
-  string style = ly_scm2string (scm_symbol_to_string (scm_style));
+  string style = robust_symbol2string (scm_style, "default");
 
   if (style == "numbered")
     return numbered_time_signature (me, n, d);
 
   if ((style == "default") || (style == ""))
-    style = to_string ("C");
+    style = ::to_string ("C");
 
   if (style == "C")
     {
@@ -82,7 +77,7 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
         return numbered_time_signature (me, n, 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);
@@ -105,9 +100,9 @@ Time_signature::numbered_time_signature (Grob *me, int num, int den)
                     chain);
 
   SCM sn = Text_interface::interpret_markup (me->layout ()->self_scm (), chain,
-                                             ly_string2scm (to_string (num)));
+                                             ly_string2scm (::to_string (num)));
   SCM sd = Text_interface::interpret_markup (me->layout ()->self_scm (), chain,
-                                             ly_string2scm (to_string (den)));
+                                             ly_string2scm (::to_string (den)));
 
   Stencil n = *unsmob_stencil (sn);
   Stencil d = *unsmob_stencil (sd);