#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"
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 = scm_to_int (ly_car (frac));
+ d = scm_to_int (ly_cdr (frac));
}
Stencil m;
- if (gh_symbol_p (st))
+ if (st == ly_symbol2scm ("single-digit"))
{
- 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);
- }
+ 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);
}
String char_name = style + to_string (n) + "/" + to_string (d);
- me->set_property ("font-encoding", 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 ())
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 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 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_interface::interpret_markup (me->get_paper ()->self_scm (), chain,
+ scm_makfrom0str (to_string (num).to_str0 ()));
+ SCM sd = Text_interface::interpret_markup (me->get_paper ()->self_scm (), chain,
+ scm_makfrom0str (to_string (den).to_str0 ()));
Stencil n = *unsmob_stencil (sn);
Stencil d = *unsmob_stencil (sd);
" 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"
" 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",