source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "time-signature.hh"
#include "paper-def.hh"
#include "font-interface.hh"
+#include "warn.hh"
+#include "staff-symbol-referencer.hh"
-MAKE_SCHEME_CALLBACK(Time_signature,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Time_signature,brew_molecule,1);
/*
TODO: make different functions for special and normal timesigs.
*/
int d = 4;
if (gh_pair_p (frac))
{
- n = gh_scm2int (gh_car (frac));
- d = gh_scm2int (gh_cdr (frac));
+ n = gh_scm2int (ly_car (frac));
+ d = gh_scm2int (ly_cdr (frac));
}
-
+ Molecule m;
if (gh_symbol_p (st))
{
String style (ly_scm2string (scm_symbol_to_string (st)));
if (style[0]=='1')
{
- return time_signature (me, n, 0).smobbed_copy ();
+ m = time_signature (me, n, 0);
}
else
{
- return special_time_signature (me, style, n, d).smobbed_copy ();
+ m = special_time_signature (me, style, n, d);
}
}
else
- return time_signature (me, n,d).smobbed_copy ();
+ m = 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 ();
}
Molecule
/*
First guess: s contains only the signature style, append fraction.
*/
- String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d);
+ String symbolname = "timesig-" + s + to_string (n) + "/" + to_string (d);
Molecule m = feta->find_by_name (symbolname);
- if (!m.empty_b())
+ if (!m.empty_b ())
return m;
/*
Second guess: s contains the full signature name
*/
m = feta->find_by_name ("timesig-" + s);
+ m.align_to (X_AXIS, LEFT);
if (!m.empty_b ())
return m;
- // Resort to default layout with numbers
+ /*
+ If there is no such symbol, we default without warning to the
+ numbered style.
+ */
return time_signature (me, n, d);
}
SCM chain = Font_interface::font_alist_chain (me);
Molecule n = Text_item::text2molecule (me,
- ly_str02scm (to_str (num).ch_C ()),
+ ly_str02scm (to_string (num).to_str0 ()),
chain);
Molecule d = Text_item::text2molecule (me,
- ly_str02scm (to_str (den).ch_C ()),
+ ly_str02scm (to_string (den).to_str0 ()),
chain);
n.align_to (X_AXIS, CENTER);
d.align_to (X_AXIS, CENTER);
m = n;
m.align_to (Y_AXIS, CENTER);
}
+
+ m.align_to (X_AXIS, LEFT);
+
return m;
}
+
+
+ADD_INTERFACE (Time_signature,"time-signature-interface",
+ "A time signature, in different styles.
+ The following values for 'style are are recognized:
+
+ @table @samp
+ @item @code{C}
+ 4/4 and 2/2 are typeset as C and struck C, respectively. All
+ other time signatures are written with two digits.
+
+ @item @code{old}
+ 2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8 and 9/8 are
+ typeset with old-style mensuration marks. All other time
+ signatures are written with two digits.
+
+ @item @code{1xxx}
+ All time signatures are typeset with a single
+ digit, e.g. 3/2 is written as 3. (Any symbol starting
+ with the digit @code{1} will do.)
+
+ @item @code{C}@var{M}@code{/}@var{N},
+@code{old}@var{M}@code{/}@var{N} or
+ @code{old6/8alt}
+ Tells LilyPond to use a specific symbol as time signature,
+ regardless of the actual time signature.
+ @end table
+
+See also the test-file @file{input/test/time.ly}.
+",
+ "fraction style");