source file of the GNU LilyPond music typesetter
- (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "time-signature.hh"
-#include "text-interface.hh"
-#include "output-def.hh"
+#include "grob.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,
+ ly_string2scm (to_string (num)));
+ SCM sd = Text_interface::interpret_markup (me->layout ()->self_scm (), chain,
+ ly_string2scm (to_string (den)));
Stencil n = *unsmob_stencil (sn);
Stencil d = *unsmob_stencil (sd);
Stencil m;
if (den)
{
- m.add_at_edge (Y_AXIS, UP, n, 0.0, 0);
- m.add_at_edge (Y_AXIS, DOWN, d, 0.0, 0);
+ m.add_at_edge (Y_AXIS, UP, n, 0.0);
+ m.add_at_edge (Y_AXIS, DOWN, d, 0.0);
}
else
{
return m;
}
-ADD_INTERFACE (Time_signature, "time-signature-interface",
- "A time signature, in different styles.\n"
- " The following values for 'style are are recognized:\n"
- "\n"
- " @table @samp\n"
- " @item @code{C}\n"
- " 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{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"
- "\n"
- " @item @code{mensural}\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 mensural style mensuration marks. All other time\n"
- " signatures are written with two digits.\n"
- "\n"
- " @item @code{single-digit}\n"
- " All time signatures are typeset with a single\n"
- " digit, e.g. 3/2 is written as 3.\n"
- " @end table\n"
+ADD_INTERFACE (Time_signature,
+ "A time signature, in different styles. The following values"
+ " for @code{style} are are recognized:\n"
"\n"
- "See also the test-file @file{input/test/time.ly}.\n",
- "fraction style");
+ "@table @code\n"
+ "@item C\n"
+ "4/4 and 2/2 are typeset as C and struck C, respectively."
+ " All other time signatures are written with two digits."
+ " The value @code{default} is equivalent to @code{C}.\n"
+ "@item neomensural\n"
+ "2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8, and 9/8 are"
+ " typeset with neo-mensural style mensuration marks. All"
+ " other time signatures are written with two digits.\n"
+ "@item mensural\n"
+ "2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8, and 9/8 are"
+ " typeset with mensural style mensuration marks. All other"
+ " time signatures are written with two digits.\n"
+ "@item single-digit\n"
+ "All time signatures are typeset with a single digit, e.g.,"
+ " 3/2 is written as 3.\n"
+ "@item numbered\n"
+ "All time signatures are typeset with two digits.\n"
+ "@end table",
+
+ /* properties */
+ "fraction "
+ "style "
+ );