source file of the GNU LilyPond music typesetter
- (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "time-signature.hh"
-#include "text-interface.hh"
-#include "output-def.hh"
#include "font-interface.hh"
-#include "warn.hh"
+#include "international.hh"
+#include "output-def.hh"
#include "staff-symbol-referencer.hh"
+#include "text-interface.hh"
+#include "warn.hh"
/*
TODO:
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 = ly_scm2string (scm_symbol_to_string (scm_style));
if (style == "numbered")
return numbered_time_signature (me, n, d);
if /* neither C2/2 nor C4/4 */
(((n != 2) || (d != 2))
&& ((n != 4) || (d != 4)))
- {
- return numbered_time_signature (me, n, 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);
ly_symbol2scm ("fetaNumber"))),
chain);
- 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 ()));
+ SCM sn = Text_interface::interpret_markup (me->layout ()->self_scm (), chain,
+ scm_makfrom0str (to_string (num).c_str ()));
+ SCM sd = Text_interface::interpret_markup (me->layout ()->self_scm (), chain,
+ scm_makfrom0str (to_string (den).c_str ()));
Stencil n = *unsmob_stencil (sn);
Stencil d = *unsmob_stencil (sd);