/*
- time-signature.cc -- implement Time_signature
+ time-signature.cc -- implement Time_signature
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2004 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);
/*
- TODO: make different functions for special and normal timesigs.
+ TODO:
+
+ this file should go ; The formatting can completely be done with
+ markups.
+
*/
+
+MAKE_SCHEME_CALLBACK (Time_signature, brew_molecule, 1);
SCM
Time_signature::brew_molecule (SCM smob)
{
- Grob * me = unsmob_element (smob);
+ Grob * me = unsmob_grob (smob);
SCM st = me->get_grob_property ("style");
SCM frac = me->get_grob_property ("fraction");
int n = 4;
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 = numbered_time_signature (me, n, 0);
}
else
{
- return special_time_signature (me, style, n, d).smobbed_copy ();
+ m = special_time_signature (me, st, n, d);
}
}
else
- return time_signature (me, n,d).smobbed_copy ();
+ 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 ();
}
Molecule
-Time_signature::special_time_signature (Grob*me, String s, int n, int d)
+Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
{
- /*
- Randomly probing the font sucks?
- */
-
- SCM alist_chain = Font_interface::font_alist_chain (me);
-
- SCM style_chain =
- Font_interface::add_style (me, ly_symbol2scm ("timesig-symbol"),
- alist_chain);
+ String style = ly_scm2string (scm_symbol_to_string (scm_style));
- Font_metric *feta = Font_interface::get_font (me, style_chain);
+ if (style == "numbered")
+ return numbered_time_signature (me, n, d);
- /*
- First guess: s contains only the signature style, append fraction.
- */
- String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d);
-
- Molecule m = feta->find_by_name (symbolname);
- if (!m.empty_b())
- return m;
-
- /*
- Second guess: s contains the full signature name
- */
- m = feta->find_by_name ("timesig-" + s);
- if (!m.empty_b ())
- return m;
-
- // Resort to default layout with numbers
- return time_signature (me, n, d);
-}
+ if ((style == "default") || (style == ""))
+ style = to_string ("C");
+
+ if (style == "C")
+ {
+ if /* neither C2/2 nor C4/4 */
+ (((n != 2) || (d != 2)) &&
+ ((n != 4) || (d != 4)))
+ {
+ return numbered_time_signature (me, n, d);
+ }
+ }
+ String char_name = style + to_string (n) + "/" + to_string (d);
+ me->set_grob_property ("font-family", ly_symbol2scm ("music"));
+ Molecule out = Font_interface::get_default_font (me)
+ ->find_by_name ("timesig-" + char_name);
+ if (!out.is_empty ())
+ return out;
+
+ /* If there is no such symbol, we default to the numbered style.
+ (Here really with a warning!) */
+ me->warning (_f ("time signature symbol `%s' not found; "
+ "reverting to numbered style", char_name));
+ return numbered_time_signature (me, n, d);
+}
Molecule
-Time_signature::time_signature (Grob*me,int num, int den)
+Time_signature::numbered_time_signature (Grob*me,int num, int den)
{
SCM chain = Font_interface::font_alist_chain (me);
+ me->set_grob_property ("font-family", ly_symbol2scm ("number"));
+
+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 ()));
- Molecule n = Text_item::text2molecule (me,
- ly_str02scm (to_str (num).ch_C ()),
- chain);
- Molecule d = Text_item::text2molecule (me,
- ly_str02scm (to_str (den).ch_C ()),
- chain);
+ Molecule n = *unsmob_molecule (sn);
+ Molecule d = *unsmob_molecule (sd);
+
n.align_to (X_AXIS, CENTER);
d.align_to (X_AXIS, CENTER);
Molecule m;
if (den)
{
- m.add_at_edge (Y_AXIS, UP, n, 0.0);
- m.add_at_edge (Y_AXIS, DOWN, d, 0.0);
+ m.add_at_edge (Y_AXIS, UP, n, 0.0, 0);
+ m.add_at_edge (Y_AXIS, DOWN, d, 0.0,0);
}
else
{
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.\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{neo_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 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{1xxx}\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"
+" @end table\n"
+"\n"
+"See also the test-file @file{input/test/time.ly}.\n",
+ "fraction style");
projects / lilypond.git / blobdiff